diff --git a/clang/include/clang/Tooling/Inclusions/CSymbolMap.inc b/clang/lib/Tooling/Inclusions/Stdlib/CSymbolMap.inc
rename from clang/include/clang/Tooling/Inclusions/CSymbolMap.inc
rename to clang/lib/Tooling/Inclusions/Stdlib/CSymbolMap.inc
diff --git a/clang/lib/Tooling/Inclusions/Stdlib/StandardLibrary.cpp b/clang/lib/Tooling/Inclusions/Stdlib/StandardLibrary.cpp
--- a/clang/lib/Tooling/Inclusions/Stdlib/StandardLibrary.cpp
+++ b/clang/lib/Tooling/Inclusions/Stdlib/StandardLibrary.cpp
@@ -55,10 +55,10 @@
 #define SYMBOL(Name, NS, Header) ++SymCount;
   switch (Language) {
   case Lang::C:
-#include "clang/Tooling/Inclusions/CSymbolMap.inc"
+#include "CSymbolMap.inc"
     break;
   case Lang::CXX:
-#include "clang/Tooling/Inclusions/StdSymbolMap.inc"
+#include "StdSymbolMap.inc"
     break;
   }
 #undef SYMBOL
@@ -112,10 +112,10 @@
 #define SYMBOL(Name, NS, Header) Add(#NS #Name, strlen(#NS), #Header);
   switch (Language) {
   case Lang::C:
-#include "clang/Tooling/Inclusions/CSymbolMap.inc"
+#include "CSymbolMap.inc"
     break;
   case Lang::CXX:
-#include "clang/Tooling/Inclusions/StdSymbolMap.inc"
+#include "StdSymbolMap.inc"
     break;
   }
 #undef SYMBOL
diff --git a/clang/include/clang/Tooling/Inclusions/StdSymbolMap.inc b/clang/lib/Tooling/Inclusions/Stdlib/StdSymbolMap.inc
rename from clang/include/clang/Tooling/Inclusions/StdSymbolMap.inc
rename to clang/lib/Tooling/Inclusions/Stdlib/StdSymbolMap.inc
diff --git a/utils/bazel/llvm-project-overlay/clang/BUILD.bazel b/utils/bazel/llvm-project-overlay/clang/BUILD.bazel
--- a/utils/bazel/llvm-project-overlay/clang/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/clang/BUILD.bazel
@@ -1078,10 +1078,10 @@
     name = "tooling_inclusions",
     srcs = glob([
         "lib/Tooling/Inclusions/**/*.cpp",
+        "lib/Tooling/Inclusions/**/*.inc",
     ]),
     hdrs = glob([
         "include/clang/Tooling/Inclusions/**/*.h",
-        "include/clang/Tooling/Inclusions/**/*.inc",
     ]),
     deps = [
         ":ast",