diff --git a/libcxx/docs/ReleaseNotes.rst b/libcxx/docs/ReleaseNotes.rst
--- a/libcxx/docs/ReleaseNotes.rst
+++ b/libcxx/docs/ReleaseNotes.rst
@@ -95,10 +95,6 @@
 
 - ``<algorithm>`` no longer includes ``<chrono>`` in any C++ version (it was previously included in C++17 and earlier).
 
-- ``<limits>`` no longer includes ``<type_traits>`` in any C++ version (it was previously included in C++20 and earlier).
-
-- ``<new>`` no longer includes ``<exception>`` or ``<type_traits>`` in any C++ version (they were previously included in C++20 and earlier).
-
 - ``<string>`` no longer includes ``<vector>`` in any C++ version (it was previously included in C++20 and earlier).
 
 - ``<string>``, ``<string_view>``, and ``<mutex>`` no longer include ``<functional>``
diff --git a/libcxx/include/limits b/libcxx/include/limits
--- a/libcxx/include/limits
+++ b/libcxx/include/limits
@@ -823,4 +823,8 @@
 
 _LIBCPP_POP_MACROS
 
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <type_traits>
+#endif
+
 #endif // _LIBCPP_LIMITS
diff --git a/libcxx/include/new b/libcxx/include/new
--- a/libcxx/include/new
+++ b/libcxx/include/new
@@ -365,4 +365,9 @@
 
 _LIBCPP_END_NAMESPACE_STD
 
+#if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
+#  include <exception>
+#  include <type_traits>
+#endif
+
 #endif // _LIBCPP_NEW
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03.csv b/libcxx/test/libcxx/transitive_includes/cxx03.csv
--- a/libcxx/test/libcxx/transitive_includes/cxx03.csv
+++ b/libcxx/test/libcxx/transitive_includes/cxx03.csv
@@ -458,6 +458,7 @@
 latch ratio
 latch type_traits
 latch version
+limits type_traits
 limits version
 list algorithm
 list atomic
@@ -573,6 +574,8 @@
 mutex version
 new cstddef
 new cstdlib
+new exception
+new type_traits
 new version
 numbers concepts
 numbers type_traits
@@ -639,7 +642,6 @@
 queue compare
 queue concepts
 queue cstddef
-queue cstdint
 queue cstdlib
 queue deque
 queue functional
@@ -776,7 +778,6 @@
 stack compare
 stack concepts
 stack cstddef
-stack cstdint
 stack deque
 stack functional
 stack initializer_list
@@ -939,7 +940,6 @@
 valarray cmath
 valarray concepts
 valarray cstddef
-valarray cstdint
 valarray cstdlib
 valarray cstring
 valarray functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11.csv b/libcxx/test/libcxx/transitive_includes/cxx11.csv
--- a/libcxx/test/libcxx/transitive_includes/cxx11.csv
+++ b/libcxx/test/libcxx/transitive_includes/cxx11.csv
@@ -458,6 +458,7 @@
 latch ratio
 latch type_traits
 latch version
+limits type_traits
 limits version
 list algorithm
 list atomic
@@ -574,6 +575,8 @@
 mutex version
 new cstddef
 new cstdlib
+new exception
+new type_traits
 new version
 numbers concepts
 numbers type_traits
@@ -640,7 +643,6 @@
 queue compare
 queue concepts
 queue cstddef
-queue cstdint
 queue cstdlib
 queue deque
 queue functional
@@ -777,7 +779,6 @@
 stack compare
 stack concepts
 stack cstddef
-stack cstdint
 stack deque
 stack functional
 stack initializer_list
@@ -940,7 +941,6 @@
 valarray cmath
 valarray concepts
 valarray cstddef
-valarray cstdint
 valarray cstdlib
 valarray cstring
 valarray functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14.csv b/libcxx/test/libcxx/transitive_includes/cxx14.csv
--- a/libcxx/test/libcxx/transitive_includes/cxx14.csv
+++ b/libcxx/test/libcxx/transitive_includes/cxx14.csv
@@ -460,6 +460,7 @@
 latch ratio
 latch type_traits
 latch version
+limits type_traits
 limits version
 list algorithm
 list atomic
@@ -576,6 +577,8 @@
 mutex version
 new cstddef
 new cstdlib
+new exception
+new type_traits
 new version
 numbers concepts
 numbers type_traits
@@ -642,7 +645,6 @@
 queue compare
 queue concepts
 queue cstddef
-queue cstdint
 queue cstdlib
 queue deque
 queue functional
@@ -779,7 +781,6 @@
 stack compare
 stack concepts
 stack cstddef
-stack cstdint
 stack deque
 stack functional
 stack initializer_list
@@ -942,7 +943,6 @@
 valarray cmath
 valarray concepts
 valarray cstddef
-valarray cstdint
 valarray cstdlib
 valarray cstring
 valarray functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17.csv b/libcxx/test/libcxx/transitive_includes/cxx17.csv
--- a/libcxx/test/libcxx/transitive_includes/cxx17.csv
+++ b/libcxx/test/libcxx/transitive_includes/cxx17.csv
@@ -460,6 +460,7 @@
 latch ratio
 latch type_traits
 latch version
+limits type_traits
 limits version
 list algorithm
 list atomic
@@ -576,6 +577,8 @@
 mutex version
 new cstddef
 new cstdlib
+new exception
+new type_traits
 new version
 numbers concepts
 numbers type_traits
@@ -642,7 +645,6 @@
 queue compare
 queue concepts
 queue cstddef
-queue cstdint
 queue cstdlib
 queue deque
 queue functional
@@ -779,7 +781,6 @@
 stack compare
 stack concepts
 stack cstddef
-stack cstdint
 stack deque
 stack functional
 stack initializer_list
@@ -942,7 +943,6 @@
 valarray cmath
 valarray concepts
 valarray cstddef
-valarray cstdint
 valarray cstdlib
 valarray cstring
 valarray functional
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20.csv b/libcxx/test/libcxx/transitive_includes/cxx20.csv
--- a/libcxx/test/libcxx/transitive_includes/cxx20.csv
+++ b/libcxx/test/libcxx/transitive_includes/cxx20.csv
@@ -466,6 +466,7 @@
 latch ratio
 latch type_traits
 latch version
+limits type_traits
 limits version
 list algorithm
 list atomic
@@ -582,6 +583,8 @@
 mutex version
 new cstddef
 new cstdlib
+new exception
+new type_traits
 new version
 numbers concepts
 numbers type_traits
@@ -648,7 +651,6 @@
 queue compare
 queue concepts
 queue cstddef
-queue cstdint
 queue cstdlib
 queue deque
 queue functional
@@ -785,7 +787,6 @@
 stack compare
 stack concepts
 stack cstddef
-stack cstdint
 stack deque
 stack functional
 stack initializer_list
@@ -947,7 +948,6 @@
 valarray cmath
 valarray concepts
 valarray cstddef
-valarray cstdint
 valarray cstdlib
 valarray cstring
 valarray functional