diff --git a/llvm/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn
--- a/llvm/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn
@@ -37,7 +37,10 @@
     "//llvm/utils/gn/build/libs/atomic",
     "//llvm/utils/gn/build/libs/pthread",
   ]
-  include_dirs = [ "." ]
+  include_dirs = [
+    ".",
+    get_label_info("//clang-tools-extra/clangd/tool:features", "target_gen_dir"),
+  ]
   sources = [
     "AST.cpp",
     "Cancellation.cpp",
diff --git a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clangd/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clangd/BUILD.gn
--- a/llvm/utils/gn/secondary/clang-tools-extra/unittests/clangd/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/unittests/clangd/BUILD.gn
@@ -20,7 +20,10 @@
     "//llvm/lib/Support",
     "//llvm/lib/Testing/Support",
   ]
-  include_dirs = [ "//clang-tools-extra/clangd" ]
+  include_dirs = [
+    "//clang-tools-extra/clangd",
+    get_label_info("//clang-tools-extra/clangd/tool:features", "target_gen_dir"),
+  ]
   sources = [
     "Annotations.cpp",
     "BackgroundIndexTests.cpp",