diff --git a/libc/src/__support/CPP/CMakeLists.txt b/libc/src/__support/CPP/CMakeLists.txt
index 9e8e1fbcd7d80..e3cc6b3633839 100644
--- a/libc/src/__support/CPP/CMakeLists.txt
+++ b/libc/src/__support/CPP/CMakeLists.txt
@@ -95,12 +95,62 @@ add_header_library(
   type_traits
   HDRS
     type_traits.h
+    type_traits/add_lvalue_reference.h
+    type_traits/add_pointer.h
+    type_traits/add_rvalue_reference.h
+    type_traits/bool_constant.h
+    type_traits/conditional.h
+    type_traits/decay.h
+    type_traits/enable_if.h
+    type_traits/false_type.h
+    type_traits/integral_constant.h
+    type_traits/is_arithmetic.h
+    type_traits/is_array.h
+    type_traits/is_base_of.h
+    type_traits/is_class.h
+    type_traits/is_const.h
+    type_traits/is_convertible.h
+    type_traits/is_destructible.h
+    type_traits/is_enum.h
+    type_traits/is_floating_point.h
+    type_traits/is_function.h
+    type_traits/is_integral.h
+    type_traits/is_lvalue_reference.h
+    type_traits/is_member_pointer.h
+    type_traits/is_null_pointer.h
+    type_traits/is_pointer.h
+    type_traits/is_reference.h
+    type_traits/is_rvalue_reference.h
+    type_traits/is_same.h
+    type_traits/is_scalar.h
+    type_traits/is_signed.h
+    type_traits/is_trivially_constructible.h
+    type_traits/is_trivially_copyable.h
+    type_traits/is_trivially_destructible.h
+    type_traits/is_union.h
+    type_traits/is_unsigned.h
+    type_traits/is_void.h
+    type_traits/make_signed.h
+    type_traits/make_unsigned.h
+    type_traits/remove_all_extents.h
+    type_traits/remove_cv.h
+    type_traits/remove_cvref.h
+    type_traits/remove_extent.h
+    type_traits/remove_reference.h
+    type_traits/true_type.h
+    type_traits/type_identity.h
+    type_traits/void_t.h
 )
 
 add_header_library(
   utility
   HDRS
     utility.h
+    utility/declval.h
+    utility/forward.h
+    utility/in_place.h
+    utility/integer_sequence.h
+    utility/move.h
 )
 
 add_header_library(