diff --git a/libcxx/include/__algorithm/lexicographical_compare_three_way.h b/libcxx/include/__algorithm/lexicographical_compare_three_way.h
--- a/libcxx/include/__algorithm/lexicographical_compare_three_way.h
+++ b/libcxx/include/__algorithm/lexicographical_compare_three_way.h
@@ -9,28 +9,29 @@
 #ifndef _LIBCPP___ALGORITHM_LEXICOGRAPHICAL_COMPARE_THREE_WAY_H
 #define _LIBCPP___ALGORITHM_LEXICOGRAPHICAL_COMPARE_THREE_WAY_H
 
-#include <__algorithm/min.h>
-#include <__algorithm/three_way_comp_ref_type.h>
-#include <__compare/compare_three_way.h>
-#include <__compare/ordering.h>
-#include <__concepts/arithmetic.h>
 #include <__config>
-#include <__iterator/iterator_traits.h>
-#include <__type_traits/common_type.h>
-#include <__type_traits/is_copy_constructible.h>
-#include <__utility/move.h>
+#if _LIBCPP_STD_VER >= 20
 
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#  pragma GCC system_header
-#endif
+#  include <__algorithm/min.h>
+#  include <__algorithm/three_way_comp_ref_type.h>
+#  include <__compare/compare_three_way.h>
+#  include <__compare/ordering.h>
+#  include <__concepts/arithmetic.h>
+#  include <__config>
+#  include <__iterator/iterator_traits.h>
+#  include <__type_traits/common_type.h>
+#  include <__type_traits/is_copy_constructible.h>
+#  include <__utility/move.h>
+
+#  if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#    pragma GCC system_header
+#  endif
 
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-#if _LIBCPP_STD_VER >= 20
-
 // Fast path for random access iterators which computes the number of loop iterations up-front and
 // then skips the iterator comparisons inside the loop.
 template <class _InputIterator1, class _InputIterator2, class _Cmp>
@@ -116,10 +117,9 @@
       std::move(__first1), std::move(__last1), std::move(__first2), std::move(__last2), std::compare_three_way());
 }
 
-#endif // _LIBCPP_STD_VER >= 20
-
 _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___ALGORITHM_LEXICOGRAPHICAL_COMPARE_THREE_WAY_H
diff --git a/libcxx/include/__concepts/same_as.h b/libcxx/include/__concepts/same_as.h
--- a/libcxx/include/__concepts/same_as.h
+++ b/libcxx/include/__concepts/same_as.h
@@ -10,15 +10,15 @@
 #define _LIBCPP___CONCEPTS_SAME_AS_H
 
 #include <__config>
-#include <__type_traits/is_same.h>
+#if _LIBCPP_STD_VER >= 20
 
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#  pragma GCC system_header
-#endif
+#  include <__type_traits/is_same.h>
 
-_LIBCPP_BEGIN_NAMESPACE_STD
+#  if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#    pragma GCC system_header
+#  endif
 
-#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 
 // [concept.same]
 
@@ -28,8 +28,8 @@
 template <class _Tp, class _Up>
 concept same_as = __same_as_impl<_Tp, _Up> && __same_as_impl<_Up, _Tp>;
 
-#endif // _LIBCPP_STD_VER >= 20
-
 _LIBCPP_END_NAMESPACE_STD
 
+#endif // _LIBCPP_STD_VER >= 20
+
 #endif // _LIBCPP___CONCEPTS_SAME_AS_H
diff --git a/libcxx/include/__format/enable_insertable.h b/libcxx/include/__format/enable_insertable.h
--- a/libcxx/include/__format/enable_insertable.h
+++ b/libcxx/include/__format/enable_insertable.h
@@ -12,13 +12,13 @@
 
 #include <__config>
 
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#  pragma GCC system_header
-#endif
+#if _LIBCPP_STD_VER >= 20
 
-_LIBCPP_BEGIN_NAMESPACE_STD
+#  if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#    pragma GCC system_header
+#  endif
 
-#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 
 namespace __format {
 
@@ -28,8 +28,8 @@
 
 } // namespace __format
 
