diff --git a/llvm/utils/TableGen/X86FoldTablesEmitter.cpp b/llvm/utils/TableGen/X86FoldTablesEmitter.cpp
--- a/llvm/utils/TableGen/X86FoldTablesEmitter.cpp
+++ b/llvm/utils/TableGen/X86FoldTablesEmitter.cpp
@@ -42,12 +42,12 @@
 
 const ManualMapEntry ManualMapSet[] = {
 #define ENTRY(REG, MEM, FLAGS) {#REG, #MEM, FLAGS},
-#include "X86ManualFoldTables.def"
+#include "X86ManualFoldTables.inc"
 };
 
 const std::set<StringRef> NoFoldSet= {
 #define NOFOLD(INSN) #INSN,
-#include "X86ManualFoldTables.def"
+#include "X86ManualFoldTables.inc"
 };
 
 static bool isExplicitAlign(const CodeGenInstruction *Inst) {
diff --git a/llvm/utils/TableGen/X86ManualFoldTables.def b/llvm/utils/TableGen/X86ManualFoldTables.inc
rename from llvm/utils/TableGen/X86ManualFoldTables.def
rename to llvm/utils/TableGen/X86ManualFoldTables.inc
--- a/llvm/utils/TableGen/X86ManualFoldTables.def
+++ b/llvm/utils/TableGen/X86ManualFoldTables.inc
@@ -1,4 +1,4 @@
-//===- X86ManualFoldTables.def ----------------------------*- C++ -*-==//
+//===- X86ManualFoldTables.inc -----------------------------------*- C++ -*-==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
diff --git a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
--- a/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/llvm/BUILD.bazel
@@ -597,11 +597,6 @@
     ],
 )
 
-cc_library(
-    name = "llvm-tblgen-headers",
-    textual_hdrs = glob(["utils/TableGen/*.def"]),
-)
-
 cc_binary(
     name = "llvm-tblgen",
     srcs = glob([
@@ -621,7 +616,6 @@
         ":Support",
         ":TableGen",
         ":config",
-        ":llvm-tblgen-headers",
     ],
 )