diff --git a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
--- a/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/mlir/BUILD.bazel
@@ -3018,10 +3018,7 @@
             "lib/Support/MlirOptMain.cpp",
         ],
     ),
-    hdrs = glob(
-        ["include/mlir/Support/*.h"],
-        exclude = ["include/mlir/Support/MlirOptMain.h"],
-    ),
+    hdrs = glob(["include/mlir/Support/*.h"]),
     includes = ["include"],
     deps = ["//llvm:Support"],
 )
@@ -3064,9 +3061,7 @@
     ]),
     hdrs = glob([
         "include/mlir/Parser/*.h",
-    ]) + [
-        "include/mlir/Parser.h",
-    ],
+    ]),
     includes = ["include"],
     deps = [
         ":IR",
@@ -5552,7 +5547,7 @@
         "lib/Translation/*.cpp",
         "lib/Translation/*.h",
     ]),
-    hdrs = ["include/mlir/Translation.h"],
+    hdrs = ["include/mlir/Tools/mlir-translate/Translation.h"],
     includes = ["include"],
     deps = [
         ":IR",
@@ -5847,7 +5842,7 @@
 cc_library(
     name = "MlirOptLib",
     srcs = ["lib/Support/MlirOptMain.cpp"],
-    hdrs = ["include/mlir/Support/MlirOptMain.h"],
+    hdrs = ["include/mlir/Tools/mlir-opt/MlirOptMain.h"],
     includes = ["include"],
     deps = [
         ":IR",