-#endif //_LIBCPP_STD_VER >= 20
-
 _LIBCPP_END_NAMESPACE_STD
 
+#endif //_LIBCPP_STD_VER >= 20
+
 #endif // _LIBCPP___FORMAT_ENABLE_INSERTABLE_H
diff --git a/libcxx/include/__format/formatter.h b/libcxx/include/__format/formatter.h
--- a/libcxx/include/__format/formatter.h
+++ b/libcxx/include/__format/formatter.h
@@ -10,17 +10,17 @@
 #ifndef _LIBCPP___FORMAT_FORMATTER_H
 #define _LIBCPP___FORMAT_FORMATTER_H
 
-#include <__availability>
 #include <__config>
-#include <__format/format_fwd.h>
+#if _LIBCPP_STD_VER >= 20
 
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#  pragma GCC system_header
-#endif
+#  include <__availability>
+#  include <__format/format_fwd.h>
 
-_LIBCPP_BEGIN_NAMESPACE_STD
+#  if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#    pragma GCC system_header
+#  endif
 
-#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 
 /// The default formatter template.
 ///
@@ -47,8 +47,8 @@
 }
 
 #  endif // _LIBCPP_STD_VER >= 23
-#endif   // _LIBCPP_STD_VER >= 20
 
 _LIBCPP_END_NAMESPACE_STD
 
+#endif // _LIBCPP_STD_VER >= 20
 #endif // _LIBCPP___FORMAT_FORMATTER_H
diff --git a/libcxx/include/__format/formatter_bool.h b/libcxx/include/__format/formatter_bool.h
--- a/libcxx/include/__format/formatter_bool.h
+++ b/libcxx/include/__format/formatter_bool.h
@@ -10,28 +10,28 @@
 #ifndef _LIBCPP___FORMAT_FORMATTER_BOOL_H
 #define _LIBCPP___FORMAT_FORMATTER_BOOL_H
 
-#include <__algorithm/copy.h>
-#include <__assert>
-#include <__availability>
 #include <__config>
-#include <__format/concepts.h>
-#include <__format/format_parse_context.h>
-#include <__format/formatter.h>
-#include <__format/formatter_integral.h>
-#include <__format/parser_std_format_spec.h>
-#include <__utility/unreachable.h>
+#if _LIBCPP_STD_VER >= 20
 
-#ifndef _LIBCPP_HAS_NO_LOCALIZATION
-#  include <locale>
-#endif
+#  include <__algorithm/copy.h>
+#  include <__assert>
+#  include <__availability>
+#  include <__format/concepts.h>
+#  include <__format/format_parse_context.h>
+#  include <__format/formatter.h>
+#  include <__format/formatter_integral.h>
+#  include <__format/parser_std_format_spec.h>
+#  include <__utility/unreachable.h>
 
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#  pragma GCC system_header
-#endif
+#  ifndef _LIBCPP_HAS_NO_LOCALIZATION
+#    include <locale>
+#  endif
 
-_LIBCPP_BEGIN_NAMESPACE_STD
+#  if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#    pragma GCC system_header
+#  endif
 
-#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 
 template <__fmt_char_type _CharT>
 struct _LIBCPP_TEMPLATE_VIS formatter<bool, _CharT> {
@@ -70,8 +70,8 @@
   __format_spec::__parser<_CharT> __parser_;
 };
 
-#endif //_LIBCPP_STD_VER >= 20
-
 _LIBCPP_END_NAMESPACE_STD
 
+#endif //_LIBCPP_STD_VER >= 20
+
 #endif // _LIBCPP___FORMAT_FORMATTER_BOOL_H
diff --git a/libcxx/include/__memory_resource/polymorphic_allocator.h b/libcxx/include/__memory_resource/polymorphic_allocator.h
--- a/libcxx/include/__memory_resource/polymorphic_allocator.h
+++ b/libcxx/include/__memory_resource/polymorphic_allocator.h
@@ -9,26 +9,26 @@
 #ifndef _LIBCPP___MEMORY_RESOURCE_POLYMORPHIC_ALLOCATOR_H
 #define _LIBCPP___MEMORY_RESOURCE_POLYMORPHIC_ALLOCATOR_H
 
