diff --git a/libc/test/src/__support/CMakeLists.txt b/libc/test/src/__support/CMakeLists.txt
@@ -28,7 +28,7 @@ add_libc_unittest(
   high_precision_decimal_test.cpp
   DEPENDS
     libc.src.__support.high_precision_decimal
-    libc.src.__support.CPP.uint128
+    libc.src.__support.uint128
 )
 
 add_libc_unittest(
@@ -39,7 +39,7 @@ add_libc_unittest(
     str_to_float_test.cpp
   DEPENDS
     libc.src.__support.str_to_float
-    libc.src.__support.CPP.uint128
+    libc.src.__support.uint128
 )
 
 add_libc_unittest(
@@ -70,7 +70,7 @@ add_libc_unittest(
   SRCS
     uint128_test.cpp
   DEPENDS
-    libc.src.__support.CPP.uint
+    libc.src.__support.uint
 )
 
 add_libc_unittest(

diff --git a/libc/test/src/__support/CPP/CMakeLists.txt b/libc/test/src/__support/CPP/CMakeLists.txt
@@ -28,7 +28,7 @@ add_libc_unittest(
     limits_test.cpp
   DEPENDS
     libc.src.__support.CPP.limits
-    libc.src.__support.CPP.uint
+    libc.src.__support.uint
 )
 
 add_libc_unittest(

diff --git a/libc/test/src/__support/CPP/limits_test.cpp b/libc/test/src/__support/CPP/limits_test.cpp
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "src/__support/CPP/UInt.h"
 #include "src/__support/CPP/limits.h"
+#include "src/__support/UInt.h"
 #include "utils/UnitTest/Test.h"
 
 namespace __llvm_libc {

diff --git a/libc/test/src/__support/high_precision_decimal_test.cpp b/libc/test/src/__support/high_precision_decimal_test.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "src/__support/CPP/UInt128.h"
+#include "src/__support/UInt128.h"
 #include "src/__support/high_precision_decimal.h"
 
 #include "utils/UnitTest/Test.h"

diff --git a/libc/test/src/__support/str_to_float_test.cpp b/libc/test/src/__support/str_to_float_test.cpp
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "src/__support/CPP/UInt128.h"
 #include "src/__support/FPUtil/FPBits.h"
+#include "src/__support/UInt128.h"
 #include "src/__support/str_to_float.h"
 
 #include "utils/UnitTest/Test.h"

diff --git a/libc/test/src/__support/uint128_test.cpp b/libc/test/src/__support/uint128_test.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "src/__support/CPP/UInt.h"
+#include "src/__support/UInt.h"
 
 #include "utils/UnitTest/Test.h"
 

diff --git a/libc/test/src/stdlib/CMakeLists.txt b/libc/test/src/stdlib/CMakeLists.txt
@@ -77,7 +77,7 @@ add_libc_unittest(
   SRCS
     strtold_test.cpp
   DEPENDS
-    libc.src.__support.CPP.uint128
+    libc.src.__support.uint128
     libc.src.stdlib.strtold
 )
 

diff --git a/libc/test/src/stdlib/strtold_test.cpp b/libc/test/src/stdlib/strtold_test.cpp
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "src/__support/CPP/UInt128.h"
 #include "src/__support/FPUtil/FPBits.h"
+#include "src/__support/UInt128.h"
 #include "src/stdlib/strtold.h"
 
 #include "utils/UnitTest/Test.h"

diff --git a/libc/utils/UnitTest/CMakeLists.txt b/libc/utils/UnitTest/CMakeLists.txt
@@ -5,7 +5,7 @@ add_library(
   LibcTest.h
 )
 target_include_directories(LibcUnitTest PUBLIC ${LIBC_SOURCE_DIR})
-add_dependencies(LibcUnitTest libc.src.__support.CPP.type_traits libc.src.__support.CPP.uint128)
+add_dependencies(LibcUnitTest libc.src.__support.CPP.type_traits libc.src.__support.uint128)
 target_link_libraries(LibcUnitTest PUBLIC libc_test_utils)
 
 add_library(

diff --git a/libc/utils/UnitTest/LibcTest.cpp b/libc/utils/UnitTest/LibcTest.cpp
@@ -8,8 +8,8 @@
 
 #include "LibcTest.h"
 
-#include "src/__support/CPP/UInt128.h"
 #include "src/__support/CPP/string_view.h"
+#include "src/__support/UInt128.h"
 #include "utils/testutils/ExecuteFunction.h"
 #include <cassert>
 #include <iostream>

diff --git a/utils/bazel/llvm-project-overlay/libc/BUILD.bazel b/utils/bazel/llvm-project-overlay/libc/BUILD.bazel
@@ -62,7 +62,7 @@ cc_library(
 cc_library(
     name = "__support_cpp_limits",
     hdrs = ["src/__support/CPP/limits.h"],
-    deps = [":libc_root", "__support_cpp_uint"],
+    deps = [":libc_root"],
 )
 
 cc_library(
@@ -87,28 +87,10 @@ cc_library(
     deps = [":libc_root"],
 )
 
-cc_library(
-    name = "__support_cpp_uint",
-    hdrs = [
-        "src/__support/CPP/UInt.h",
-    ],
-    deps = [":libc_root","__support_cpp_array"],
-)
-
-cc_library(
-    name = "__support_cpp_uint128",
-    hdrs = [
-        "src/__support/CPP/UInt128.h",
-    ],
-    deps = [":libc_root",":__support_cpp_uint"],
-)
-
 cc_library(
     name = "__support_cpp_type_traits",
-    hdrs = [
-        "src/__support/CPP/type_traits.h",
-    ],
-    deps = [":libc_root","__support_cpp_uint"],
+    hdrs = ["src/__support/CPP/type_traits.h"],
+    deps = [":libc_root"],
 )
 
 cc_library(
@@ -135,6 +117,26 @@ cc_library(
     ],
 )
 
+cc_library(
+    name = "__support_uint",
+    hdrs = ["src/__support/UInt.h"],
+    deps = [
+        "__support_cpp_array",
+        "__support_cpp_limits",
+        "__support_cpp_type_traits",
+        ":libc_root",
+    ],
+)
+
+cc_library(
+    name = "__support_cpp_uint128",
+    hdrs = ["src/__support/UInt128.h"],
+    deps = [
+        ":__support_uint",
+        ":libc_root",
+    ],
+)
+
 cc_library(
     name = "__support_integer_operations",
     hdrs = ["src/__support/integer_operations.h"],
@@ -479,8 +481,8 @@ cc_library(
         ":__support_common",
         ":__support_fputil",
         ":__support_fputil_polyeval",
-        ":range_reduction",
         ":libc_root",
+        ":range_reduction",
     ],
 )