Index: llvm/utils/gn/secondary/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/BUILD.gn
+++ llvm/utils/gn/secondary/BUILD.gn
@@ -11,6 +11,8 @@
     "//clang-tools-extra/clang-query/tool:clang-query",
     "//clang-tools-extra/clang-reorder-fields/tool:clang-reorder-fields",
     "//clang-tools-extra/clang-tidy/tool:clang-tidy",
+    "//clang-tools-extra/modularize",
+    "//clang-tools-extra/pp-trace",
     "//clang/test",
     "//lld/test",
     "//llvm/test",
Index: llvm/utils/gn/secondary/clang-tools-extra/modularize/BUILD.gn
===================================================================
--- /dev/null
+++ llvm/utils/gn/secondary/clang-tools-extra/modularize/BUILD.gn
@@ -0,0 +1,21 @@
+executable("modularize") {
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang/lib/AST",
+    "//clang/lib/Basic",
+    "//clang/lib/Driver",
+    "//clang/lib/Frontend",
+    "//clang/lib/Lex",
+    "//clang/lib/Serialization",
+    "//clang/lib/Tooling",
+    "//llvm/lib/Option",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "Modularize.cpp",
+    "ModuleAssistant.cpp",
+    "ModularizeUtilities.cpp",
+    "CoverageChecker.cpp",
+    "PreprocessorTracker.cpp",
+  ]
+}
Index: llvm/utils/gn/secondary/clang-tools-extra/pp-trace/BUILD.gn
===================================================================
--- /dev/null
+++ llvm/utils/gn/secondary/clang-tools-extra/pp-trace/BUILD.gn
@@ -0,0 +1,16 @@
+executable("pp-trace") {
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang/lib/AST",
+    "//clang/lib/Basic",
+    "//clang/lib/Frontend",
+    "//clang/lib/Lex",
+    "//clang/lib/Serialization",
+    "//clang/lib/Tooling",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "PPTrace.cpp",
+    "PPCallbacksTracker.cpp",
+  ]
+}