-#include <__assert>
-#include <__availability>
 #include <__config>
-#include <__memory_resource/memory_resource.h>
-#include <__utility/exception_guard.h>
-#include <cstddef>
-#include <limits>
-#include <new>
-#include <stdexcept>
-#include <tuple>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#  pragma GCC system_header
-#endif
+#if _LIBCPP_STD_VER >= 17
+
+#  include <__assert>
+#  include <__availability>
+#  include <__memory_resource/memory_resource.h>
+#  include <__utility/exception_guard.h>
+#  include <cstddef>
+#  include <limits>
+#  include <new>
+#  include <stdexcept>
+#  include <tuple>
+
+#  if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#    pragma GCC system_header
+#  endif
 
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
 
-#if _LIBCPP_STD_VER >= 17
-
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 namespace pmr {
@@ -222,8 +222,8 @@
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP_STD_VER >= 17
-
 _LIBCPP_POP_MACROS
 
+#endif // _LIBCPP_STD_VER >= 17
+
 #endif // _LIBCPP___MEMORY_RESOURCE_POLYMORPHIC_ALLOCATOR_H
diff --git a/libcxx/include/__ranges/access.h b/libcxx/include/__ranges/access.h
--- a/libcxx/include/__ranges/access.h
+++ b/libcxx/include/__ranges/access.h
@@ -10,26 +10,26 @@
 #ifndef _LIBCPP___RANGES_ACCESS_H
 #define _LIBCPP___RANGES_ACCESS_H
 
-#include <__concepts/class_or_enum.h>
 #include <__config>
-#include <__iterator/concepts.h>
-#include <__iterator/readable_traits.h>
-#include <__ranges/enable_borrowed_range.h>
-#include <__type_traits/decay.h>
-#include <__type_traits/is_reference.h>
-#include <__type_traits/remove_cvref.h>
-#include <__type_traits/remove_reference.h>
-#include <__utility/auto_cast.h>
-#include <__utility/declval.h>
-#include <cstddef>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#  pragma GCC system_header
-#endif
+#if _LIBCPP_STD_VER >= 20
 
-_LIBCPP_BEGIN_NAMESPACE_STD
+#  include <__concepts/class_or_enum.h>
+#  include <__iterator/concepts.h>
+#  include <__iterator/readable_traits.h>
+#  include <__ranges/enable_borrowed_range.h>
+#  include <__type_traits/decay.h>
+#  include <__type_traits/is_reference.h>
+#  include <__type_traits/remove_cvref.h>
+#  include <__type_traits/remove_reference.h>
+#  include <__utility/auto_cast.h>
+#  include <__utility/declval.h>
+#  include <cstddef>
+
+#  if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#    pragma GCC system_header
+#  endif
 
-#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 
 namespace ranges {
   template <class _Tp>
@@ -223,8 +223,8 @@
 } // namespace __cpo
 } // namespace ranges
 
-#endif // _LIBCPP_STD_VER >= 20
-
 _LIBCPP_END_NAMESPACE_STD
 
+#endif // _LIBCPP_STD_VER >= 20
+
 #endif // _LIBCPP___RANGES_ACCESS_H
diff --git a/libcxx/include/__ranges/concepts.h b/libcxx/include/__ranges/concepts.h
--- a/libcxx/include/__ranges/concepts.h
+++ b/libcxx/include/__ranges/concepts.h
@@ -10,34 +10,34 @@
 #ifndef _LIBCPP___RANGES_CONCEPTS_H
 #define _LIBCPP___RANGES_CONCEPTS_H
 
-#include <__concepts/constructible.h>
-#include <__concepts/movable.h>
-#include <__concepts/same_as.h>
 #include <__config>
