diff --git a/third_party/examples/woff2/carbon/compile_flags.txt b/third_party/examples/woff2/carbon/compile_flags.txt
deleted file mode 100644
index 0c9c359b4cff..000000000000
--- a/third_party/examples/woff2/carbon/compile_flags.txt
+++ /dev/null
@@ -1,52 +0,0 @@
--xc++
--Wall
--Wextra
--Wthread-safety
--Wself-assign
--Wno-missing-field-initializers
--DLLVM_ON_UNIX=1
--DHAVE_BACKTRACE=1
--DBACKTRACE_HEADER=<execinfo.h>
--DLTDL_SHLIB_EXT=".so"
--DLLVM_ENABLE_THREADS=1
--DHAVE_SYSEXITS_H=1
--DHAVE_UNISTD_H=1
--DHAVE_STRERROR_R=1
--DHAVE_LIBPTHREAD=1
--DHAVE_PTHREAD_GETNAME_NP=1
--DHAVE_PTHREAD_SETNAME_NP=1
--DHAVE_PTHREAD_GETSPECIFIC=1
--D_GNU_SOURCE
--DHAVE_LINK_H=1
--DHAVE_LSEEK64=1
--DHAVE_MALLINFO=1
--DHAVE_POSIX_FALLOCATE=1
--DHAVE_SBRK=1
--DHAVE_STRUCT_STAT_ST_MTIM_TV_NSEC=1
--DLLVM_NATIVE_ARCH="X86"
--DLLVM_NATIVE_ASMPARSER=LLVMInitializeX86AsmParser
--DLLVM_NATIVE_ASMPRINTER=LLVMInitializeX86AsmPrinter
--DLLVM_NATIVE_DISASSEMBLER=LLVMInitializeX86Disassembler
--DLLVM_NATIVE_TARGET=LLVMInitializeX86Target
--DLLVM_NATIVE_TARGETINFO=LLVMInitializeX86TargetInfo
--DLLVM_NATIVE_TARGETMC=LLVMInitializeX86TargetMC
--DLLVM_HOST_TRIPLE="x86_64-unknown-linux-gnu"
--DLLVM_DEFAULT_TARGET_TRIPLE="x86_64-unknown-linux-gnu"
--DLLVM_ENABLE_TERMINFO=1
--DLLVM_ENABLE_ZLIB=1
--DGTEST_HAS_RTTI=0
--D__STDC_LIMIT_MACROS
--D__STDC_CONSTANT_MACROS
--DGTEST_USE_OWN_TR1_TUPLE=1
--std=c++17
--stdlib=libc++
--I../../brotli/original/c/include
--Iinclude
--no-canonical-prefixes
--Wno-builtin-macro-redefined
--D__DATE__="redacted"
--D__TIMESTAMP__="redacted"
--D__TIME__="redacted"
--Wno-unused-variable
--Wno-unused-const-variable
--Wno-sign-compare
diff --git a/third_party/examples/woff2/migrate_cpp.sh b/third_party/examples/woff2/migrate_cpp.sh
index e9629d95e582..03f08dbf310b 100755
--- a/third_party/examples/woff2/migrate_cpp.sh
+++ b/third_party/examples/woff2/migrate_cpp.sh
@@ -29,10 +29,23 @@ cp "${EXAMPLE}/WORKSPACE.original" \
 cp "${EXAMPLE}/compile_flags.carbon.txt" \
   "${EXAMPLE}/carbon/compile_flags.txt"
 
+# Kludge for adding LLVM include paths into the compile flags.
+# TODO: Find better solution.
+for x in $(
+    clang++ -Wp,-v -xc++ -stdlib=libc++ - -fsyntax-only < /dev/null 2>&1 |
+    grep /llvm/); do
+  echo "-isystem" >> "${EXAMPLE}/carbon/compile_flags.txt"
+  echo "${x}" >> "${EXAMPLE}/carbon/compile_flags.txt"
+done
+
 # Run the migration tool.
 bazel build -c opt //migrate_cpp
 # Not sure why, but execution of cpp_refactoring fails while saving refactorings
 # if not in the directory. Ideally shouldn't be required, passing the path to
 # migrate_cpp should work.
-cd "${EXAMPLE}/carbon"
+pushd "${EXAMPLE}/carbon"
 ../../../../bazel-bin/migrate_cpp/migrate_cpp .
+popd
+
+# Don't save the compile flags.
+rm "${EXAMPLE}/carbon/compile_flags.txt"