Index: llvm/trunk/utils/gn/secondary/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/BUILD.gn
@@ -7,6 +7,8 @@
     "//clang-tools-extra/clang-apply-replacements/tool:clang-apply-replacements",
     "//clang-tools-extra/clang-change-namespace/tool:clang-change-namespace",
     "//clang-tools-extra/clang-doc/tool:clang-doc",
+    "//clang-tools-extra/clang-include-fixer/find-all-symbols/tool:find-all-symbols",
+    "//clang-tools-extra/clang-include-fixer/tool:clang-include-fixer",
     "//clang-tools-extra/clang-move/tool:clang-move",
     "//clang-tools-extra/clang-query/tool:clang-query",
     "//clang-tools-extra/clang-reorder-fields/tool:clang-reorder-fields",
Index: llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-include-fixer/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-include-fixer/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-include-fixer/BUILD.gn
@@ -0,0 +1,26 @@
+static_library("clang-include-fixer") {
+  output_name = "clangIncludeFixer"
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang-tools-extra/clang-include-fixer/find-all-symbols",
+    "//clang/lib/AST",
+    "//clang/lib/Basic",
+    "//clang/lib/Format",
+    "//clang/lib/Frontend",
+    "//clang/lib/Lex",
+    "//clang/lib/Parse",
+    "//clang/lib/Sema",
+    "//clang/lib/Serialization",
+    "//clang/lib/Tooling",
+    "//clang/lib/Tooling/Core",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "FuzzySymbolIndex.cpp",
+    "InMemorySymbolIndex.cpp",
+    "IncludeFixer.cpp",
+    "IncludeFixerContext.cpp",
+    "SymbolIndexManager.cpp",
+    "YamlSymbolIndex.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-include-fixer/find-all-symbols/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-include-fixer/find-all-symbols/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-include-fixer/find-all-symbols/BUILD.gn
@@ -0,0 +1,23 @@
+static_library("find-all-symbols") {
+  output_name = "findAllSymbols"
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang/lib/AST",
+    "//clang/lib/ASTMatchers",
+    "//clang/lib/Basic",
+    "//clang/lib/Frontend",
+    "//clang/lib/Lex",
+    "//clang/lib/Tooling",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "FindAllMacros.cpp",
+    "FindAllSymbols.cpp",
+    "FindAllSymbolsAction.cpp",
+    "HeaderMapCollector.cpp",
+    "PathConfig.cpp",
+    "PragmaCommentHandler.cpp",
+    "STLPostfixHeaderMap.cpp",
+    "SymbolInfo.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-include-fixer/find-all-symbols/tool/BUILD.gn
@@ -0,0 +1,17 @@
+executable("find-all-symbols") {
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang-tools-extra/clang-include-fixer/find-all-symbols",
+    "//clang/lib/AST",
+    "//clang/lib/ASTMatchers",
+    "//clang/lib/Basic",
+    "//clang/lib/Frontend",
+    "//clang/lib/Lex",
+    "//clang/lib/Serialization",
+    "//clang/lib/Tooling",
+  ]
+  include_dirs = [ ".." ]
+  sources = [
+    "FindAllSymbolsMain.cpp",
+  ]
+}
Index: llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-include-fixer/tool/BUILD.gn
===================================================================
--- llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-include-fixer/tool/BUILD.gn
+++ llvm/trunk/utils/gn/secondary/clang-tools-extra/clang-include-fixer/tool/BUILD.gn
@@ -0,0 +1,18 @@
+executable("clang-include-fixer") {
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang-tools-extra/clang-include-fixer",
+    "//clang-tools-extra/clang-include-fixer/find-all-symbols",
+    "//clang/lib/Basic",
+    "//clang/lib/Format",
+    "//clang/lib/Frontend",
+    "//clang/lib/Rewrite",
+    "//clang/lib/Serialization",
+    "//clang/lib/Tooling",
+    "//clang/lib/Tooling/Core",
+  ]
+  include_dirs = [ ".." ]
+  sources = [
+    "ClangIncludeFixer.cpp",
+  ]
+}