-#include <__iterator/concepts.h>
-#include <__iterator/incrementable_traits.h>
-#include <__iterator/iter_move.h>
-#include <__iterator/iterator_traits.h>
-#include <__iterator/readable_traits.h>
-#include <__ranges/access.h>
-#include <__ranges/data.h>
-#include <__ranges/enable_borrowed_range.h>
-#include <__ranges/enable_view.h>
-#include <__ranges/size.h>
-#include <__type_traits/add_pointer.h>
-#include <__type_traits/is_reference.h>
-#include <__type_traits/remove_cvref.h>
-#include <__type_traits/remove_reference.h>
-#include <__utility/declval.h>
-#include <initializer_list>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#  pragma GCC system_header
-#endif
+#if _LIBCPP_STD_VER >= 20
 
-_LIBCPP_BEGIN_NAMESPACE_STD
+#  include <__concepts/constructible.h>
+#  include <__concepts/movable.h>
+#  include <__concepts/same_as.h>
+#  include <__iterator/concepts.h>
+#  include <__iterator/incrementable_traits.h>
+#  include <__iterator/iter_move.h>
+#  include <__iterator/iterator_traits.h>
+#  include <__iterator/readable_traits.h>
+#  include <__ranges/access.h>
+#  include <__ranges/data.h>
+#  include <__ranges/enable_borrowed_range.h>
+#  include <__ranges/enable_view.h>
+#  include <__ranges/size.h>
+#  include <__type_traits/add_pointer.h>
+#  include <__type_traits/is_reference.h>
+#  include <__type_traits/remove_cvref.h>
+#  include <__type_traits/remove_reference.h>
+#  include <__utility/declval.h>
+#  include <initializer_list>
+
+#  if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#    pragma GCC system_header
+#  endif
 
-#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 
 namespace ranges {
 
@@ -143,8 +143,8 @@
 
 } // namespace ranges
 
-#endif // _LIBCPP_STD_VER >= 20
-
 _LIBCPP_END_NAMESPACE_STD
 
+#endif // _LIBCPP_STD_VER >= 20
+
 #endif // _LIBCPP___RANGES_CONCEPTS_H
diff --git a/libcxx/include/__ranges/container_compatible_range.h b/libcxx/include/__ranges/container_compatible_range.h
--- a/libcxx/include/__ranges/container_compatible_range.h
+++ b/libcxx/include/__ranges/container_compatible_range.h
@@ -10,24 +10,24 @@
 #ifndef _LIBCPP___RANGES_CONTAINER_COMPATIBLE_RANGE_H
 #define _LIBCPP___RANGES_CONTAINER_COMPATIBLE_RANGE_H
 
-#include <__concepts/convertible_to.h>
 #include <__config>
-#include <__ranges/concepts.h>
+#if _LIBCPP_STD_VER >= 23
 
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#  pragma GCC system_header
-#endif
+#  include <__concepts/convertible_to.h>
+#  include <__ranges/concepts.h>
 
-_LIBCPP_BEGIN_NAMESPACE_STD
+#  if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#    pragma GCC system_header
+#  endif
 
-#if _LIBCPP_STD_VER >= 23
+_LIBCPP_BEGIN_NAMESPACE_STD
 
 template <class _Range, class _Tp>
 concept _ContainerCompatibleRange =
     ranges::input_range<_Range> && convertible_to<ranges::range_reference_t<_Range>, _Tp>;
 
-#endif // _LIBCPP_STD_VER >= 23
-
 _LIBCPP_END_NAMESPACE_STD
 
+#endif // _LIBCPP_STD_VER >= 23
+
 #endif // _LIBCPP___RANGES_CONTAINER_COMPATIBLE_RANGE_H
diff --git a/libcxx/include/__ranges/from_range.h b/libcxx/include/__ranges/from_range.h
--- a/libcxx/include/__ranges/from_range.h
+++ b/libcxx/include/__ranges/from_range.h
@@ -11,23 +11,22 @@
 #define _LIBCPP___RANGES_FROM_RANGE_H
 
 #include <__config>
+#if _LIBCPP_STD_VER >= 23
 
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#  pragma GCC system_header
-#endif
+#  if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#    pragma GCC system_header
+#  endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-#if _LIBCPP_STD_VER >= 23
-
 struct from_range_t {
   explicit from_range_t() = default;
 };
 
 inline constexpr from_range_t from_range{};
 
