[libcxx-commits] [libcxx] ab88d9a - Revert "[libc++] Add test_iterators.h to the modulemap (#181351)"
Aiden Grossman via libcxx-commits
libcxx-commits at lists.llvm.org
Sun Feb 15 18:29:06 PST 2026
Author: Aiden Grossman
Date: 2026-02-16T02:28:39Z
New Revision: ab88d9af5371ef62a636fc780c88cf6d3487c584
URL: https://github.com/llvm/llvm-project/commit/ab88d9af5371ef62a636fc780c88cf6d3487c584
DIFF: https://github.com/llvm/llvm-project/commit/ab88d9af5371ef62a636fc780c88cf6d3487c584.diff
LOG: Revert "[libc++] Add test_iterators.h to the modulemap (#181351)"
This reverts commit 04ef765b65040e1df4cafaf3dacc26fa5d48e519.
This was causing buildbot failures for premerge:
1. https://lab.llvm.org/staging/#/builders/192/builds/20135
Added:
Modified:
libcxx/include/module.modulemap.in
libcxx/test/benchmarks/containers/sequence/sequence_container_benchmarks.h
libcxx/test/libcxx/algorithms/specialized.algorithms/special.mem.concepts/nothrow_forward_iterator.compile.pass.cpp
libcxx/test/libcxx/algorithms/specialized.algorithms/special.mem.concepts/nothrow_input_iterator.compile.pass.cpp
libcxx/test/libcxx/input.output/filesystems/class.path/path.req/is_pathable.pass.cpp
libcxx/test/libcxx/iterators/bounded_iter/arithmetic.pass.cpp
libcxx/test/libcxx/iterators/bounded_iter/comparison.pass.cpp
libcxx/test/libcxx/iterators/capacity_aware_iter/arithmetic.pass.cpp
libcxx/test/libcxx/iterators/capacity_aware_iter/comparison.pass.cpp
libcxx/test/libcxx/iterators/capacity_aware_iter/dereference.pass.cpp
libcxx/test/libcxx/iterators/iterator.requirements/iterator.concepts/cpp20_iter_traits.compile.pass.cpp
libcxx/test/libcxx/iterators/iterator_with_data.pass.cpp
libcxx/test/libcxx/iterators/product_iterator.pass.cpp
libcxx/test/libcxx/iterators/unwrap_iter.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/ranges.copy.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/ranges.copy_backward.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/ranges.copy_n.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/ranges.fill.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/ranges.fill_n.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.generate/ranges_generate.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.generate/ranges_generate_n.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.move/pstl.move.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_point.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/ranges_partition.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/ranges_partition_copy.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/ranges_partition_point.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/ranges_stable_partition.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/ranges_sample.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.random.shuffle/ranges_shuffle.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/ranges_remove_copy.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/ranges_remove_copy_if.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/ranges_replace_copy.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/ranges_replace_copy_if.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.reverse/ranges.reverse.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.shift/ranges.shift_left.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.shift/shift_left.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.shift/shift_right.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/pstl.transform.binary.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/pstl.transform.unary.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/ranges_unique.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/ranges_unique_copy.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp
libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find_pred.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.all_of/all_of.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.all_of/pstl.all_of.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.any_of/any_of.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.any_of/pstl.any_of.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.contains/ranges.contains.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.count/pstl.count.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.count/pstl.count_if.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.ends_with/ranges.ends_with.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/pstl.equal.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/ranges.equal.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.find.end/find_end.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.find.end/find_end_pred.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.find.end/ranges.find_end.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/ranges.find_first_of.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.find.last/ranges.find_last.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.find/pstl.find.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.find/pstl.find_if.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.find/pstl.find_if_not.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.find/ranges.find.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.fold/requirements.compile.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/for_each.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/pstl.for_each.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/pstl.for_each_n.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/ranges.for_each.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/ranges.for_each_n.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.is_permutation/ranges.is_permutation.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.none_of/none_of.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.none_of/pstl.none_of.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.search/ranges.search.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.search/ranges.search_n.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_n_pred.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp
libcxx/test/std/algorithms/alg.nonmodifying/alg.starts_with/ranges.starts_with.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.binary.search/equal.range/ranges_equal_range.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_comp.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until_comp.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/ranges_is_heap.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/ranges_is_heap_until.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/make.heap/ranges_make_heap.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/pop.heap/ranges_pop_heap.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/push.heap/ranges_push_heap.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/sort.heap/ranges_sort_heap.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.merge/ranges_inplace_merge.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.merge/ranges_merge.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.min.max/ranges.max.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.min.max/ranges.min.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.min.max/requires_forward_iterator.verify.cpp
libcxx/test/std/algorithms/alg.sorting/alg.nth.element/ranges_nth_element.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.set.operations/includes/ranges_includes.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.difference/ranges_set_difference.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/ranges_set_intersection.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_complexity.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.difference/ranges_set_symmetric_difference.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.union/ranges_set_union.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/pstl.is_sorted.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/pstl.is_sorted_comp.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort.copy/ranges_partial_sort_copy.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort/ranges_partial_sort.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.sort/sort/pstl.sort.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.sort/sort/ranges.sort.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.sort/stable.sort/pstl.stable_sort.pass.cpp
libcxx/test/std/algorithms/alg.sorting/alg.sort/stable.sort/ranges.stable.sort.pass.cpp
libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp
libcxx/test/std/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
libcxx/test/std/containers/associative/set/set.cons/iter_iter_comp.pass.cpp
libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp
libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp
libcxx/test/std/iterators/iterator.primitives/iterator.operations/distance.pass.cpp
libcxx/test/std/iterators/iterator.primitives/iterator.traits/cxx20_iterator_traits.compile.pass.cpp
libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.distance/iterator_sentinel.pass.cpp
libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.distance/lwg3664.pass.cpp
libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.prev/iterator.pass.cpp
libcxx/test/std/iterators/iterator.requirements/indirectcallable/projected/projected.compile.pass.cpp
libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.bidir/bidirectional_iterator.compile.pass.cpp
libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.forward/forward_iterator.compile.pass.cpp
libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.input/input_iterator.compile.pass.cpp
libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.iterator/input_or_output_iterator.compile.pass.cpp
libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.random.access/random_access_iterator.compile.pass.cpp
libcxx/test/std/iterators/iterator.requirements/iterator.cust/iterator.cust.swap/iter_swap.pass.cpp
libcxx/test/std/iterators/predef.iterators/counted.iterator/arrow.pass.cpp
libcxx/test/std/iterators/predef.iterators/counted.iterator/assign.pass.cpp
libcxx/test/std/iterators/predef.iterators/counted.iterator/base.pass.cpp
libcxx/test/std/iterators/predef.iterators/counted.iterator/compare.pass.cpp
libcxx/test/std/iterators/predef.iterators/counted.iterator/count.pass.cpp
libcxx/test/std/iterators/predef.iterators/counted.iterator/ctor.conv.pass.cpp
libcxx/test/std/iterators/predef.iterators/counted.iterator/ctor.default.pass.cpp
libcxx/test/std/iterators/predef.iterators/counted.iterator/ctor.iter.pass.cpp
libcxx/test/std/iterators/predef.iterators/counted.iterator/decrement.pass.cpp
libcxx/test/std/iterators/predef.iterators/counted.iterator/deref.pass.cpp
libcxx/test/std/iterators/predef.iterators/counted.iterator/increment.pass.cpp
libcxx/test/std/iterators/predef.iterators/counted.iterator/iter_move.pass.cpp
libcxx/test/std/iterators/predef.iterators/counted.iterator/iter_swap.pass.cpp
libcxx/test/std/iterators/predef.iterators/counted.iterator/iterator_traits.compile.pass.cpp
libcxx/test/std/iterators/predef.iterators/counted.iterator/member_types.compile.pass.cpp
libcxx/test/std/iterators/predef.iterators/counted.iterator/minus.default_sentinel.pass.cpp
libcxx/test/std/iterators/predef.iterators/counted.iterator/minus.eq.pass.cpp
libcxx/test/std/iterators/predef.iterators/counted.iterator/minus.iter.pass.cpp
libcxx/test/std/iterators/predef.iterators/counted.iterator/minus.size.pass.cpp
libcxx/test/std/iterators/predef.iterators/counted.iterator/plus.pass.cpp
libcxx/test/std/iterators/predef.iterators/counted.iterator/subscript.pass.cpp
libcxx/test/std/iterators/predef.iterators/counted.iterator/three_way_compare.pass.cpp
libcxx/test/std/iterators/predef.iterators/iterators.common/ctor.default.pass.cpp
libcxx/test/std/iterators/predef.iterators/iterators.common/ctor.iter.pass.cpp
libcxx/test/std/iterators/predef.iterators/iterators.common/ctor.sentinel.pass.cpp
libcxx/test/std/iterators/predef.iterators/iterators.common/types.h
libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/iter_move.pass.cpp
libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/iter_swap.pass.cpp
libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp
libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.conv/base.pass.cpp
libcxx/test/std/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp
libcxx/test/std/iterators/predef.iterators/move.iterators/sized_sentinel.compile.pass.cpp
libcxx/test/std/iterators/predef.iterators/reverse.iterators/reverse.iter.nonmember/iter_move.pass.cpp
libcxx/test/std/iterators/predef.iterators/reverse.iterators/reverse.iter.nonmember/iter_swap.pass.cpp
libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp
libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/test_neg_one.pass.cpp
libcxx/test/std/numerics/numeric.ops/numeric.iota/ranges.iota.pass.cpp
libcxx/test/std/numerics/numeric.ops/reduce/pstl.reduce.pass.cpp
libcxx/test/std/numerics/numeric.ops/reduce/reduce.pass.cpp
libcxx/test/std/numerics/numeric.ops/reduce/reduce_init.pass.cpp
libcxx/test/std/numerics/numeric.ops/reduce/reduce_init_op.pass.cpp
libcxx/test/std/numerics/numeric.ops/transform.reduce/pstl.transform_reduce.binary.pass.cpp
libcxx/test/std/numerics/numeric.ops/transform.reduce/pstl.transform_reduce.unary.pass.cpp
libcxx/test/std/ranges/range.access/size.pass.cpp
libcxx/test/std/ranges/range.access/ssize.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.adaptor.object/range_adaptor_closure.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/iterator/ctor.other.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/iterator/member_types.compile.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/sentinel/ctor.other.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/sentinel/eq.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/sentinel/minus.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/size.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.adjacent/adaptor.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.adjacent/ctor.views.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/arithmetic.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/compare.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/ctor.default.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/ctor.other.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/member_types.compile.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/singular.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.adjacent/sentinel/ctor.other.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.adjacent/sentinel/eq.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.adjacent/sentinel/minus.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.adjacent/size.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.all/all_t.compile.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.all/range.owning.view/begin_end.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.all/range.owning.view/data.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.all/range.owning.view/empty.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.all/range.owning.view/size.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.as.rvalue/begin.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.as.rvalue/end.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.chunk.by/begin.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.chunk.by/end.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/compare.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/types.compile.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.drop/base.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.drop/begin.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.drop/ctor.default.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.drop/ctor.view.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.drop/dangling.cache.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.drop/end.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.drop/size.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.elements/iterator/arithmetic.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.elements/iterator/compare.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.elements/iterator/ctor.default.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.elements/sentinel/equality.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.elements/sentinel/minus.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.elements/types.h
libcxx/test/std/ranges/range.adaptors/range.filter/begin.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.filter/end.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.join.with/range.join.with.overview/adaptor.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.join.with/range.join.with.view/begin.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.join.with/range.join.with.view/end.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.join/begin.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.join/end.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.join/range.join.iterator/ctor.other.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.join/range.join.iterator/eq.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.join/range.join.sentinel/ctor.other.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.join/range.join.sentinel/eq.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.inner/base.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.inner/deref.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.inner/equal.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.outer/equal.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.split/types.h
libcxx/test/std/ranges/range.adaptors/range.take.while/sentinel/equality.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.take/range.take.sentinel/base.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.take/range.take.sentinel/ctor.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.transform/base.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.transform/begin.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.transform/end.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.transform/iterator/arithmetic.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.transform/iterator/base.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.transform/iterator/compare.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.transform/iterator/deref.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.transform/iterator/plus_minus.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.transform/iterator/sentinel.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.transform/iterator/subscript.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.transform/size.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.zip.transform/begin.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.zip.transform/ctor.default.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.zip.transform/ctor.views.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.zip.transform/end.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.zip.transform/iterator/arithmetic.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.zip.transform/iterator/compare.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.zip.transform/iterator/ctor.default.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.zip.transform/iterator/ctor.other.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.zip.transform/sentinel/ctor.other.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.zip.transform/sentinel/eq.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.zip.transform/sentinel/minus.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.zip.transform/size.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.zip/ctor.views.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.zip/end.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.zip/iterator/arithmetic.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.zip/iterator/compare.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.zip/iterator/ctor.default.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.zip/iterator/ctor.other.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.zip/iterator/deref.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.zip/iterator/member_types.compile.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.zip/iterator/singular.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.zip/sentinel/ctor.other.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.zip/sentinel/eq.pass.cpp
libcxx/test/std/ranges/range.adaptors/range.zip/sentinel/minus.pass.cpp
libcxx/test/std/ranges/range.adaptors/range_adaptor_types.h
libcxx/test/std/ranges/range.factories/range.iota.view/iterator/compare.pass.cpp
libcxx/test/std/ranges/range.utility/range.elementsof/ctad.pass.cpp
libcxx/test/std/ranges/range.utility/range.elementsof/elements_of.pass.cpp
libcxx/test/std/ranges/range.utility/view.interface/view.interface.pass.cpp
libcxx/test/std/strings/basic.string/string.cons/from_range_deduction.pass.cpp
libcxx/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
libcxx/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
libcxx/test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
libcxx/test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
libcxx/test/std/strings/string.view/string.view.cons/from_iterator_sentinel.pass.cpp
libcxx/test/std/utilities/function.objects/func.search/func.search.bm/hash.pass.cpp
libcxx/test/std/utilities/function.objects/func.search/func.search.bm/hash.pred.pass.cpp
libcxx/test/std/utilities/function.objects/func.search/func.search.bm/pred.pass.cpp
libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/hash.pass.cpp
libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/hash.pred.pass.cpp
libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/pred.pass.cpp
libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/ranges_uninitialized_default_construct_n.pass.cpp
libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct_n.pass.cpp
libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/ranges_uninitialized_value_construct_n.pass.cpp
libcxx/test/support/module.modulemap
libcxx/test/support/test.support/test_proxy.pass.cpp
libcxx/test/support/test_range.h
Removed:
################################################################################
diff --git a/libcxx/include/module.modulemap.in b/libcxx/include/module.modulemap.in
index 9012ed18cbd79..cf5bfc628206d 100644
--- a/libcxx/include/module.modulemap.in
+++ b/libcxx/include/module.modulemap.in
@@ -469,7 +469,6 @@ module std [system] {
module mismatch {
header "__algorithm/mismatch.h"
export std.utility.pair // return type
- export std.iterator.aliasing_iterator
}
module move_backward { header "__algorithm/move_backward.h" }
module move { header "__algorithm/move.h" }
diff --git a/libcxx/test/benchmarks/containers/sequence/sequence_container_benchmarks.h b/libcxx/test/benchmarks/containers/sequence/sequence_container_benchmarks.h
index 00ec1ded7dc44..6e83e6b0c94e2 100644
--- a/libcxx/test/benchmarks/containers/sequence/sequence_container_benchmarks.h
+++ b/libcxx/test/benchmarks/containers/sequence/sequence_container_benchmarks.h
@@ -21,7 +21,6 @@
#include "benchmark/benchmark.h"
#include "test_iterators.h"
-#include "test_macros.h"
#include "../../GenerateInput.h"
namespace support {
diff --git a/libcxx/test/libcxx/algorithms/specialized.algorithms/special.mem.concepts/nothrow_forward_iterator.compile.pass.cpp b/libcxx/test/libcxx/algorithms/specialized.algorithms/special.mem.concepts/nothrow_forward_iterator.compile.pass.cpp
index 8326e4d3bdd86..9c488c255465f 100644
--- a/libcxx/test/libcxx/algorithms/specialized.algorithms/special.mem.concepts/nothrow_forward_iterator.compile.pass.cpp
+++ b/libcxx/test/libcxx/algorithms/specialized.algorithms/special.mem.concepts/nothrow_forward_iterator.compile.pass.cpp
@@ -11,7 +11,6 @@
// template<class I>
// concept __nothrow_forward_iterator;
-#include <iterator>
#include <memory>
#include "test_iterators.h"
diff --git a/libcxx/test/libcxx/algorithms/specialized.algorithms/special.mem.concepts/nothrow_input_iterator.compile.pass.cpp b/libcxx/test/libcxx/algorithms/specialized.algorithms/special.mem.concepts/nothrow_input_iterator.compile.pass.cpp
index 6deb841616b97..2da3f4297af70 100644
--- a/libcxx/test/libcxx/algorithms/specialized.algorithms/special.mem.concepts/nothrow_input_iterator.compile.pass.cpp
+++ b/libcxx/test/libcxx/algorithms/specialized.algorithms/special.mem.concepts/nothrow_input_iterator.compile.pass.cpp
@@ -11,7 +11,6 @@
// template<class I>
// concept __nothrow_input_iterator;
-#include <iterator>
#include <memory>
#include "test_iterators.h"
diff --git a/libcxx/test/libcxx/input.output/filesystems/class.path/path.req/is_pathable.pass.cpp b/libcxx/test/libcxx/input.output/filesystems/class.path/path.req/is_pathable.pass.cpp
index 950f895e32343..e095d7598f189 100644
--- a/libcxx/test/libcxx/input.output/filesystems/class.path/path.req/is_pathable.pass.cpp
+++ b/libcxx/test/libcxx/input.output/filesystems/class.path/path.req/is_pathable.pass.cpp
@@ -22,7 +22,6 @@
#include <filesystem>
#include <type_traits>
#include <cassert>
-#include <utility>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/libcxx/iterators/bounded_iter/arithmetic.pass.cpp b/libcxx/test/libcxx/iterators/bounded_iter/arithmetic.pass.cpp
index 88acc30369165..45d0cc3b95f90 100644
--- a/libcxx/test/libcxx/iterators/bounded_iter/arithmetic.pass.cpp
+++ b/libcxx/test/libcxx/iterators/bounded_iter/arithmetic.pass.cpp
@@ -12,7 +12,6 @@
// Arithmetic operators
#include <__iterator/bounded_iter.h>
-#include <cassert>
#include <cstddef>
#include "test_iterators.h"
diff --git a/libcxx/test/libcxx/iterators/bounded_iter/comparison.pass.cpp b/libcxx/test/libcxx/iterators/bounded_iter/comparison.pass.cpp
index 31c080c63a31d..cef2157469c8f 100644
--- a/libcxx/test/libcxx/iterators/bounded_iter/comparison.pass.cpp
+++ b/libcxx/test/libcxx/iterators/bounded_iter/comparison.pass.cpp
@@ -11,8 +11,6 @@
//
// Comparison operators
-#include <cassert>
-#include <compare>
#include <concepts>
#include <__iterator/bounded_iter.h>
diff --git a/libcxx/test/libcxx/iterators/capacity_aware_iter/arithmetic.pass.cpp b/libcxx/test/libcxx/iterators/capacity_aware_iter/arithmetic.pass.cpp
index f4aa5c29790ff..c8451141c9844 100644
--- a/libcxx/test/libcxx/iterators/capacity_aware_iter/arithmetic.pass.cpp
+++ b/libcxx/test/libcxx/iterators/capacity_aware_iter/arithmetic.pass.cpp
@@ -25,7 +25,6 @@
// operator-(__capacity_aware_iterator, __capacity_aware_iterator)
#include <__iterator/capacity_aware_iterator.h>
-#include <cassert>
#include <concepts>
#include <cstddef>
#include <iterator>
diff --git a/libcxx/test/libcxx/iterators/capacity_aware_iter/comparison.pass.cpp b/libcxx/test/libcxx/iterators/capacity_aware_iter/comparison.pass.cpp
index 34aa73bf4459c..d1f396fb93777 100644
--- a/libcxx/test/libcxx/iterators/capacity_aware_iter/comparison.pass.cpp
+++ b/libcxx/test/libcxx/iterators/capacity_aware_iter/comparison.pass.cpp
@@ -22,7 +22,6 @@
// operator<=>
#include <__iterator/capacity_aware_iterator.h>
-#include <cassert>
#include <compare>
#include <concepts>
#include <iterator>
diff --git a/libcxx/test/libcxx/iterators/capacity_aware_iter/dereference.pass.cpp b/libcxx/test/libcxx/iterators/capacity_aware_iter/dereference.pass.cpp
index 42ab763896e2f..ff7d4b53b071a 100644
--- a/libcxx/test/libcxx/iterators/capacity_aware_iter/dereference.pass.cpp
+++ b/libcxx/test/libcxx/iterators/capacity_aware_iter/dereference.pass.cpp
@@ -18,9 +18,7 @@
// operator->();
#include <__iterator/capacity_aware_iterator.h>
-#include <cassert>
#include <concepts>
-#include <iterator>
#include "test_iterators.h"
#include "test_macros.h"
diff --git a/libcxx/test/libcxx/iterators/iterator.requirements/iterator.concepts/cpp20_iter_traits.compile.pass.cpp b/libcxx/test/libcxx/iterators/iterator.requirements/iterator.concepts/cpp20_iter_traits.compile.pass.cpp
index ff2e1a5579bac..066587d68cd3b 100644
--- a/libcxx/test/libcxx/iterators/iterator.requirements/iterator.concepts/cpp20_iter_traits.compile.pass.cpp
+++ b/libcxx/test/libcxx/iterators/iterator.requirements/iterator.concepts/cpp20_iter_traits.compile.pass.cpp
@@ -15,7 +15,6 @@
// ITER_TRAITS(I) denotes iterator_traits<I>.
#include <__iterator/concepts.h>
-#include <iterator>
#include <type_traits>
#include "test_iterators.h"
diff --git a/libcxx/test/libcxx/iterators/iterator_with_data.pass.cpp b/libcxx/test/libcxx/iterators/iterator_with_data.pass.cpp
index 6986302de1822..b2e3ffe0be90e 100644
--- a/libcxx/test/libcxx/iterators/iterator_with_data.pass.cpp
+++ b/libcxx/test/libcxx/iterators/iterator_with_data.pass.cpp
@@ -15,10 +15,6 @@ TEST_CLANG_DIAGNOSTIC_IGNORED("-Wprivate-header")
#include <__iterator/iterator_with_data.h>
TEST_DIAGNOSTIC_POP
-#include <cassert>
-#include <iterator>
-#include <utility>
-
#include "test_iterators.h"
static_assert(std::forward_iterator<std::__iterator_with_data<forward_iterator<int*>, int>>);
diff --git a/libcxx/test/libcxx/iterators/product_iterator.pass.cpp b/libcxx/test/libcxx/iterators/product_iterator.pass.cpp
index d70bbca15ca6c..604f3667c36e3 100644
--- a/libcxx/test/libcxx/iterators/product_iterator.pass.cpp
+++ b/libcxx/test/libcxx/iterators/product_iterator.pass.cpp
@@ -10,7 +10,6 @@
// gcc 15 does not seem to recognize the __product_iterator_traits specializations
// UNSUPPORTED: gcc
-#include <cassert>
#include <flat_map>
#include <ranges>
#include <type_traits>
diff --git a/libcxx/test/libcxx/iterators/unwrap_iter.pass.cpp b/libcxx/test/libcxx/iterators/unwrap_iter.pass.cpp
index 3902eb350bca9..8ef2be2b01074 100644
--- a/libcxx/test/libcxx/iterators/unwrap_iter.pass.cpp
+++ b/libcxx/test/libcxx/iterators/unwrap_iter.pass.cpp
@@ -12,7 +12,6 @@
#include <cassert>
#include <string>
#include <type_traits>
-#include <utility>
#include "test_iterators.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp
index 6ef693ec42534..bede567f33019 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy.pass.cpp
@@ -14,7 +14,6 @@
#include <algorithm>
#include <cassert>
-#include <cstdint>
#include <vector>
#include "sized_allocator.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp
index f535ede394781..b921591c19621 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_backward.pass.cpp
@@ -17,7 +17,6 @@
#include <algorithm>
#include <cassert>
-#include <cstdint>
#include <vector>
#include "sized_allocator.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp
index 183f38c1ce117..2053134a01a2f 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/copy_n.pass.cpp
@@ -14,7 +14,6 @@
#include <algorithm>
#include <cassert>
-#include <cstdint>
#include <vector>
#include "test_macros.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/ranges.copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/ranges.copy.pass.cpp
index ab76388ca957c..0e0fbf39602de 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/ranges.copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/ranges.copy.pass.cpp
@@ -20,7 +20,6 @@
#include <algorithm>
#include <array>
#include <cassert>
-#include <cstdint>
#include <deque>
#include <ranges>
#include <vector>
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/ranges.copy_backward.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/ranges.copy_backward.pass.cpp
index c76efdd3f5748..46beea04aa2f3 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/ranges.copy_backward.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/ranges.copy_backward.pass.cpp
@@ -23,7 +23,6 @@
#include <algorithm>
#include <array>
#include <cassert>
-#include <cstdint>
#include <deque>
#include <ranges>
#include <vector>
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/ranges.copy_n.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/ranges.copy_n.pass.cpp
index 132993dba76b9..577328d663d9f 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/ranges.copy_n.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.copy/ranges.copy_n.pass.cpp
@@ -24,7 +24,6 @@
#include "almost_satisfies_types.h"
#include "test_macros.h"
#include "test_iterators.h"
-#include "type_algorithms.h"
template <class In, class Out = In, class Count = std::size_t>
concept HasCopyNIt = requires(In in, Count count, Out out) { std::ranges::copy_n(in, count, out); };
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp
index 10aad31778ea9..b0a74b81f8c0f 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill.pass.cpp
@@ -17,7 +17,6 @@
#include <array>
#include <cassert>
#include <cstddef>
-#include <cstdint>
#include <deque>
#include <ranges>
#include <vector>
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp
index 6d7ba98a33b65..5dc9b901db075 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/fill_n.pass.cpp
@@ -17,7 +17,6 @@
#include <array>
#include <cassert>
#include <cstddef>
-#include <cstdint>
#include <deque>
#include <ranges>
#include <vector>
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/ranges.fill.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/ranges.fill.pass.cpp
index 79543832d6e20..7ae0a0665dfbb 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/ranges.fill.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/ranges.fill.pass.cpp
@@ -18,7 +18,6 @@
#include <algorithm>
#include <array>
#include <cassert>
-#include <cstdint>
#include <deque>
#include <ranges>
#include <string>
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/ranges.fill_n.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/ranges.fill_n.pass.cpp
index 0de6f4a625136..25db892548a6a 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/ranges.fill_n.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.fill/ranges.fill_n.pass.cpp
@@ -16,7 +16,6 @@
#include <algorithm>
#include <array>
#include <cassert>
-#include <cstdint>
#include <deque>
#include <ranges>
#include <string>
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.generate/ranges_generate.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.generate/ranges_generate.pass.cpp
index 98741873760d7..56fbe58e2dfd0 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.generate/ranges_generate.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.generate/ranges_generate.pass.cpp
@@ -20,7 +20,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.generate/ranges_generate_n.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.generate/ranges_generate_n.pass.cpp
index 33d40a39cf385..e6af0116ea0d2 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.generate/ranges_generate_n.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.generate/ranges_generate_n.pass.cpp
@@ -16,7 +16,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move.pass.cpp
index 1c82dd6d4fe70..e28484ee4984b 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move.pass.cpp
@@ -18,7 +18,6 @@
#include <algorithm>
#include <cassert>
-#include <cstdint>
#include <iterator>
#include <memory>
#include <vector>
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp
index 5d4ba6e1ec3e3..d8b7e68b155d6 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/move_backward.pass.cpp
@@ -17,7 +17,6 @@
#include <algorithm>
#include <cassert>
-#include <cstdint>
#include <iterator>
#include <memory>
#include <vector>
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/pstl.move.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/pstl.move.pass.cpp
index 26c537f42efc2..a82a068caf031 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/pstl.move.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.move/pstl.move.pass.cpp
@@ -18,7 +18,6 @@
// ForwardIterator2 result);
#include <algorithm>
-#include <cassert>
#include <vector>
#include "test_macros.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp
index 73a4895abc942..f5a0ff0b27dad 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/is_partitioned.pass.cpp
@@ -13,10 +13,9 @@
// is_partitioned(InputIterator first, InputIterator last, Predicate pred);
#include <algorithm>
-#include <cassert>
-#include <cstddef>
#include <functional>
-#include <iterator>
+#include <cstddef>
+#include <cassert>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp
index 1867c3ae46246..05ab77907ea06 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_copy.pass.cpp
@@ -17,7 +17,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_point.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_point.pass.cpp
index c16aa6f10e5c6..2dc17868f80ee 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_point.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/partition_point.pass.cpp
@@ -14,7 +14,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/ranges_partition.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/ranges_partition.pass.cpp
index 07ee0f29d4009..6d9be0441bfef 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/ranges_partition.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/ranges_partition.pass.cpp
@@ -23,7 +23,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/ranges_partition_copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/ranges_partition_copy.pass.cpp
index 19fe28febe797..af9a72da71a99 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/ranges_partition_copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/ranges_partition_copy.pass.cpp
@@ -28,7 +28,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/ranges_partition_point.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/ranges_partition_point.pass.cpp
index 19ecdc02b777b..932e833aa499d 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/ranges_partition_point.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/ranges_partition_point.pass.cpp
@@ -21,7 +21,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/ranges_stable_partition.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/ranges_stable_partition.pass.cpp
index 28fda6b56446c..615cac8c67239 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/ranges_stable_partition.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.partitions/ranges_stable_partition.pass.cpp
@@ -24,14 +24,12 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <ranges>
#include "almost_satisfies_types.h"
#include "test_iterators.h"
-#include "test_macros.h"
struct UnaryPred { bool operator()(int) const; };
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/ranges_sample.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/ranges_sample.pass.cpp
index 0da76d5389d20..a5178cb2eee13 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/ranges_sample.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/ranges_sample.pass.cpp
@@ -24,7 +24,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <random>
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.pass.cpp
index 09322dad3d6f1..ed89a5ad47115 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.pass.cpp
@@ -17,12 +17,10 @@
// UniformRandomNumberGenerator &&g);
#include <algorithm>
-#include <cassert>
-#include <cstddef>
-#include <iterator>
#include <random>
#include <type_traits>
-#include <utility>
+#include <cassert>
+#include <cstddef>
#include "test_iterators.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.shuffle/ranges_shuffle.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.shuffle/ranges_shuffle.pass.cpp
index 9db7bc62ecf3d..24237b94502f9 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.shuffle/ranges_shuffle.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.shuffle/ranges_shuffle.pass.cpp
@@ -22,7 +22,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <random>
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/ranges_remove_copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/ranges_remove_copy.pass.cpp
index 29508988cd266..9c09b443ef12c 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/ranges_remove_copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/ranges_remove_copy.pass.cpp
@@ -26,7 +26,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/ranges_remove_copy_if.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/ranges_remove_copy_if.pass.cpp
index 9636ddb1e07e7..c67f7c92e3cef 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/ranges_remove_copy_if.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/ranges_remove_copy_if.pass.cpp
@@ -24,7 +24,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp
index deff5d626046f..ebacec5f49367 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove.pass.cpp
@@ -16,7 +16,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include <memory>
#include "test_macros.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp
index 2647df673702c..1a0313d0b2b39 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy.pass.cpp
@@ -15,7 +15,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp
index 90be6f9c5c6d4..d2ad3f2d2d5df 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_copy_if.pass.cpp
@@ -15,9 +15,8 @@
// remove_copy_if(InIter first, InIter last, OutIter result, Pred pred);
#include <algorithm>
-#include <cassert>
#include <functional>
-#include <iterator>
+#include <cassert>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp
index 40efd0cbff167..99f9adfd319ea 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.remove/remove_if.pass.cpp
@@ -18,7 +18,6 @@
#include <functional>
#include <cassert>
#include <memory>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/ranges_replace_copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/ranges_replace_copy.pass.cpp
index 278fb04d95f60..b1c03e9604a6a 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/ranges_replace_copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/ranges_replace_copy.pass.cpp
@@ -27,7 +27,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/ranges_replace_copy_if.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/ranges_replace_copy_if.pass.cpp
index fe2bea49fdbd2..38f6d4789b951 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/ranges_replace_copy_if.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/ranges_replace_copy_if.pass.cpp
@@ -26,7 +26,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp
index 31c398e6321e4..1e91fc968cb21 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace.pass.cpp
@@ -17,7 +17,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp
index 471a1c98354f6..00f869889a422 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy.pass.cpp
@@ -18,7 +18,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp
index 12c4a8980cc77..795181bbbd18d 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_copy_if.pass.cpp
@@ -17,9 +17,8 @@
// replace_copy_if(InIter first, InIter last, OutIter result, Pred pred, const T& new_value);
#include <algorithm>
-#include <cassert>
#include <functional>
-#include <iterator>
+#include <cassert>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp
index 57ccc8d54a13a..4f32b6e94a413 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.replace/replace_if.pass.cpp
@@ -16,9 +16,8 @@
// replace_if(Iter first, Iter last, Pred pred, const T& new_value);
#include <algorithm>
-#include <cassert>
#include <functional>
-#include <iterator>
+#include <cassert>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.reverse/ranges.reverse.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.reverse/ranges.reverse.pass.cpp
index 46d6345aeede9..c1011f3ada649 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.reverse/ranges.reverse.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.reverse/ranges.reverse.pass.cpp
@@ -19,7 +19,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp
index d1184b6320e84..150ade52de896 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.reverse/reverse_copy.pass.cpp
@@ -14,7 +14,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp
index 976b0e69a9833..8e356cc219fe7 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.rotate/rotate_copy.pass.cpp
@@ -14,7 +14,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.shift/ranges.shift_left.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.shift/ranges.shift_left.pass.cpp
index 51a2e448e42de..9639fc529c2a0 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.shift/ranges.shift_left.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.shift/ranges.shift_left.pass.cpp
@@ -26,9 +26,8 @@
#include <vector>
#include "almost_satisfies_types.h"
-#include "MoveOnly.h"
#include "test_iterators.h"
-#include "type_algorithms.h"
+#include "MoveOnly.h"
struct InvalidDifferenceT {};
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.shift/shift_left.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.shift/shift_left.pass.cpp
index 5e058b853cd22..90540f499e156 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.shift/shift_left.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.shift/shift_left.pass.cpp
@@ -17,7 +17,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.shift/shift_right.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.shift/shift_right.pass.cpp
index c3c30cca0318f..d92387c4c77ae 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.shift/shift_right.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.shift/shift_right.pass.cpp
@@ -17,7 +17,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp
index b05206c77b59d..7ad94e3331bf1 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/binary_transform.pass.cpp
@@ -17,7 +17,6 @@
#include <algorithm>
#include <functional>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/pstl.transform.binary.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/pstl.transform.binary.pass.cpp
index bbad9ae357a7a..b2b98619fb964 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/pstl.transform.binary.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/pstl.transform.binary.pass.cpp
@@ -21,13 +21,11 @@
// BinaryOperation binary_op);
#include <algorithm>
-#include <cassert>
#include <vector>
#include "test_macros.h"
#include "test_execution_policies.h"
#include "test_iterators.h"
-#include "type_algorithms.h"
EXECUTION_POLICY_SFINAE_TEST(transform);
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/pstl.transform.unary.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/pstl.transform.unary.pass.cpp
index a63a114b32308..03985c7d3673b 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/pstl.transform.unary.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/pstl.transform.unary.pass.cpp
@@ -26,7 +26,6 @@
#include "test_macros.h"
#include "test_execution_policies.h"
#include "test_iterators.h"
-#include "type_algorithms.h"
// We can't test the constraint on the execution policy, because that would conflict with the binary
// transform algorithm that doesn't take an execution policy, which is not constrained at all.
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp
index 124009479c8bb..8cf9667f757f6 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.transform/unary_transform.pass.cpp
@@ -17,7 +17,6 @@
#include <algorithm>
#include <functional>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/ranges_unique.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/ranges_unique.pass.cpp
index afa350a765ecd..67a8462c76650 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/ranges_unique.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/ranges_unique.pass.cpp
@@ -22,7 +22,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/ranges_unique_copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/ranges_unique_copy.pass.cpp
index 7a9d2f0a2e577..a4cf97069c96a 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/ranges_unique_copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/ranges_unique_copy.pass.cpp
@@ -30,7 +30,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp
index d763000bbecfd..b145d567f47bf 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp
@@ -17,7 +17,6 @@
#include <algorithm>
#include <cassert>
#include <memory>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp
index 51236a0dc5e96..bcf9c99e24c25 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy.pass.cpp
@@ -18,7 +18,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "MoveOnly.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp
index 306a40f538bb2..e7d76a3343766 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_copy_pred.pass.cpp
@@ -19,7 +19,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp
index 97e0606da98e5..91535f081ca8b 100644
--- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.unique/unique_pred.pass.cpp
@@ -17,7 +17,6 @@
#include <algorithm>
#include <cassert>
#include <memory>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find.pass.cpp
index 06f4c90d1fe61..6d57c5869ab70 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find.pass.cpp
@@ -15,7 +15,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find_pred.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find_pred.pass.cpp
index e107d65fd9853..c80bc9fff83b6 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find_pred.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.adjacent.find/adjacent_find_pred.pass.cpp
@@ -14,9 +14,8 @@
// adjacent_find(Iter first, Iter last, Pred pred);
#include <algorithm>
-#include <cassert>
#include <functional>
-#include <iterator>
+#include <cassert>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.all_of/all_of.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.all_of/all_of.pass.cpp
index f9377fb10277f..255cd62fd05d9 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.all_of/all_of.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.all_of/all_of.pass.cpp
@@ -14,7 +14,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.all_of/pstl.all_of.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.all_of/pstl.all_of.pass.cpp
index 1770749fbcc4b..a3af9b949bfd2 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.all_of/pstl.all_of.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.all_of/pstl.all_of.pass.cpp
@@ -23,7 +23,6 @@
#include "test_macros.h"
#include "test_execution_policies.h"
#include "test_iterators.h"
-#include "type_algorithms.h"
EXECUTION_POLICY_SFINAE_TEST(all_of);
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.any_of/any_of.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.any_of/any_of.pass.cpp
index c0b659304db8b..79f4438aa9abe 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.any_of/any_of.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.any_of/any_of.pass.cpp
@@ -14,7 +14,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.any_of/pstl.any_of.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.any_of/pstl.any_of.pass.cpp
index 5ddbfa9b98c37..229bf576dd801 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.any_of/pstl.any_of.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.any_of/pstl.any_of.pass.cpp
@@ -23,7 +23,6 @@
#include "test_macros.h"
#include "test_execution_policies.h"
#include "test_iterators.h"
-#include "type_algorithms.h"
EXECUTION_POLICY_SFINAE_TEST(any_of);
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.contains/ranges.contains.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.contains/ranges.contains.pass.cpp
index e5da5d68a4db4..1e89cd272e643 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.contains/ranges.contains.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.contains/ranges.contains.pass.cpp
@@ -29,7 +29,6 @@
#include "almost_satisfies_types.h"
#include "boolean_testable.h"
#include "test_iterators.h"
-#include "type_algorithms.h"
struct NotEqualityComparable {};
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp
index 64c3d7ce3ac86..176d6b22551fb 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.count/count_if.pass.cpp
@@ -14,9 +14,8 @@
// count_if(Iter first, Iter last, Pred pred);
#include <algorithm>
-#include <cassert>
#include <functional>
-#include <iterator>
+#include <cassert>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.count/pstl.count.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.count/pstl.count.pass.cpp
index 3b7d0816c2bea..f00861f66bfe9 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.count/pstl.count.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.count/pstl.count.pass.cpp
@@ -20,13 +20,11 @@
#include <algorithm>
#include <array>
#include <cassert>
-#include <iterator>
#include <vector>
#include "test_macros.h"
#include "test_execution_policies.h"
#include "test_iterators.h"
-#include "type_algorithms.h"
EXECUTION_POLICY_SFINAE_TEST(count);
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.count/pstl.count_if.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.count/pstl.count_if.pass.cpp
index 2808670b55d86..489c7a7332a6e 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.count/pstl.count_if.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.count/pstl.count_if.pass.cpp
@@ -20,13 +20,11 @@
#include <algorithm>
#include <array>
#include <cassert>
-#include <iterator>
#include <vector>
#include "test_macros.h"
#include "test_execution_policies.h"
#include "test_iterators.h"
-#include "type_algorithms.h"
EXECUTION_POLICY_SFINAE_TEST(count_if);
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.ends_with/ranges.ends_with.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.ends_with/ranges.ends_with.pass.cpp
index 9a7a5f551a784..76c62ffa760ad 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.ends_with/ranges.ends_with.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.ends_with/ranges.ends_with.pass.cpp
@@ -23,7 +23,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <chrono>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp
index 48c91bc664e0c..a041e38a4838a 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal.pass.cpp
@@ -30,7 +30,6 @@
#include <algorithm>
#include <cassert>
-#include <cstdint>
#include <functional>
#include <vector>
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp
index 933605c870eb8..8752b92d6dfa9 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/equal_pred.pass.cpp
@@ -21,10 +21,10 @@
// constexpr bool // constexpr after c++17
// equal(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2, Pred pred);
+
#include <algorithm>
-#include <cassert>
#include <functional>
-#include <iterator>
+#include <cassert>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/pstl.equal.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/pstl.equal.pass.cpp
index 4be9b166045c1..e2f4dafe1a05d 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/pstl.equal.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/pstl.equal.pass.cpp
@@ -42,7 +42,6 @@
#include "test_execution_policies.h"
#include "test_iterators.h"
#include "test_macros.h"
-#include "type_algorithms.h"
template <class It1, class It2>
struct Test {
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/ranges.equal.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/ranges.equal.pass.cpp
index 81723e1a25773..8f35a3cf34589 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/ranges.equal.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.equal/ranges.equal.pass.cpp
@@ -26,7 +26,6 @@
#include <array>
#include <cassert>
#include <concepts>
-#include <cstdint>
#include <functional>
#include <ranges>
#include <vector>
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.end/find_end.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.end/find_end.pass.cpp
index e64947bc4f806..3060528a8e899 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.end/find_end.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.end/find_end.pass.cpp
@@ -15,7 +15,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.end/find_end_pred.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.end/find_end_pred.pass.cpp
index 4f84def8fea7e..7358cf5f70106 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.end/find_end_pred.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.end/find_end_pred.pass.cpp
@@ -17,7 +17,6 @@
#include <algorithm>
#include <functional>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.end/ranges.find_end.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.end/ranges.find_end.pass.cpp
index ce5226c563f14..deaec0b6ebb62 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.end/ranges.find_end.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.end/ranges.find_end.pass.cpp
@@ -25,7 +25,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <ranges>
#include "almost_satisfies_types.h"
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp
index efa54bbc8fd66..6a76ef95353a8 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of.pass.cpp
@@ -15,7 +15,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp
index fd2e4d426fbf9..0e9a6e576b85c 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/find_first_of_pred.pass.cpp
@@ -15,9 +15,8 @@
// find_first_of(Iter1 first1, Iter1 last1, Iter2 first2, Iter2 last2, Pred pred);
#include <algorithm>
-#include <cassert>
#include <functional>
-#include <iterator>
+#include <cassert>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/ranges.find_first_of.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/ranges.find_first_of.pass.cpp
index 4a374947dc449..a74e6d721f773 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/ranges.find_first_of.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.first.of/ranges.find_first_of.pass.cpp
@@ -26,7 +26,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <functional>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.last/ranges.find_last.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.last/ranges.find_last.pass.cpp
index dde7bd923e8f1..9da8c26db0f56 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.last/ranges.find_last.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find.last/ranges.find_last.pass.cpp
@@ -31,7 +31,6 @@
#include "almost_satisfies_types.h"
#include "test_iterators.h"
-#include "type_algorithms.h"
struct NotEqualityComparable {};
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find.pass.cpp
index a347778092d2b..e9fd8c17b40cb 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find.pass.cpp
@@ -28,9 +28,7 @@
#include <algorithm>
#include <cassert>
#include <cstddef>
-#include <cstdint>
#include <deque>
-#include <ranges>
#include <vector>
#include <type_traits>
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp
index 8af4c2e0f2189..7fb168a061352 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if.pass.cpp
@@ -12,9 +12,8 @@
// constexpr InputIterator find_if(InputIterator first, InputIterator last, Predicate pred); // constexpr since C++20
#include <algorithm>
-#include <cassert>
#include <functional>
-#include <iterator>
+#include <cassert>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp
index a083cb56df6ea..4b5d3540512d7 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/find_if_not.pass.cpp
@@ -15,7 +15,6 @@
#include <algorithm>
#include <functional>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/pstl.find.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/pstl.find.pass.cpp
index 9d43b1aa22cec..8a9eee81d95c0 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/pstl.find.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/pstl.find.pass.cpp
@@ -23,7 +23,6 @@
#include "test_macros.h"
#include "test_execution_policies.h"
#include "test_iterators.h"
-#include "type_algorithms.h"
EXECUTION_POLICY_SFINAE_TEST(find);
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/pstl.find_if.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/pstl.find_if.pass.cpp
index e12acf1d28379..49eef2a7bc55f 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/pstl.find_if.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/pstl.find_if.pass.cpp
@@ -23,7 +23,6 @@
#include "test_macros.h"
#include "test_execution_policies.h"
#include "test_iterators.h"
-#include "type_algorithms.h"
EXECUTION_POLICY_SFINAE_TEST(find_if);
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/pstl.find_if_not.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/pstl.find_if_not.pass.cpp
index c67490dc402f6..e5a242c57a2c4 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/pstl.find_if_not.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/pstl.find_if_not.pass.cpp
@@ -23,7 +23,6 @@
#include "test_macros.h"
#include "test_execution_policies.h"
#include "test_iterators.h"
-#include "type_algorithms.h"
EXECUTION_POLICY_SFINAE_TEST(find_if_not);
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/ranges.find.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/ranges.find.pass.cpp
index 08a3a4658fa6b..3303b4a76f467 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/ranges.find.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.find/ranges.find.pass.cpp
@@ -29,7 +29,6 @@
#include <array>
#include <cassert>
#include <cstddef>
-#include <cstdint>
#include <deque>
#include <ranges>
#include <vector>
@@ -37,7 +36,6 @@
#include "almost_satisfies_types.h"
#include "sized_allocator.h"
#include "test_iterators.h"
-#include "type_algorithms.h"
struct NotEqualityComparable {};
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.fold/requirements.compile.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.fold/requirements.compile.pass.cpp
index 8673a09394b95..261dd6e572e50 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.fold/requirements.compile.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.fold/requirements.compile.pass.cpp
@@ -32,7 +32,6 @@
#include <functional>
#include <iterator>
#include <ranges>
-#include <type_traits>
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/for_each.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/for_each.pass.cpp
index 6506e4c5b3173..3c0ff75fc56c7 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/for_each.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/for_each.pass.cpp
@@ -20,7 +20,6 @@
#include "test_macros.h"
#include "test_iterators.h"
-#include "type_algorithms.h"
struct for_each_test {
TEST_CONSTEXPR for_each_test(int c) : count(c) {}
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/pstl.for_each.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/pstl.for_each.pass.cpp
index 97b0220309720..b0e77094f0a42 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/pstl.for_each.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/pstl.for_each.pass.cpp
@@ -25,7 +25,6 @@
#include "test_macros.h"
#include "test_execution_policies.h"
#include "test_iterators.h"
-#include <type_algorithms.h>
EXECUTION_POLICY_SFINAE_TEST(for_each);
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/pstl.for_each_n.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/pstl.for_each_n.pass.cpp
index 8769d1b4db554..c00eed1ead564 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/pstl.for_each_n.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/pstl.for_each_n.pass.cpp
@@ -24,7 +24,6 @@
#include "test_macros.h"
#include "test_execution_policies.h"
#include "test_iterators.h"
-#include "type_algorithms.h"
EXECUTION_POLICY_SFINAE_TEST(for_each_n);
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/ranges.for_each.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/ranges.for_each.pass.cpp
index 86c5a8a39736f..a6d0afde3186a 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/ranges.for_each.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/ranges.for_each.pass.cpp
@@ -27,7 +27,6 @@
#include "almost_satisfies_types.h"
#include "test_iterators.h"
-#include "test_macros.h"
struct Callable {
void operator()(int);
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/ranges.for_each_n.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/ranges.for_each_n.pass.cpp
index a82fb6afaad0b..1578763694231 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/ranges.for_each_n.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.foreach/ranges.for_each_n.pass.cpp
@@ -26,7 +26,6 @@
#include "almost_satisfies_types.h"
#include "test_iterators.h"
-#include "test_macros.h"
struct Callable {
void operator()(int);
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation.pass.cpp
index 2863219e60eac..2a2c796caac01 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation.pass.cpp
@@ -15,7 +15,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp
index d2a3ec6287a29..4e4f889a45e74 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.is_permutation/is_permutation_pred.pass.cpp
@@ -16,7 +16,6 @@
#include <algorithm>
#include <functional>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.is_permutation/ranges.is_permutation.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.is_permutation/ranges.is_permutation.pass.cpp
index e04c78e516c00..2d560b165758c 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.is_permutation/ranges.is_permutation.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.is_permutation/ranges.is_permutation.pass.cpp
@@ -27,7 +27,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <list>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.none_of/none_of.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.none_of/none_of.pass.cpp
index 8d63ecb6c17a5..00c1b8954ad3b 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.none_of/none_of.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.none_of/none_of.pass.cpp
@@ -14,7 +14,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.none_of/pstl.none_of.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.none_of/pstl.none_of.pass.cpp
index b20b99c1e836b..fb3e34a2bdec3 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.none_of/pstl.none_of.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.none_of/pstl.none_of.pass.cpp
@@ -23,7 +23,6 @@
#include "test_macros.h"
#include "test_execution_policies.h"
#include "test_iterators.h"
-#include "type_algorithms.h"
EXECUTION_POLICY_SFINAE_TEST(none_of);
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/ranges.search.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/ranges.search.pass.cpp
index 9ab7abdd9548d..8a706071f5130 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/ranges.search.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/ranges.search.pass.cpp
@@ -26,7 +26,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <ranges>
#include "almost_satisfies_types.h"
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/ranges.search_n.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/ranges.search_n.pass.cpp
index 6686e8de733bd..f68c31ead7b8f 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/ranges.search_n.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/ranges.search_n.pass.cpp
@@ -25,7 +25,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <ranges>
#include "almost_satisfies_types.h"
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search.pass.cpp
index 2e1aa06167e84..3bf2fd9d6bb04 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search.pass.cpp
@@ -19,7 +19,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_n_pred.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_n_pred.pass.cpp
index 21683da150f48..2fa3e9ffac1bc 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_n_pred.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_n_pred.pass.cpp
@@ -15,7 +15,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp
index 2251a89a8f516..cfb82f3d4084c 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.search/search_pred.pass.cpp
@@ -15,7 +15,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.nonmodifying/alg.starts_with/ranges.starts_with.pass.cpp b/libcxx/test/std/algorithms/alg.nonmodifying/alg.starts_with/ranges.starts_with.pass.cpp
index 5346773fe06fb..172fa82fccc29 100644
--- a/libcxx/test/std/algorithms/alg.nonmodifying/alg.starts_with/ranges.starts_with.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.nonmodifying/alg.starts_with/ranges.starts_with.pass.cpp
@@ -23,7 +23,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <ranges>
#include "almost_satisfies_types.h"
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/equal.range/ranges_equal_range.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/equal.range/ranges_equal_range.pass.cpp
index cc4c922d32dd4..518526705409a 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/equal.range/ranges_equal_range.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.binary.search/equal.range/ranges_equal_range.pass.cpp
@@ -23,7 +23,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap.pass.cpp
index cbef8544e153e..8ccff2ebb531a 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap.pass.cpp
@@ -15,7 +15,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_comp.pass.cpp
index 63b1ba343f1f4..b07a3c8f24f60 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_comp.pass.cpp
@@ -16,7 +16,6 @@
#include <algorithm>
#include <functional>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until.pass.cpp
index 78465465e5eb4..9708db7ce5fd2 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until.pass.cpp
@@ -15,7 +15,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until_comp.pass.cpp
index 15e481807eb6c..1cec5440f0068 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/is_heap_until_comp.pass.cpp
@@ -14,9 +14,8 @@
// is_heap_until(Iter first, Iter last, Compare comp);
#include <algorithm>
-#include <cassert>
#include <functional>
-#include <iterator>
+#include <cassert>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/ranges_is_heap.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/ranges_is_heap.pass.cpp
index 38a89e83f5f3b..fc207c9fc7529 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/ranges_is_heap.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/ranges_is_heap.pass.cpp
@@ -20,7 +20,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/ranges_is_heap_until.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/ranges_is_heap_until.pass.cpp
index 5fd119a21a98f..f1dc6adbeaae1 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/ranges_is_heap_until.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/is.heap/ranges_is_heap_until.pass.cpp
@@ -21,7 +21,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/make.heap/ranges_make_heap.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/make.heap/ranges_make_heap.pass.cpp
index 2c96c1987a121..f69351209e4f1 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/make.heap/ranges_make_heap.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/make.heap/ranges_make_heap.pass.cpp
@@ -23,7 +23,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <memory>
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/pop.heap/ranges_pop_heap.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/pop.heap/ranges_pop_heap.pass.cpp
index b0a00335ab440..9efe2513271ed 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/pop.heap/ranges_pop_heap.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/pop.heap/ranges_pop_heap.pass.cpp
@@ -23,7 +23,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <memory>
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/push.heap/ranges_push_heap.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/push.heap/ranges_push_heap.pass.cpp
index 7161e6138487d..571da879ed3f5 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/push.heap/ranges_push_heap.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/push.heap/ranges_push_heap.pass.cpp
@@ -23,7 +23,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <memory>
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/sort.heap/ranges_sort_heap.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/sort.heap/ranges_sort_heap.pass.cpp
index e7d346a627d65..e62410e3a948b 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/sort.heap/ranges_sort_heap.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.heap.operations/sort.heap/ranges_sort_heap.pass.cpp
@@ -23,7 +23,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <memory>
@@ -33,7 +32,6 @@
#include "almost_satisfies_types.h"
#include "test_iterators.h"
-#include "test_macros.h"
// SFINAE tests.
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
index 644b4225976c7..2cf675476026c 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare.pass.cpp
@@ -16,11 +16,9 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
-#include "type_algorithms.h"
template <class T, class Iter1>
struct Test {
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp
index c5f32cdbadff2..a78efaf58d7c7 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.lex.comparison/lexicographical_compare_comp.pass.cpp
@@ -16,9 +16,8 @@
// Iter2 first2, Iter2 last2, Compare comp);
#include <algorithm>
-#include <cassert>
#include <functional>
-#include <iterator>
+#include <cassert>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.merge/ranges_inplace_merge.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.merge/ranges_inplace_merge.pass.cpp
index d852ef1fce45b..827e6c1d20868 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.merge/ranges_inplace_merge.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.merge/ranges_inplace_merge.pass.cpp
@@ -24,7 +24,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.merge/ranges_merge.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.merge/ranges_merge.pass.cpp
index b34860267c762..d68b0629e4c08 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.merge/ranges_merge.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.merge/ranges_merge.pass.cpp
@@ -28,7 +28,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include "almost_satisfies_types.h"
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/ranges.max.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/ranges.max.pass.cpp
index fb8b0daa3ee47..e9e5240cf8cde 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/ranges.max.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/ranges.max.pass.cpp
@@ -33,7 +33,6 @@
#include "almost_satisfies_types.h"
#include "test_iterators.h"
#include "test_macros.h"
-#include "type_algorithms.h"
template <class T>
concept HasMaxR = requires { std::ranges::max(std::declval<T>()); };
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/ranges.min.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/ranges.min.pass.cpp
index 966a48d6fc2d4..3d92964c90daa 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/ranges.min.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/ranges.min.pass.cpp
@@ -31,7 +31,6 @@
#include "almost_satisfies_types.h"
#include "test_iterators.h"
#include "test_macros.h"
-#include "type_algorithms.h"
template <class T>
concept HasMinR = requires { std::ranges::min(std::declval<T>()); };
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/requires_forward_iterator.verify.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/requires_forward_iterator.verify.cpp
index 3cc2a2cb1e715..4fabc2cdfe106 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/requires_forward_iterator.verify.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/requires_forward_iterator.verify.cpp
@@ -13,7 +13,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.nth.element/ranges_nth_element.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.nth.element/ranges_nth_element.pass.cpp
index 61bbe6359b771..f497dbd830472 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.nth.element/ranges_nth_element.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.nth.element/ranges_nth_element.pass.cpp
@@ -23,7 +23,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <iterator>
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/includes/ranges_includes.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/includes/ranges_includes.pass.cpp
index e591011747026..47f6779227f81 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/includes/ranges_includes.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/includes/ranges_includes.pass.cpp
@@ -26,7 +26,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.
diff erence/ranges_set_
diff erence.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.
diff erence/ranges_set_
diff erence.pass.cpp
index 0a61199e9dca1..df55f63b73be3 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.
diff erence/ranges_set_
diff erence.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.
diff erence/ranges_set_
diff erence.pass.cpp
@@ -28,7 +28,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include "almost_satisfies_types.h"
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/ranges_set_intersection.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/ranges_set_intersection.pass.cpp
index e047588baea31..f7870485cfefc 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/ranges_set_intersection.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/ranges_set_intersection.pass.cpp
@@ -27,7 +27,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <cstddef>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_complexity.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_complexity.pass.cpp
index 92df0e8658631..ddf4087ddd6cd 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_complexity.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.intersection/set_intersection_complexity.pass.cpp
@@ -38,7 +38,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <cstddef>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.
diff erence/ranges_set_symmetric_
diff erence.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.
diff erence/ranges_set_symmetric_
diff erence.pass.cpp
index 163b3913a4f62..ca830a09e3a0b 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.
diff erence/ranges_set_symmetric_
diff erence.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.symmetric.
diff erence/ranges_set_symmetric_
diff erence.pass.cpp
@@ -28,7 +28,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include "almost_satisfies_types.h"
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.union/ranges_set_union.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.union/ranges_set_union.pass.cpp
index a53cb3ec3ed19..b018763a8bf70 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.union/ranges_set_union.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.set.operations/set.union/ranges_set_union.pass.cpp
@@ -28,7 +28,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp
index 28e0786f0c56b..67d7a9eae4cee 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted.pass.cpp
@@ -15,7 +15,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp
index 4d26d51d7d135..103bcf84ed6b3 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_comp.pass.cpp
@@ -16,7 +16,6 @@
#include <algorithm>
#include <functional>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp
index c0bddc7df9fdd..229ce5821014c 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until.pass.cpp
@@ -15,7 +15,6 @@
#include <algorithm>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp
index f66656439b529..617cd7aacbfdb 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/is_sorted_until_comp.pass.cpp
@@ -14,9 +14,8 @@
// is_sorted_until(Iter first, Iter last, Compare comp);
#include <algorithm>
-#include <cassert>
#include <functional>
-#include <iterator>
+#include <cassert>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/pstl.is_sorted.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/pstl.is_sorted.pass.cpp
index 5095266de2760..5b1e5ce60c253 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/pstl.is_sorted.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/pstl.is_sorted.pass.cpp
@@ -23,7 +23,6 @@
#include "test_execution_policies.h"
#include "test_iterators.h"
#include "test_macros.h"
-#include "type_algorithms.h"
template <class Iter>
struct Test {
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/pstl.is_sorted_comp.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/pstl.is_sorted_comp.pass.cpp
index 56e4c694bae30..8a6c24ca22af1 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/pstl.is_sorted_comp.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/is.sorted/pstl.is_sorted_comp.pass.cpp
@@ -24,7 +24,6 @@
#include "test_execution_policies.h"
#include "test_iterators.h"
#include "test_macros.h"
-#include "type_algorithms.h"
template <class Iter>
struct Test {
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort.copy/ranges_partial_sort_copy.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort.copy/ranges_partial_sort_copy.pass.cpp
index e5398dc3d161e..36ec7892faa22 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort.copy/ranges_partial_sort_copy.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort.copy/ranges_partial_sort_copy.pass.cpp
@@ -31,7 +31,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort/ranges_partial_sort.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort/ranges_partial_sort.pass.cpp
index 2c62a2bbaeb34..f348c6e93e19c 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort/ranges_partial_sort.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/partial.sort/ranges_partial_sort.pass.cpp
@@ -23,7 +23,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/sort/pstl.sort.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/sort/pstl.sort.pass.cpp
index 61fca0ef9dbc0..0724e746eab4a 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/sort/pstl.sort.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/sort/pstl.sort.pass.cpp
@@ -29,7 +29,6 @@
#include "test_execution_policies.h"
#include "test_iterators.h"
#include "test_macros.h"
-#include "type_algorithms.h"
template <class Iter>
struct Test {
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/sort/ranges.sort.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/sort/ranges.sort.pass.cpp
index f9759bd887775..d7bf6dd75f90f 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/sort/ranges.sort.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/sort/ranges.sort.pass.cpp
@@ -23,7 +23,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <ranges>
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/stable.sort/pstl.stable_sort.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/stable.sort/pstl.stable_sort.pass.cpp
index 3a9e624c8e40d..e1a64f5185b5d 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/stable.sort/pstl.stable_sort.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/stable.sort/pstl.stable_sort.pass.cpp
@@ -25,14 +25,12 @@
#include <array>
#include <atomic>
#include <cassert>
-#include <iterator>
#include <vector>
-#include "MoveOnly.h"
-#include "test_execution_policies.h"
#include "test_macros.h"
+#include "test_execution_policies.h"
#include "test_iterators.h"
-#include "type_algorithms.h"
+#include "MoveOnly.h"
EXECUTION_POLICY_SFINAE_TEST(stable_sort);
diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.sort/stable.sort/ranges.stable.sort.pass.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.sort/stable.sort/ranges.stable.sort.pass.cpp
index b96e1e843641a..10e0874b3bc83 100644
--- a/libcxx/test/std/algorithms/alg.sorting/alg.sort/stable.sort/ranges.stable.sort.pass.cpp
+++ b/libcxx/test/std/algorithms/alg.sorting/alg.sort/stable.sort/ranges.stable.sort.pass.cpp
@@ -23,14 +23,12 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
#include <ranges>
#include "almost_satisfies_types.h"
#include "test_iterators.h"
-#include "test_macros.h"
// SFINAE tests.
diff --git a/libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp b/libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
index 50f8fda2a676b..01f14d79823fa 100644
--- a/libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
+++ b/libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter_alloc.pass.cpp
@@ -16,7 +16,6 @@
#include <set>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp b/libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp
index bed8d02f3e681..a7ce697335944 100644
--- a/libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp
+++ b/libcxx/test/std/containers/associative/multiset/multiset.cons/iter_iter_comp.pass.cpp
@@ -13,9 +13,8 @@
// template <class InputIterator>
// multiset(InputIterator first, InputIterator last, const value_compare& comp);
-#include <cassert>
#include <set>
-#include <iterator>
+#include <cassert>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp b/libcxx/test/std/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
index 6a3146fcd2b0a..dac553073f177 100644
--- a/libcxx/test/std/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
+++ b/libcxx/test/std/containers/associative/set/set.cons/iter_iter_alloc.pass.cpp
@@ -20,7 +20,6 @@
#include <set>
#include <cassert>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/containers/associative/set/set.cons/iter_iter_comp.pass.cpp b/libcxx/test/std/containers/associative/set/set.cons/iter_iter_comp.pass.cpp
index e1763b87ff565..573bbd316e073 100644
--- a/libcxx/test/std/containers/associative/set/set.cons/iter_iter_comp.pass.cpp
+++ b/libcxx/test/std/containers/associative/set/set.cons/iter_iter_comp.pass.cpp
@@ -13,9 +13,8 @@
// template <class InputIterator>
// set(InputIterator first, InputIterator last, const value_compare& comp);
-#include <cassert>
-#include <iterator>
#include <set>
+#include <cassert>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp
index 51da5d2d2ca4d..f2ac013987eb8 100644
--- a/libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp
+++ b/libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp
@@ -14,7 +14,6 @@
#include <vector>
#include <cassert>
#include <cstddef>
-#include <cstdint>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp
index 4e5fcd4d6757d..b43517da66f27 100644
--- a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp
@@ -27,7 +27,6 @@
#include <type_traits>
#include <string_view>
#include <cassert>
-#include <utility>
// On Windows, charset conversions cause allocations in the path class in
// cases where no allocations are done on other platforms.
diff --git a/libcxx/test/std/iterators/iterator.primitives/iterator.operations/distance.pass.cpp b/libcxx/test/std/iterators/iterator.primitives/iterator.operations/distance.pass.cpp
index dcf222267463c..d92a44f2dbe14 100644
--- a/libcxx/test/std/iterators/iterator.primitives/iterator.operations/distance.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.primitives/iterator.operations/distance.pass.cpp
@@ -20,7 +20,6 @@
#include <cassert>
#include <deque>
#include <iterator>
-#include <ranges>
#include <vector>
#include <type_traits>
diff --git a/libcxx/test/std/iterators/iterator.primitives/iterator.traits/cxx20_iterator_traits.compile.pass.cpp b/libcxx/test/std/iterators/iterator.primitives/iterator.traits/cxx20_iterator_traits.compile.pass.cpp
index e56176ca730b3..f649083b900e6 100644
--- a/libcxx/test/std/iterators/iterator.primitives/iterator.traits/cxx20_iterator_traits.compile.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.primitives/iterator.traits/cxx20_iterator_traits.compile.pass.cpp
@@ -25,7 +25,6 @@
#include <set>
#include <string>
#include <string_view>
-#include <type_traits>
#include <unordered_map>
#include <unordered_set>
#include <vector>
diff --git a/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.distance/iterator_sentinel.pass.cpp b/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.distance/iterator_sentinel.pass.cpp
index c34d59e405a9e..1b7848963a739 100644
--- a/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.distance/iterator_sentinel.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.distance/iterator_sentinel.pass.cpp
@@ -19,7 +19,6 @@
#include <cassert>
#include <deque>
#include <iterator>
-#include <ranges>
#include <vector>
#include "test_iterators.h"
diff --git a/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.distance/lwg3664.pass.cpp b/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.distance/lwg3664.pass.cpp
index 164101c2bf5a8..e2258e93966d0 100644
--- a/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.distance/lwg3664.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.distance/lwg3664.pass.cpp
@@ -15,10 +15,8 @@
// template<class I, sized_sentinel_for<decay_t<I>> S>
// constexpr iter_
diff erence_t<I> ranges::distance(const I& first, S last);
-#include <cassert>
#include <iterator>
-#include <type_traits>
-#include <utility>
+#include <cassert>
#include "test_iterators.h"
diff --git a/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.prev/iterator.pass.cpp b/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.prev/iterator.pass.cpp
index ec3eff2db512a..a29f7c9555235 100644
--- a/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.prev/iterator.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.primitives/range.iter.ops/range.iter.ops.prev/iterator.pass.cpp
@@ -12,7 +12,6 @@
#include <iterator>
#include <cassert>
-#include <utility>
#include "test_iterators.h"
diff --git a/libcxx/test/std/iterators/iterator.requirements/indirectcallable/projected/projected.compile.pass.cpp b/libcxx/test/std/iterators/iterator.requirements/indirectcallable/projected/projected.compile.pass.cpp
index c1c48d537c310..7ab92660fb068 100644
--- a/libcxx/test/std/iterators/iterator.requirements/indirectcallable/projected/projected.compile.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.requirements/indirectcallable/projected/projected.compile.pass.cpp
@@ -13,7 +13,6 @@
#include <iterator>
#include <concepts>
-#include <cstddef>
#include <functional>
#include "test_iterators.h"
diff --git a/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.bidir/bidirectional_iterator.compile.pass.cpp b/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.bidir/bidirectional_iterator.compile.pass.cpp
index b367423db7b52..7ab3a75f17ba1 100644
--- a/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.bidir/bidirectional_iterator.compile.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.bidir/bidirectional_iterator.compile.pass.cpp
@@ -14,7 +14,6 @@
#include <iterator>
#include <concepts>
-#include <cstddef>
#include "test_iterators.h"
diff --git a/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.forward/forward_iterator.compile.pass.cpp b/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.forward/forward_iterator.compile.pass.cpp
index a500757b50a2f..2df15cbd31423 100644
--- a/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.forward/forward_iterator.compile.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.forward/forward_iterator.compile.pass.cpp
@@ -13,7 +13,6 @@
#include <iterator>
#include <concepts>
-#include <cstddef>
#include "test_iterators.h"
diff --git a/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.input/input_iterator.compile.pass.cpp b/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.input/input_iterator.compile.pass.cpp
index e976e468e6f68..0c72c70a72d27 100644
--- a/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.input/input_iterator.compile.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.input/input_iterator.compile.pass.cpp
@@ -11,7 +11,6 @@
// template<class T>
// concept input_iterator;
-#include <cstddef>
#include <iterator>
#include "test_iterators.h"
diff --git a/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.iterator/input_or_output_iterator.compile.pass.cpp b/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.iterator/input_or_output_iterator.compile.pass.cpp
index 62469ea6f21e9..b8df4fb5f1d42 100644
--- a/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.iterator/input_or_output_iterator.compile.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.iterator/input_or_output_iterator.compile.pass.cpp
@@ -11,7 +11,6 @@
// template<class In>
// concept input_or_output_iterator;
-#include <cstddef>
#include <iterator>
#include "test_iterators.h"
diff --git a/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.random.access/random_access_iterator.compile.pass.cpp b/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.random.access/random_access_iterator.compile.pass.cpp
index de3912ea06f8a..e42fd8b0e4e0f 100644
--- a/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.random.access/random_access_iterator.compile.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.requirements/iterator.concepts/iterator.concept.random.access/random_access_iterator.compile.pass.cpp
@@ -11,7 +11,6 @@
// template<class T>
// concept random_access_iterator;
-#include <cstddef>
#include <iterator>
#include "test_iterators.h"
diff --git a/libcxx/test/std/iterators/iterator.requirements/iterator.cust/iterator.cust.swap/iter_swap.pass.cpp b/libcxx/test/std/iterators/iterator.requirements/iterator.cust/iterator.cust.swap/iter_swap.pass.cpp
index 65a8cf281b8e0..e6507f7e77673 100644
--- a/libcxx/test/std/iterators/iterator.requirements/iterator.cust/iterator.cust.swap/iter_swap.pass.cpp
+++ b/libcxx/test/std/iterators/iterator.requirements/iterator.cust/iterator.cust.swap/iter_swap.pass.cpp
@@ -15,8 +15,6 @@
#include <array>
#include <cassert>
-#include <type_traits>
-#include <utility>
#include "../unqualified_lookup_wrapper.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/counted.iterator/arrow.pass.cpp b/libcxx/test/std/iterators/predef.iterators/counted.iterator/arrow.pass.cpp
index 9d7b4419fba74..208d6932d86d6 100644
--- a/libcxx/test/std/iterators/predef.iterators/counted.iterator/arrow.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/counted.iterator/arrow.pass.cpp
@@ -11,7 +11,6 @@
// constexpr auto operator->() const noexcept
// requires contiguous_iterator<I>;
-#include <cassert>
#include <iterator>
#include "test_macros.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/counted.iterator/assign.pass.cpp b/libcxx/test/std/iterators/predef.iterators/counted.iterator/assign.pass.cpp
index df21d8016c1d1..cf7460911357e 100644
--- a/libcxx/test/std/iterators/predef.iterators/counted.iterator/assign.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/counted.iterator/assign.pass.cpp
@@ -12,9 +12,7 @@
// requires assignable_from<I&, const I2&>
// constexpr counted_iterator& operator=(const counted_iterator<I2>& x);
-#include <cassert>
#include <iterator>
-#include <type_traits>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/counted.iterator/base.pass.cpp b/libcxx/test/std/iterators/predef.iterators/counted.iterator/base.pass.cpp
index dfb922cd9bb89..8d3e9f3d4f473 100644
--- a/libcxx/test/std/iterators/predef.iterators/counted.iterator/base.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/counted.iterator/base.pass.cpp
@@ -11,9 +11,7 @@
// constexpr const I& base() const &;
// constexpr I base() &&;
-#include <cassert>
#include <iterator>
-#include <utility>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/counted.iterator/compare.pass.cpp b/libcxx/test/std/iterators/predef.iterators/counted.iterator/compare.pass.cpp
index eb349557d76cf..eb0c5d8864a7c 100644
--- a/libcxx/test/std/iterators/predef.iterators/counted.iterator/compare.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/counted.iterator/compare.pass.cpp
@@ -14,9 +14,7 @@
// friend constexpr bool operator==(
// const counted_iterator& x, default_sentinel_t);
-#include <cassert>
#include <iterator>
-#include <utility>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/counted.iterator/count.pass.cpp b/libcxx/test/std/iterators/predef.iterators/counted.iterator/count.pass.cpp
index 3012439ed90a5..6e161fb224db3 100644
--- a/libcxx/test/std/iterators/predef.iterators/counted.iterator/count.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/counted.iterator/count.pass.cpp
@@ -10,7 +10,6 @@
// constexpr iter_
diff erence_t<I> count() const noexcept;
-#include <cassert>
#include <iterator>
#include "test_macros.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/counted.iterator/ctor.conv.pass.cpp b/libcxx/test/std/iterators/predef.iterators/counted.iterator/ctor.conv.pass.cpp
index b6dcaf8451e92..8e1a3f6770827 100644
--- a/libcxx/test/std/iterators/predef.iterators/counted.iterator/ctor.conv.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/counted.iterator/ctor.conv.pass.cpp
@@ -12,9 +12,7 @@
// requires convertible_to<const I2&, I>
// constexpr counted_iterator(const counted_iterator<I2>& x);
-#include <cassert>
#include <iterator>
-#include <type_traits>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/counted.iterator/ctor.default.pass.cpp b/libcxx/test/std/iterators/predef.iterators/counted.iterator/ctor.default.pass.cpp
index edde9b2da9ffc..60596ad43c602 100644
--- a/libcxx/test/std/iterators/predef.iterators/counted.iterator/ctor.default.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/counted.iterator/ctor.default.pass.cpp
@@ -10,7 +10,6 @@
// constexpr counted_iterator() requires default_initializable<I> = default;
-#include <cassert>
#include <iterator>
#include "test_macros.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/counted.iterator/ctor.iter.pass.cpp b/libcxx/test/std/iterators/predef.iterators/counted.iterator/ctor.iter.pass.cpp
index b29db9b146a18..00b6fb655c9cf 100644
--- a/libcxx/test/std/iterators/predef.iterators/counted.iterator/ctor.iter.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/counted.iterator/ctor.iter.pass.cpp
@@ -14,7 +14,6 @@
// requires convertible_to<const I2&, I>
// constexpr counted_iterator(const counted_iterator<I2>& x);
-#include <cassert>
#include <iterator>
#include "test_macros.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/counted.iterator/decrement.pass.cpp b/libcxx/test/std/iterators/predef.iterators/counted.iterator/decrement.pass.cpp
index b833baed065d1..7b3c526b1280f 100644
--- a/libcxx/test/std/iterators/predef.iterators/counted.iterator/decrement.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/counted.iterator/decrement.pass.cpp
@@ -13,7 +13,6 @@
// constexpr counted_iterator operator--(int)
// requires bidirectional_iterator<I>;
-#include <cassert>
#include <iterator>
#include "test_macros.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/counted.iterator/deref.pass.cpp b/libcxx/test/std/iterators/predef.iterators/counted.iterator/deref.pass.cpp
index 3204b99a526bc..ea7083f17cf8e 100644
--- a/libcxx/test/std/iterators/predef.iterators/counted.iterator/deref.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/counted.iterator/deref.pass.cpp
@@ -12,7 +12,6 @@
// constexpr decltype(auto) operator*() const
// requires dereferenceable<const I>;
-#include <cassert>
#include <iterator>
#include "test_macros.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/counted.iterator/increment.pass.cpp b/libcxx/test/std/iterators/predef.iterators/counted.iterator/increment.pass.cpp
index 9b880871b3573..2fea2561ebf7f 100644
--- a/libcxx/test/std/iterators/predef.iterators/counted.iterator/increment.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/counted.iterator/increment.pass.cpp
@@ -13,7 +13,6 @@
// constexpr counted_iterator operator++(int)
// requires forward_iterator<I>;
-#include <cassert>
#include <iterator>
#include "test_macros.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/counted.iterator/iter_move.pass.cpp b/libcxx/test/std/iterators/predef.iterators/counted.iterator/iter_move.pass.cpp
index 8e7f77f696893..1494a9d649980 100644
--- a/libcxx/test/std/iterators/predef.iterators/counted.iterator/iter_move.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/counted.iterator/iter_move.pass.cpp
@@ -13,9 +13,7 @@
// noexcept(noexcept(ranges::iter_move(i.current)))
// requires input_iterator<I>;
-#include <cassert>
#include <iterator>
-#include <utility>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/counted.iterator/iter_swap.pass.cpp b/libcxx/test/std/iterators/predef.iterators/counted.iterator/iter_swap.pass.cpp
index 8de4c406165d7..d3057e653ef85 100644
--- a/libcxx/test/std/iterators/predef.iterators/counted.iterator/iter_swap.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/counted.iterator/iter_swap.pass.cpp
@@ -13,9 +13,7 @@
// iter_swap(const counted_iterator& x, const counted_iterator<I2>& y)
// noexcept(noexcept(ranges::iter_swap(x.current, y.current)));
-#include <cassert>
#include <iterator>
-#include <utility>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/counted.iterator/iterator_traits.compile.pass.cpp b/libcxx/test/std/iterators/predef.iterators/counted.iterator/iterator_traits.compile.pass.cpp
index 9d3c70814e03b..8675c532f82b7 100644
--- a/libcxx/test/std/iterators/predef.iterators/counted.iterator/iterator_traits.compile.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/counted.iterator/iterator_traits.compile.pass.cpp
@@ -15,7 +15,6 @@
// add_pointer_t<iter_reference_t<I>>, void>;
// };
-#include <cstddef>
#include <iterator>
#include "test_macros.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/counted.iterator/member_types.compile.pass.cpp b/libcxx/test/std/iterators/predef.iterators/counted.iterator/member_types.compile.pass.cpp
index 39d89334a636c..569b57c6bffc2 100644
--- a/libcxx/test/std/iterators/predef.iterators/counted.iterator/member_types.compile.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/counted.iterator/member_types.compile.pass.cpp
@@ -10,7 +10,6 @@
// iterator_type, value_type,
diff erence_type, iterator_concept, iterator_category
-#include <cstddef>
#include <iterator>
#include "test_macros.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/counted.iterator/minus.default_sentinel.pass.cpp b/libcxx/test/std/iterators/predef.iterators/counted.iterator/minus.default_sentinel.pass.cpp
index d972c6feb187d..7eb4ff402e479 100644
--- a/libcxx/test/std/iterators/predef.iterators/counted.iterator/minus.default_sentinel.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/counted.iterator/minus.default_sentinel.pass.cpp
@@ -13,7 +13,6 @@
// friend constexpr iter_
diff erence_t<I> operator-(
// default_sentinel_t, const counted_iterator& y);
-#include <cassert>
#include <iterator>
#include "test_macros.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/counted.iterator/minus.eq.pass.cpp b/libcxx/test/std/iterators/predef.iterators/counted.iterator/minus.eq.pass.cpp
index 912025a1d857e..854c36a8c35be 100644
--- a/libcxx/test/std/iterators/predef.iterators/counted.iterator/minus.eq.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/counted.iterator/minus.eq.pass.cpp
@@ -11,7 +11,6 @@
// constexpr counted_iterator& operator-=(iter_
diff erence_t<I> n)
// requires random_access_iterator<I>;
-#include <cassert>
#include <iterator>
#include "test_macros.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/counted.iterator/minus.iter.pass.cpp b/libcxx/test/std/iterators/predef.iterators/counted.iterator/minus.iter.pass.cpp
index af24c39628072..f2767a960ffbd 100644
--- a/libcxx/test/std/iterators/predef.iterators/counted.iterator/minus.iter.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/counted.iterator/minus.iter.pass.cpp
@@ -12,7 +12,6 @@
// friend constexpr iter_
diff erence_t<I2> operator-(
// const counted_iterator& x, const counted_iterator<I2>& y);
-#include <cassert>
#include <iterator>
#include "test_macros.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/counted.iterator/minus.size.pass.cpp b/libcxx/test/std/iterators/predef.iterators/counted.iterator/minus.size.pass.cpp
index d755b5c6cf972..e6fa733eb0e0a 100644
--- a/libcxx/test/std/iterators/predef.iterators/counted.iterator/minus.size.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/counted.iterator/minus.size.pass.cpp
@@ -11,7 +11,6 @@
// constexpr counted_iterator operator-(iter_
diff erence_t<I> n) const
// requires random_access_iterator<I>;
-#include <cassert>
#include <iterator>
#include "test_macros.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/counted.iterator/plus.pass.cpp b/libcxx/test/std/iterators/predef.iterators/counted.iterator/plus.pass.cpp
index 277b0bff97cfd..a397a8717b89a 100644
--- a/libcxx/test/std/iterators/predef.iterators/counted.iterator/plus.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/counted.iterator/plus.pass.cpp
@@ -16,9 +16,7 @@
// constexpr counted_iterator& operator+=(iter_
diff erence_t<I> n)
// requires random_access_iterator<I>;
-#include <cassert>
#include <iterator>
-#include <type_traits>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/counted.iterator/subscript.pass.cpp b/libcxx/test/std/iterators/predef.iterators/counted.iterator/subscript.pass.cpp
index 0b28a6d7a32b3..7e1c320c0ca78 100644
--- a/libcxx/test/std/iterators/predef.iterators/counted.iterator/subscript.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/counted.iterator/subscript.pass.cpp
@@ -11,7 +11,6 @@
// constexpr decltype(auto) operator[](iter_
diff erence_t<I> n) const
// requires random_access_iterator<I>;
-#include <cassert>
#include <iterator>
#include "test_macros.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/counted.iterator/three_way_compare.pass.cpp b/libcxx/test/std/iterators/predef.iterators/counted.iterator/three_way_compare.pass.cpp
index e97dd7156bb3d..38df872fd1650 100644
--- a/libcxx/test/std/iterators/predef.iterators/counted.iterator/three_way_compare.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/counted.iterator/three_way_compare.pass.cpp
@@ -12,7 +12,6 @@
// friend constexpr strong_ordering operator<=>(
// const counted_iterator& x, const counted_iterator<I2>& y);
-#include <cassert>
#include <iterator>
#include "test_macros.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/iterators.common/ctor.default.pass.cpp b/libcxx/test/std/iterators/predef.iterators/iterators.common/ctor.default.pass.cpp
index fce22c18feec8..b7b02be51f6df 100644
--- a/libcxx/test/std/iterators/predef.iterators/iterators.common/ctor.default.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/iterators.common/ctor.default.pass.cpp
@@ -10,9 +10,8 @@
// constexpr common_iterator() requires default_initializable<I> = default;
-#include <cassert>
#include <iterator>
-#include <type_traits>
+#include <cassert>
#include "test_iterators.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/iterators.common/ctor.iter.pass.cpp b/libcxx/test/std/iterators/predef.iterators/iterators.common/ctor.iter.pass.cpp
index 3ad6e5149453e..57d89e3c2e1b8 100644
--- a/libcxx/test/std/iterators/predef.iterators/iterators.common/ctor.iter.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/iterators.common/ctor.iter.pass.cpp
@@ -12,7 +12,6 @@
#include <iterator>
#include <cassert>
-#include <utility>
#include "test_iterators.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/iterators.common/ctor.sentinel.pass.cpp b/libcxx/test/std/iterators/predef.iterators/iterators.common/ctor.sentinel.pass.cpp
index cc678642d81c9..6e1c2130c9c91 100644
--- a/libcxx/test/std/iterators/predef.iterators/iterators.common/ctor.sentinel.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/iterators.common/ctor.sentinel.pass.cpp
@@ -13,7 +13,6 @@
#include <iterator>
#include <cassert>
#include <type_traits>
-#include <utility>
#include "test_iterators.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/iterators.common/types.h b/libcxx/test/std/iterators/predef.iterators/iterators.common/types.h
index f5717f3eb3df3..c51b70520fda8 100644
--- a/libcxx/test/std/iterators/predef.iterators/iterators.common/types.h
+++ b/libcxx/test/std/iterators/predef.iterators/iterators.common/types.h
@@ -9,8 +9,6 @@
#ifndef TEST_STD_RANGES_ITERATORS_PREDEF_ITERATORS_ITERATORS_COMMON_TYPES_H
#define TEST_STD_RANGES_ITERATORS_PREDEF_ITERATORS_ITERATORS_COMMON_TYPES_H
-#include <utility>
-
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/iter_move.pass.cpp b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/iter_move.pass.cpp
index d7d1d660359ab..e0f63ac594367 100644
--- a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/iter_move.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/iter_move.pass.cpp
@@ -17,10 +17,8 @@
#include <iterator>
#include <cassert>
-#include <cstddef>
#include <type_traits>
#include <utility>
-
#include "test_iterators.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/iter_swap.pass.cpp b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/iter_swap.pass.cpp
index f7e82c8718450..aa0815390391c 100644
--- a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/iter_swap.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.nonmember/iter_swap.pass.cpp
@@ -18,10 +18,8 @@
#include <iterator>
#include <cassert>
-#include <cstddef>
#include <type_traits>
#include <utility>
-
#include "test_iterators.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp
index 3955ebd9d2ac2..f7830f73e5248 100644
--- a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.pass.cpp
@@ -16,7 +16,6 @@
#include <iterator>
#include <cassert>
-#include <type_traits>
#include <utility>
#include "test_macros.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.conv/base.pass.cpp b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.conv/base.pass.cpp
index 4144107889166..6e348b59be16b 100644
--- a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.conv/base.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.conv/base.pass.cpp
@@ -12,12 +12,9 @@
// constexpr const Iterator& base() const & noexcept; // From C++20
// constexpr Iterator base() &&; // From C++20
-#include <cassert>
-#include <cstddef>
#include <iterator>
-#include <type_traits>
-#include <utility>
+#include <utility>
#include "test_iterators.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp
index 8cb99be391d03..8b92eb25761bf 100644
--- a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iterator/types.pass.cpp
@@ -24,7 +24,6 @@
// using reference = iter_rvalue_reference_t<Iterator>; // Until C++20, value_type&&
// };
-#include <cstddef>
#include <functional>
#include <iterator>
#include <type_traits>
diff --git a/libcxx/test/std/iterators/predef.iterators/move.iterators/sized_sentinel.compile.pass.cpp b/libcxx/test/std/iterators/predef.iterators/move.iterators/sized_sentinel.compile.pass.cpp
index d72b1e8977203..998b13ed49455 100644
--- a/libcxx/test/std/iterators/predef.iterators/move.iterators/sized_sentinel.compile.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/move.iterators/sized_sentinel.compile.pass.cpp
@@ -8,7 +8,6 @@
// UNSUPPORTED: c++03, c++11, c++14, c++17
-#include <cstddef>
#include <iterator>
#include "test_iterators.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/reverse.iterators/reverse.iter.nonmember/iter_move.pass.cpp b/libcxx/test/std/iterators/predef.iterators/reverse.iterators/reverse.iter.nonmember/iter_move.pass.cpp
index d6e9a4abef8cc..5e35f5c8facc4 100644
--- a/libcxx/test/std/iterators/predef.iterators/reverse.iterators/reverse.iter.nonmember/iter_move.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/reverse.iterators/reverse.iter.nonmember/iter_move.pass.cpp
@@ -18,10 +18,8 @@
#include <iterator>
#include <cassert>
-#include <cstddef>
#include <type_traits>
#include <utility>
-
#include "test_iterators.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/iterators/predef.iterators/reverse.iterators/reverse.iter.nonmember/iter_swap.pass.cpp b/libcxx/test/std/iterators/predef.iterators/reverse.iterators/reverse.iter.nonmember/iter_swap.pass.cpp
index d420d0f53b5ef..7b6fb43b0001f 100644
--- a/libcxx/test/std/iterators/predef.iterators/reverse.iterators/reverse.iter.nonmember/iter_swap.pass.cpp
+++ b/libcxx/test/std/iterators/predef.iterators/reverse.iterators/reverse.iter.nonmember/iter_swap.pass.cpp
@@ -20,10 +20,8 @@
#include <iterator>
#include <cassert>
-#include <cstddef>
#include <type_traits>
#include <utility>
-
#include "test_iterators.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp
index 00c766e2e2d57..57607e6d6a521 100644
--- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_pointer.pass.cpp
@@ -19,7 +19,6 @@
#include <locale>
#include "test_iterators.h"
-#include "test_macros.h"
typedef std::num_put<char, cpp17_output_iterator<char*> > F;
diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/test_neg_one.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/test_neg_one.pass.cpp
index 941148189fbe1..5eb7c92daec2a 100644
--- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/test_neg_one.pass.cpp
+++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/test_neg_one.pass.cpp
@@ -19,7 +19,6 @@
#include <cassert>
#include <streambuf>
#include <sstream>
-#include <type_traits>
#include "test_iterators.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.iota/ranges.iota.pass.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.iota/ranges.iota.pass.cpp
index 53f9c0815b26a..9fa50f1326f1d 100644
--- a/libcxx/test/std/numerics/numeric.ops/numeric.iota/ranges.iota.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/numeric.iota/ranges.iota.pass.cpp
@@ -19,7 +19,6 @@
#include "almost_satisfies_types.h"
#include "test_iterators.h"
#include "test_macros.h"
-#include "type_algorithms.h"
//
// Testing constraints
diff --git a/libcxx/test/std/numerics/numeric.ops/reduce/pstl.reduce.pass.cpp b/libcxx/test/std/numerics/numeric.ops/reduce/pstl.reduce.pass.cpp
index bf37bbef447e9..f5748d7c823b7 100644
--- a/libcxx/test/std/numerics/numeric.ops/reduce/pstl.reduce.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/reduce/pstl.reduce.pass.cpp
@@ -21,8 +21,6 @@
// ForwardIterator first, ForwardIterator last, T init,
// BinaryOperation binary_op);
-#include <cassert>
-#include <iterator>
#include <numeric>
#include <vector>
@@ -30,7 +28,6 @@
#include "test_execution_policies.h"
#include "test_iterators.h"
#include "test_macros.h"
-#include "type_algorithms.h"
template <class Iter, class ValueT>
struct Test {
diff --git a/libcxx/test/std/numerics/numeric.ops/reduce/reduce.pass.cpp b/libcxx/test/std/numerics/numeric.ops/reduce/reduce.pass.cpp
index a4496f9c88a56..53a595e0bed30 100644
--- a/libcxx/test/std/numerics/numeric.ops/reduce/reduce.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/reduce/reduce.pass.cpp
@@ -17,8 +17,6 @@
#include <numeric>
#include <cassert>
-#include <iterator>
-#include <type_traits>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/numerics/numeric.ops/reduce/reduce_init.pass.cpp b/libcxx/test/std/numerics/numeric.ops/reduce/reduce_init.pass.cpp
index 17491a9d9de18..59590b1a1fa69 100644
--- a/libcxx/test/std/numerics/numeric.ops/reduce/reduce_init.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/reduce/reduce_init.pass.cpp
@@ -14,9 +14,8 @@
// template<class InputIterator, class T>
// T reduce(InputIterator first, InputIterator last, T init);
-#include <cassert>
#include <numeric>
-#include <type_traits>
+#include <cassert>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/numerics/numeric.ops/reduce/reduce_init_op.pass.cpp b/libcxx/test/std/numerics/numeric.ops/reduce/reduce_init_op.pass.cpp
index 2c8346bf38a6f..347d3755a07cf 100644
--- a/libcxx/test/std/numerics/numeric.ops/reduce/reduce_init_op.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/reduce/reduce_init_op.pass.cpp
@@ -17,8 +17,6 @@
#include <numeric>
#include <cassert>
#include <functional>
-#include <initializer_list>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/numerics/numeric.ops/transform.reduce/pstl.transform_reduce.binary.pass.cpp b/libcxx/test/std/numerics/numeric.ops/transform.reduce/pstl.transform_reduce.binary.pass.cpp
index 0c84a6149cadb..6d8bb47ac7dc1 100644
--- a/libcxx/test/std/numerics/numeric.ops/transform.reduce/pstl.transform_reduce.binary.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/transform.reduce/pstl.transform_reduce.binary.pass.cpp
@@ -29,7 +29,6 @@
// BinaryOperation1 binary_op1,
// BinaryOperation2 binary_op2);
-#include <cassert>
#include <numeric>
#include <vector>
diff --git a/libcxx/test/std/numerics/numeric.ops/transform.reduce/pstl.transform_reduce.unary.pass.cpp b/libcxx/test/std/numerics/numeric.ops/transform.reduce/pstl.transform_reduce.unary.pass.cpp
index 3bf8a7138fd62..4cea3d405aa02 100644
--- a/libcxx/test/std/numerics/numeric.ops/transform.reduce/pstl.transform_reduce.unary.pass.cpp
+++ b/libcxx/test/std/numerics/numeric.ops/transform.reduce/pstl.transform_reduce.unary.pass.cpp
@@ -19,7 +19,6 @@
// ForwardIterator first, ForwardIterator last,
// T init, BinaryOperation binary_op, UnaryOperation unary_op);
-#include <cassert>
#include <numeric>
#include <string>
#include <vector>
@@ -27,7 +26,7 @@
#include "MoveOnly.h"
#include "test_execution_policies.h"
#include "test_iterators.h"
-#include "type_algorithms.h"
+#include "test_macros.h"
template <class Iter1, class ValueT>
struct Test {
diff --git a/libcxx/test/std/ranges/range.access/size.pass.cpp b/libcxx/test/std/ranges/range.access/size.pass.cpp
index 0524c784530eb..ee44aa815ba99 100644
--- a/libcxx/test/std/ranges/range.access/size.pass.cpp
+++ b/libcxx/test/std/ranges/range.access/size.pass.cpp
@@ -13,8 +13,6 @@
#include <ranges>
#include <cassert>
-#include <utility>
-
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/ranges/range.access/ssize.pass.cpp b/libcxx/test/std/ranges/range.access/ssize.pass.cpp
index 9fe281b275863..ac2c5b7b6b764 100644
--- a/libcxx/test/std/ranges/range.access/ssize.pass.cpp
+++ b/libcxx/test/std/ranges/range.access/ssize.pass.cpp
@@ -13,8 +13,6 @@
#include <ranges>
#include <cassert>
-#include <type_traits>
-
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.adaptor.object/range_adaptor_closure.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.adaptor.object/range_adaptor_closure.pass.cpp
index 6fec182d3b5a9..9d1eb12434581 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.adaptor.object/range_adaptor_closure.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.adaptor.object/range_adaptor_closure.pass.cpp
@@ -13,7 +13,6 @@
#include <ranges>
#include <algorithm>
-#include <cassert>
#include <vector>
#include "test_range.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/iterator/ctor.other.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/iterator/ctor.other.pass.cpp
index 3c09ae8b3cde3..36c2456e459db 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/iterator/ctor.other.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/iterator/ctor.other.pass.cpp
@@ -15,7 +15,6 @@
#include <cassert>
#include <tuple>
-#include <utility>
#include "../helpers.h"
#include "../../range_adaptor_types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/iterator/member_types.compile.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/iterator/member_types.compile.pass.cpp
index 684569516d747..f8f20919fbf4b 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/iterator/member_types.compile.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/iterator/member_types.compile.pass.cpp
@@ -15,7 +15,6 @@
#include <ranges>
#include <tuple>
#include <type_traits>
-#include <utility>
#include "test_iterators.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/sentinel/ctor.other.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/sentinel/ctor.other.pass.cpp
index eda06c00ecba3..d06534ea52d52 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/sentinel/ctor.other.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/sentinel/ctor.other.pass.cpp
@@ -13,7 +13,6 @@
#include <cassert>
#include <ranges>
-#include <utility>
#include "../helpers.h"
#include "../../range_adaptor_types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/sentinel/eq.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/sentinel/eq.pass.cpp
index c7379be794b18..d7510a099c806 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/sentinel/eq.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/sentinel/eq.pass.cpp
@@ -16,7 +16,6 @@
#include <compare>
#include <ranges>
#include <tuple>
-#include <utility>
#include "../helpers.h"
#include "../../range_adaptor_types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/sentinel/minus.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/sentinel/minus.pass.cpp
index 6dc7a4a72e919..bed863a65d47d 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/sentinel/minus.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/sentinel/minus.pass.cpp
@@ -23,7 +23,6 @@
#include <functional>
#include <ranges>
#include <tuple>
-#include <utility>
#include "../helpers.h"
#include "../../range_adaptor_types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/size.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/size.pass.cpp
index a12f6e0914f96..12cdf52d711bd 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/size.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.adjacent.transform/size.pass.cpp
@@ -12,7 +12,6 @@
// constexpr auto size() const requires sized_range<const InnerView>
#include <ranges>
-#include <utility>
#include "test_macros.h"
#include "helpers.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.adjacent/adaptor.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.adjacent/adaptor.pass.cpp
index 8e72871649d51..5fd4e803955ad 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.adjacent/adaptor.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.adjacent/adaptor.pass.cpp
@@ -10,7 +10,6 @@
// Test std::views::adjacent<N>
-#include <cassert>
#include <concepts>
#include <cstddef>
#include <iterator>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.adjacent/ctor.views.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.adjacent/ctor.views.pass.cpp
index 62e179515fa6d..6add56fe7a2d5 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.adjacent/ctor.views.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.adjacent/ctor.views.pass.cpp
@@ -10,7 +10,6 @@
// constexpr explicit adjacent_view(View)
-#include <cassert>
#include <ranges>
#include <tuple>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/arithmetic.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/arithmetic.pass.cpp
index 880c06d614438..671a5c3fec4d0 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/arithmetic.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/arithmetic.pass.cpp
@@ -21,7 +21,6 @@
// friend constexpr
diff erence_type operator-(const iterator& x, const iterator& y)
// requires sized_sentinel_for<iterator_t<Base>, iterator_t<Base>>;
-#include <cassert>
#include <iterator>
#include <ranges>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/compare.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/compare.pass.cpp
index ceea9e3cf5abd..8461d7fa4a53c 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/compare.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/compare.pass.cpp
@@ -21,7 +21,6 @@
// requires random_access_range<Base> &&
// three_way_comparable<iterator_t<Base>>;
-#include <cassert>
#include <ranges>
#include <compare>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/ctor.default.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/ctor.default.pass.cpp
index 48aa71751ef95..8cb005a9d3f8f 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/ctor.default.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/ctor.default.pass.cpp
@@ -10,7 +10,6 @@
// iterator() = default;
-#include <cassert>
#include <ranges>
#include <tuple>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/ctor.other.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/ctor.other.pass.cpp
index 510c3ce5c7b73..db70e1affe3ee 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/ctor.other.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/ctor.other.pass.cpp
@@ -15,7 +15,6 @@
#include <cassert>
#include <tuple>
-#include <utility>
#include "../../range_adaptor_types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/member_types.compile.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/member_types.compile.pass.cpp
index f333d0200365e..b24c730e1197f 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/member_types.compile.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/member_types.compile.pass.cpp
@@ -14,7 +14,6 @@
#include <iterator>
#include <ranges>
#include <tuple>
-#include <utility>
#include "test_iterators.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/singular.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/singular.pass.cpp
index 7db80b412d58d..c1cc9498d39e1 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/singular.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.adjacent/iterator/singular.pass.cpp
@@ -12,7 +12,6 @@
// [range.adjacent.iterator#2] If the invocation of any non-const member function of `iterator` exits via an
// exception, the iterator acquires a singular value.
-#include <cassert>
#include <ranges>
#include <tuple>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.adjacent/sentinel/ctor.other.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.adjacent/sentinel/ctor.other.pass.cpp
index de411975b3e40..7a3ebbd94ca9d 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.adjacent/sentinel/ctor.other.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.adjacent/sentinel/ctor.other.pass.cpp
@@ -13,7 +13,6 @@
#include <cassert>
#include <ranges>
-#include <utility>
#include "../../range_adaptor_types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.adjacent/sentinel/eq.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.adjacent/sentinel/eq.pass.cpp
index fad9e20e3bfa5..a79107c69fb4b 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.adjacent/sentinel/eq.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.adjacent/sentinel/eq.pass.cpp
@@ -16,7 +16,6 @@
#include <compare>
#include <ranges>
#include <tuple>
-#include <utility>
#include "../../range_adaptor_types.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.adjacent/sentinel/minus.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.adjacent/sentinel/minus.pass.cpp
index 2b21ebc6605da..9f3fada6013cb 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.adjacent/sentinel/minus.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.adjacent/sentinel/minus.pass.cpp
@@ -23,7 +23,6 @@
#include <functional>
#include <ranges>
#include <tuple>
-#include <utility>
#include "../../range_adaptor_types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.adjacent/size.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.adjacent/size.pass.cpp
index 44beb12618018..79b20e56f53f3 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.adjacent/size.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.adjacent/size.pass.cpp
@@ -11,9 +11,7 @@
// constexpr auto size() requires sized_range<View>
// constexpr auto size() const requires sized_range<const View>
-#include <cassert>
#include <ranges>
-#include <utility>
#include "test_macros.h"
#include "../range_adaptor_types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.all/all_t.compile.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.all/all_t.compile.pass.cpp
index 64f097a2cc7b2..703467611b974 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.all/all_t.compile.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.all/all_t.compile.pass.cpp
@@ -14,7 +14,6 @@
#include <ranges>
#include "test_iterators.h"
-#include "test_macros.h"
struct View : std::ranges::view_base {
int *begin() const;
diff --git a/libcxx/test/std/ranges/range.adaptors/range.all/range.owning.view/begin_end.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.all/range.owning.view/begin_end.pass.cpp
index 90b471b7732fd..2dddd84d8796e 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.all/range.owning.view/begin_end.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.all/range.owning.view/begin_end.pass.cpp
@@ -20,7 +20,6 @@
#include <cassert>
#include <concepts>
#include <memory>
-#include <utility>
#include "test_iterators.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.all/range.owning.view/data.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.all/range.owning.view/data.pass.cpp
index 0b6547177eabd..568371dd5c7d4 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.all/range.owning.view/data.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.all/range.owning.view/data.pass.cpp
@@ -16,7 +16,6 @@
#include <array>
#include <cassert>
#include <concepts>
-#include <utility>
#include "test_iterators.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.all/range.owning.view/empty.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.all/range.owning.view/empty.pass.cpp
index 42418c7d2c2ca..349233f037b74 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.all/range.owning.view/empty.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.all/range.owning.view/empty.pass.cpp
@@ -16,7 +16,6 @@
#include <array>
#include <cassert>
#include <concepts>
-#include <utility>
#include "test_iterators.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.all/range.owning.view/size.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.all/range.owning.view/size.pass.cpp
index eab261175cf71..20f3eaae31c36 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.all/range.owning.view/size.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.all/range.owning.view/size.pass.cpp
@@ -16,7 +16,6 @@
#include <array>
#include <cassert>
#include <concepts>
-#include <utility>
#include "test_iterators.h"
#include "test_macros.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.as.rvalue/begin.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.as.rvalue/begin.pass.cpp
index 7bf0aedea383e..db846b25b9551 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.as.rvalue/begin.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.as.rvalue/begin.pass.cpp
@@ -17,7 +17,6 @@
#include <ranges>
#include "test_iterators.h"
-#include "type_algorithms.h"
struct SimpleView : std::ranges::view_base {
int* begin() const;
diff --git a/libcxx/test/std/ranges/range.adaptors/range.as.rvalue/end.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.as.rvalue/end.pass.cpp
index 877d515638462..529a609a3bbe1 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.as.rvalue/end.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.as.rvalue/end.pass.cpp
@@ -16,7 +16,6 @@
#include <ranges>
#include "test_iterators.h"
-#include "type_algorithms.h"
struct DefaultConstructibleView : std::ranges::view_base {
int* begin() const;
diff --git a/libcxx/test/std/ranges/range.adaptors/range.chunk.by/begin.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.chunk.by/begin.pass.cpp
index 2fa9218272fee..d2d1d313cebe9 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.chunk.by/begin.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.chunk.by/begin.pass.cpp
@@ -18,7 +18,6 @@
#include <utility>
#include "test_iterators.h"
-#include "test_macros.h"
#include "types.h"
struct Range : std::ranges::view_base {
diff --git a/libcxx/test/std/ranges/range.adaptors/range.chunk.by/end.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.chunk.by/end.pass.cpp
index da46897a29869..61ea0c7471953 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.chunk.by/end.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.chunk.by/end.pass.cpp
@@ -19,7 +19,6 @@
#include <functional>
#include "test_iterators.h"
-#include "test_macros.h"
struct NonCommonRange : std::ranges::view_base {
using Iterator = forward_iterator<int*>;
diff --git a/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/compare.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/compare.pass.cpp
index 08ce289c2bc9e..8757d63b6d9ae 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/compare.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/compare.pass.cpp
@@ -24,7 +24,6 @@
#include "../types.h"
#include "test_iterators.h"
#include "test_macros.h"
-#include "type_algorithms.h"
template <class Iter, class Sent = sentinel_wrapper<Iter>>
constexpr void test() {
diff --git a/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/types.compile.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/types.compile.pass.cpp
index 2631a44be9ff9..2093936ccf799 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/types.compile.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.chunk.by/range.chunk.by.iter/types.compile.pass.cpp
@@ -22,7 +22,6 @@
#include "../types.h"
#include "test_iterators.h"
-#include "type_algorithms.h"
struct TestValueTypeAndDifferenceType {
template <class Iter>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.drop/base.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.drop/base.pass.cpp
index 5fcd1a78961f5..eaf2e7d22130e 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.drop/base.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.drop/base.pass.cpp
@@ -11,7 +11,6 @@
// constexpr V base() const& requires copy_constructible<V> { return base_; }
// constexpr V base() && { return std::move(base_); }
-#include <cassert>
#include <ranges>
#include "test_macros.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.drop/begin.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.drop/begin.pass.cpp
index e02f2b976afe4..7e01b5884728f 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.drop/begin.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.drop/begin.pass.cpp
@@ -14,9 +14,7 @@
// constexpr auto begin() const
// requires random_access_range<const V> && sized_range<const V>;
-#include <cassert>
#include <ranges>
-#include <utility>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.drop/ctor.default.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.drop/ctor.default.pass.cpp
index 70414604a5174..ba6e2eb7582a3 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.drop/ctor.default.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.drop/ctor.default.pass.cpp
@@ -10,7 +10,6 @@
// drop_view() requires default_initializable<V> = default;
-#include <cassert>
#include <ranges>
#include "test_macros.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.drop/ctor.view.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.drop/ctor.view.pass.cpp
index aeb31ae2fec4b..4f4257f9102cb 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.drop/ctor.view.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.drop/ctor.view.pass.cpp
@@ -10,7 +10,6 @@
// constexpr drop_view(V base, range_
diff erence_t<V> count); // explicit since C++23
-#include <cassert>
#include <ranges>
#include "test_convertible.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.drop/dangling.cache.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.drop/dangling.cache.pass.cpp
index f45e6e40d3e31..caf64c231c347 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.drop/dangling.cache.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.drop/dangling.cache.pass.cpp
@@ -14,7 +14,6 @@
#include <ranges>
-#include <cassert>
#include <cstddef>
#include <cstring>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.drop/end.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.drop/end.pass.cpp
index 3d835520c8aae..62182ad98d459 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.drop/end.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.drop/end.pass.cpp
@@ -13,7 +13,6 @@
// constexpr auto end() const
// requires range<const V>
-#include <cassert>
#include <ranges>
#include "test_macros.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.drop/size.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.drop/size.pass.cpp
index 2914f9771dee6..8647bfa296a31 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.drop/size.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.drop/size.pass.cpp
@@ -13,7 +13,6 @@
// constexpr auto size() const
// requires sized_range<const V>
-#include <cassert>
#include <ranges>
#include "test_macros.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.elements/iterator/arithmetic.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.elements/iterator/arithmetic.pass.cpp
index ce068c64387f4..7a4ce83f1a9f6 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.elements/iterator/arithmetic.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.elements/iterator/arithmetic.pass.cpp
@@ -28,7 +28,6 @@
#include <ranges>
-#include <cassert>
#include <tuple>
#include "test_iterators.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.elements/iterator/compare.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.elements/iterator/compare.pass.cpp
index 83ecb6e24a7c2..4dd52a80a0eba 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.elements/iterator/compare.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.elements/iterator/compare.pass.cpp
@@ -21,7 +21,6 @@
// friend constexpr auto operator<=>(const iterator& x, const iterator& y)
// requires random_access_range<Base> && three_way_comparable<iterator_t<Base>>;
-#include <cassert>
#include <compare>
#include <functional>
#include <ranges>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.elements/iterator/ctor.default.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.elements/iterator/ctor.default.pass.cpp
index 902b3ac1ce434..11da4843270bf 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.elements/iterator/ctor.default.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.elements/iterator/ctor.default.pass.cpp
@@ -10,7 +10,6 @@
// iterator() requires default_initializable<iterator_t<Base>> = default;
-#include <cassert>
#include <ranges>
#include <tuple>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.elements/sentinel/equality.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.elements/sentinel/equality.pass.cpp
index fd6d87b509786..d8a3149398bf7 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.elements/sentinel/equality.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.elements/sentinel/equality.pass.cpp
@@ -15,7 +15,6 @@
#include <array>
#include <cassert>
#include <ranges>
-#include <utility>
#include "../types.h"
#include "test_range.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.elements/sentinel/minus.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.elements/sentinel/minus.pass.cpp
index 6857eacf8def9..343bf80346302 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.elements/sentinel/minus.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.elements/sentinel/minus.pass.cpp
@@ -24,7 +24,6 @@
#include <functional>
#include <ranges>
#include <tuple>
-#include <utility>
#include "../types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.elements/types.h b/libcxx/test/std/ranges/range.adaptors/range.elements/types.h
index 5e2d727a9f772..4c4084695ff33 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.elements/types.h
+++ b/libcxx/test/std/ranges/range.adaptors/range.elements/types.h
@@ -10,7 +10,6 @@
#define TEST_STD_RANGES_RANGE_ADAPTORS_RANGE_ELEMENTS_TYPES_H
#include <array>
-#include <cstdint>
#include <functional>
#include <ranges>
#include <tuple>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.filter/begin.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.filter/begin.pass.cpp
index d06d58a6558d6..478462795a4a3 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.filter/begin.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.filter/begin.pass.cpp
@@ -13,9 +13,7 @@
#include <ranges>
#include <cassert>
-
#include "test_iterators.h"
-#include "test_macros.h"
#include "types.h"
struct Range : std::ranges::view_base {
diff --git a/libcxx/test/std/ranges/range.adaptors/range.filter/end.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.filter/end.pass.cpp
index 61a221e2dea90..8c692fe60804f 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.filter/end.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.filter/end.pass.cpp
@@ -15,9 +15,7 @@
#include <cassert>
#include <concepts>
#include <type_traits>
-
#include "test_iterators.h"
-#include "test_macros.h"
struct Range : std::ranges::view_base {
using Iterator = forward_iterator<int*>;
diff --git a/libcxx/test/std/ranges/range.adaptors/range.join.with/range.join.with.overview/adaptor.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.join.with/range.join.with.overview/adaptor.pass.cpp
index d247a94dbfc25..da53bfaaa5a52 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.join.with/range.join.with.overview/adaptor.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.join.with/range.join.with.overview/adaptor.pass.cpp
@@ -14,7 +14,6 @@
#include <ranges>
-#include <cassert>
#include <memory>
#include <span>
#include <string_view>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.join.with/range.join.with.view/begin.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.join.with/range.join.with.view/begin.pass.cpp
index 8f32d5e4e9724..22872c20773a4 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.join.with/range.join.with.view/begin.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.join.with/range.join.with.view/begin.pass.cpp
@@ -21,7 +21,6 @@
#include <algorithm>
#include <array>
-#include <cassert>
#include <string>
#include <vector>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.join.with/range.join.with.view/end.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.join.with/range.join.with.view/end.pass.cpp
index ffe0a28d637dd..c6e973abfface 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.join.with/range.join.with.view/end.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.join.with/range.join.with.view/end.pass.cpp
@@ -21,7 +21,6 @@
#include <ranges>
#include <algorithm>
-#include <cassert>
#include <string>
#include <vector>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.join/begin.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.join/begin.pass.cpp
index 48f3eb4ea9ca5..005d0d1d2d5cb 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.join/begin.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.join/begin.pass.cpp
@@ -18,7 +18,6 @@
#include <cassert>
#include <ranges>
#include <string_view>
-#include <utility>
#include "types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.join/end.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.join/end.pass.cpp
index a4348832c14ca..516ba25a0e859 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.join/end.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.join/end.pass.cpp
@@ -17,7 +17,6 @@
#include <cassert>
#include <ranges>
#include <type_traits>
-#include <utility>
#include "test_macros.h"
#include "types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.join/range.join.iterator/ctor.other.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.join/range.join.iterator/ctor.other.pass.cpp
index 617fc5640d1da..e220b2cfeac84 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.join/range.join.iterator/ctor.other.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.join/range.join.iterator/ctor.other.pass.cpp
@@ -15,7 +15,6 @@
#include <cassert>
#include <ranges>
-#include <utility>
#include "test_macros.h"
#include "../types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.join/range.join.iterator/eq.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.join/range.join.iterator/eq.pass.cpp
index f02fa50fa4864..5c831f33e67c7 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.join/range.join.iterator/eq.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.join/range.join.iterator/eq.pass.cpp
@@ -14,7 +14,6 @@
#include <cassert>
#include <ranges>
-#include <utility>
#include "../types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.join/range.join.sentinel/ctor.other.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.join/range.join.sentinel/ctor.other.pass.cpp
index 3b67f46164985..8e78c3732e208 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.join/range.join.sentinel/ctor.other.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.join/range.join.sentinel/ctor.other.pass.cpp
@@ -13,7 +13,6 @@
#include <cassert>
#include <ranges>
-#include <utility>
#include "../types.h"
#include "test_range.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.join/range.join.sentinel/eq.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.join/range.join.sentinel/eq.pass.cpp
index e280cc766dd0f..9d6cb76902622 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.join/range.join.sentinel/eq.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.join/range.join.sentinel/eq.pass.cpp
@@ -17,7 +17,6 @@
#include <functional>
#include <ranges>
#include <type_traits>
-#include <utility>
#include "../types.h"
#include "test_range.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.inner/base.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.inner/base.pass.cpp
index 78e8c1f9db76c..24ce2e9b4533c 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.inner/base.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.inner/base.pass.cpp
@@ -15,7 +15,6 @@
#include <ranges>
-#include <cassert>
#include <concepts>
#include <utility>
#include "../types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.inner/deref.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.inner/deref.pass.cpp
index 1b01c97df3a2b..dc967b673cf26 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.inner/deref.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.inner/deref.pass.cpp
@@ -10,7 +10,6 @@
// constexpr decltype(auto) inner-iterator::operator*() const;
-#include <cassert>
#include <ranges>
#include "../types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.inner/equal.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.inner/equal.pass.cpp
index 369f79ae751c3..dbf3bfa126ae8 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.inner/equal.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.inner/equal.pass.cpp
@@ -15,7 +15,6 @@
#include <ranges>
-#include <cassert>
#include <concepts>
#include <string_view>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.outer/equal.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.outer/equal.pass.cpp
index 566fad66ebdde..6cbc98a94645f 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.outer/equal.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.lazy.split/range.lazy.split.outer/equal.pass.cpp
@@ -15,7 +15,6 @@
#include <ranges>
-#include <cassert>
#include <concepts>
#include <string_view>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.split/types.h b/libcxx/test/std/ranges/range.adaptors/range.split/types.h
index 0fd5af569d285..aa47faf0f468b 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.split/types.h
+++ b/libcxx/test/std/ranges/range.adaptors/range.split/types.h
@@ -9,7 +9,6 @@
#ifndef TEST_STD_RANGES_RANGE_ADAPTORS_RANGE_SPLIT_TYPES_H
#define TEST_STD_RANGES_RANGE_ADAPTORS_RANGE_SPLIT_TYPES_H
-#include <cstdint>
#include <functional>
#include <ranges>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.take.while/sentinel/equality.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.take.while/sentinel/equality.pass.cpp
index 473a09add7df5..b00b3dd0bd053 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.take.while/sentinel/equality.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.take.while/sentinel/equality.pass.cpp
@@ -17,9 +17,7 @@
#include <array>
#include <cassert>
-#include <cstdint>
#include <ranges>
-#include <utility>
#include "../types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.take/range.take.sentinel/base.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.take/range.take.sentinel/base.pass.cpp
index 7947319408dfc..15b2b5476e86d 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.take/range.take.sentinel/base.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.take/range.take.sentinel/base.pass.cpp
@@ -12,7 +12,6 @@
#include <ranges>
#include <cassert>
-#include <utility>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.take/range.take.sentinel/ctor.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.take/range.take.sentinel/ctor.pass.cpp
index 61d33760c71d7..8928371939c87 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.take/range.take.sentinel/ctor.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.take/range.take.sentinel/ctor.pass.cpp
@@ -13,9 +13,8 @@
// constexpr sentinel(sentinel<!Const> s)
// requires Const && convertible_to<sentinel_t<V>, sentinel_t<Base>>;
-#include <cassert>
#include <ranges>
-#include <utility>
+#include <cassert>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/base.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/base.pass.cpp
index d3072d78fef7b..496f68f1769a9 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.transform/base.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.transform/base.pass.cpp
@@ -11,7 +11,6 @@
// constexpr V base() const& requires copy_constructible<V>
// constexpr V base() &&
-#include <cassert>
#include <ranges>
#include "test_macros.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/begin.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/begin.pass.cpp
index 5067c1d357706..a3ddbf8914bf3 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.transform/begin.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.transform/begin.pass.cpp
@@ -13,7 +13,6 @@
// requires range<const V> &&
// regular_invocable<const F&, range_reference_t<const V>>;
-#include <cassert>
#include <ranges>
#include "test_macros.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/end.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/end.pass.cpp
index 46fe20e998dcd..bfa9e6431c507 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.transform/end.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.transform/end.pass.cpp
@@ -17,9 +17,7 @@
// requires common_range<const V> &&
// regular_invocable<const F&, range_reference_t<const V>>;
-#include <cassert>
#include <ranges>
-#include <utility>
#include "test_macros.h"
#include "types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/arithmetic.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/arithmetic.pass.cpp
index f4093ee4d0230..3b2b738f4e104 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/arithmetic.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/arithmetic.pass.cpp
@@ -10,7 +10,6 @@
// transform_view::<iterator>::operator{++,--,+=,-=}
-#include <cassert>
#include <ranges>
#include "test_macros.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/base.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/base.pass.cpp
index 7ec33b8f93a7a..02a93f4247997 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/base.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/base.pass.cpp
@@ -10,7 +10,6 @@
// transform_view::<iterator>::base
-#include <cassert>
#include <ranges>
#include "test_macros.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/compare.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/compare.pass.cpp
index c4987081c00d9..7077cf49a7c65 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/compare.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/compare.pass.cpp
@@ -10,7 +10,6 @@
// transform_view::<iterator>::operator{<,>,<=,>=,==,!=,<=>}
-#include <cassert>
#include <ranges>
#include <compare>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/deref.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/deref.pass.cpp
index 171f0d145f7ac..5d8bf51c69696 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/deref.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/deref.pass.cpp
@@ -10,7 +10,6 @@
// transform_view::<iterator>::operator*
-#include <cassert>
#include <ranges>
#include "test_macros.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/plus_minus.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/plus_minus.pass.cpp
index 055d5b917263d..284fb41d4fe78 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/plus_minus.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/plus_minus.pass.cpp
@@ -10,7 +10,6 @@
// transform_view::<iterator>::operator{+,-}
-#include <cassert>
#include <ranges>
#include "test_macros.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/sentinel.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/sentinel.pass.cpp
index ce48e09d6eb8f..a2da6acb796b4 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/sentinel.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/sentinel.pass.cpp
@@ -10,7 +10,6 @@
// class transform_view::<sentinel>;
-#include <cassert>
#include <ranges>
#include "test_macros.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/subscript.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/subscript.pass.cpp
index 9fd3207b66d2e..30c0b2ae8d8c9 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/subscript.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.transform/iterator/subscript.pass.cpp
@@ -10,7 +10,6 @@
// transform_view::<iterator>::operator[]
-#include <cassert>
#include <ranges>
#include "test_macros.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.transform/size.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.transform/size.pass.cpp
index 46ee4e9190bb7..614686763ce9f 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.transform/size.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.transform/size.pass.cpp
@@ -11,7 +11,6 @@
// constexpr auto size() requires sized_range<V>
// constexpr auto size() const requires sized_range<const V>
-#include <cassert>
#include <ranges>
#include "test_macros.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.zip.transform/begin.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.zip.transform/begin.pass.cpp
index 27d955a2039e2..9b326e1cd6981 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.zip.transform/begin.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.zip.transform/begin.pass.cpp
@@ -14,7 +14,6 @@
// regular_invocable<const F&, range_reference_t<const Views>...>;
#include <ranges>
-#include <utility>
#include <cassert>
#include <concepts>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.zip.transform/ctor.default.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.zip.transform/ctor.default.pass.cpp
index bd9aeefab7dc5..751210f2a4f1f 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.zip.transform/ctor.default.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.zip.transform/ctor.default.pass.cpp
@@ -11,7 +11,6 @@
// zip_transform_view() = default;
#include <ranges>
-#include <utility>
#include <cassert>
#include <type_traits>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.zip.transform/ctor.views.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.zip.transform/ctor.views.pass.cpp
index e8668a1365f97..5f3b5a3ff6f99 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.zip.transform/ctor.views.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.zip.transform/ctor.views.pass.cpp
@@ -11,7 +11,6 @@
// constexpr explicit zip_transform_view(F, Views...)
#include <algorithm>
-#include <cassert>
#include <ranges>
#include <vector>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.zip.transform/end.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.zip.transform/end.pass.cpp
index b12fbc9e74de8..e6c7094e7d720 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.zip.transform/end.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.zip.transform/end.pass.cpp
@@ -13,9 +13,7 @@
// requires range<const InnerView> &&
// regular_invocable<const F&, range_reference_t<const Views>...>;
-#include <cassert>
#include <ranges>
-#include <utility>
#include "types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.zip.transform/iterator/arithmetic.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.zip.transform/iterator/arithmetic.pass.cpp
index 1f478f1cee3d0..d697ae571cb7d 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.zip.transform/iterator/arithmetic.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.zip.transform/iterator/arithmetic.pass.cpp
@@ -22,7 +22,6 @@
#include <ranges>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.zip.transform/iterator/compare.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.zip.transform/iterator/compare.pass.cpp
index 5b216e26a99bf..2befb7e4cc58c 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.zip.transform/iterator/compare.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.zip.transform/iterator/compare.pass.cpp
@@ -16,7 +16,6 @@
#include <ranges>
-#include <cassert>
#include <compare>
#include "test_iterators.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.zip.transform/iterator/ctor.default.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.zip.transform/iterator/ctor.default.pass.cpp
index c13aefde4cba7..8f8369d6af5f2 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.zip.transform/iterator/ctor.default.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.zip.transform/iterator/ctor.default.pass.cpp
@@ -10,7 +10,6 @@
// iterator() = default;
-#include <cassert>
#include <ranges>
#include "../types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.zip.transform/iterator/ctor.other.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.zip.transform/iterator/ctor.other.pass.cpp
index fc1fb70e91795..c643d83a2c665 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.zip.transform/iterator/ctor.other.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.zip.transform/iterator/ctor.other.pass.cpp
@@ -13,7 +13,6 @@
#include <array>
#include <ranges>
-#include <utility>
#include <cassert>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.zip.transform/sentinel/ctor.other.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.zip.transform/sentinel/ctor.other.pass.cpp
index c91a57cec6911..be7c3d15a9109 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.zip.transform/sentinel/ctor.other.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.zip.transform/sentinel/ctor.other.pass.cpp
@@ -13,7 +13,6 @@
#include <cassert>
#include <ranges>
-#include <utility>
#include "../types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.zip.transform/sentinel/eq.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.zip.transform/sentinel/eq.pass.cpp
index f4750a14437aa..9b20dacd1f696 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.zip.transform/sentinel/eq.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.zip.transform/sentinel/eq.pass.cpp
@@ -15,7 +15,6 @@
#include <cassert>
#include <compare>
#include <ranges>
-#include <utility>
#include "../types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.zip.transform/sentinel/minus.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.zip.transform/sentinel/minus.pass.cpp
index a5438da18ca99..48a0a6d206db5 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.zip.transform/sentinel/minus.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.zip.transform/sentinel/minus.pass.cpp
@@ -18,7 +18,6 @@
#include <functional>
#include <ranges>
#include <tuple>
-#include <utility>
#include "../types.h"
#include "../../range_adaptor_types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.zip.transform/size.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.zip.transform/size.pass.cpp
index fac08c1f4ace1..140bdc311d527 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.zip.transform/size.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.zip.transform/size.pass.cpp
@@ -12,7 +12,6 @@
// constexpr auto size() const requires sized_range<const InnerView>
#include <ranges>
-#include <utility>
#include <cassert>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.zip/ctor.views.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.zip/ctor.views.pass.cpp
index 7013d675e423f..513d26817e915 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.zip/ctor.views.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.zip/ctor.views.pass.cpp
@@ -10,7 +10,6 @@
// constexpr explicit zip_view(Views...)
-#include <cassert>
#include <ranges>
#include <tuple>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.zip/end.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.zip/end.pass.cpp
index 4acef0b5a662f..7cf9f5f462725 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.zip/end.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.zip/end.pass.cpp
@@ -11,10 +11,8 @@
// constexpr auto end() requires(!(simple-view<Views> && ...))
// constexpr auto end() const requires(range<const Views>&&...)
-#include <cassert>
#include <ranges>
#include <tuple>
-#include <utility>
#include "../range_adaptor_types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/arithmetic.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/arithmetic.pass.cpp
index 2beec58fdc89a..444f3ed95b322 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/arithmetic.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/arithmetic.pass.cpp
@@ -22,7 +22,6 @@
#include <ranges>
#include <array>
-#include <cassert>
#include <concepts>
#include <functional>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/compare.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/compare.pass.cpp
index 3408cf09a360f..5ad054c0c3b1d 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/compare.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/compare.pass.cpp
@@ -13,9 +13,8 @@
// friend constexpr auto operator<=>(const iterator& x, const iterator& y)
// requires all-random-access<Const, Views...>;
-#include <cassert>
-#include <compare>
#include <ranges>
+#include <compare>
#include "test_iterators.h"
#include "test_range.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/ctor.default.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/ctor.default.pass.cpp
index 015376c4b6032..abced1629a4a7 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/ctor.default.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/ctor.default.pass.cpp
@@ -10,7 +10,6 @@
// iterator() = default;
-#include <cassert>
#include <ranges>
#include <tuple>
diff --git a/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/ctor.other.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/ctor.other.pass.cpp
index e6f124983a9d8..6b8b55fbe68e8 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/ctor.other.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/ctor.other.pass.cpp
@@ -16,7 +16,6 @@
#include <cassert>
#include <tuple>
-#include <utility>
#include "../../range_adaptor_types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/deref.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/deref.pass.cpp
index 068f4846b72ce..61495fae0467f 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/deref.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/deref.pass.cpp
@@ -14,7 +14,6 @@
#include <cassert>
#include <ranges>
#include <tuple>
-#include <utility>
#include "../../range_adaptor_types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/member_types.compile.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/member_types.compile.pass.cpp
index 223719246a945..852ea9ba069b0 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/member_types.compile.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/member_types.compile.pass.cpp
@@ -13,7 +13,6 @@
#include <array>
#include <ranges>
#include <tuple>
-#include <utility>
#include "test_iterators.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/singular.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/singular.pass.cpp
index 7520c75184311..5cd76e03bab48 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/singular.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.zip/iterator/singular.pass.cpp
@@ -14,7 +14,6 @@
#include <ranges>
-#include <cassert>
#include <tuple>
#include "../../range_adaptor_types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.zip/sentinel/ctor.other.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.zip/sentinel/ctor.other.pass.cpp
index dc3ba740bfe33..c3f50b0aeabd8 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.zip/sentinel/ctor.other.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.zip/sentinel/ctor.other.pass.cpp
@@ -12,7 +12,6 @@
#include <cassert>
#include <ranges>
-#include <utility>
#include "../../range_adaptor_types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.zip/sentinel/eq.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.zip/sentinel/eq.pass.cpp
index 94cdfad53cb8e..fa26d987b8dd3 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.zip/sentinel/eq.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.zip/sentinel/eq.pass.cpp
@@ -16,7 +16,6 @@
#include <compare>
#include <ranges>
#include <tuple>
-#include <utility>
#include "../../range_adaptor_types.h"
#include "test_range.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range.zip/sentinel/minus.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.zip/sentinel/minus.pass.cpp
index db762dcf9ec85..61f8935af3c4a 100644
--- a/libcxx/test/std/ranges/range.adaptors/range.zip/sentinel/minus.pass.cpp
+++ b/libcxx/test/std/ranges/range.adaptors/range.zip/sentinel/minus.pass.cpp
@@ -25,7 +25,6 @@
#include <functional>
#include <ranges>
#include <tuple>
-#include <utility>
#include "../../range_adaptor_types.h"
diff --git a/libcxx/test/std/ranges/range.adaptors/range_adaptor_types.h b/libcxx/test/std/ranges/range.adaptors/range_adaptor_types.h
index 0b654566e35b8..da5b94d75f466 100644
--- a/libcxx/test/std/ranges/range.adaptors/range_adaptor_types.h
+++ b/libcxx/test/std/ranges/range.adaptors/range_adaptor_types.h
@@ -9,7 +9,6 @@
#ifndef TEST_STD_RANGES_RANGE_ADAPTORS_RANGE_ADAPTOR_TYPES_H
#define TEST_STD_RANGES_RANGE_ADAPTORS_RANGE_ADAPTOR_TYPES_H
-#include <cstdint>
#include <functional>
#include <ranges>
diff --git a/libcxx/test/std/ranges/range.factories/range.iota.view/iterator/compare.pass.cpp b/libcxx/test/std/ranges/range.factories/range.iota.view/iterator/compare.pass.cpp
index bfeb7c231b81a..dba5ce24078c5 100644
--- a/libcxx/test/std/ranges/range.factories/range.iota.view/iterator/compare.pass.cpp
+++ b/libcxx/test/std/ranges/range.factories/range.iota.view/iterator/compare.pass.cpp
@@ -10,7 +10,6 @@
// iota_view::<iterator>::operator{<,>,<=,>=,==,!=,<=>}
-#include <cassert>
#include <ranges>
#include <compare>
diff --git a/libcxx/test/std/ranges/range.utility/range.elementsof/ctad.pass.cpp b/libcxx/test/std/ranges/range.utility/range.elementsof/ctad.pass.cpp
index a813f67d5d8f2..532fe01306c5a 100644
--- a/libcxx/test/std/ranges/range.utility/range.elementsof/ctad.pass.cpp
+++ b/libcxx/test/std/ranges/range.utility/range.elementsof/ctad.pass.cpp
@@ -25,7 +25,6 @@
#include "min_allocator.h"
#include "test_allocator.h"
#include "test_iterators.h"
-#include "type_algorithms.h"
template <class Allocator, class Range>
constexpr void test_impl() {
diff --git a/libcxx/test/std/ranges/range.utility/range.elementsof/elements_of.pass.cpp b/libcxx/test/std/ranges/range.utility/range.elementsof/elements_of.pass.cpp
index f82a23079665a..77a9b84e01c24 100644
--- a/libcxx/test/std/ranges/range.utility/range.elementsof/elements_of.pass.cpp
+++ b/libcxx/test/std/ranges/range.utility/range.elementsof/elements_of.pass.cpp
@@ -24,7 +24,6 @@
#include "min_allocator.h"
#include "test_allocator.h"
#include "test_iterators.h"
-#include "type_algorithms.h"
template <class Iterator>
struct Range {
diff --git a/libcxx/test/std/ranges/range.utility/view.interface/view.interface.pass.cpp b/libcxx/test/std/ranges/range.utility/view.interface/view.interface.pass.cpp
index bce13c38f2dab..3f7c174d3fe48 100644
--- a/libcxx/test/std/ranges/range.utility/view.interface/view.interface.pass.cpp
+++ b/libcxx/test/std/ranges/range.utility/view.interface/view.interface.pass.cpp
@@ -15,9 +15,7 @@
#include <ranges>
#include <cassert>
-#include <type_traits>
#include <utility>
-
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/strings/basic.string/string.cons/from_range_deduction.pass.cpp b/libcxx/test/std/strings/basic.string/string.cons/from_range_deduction.pass.cpp
index 0ed62b345fa8d..44aa0980972bd 100644
--- a/libcxx/test/std/strings/basic.string/string.cons/from_range_deduction.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.cons/from_range_deduction.pass.cpp
@@ -22,7 +22,6 @@
// is a type that does not qualify as an allocator (in addition to the `input_range` concept being satisfied by `R`).
#include <array>
-#include <cassert>
#include <string>
#include "deduction_guides_sfinae_checks.h"
diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
index 82f4f2de760c9..684661aeab8fc 100644
--- a/libcxx/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_append/iterator.pass.cpp
@@ -13,7 +13,6 @@
#include <string>
#include <cassert>
-#include <cstdint>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
index b2306807fcf7b..c183def9ee75f 100644
--- a/libcxx/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_assign/iterator.pass.cpp
@@ -11,14 +11,13 @@
// template<class InputIterator>
// basic_string& assign(InputIterator first, InputIterator last); // constexpr since C++20
-#include <cassert>
-#include <cstdint>
#include <string>
+#include <cassert>
-#include "asan_testing.h"
-#include "min_allocator.h"
#include "test_macros.h"
#include "test_iterators.h"
+#include "min_allocator.h"
+#include "asan_testing.h"
template <class S, class It>
TEST_CONSTEXPR_CXX20 void test(S s, It first, It last, S expected) {
diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
index e228ccac20574..060216e7a82b3 100644
--- a/libcxx/test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_insert/iter_iter_iter.pass.cpp
@@ -11,14 +11,13 @@
// template<class InputIterator>
// iterator insert(const_iterator p, InputIterator first, InputIterator last); // constexpr since C++20
-#include <cassert>
-#include <cstdint>
#include <string>
+#include <cassert>
-#include "asan_testing.h"
-#include "min_allocator.h"
-#include "test_iterators.h"
#include "test_macros.h"
+#include "test_iterators.h"
+#include "min_allocator.h"
+#include "asan_testing.h"
template <class S, class It>
TEST_CONSTEXPR_CXX20 void test(S s, typename S::
diff erence_type pos, It first, It last, S expected) {
diff --git a/libcxx/test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp b/libcxx/test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
index ba91e0bd56f00..c1ca532a5f910 100644
--- a/libcxx/test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
+++ b/libcxx/test/std/strings/basic.string/string.modifiers/string_replace/iter_iter_iter_iter.pass.cpp
@@ -15,7 +15,6 @@
#include <string>
#include <iterator>
#include <cassert>
-#include <cstdint>
#include "test_macros.h"
#include "min_allocator.h"
diff --git a/libcxx/test/std/strings/string.view/string.view.cons/from_iterator_sentinel.pass.cpp b/libcxx/test/std/strings/string.view/string.view.cons/from_iterator_sentinel.pass.cpp
index 4e6d97203b6b8..f6f407b7876fc 100644
--- a/libcxx/test/std/strings/string.view/string.view.cons/from_iterator_sentinel.pass.cpp
+++ b/libcxx/test/std/strings/string.view/string.view.cons/from_iterator_sentinel.pass.cpp
@@ -15,7 +15,6 @@
#include <string_view>
#include <cassert>
#include <iterator>
-#include <type_traits>
#include "make_string.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/hash.pass.cpp b/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/hash.pass.cpp
index 6564e34fabd29..b9209ac2c89b6 100644
--- a/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/hash.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/hash.pass.cpp
@@ -35,7 +35,6 @@
#include <cassert>
#include <cstddef>
#include <functional>
-#include <iterator>
#include "test_iterators.h"
diff --git a/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/hash.pred.pass.cpp b/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/hash.pred.pass.cpp
index d23e10b0baa5f..d616301767ede 100644
--- a/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/hash.pred.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/hash.pred.pass.cpp
@@ -35,7 +35,6 @@
#include <cassert>
#include <cstddef>
#include <functional>
-#include <iterator>
#include "test_iterators.h"
diff --git a/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/pred.pass.cpp b/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/pred.pass.cpp
index 2f7854157e8de..396e2847928b0 100644
--- a/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/pred.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.search/func.search.bm/pred.pass.cpp
@@ -34,7 +34,6 @@
#include <algorithm>
#include <cassert>
#include <functional>
-#include <iterator>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/hash.pass.cpp b/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/hash.pass.cpp
index a0824b21c9e02..19f5710819c46 100644
--- a/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/hash.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/hash.pass.cpp
@@ -34,7 +34,6 @@
#include <cassert>
#include <cstddef>
#include <functional>
-#include <iterator>
#include "test_iterators.h"
diff --git a/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/hash.pred.pass.cpp b/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/hash.pred.pass.cpp
index e1c961bcc4ce2..3d29a05efd40c 100644
--- a/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/hash.pred.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/hash.pred.pass.cpp
@@ -34,7 +34,6 @@
#include <cassert>
#include <cstddef>
#include <functional>
-#include <iterator>
#include "test_iterators.h"
diff --git a/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/pred.pass.cpp b/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/pred.pass.cpp
index 7da2f904a1d30..9f6dcbd2f2423 100644
--- a/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/pred.pass.cpp
+++ b/libcxx/test/std/utilities/function.objects/func.search/func.search.bmh/pred.pass.cpp
@@ -31,9 +31,8 @@
// };
#include <algorithm>
-#include <cassert>
#include <functional>
-#include <iterator>
+#include <cassert>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/ranges_uninitialized_default_construct_n.pass.cpp b/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/ranges_uninitialized_default_construct_n.pass.cpp
index 097547cc28d9d..40fbf22695909 100644
--- a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/ranges_uninitialized_default_construct_n.pass.cpp
+++ b/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/ranges_uninitialized_default_construct_n.pass.cpp
@@ -18,7 +18,6 @@
#include <cassert>
#include <memory>
#include <ranges>
-#include <type_traits>
#include "../buffer.h"
#include "../counted.h"
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct_n.pass.cpp b/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct_n.pass.cpp
index 95a664a1285b4..58ee06aaa819d 100644
--- a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct_n.pass.cpp
+++ b/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.default/uninitialized_default_construct_n.pass.cpp
@@ -16,7 +16,6 @@
#include <memory>
#include <cstdlib>
#include <cassert>
-#include <type_traits>
#include "test_macros.h"
#include "test_iterators.h"
diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/ranges_uninitialized_value_construct_n.pass.cpp b/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/ranges_uninitialized_value_construct_n.pass.cpp
index ac8f8f1173fd1..4742aefcdb5ad 100644
--- a/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/ranges_uninitialized_value_construct_n.pass.cpp
+++ b/libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.construct.value/ranges_uninitialized_value_construct_n.pass.cpp
@@ -18,7 +18,6 @@
#include <cassert>
#include <memory>
#include <ranges>
-#include <type_traits>
#include "../buffer.h"
#include "../counted.h"
diff --git a/libcxx/test/support/module.modulemap b/libcxx/test/support/module.modulemap
index 0af147d75ee5d..75ae8c4221ae0 100644
--- a/libcxx/test/support/module.modulemap
+++ b/libcxx/test/support/module.modulemap
@@ -6,6 +6,5 @@ module test_config {
module test {
module double_move_tracker { header "double_move_tracker.h" }
module test_allocator { header "test_allocator.h" }
- module test_iterators { header "test_iterators.h" }
module type_algorithms { header "type_algorithms.h" }
}
diff --git a/libcxx/test/support/test.support/test_proxy.pass.cpp b/libcxx/test/support/test.support/test_proxy.pass.cpp
index 7c40fa4c2bb83..668caf175add3 100644
--- a/libcxx/test/support/test.support/test_proxy.pass.cpp
+++ b/libcxx/test/support/test.support/test_proxy.pass.cpp
@@ -12,8 +12,6 @@
#include "test_iterators.h"
#include <cassert>
-#include <iterator>
-#include <ranges>
constexpr void testProxy() {
// constructor value
diff --git a/libcxx/test/support/test_range.h b/libcxx/test/support/test_range.h
index 315c443ab3c24..4efa26f266475 100644
--- a/libcxx/test/support/test_range.h
+++ b/libcxx/test/support/test_range.h
@@ -16,7 +16,6 @@
#include <type_traits>
#include "test_iterators.h"
-#include "test_macros.h"
#if TEST_STD_VER < 17
# error "test/support/test_range.h" can only be included in builds supporting ranges
More information about the libcxx-commits
mailing list