Index: clang-tools-extra/clang-query/tool/CMakeLists.txt
===================================================================
--- clang-tools-extra/clang-query/tool/CMakeLists.txt
+++ clang-tools-extra/clang-query/tool/CMakeLists.txt
@@ -1,6 +1,8 @@
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 
-add_clang_executable(clang-query ClangQuery.cpp)
+add_clang_executable(clang-query
+  ClangQuery.cpp
+  )
 target_link_libraries(clang-query
   PRIVATE
   clangAST
Index: clang-tools-extra/clang-reorder-fields/tool/CMakeLists.txt
===================================================================
--- clang-tools-extra/clang-reorder-fields/tool/CMakeLists.txt
+++ clang-tools-extra/clang-reorder-fields/tool/CMakeLists.txt
@@ -1,4 +1,6 @@
-add_clang_tool(clang-reorder-fields ClangReorderFields.cpp)
+add_clang_tool(clang-reorder-fields
+  ClangReorderFields.cpp
+  )
 
 target_link_libraries(clang-reorder-fields
   PRIVATE
Index: llvm/utils/gn/secondary/BUILD.gn
===================================================================
--- llvm/utils/gn/secondary/BUILD.gn
+++ llvm/utils/gn/secondary/BUILD.gn
@@ -5,7 +5,11 @@
 group("default") {
   deps = [
     "//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-move/tool:clang-move",
+    "//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/test",
     "//lld/test",
Index: llvm/utils/gn/secondary/clang-tools-extra/clang-change-namespace/BUILD.gn
===================================================================
--- /dev/null
+++ llvm/utils/gn/secondary/clang-tools-extra/clang-change-namespace/BUILD.gn
@@ -0,0 +1,19 @@
+static_library("clang-change-namespace") {
+  output_name = "clangChangeNamespace"
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang/lib/AST",
+    "//clang/lib/ASTMatchers",
+    "//clang/lib/Basic",
+    "//clang/lib/Format",
+    "//clang/lib/Frontend",
+    "//clang/lib/Lex",
+    "//clang/lib/Serialization",
+    "//clang/lib/Tooling",
+    "//clang/lib/Tooling/Core",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "ChangeNamespace.cpp",
+  ]
+}
Index: llvm/utils/gn/secondary/clang-tools-extra/clang-change-namespace/tool/BUILD.gn
===================================================================
--- /dev/null
+++ llvm/utils/gn/secondary/clang-tools-extra/clang-change-namespace/tool/BUILD.gn
@@ -0,0 +1,19 @@
+executable("clang-change-namespace") {
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang-tools-extra/clang-change-namespace",
+    "//clang/lib/AST",
+    "//clang/lib/ASTMatchers",
+    "//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 = [
+    "ClangChangeNamespace.cpp",
+  ]
+}
Index: llvm/utils/gn/secondary/clang-tools-extra/clang-move/BUILD.gn
===================================================================
--- /dev/null
+++ llvm/utils/gn/secondary/clang-tools-extra/clang-move/BUILD.gn
@@ -0,0 +1,21 @@
+static_library("clang-move") {
+  output_name = "clangMove"
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang/lib/AST",
+    "//clang/lib/ASTMatchers",
+    "//clang/lib/Analysis",
+    "//clang/lib/Basic",
+    "//clang/lib/Format",
+    "//clang/lib/Frontend",
+    "//clang/lib/Lex",
+    "//clang/lib/Serialization",
+    "//clang/lib/Tooling",
+    "//clang/lib/Tooling/Core",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "ClangMove.cpp",
+    "HelperDeclRefGraph.cpp",
+  ]
+}
Index: llvm/utils/gn/secondary/clang-tools-extra/clang-move/tool/BUILD.gn
===================================================================
--- /dev/null
+++ llvm/utils/gn/secondary/clang-tools-extra/clang-move/tool/BUILD.gn
@@ -0,0 +1,19 @@
+executable("clang-move") {
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang-tools-extra/clang-move",
+    "//clang/lib/AST",
+    "//clang/lib/ASTMatchers",
+    "//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 = [
+    "ClangMoveMain.cpp",
+  ]
+}
Index: llvm/utils/gn/secondary/clang-tools-extra/clang-query/BUILD.gn
===================================================================
--- /dev/null
+++ llvm/utils/gn/secondary/clang-tools-extra/clang-query/BUILD.gn
@@ -0,0 +1,18 @@
+static_library("clang-query") {
+  output_name = "clangQuery"
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang/lib/AST",
+    "//clang/lib/ASTMatchers",
+    "//clang/lib/ASTMatchers/Dynamic",
+    "//clang/lib/Basic",
+    "//clang/lib/Frontend",
+    "//clang/lib/Serialization",
+    "//llvm/lib/LineEditor",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "Query.cpp",
+    "QueryParser.cpp",
+  ]
+}
Index: llvm/utils/gn/secondary/clang-tools-extra/clang-query/tool/BUILD.gn
===================================================================
--- /dev/null
+++ llvm/utils/gn/secondary/clang-tools-extra/clang-query/tool/BUILD.gn
@@ -0,0 +1,17 @@
+executable("clang-query") {
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang-tools-extra/clang-query",
+    "//clang/lib/AST",
+    "//clang/lib/ASTMatchers",
+    "//clang/lib/ASTMatchers/Dynamic",
+    "//clang/lib/Basic",
+    "//clang/lib/Frontend",
+    "//clang/lib/Serialization",
+    "//clang/lib/Tooling",
+  ]
+  include_dirs = [ ".." ]
+  sources = [
+    "ClangQuery.cpp",
+  ]
+}
Index: llvm/utils/gn/secondary/clang-tools-extra/clang-reorder-fields/BUILD.gn
===================================================================
--- /dev/null
+++ llvm/utils/gn/secondary/clang-tools-extra/clang-reorder-fields/BUILD.gn
@@ -0,0 +1,17 @@
+static_library("clang-reorder-fields") {
+  output_name = "clangReorderFields"
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang/lib/AST",
+    "//clang/lib/ASTMatchers",
+    "//clang/lib/Basic",
+    "//clang/lib/Index",
+    "//clang/lib/Lex",
+    "//clang/lib/Serialization",
+    "//clang/lib/Tooling/Core",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "ReorderFieldsAction.cpp",
+  ]
+}
Index: llvm/utils/gn/secondary/clang-tools-extra/clang-reorder-fields/tool/BUILD.gn
===================================================================
--- /dev/null
+++ llvm/utils/gn/secondary/clang-tools-extra/clang-reorder-fields/tool/BUILD.gn
@@ -0,0 +1,15 @@
+executable("clang-reorder-fields") {
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang-tools-extra/clang-reorder-fields",
+    "//clang/lib/Basic",
+    "//clang/lib/Frontend",
+    "//clang/lib/Rewrite",
+    "//clang/lib/Serialization",
+    "//clang/lib/Tooling",
+    "//clang/lib/Tooling/Core",
+  ]
+  sources = [
+    "ClangReorderFields.cpp",
+  ]
+}