-#endif // _LIBCPP_STD_VER >= 23
-
 _LIBCPP_END_NAMESPACE_STD
 
+#endif // _LIBCPP_STD_VER >= 23
+
 #endif // _LIBCPP___RANGES_FROM_RANGE_H
diff --git a/libcxx/include/__ranges/size.h b/libcxx/include/__ranges/size.h
--- a/libcxx/include/__ranges/size.h
+++ b/libcxx/include/__ranges/size.h
@@ -10,27 +10,27 @@
 #ifndef _LIBCPP___RANGES_SIZE_H
 #define _LIBCPP___RANGES_SIZE_H
 
-#include <__concepts/arithmetic.h>
-#include <__concepts/class_or_enum.h>
 #include <__config>
-#include <__iterator/concepts.h>
-#include <__iterator/iterator_traits.h>
-#include <__ranges/access.h>
-#include <__type_traits/decay.h>
-#include <__type_traits/make_signed.h>
-#include <__type_traits/make_unsigned.h>
-#include <__type_traits/remove_cvref.h>
-#include <__utility/auto_cast.h>
-#include <__utility/declval.h>
-#include <cstddef>
-
-#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
-#  pragma GCC system_header
-#endif
+#if _LIBCPP_STD_VER >= 20
 
-_LIBCPP_BEGIN_NAMESPACE_STD
+#  include <__concepts/arithmetic.h>
+#  include <__concepts/class_or_enum.h>
+#  include <__iterator/concepts.h>
+#  include <__iterator/iterator_traits.h>
+#  include <__ranges/access.h>
+#  include <__type_traits/decay.h>
+#  include <__type_traits/make_signed.h>
+#  include <__type_traits/make_unsigned.h>
+#  include <__type_traits/remove_cvref.h>
+#  include <__utility/auto_cast.h>
+#  include <__utility/declval.h>
+#  include <cstddef>
+
+#  if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
+#    pragma GCC system_header
+#  endif
 
-#if _LIBCPP_STD_VER >= 20
+_LIBCPP_BEGIN_NAMESPACE_STD
 
 namespace ranges {
   template<class>
@@ -141,8 +141,8 @@
 } // namespace __cpo
 } // namespace ranges
 
-#endif // _LIBCPP_STD_VER >= 20
-
 _LIBCPP_END_NAMESPACE_STD
 
+#endif // _LIBCPP_STD_VER >= 20
+
 #endif // _LIBCPP___RANGES_SIZE_H
diff --git a/libcxx/include/compare b/libcxx/include/compare
--- a/libcxx/include/compare
+++ b/libcxx/include/compare
@@ -141,6 +141,10 @@
 */
 
 #include <__assert> // all public C++ headers provide the assertion handler
+#include <__config>
+#include <version>
+#if _LIBCPP_STD_VER >= 20
+
 #include <__compare/common_comparison_category.h>
 #include <__compare/compare_partial_order_fallback.h>
 #include <__compare/compare_strong_order_fallback.h>
@@ -154,13 +158,13 @@
 #include <__compare/synth_three_way.h>
 #include <__compare/three_way_comparable.h>
 #include <__compare/weak_order.h>
-#include <__config>
-#include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
 
+#endif // _LIBCPP_STD_VER >= 20
+
 #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20
 #  include <type_traits>
 #endif
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
@@ -149,10 +149,6 @@
 codecvt type_traits
 codecvt typeinfo
 codecvt version
-compare cmath
-compare cstddef
-compare cstdint
-compare limits
 compare type_traits
 compare version
 complex cmath
@@ -212,7 +208,6 @@
 deque limits
 deque new
 deque stdexcept
-deque tuple
 deque type_traits
 deque typeinfo
 deque version
@@ -329,8 +324,6 @@
 forward_list iterator
 forward_list limits
 forward_list new
-forward_list stdexcept
-forward_list tuple
 forward_list type_traits
 forward_list typeinfo
 forward_list version
