diff --git a/libcxx/docs/ReleaseNotes.rst b/libcxx/docs/ReleaseNotes.rst
index 8c77f2e3cff6a4..362e0cedbb77c2 100644
--- a/libcxx/docs/ReleaseNotes.rst
+++ b/libcxx/docs/ReleaseNotes.rst
@@ -97,7 +97,10 @@ API Changes
 - Some libc++ headers no longer transitively include all of:
     - ``<algorithm>``
     - ``<chrono>``
+    - ``<exception>``
     - ``<functional>``
+    - ``<new>``
+    - ``<typeinfo>``
     - ``<utility>``
 
   If, after updating libc++, you see compiler errors related to missing declarations
diff --git a/libcxx/include/iterator b/libcxx/include/iterator
index 30c9a10139ffbc..f0bcff96ad01a6 100644
--- a/libcxx/include/iterator
+++ b/libcxx/include/iterator
@@ -723,13 +723,6 @@ template <class E> constexpr const E* data(initializer_list<E> il) noexcept;
 #include <type_traits>
 #include <version>
 
-// TODO: remove these headers
-#include <__memory/allocator_arg_t.h>
-#include <__memory/uses_allocator.h>
-#include <exception>
-#include <new>
-#include <typeinfo>
-
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
diff --git a/libcxx/include/optional b/libcxx/include/optional
index b1e014efd2c1c2..ec01af47684bf2 100644
--- a/libcxx/include/optional
+++ b/libcxx/include/optional
@@ -178,11 +178,6 @@ template<class T>
 #include <type_traits>
 #include <version>
 
-// TODO: remove these headers
-#include <__memory/allocator_arg_t.h>
-#include <__memory/uses_allocator.h>
-#include <typeinfo>
-
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
diff --git a/libcxx/include/string b/libcxx/include/string
index 7229a568a2a10d..9cfbb5f2ff5479 100644
--- a/libcxx/include/string
+++ b/libcxx/include/string
@@ -553,10 +553,6 @@ basic_string<char32_t> operator "" s( const char32_t *str, size_t len );
 #include <type_traits>
 #include <version>
 
-// TODO: remove these headers
-#include <new>
-#include <typeinfo>
-
 #ifndef _LIBCPP_HAS_NO_WIDE_CHARACTERS
 #  include <cwchar>
 #endif
diff --git a/libcxx/include/tuple b/libcxx/include/tuple
index cc08d8c2af3264..8c5b24e7ad6ce1 100644
--- a/libcxx/include/tuple
+++ b/libcxx/include/tuple
@@ -184,11 +184,6 @@ template <class... Types>
 #include <type_traits>
 #include <version>
 
-// TODO: remove these headers
-#include <exception>
-#include <new>
-#include <typeinfo>
-
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
diff --git a/libcxx/include/typeindex b/libcxx/include/typeindex
index 8da8f58c53b5a5..a92375ab751747 100644
--- a/libcxx/include/typeindex
+++ b/libcxx/include/typeindex
@@ -51,11 +51,6 @@ struct hash<type_index>
 #include <typeinfo>
 #include <version>
 
-// TODO: remove these headers
-#include <__memory/allocator_arg_t.h>
-#include <__memory/uses_allocator.h>
-#include <new>
-
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
diff --git a/libcxx/include/variant b/libcxx/include/variant
index 16fcede8756ffa..f15d600a6fd5dc 100644
--- a/libcxx/include/variant
+++ b/libcxx/include/variant
@@ -220,11 +220,6 @@ namespace std {
 #include <type_traits>
 #include <version>
 
-// TODO: remove these headers
-#include <__memory/allocator_arg_t.h>
-#include <__memory/uses_allocator.h>
-#include <typeinfo>
-
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
diff --git a/libcxx/include/vector b/libcxx/include/vector
index f3710ea680597e..73806b906f59ad 100644
--- a/libcxx/include/vector
+++ b/libcxx/include/vector
@@ -307,9 +307,6 @@ erase_if(vector<T, Allocator>& c, Predicate pred);    // C++20
 #include <type_traits>
 #include <version>
 
-// TODO: remove these headers
-#include <typeinfo>
-
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
diff --git a/libcxx/test/std/ranges/range.adaptors/range.join.view/types.h b/libcxx/test/std/ranges/range.adaptors/range.join.view/types.h
index 4dd3cf7cfda43a..6cc7d8cc2dc288 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.join.view/types.h
+++ b/libcxx/test/std/ranges/range.adaptors/range.join.view/types.h
@@ -10,6 +10,7 @@
 #define TEST_STD_RANGES_RANGE_ADAPTORS_RANGE_JOIN_TYPES_H
 
 #include <concepts>
+#include <cstdint>
 #include <tuple>
 
 #include "test_macros.h"
diff --git a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.in_range/in_range.pass.cpp b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.in_range/in_range.pass.cpp
index b8606fb12808de..1efa3d965a7f33 100644
--- a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.in_range/in_range.pass.cpp
+++ b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.in_range/in_range.pass.cpp
@@ -18,6 +18,7 @@
 #include <numeric>
 #include <tuple>
 #include <cassert>
+#include <cstdint>
 
 #include "test_macros.h"