diff --git a/llvm/utils/gn/secondary/clang/include/clang/AST/BUILD.gn b/llvm/utils/gn/secondary/clang/include/clang/AST/BUILD.gn
index 2e7047fcf66e54..4be766d3ee13fb 100644
--- a/llvm/utils/gn/secondary/clang/include/clang/AST/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/include/clang/AST/BUILD.gn
@@ -1,47 +1,27 @@
 import("//clang/utils/TableGen/clang_tablegen.gni")
 
 clang_tablegen("Attrs") {
-  args = [
-    "-gen-clang-attr-classes",
-    "-I",
-    rebase_path("../..", root_out_dir),
-  ]
+  args = [ "-gen-clang-attr-classes" ]
   td_file = "../Basic/Attr.td"
 }
 
 clang_tablegen("AttrImpl") {
-  args = [
-    "-gen-clang-attr-impl",
-    "-I",
-    rebase_path("../..", root_out_dir),
-  ]
+  args = [ "-gen-clang-attr-impl" ]
   td_file = "../Basic/Attr.td"
 }
 
 clang_tablegen("AttrTextNodeDump") {
-  args = [
-    "-gen-clang-attr-text-node-dump",
-    "-I",
-    rebase_path("../..", root_out_dir),
-  ]
+  args = [ "-gen-clang-attr-text-node-dump" ]
   td_file = "../Basic/Attr.td"
 }
 
 clang_tablegen("AttrNodeTraverse") {
-  args = [
-    "-gen-clang-attr-node-traverse",
-    "-I",
-    rebase_path("../..", root_out_dir),
-  ]
+  args = [ "-gen-clang-attr-node-traverse" ]
   td_file = "../Basic/Attr.td"
 }
 
 clang_tablegen("AttrVisitor") {
-  args = [
-    "-gen-clang-attr-ast-visitor",
-    "-I",
-    rebase_path("../..", root_out_dir),
-  ]
+  args = [ "-gen-clang-attr-ast-visitor" ]
   td_file = "../Basic/Attr.td"
 }
 
diff --git a/llvm/utils/gn/secondary/clang/utils/TableGen/clang_tablegen.gni b/llvm/utils/gn/secondary/clang/utils/TableGen/clang_tablegen.gni
index efc1e3c5d5427a..4dd28ff1e60ba6 100644
--- a/llvm/utils/gn/secondary/clang/utils/TableGen/clang_tablegen.gni
+++ b/llvm/utils/gn/secondary/clang/utils/TableGen/clang_tablegen.gni
@@ -29,12 +29,15 @@ template("clang_tablegen") {
   tablegen(target_name) {
     forward_variables_from(invoker,
                            [
-                             "args",
                              "output_name",
                              "td_file",
                              "visibility",
                            ])
 
+    args = [
+             "-I",
+             rebase_path("//clang/include", root_out_dir),
+           ] + invoker.args
     tblgen_target = "//clang/utils/TableGen:clang-tblgen"
   }
 }