@@ -473,8 +466,6 @@
 list iterator
 list limits
 list new
-list stdexcept
-list tuple
 list type_traits
 list typeinfo
 list version
@@ -545,11 +536,7 @@
 memory version
 memory_resource cstddef
 memory_resource cstdint
-memory_resource limits
 memory_resource mutex
-memory_resource new
-memory_resource stdexcept
-memory_resource tuple
 memory_resource version
 mutex atomic
 mutex cerrno
@@ -756,7 +743,6 @@
 set new
 set optional
 set stdexcept
-set tuple
 set type_traits
 set version
 shared_mutex cerrno
@@ -775,7 +761,6 @@
 span concepts
 span cstddef
 span functional
-span initializer_list
 span iterator
 span limits
 span type_traits
@@ -802,8 +787,12 @@
 stop_token atomic
 stop_token cstddef
 stop_token cstdint
+stop_token cstring
+stop_token ctime
 stop_token limits
+stop_token ratio
 stop_token thread
+stop_token type_traits
 stop_token version
 streambuf cstdint
 streambuf ios
@@ -826,7 +815,6 @@
 string new
 string stdexcept
 string string_view
-string tuple
 string type_traits
 string typeinfo
 string utility
@@ -937,8 +925,6 @@
 unordered_set limits
 unordered_set new
 unordered_set optional
-unordered_set stdexcept
-unordered_set tuple
 unordered_set type_traits
 unordered_set version
 utility compare
@@ -976,9 +962,7 @@
 variant utility
 variant version
 vector algorithm
-vector array
 vector atomic
-vector cerrno
 vector climits
 vector compare
 vector concepts
@@ -990,12 +974,8 @@
 vector initializer_list
 vector iosfwd
 vector limits
-vector locale
 vector new
 vector stdexcept
-vector string
-vector string_view
-vector tuple
 vector type_traits
 vector typeinfo
 vector utility
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
@@ -149,10 +149,6 @@
 codecvt type_traits
 codecvt typeinfo
 codecvt version
-compare cmath
-compare cstddef
-compare cstdint
-compare limits
 compare type_traits
 compare version
 complex cmath
@@ -212,7 +208,6 @@
 deque limits
 deque new
 deque stdexcept
-deque tuple
 deque type_traits
 deque typeinfo
 deque version
@@ -329,8 +324,6 @@
 forward_list iterator
 forward_list limits
 forward_list new
-forward_list stdexcept
-forward_list tuple
 forward_list type_traits
 forward_list typeinfo
 forward_list version
@@ -473,8 +466,6 @@
 list iterator
 list limits
 list new
-list stdexcept
-list tuple
 list type_traits
 list typeinfo
 list version
@@ -545,11 +536,7 @@
 memory version
 memory_resource cstddef
 memory_resource cstdint
-memory_resource limits
 memory_resource mutex
-memory_resource new
-memory_resource stdexcept
-memory_resource tuple
 memory_resource version
 mutex atomic
 mutex cerrno
@@ -757,7 +744,6 @@
 set new
 set optional
 set stdexcept
-set tuple
 set type_traits
 set version
 shared_mutex cerrno
@@ -776,7 +762,6 @@
 span concepts
 span cstddef
 span functional
-span initializer_list
 span iterator
 span limits
 span type_traits
@@ -803,8 +788,12 @@
 stop_token atomic
 stop_token cstddef
 stop_token cstdint
+stop_token cstring
+stop_token ctime
 stop_token limits
+stop_token ratio
 stop_token thread
+stop_token type_traits
 stop_token version
 streambuf cstdint
 streambuf ios
@@ -827,7 +816,6 @@
 string new
 string stdexcept
 string string_view
-string tuple
 string type_traits
 string typeinfo
 string utility
@@ -938,8 +926,6 @@
 unordered_set limits
 unordered_set new
 unordered_set optional
-unordered_set stdexcept
-unordered_set tuple
 unordered_set type_traits
 unordered_set version
 utility compare
