diff --git a/llvm/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn b/llvm/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn
index 1ee54b4a6af9a5..535d87d9f12dd5 100644
--- a/llvm/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang-tools-extra/clangd/BUILD.gn
@@ -56,6 +56,7 @@ static_library("clangd") {
     "//clang/lib/Tooling",
     "//clang/lib/Tooling/Core",
     "//clang/lib/Tooling/Inclusions",
+    "//clang/lib/Tooling/Inclusions/Stdlib",
     "//clang/lib/Tooling/Refactoring",
     "//clang/lib/Tooling/Syntax",
     "//llvm/lib/Support",
diff --git a/llvm/utils/gn/secondary/clang/lib/Tooling/Inclusions/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/Tooling/Inclusions/BUILD.gn
index 208a8aec4ec6d6..419c615da2ee2f 100644
--- a/llvm/utils/gn/secondary/clang/lib/Tooling/Inclusions/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/Tooling/Inclusions/BUILD.gn
@@ -11,6 +11,5 @@ static_library("Inclusions") {
   sources = [
     "HeaderIncludes.cpp",
     "IncludeStyle.cpp",
-    "StandardLibrary.cpp",
   ]
 }
diff --git a/llvm/utils/gn/secondary/clang/lib/Tooling/Inclusions/Stdlib/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/Tooling/Inclusions/Stdlib/BUILD.gn
new file mode 100644
index 00000000000000..93d03c33d49b76
--- /dev/null
+++ b/llvm/utils/gn/secondary/clang/lib/Tooling/Inclusions/Stdlib/BUILD.gn
@@ -0,0 +1,6 @@
+static_library("Stdlib") {
+  output_name = "clangToolingInclusionsStdlib"
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [ "//clang/lib/AST" ]
+  sources = [ "StandardLibrary.cpp" ]
+}
diff --git a/llvm/utils/gn/secondary/clang/unittests/Tooling/BUILD.gn b/llvm/utils/gn/secondary/clang/unittests/Tooling/BUILD.gn
index 7cab8a0982b148..37e45e00d87ac2 100644
--- a/llvm/utils/gn/secondary/clang/unittests/Tooling/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/unittests/Tooling/BUILD.gn
@@ -15,6 +15,8 @@ unittest("ToolingTests") {
     "//clang/lib/Tooling",
     "//clang/lib/Tooling/Core",
     "//clang/lib/Tooling/DependencyScanning",
+    "//clang/lib/Tooling/Inclusions",
+    "//clang/lib/Tooling/Inclusions/Stdlib",
     "//clang/lib/Tooling/Refactoring",
     "//clang/lib/Tooling/Transformer",
     "//llvm/lib/Support",