diff --git a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
--- a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
@@ -35,24 +35,99 @@
 )
 
 cc_library(
-    name = "__support_standalone_cpp",
+    name = "__support_cpp_array",
     hdrs = [
         "src/__support/CPP/Array.h",
+    ],
+    deps = [":libc_root"],
+)
+
+cc_library(
+    name = "__support_cpp_array_ref",
+    hdrs = [
         "src/__support/CPP/ArrayRef.h",
+    ],
+    deps = [":libc_root"],
+)
+
+cc_library(
+    name = "__support_cpp_bit",
+    hdrs = [
         "src/__support/CPP/Bit.h",
+    ],
+    deps = [":libc_root"],
+)
+
+cc_library(
+    name = "__support_cpp_bitset",
+    hdrs = [
         "src/__support/CPP/Bitset.h",
+    ],
+    deps = [":libc_root"],
+)
+
+cc_library(
+    name = "__support_cpp_functional",
+    hdrs = [
         "src/__support/CPP/Functional.h",
+    ],
+    deps = [":libc_root"],
+)
+
+cc_library(
+    name = "__support_cpp_limits",
+    hdrs = [
         "src/__support/CPP/Limits.h",
+    ],
+    deps = [":libc_root"],
+)
+
+cc_library(
+    name = "__support_cpp_string_view",
+    hdrs = [
         "src/__support/CPP/StringView.h",
+    ],
+    deps = [":libc_root"],
+)
+
+cc_library(
+    name = "__support_cpp_type_traits",
+    hdrs = [
         "src/__support/CPP/TypeTraits.h",
     ],
     deps = [":libc_root"],
 )
 
+cc_library(
+    name = "__support_cpp_utility",
+    hdrs = [
+        "src/__support/CPP/Utility.h",
+    ],
+    deps = [":libc_root"],
+)
+
+cc_library(
+    name = "__support_cpp_vector",
+    hdrs = [
+        "src/__support/CPP/Vector.h",
+    ],
+    deps = [":libc_root"],
+)
+
+cc_library(
+    name = "__support_cpp_atomic",
+    hdrs = [
+        "src/__support/CPP/Atomic.h",
+    ],
+    deps = [":libc_root"],
+)
+
+
+
 cc_library(
     name = "__support_integer_operations",
     hdrs = ["src/__support/integer_operations.h"],
-    deps = [":__support_standalone_cpp"],
+    deps = [":__support_cpp_type_traits"],
 )
 
 cc_library(
@@ -65,7 +140,7 @@
     hdrs = ["src/__support/str_to_integer.h"],
     deps = [
         ":__support_ctype_utils",
-        ":__support_standalone_cpp",
+        ":__support_cpp_limits",
     ],
 )
 
@@ -99,7 +174,8 @@
     hdrs = fputil_hdrs,
     deps = [
         ":__support_common",
-        ":__support_standalone_cpp",
+        ":__support_cpp_type_traits",
+        ":__support_cpp_bit",
         ":libc_root",
     ],
 )
@@ -126,7 +202,6 @@
     deps = [
         ":__support_common",
         ":__support_fputil",
-        ":__support_standalone_cpp",
         ":libc_root",
     ],
 )
@@ -281,7 +356,6 @@
     hdrs = ["src/math/generic/math_utils.h"],
     deps = [
         ":__support_common",
-        ":__support_standalone_cpp",
         ":libc_root",
     ],
 )
@@ -645,7 +719,7 @@
     hdrs = ["src/string/string_utils.h"],
     deps = [
         ":__support_common",
-        ":__support_standalone_cpp",
+        ":__support_cpp_bitset",
         ":libc_root",
     ],
 )
@@ -666,7 +740,7 @@
     ],
     deps = [
         ":__support_common",
-        ":__support_standalone_cpp",
+        ":__support_cpp_bit",
         ":libc_root",
     ],
 )
@@ -900,7 +974,7 @@
     hdrs = ["src/string/strspn.h"],
     deps = [
         ":__support_common",
-        ":__support_standalone_cpp",
+        ":__support_cpp_bitset",
         ":string_utils",
     ],
 )