diff --git a/llvm/utils/gn/secondary/clang-tools-extra/clang-tidy/misc/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clang-tidy/misc/BUILD.gn
index ff9a8b70ef0d1..d4ad10367a76e 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clang-tidy/misc/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clang-tidy/misc/BUILD.gn
@@ -13,7 +13,10 @@ compiled_action("Confusables.inc") {
 static_library("misc") {
   output_name = "clangTidyMiscModule"
   configs += [ "//llvm/utils/gn/build:clang_code" ]
-  include_dirs = [ target_gen_dir ]
+  include_dirs = [
+    target_gen_dir,
+    "//clang-tools-extra/include-cleaner/include",
+  ]
   deps = [
     ":Confusables.inc",
     "//clang-tools-extra/clang-tidy",
@@ -31,6 +34,7 @@ static_library("misc") {
     "ConfusableIdentifierCheck.cpp",
     "ConstCorrectnessCheck.cpp",
     "DefinitionsInHeadersCheck.cpp",
+    "IncludeCleanerCheck.cpp",
     "MiscTidyModule.cpp",
     "MisleadingBidirectional.cpp",
     "MisleadingIdentifier.cpp",
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-tidy/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-tidy/BUILD.gn
index 3fa7e7c379597..6d77713fafb6f 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-tidy/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clang-tidy/BUILD.gn
@@ -25,7 +25,10 @@ unittest("ClangTidyTests") {
     "//llvm/lib/Testing/Annotations",
     "//llvm/lib/Testing/Support",
   ]
-  include_dirs = [ "//clang-tools-extra/clang-tidy" ]
+  include_dirs = [
+    "//clang-tools-extra/clang-tidy",
+    "//clang-tools-extra/include-cleaner/include",
+  ]
   sources = [
     "AddConstTest.cpp",
     "ClangTidyDiagnosticConsumerTest.cpp",
@@ -33,6 +36,7 @@ unittest("ClangTidyTests") {
     "DeclRefExprUtilsTest.cpp",
     "GlobListTest.cpp",
     "GoogleModuleTest.cpp",
+    "IncludeCleanerTest.cpp",
     "IncludeInserterTest.cpp",
     "LLVMModuleTest.cpp",
     "ModernizeModuleTest.cpp",