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
@@ -56,7 +56,6 @@
 [
     gentbl_cc_library(
         name = name + "IncGen",
-        strip_include_prefix = "include",
         tbl_outs = [
             (
                 ["-gen-op-interface-decls"],
@@ -80,7 +79,6 @@
 
 gentbl_cc_library(
     name = "TensorEncodingIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-attr-interface-decls"],
@@ -129,7 +127,6 @@
 
 gentbl_cc_library(
     name = "BuiltinDialectIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-dialect-decls"],
@@ -147,7 +144,6 @@
 
 gentbl_cc_library(
     name = "BuiltinDialectBytecodeGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -164,7 +160,6 @@
 
 gentbl_cc_library(
     name = "BuiltinAttributesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["--gen-attrdef-decls"],
@@ -182,7 +177,6 @@
 
 gentbl_cc_library(
     name = "BuiltinAttributeInterfacesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["--gen-attr-interface-decls"],
@@ -200,7 +194,6 @@
 
 gentbl_cc_library(
     name = "BuiltinLocationAttributesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["--gen-attrdef-decls"],
@@ -218,7 +211,6 @@
 
 gentbl_cc_library(
     name = "BuiltinOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -239,7 +231,6 @@
 
 gentbl_cc_library(
     name = "BuiltinTypesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["--gen-typedef-decls"],
@@ -257,7 +248,6 @@
 
 gentbl_cc_library(
     name = "BuiltinTypeInterfacesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["--gen-type-interface-decls"],
@@ -284,7 +274,6 @@
 
 gentbl_cc_library(
     name = "FunctionInterfacesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -1222,7 +1211,6 @@
 
 gentbl_cc_library(
     name = "AffineOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -1254,7 +1242,6 @@
 
 gentbl_cc_library(
     name = "AffineMemoryOpInterfacesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -1283,7 +1270,6 @@
 
 gentbl_cc_library(
     name = "AffineTransformOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -1335,7 +1321,6 @@
 
 gentbl_cc_library(
     name = "AMDGPUIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -1409,7 +1394,6 @@
 
 gentbl_cc_library(
     name = "AMDGPUPassIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -1482,7 +1466,6 @@
 
 gentbl_cc_library(
     name = "EmitCAttributesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["--gen-attrdef-decls"],
@@ -1500,7 +1483,6 @@
 
 gentbl_cc_library(
     name = "EmitCOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-dialect-decls"],
@@ -1577,7 +1559,6 @@
 
 gentbl_cc_library(
     name = "AsyncOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -1611,7 +1592,6 @@
 
 gentbl_cc_library(
     name = "AsyncPassIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -1657,7 +1637,6 @@
 
 gentbl_cc_library(
     name = "ArmNeonIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -1708,7 +1687,6 @@
 
 gentbl_cc_library(
     name = "ArmNeonConversionIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-llvmir-conversions"],
@@ -1766,7 +1744,6 @@
 
 gentbl_cc_library(
     name = "ArmSMETransformsPassIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [(
         [
             "-gen-pass-decls",
@@ -1781,7 +1758,6 @@
 
 gentbl_cc_library(
     name = "ArmSMEIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -1821,7 +1797,6 @@
 
 gentbl_cc_library(
     name = "ArmSMEConversionIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-llvmir-conversions"],
@@ -1920,7 +1895,6 @@
 
 gentbl_cc_library(
     name = "ArmSVEIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -1992,7 +1966,6 @@
 
 gentbl_cc_library(
     name = "ArmSVEConversionIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-llvmir-conversions"],
@@ -2020,7 +1993,6 @@
 
 gentbl_cc_library(
     name = "AMXIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -2087,7 +2059,6 @@
 
 gentbl_cc_library(
     name = "AMXConversionIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-llvmir-conversions"],
@@ -2116,7 +2087,6 @@
 
 gentbl_cc_library(
     name = "X86VectorIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -2187,7 +2157,6 @@
 
 gentbl_cc_library(
     name = "X86VectorConversionIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-llvmir-conversions"],
@@ -2222,7 +2191,6 @@
 
 gentbl_cc_library(
     name = "IRDLIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-dialect-decls"],
@@ -2256,7 +2224,6 @@
 
 gentbl_cc_library(
     name = "IRDLInterfacesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -2274,7 +2241,6 @@
 
 gentbl_cc_library(
     name = "IRDLAttributesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-attrdef-decls"],
@@ -2292,7 +2258,6 @@
 
 gentbl_cc_library(
     name = "IRDLEnumsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-enum-decls"],
@@ -2310,7 +2275,6 @@
 
 gentbl_cc_library(
     name = "IRDLOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -2328,7 +2292,6 @@
 
 gentbl_cc_library(
     name = "IRDLTypesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-typedef-decls"],
@@ -2399,7 +2362,6 @@
 
 gentbl_cc_library(
     name = "SCFIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -2425,7 +2387,6 @@
 
 gentbl_cc_library(
     name = "SCFDeviceMappingInterfacesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-attr-interface-decls"],
@@ -2451,7 +2412,6 @@
 
 gentbl_cc_library(
     name = "SCFPassIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -2516,7 +2476,6 @@
 
 gentbl_cc_library(
     name = "SCFTransformOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -2578,7 +2537,6 @@
 
 gentbl_cc_library(
     name = "SparseTensorAttrDefsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["--gen-attrdef-decls"],
@@ -2604,7 +2562,6 @@
 
 gentbl_cc_library(
     name = "SparseTensorOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -2640,7 +2597,6 @@
 
 gentbl_cc_library(
     name = "SparseTensorTypesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["--gen-typedef-decls"],
@@ -2658,7 +2614,6 @@
 
 gentbl_cc_library(
     name = "SparseTensorPassIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -2763,7 +2718,6 @@
 
 gentbl_cc_library(
     name = "SparseTensorTransformOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -2888,7 +2842,6 @@
 
 gentbl_cc_library(
     name = "NVGPUIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -2948,7 +2901,6 @@
 
 gentbl_cc_library(
     name = "NVGPUPassIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -3026,7 +2978,6 @@
 
 gentbl_cc_library(
     name = "NVGPUTransformOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -3108,7 +3059,6 @@
 
 gentbl_cc_library(
     name = "FuncIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -3167,7 +3117,6 @@
 
 gentbl_cc_library(
     name = "DialectUtilsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-enum-decls"],
@@ -3354,7 +3303,6 @@
 
 gentbl_cc_library(
     name = "AffinePassIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -3406,7 +3354,6 @@
 
 gentbl_cc_library(
     name = "ConversionPassIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -3777,7 +3724,6 @@
 
 gentbl_cc_library(
     name = "ShapeOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -3811,7 +3757,6 @@
 
 gentbl_cc_library(
     name = "MLIRShapeCanonicalizationIncGen",
-    strip_include_prefix = "include/mlir/Dialect/Shape/IR",
     tbl_outs = [
         (
             ["-gen-rewriters"],
@@ -3850,7 +3795,6 @@
 
 gentbl_cc_library(
     name = "ShapeToStandardGen",
-    strip_include_prefix = "lib/Conversion/ShapeToStandard",
     tbl_outs = [
         (
             ["-gen-rewriters"],
@@ -3890,7 +3834,6 @@
 
 gentbl_cc_library(
     name = "ShapeTransformsPassIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [(
         [
             "-gen-pass-decls",
@@ -3950,7 +3893,6 @@
 
 gentbl_cc_library(
     name = "ControlFlowOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -4065,7 +4007,6 @@
 
 gentbl_cc_library(
     name = "FuncTransformOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -4125,7 +4066,6 @@
 
 gentbl_cc_library(
     name = "FuncTransformsPassIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [(
         [
             "-gen-pass-decls",
@@ -4233,7 +4173,6 @@
 
 gentbl_cc_library(
     name = "VectorEnumsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-enum-decls"],
@@ -4253,7 +4192,6 @@
 
 gentbl_cc_library(
     name = "VectorPassIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -4527,7 +4465,6 @@
 
 gentbl_cc_library(
     name = "LLVMDialectInterfaceIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -4610,7 +4547,6 @@
 
 gentbl_cc_library(
     name = "LLVMPassIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -4671,7 +4607,6 @@
 
 gentbl_cc_library(
     name = "GPUDeviceMapperEnumsGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-enum-decls"],
@@ -4692,7 +4627,6 @@
 
 gentbl_cc_library(
     name = "GPUCompilationAttrInterfacesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-attr-interface-decls"],
@@ -4713,7 +4647,6 @@
 
 gentbl_cc_library(
     name = "GPUBaseIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -4731,7 +4664,6 @@
 
 gentbl_cc_library(
     name = "GPUOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -4809,7 +4741,6 @@
 
 gentbl_cc_library(
     name = "GPUPassIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -4957,7 +4888,6 @@
 
 gentbl_cc_library(
     name = "GPUTransformOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -5063,7 +4993,6 @@
 
 gentbl_cc_library(
     name = "GPUToNVVMGen",
-    strip_include_prefix = "lib/Conversion/GPUToNVVM",
     tbl_outs = [
         (
             ["-gen-rewriters"],
@@ -5190,7 +5119,6 @@
 
 gentbl_cc_library(
     name = "GPUToROCDLTGen",
-    strip_include_prefix = "lib/Conversion/GPUToROCDL",
     tbl_outs = [
         (
             ["-gen-rewriters"],
@@ -5375,7 +5303,6 @@
 
 gentbl_cc_library(
     name = "LLVMOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -5423,7 +5350,6 @@
 
 gentbl_cc_library(
     name = "LLVMTypesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -5447,7 +5373,6 @@
 
 gentbl_cc_library(
     name = "LLVMIntrinsicOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -5465,7 +5390,6 @@
 
 gentbl_cc_library(
     name = "LLVMConversionIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-llvmir-conversions"],
@@ -5491,7 +5415,6 @@
 
 gentbl_cc_library(
     name = "LLVMIntrinsicConversionIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-llvmir-conversions"],
@@ -5585,7 +5508,6 @@
 
 gentbl_cc_library(
     name = "NVVMOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -5653,7 +5575,6 @@
 
 gentbl_cc_library(
     name = "NVVMConversionIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-llvmir-conversions"],
@@ -5716,7 +5637,6 @@
 
 gentbl_cc_library(
     name = "ROCDLOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -5748,7 +5668,6 @@
 
 gentbl_cc_library(
     name = "ROCDLConversionIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-llvmir-conversions"],
@@ -5795,7 +5714,6 @@
 
 gentbl_cc_library(
     name = "PDLOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -5821,7 +5739,6 @@
 
 gentbl_cc_library(
     name = "PDLTypesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-typedef-decls"],
@@ -5871,7 +5788,6 @@
 
 gentbl_cc_library(
     name = "PDLInterpOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -5918,7 +5834,6 @@
 
 gentbl_cc_library(
     name = "SPIRVOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -5968,7 +5883,6 @@
 
 gentbl_cc_library(
     name = "SPIRVAttributesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-attrdef-decls"],
@@ -5986,7 +5900,6 @@
 
 gentbl_cc_library(
     name = "SPIRVCanonicalizationIncGen",
-    strip_include_prefix = "lib/Dialect/SPIRV/IR",
     tbl_outs = [
         (
             ["-gen-rewriters"],
@@ -6000,7 +5913,6 @@
 
 gentbl_cc_library(
     name = "SPIRVAvailabilityIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-avail-interface-decls"],
@@ -6022,7 +5934,6 @@
 
 gentbl_cc_library(
     name = "SPIRVAttrUtilsGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-spirv-attr-utils"],
@@ -6036,7 +5947,6 @@
 
 gentbl_cc_library(
     name = "SPIRVSerializationGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-spirv-serialization"],
@@ -6079,7 +5989,6 @@
 
 gentbl_cc_library(
     name = "SPIRVPassIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -6396,7 +6305,6 @@
 
 gentbl_cc_library(
     name = "TensorOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -6518,7 +6426,6 @@
 
 gentbl_cc_library(
     name = "TensorPassIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -6587,7 +6494,6 @@
 
 gentbl_cc_library(
     name = "TensorTransformOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -6673,7 +6579,6 @@
 
 gentbl_cc_library(
     name = "DerivedAttributeOpInterfaceIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -6703,7 +6608,6 @@
 
 gentbl_cc_library(
     name = "DestinationStyleOpInterfaceIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -6733,7 +6637,6 @@
 
 gentbl_cc_library(
     name = "InferIntRangeInterfaceIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -6802,7 +6705,6 @@
 
 gentbl_cc_library(
     name = "LoopLikeInterfaceIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -6820,7 +6722,6 @@
 
 gentbl_cc_library(
     name = "MemorySlotInterfacesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -6846,7 +6747,6 @@
 
 gentbl_cc_library(
     name = "ShapedOpInterfacesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -6864,7 +6764,6 @@
 
 gentbl_cc_library(
     name = "ParallelCombiningOpInterfaceIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -6882,7 +6781,6 @@
 
 gentbl_cc_library(
     name = "RuntimeVerifiableOpInterfaceIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -6900,7 +6798,6 @@
 
 gentbl_cc_library(
     name = "VectorInterfacesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -6918,7 +6815,6 @@
 
 gentbl_cc_library(
     name = "ViewLikeInterfaceIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -6936,7 +6832,6 @@
 
 gentbl_cc_library(
     name = "CopyOpInterfaceIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -6954,7 +6849,6 @@
 
 gentbl_cc_library(
     name = "TransformsPassIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -7431,7 +7325,6 @@
 
 gentbl_cc_library(
     name = "BytecodeOpInterfaceIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -7449,7 +7342,6 @@
 
 gentbl_cc_library(
     name = "CallOpInterfacesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -7479,7 +7371,6 @@
 
 gentbl_cc_library(
     name = "CastInterfacesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -7509,7 +7400,6 @@
 
 gentbl_cc_library(
     name = "ControlFlowInterfacesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -7539,7 +7429,6 @@
 
 gentbl_cc_library(
     name = "InferTypeOpInterfaceIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -7570,7 +7459,6 @@
 
 gentbl_cc_library(
     name = "SideEffectInterfacesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -7600,7 +7488,6 @@
 
 gentbl_cc_library(
     name = "TilingInterfaceIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -8749,7 +8636,6 @@
 gentbl_cc_library(
     name = "AccCommonGen",
     includes = ["/llvm/include"],
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -8779,7 +8665,6 @@
 
 gentbl_cc_library(
     name = "OpenACCOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -8842,7 +8727,6 @@
 
 gentbl_cc_library(
     name = "OpenACCTypesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -8866,7 +8750,6 @@
 
 gentbl_cc_library(
     name = "OpenACCTypeInterfacesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-type-interface-decls"],
@@ -8913,7 +8796,6 @@
 gentbl_cc_library(
     name = "OmpCommonTdGen",
     includes = ["/llvm/include"],
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -8947,7 +8829,6 @@
 
 gentbl_cc_library(
     name = "OpenMPOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -9005,7 +8886,6 @@
 
 gentbl_cc_library(
     name = "OpenMPTypeInterfacesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-type-interface-decls"],
@@ -9023,7 +8903,6 @@
 
 gentbl_cc_library(
     name = "OpenMPInterfacesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -9162,7 +9041,6 @@
 
 gentbl_cc_library(
     name = "QuantOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -9192,7 +9070,6 @@
 
 gentbl_cc_library(
     name = "QuantDialectBytecodeGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -9262,7 +9139,6 @@
 
 gentbl_cc_library(
     name = "IndexOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -9302,7 +9178,6 @@
 
 gentbl_cc_library(
     name = "IndexEnumsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-enum-decls"],
@@ -9411,7 +9286,6 @@
 
 gentbl_cc_library(
     name = "LinalgOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -9451,7 +9325,6 @@
 
 gentbl_cc_library(
     name = "LinalgEnumsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-enum-decls"],
@@ -9469,7 +9342,6 @@
 
 gentbl_cc_library(
     name = "LinalgMatchOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -9492,7 +9364,6 @@
 
 gentbl_cc_library(
     name = "LinalgTransformEnumsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-enum-decls"],
@@ -9513,7 +9384,6 @@
 
 gentbl_cc_library(
     name = "LinalgTransformOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -9568,7 +9438,6 @@
 
 gentbl_cc_library(
     name = "LinalgStructuredOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -9586,7 +9455,6 @@
 
 gentbl_cc_library(
     name = "LinalgInterfacesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -9615,7 +9483,6 @@
 
 gentbl_cc_library(
     name = "BufferizableOpInterfaceIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -9645,7 +9512,6 @@
 
 gentbl_cc_library(
     name = "LinalgDocIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-doc"],
@@ -9767,7 +9633,6 @@
 
 gentbl_cc_library(
     name = "LinalgPassIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -9901,7 +9766,6 @@
 
 gentbl_cc_library(
     name = "ValueBoundsOpInterfaceIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -10012,7 +9876,6 @@
 
 gentbl_cc_library(
     name = "MaskableOpInterfaceIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -10030,7 +9893,6 @@
 
 gentbl_cc_library(
     name = "MaskingOpInterfaceIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -10048,7 +9910,6 @@
 
 gentbl_cc_library(
     name = "VectorOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -10100,7 +9961,6 @@
 
 gentbl_cc_library(
     name = "VectorTransformOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -10290,7 +10150,6 @@
 
 gentbl_cc_library(
     name = "TosaDialectIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -10328,7 +10187,6 @@
 
 gentbl_cc_library(
     name = "TosaInterfacesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -10346,7 +10204,6 @@
 
 gentbl_cc_library(
     name = "TosaPassIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -10537,7 +10394,6 @@
 
 gentbl_cc_library(
     name = "TransformDialectEnumsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -10559,7 +10415,6 @@
 
 gentbl_cc_library(
     name = "TransformDialectMatchInterfacesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -10584,7 +10439,6 @@
 
 gentbl_cc_library(
     name = "TransformDialectInterfacesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -10618,7 +10472,6 @@
 
 gentbl_cc_library(
     name = "TransformDialectIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -10640,7 +10493,6 @@
 
 gentbl_cc_library(
     name = "TransformOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -10662,7 +10514,6 @@
 
 gentbl_cc_library(
     name = "TransformTypesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-typedef-decls"],
@@ -10719,7 +10570,6 @@
 
 gentbl_cc_library(
     name = "TransformPDLExtensionOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -10767,7 +10617,6 @@
 
 gentbl_cc_library(
     name = "TransformDialectTransformsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -10830,7 +10679,6 @@
 
 gentbl_cc_library(
     name = "ComplexAttributesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-attrdef-decls"],
@@ -10848,7 +10696,6 @@
 
 gentbl_cc_library(
     name = "ComplexBaseIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -10872,7 +10719,6 @@
 
 gentbl_cc_library(
     name = "ComplexOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -11047,7 +10893,6 @@
 
 gentbl_cc_library(
     name = "ArithBaseIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -11079,7 +10924,6 @@
 
 gentbl_cc_library(
     name = "ArithOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -11113,7 +10957,6 @@
 
 gentbl_cc_library(
     name = "ArithOpsInterfacesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -11133,7 +10976,6 @@
 
 gentbl_cc_library(
     name = "ArithCanonicalizationIncGen",
-    strip_include_prefix = "include/mlir/Dialect/Arith/IR",
     tbl_outs = [
         (
             ["-gen-rewriters"],
@@ -11180,7 +11022,6 @@
 
 gentbl_cc_library(
     name = "ArithPassIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -11261,7 +11102,6 @@
 
 gentbl_cc_library(
     name = "MathBaseIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -11285,7 +11125,6 @@
 
 gentbl_cc_library(
     name = "MathOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -11303,7 +11142,6 @@
 
 gentbl_cc_library(
     name = "MathPassIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -11417,7 +11255,6 @@
 
 gentbl_cc_library(
     name = "MemRefBaseIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -11441,7 +11278,6 @@
 
 gentbl_cc_library(
     name = "MemRefOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -11515,7 +11351,6 @@
 
 gentbl_cc_library(
     name = "MemRefPassIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -11583,7 +11418,6 @@
 
 gentbl_cc_library(
     name = "MemRefTransformOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -11650,7 +11484,6 @@
 
 gentbl_cc_library(
     name = "MLProgramOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -11676,7 +11509,6 @@
 
 gentbl_cc_library(
     name = "MLProgramAttributesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-attrdef-decls"],
@@ -11694,7 +11526,6 @@
 
 gentbl_cc_library(
     name = "MLProgramTypesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-typedef-decls"],
@@ -11745,7 +11576,6 @@
 
 gentbl_cc_library(
     name = "AllocationOpInterfaceIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-interface-decls"],
@@ -11791,7 +11621,6 @@
 
 gentbl_cc_library(
     name = "BufferizationBaseIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -11826,7 +11655,6 @@
 
 gentbl_cc_library(
     name = "BufferizationEnumsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-enum-decls"],
@@ -11856,7 +11684,6 @@
 
 gentbl_cc_library(
     name = "BufferizationTransformOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -11901,7 +11728,6 @@
 
 gentbl_cc_library(
     name = "BufferizationOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["-gen-op-decls"],
@@ -11957,7 +11783,6 @@
 
 gentbl_cc_library(
     name = "BufferizationPassIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -12039,7 +11864,6 @@
 
 gentbl_cc_library(
     name = "DLTIBaseIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -12076,7 +11900,6 @@
 
 gentbl_cc_library(
     name = "ReducerIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [
@@ -12268,7 +12091,6 @@
 
 gentbl_cc_library(
     name = "UBOpsInterfacesIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             ["--gen-attr-interface-decls"],
@@ -12286,7 +12108,6 @@
 
 gentbl_cc_library(
     name = "UBOpsIncGen",
-    strip_include_prefix = "include",
     tbl_outs = [
         (
             [