diff --git a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
index 64d36c7b7f664d8..ae17746c72882a1 100644
--- a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
@@ -947,7 +947,14 @@ cc_library(
     ]) + [
         # To avoid a dependency cycle.
         "include/llvm/Analysis/IVDescriptors.h",
-    ],
+        "include/llvm/CodeGen/GenVT.inc",
+    ] + glob(
+        # To avoid a dependency cycle.
+        [
+            "include/llvm/CodeGen/**/*.h",
+            "include/llvm/CodeGenTypes/**/*.h",
+        ],
+    ),
     hdrs = glob(
         [
             "include/llvm/*.h",