@@ -977,9 +963,7 @@
 variant utility
 variant version
 vector algorithm
-vector array
 vector atomic
-vector cerrno
 vector climits
 vector compare
 vector concepts
@@ -991,12 +975,8 @@
 vector initializer_list
 vector iosfwd
 vector limits
-vector locale
 vector new
 vector stdexcept
-vector string
-vector string_view
-vector tuple
 vector type_traits
 vector typeinfo
 vector utility
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
@@ -149,10 +149,6 @@
 codecvt type_traits
 codecvt typeinfo
 codecvt version
-compare cmath
-compare cstddef
-compare cstdint
-compare limits
 compare type_traits
 compare version
 complex cmath
@@ -212,7 +208,6 @@
 deque limits
 deque new
 deque stdexcept
-deque tuple
 deque type_traits
 deque typeinfo
 deque version
@@ -331,8 +326,6 @@
 forward_list iterator
 forward_list limits
 forward_list new
-forward_list stdexcept
-forward_list tuple
 forward_list type_traits
 forward_list typeinfo
 forward_list version
@@ -475,8 +468,6 @@
 list iterator
 list limits
 list new
-list stdexcept
-list tuple
 list type_traits
 list typeinfo
 list version
@@ -547,11 +538,7 @@
 memory version
 memory_resource cstddef
 memory_resource cstdint
-memory_resource limits
 memory_resource mutex
-memory_resource new
-memory_resource stdexcept
-memory_resource tuple
 memory_resource version
 mutex atomic
 mutex cerrno
@@ -759,7 +746,6 @@
 set new
 set optional
 set stdexcept
-set tuple
 set type_traits
 set version
 shared_mutex cerrno
@@ -778,7 +764,6 @@
 span concepts
 span cstddef
 span functional
-span initializer_list
 span iterator
 span limits
 span type_traits
@@ -805,8 +790,12 @@
 stop_token atomic
 stop_token cstddef
 stop_token cstdint
+stop_token cstring
+stop_token ctime
 stop_token limits
+stop_token ratio
 stop_token thread
+stop_token type_traits
 stop_token version
 streambuf cstdint
 streambuf ios
@@ -829,7 +818,6 @@
 string new
 string stdexcept
 string string_view
-string tuple
 string type_traits
 string typeinfo
 string utility
@@ -940,8 +928,6 @@
 unordered_set limits
 unordered_set new
 unordered_set optional
-unordered_set stdexcept
-unordered_set tuple
 unordered_set type_traits
 unordered_set version
 utility compare
@@ -979,9 +965,7 @@
 variant utility
 variant version
 vector algorithm
-vector array
 vector atomic
-vector cerrno
 vector climits
 vector compare
 vector concepts
@@ -993,12 +977,8 @@
 vector initializer_list
 vector iosfwd
 vector limits
-vector locale
 vector new
 vector stdexcept
-vector string
-vector string_view
-vector tuple
 vector type_traits
 vector typeinfo
 vector utility
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
@@ -149,10 +149,6 @@
 codecvt type_traits
 codecvt typeinfo
 codecvt version
-compare cmath
-compare cstddef
-compare cstdint
-compare limits
 compare type_traits
 compare version
 complex cmath
@@ -778,7 +774,6 @@
 span concepts
 span cstddef
 span functional
-span initializer_list
 span iterator
 span limits
 span type_traits
@@ -805,8 +800,12 @@
 stop_token atomic
 stop_token cstddef
 stop_token cstdint
+stop_token cstring
+stop_token ctime
 stop_token limits
+stop_token ratio
 stop_token thread
+stop_token type_traits
 stop_token version
 streambuf cstdint
 streambuf ios
@@ -979,9 +978,7 @@
 variant utility
 variant version
 vector algorithm
-vector array
 vector atomic
-vector cerrno
 vector climits
 vector compare
 vector concepts
@@ -993,11 +990,8 @@
 vector initializer_list
 vector iosfwd
 vector limits
-vector locale
 vector new
 vector stdexcept
-vector string
-vector string_view
 vector tuple
 vector type_traits
 vector typeinfo