[libcxx-commits] [libcxxabi] 368faac - [libc++] Revert "Protect users from relying on detail headers" & related changes

Tue Mar 1 05:21:02 PST 2022

Author: Louis Dionne
Date: 2022-03-01T08:20:24-05:00
New Revision: 368faacac7525e538fa6680aea74e19a75e3458d

URL: https://github.com/llvm/llvm-project/commit/368faacac7525e538fa6680aea74e19a75e3458d
DIFF: https://github.com/llvm/llvm-project/commit/368faacac7525e538fa6680aea74e19a75e3458d.diff

LOG: [libc++] Revert "Protect users from relying on detail headers" & related changes

This commit reverts 5aaefa51 (and also partly 7f285f48e77 and b6d75682f9,
which were related to the original commit). As landed, 5aaefa51 had
unintended consequences on some downstream bots and didn't have proper
coverage upstream due to a few subtle things. Implementing this is
something we should do in libc++, however we'll first need to address
a few issues listed in https://reviews.llvm.org/D106124#3349710.

Differential Revision: https://reviews.llvm.org/D120683

Added: 
    

Modified: 
    libcxx/cmake/Modules/HandleLibCXXABI.cmake
    libcxx/include/__algorithm/adjacent_find.h
    libcxx/include/__algorithm/all_of.h
    libcxx/include/__algorithm/any_of.h
    libcxx/include/__algorithm/binary_search.h
    libcxx/include/__algorithm/clamp.h
    libcxx/include/__algorithm/comp.h
    libcxx/include/__algorithm/comp_ref_type.h
    libcxx/include/__algorithm/copy.h
    libcxx/include/__algorithm/copy_backward.h
    libcxx/include/__algorithm/copy_if.h
    libcxx/include/__algorithm/copy_n.h
    libcxx/include/__algorithm/count.h
    libcxx/include/__algorithm/count_if.h
    libcxx/include/__algorithm/equal.h
    libcxx/include/__algorithm/equal_range.h
    libcxx/include/__algorithm/fill.h
    libcxx/include/__algorithm/fill_n.h
    libcxx/include/__algorithm/find.h
    libcxx/include/__algorithm/find_end.h
    libcxx/include/__algorithm/find_first_of.h
    libcxx/include/__algorithm/find_if.h
    libcxx/include/__algorithm/find_if_not.h
    libcxx/include/__algorithm/for_each.h
    libcxx/include/__algorithm/for_each_n.h
    libcxx/include/__algorithm/generate.h
    libcxx/include/__algorithm/generate_n.h
    libcxx/include/__algorithm/half_positive.h
    libcxx/include/__algorithm/in_found_result.h
    libcxx/include/__algorithm/in_fun_result.h
    libcxx/include/__algorithm/in_in_out_result.h
    libcxx/include/__algorithm/in_in_result.h
    libcxx/include/__algorithm/in_out_out_result.h
    libcxx/include/__algorithm/in_out_result.h
    libcxx/include/__algorithm/includes.h
    libcxx/include/__algorithm/inplace_merge.h
    libcxx/include/__algorithm/is_heap.h
    libcxx/include/__algorithm/is_heap_until.h
    libcxx/include/__algorithm/is_partitioned.h
    libcxx/include/__algorithm/is_permutation.h
    libcxx/include/__algorithm/is_sorted.h
    libcxx/include/__algorithm/is_sorted_until.h
    libcxx/include/__algorithm/iter_swap.h
    libcxx/include/__algorithm/lexicographical_compare.h
    libcxx/include/__algorithm/lower_bound.h
    libcxx/include/__algorithm/make_heap.h
    libcxx/include/__algorithm/max.h
    libcxx/include/__algorithm/max_element.h
    libcxx/include/__algorithm/merge.h
    libcxx/include/__algorithm/min.h
    libcxx/include/__algorithm/min_element.h
    libcxx/include/__algorithm/min_max_result.h
    libcxx/include/__algorithm/minmax.h
    libcxx/include/__algorithm/minmax_element.h
    libcxx/include/__algorithm/mismatch.h
    libcxx/include/__algorithm/move.h
    libcxx/include/__algorithm/move_backward.h
    libcxx/include/__algorithm/next_permutation.h
    libcxx/include/__algorithm/none_of.h
    libcxx/include/__algorithm/nth_element.h
    libcxx/include/__algorithm/partial_sort.h
    libcxx/include/__algorithm/partial_sort_copy.h
    libcxx/include/__algorithm/partition.h
    libcxx/include/__algorithm/partition_copy.h
    libcxx/include/__algorithm/partition_point.h
    libcxx/include/__algorithm/pop_heap.h
    libcxx/include/__algorithm/prev_permutation.h
    libcxx/include/__algorithm/push_heap.h
    libcxx/include/__algorithm/ranges_min_element.h
    libcxx/include/__algorithm/ranges_swap_ranges.h
    libcxx/include/__algorithm/remove.h
    libcxx/include/__algorithm/remove_copy.h
    libcxx/include/__algorithm/remove_copy_if.h
    libcxx/include/__algorithm/remove_if.h
    libcxx/include/__algorithm/replace.h
    libcxx/include/__algorithm/replace_copy.h
    libcxx/include/__algorithm/replace_copy_if.h
    libcxx/include/__algorithm/replace_if.h
    libcxx/include/__algorithm/reverse.h
    libcxx/include/__algorithm/reverse_copy.h
    libcxx/include/__algorithm/rotate.h
    libcxx/include/__algorithm/rotate_copy.h
    libcxx/include/__algorithm/sample.h
    libcxx/include/__algorithm/search.h
    libcxx/include/__algorithm/search_n.h
    libcxx/include/__algorithm/set_difference.h
    libcxx/include/__algorithm/set_intersection.h
    libcxx/include/__algorithm/set_symmetric_difference.h
    libcxx/include/__algorithm/set_union.h
    libcxx/include/__algorithm/shift_left.h
    libcxx/include/__algorithm/shift_right.h
    libcxx/include/__algorithm/shuffle.h
    libcxx/include/__algorithm/sift_down.h
    libcxx/include/__algorithm/sort.h
    libcxx/include/__algorithm/sort_heap.h
    libcxx/include/__algorithm/stable_partition.h
    libcxx/include/__algorithm/stable_sort.h
    libcxx/include/__algorithm/swap_ranges.h
    libcxx/include/__algorithm/transform.h
    libcxx/include/__algorithm/unique.h
    libcxx/include/__algorithm/unique_copy.h
    libcxx/include/__algorithm/unwrap_iter.h
    libcxx/include/__algorithm/upper_bound.h
    libcxx/include/__bit/bit_cast.h
    libcxx/include/__bit/byteswap.h
    libcxx/include/__bit_reference
    libcxx/include/__bits
    libcxx/include/__charconv/chars_format.h
    libcxx/include/__charconv/from_chars_result.h
    libcxx/include/__charconv/to_chars_result.h
    libcxx/include/__chrono/calendar.h
    libcxx/include/__chrono/convert_to_timespec.h
    libcxx/include/__chrono/duration.h
    libcxx/include/__chrono/file_clock.h
    libcxx/include/__chrono/high_resolution_clock.h
    libcxx/include/__chrono/steady_clock.h
    libcxx/include/__chrono/system_clock.h
    libcxx/include/__chrono/time_point.h
    libcxx/include/__compare/common_comparison_category.h
    libcxx/include/__compare/compare_partial_order_fallback.h
    libcxx/include/__compare/compare_strong_order_fallback.h
    libcxx/include/__compare/compare_three_way.h
    libcxx/include/__compare/compare_three_way_result.h
    libcxx/include/__compare/compare_weak_order_fallback.h
    libcxx/include/__compare/is_eq.h
    libcxx/include/__compare/ordering.h
    libcxx/include/__compare/partial_order.h
    libcxx/include/__compare/strong_order.h
    libcxx/include/__compare/synth_three_way.h
    libcxx/include/__compare/three_way_comparable.h
    libcxx/include/__compare/weak_order.h
    libcxx/include/__concepts/arithmetic.h
    libcxx/include/__concepts/assignable.h
    libcxx/include/__concepts/boolean_testable.h
    libcxx/include/__concepts/class_or_enum.h
    libcxx/include/__concepts/common_reference_with.h
    libcxx/include/__concepts/common_with.h
    libcxx/include/__concepts/constructible.h
    libcxx/include/__concepts/convertible_to.h
    libcxx/include/__concepts/copyable.h
    libcxx/include/__concepts/derived_from.h
    libcxx/include/__concepts/destructible.h
    libcxx/include/__concepts/different_from.h
    libcxx/include/__concepts/equality_comparable.h
    libcxx/include/__concepts/invocable.h
    libcxx/include/__concepts/movable.h
    libcxx/include/__concepts/predicate.h
    libcxx/include/__concepts/regular.h
    libcxx/include/__concepts/relation.h
    libcxx/include/__concepts/same_as.h
    libcxx/include/__concepts/semiregular.h
    libcxx/include/__concepts/swappable.h
    libcxx/include/__concepts/totally_ordered.h
    libcxx/include/__coroutine/coroutine_handle.h
    libcxx/include/__coroutine/coroutine_traits.h
    libcxx/include/__coroutine/noop_coroutine_handle.h
    libcxx/include/__coroutine/trivial_awaitables.h
    libcxx/include/__filesystem/copy_options.h
    libcxx/include/__filesystem/directory_entry.h
    libcxx/include/__filesystem/directory_iterator.h
    libcxx/include/__filesystem/directory_options.h
    libcxx/include/__filesystem/file_status.h
    libcxx/include/__filesystem/file_time_type.h
    libcxx/include/__filesystem/file_type.h
    libcxx/include/__filesystem/filesystem_error.h
    libcxx/include/__filesystem/operations.h
    libcxx/include/__filesystem/path.h
    libcxx/include/__filesystem/path_iterator.h
    libcxx/include/__filesystem/perm_options.h
    libcxx/include/__filesystem/perms.h
    libcxx/include/__filesystem/recursive_directory_iterator.h
    libcxx/include/__filesystem/space_info.h
    libcxx/include/__filesystem/u8path.h
    libcxx/include/__format/format_arg.h
    libcxx/include/__format/format_args.h
    libcxx/include/__format/format_context.h
    libcxx/include/__format/format_error.h
    libcxx/include/__format/format_fwd.h
    libcxx/include/__format/format_parse_context.h
    libcxx/include/__format/format_string.h
    libcxx/include/__format/format_to_n_result.h
    libcxx/include/__format/formatter.h
    libcxx/include/__format/formatter_bool.h
    libcxx/include/__format/formatter_char.h
    libcxx/include/__format/formatter_floating_point.h
    libcxx/include/__format/formatter_integer.h
    libcxx/include/__format/formatter_integral.h
    libcxx/include/__format/formatter_pointer.h
    libcxx/include/__format/formatter_string.h
    libcxx/include/__format/parser_std_format_spec.h
    libcxx/include/__functional/binary_function.h
    libcxx/include/__functional/binary_negate.h
    libcxx/include/__functional/bind.h
    libcxx/include/__functional/bind_back.h
    libcxx/include/__functional/bind_front.h
    libcxx/include/__functional/binder1st.h
    libcxx/include/__functional/binder2nd.h
    libcxx/include/__functional/compose.h
    libcxx/include/__functional/default_searcher.h
    libcxx/include/__functional/function.h
    libcxx/include/__functional/hash.h
    libcxx/include/__functional/identity.h
    libcxx/include/__functional/invoke.h
    libcxx/include/__functional/is_transparent.h
    libcxx/include/__functional/mem_fn.h
    libcxx/include/__functional/mem_fun_ref.h
    libcxx/include/__functional/not_fn.h
    libcxx/include/__functional/operations.h
    libcxx/include/__functional/perfect_forward.h
    libcxx/include/__functional/pointer_to_binary_function.h
    libcxx/include/__functional/pointer_to_unary_function.h
    libcxx/include/__functional/ranges_operations.h
    libcxx/include/__functional/reference_wrapper.h
    libcxx/include/__functional/unary_function.h
    libcxx/include/__functional/unary_negate.h
    libcxx/include/__functional/unwrap_ref.h
    libcxx/include/__functional/weak_result_type.h
    libcxx/include/__hash_table
    libcxx/include/__ios/fpos.h
    libcxx/include/__iterator/access.h
    libcxx/include/__iterator/advance.h
    libcxx/include/__iterator/back_insert_iterator.h
    libcxx/include/__iterator/common_iterator.h
    libcxx/include/__iterator/concepts.h
    libcxx/include/__iterator/counted_iterator.h
    libcxx/include/__iterator/data.h
    libcxx/include/__iterator/default_sentinel.h
    libcxx/include/__iterator/distance.h
    libcxx/include/__iterator/empty.h
    libcxx/include/__iterator/erase_if_container.h
    libcxx/include/__iterator/front_insert_iterator.h
    libcxx/include/__iterator/incrementable_traits.h
    libcxx/include/__iterator/indirectly_comparable.h
    libcxx/include/__iterator/insert_iterator.h
    libcxx/include/__iterator/istream_iterator.h
    libcxx/include/__iterator/istreambuf_iterator.h
    libcxx/include/__iterator/iter_move.h
    libcxx/include/__iterator/iter_swap.h
    libcxx/include/__iterator/iterator.h
    libcxx/include/__iterator/iterator_traits.h
    libcxx/include/__iterator/mergeable.h
    libcxx/include/__iterator/move_iterator.h
    libcxx/include/__iterator/next.h
    libcxx/include/__iterator/ostream_iterator.h
    libcxx/include/__iterator/ostreambuf_iterator.h
    libcxx/include/__iterator/permutable.h
    libcxx/include/__iterator/prev.h
    libcxx/include/__iterator/projected.h
    libcxx/include/__iterator/readable_traits.h
    libcxx/include/__iterator/reverse_access.h
    libcxx/include/__iterator/reverse_iterator.h
    libcxx/include/__iterator/size.h
    libcxx/include/__iterator/sortable.h
    libcxx/include/__iterator/unreachable_sentinel.h
    libcxx/include/__iterator/wrap_iter.h
    libcxx/include/__locale
    libcxx/include/__memory/addressof.h
    libcxx/include/__memory/allocation_guard.h
    libcxx/include/__memory/allocator.h
    libcxx/include/__memory/allocator_arg_t.h
    libcxx/include/__memory/allocator_traits.h
    libcxx/include/__memory/auto_ptr.h
    libcxx/include/__memory/compressed_pair.h
    libcxx/include/__memory/concepts.h
    libcxx/include/__memory/construct_at.h
    libcxx/include/__memory/pointer_traits.h
    libcxx/include/__memory/ranges_construct_at.h
    libcxx/include/__memory/ranges_uninitialized_algorithms.h
    libcxx/include/__memory/raw_storage_iterator.h
    libcxx/include/__memory/shared_ptr.h
    libcxx/include/__memory/temporary_buffer.h
    libcxx/include/__memory/uninitialized_algorithms.h
    libcxx/include/__memory/unique_ptr.h
    libcxx/include/__memory/uses_allocator.h
    libcxx/include/__memory/voidify.h
    libcxx/include/__mutex_base
    libcxx/include/__node_handle
    libcxx/include/__numeric/accumulate.h
    libcxx/include/__numeric/adjacent_difference.h
    libcxx/include/__numeric/exclusive_scan.h
    libcxx/include/__numeric/gcd_lcm.h
    libcxx/include/__numeric/inclusive_scan.h
    libcxx/include/__numeric/inner_product.h
    libcxx/include/__numeric/iota.h
    libcxx/include/__numeric/midpoint.h
    libcxx/include/__numeric/partial_sum.h
    libcxx/include/__numeric/reduce.h
    libcxx/include/__numeric/transform_exclusive_scan.h
    libcxx/include/__numeric/transform_inclusive_scan.h
    libcxx/include/__numeric/transform_reduce.h
    libcxx/include/__random/bernoulli_distribution.h
    libcxx/include/__random/binomial_distribution.h
    libcxx/include/__random/cauchy_distribution.h
    libcxx/include/__random/chi_squared_distribution.h
    libcxx/include/__random/clamp_to_integral.h
    libcxx/include/__random/default_random_engine.h
    libcxx/include/__random/discard_block_engine.h
    libcxx/include/__random/discrete_distribution.h
    libcxx/include/__random/exponential_distribution.h
    libcxx/include/__random/extreme_value_distribution.h
    libcxx/include/__random/fisher_f_distribution.h
    libcxx/include/__random/gamma_distribution.h
    libcxx/include/__random/generate_canonical.h
    libcxx/include/__random/geometric_distribution.h
    libcxx/include/__random/independent_bits_engine.h
    libcxx/include/__random/is_seed_sequence.h
    libcxx/include/__random/knuth_b.h
    libcxx/include/__random/linear_congruential_engine.h
    libcxx/include/__random/log2.h
    libcxx/include/__random/lognormal_distribution.h
    libcxx/include/__random/mersenne_twister_engine.h
    libcxx/include/__random/negative_binomial_distribution.h
    libcxx/include/__random/normal_distribution.h
    libcxx/include/__random/piecewise_constant_distribution.h
    libcxx/include/__random/piecewise_linear_distribution.h
    libcxx/include/__random/poisson_distribution.h
    libcxx/include/__random/random_device.h
    libcxx/include/__random/ranlux.h
    libcxx/include/__random/seed_seq.h
    libcxx/include/__random/shuffle_order_engine.h
    libcxx/include/__random/student_t_distribution.h
    libcxx/include/__random/subtract_with_carry_engine.h
    libcxx/include/__random/uniform_int_distribution.h
    libcxx/include/__random/uniform_random_bit_generator.h
    libcxx/include/__random/uniform_real_distribution.h
    libcxx/include/__random/weibull_distribution.h
    libcxx/include/__ranges/access.h
    libcxx/include/__ranges/all.h
    libcxx/include/__ranges/common_view.h
    libcxx/include/__ranges/concepts.h
    libcxx/include/__ranges/copyable_box.h
    libcxx/include/__ranges/counted.h
    libcxx/include/__ranges/dangling.h
    libcxx/include/__ranges/data.h
    libcxx/include/__ranges/drop_view.h
    libcxx/include/__ranges/empty.h
    libcxx/include/__ranges/empty_view.h
    libcxx/include/__ranges/enable_borrowed_range.h
    libcxx/include/__ranges/enable_view.h
    libcxx/include/__ranges/iota_view.h
    libcxx/include/__ranges/join_view.h
    libcxx/include/__ranges/non_propagating_cache.h
    libcxx/include/__ranges/owning_view.h
    libcxx/include/__ranges/range_adaptor.h
    libcxx/include/__ranges/rbegin.h
    libcxx/include/__ranges/ref_view.h
    libcxx/include/__ranges/rend.h
    libcxx/include/__ranges/reverse_view.h
    libcxx/include/__ranges/single_view.h
    libcxx/include/__ranges/size.h
    libcxx/include/__ranges/subrange.h
    libcxx/include/__ranges/take_view.h
    libcxx/include/__ranges/transform_view.h
    libcxx/include/__ranges/view_interface.h
    libcxx/include/__ranges/views.h
    libcxx/include/__split_buffer
    libcxx/include/__std_stream
    libcxx/include/__string
    libcxx/include/__thread/poll_with_backoff.h
    libcxx/include/__thread/timed_backoff_policy.h
    libcxx/include/__threading_support
    libcxx/include/__tree
    libcxx/include/__tuple
    libcxx/include/__utility/as_const.h
    libcxx/include/__utility/auto_cast.h
    libcxx/include/__utility/cmp.h
    libcxx/include/__utility/declval.h
    libcxx/include/__utility/exchange.h
    libcxx/include/__utility/forward.h
    libcxx/include/__utility/in_place.h
    libcxx/include/__utility/integer_sequence.h
    libcxx/include/__utility/move.h
    libcxx/include/__utility/pair.h
    libcxx/include/__utility/piecewise_construct.h
    libcxx/include/__utility/priority_tag.h
    libcxx/include/__utility/rel_ops.h
    libcxx/include/__utility/swap.h
    libcxx/include/__utility/to_underlying.h
    libcxx/include/__utility/transaction.h
    libcxx/include/__utility/unreachable.h
    libcxx/include/__variant/monostate.h
    libcxx/test/libcxx/lint/lint_headers.sh.py
    libcxx/utils/generate_private_header_tests.py
    libcxxabi/src/cxa_exception_storage.cpp
    libcxxabi/src/cxa_guard_impl.h
    libcxxabi/src/cxa_thread_atexit.cpp
    libcxxabi/src/fallback_malloc.cpp
    libcxxabi/test/test_exception_storage.pass.cpp
    libcxxabi/test/test_fallback_malloc.pass.cpp

Removed: 
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/adjacent_find.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/all_of.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/any_of.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/binary_search.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/clamp.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/comp.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/comp_ref_type.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_backward.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_if.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_n.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/count.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/count_if.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/equal.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/equal_range.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/fill.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/fill_n.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_end.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_first_of.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_if.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_if_not.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/for_each.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/for_each_n.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/generate.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/generate_n.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/half_positive.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_found_result.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_fun_result.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_in_out_result.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_in_result.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_out_out_result.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_out_result.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/includes.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/inplace_merge.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_heap.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_heap_until.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_partitioned.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_permutation.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_sorted.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_sorted_until.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/iter_swap.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/lexicographical_compare.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/lower_bound.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/make_heap.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/max.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/max_element.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/merge.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min_element.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min_max_result.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/minmax.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/minmax_element.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/mismatch.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/move.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/move_backward.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/next_permutation.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/none_of.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/nth_element.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partial_sort.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partial_sort_copy.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition_copy.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition_point.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/pop_heap.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/prev_permutation.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/push_heap.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/ranges_min_element.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/ranges_swap_ranges.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_copy.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_copy_if.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_if.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_copy.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_copy_if.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_if.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/reverse.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/reverse_copy.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/rotate.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/rotate_copy.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sample.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/search.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/search_n.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_difference.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_intersection.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_symmetric_difference.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_union.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shift_left.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shift_right.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shuffle.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sift_down.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sort.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sort_heap.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/stable_partition.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/stable_sort.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/swap_ranges.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/transform.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unique.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unique_copy.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unwrap_iter.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/algorithm/upper_bound.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/bit/bit_cast.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/bit/byteswap.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/bit_reference.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/bits.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/charconv/chars_format.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/charconv/from_chars_result.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/charconv/to_chars_result.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/chrono/calendar.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/chrono/convert_to_timespec.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/chrono/duration.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/chrono/file_clock.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/chrono/high_resolution_clock.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/chrono/steady_clock.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/chrono/system_clock.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/chrono/time_point.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/compare/common_comparison_category.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_partial_order_fallback.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_strong_order_fallback.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_three_way.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_three_way_result.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_weak_order_fallback.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/compare/is_eq.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/compare/ordering.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/compare/partial_order.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/compare/strong_order.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/compare/synth_three_way.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/compare/three_way_comparable.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/compare/weak_order.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/arithmetic.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/assignable.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/boolean_testable.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/class_or_enum.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/common_reference_with.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/common_with.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/constructible.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/convertible_to.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/copyable.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/derived_from.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/destructible.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/different_from.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/equality_comparable.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/invocable.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/movable.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/predicate.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/regular.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/relation.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/same_as.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/semiregular.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/swappable.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/concepts/totally_ordered.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/coroutine/coroutine_handle.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/coroutine/coroutine_traits.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/coroutine/noop_coroutine_handle.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/coroutine/trivial_awaitables.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/filesystem/copy_options.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/filesystem/directory_entry.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/filesystem/directory_iterator.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/filesystem/directory_options.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/filesystem/file_status.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/filesystem/file_time_type.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/filesystem/file_type.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/filesystem/filesystem_error.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/filesystem/operations.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/filesystem/path.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/filesystem/path_iterator.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/filesystem/perm_options.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/filesystem/perms.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/filesystem/recursive_directory_iterator.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/filesystem/space_info.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/filesystem/u8path.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/format_arg.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/format_args.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/format_context.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/format_error.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/format_fwd.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/format_parse_context.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/format_string.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/format_to_n_result.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/formatter.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_bool.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_char.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_floating_point.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_integer.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_integral.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_pointer.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_string.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/format/parser_std_format_spec.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/binary_function.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/binary_negate.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/bind.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/bind_back.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/bind_front.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/binder1st.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/binder2nd.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/compose.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/default_searcher.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/function.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/hash.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/identity.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/invoke.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/is_transparent.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/mem_fn.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/mem_fun_ref.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/not_fn.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/operations.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/perfect_forward.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/pointer_to_binary_function.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/pointer_to_unary_function.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/ranges_operations.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/reference_wrapper.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/unary_function.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/unary_negate.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/unwrap_ref.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/functional/weak_result_type.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ios/fpos.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/access.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/advance.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/back_insert_iterator.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/common_iterator.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/concepts.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/counted_iterator.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/data.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/default_sentinel.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/distance.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/empty.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/erase_if_container.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/front_insert_iterator.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/incrementable_traits.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/indirectly_comparable.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/insert_iterator.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/istream_iterator.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/istreambuf_iterator.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/iter_move.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/iter_swap.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/iterator.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/iterator_traits.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/mergeable.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/move_iterator.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/next.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/ostream_iterator.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/ostreambuf_iterator.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/permutable.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/prev.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/projected.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/readable_traits.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/reverse_access.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/reverse_iterator.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/size.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/sortable.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/unreachable_sentinel.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/iterator/wrap_iter.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/locale.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/addressof.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/allocation_guard.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator_arg_t.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator_traits.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/auto_ptr.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/compressed_pair.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/concepts.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/construct_at.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/pointer_traits.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/ranges_construct_at.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/ranges_uninitialized_algorithms.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/raw_storage_iterator.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/shared_ptr.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/temporary_buffer.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/uninitialized_algorithms.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/unique_ptr.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/uses_allocator.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/memory/voidify.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/mutex_base.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/node_handle.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/numeric/accumulate.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/numeric/adjacent_difference.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/numeric/exclusive_scan.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/numeric/gcd_lcm.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/numeric/inclusive_scan.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/numeric/inner_product.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/numeric/iota.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/numeric/midpoint.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/numeric/partial_sum.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/numeric/reduce.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/numeric/transform_exclusive_scan.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/numeric/transform_inclusive_scan.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/numeric/transform_reduce.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/bernoulli_distribution.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/binomial_distribution.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/cauchy_distribution.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/chi_squared_distribution.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/clamp_to_integral.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/default_random_engine.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/discard_block_engine.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/discrete_distribution.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/exponential_distribution.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/extreme_value_distribution.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/fisher_f_distribution.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/gamma_distribution.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/generate_canonical.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/geometric_distribution.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/independent_bits_engine.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/is_seed_sequence.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/knuth_b.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/linear_congruential_engine.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/log2.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/lognormal_distribution.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/mersenne_twister_engine.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/negative_binomial_distribution.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/normal_distribution.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/piecewise_constant_distribution.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/piecewise_linear_distribution.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/poisson_distribution.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/random_device.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/ranlux.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/seed_seq.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/shuffle_order_engine.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/student_t_distribution.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/subtract_with_carry_engine.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/uniform_int_distribution.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/uniform_random_bit_generator.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/uniform_real_distribution.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/random/weibull_distribution.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/access.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/all.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/common_view.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/concepts.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/copyable_box.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/counted.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/dangling.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/data.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/drop_view.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/empty.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/empty_view.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/enable_borrowed_range.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/enable_view.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/iota_view.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/join_view.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/non_propagating_cache.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/owning_view.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/range_adaptor.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/rbegin.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/ref_view.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/rend.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/reverse_view.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/single_view.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/size.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/subrange.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/take_view.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/transform_view.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/view_interface.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/ranges/views.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/split_buffer.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/std_stream.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/string.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/thread/poll_with_backoff.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/thread/timed_backoff_policy.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/tuple.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/as_const.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/auto_cast.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/cmp.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/declval.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/exchange.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/forward.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/in_place.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/integer_sequence.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/move.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/pair.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/piecewise_construct.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/priority_tag.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/rel_ops.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/swap.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/to_underlying.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/transaction.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/utility/unreachable.header.verify.cpp
    libcxx/test/libcxx/diagnostics/detail.headers/variant/monostate.header.verify.cpp
    libcxxabi/include/threading_support.h


################################################################################
diff  --git a/libcxx/cmake/Modules/HandleLibCXXABI.cmake b/libcxx/cmake/Modules/HandleLibCXXABI.cmake
index 5b92ebb765a81..d69405ddeeacf 100644

--- a/libcxx/cmake/Modules/HandleLibCXXABI.cmake
+++ b/libcxx/cmake/Modules/HandleLibCXXABI.cmake
@@ -117,7 +117,7 @@ elseif ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libcxxabi")
 
   setup_abi_lib(
     "-DLIBCXX_BUILDING_LIBCXXABI"
-    "${shared}" "${static}" "cxxabi.h;__cxxabi_config.h;threading_support.h" "")
+    "${shared}" "${static}" "cxxabi.h;__cxxabi_config.h" "")
 elseif ("${LIBCXX_CXX_ABI_LIBNAME}" STREQUAL "libcxxrt")
   if(NOT LIBCXX_CXX_ABI_INCLUDE_PATHS)
     set(LIBCXX_CXX_ABI_INCLUDE_PATHS "/usr/include/c++/v1")

diff  --git a/libcxx/include/__algorithm/adjacent_find.h b/libcxx/include/__algorithm/adjacent_find.h
index e892ff46218df..83d8c260f27a2 100644
--- a/libcxx/include/__algorithm/adjacent_find.h
+++ b/libcxx/include/__algorithm/adjacent_find.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/all_of.h b/libcxx/include/__algorithm/all_of.h
index 7b4a52cb22878..3af32a5775048 100644
--- a/libcxx/include/__algorithm/all_of.h
+++ b/libcxx/include/__algorithm/all_of.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/any_of.h b/libcxx/include/__algorithm/any_of.h
index 193f9bd121e04..6fe6a0b6b3c42 100644
--- a/libcxx/include/__algorithm/any_of.h
+++ b/libcxx/include/__algorithm/any_of.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/binary_search.h b/libcxx/include/__algorithm/binary_search.h
index 60f91f2627102..15a17e1cde99a 100644
--- a/libcxx/include/__algorithm/binary_search.h
+++ b/libcxx/include/__algorithm/binary_search.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/clamp.h b/libcxx/include/__algorithm/clamp.h
index 79eab5388e1b6..b3762b85a0bc9 100644
--- a/libcxx/include/__algorithm/clamp.h
+++ b/libcxx/include/__algorithm/clamp.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/comp.h b/libcxx/include/__algorithm/comp.h
index beb2b6802b385..62c06ae57f23c 100644
--- a/libcxx/include/__algorithm/comp.h
+++ b/libcxx/include/__algorithm/comp.h
@@ -13,7 +13,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/comp_ref_type.h b/libcxx/include/__algorithm/comp_ref_type.h
index 70993d19cefdd..ed0ed5904a44c 100644
--- a/libcxx/include/__algorithm/comp_ref_type.h
+++ b/libcxx/include/__algorithm/comp_ref_type.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/copy.h b/libcxx/include/__algorithm/copy.h
index 7c0ccb78da887..b4045cd06a2bb 100644
--- a/libcxx/include/__algorithm/copy.h
+++ b/libcxx/include/__algorithm/copy.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/copy_backward.h b/libcxx/include/__algorithm/copy_backward.h
index cd216207928e6..9754f0c95b01f 100644
--- a/libcxx/include/__algorithm/copy_backward.h
+++ b/libcxx/include/__algorithm/copy_backward.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/copy_if.h b/libcxx/include/__algorithm/copy_if.h
index 8960ce28cc47e..9c3cd29e24134 100644
--- a/libcxx/include/__algorithm/copy_if.h
+++ b/libcxx/include/__algorithm/copy_if.h
@@ -13,7 +13,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/copy_n.h b/libcxx/include/__algorithm/copy_n.h
index 93bcea60f2039..8b915af63c0db 100644
--- a/libcxx/include/__algorithm/copy_n.h
+++ b/libcxx/include/__algorithm/copy_n.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/count.h b/libcxx/include/__algorithm/count.h
index e29a84b97ee41..e18128cae8a80 100644
--- a/libcxx/include/__algorithm/count.h
+++ b/libcxx/include/__algorithm/count.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/count_if.h b/libcxx/include/__algorithm/count_if.h
index b6432e9c25515..1ec2d83394e12 100644
--- a/libcxx/include/__algorithm/count_if.h
+++ b/libcxx/include/__algorithm/count_if.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/equal.h b/libcxx/include/__algorithm/equal.h
index bfd3bf15f00c9..ca1bc6bc5665a 100644
--- a/libcxx/include/__algorithm/equal.h
+++ b/libcxx/include/__algorithm/equal.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/equal_range.h b/libcxx/include/__algorithm/equal_range.h
index f4654a08485ba..37a2c299f0b93 100644
--- a/libcxx/include/__algorithm/equal_range.h
+++ b/libcxx/include/__algorithm/equal_range.h
@@ -19,7 +19,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/fill.h b/libcxx/include/__algorithm/fill.h
index ecbdc502329fe..be5b4740a52a7 100644
--- a/libcxx/include/__algorithm/fill.h
+++ b/libcxx/include/__algorithm/fill.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/fill_n.h b/libcxx/include/__algorithm/fill_n.h
index 3a0aca7a365f4..590c8f38f3fdd 100644
--- a/libcxx/include/__algorithm/fill_n.h
+++ b/libcxx/include/__algorithm/fill_n.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/find.h b/libcxx/include/__algorithm/find.h
index b9ed3c8295ab8..641b85e2f6456 100644
--- a/libcxx/include/__algorithm/find.h
+++ b/libcxx/include/__algorithm/find.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/find_end.h b/libcxx/include/__algorithm/find_end.h
index 294f09ed46ffb..0220c09397110 100644
--- a/libcxx/include/__algorithm/find_end.h
+++ b/libcxx/include/__algorithm/find_end.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/find_first_of.h b/libcxx/include/__algorithm/find_first_of.h
index 1d3f0e9606c1b..b968329fc3186 100644
--- a/libcxx/include/__algorithm/find_first_of.h
+++ b/libcxx/include/__algorithm/find_first_of.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/find_if.h b/libcxx/include/__algorithm/find_if.h
index 8fc59b5a322e1..aa98171a1f61a 100644
--- a/libcxx/include/__algorithm/find_if.h
+++ b/libcxx/include/__algorithm/find_if.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/find_if_not.h b/libcxx/include/__algorithm/find_if_not.h
index 58fc6c3a9c9dd..61ddab0b9805d 100644
--- a/libcxx/include/__algorithm/find_if_not.h
+++ b/libcxx/include/__algorithm/find_if_not.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/for_each.h b/libcxx/include/__algorithm/for_each.h
index 4d869eaf9c93d..bfbd37c3a3a44 100644
--- a/libcxx/include/__algorithm/for_each.h
+++ b/libcxx/include/__algorithm/for_each.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/for_each_n.h b/libcxx/include/__algorithm/for_each_n.h
index 75245c39b7579..2552b40c2781c 100644
--- a/libcxx/include/__algorithm/for_each_n.h
+++ b/libcxx/include/__algorithm/for_each_n.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/generate.h b/libcxx/include/__algorithm/generate.h
index 0b49f36dc8da5..dacbd8c681955 100644
--- a/libcxx/include/__algorithm/generate.h
+++ b/libcxx/include/__algorithm/generate.h
@@ -13,7 +13,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/generate_n.h b/libcxx/include/__algorithm/generate_n.h
index 0184c1f490fd3..2650e9e5d8b70 100644
--- a/libcxx/include/__algorithm/generate_n.h
+++ b/libcxx/include/__algorithm/generate_n.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/half_positive.h b/libcxx/include/__algorithm/half_positive.h
index a3d7e18959b63..7666ef1449c67 100644
--- a/libcxx/include/__algorithm/half_positive.h
+++ b/libcxx/include/__algorithm/half_positive.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/in_found_result.h b/libcxx/include/__algorithm/in_found_result.h
index 9cbcd319babcb..08ebf2fbcc1ac 100644
--- a/libcxx/include/__algorithm/in_found_result.h
+++ b/libcxx/include/__algorithm/in_found_result.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 #if !defined(_LIBCPP_HAS_NO_CONCEPTS) && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)

diff  --git a/libcxx/include/__algorithm/in_fun_result.h b/libcxx/include/__algorithm/in_fun_result.h
index d971bc3000c35..d5186e11b7ea4 100644
--- a/libcxx/include/__algorithm/in_fun_result.h
+++ b/libcxx/include/__algorithm/in_fun_result.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/in_in_out_result.h b/libcxx/include/__algorithm/in_in_out_result.h
index 5b17226074618..f7cb698472fb6 100644
--- a/libcxx/include/__algorithm/in_in_out_result.h
+++ b/libcxx/include/__algorithm/in_in_out_result.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/in_in_result.h b/libcxx/include/__algorithm/in_in_result.h
index 0de12db28b734..159092189a532 100644
--- a/libcxx/include/__algorithm/in_in_result.h
+++ b/libcxx/include/__algorithm/in_in_result.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/in_out_out_result.h b/libcxx/include/__algorithm/in_out_out_result.h
index d429d4fea443d..9788fbfa2e74e 100644
--- a/libcxx/include/__algorithm/in_out_out_result.h
+++ b/libcxx/include/__algorithm/in_out_out_result.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/in_out_result.h b/libcxx/include/__algorithm/in_out_result.h
index 6edd15dfe7890..fd394a36211b1 100644
--- a/libcxx/include/__algorithm/in_out_result.h
+++ b/libcxx/include/__algorithm/in_out_result.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/includes.h b/libcxx/include/__algorithm/includes.h
index ec7d83119a9f9..4c87e8d221168 100644
--- a/libcxx/include/__algorithm/includes.h
+++ b/libcxx/include/__algorithm/includes.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/inplace_merge.h b/libcxx/include/__algorithm/inplace_merge.h
index d22c26dde00f5..90ca152c5b3a8 100644
--- a/libcxx/include/__algorithm/inplace_merge.h
+++ b/libcxx/include/__algorithm/inplace_merge.h
@@ -23,7 +23,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__algorithm/is_heap.h b/libcxx/include/__algorithm/is_heap.h
index cf57ef1b37974..fe44e634f6ddd 100644
--- a/libcxx/include/__algorithm/is_heap.h
+++ b/libcxx/include/__algorithm/is_heap.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/is_heap_until.h b/libcxx/include/__algorithm/is_heap_until.h
index f39cf9dcc8460..39f313eb0d3fc 100644
--- a/libcxx/include/__algorithm/is_heap_until.h
+++ b/libcxx/include/__algorithm/is_heap_until.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/is_partitioned.h b/libcxx/include/__algorithm/is_partitioned.h
index 849fdabe1481a..b4f421cfc0538 100644
--- a/libcxx/include/__algorithm/is_partitioned.h
+++ b/libcxx/include/__algorithm/is_partitioned.h
@@ -13,7 +13,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/is_permutation.h b/libcxx/include/__algorithm/is_permutation.h
index 2a58dcfb21eb5..cdd742048412a 100644
--- a/libcxx/include/__algorithm/is_permutation.h
+++ b/libcxx/include/__algorithm/is_permutation.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/is_sorted.h b/libcxx/include/__algorithm/is_sorted.h
index b4bc21b54eaa6..56de95bb31b73 100644
--- a/libcxx/include/__algorithm/is_sorted.h
+++ b/libcxx/include/__algorithm/is_sorted.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/is_sorted_until.h b/libcxx/include/__algorithm/is_sorted_until.h
index c9200737b524f..338d28508c173 100644
--- a/libcxx/include/__algorithm/is_sorted_until.h
+++ b/libcxx/include/__algorithm/is_sorted_until.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/iter_swap.h b/libcxx/include/__algorithm/iter_swap.h
index 89633252630ea..038859e1361d2 100644
--- a/libcxx/include/__algorithm/iter_swap.h
+++ b/libcxx/include/__algorithm/iter_swap.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/lexicographical_compare.h b/libcxx/include/__algorithm/lexicographical_compare.h
index 26ae99da7bbbb..30ddf24081202 100644
--- a/libcxx/include/__algorithm/lexicographical_compare.h
+++ b/libcxx/include/__algorithm/lexicographical_compare.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/lower_bound.h b/libcxx/include/__algorithm/lower_bound.h
index 6bac873693bb9..26b64ec12d304 100644
--- a/libcxx/include/__algorithm/lower_bound.h
+++ b/libcxx/include/__algorithm/lower_bound.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/make_heap.h b/libcxx/include/__algorithm/make_heap.h
index 7e1b9a2a5df72..acac0aabf1e43 100644
--- a/libcxx/include/__algorithm/make_heap.h
+++ b/libcxx/include/__algorithm/make_heap.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/max.h b/libcxx/include/__algorithm/max.h
index f41a29ce4f4a2..345b235a21933 100644
--- a/libcxx/include/__algorithm/max.h
+++ b/libcxx/include/__algorithm/max.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__algorithm/max_element.h b/libcxx/include/__algorithm/max_element.h
index ce1dfae374480..795ec8e1ddc16 100644
--- a/libcxx/include/__algorithm/max_element.h
+++ b/libcxx/include/__algorithm/max_element.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/merge.h b/libcxx/include/__algorithm/merge.h
index 82855fac992c9..48360ed5b4451 100644
--- a/libcxx/include/__algorithm/merge.h
+++ b/libcxx/include/__algorithm/merge.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/min.h b/libcxx/include/__algorithm/min.h
index 7a092fe97a1b1..3d8c73d78f118 100644
--- a/libcxx/include/__algorithm/min.h
+++ b/libcxx/include/__algorithm/min.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__algorithm/min_element.h b/libcxx/include/__algorithm/min_element.h
index b8da52b236f87..129833d42bda8 100644
--- a/libcxx/include/__algorithm/min_element.h
+++ b/libcxx/include/__algorithm/min_element.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/min_max_result.h b/libcxx/include/__algorithm/min_max_result.h
index 9d0226af63321..1d56a741f5bc5 100644
--- a/libcxx/include/__algorithm/min_max_result.h
+++ b/libcxx/include/__algorithm/min_max_result.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__algorithm/minmax.h b/libcxx/include/__algorithm/minmax.h
index fddfcc64f6988..30a119491a36e 100644
--- a/libcxx/include/__algorithm/minmax.h
+++ b/libcxx/include/__algorithm/minmax.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/minmax_element.h b/libcxx/include/__algorithm/minmax_element.h
index 38e280d97dbf7..80afbdf87abea 100644
--- a/libcxx/include/__algorithm/minmax_element.h
+++ b/libcxx/include/__algorithm/minmax_element.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/mismatch.h b/libcxx/include/__algorithm/mismatch.h
index d919e142cb0f6..f2011faf2f9a0 100644
--- a/libcxx/include/__algorithm/mismatch.h
+++ b/libcxx/include/__algorithm/mismatch.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/move.h b/libcxx/include/__algorithm/move.h
index 77692255e213a..72bf3d76ea5be 100644
--- a/libcxx/include/__algorithm/move.h
+++ b/libcxx/include/__algorithm/move.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/move_backward.h b/libcxx/include/__algorithm/move_backward.h
index 38d361d15a476..a56f6b826ce33 100644
--- a/libcxx/include/__algorithm/move_backward.h
+++ b/libcxx/include/__algorithm/move_backward.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/next_permutation.h b/libcxx/include/__algorithm/next_permutation.h
index 1ea0b0db68f67..05e56f4a17ff6 100644
--- a/libcxx/include/__algorithm/next_permutation.h
+++ b/libcxx/include/__algorithm/next_permutation.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/none_of.h b/libcxx/include/__algorithm/none_of.h
index d9dbec0cefcde..b34b1e00ddb84 100644
--- a/libcxx/include/__algorithm/none_of.h
+++ b/libcxx/include/__algorithm/none_of.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/nth_element.h b/libcxx/include/__algorithm/nth_element.h
index fb754fbd68d9f..0f9f66d3ca66f 100644
--- a/libcxx/include/__algorithm/nth_element.h
+++ b/libcxx/include/__algorithm/nth_element.h
@@ -22,7 +22,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/partial_sort.h b/libcxx/include/__algorithm/partial_sort.h
index 9714e4ff45dd1..8adf5b2f4f459 100644
--- a/libcxx/include/__algorithm/partial_sort.h
+++ b/libcxx/include/__algorithm/partial_sort.h
@@ -24,7 +24,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/partial_sort_copy.h b/libcxx/include/__algorithm/partial_sort_copy.h
index 5a11963d675fd..7ed1e538e9b83 100644
--- a/libcxx/include/__algorithm/partial_sort_copy.h
+++ b/libcxx/include/__algorithm/partial_sort_copy.h
@@ -19,7 +19,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/partition.h b/libcxx/include/__algorithm/partition.h
index d2ed4b419d86a..73d94831ed876 100644
--- a/libcxx/include/__algorithm/partition.h
+++ b/libcxx/include/__algorithm/partition.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/partition_copy.h b/libcxx/include/__algorithm/partition_copy.h
index a53916eedcbff..cacde0bfd47bb 100644
--- a/libcxx/include/__algorithm/partition_copy.h
+++ b/libcxx/include/__algorithm/partition_copy.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/partition_point.h b/libcxx/include/__algorithm/partition_point.h
index 24fd5d88ba2ba..c2fa841edc6d0 100644
--- a/libcxx/include/__algorithm/partition_point.h
+++ b/libcxx/include/__algorithm/partition_point.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/pop_heap.h b/libcxx/include/__algorithm/pop_heap.h
index 6680369477a44..2a69f6ee47f0d 100644
--- a/libcxx/include/__algorithm/pop_heap.h
+++ b/libcxx/include/__algorithm/pop_heap.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/prev_permutation.h b/libcxx/include/__algorithm/prev_permutation.h
index 2f127eab4583e..9dbc1dad01244 100644
--- a/libcxx/include/__algorithm/prev_permutation.h
+++ b/libcxx/include/__algorithm/prev_permutation.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/push_heap.h b/libcxx/include/__algorithm/push_heap.h
index 8ff6df4784d9d..66973e082f14a 100644
--- a/libcxx/include/__algorithm/push_heap.h
+++ b/libcxx/include/__algorithm/push_heap.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/ranges_min_element.h b/libcxx/include/__algorithm/ranges_min_element.h
index 218cfce1f1962..82aaeea1c846b 100644
--- a/libcxx/include/__algorithm/ranges_min_element.h
+++ b/libcxx/include/__algorithm/ranges_min_element.h
@@ -22,7 +22,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 #if !defined(_LIBCPP_HAS_NO_CONCEPTS) && !defined(_LIBCPP_HAS_NO_INCOMPLETE_RANGES)

diff  --git a/libcxx/include/__algorithm/ranges_swap_ranges.h b/libcxx/include/__algorithm/ranges_swap_ranges.h
index b05bff2e3dc67..59a875ae3bb21 100644
--- a/libcxx/include/__algorithm/ranges_swap_ranges.h
+++ b/libcxx/include/__algorithm/ranges_swap_ranges.h
@@ -20,7 +20,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 #ifndef _LIBCPP_HAS_NO_CONCEPTS

diff  --git a/libcxx/include/__algorithm/remove.h b/libcxx/include/__algorithm/remove.h
index 88bf9b43b7dbb..c00f96f78a634 100644
--- a/libcxx/include/__algorithm/remove.h
+++ b/libcxx/include/__algorithm/remove.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/remove_copy.h b/libcxx/include/__algorithm/remove_copy.h
index 411723f2d0980..a29a385af9acc 100644
--- a/libcxx/include/__algorithm/remove_copy.h
+++ b/libcxx/include/__algorithm/remove_copy.h
@@ -13,7 +13,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/remove_copy_if.h b/libcxx/include/__algorithm/remove_copy_if.h
index 0dbe6fd5aadac..36ddba4883ab9 100644
--- a/libcxx/include/__algorithm/remove_copy_if.h
+++ b/libcxx/include/__algorithm/remove_copy_if.h
@@ -13,7 +13,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/remove_if.h b/libcxx/include/__algorithm/remove_if.h
index 59746434c1bc3..0ae131498d22d 100644
--- a/libcxx/include/__algorithm/remove_if.h
+++ b/libcxx/include/__algorithm/remove_if.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/replace.h b/libcxx/include/__algorithm/replace.h
index 345440305bd4d..d0ae8f65d4a28 100644
--- a/libcxx/include/__algorithm/replace.h
+++ b/libcxx/include/__algorithm/replace.h
@@ -13,7 +13,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/replace_copy.h b/libcxx/include/__algorithm/replace_copy.h
index f260c819382e2..7c8a5a0b93cbb 100644
--- a/libcxx/include/__algorithm/replace_copy.h
+++ b/libcxx/include/__algorithm/replace_copy.h
@@ -13,7 +13,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/replace_copy_if.h b/libcxx/include/__algorithm/replace_copy_if.h
index 2dc6f6bba5040..9d8a68fdc0f39 100644
--- a/libcxx/include/__algorithm/replace_copy_if.h
+++ b/libcxx/include/__algorithm/replace_copy_if.h
@@ -13,7 +13,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/replace_if.h b/libcxx/include/__algorithm/replace_if.h
index c5a06f8140753..37c719a34c848 100644
--- a/libcxx/include/__algorithm/replace_if.h
+++ b/libcxx/include/__algorithm/replace_if.h
@@ -13,7 +13,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/reverse.h b/libcxx/include/__algorithm/reverse.h
index 1bde1b0dc7915..0202cd7408332 100644
--- a/libcxx/include/__algorithm/reverse.h
+++ b/libcxx/include/__algorithm/reverse.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/reverse_copy.h b/libcxx/include/__algorithm/reverse_copy.h
index 9db7379545a36..1583907078031 100644
--- a/libcxx/include/__algorithm/reverse_copy.h
+++ b/libcxx/include/__algorithm/reverse_copy.h
@@ -13,7 +13,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/rotate.h b/libcxx/include/__algorithm/rotate.h
index 61e5cf1db0819..344c2f8cc9ff9 100644
--- a/libcxx/include/__algorithm/rotate.h
+++ b/libcxx/include/__algorithm/rotate.h
@@ -21,7 +21,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/rotate_copy.h b/libcxx/include/__algorithm/rotate_copy.h
index 7dc29dcda589a..ab569ef7c6be9 100644
--- a/libcxx/include/__algorithm/rotate_copy.h
+++ b/libcxx/include/__algorithm/rotate_copy.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/sample.h b/libcxx/include/__algorithm/sample.h
index e8b9ebfbb6be4..523496108217a 100644
--- a/libcxx/include/__algorithm/sample.h
+++ b/libcxx/include/__algorithm/sample.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__algorithm/search.h b/libcxx/include/__algorithm/search.h
index 6d1d77f8da67a..d89ec2b1c5bce 100644
--- a/libcxx/include/__algorithm/search.h
+++ b/libcxx/include/__algorithm/search.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/search_n.h b/libcxx/include/__algorithm/search_n.h
index 5e563b580184a..4c083de65ee20 100644
--- a/libcxx/include/__algorithm/search_n.h
+++ b/libcxx/include/__algorithm/search_n.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/set_
diff erence.h b/libcxx/include/__algorithm/set_
diff erence.h
index 23eae01a9dee4..5e2dca24e446c 100644
--- a/libcxx/include/__algorithm/set_
diff erence.h
+++ b/libcxx/include/__algorithm/set_
diff erence.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/set_intersection.h b/libcxx/include/__algorithm/set_intersection.h
index 563ee66e78d6b..c4163fcd4c3cc 100644
--- a/libcxx/include/__algorithm/set_intersection.h
+++ b/libcxx/include/__algorithm/set_intersection.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/set_symmetric_
diff erence.h b/libcxx/include/__algorithm/set_symmetric_
diff erence.h
index 1e0d3257a236a..2dbfb35d7be6e 100644
--- a/libcxx/include/__algorithm/set_symmetric_
diff erence.h
+++ b/libcxx/include/__algorithm/set_symmetric_
diff erence.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/set_union.h b/libcxx/include/__algorithm/set_union.h
index 78ee9e27fc748..0ec6b09380ed2 100644
--- a/libcxx/include/__algorithm/set_union.h
+++ b/libcxx/include/__algorithm/set_union.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/shift_left.h b/libcxx/include/__algorithm/shift_left.h
index 51710094a7a37..33f06d57e23a4 100644
--- a/libcxx/include/__algorithm/shift_left.h
+++ b/libcxx/include/__algorithm/shift_left.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/shift_right.h b/libcxx/include/__algorithm/shift_right.h
index 65d52d3d53958..14bc761598b26 100644
--- a/libcxx/include/__algorithm/shift_right.h
+++ b/libcxx/include/__algorithm/shift_right.h
@@ -19,7 +19,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/shuffle.h b/libcxx/include/__algorithm/shuffle.h
index 123a6a7b62e0a..647aa3f067181 100644
--- a/libcxx/include/__algorithm/shuffle.h
+++ b/libcxx/include/__algorithm/shuffle.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__algorithm/sift_down.h b/libcxx/include/__algorithm/sift_down.h
index b61715344608a..b636da78b0ccd 100644
--- a/libcxx/include/__algorithm/sift_down.h
+++ b/libcxx/include/__algorithm/sift_down.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/sort.h b/libcxx/include/__algorithm/sort.h
index 315945273c3aa..27ce647c8129c 100644
--- a/libcxx/include/__algorithm/sort.h
+++ b/libcxx/include/__algorithm/sort.h
@@ -24,7 +24,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/sort_heap.h b/libcxx/include/__algorithm/sort_heap.h
index 9ab129ad2dd5f..3a63d744fc1c7 100644
--- a/libcxx/include/__algorithm/sort_heap.h
+++ b/libcxx/include/__algorithm/sort_heap.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/stable_partition.h b/libcxx/include/__algorithm/stable_partition.h
index 9e13234bd698e..1233cc157fb5e 100644
--- a/libcxx/include/__algorithm/stable_partition.h
+++ b/libcxx/include/__algorithm/stable_partition.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/stable_sort.h b/libcxx/include/__algorithm/stable_sort.h
index 8658069590841..33df6e8ba75f3 100644
--- a/libcxx/include/__algorithm/stable_sort.h
+++ b/libcxx/include/__algorithm/stable_sort.h
@@ -21,7 +21,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/swap_ranges.h b/libcxx/include/__algorithm/swap_ranges.h
index 4d7844ddd18ab..0422265bb4be4 100644
--- a/libcxx/include/__algorithm/swap_ranges.h
+++ b/libcxx/include/__algorithm/swap_ranges.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/transform.h b/libcxx/include/__algorithm/transform.h
index 2983b7176352c..f9db806f5b94d 100644
--- a/libcxx/include/__algorithm/transform.h
+++ b/libcxx/include/__algorithm/transform.h
@@ -13,7 +13,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/unique.h b/libcxx/include/__algorithm/unique.h
index cb80ee3765fa5..264d727d93c88 100644
--- a/libcxx/include/__algorithm/unique.h
+++ b/libcxx/include/__algorithm/unique.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/unique_copy.h b/libcxx/include/__algorithm/unique_copy.h
index 4cb861dc83748..f58517749f514 100644
--- a/libcxx/include/__algorithm/unique_copy.h
+++ b/libcxx/include/__algorithm/unique_copy.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/unwrap_iter.h b/libcxx/include/__algorithm/unwrap_iter.h
index bbadd53aa9392..e738cb26fcd89 100644
--- a/libcxx/include/__algorithm/unwrap_iter.h
+++ b/libcxx/include/__algorithm/unwrap_iter.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__algorithm/upper_bound.h b/libcxx/include/__algorithm/upper_bound.h
index a4963cf9ecb61..cfa021e142479 100644
--- a/libcxx/include/__algorithm/upper_bound.h
+++ b/libcxx/include/__algorithm/upper_bound.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__bit/bit_cast.h b/libcxx/include/__bit/bit_cast.h
index 589594b06fe25..fbb70b3b46f67 100644
--- a/libcxx/include/__bit/bit_cast.h
+++ b/libcxx/include/__bit/bit_cast.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<bit>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__bit/byteswap.h b/libcxx/include/__bit/byteswap.h
index 6bb1980b53abf..970074ed98cea 100644
--- a/libcxx/include/__bit/byteswap.h
+++ b/libcxx/include/__bit/byteswap.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<bit>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__bit_reference b/libcxx/include/__bit_reference
index 7c0f332fa8810..423acee4aa7ce 100644
--- a/libcxx/include/__bit_reference
+++ b/libcxx/include/__bit_reference
@@ -20,8 +20,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<bitset>)
-#  pragma clang include_instead(<vector>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__bits b/libcxx/include/__bits
index 56508e169ad72..1eee8f576e9e1 100644
--- a/libcxx/include/__bits
+++ b/libcxx/include/__bits
@@ -14,14 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<algorithm>)
-#  pragma clang include_instead(<bit>)
-#  pragma clang include_instead(<bitset>)
-#  pragma clang include_instead(<numeric>)
-#  pragma clang include_instead(<random>)
-#  pragma clang include_instead(<unordered_map>)
-#  pragma clang include_instead(<unordered_set>)
-#  pragma clang include_instead(<vector>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__charconv/chars_format.h b/libcxx/include/__charconv/chars_format.h
index 59e17dffaa243..0875079e6c7ab 100644
--- a/libcxx/include/__charconv/chars_format.h
+++ b/libcxx/include/__charconv/chars_format.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<charconv>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__charconv/from_chars_result.h b/libcxx/include/__charconv/from_chars_result.h
index e2815670e1893..2cc3c11ef64fa 100644
--- a/libcxx/include/__charconv/from_chars_result.h
+++ b/libcxx/include/__charconv/from_chars_result.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<charconv>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__charconv/to_chars_result.h b/libcxx/include/__charconv/to_chars_result.h
index c0e3a9a0c17bf..b4bc6ac2635b0 100644
--- a/libcxx/include/__charconv/to_chars_result.h
+++ b/libcxx/include/__charconv/to_chars_result.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<charconv>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__chrono/calendar.h b/libcxx/include/__chrono/calendar.h
index f9feab8e299bf..9e5642f758114 100644
--- a/libcxx/include/__chrono/calendar.h
+++ b/libcxx/include/__chrono/calendar.h
@@ -20,7 +20,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<chrono>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__chrono/convert_to_timespec.h b/libcxx/include/__chrono/convert_to_timespec.h
index 23c6415f6303e..e8631d135fee5 100644
--- a/libcxx/include/__chrono/convert_to_timespec.h
+++ b/libcxx/include/__chrono/convert_to_timespec.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<chrono>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__chrono/duration.h b/libcxx/include/__chrono/duration.h
index 1097412ee6b49..f5207594291eb 100644
--- a/libcxx/include/__chrono/duration.h
+++ b/libcxx/include/__chrono/duration.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<chrono>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__chrono/file_clock.h b/libcxx/include/__chrono/file_clock.h
index f2bbdb31d0949..b8e08e78ba720 100644
--- a/libcxx/include/__chrono/file_clock.h
+++ b/libcxx/include/__chrono/file_clock.h
@@ -19,7 +19,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<chrono>)
 #endif
 
 #ifndef _LIBCPP_CXX03_LANG

diff  --git a/libcxx/include/__chrono/high_resolution_clock.h b/libcxx/include/__chrono/high_resolution_clock.h
index 36c9d3ff808fa..778ff44f3d09b 100644
--- a/libcxx/include/__chrono/high_resolution_clock.h
+++ b/libcxx/include/__chrono/high_resolution_clock.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<chrono>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__chrono/steady_clock.h b/libcxx/include/__chrono/steady_clock.h
index 9827601f2308f..657e5eef6c370 100644
--- a/libcxx/include/__chrono/steady_clock.h
+++ b/libcxx/include/__chrono/steady_clock.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<chrono>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__chrono/system_clock.h b/libcxx/include/__chrono/system_clock.h
index 972da259cf405..2922b78a74cb5 100644
--- a/libcxx/include/__chrono/system_clock.h
+++ b/libcxx/include/__chrono/system_clock.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<chrono>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__chrono/time_point.h b/libcxx/include/__chrono/time_point.h
index 3ac44e71663ab..ac2d347a0dcad 100644
--- a/libcxx/include/__chrono/time_point.h
+++ b/libcxx/include/__chrono/time_point.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<chrono>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__compare/common_comparison_category.h b/libcxx/include/__compare/common_comparison_category.h
index 9538f3ff95683..deab171846e24 100644
--- a/libcxx/include/__compare/common_comparison_category.h
+++ b/libcxx/include/__compare/common_comparison_category.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<compare>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__compare/compare_partial_order_fallback.h b/libcxx/include/__compare/compare_partial_order_fallback.h
index a403403097479..b1fd5e82bb46e 100644
--- a/libcxx/include/__compare/compare_partial_order_fallback.h
+++ b/libcxx/include/__compare/compare_partial_order_fallback.h
@@ -18,7 +18,6 @@
 
 #ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
 #  pragma GCC system_header
-#  pragma clang include_instead(<compare>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__compare/compare_strong_order_fallback.h b/libcxx/include/__compare/compare_strong_order_fallback.h
index fdcd60aa21371..9365a1ef036ce 100644
--- a/libcxx/include/__compare/compare_strong_order_fallback.h
+++ b/libcxx/include/__compare/compare_strong_order_fallback.h
@@ -18,7 +18,6 @@
 
 #ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
 #  pragma GCC system_header
-#  pragma clang include_instead(<compare>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__compare/compare_three_way.h b/libcxx/include/__compare/compare_three_way.h
index 5445afa4dd0dd..25563bb7fec03 100644
--- a/libcxx/include/__compare/compare_three_way.h
+++ b/libcxx/include/__compare/compare_three_way.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<compare>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__compare/compare_three_way_result.h b/libcxx/include/__compare/compare_three_way_result.h
index bdcce13369c71..7b03597ab1c12 100644
--- a/libcxx/include/__compare/compare_three_way_result.h
+++ b/libcxx/include/__compare/compare_three_way_result.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<compare>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__compare/compare_weak_order_fallback.h b/libcxx/include/__compare/compare_weak_order_fallback.h
index d72c1eee9d73a..160e45ecb5498 100644
--- a/libcxx/include/__compare/compare_weak_order_fallback.h
+++ b/libcxx/include/__compare/compare_weak_order_fallback.h
@@ -18,7 +18,6 @@
 
 #ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
 #  pragma GCC system_header
-#  pragma clang include_instead(<compare>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__compare/is_eq.h b/libcxx/include/__compare/is_eq.h
index fcf9e6cc32f5b..49648924e81f7 100644
--- a/libcxx/include/__compare/is_eq.h
+++ b/libcxx/include/__compare/is_eq.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<compare>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__compare/ordering.h b/libcxx/include/__compare/ordering.h
index 7913129768cb5..1d466d669eec1 100644
--- a/libcxx/include/__compare/ordering.h
+++ b/libcxx/include/__compare/ordering.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<compare>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__compare/partial_order.h b/libcxx/include/__compare/partial_order.h
index f3d8e633dd81e..ad29701875b91 100644
--- a/libcxx/include/__compare/partial_order.h
+++ b/libcxx/include/__compare/partial_order.h
@@ -19,7 +19,6 @@
 
 #ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
 #  pragma GCC system_header
-#  pragma clang include_instead(<compare>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__compare/strong_order.h b/libcxx/include/__compare/strong_order.h
index 6e1e285852393..49a6106663547 100644
--- a/libcxx/include/__compare/strong_order.h
+++ b/libcxx/include/__compare/strong_order.h
@@ -22,7 +22,6 @@
 
 #ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
 #  pragma GCC system_header
-#  pragma clang include_instead(<compare>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__compare/synth_three_way.h b/libcxx/include/__compare/synth_three_way.h
index 1d153420bf557..f55edd4876b5e 100644
--- a/libcxx/include/__compare/synth_three_way.h
+++ b/libcxx/include/__compare/synth_three_way.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<compare>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__compare/three_way_comparable.h b/libcxx/include/__compare/three_way_comparable.h
index 7fdf9feaac286..f17382e430787 100644
--- a/libcxx/include/__compare/three_way_comparable.h
+++ b/libcxx/include/__compare/three_way_comparable.h
@@ -20,7 +20,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<compare>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__compare/weak_order.h b/libcxx/include/__compare/weak_order.h
index c02011fbb29a7..725ac831e66bc 100644
--- a/libcxx/include/__compare/weak_order.h
+++ b/libcxx/include/__compare/weak_order.h
@@ -20,7 +20,6 @@
 
 #ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
 #  pragma GCC system_header
-#  pragma clang include_instead(<compare>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__concepts/arithmetic.h b/libcxx/include/__concepts/arithmetic.h
index b9a1d2a7cd97d..f86908cfdff31 100644
--- a/libcxx/include/__concepts/arithmetic.h
+++ b/libcxx/include/__concepts/arithmetic.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<concepts>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__concepts/assignable.h b/libcxx/include/__concepts/assignable.h
index 7f28afceea6e4..4d8a230ff4e9d 100644
--- a/libcxx/include/__concepts/assignable.h
+++ b/libcxx/include/__concepts/assignable.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<concepts>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__concepts/boolean_testable.h b/libcxx/include/__concepts/boolean_testable.h
index 222c35fc469fa..89f66201e644a 100644
--- a/libcxx/include/__concepts/boolean_testable.h
+++ b/libcxx/include/__concepts/boolean_testable.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<concepts>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__concepts/class_or_enum.h b/libcxx/include/__concepts/class_or_enum.h
index e3c0f6f6f2736..729e444b39ada 100644
--- a/libcxx/include/__concepts/class_or_enum.h
+++ b/libcxx/include/__concepts/class_or_enum.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<concepts>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__concepts/common_reference_with.h b/libcxx/include/__concepts/common_reference_with.h
index a16a59bf2bd1c..bb5801a8c1ace 100644
--- a/libcxx/include/__concepts/common_reference_with.h
+++ b/libcxx/include/__concepts/common_reference_with.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<concepts>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__concepts/common_with.h b/libcxx/include/__concepts/common_with.h
index f1661a67b4640..2b7cb836d63fe 100644
--- a/libcxx/include/__concepts/common_with.h
+++ b/libcxx/include/__concepts/common_with.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<concepts>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__concepts/constructible.h b/libcxx/include/__concepts/constructible.h
index 7d97490d313fc..f5371086233c3 100644
--- a/libcxx/include/__concepts/constructible.h
+++ b/libcxx/include/__concepts/constructible.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<concepts>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__concepts/convertible_to.h b/libcxx/include/__concepts/convertible_to.h
index 2e5d8a62b8a41..6bf19228a491d 100644
--- a/libcxx/include/__concepts/convertible_to.h
+++ b/libcxx/include/__concepts/convertible_to.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<concepts>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__concepts/copyable.h b/libcxx/include/__concepts/copyable.h
index bfde9233da77d..8d5f28abc4247 100644
--- a/libcxx/include/__concepts/copyable.h
+++ b/libcxx/include/__concepts/copyable.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<concepts>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__concepts/derived_from.h b/libcxx/include/__concepts/derived_from.h
index 12aa88bb1b168..b91ce13fe4090 100644
--- a/libcxx/include/__concepts/derived_from.h
+++ b/libcxx/include/__concepts/derived_from.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<concepts>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__concepts/destructible.h b/libcxx/include/__concepts/destructible.h
index 54941fb000da6..429e82ee93fea 100644
--- a/libcxx/include/__concepts/destructible.h
+++ b/libcxx/include/__concepts/destructible.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<concepts>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__concepts/
diff erent_from.h b/libcxx/include/__concepts/
diff erent_from.h
index fdeef6422852e..f882205d4a44d 100644
--- a/libcxx/include/__concepts/
diff erent_from.h
+++ b/libcxx/include/__concepts/
diff erent_from.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<concepts>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__concepts/equality_comparable.h b/libcxx/include/__concepts/equality_comparable.h
index 860780265684f..36ac870b6bce1 100644
--- a/libcxx/include/__concepts/equality_comparable.h
+++ b/libcxx/include/__concepts/equality_comparable.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<concepts>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__concepts/invocable.h b/libcxx/include/__concepts/invocable.h
index 193e813bfe097..8a669f1f18e6f 100644
--- a/libcxx/include/__concepts/invocable.h
+++ b/libcxx/include/__concepts/invocable.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<concepts>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__concepts/movable.h b/libcxx/include/__concepts/movable.h
index bb95690732382..53e36ebc3fadc 100644
--- a/libcxx/include/__concepts/movable.h
+++ b/libcxx/include/__concepts/movable.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<concepts>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__concepts/predicate.h b/libcxx/include/__concepts/predicate.h
index 5e11205ade48b..04cdd97f9557f 100644
--- a/libcxx/include/__concepts/predicate.h
+++ b/libcxx/include/__concepts/predicate.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<concepts>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__concepts/regular.h b/libcxx/include/__concepts/regular.h
index 870b254408fb4..63c9fb3ce3cfc 100644
--- a/libcxx/include/__concepts/regular.h
+++ b/libcxx/include/__concepts/regular.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<concepts>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__concepts/relation.h b/libcxx/include/__concepts/relation.h
index 2bfeacdb36bbd..1d687559e415e 100644
--- a/libcxx/include/__concepts/relation.h
+++ b/libcxx/include/__concepts/relation.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<concepts>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__concepts/same_as.h b/libcxx/include/__concepts/same_as.h
index 12057a25a657d..1337193c93cc0 100644
--- a/libcxx/include/__concepts/same_as.h
+++ b/libcxx/include/__concepts/same_as.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<concepts>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__concepts/semiregular.h b/libcxx/include/__concepts/semiregular.h
index 6654ae1204cf2..eac5ec28724f6 100644
--- a/libcxx/include/__concepts/semiregular.h
+++ b/libcxx/include/__concepts/semiregular.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<concepts>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__concepts/swappable.h b/libcxx/include/__concepts/swappable.h
index dc185cfd5d9d9..866e9f7dfd4ad 100644
--- a/libcxx/include/__concepts/swappable.h
+++ b/libcxx/include/__concepts/swappable.h
@@ -21,7 +21,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<concepts>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__concepts/totally_ordered.h b/libcxx/include/__concepts/totally_ordered.h
index 853b490622c7d..5ede92ad086c4 100644
--- a/libcxx/include/__concepts/totally_ordered.h
+++ b/libcxx/include/__concepts/totally_ordered.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<concepts>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__coroutine/coroutine_handle.h b/libcxx/include/__coroutine/coroutine_handle.h
index d16660128e306..4bf323789217e 100644
--- a/libcxx/include/__coroutine/coroutine_handle.h
+++ b/libcxx/include/__coroutine/coroutine_handle.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<coroutine>)
 #endif
 
 #if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CXX20_COROUTINES)

diff  --git a/libcxx/include/__coroutine/coroutine_traits.h b/libcxx/include/__coroutine/coroutine_traits.h
index 1acca38e8a1c2..0a5229b459454 100644
--- a/libcxx/include/__coroutine/coroutine_traits.h
+++ b/libcxx/include/__coroutine/coroutine_traits.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<coroutine>)
 #endif
 
 #if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CXX20_COROUTINES)

diff  --git a/libcxx/include/__coroutine/noop_coroutine_handle.h b/libcxx/include/__coroutine/noop_coroutine_handle.h
index 7ec0cb97c97dd..7a2c672057cb9 100644
--- a/libcxx/include/__coroutine/noop_coroutine_handle.h
+++ b/libcxx/include/__coroutine/noop_coroutine_handle.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<coroutine>)
 #endif
 
 #if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CXX20_COROUTINES)

diff  --git a/libcxx/include/__coroutine/trivial_awaitables.h b/libcxx/include/__coroutine/trivial_awaitables.h
index e09c0b275fb4c..31399ab29a000 100644
--- a/libcxx/include/__coroutine/trivial_awaitables.h
+++ b/libcxx/include/__coroutine/trivial_awaitables.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<coroutine>)
 #endif
 
 #if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CXX20_COROUTINES)

diff  --git a/libcxx/include/__filesystem/copy_options.h b/libcxx/include/__filesystem/copy_options.h
index 411cec2b0bcfe..2e037403f6f27 100644
--- a/libcxx/include/__filesystem/copy_options.h
+++ b/libcxx/include/__filesystem/copy_options.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<filesystem>)
 #endif
 
 #ifndef _LIBCPP_CXX03_LANG

diff  --git a/libcxx/include/__filesystem/directory_entry.h b/libcxx/include/__filesystem/directory_entry.h
index 068414089554e..3db244556cfd8 100644
--- a/libcxx/include/__filesystem/directory_entry.h
+++ b/libcxx/include/__filesystem/directory_entry.h
@@ -29,7 +29,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<filesystem>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__filesystem/directory_iterator.h b/libcxx/include/__filesystem/directory_iterator.h
index 8994427b56a99..87bbbfac717bb 100644
--- a/libcxx/include/__filesystem/directory_iterator.h
+++ b/libcxx/include/__filesystem/directory_iterator.h
@@ -25,7 +25,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<filesystem>)
 #endif
 
 #ifndef _LIBCPP_CXX03_LANG

diff  --git a/libcxx/include/__filesystem/directory_options.h b/libcxx/include/__filesystem/directory_options.h
index 6a721466b5cfd..d3f8cc1deb21f 100644
--- a/libcxx/include/__filesystem/directory_options.h
+++ b/libcxx/include/__filesystem/directory_options.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<filesystem>)
 #endif
 
 #ifndef _LIBCPP_CXX03_LANG

diff  --git a/libcxx/include/__filesystem/file_status.h b/libcxx/include/__filesystem/file_status.h
index 5adcc339b4191..ac3f6cbed9d78 100644
--- a/libcxx/include/__filesystem/file_status.h
+++ b/libcxx/include/__filesystem/file_status.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<filesystem>)
 #endif
 
 #ifndef _LIBCPP_CXX03_LANG

diff  --git a/libcxx/include/__filesystem/file_time_type.h b/libcxx/include/__filesystem/file_time_type.h
index 7c4b0254af4cb..7c4932e603bc1 100644
--- a/libcxx/include/__filesystem/file_time_type.h
+++ b/libcxx/include/__filesystem/file_time_type.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<filesystem>)
 #endif
 
 #ifndef _LIBCPP_CXX03_LANG

diff  --git a/libcxx/include/__filesystem/file_type.h b/libcxx/include/__filesystem/file_type.h
index 24e59302e229b..c756a05c848b0 100644
--- a/libcxx/include/__filesystem/file_type.h
+++ b/libcxx/include/__filesystem/file_type.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<filesystem>)
 #endif
 
 #ifndef _LIBCPP_CXX03_LANG

diff  --git a/libcxx/include/__filesystem/filesystem_error.h b/libcxx/include/__filesystem/filesystem_error.h
index 0e76f397b75b1..e32b14c1b7bf9 100644
--- a/libcxx/include/__filesystem/filesystem_error.h
+++ b/libcxx/include/__filesystem/filesystem_error.h
@@ -21,7 +21,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<filesystem>)
 #endif
 
 #ifndef _LIBCPP_CXX03_LANG

diff  --git a/libcxx/include/__filesystem/operations.h b/libcxx/include/__filesystem/operations.h
index 2f92922b36e6d..85c71f017f346 100644
--- a/libcxx/include/__filesystem/operations.h
+++ b/libcxx/include/__filesystem/operations.h
@@ -26,7 +26,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<filesystem>)
 #endif
 
 #ifndef _LIBCPP_CXX03_LANG

diff  --git a/libcxx/include/__filesystem/path.h b/libcxx/include/__filesystem/path.h
index c3537382f8db9..6b4b1ae9baa20 100644
--- a/libcxx/include/__filesystem/path.h
+++ b/libcxx/include/__filesystem/path.h
@@ -28,7 +28,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<filesystem>)
 #endif
 
 #ifndef _LIBCPP_CXX03_LANG

diff  --git a/libcxx/include/__filesystem/path_iterator.h b/libcxx/include/__filesystem/path_iterator.h
index 8be8101bb9dc7..6f2baf8f7a298 100644
--- a/libcxx/include/__filesystem/path_iterator.h
+++ b/libcxx/include/__filesystem/path_iterator.h
@@ -21,7 +21,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<filesystem>)
 #endif
 
 #ifndef _LIBCPP_CXX03_LANG

diff  --git a/libcxx/include/__filesystem/perm_options.h b/libcxx/include/__filesystem/perm_options.h
index 7484f75076db2..f7580a2473d06 100644
--- a/libcxx/include/__filesystem/perm_options.h
+++ b/libcxx/include/__filesystem/perm_options.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<filesystem>)
 #endif
 
 #ifndef _LIBCPP_CXX03_LANG

diff  --git a/libcxx/include/__filesystem/perms.h b/libcxx/include/__filesystem/perms.h
index 3d6d1b9c1af63..0e5c7ed8d2e9d 100644
--- a/libcxx/include/__filesystem/perms.h
+++ b/libcxx/include/__filesystem/perms.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<filesystem>)
 #endif
 
 #ifndef _LIBCPP_CXX03_LANG

diff  --git a/libcxx/include/__filesystem/recursive_directory_iterator.h b/libcxx/include/__filesystem/recursive_directory_iterator.h
index e17c6f81d099a..95360376fc289 100644
--- a/libcxx/include/__filesystem/recursive_directory_iterator.h
+++ b/libcxx/include/__filesystem/recursive_directory_iterator.h
@@ -24,7 +24,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<filesystem>)
 #endif
 
 #ifndef _LIBCPP_CXX03_LANG

diff  --git a/libcxx/include/__filesystem/space_info.h b/libcxx/include/__filesystem/space_info.h
index c220e506efdc6..d7dc03af75a7f 100644
--- a/libcxx/include/__filesystem/space_info.h
+++ b/libcxx/include/__filesystem/space_info.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<filesystem>)
 #endif
 
 #ifndef _LIBCPP_CXX03_LANG

diff  --git a/libcxx/include/__filesystem/u8path.h b/libcxx/include/__filesystem/u8path.h
index 82dcf8949ddde..ee25521f2898f 100644
--- a/libcxx/include/__filesystem/u8path.h
+++ b/libcxx/include/__filesystem/u8path.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<filesystem>)
 #endif
 
 #ifndef _LIBCPP_CXX03_LANG

diff  --git a/libcxx/include/__format/format_arg.h b/libcxx/include/__format/format_arg.h
index 79539034d651d..5e1565bf15956 100644
--- a/libcxx/include/__format/format_arg.h
+++ b/libcxx/include/__format/format_arg.h
@@ -24,7 +24,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<format>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__format/format_args.h b/libcxx/include/__format/format_args.h
index 84cb51bdabe1c..2739d1131bcbe 100644
--- a/libcxx/include/__format/format_args.h
+++ b/libcxx/include/__format/format_args.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<format>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__format/format_context.h b/libcxx/include/__format/format_context.h
index 71d6c1cfac4d4..d4bc35decda64 100644
--- a/libcxx/include/__format/format_context.h
+++ b/libcxx/include/__format/format_context.h
@@ -25,7 +25,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<format>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__format/format_error.h b/libcxx/include/__format/format_error.h
index ee0cd9c6ec636..67ff41cbc3d83 100644
--- a/libcxx/include/__format/format_error.h
+++ b/libcxx/include/__format/format_error.h
@@ -19,7 +19,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<format>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__format/format_fwd.h b/libcxx/include/__format/format_fwd.h
index e590f5fe1b86a..9421aa878850f 100644
--- a/libcxx/include/__format/format_fwd.h
+++ b/libcxx/include/__format/format_fwd.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<format>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__format/format_parse_context.h b/libcxx/include/__format/format_parse_context.h
index 1110f0e29672b..3147be8372a72 100644
--- a/libcxx/include/__format/format_parse_context.h
+++ b/libcxx/include/__format/format_parse_context.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<format>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__format/format_string.h b/libcxx/include/__format/format_string.h
index b26fc484533a3..32af6609e7b7d 100644
--- a/libcxx/include/__format/format_string.h
+++ b/libcxx/include/__format/format_string.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<format>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__format/format_to_n_result.h b/libcxx/include/__format/format_to_n_result.h
index 11edcecf5bf89..b973dc5c1dfe0 100644
--- a/libcxx/include/__format/format_to_n_result.h
+++ b/libcxx/include/__format/format_to_n_result.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<format>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__format/formatter.h b/libcxx/include/__format/formatter.h
index 1ca41606a6c6b..f9e0b6c84b7b7 100644
--- a/libcxx/include/__format/formatter.h
+++ b/libcxx/include/__format/formatter.h
@@ -25,7 +25,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<format>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__format/formatter_bool.h b/libcxx/include/__format/formatter_bool.h
index d4218eebd10a1..f42868365771a 100644
--- a/libcxx/include/__format/formatter_bool.h
+++ b/libcxx/include/__format/formatter_bool.h
@@ -25,7 +25,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<format>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__format/formatter_char.h b/libcxx/include/__format/formatter_char.h
index 07d408a509bd3..f565135821e8f 100644
--- a/libcxx/include/__format/formatter_char.h
+++ b/libcxx/include/__format/formatter_char.h
@@ -20,7 +20,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<format>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__format/formatter_floating_point.h b/libcxx/include/__format/formatter_floating_point.h
index 557aeb73e6beb..aa32815af2a48 100644
--- a/libcxx/include/__format/formatter_floating_point.h
+++ b/libcxx/include/__format/formatter_floating_point.h
@@ -37,7 +37,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<format>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__format/formatter_integer.h b/libcxx/include/__format/formatter_integer.h
index 256ff8ad0f7ab..e6143a47450ff 100644
--- a/libcxx/include/__format/formatter_integer.h
+++ b/libcxx/include/__format/formatter_integer.h
@@ -21,7 +21,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<format>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__format/formatter_integral.h b/libcxx/include/__format/formatter_integral.h
index 16577136410a5..836082671c5aa 100644
--- a/libcxx/include/__format/formatter_integral.h
+++ b/libcxx/include/__format/formatter_integral.h
@@ -33,7 +33,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<format>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__format/formatter_pointer.h b/libcxx/include/__format/formatter_pointer.h
index ce7af24b2db8f..83d21e1c50e6c 100644
--- a/libcxx/include/__format/formatter_pointer.h
+++ b/libcxx/include/__format/formatter_pointer.h
@@ -24,7 +24,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<format>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__format/formatter_string.h b/libcxx/include/__format/formatter_string.h
index 850cf2ecd82c4..54aa1215d99e5 100644
--- a/libcxx/include/__format/formatter_string.h
+++ b/libcxx/include/__format/formatter_string.h
@@ -21,7 +21,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<format>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__format/parser_std_format_spec.h b/libcxx/include/__format/parser_std_format_spec.h
index 1ec87ea811512..92c8986e760c2 100644
--- a/libcxx/include/__format/parser_std_format_spec.h
+++ b/libcxx/include/__format/parser_std_format_spec.h
@@ -25,7 +25,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<format>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__functional/binary_function.h b/libcxx/include/__functional/binary_function.h
index 74aa70ea6e7d7..51135ef51e12d 100644
--- a/libcxx/include/__functional/binary_function.h
+++ b/libcxx/include/__functional/binary_function.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/binary_negate.h b/libcxx/include/__functional/binary_negate.h
index c0858567f612b..17c5c20668f38 100644
--- a/libcxx/include/__functional/binary_negate.h
+++ b/libcxx/include/__functional/binary_negate.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/bind.h b/libcxx/include/__functional/bind.h
index 8a2d0b3003e09..c352406f85613 100644
--- a/libcxx/include/__functional/bind.h
+++ b/libcxx/include/__functional/bind.h
@@ -19,7 +19,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/bind_back.h b/libcxx/include/__functional/bind_back.h
index 93cdecbbb9b95..d64981aa9eb86 100644
--- a/libcxx/include/__functional/bind_back.h
+++ b/libcxx/include/__functional/bind_back.h
@@ -20,7 +20,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/bind_front.h b/libcxx/include/__functional/bind_front.h
index f3f96ff1cbd41..22fb3a69dc75e 100644
--- a/libcxx/include/__functional/bind_front.h
+++ b/libcxx/include/__functional/bind_front.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/binder1st.h b/libcxx/include/__functional/binder1st.h
index 83270100bc298..13b2459dff4d0 100644
--- a/libcxx/include/__functional/binder1st.h
+++ b/libcxx/include/__functional/binder1st.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/binder2nd.h b/libcxx/include/__functional/binder2nd.h
index 56a3b08ad1dc4..ff0f5f0816928 100644
--- a/libcxx/include/__functional/binder2nd.h
+++ b/libcxx/include/__functional/binder2nd.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/compose.h b/libcxx/include/__functional/compose.h
index 41a81f9c20838..25213f28b1f28 100644
--- a/libcxx/include/__functional/compose.h
+++ b/libcxx/include/__functional/compose.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/default_searcher.h b/libcxx/include/__functional/default_searcher.h
index 4ad333d52885e..05fb23d7c3c41 100644
--- a/libcxx/include/__functional/default_searcher.h
+++ b/libcxx/include/__functional/default_searcher.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/function.h b/libcxx/include/__functional/function.h
index ee51a07207d19..4698c8c2d42e0 100644
--- a/libcxx/include/__functional/function.h
+++ b/libcxx/include/__functional/function.h
@@ -28,7 +28,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/hash.h b/libcxx/include/__functional/hash.h
index 029ba048b1528..2b3b96e534216 100644
--- a/libcxx/include/__functional/hash.h
+++ b/libcxx/include/__functional/hash.h
@@ -24,7 +24,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/identity.h b/libcxx/include/__functional/identity.h
index 1a181a37af092..646325aca496f 100644
--- a/libcxx/include/__functional/identity.h
+++ b/libcxx/include/__functional/identity.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/invoke.h b/libcxx/include/__functional/invoke.h
index cb38c0fe27194..b4c3e76562a86 100644
--- a/libcxx/include/__functional/invoke.h
+++ b/libcxx/include/__functional/invoke.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/is_transparent.h b/libcxx/include/__functional/is_transparent.h
index f102bb5c6b9fc..74326c76c12f8 100644
--- a/libcxx/include/__functional/is_transparent.h
+++ b/libcxx/include/__functional/is_transparent.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/mem_fn.h b/libcxx/include/__functional/mem_fn.h
index 36fef444ce860..10967a8a14ec3 100644
--- a/libcxx/include/__functional/mem_fn.h
+++ b/libcxx/include/__functional/mem_fn.h
@@ -19,7 +19,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/mem_fun_ref.h b/libcxx/include/__functional/mem_fun_ref.h
index 9d61c4dd28ea6..81f48e66e7829 100644
--- a/libcxx/include/__functional/mem_fun_ref.h
+++ b/libcxx/include/__functional/mem_fun_ref.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/not_fn.h b/libcxx/include/__functional/not_fn.h
index 89f2d3752532e..b5c415c25c446 100644
--- a/libcxx/include/__functional/not_fn.h
+++ b/libcxx/include/__functional/not_fn.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/operations.h b/libcxx/include/__functional/operations.h
index 482458348cccd..9df6d773fea7c 100644
--- a/libcxx/include/__functional/operations.h
+++ b/libcxx/include/__functional/operations.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/perfect_forward.h b/libcxx/include/__functional/perfect_forward.h
index 92811e00cf9b3..9acaa7e98f005 100644
--- a/libcxx/include/__functional/perfect_forward.h
+++ b/libcxx/include/__functional/perfect_forward.h
@@ -19,7 +19,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/pointer_to_binary_function.h b/libcxx/include/__functional/pointer_to_binary_function.h
index 437b5186089ed..187e3098c4883 100644
--- a/libcxx/include/__functional/pointer_to_binary_function.h
+++ b/libcxx/include/__functional/pointer_to_binary_function.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/pointer_to_unary_function.h b/libcxx/include/__functional/pointer_to_unary_function.h
index 8984217afe7f1..a0f98c1a55225 100644
--- a/libcxx/include/__functional/pointer_to_unary_function.h
+++ b/libcxx/include/__functional/pointer_to_unary_function.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/ranges_operations.h b/libcxx/include/__functional/ranges_operations.h
index e7afe67ad0b63..b89d59593750f 100644
--- a/libcxx/include/__functional/ranges_operations.h
+++ b/libcxx/include/__functional/ranges_operations.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/reference_wrapper.h b/libcxx/include/__functional/reference_wrapper.h
index 6fc8182f97b60..b7d2f873022ed 100644
--- a/libcxx/include/__functional/reference_wrapper.h
+++ b/libcxx/include/__functional/reference_wrapper.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/unary_function.h b/libcxx/include/__functional/unary_function.h
index aa091d3fd964d..af2a0b967c5d4 100644
--- a/libcxx/include/__functional/unary_function.h
+++ b/libcxx/include/__functional/unary_function.h
@@ -13,7 +13,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/unary_negate.h b/libcxx/include/__functional/unary_negate.h
index c09ec84ab3ce9..7ff1f6e8791d8 100644
--- a/libcxx/include/__functional/unary_negate.h
+++ b/libcxx/include/__functional/unary_negate.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/unwrap_ref.h b/libcxx/include/__functional/unwrap_ref.h
index 8367b5fb09859..f7207934e1b48 100644
--- a/libcxx/include/__functional/unwrap_ref.h
+++ b/libcxx/include/__functional/unwrap_ref.h
@@ -13,7 +13,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__functional/weak_result_type.h b/libcxx/include/__functional/weak_result_type.h
index 2799f0b76c769..e1c553e6f0cdb 100644
--- a/libcxx/include/__functional/weak_result_type.h
+++ b/libcxx/include/__functional/weak_result_type.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<functional>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__hash_table b/libcxx/include/__hash_table
index 4ea55c7911d38..36f2ef7a2c7ac 100644
--- a/libcxx/include/__hash_table
+++ b/libcxx/include/__hash_table
@@ -26,8 +26,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<unordered_map>)
-#  pragma clang include_instead(<unordered_set>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__ios/fpos.h b/libcxx/include/__ios/fpos.h
index 870cc8a9128ea..87f0135fc3ea2 100644
--- a/libcxx/include/__ios/fpos.h
+++ b/libcxx/include/__ios/fpos.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ios>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/access.h b/libcxx/include/__iterator/access.h
index fb5e881691161..7abd4c5573d66 100644
--- a/libcxx/include/__iterator/access.h
+++ b/libcxx/include/__iterator/access.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/advance.h b/libcxx/include/__iterator/advance.h
index 766adcee76208..da6bf052525c7 100644
--- a/libcxx/include/__iterator/advance.h
+++ b/libcxx/include/__iterator/advance.h
@@ -24,7 +24,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/back_insert_iterator.h b/libcxx/include/__iterator/back_insert_iterator.h
index 27df535247998..9a4b05703b3c3 100644
--- a/libcxx/include/__iterator/back_insert_iterator.h
+++ b/libcxx/include/__iterator/back_insert_iterator.h
@@ -19,7 +19,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/common_iterator.h b/libcxx/include/__iterator/common_iterator.h
index a1f0fc6e1f69c..505e4f1f3f0db 100644
--- a/libcxx/include/__iterator/common_iterator.h
+++ b/libcxx/include/__iterator/common_iterator.h
@@ -23,7 +23,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/concepts.h b/libcxx/include/__iterator/concepts.h
index 8f4d201d4ae9f..92ef781457de2 100644
--- a/libcxx/include/__iterator/concepts.h
+++ b/libcxx/include/__iterator/concepts.h
@@ -22,7 +22,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/counted_iterator.h b/libcxx/include/__iterator/counted_iterator.h
index 76499ac7a32d8..826d5de51f972 100644
--- a/libcxx/include/__iterator/counted_iterator.h
+++ b/libcxx/include/__iterator/counted_iterator.h
@@ -26,7 +26,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/data.h b/libcxx/include/__iterator/data.h
index 6f7469ccfe395..88eb752b642e1 100644
--- a/libcxx/include/__iterator/data.h
+++ b/libcxx/include/__iterator/data.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/default_sentinel.h b/libcxx/include/__iterator/default_sentinel.h
index 7734027c3faec..669032aa97297 100644
--- a/libcxx/include/__iterator/default_sentinel.h
+++ b/libcxx/include/__iterator/default_sentinel.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/distance.h b/libcxx/include/__iterator/distance.h
index 61e4157ffa8da..78b8177fae64e 100644
--- a/libcxx/include/__iterator/distance.h
+++ b/libcxx/include/__iterator/distance.h
@@ -21,7 +21,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/empty.h b/libcxx/include/__iterator/empty.h
index 7b55ddd8c2429..748ca9ecbd599 100644
--- a/libcxx/include/__iterator/empty.h
+++ b/libcxx/include/__iterator/empty.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/erase_if_container.h b/libcxx/include/__iterator/erase_if_container.h
index d44d00656d0db..d7c71a947a2b1 100644
--- a/libcxx/include/__iterator/erase_if_container.h
+++ b/libcxx/include/__iterator/erase_if_container.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/front_insert_iterator.h b/libcxx/include/__iterator/front_insert_iterator.h
index b7b6bc318240d..69b2d32d077a1 100644
--- a/libcxx/include/__iterator/front_insert_iterator.h
+++ b/libcxx/include/__iterator/front_insert_iterator.h
@@ -19,7 +19,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/incrementable_traits.h b/libcxx/include/__iterator/incrementable_traits.h
index 2a668740875be..f36b417bf8a0e 100644
--- a/libcxx/include/__iterator/incrementable_traits.h
+++ b/libcxx/include/__iterator/incrementable_traits.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/indirectly_comparable.h b/libcxx/include/__iterator/indirectly_comparable.h
index b14ae7d50cac6..9002b21fd5268 100644
--- a/libcxx/include/__iterator/indirectly_comparable.h
+++ b/libcxx/include/__iterator/indirectly_comparable.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/insert_iterator.h b/libcxx/include/__iterator/insert_iterator.h
index dc260abf4a8e4..aba197ec2190b 100644
--- a/libcxx/include/__iterator/insert_iterator.h
+++ b/libcxx/include/__iterator/insert_iterator.h
@@ -20,7 +20,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/istream_iterator.h b/libcxx/include/__iterator/istream_iterator.h
index d5241a9aab6bc..9ee0a989b8f6b 100644
--- a/libcxx/include/__iterator/istream_iterator.h
+++ b/libcxx/include/__iterator/istream_iterator.h
@@ -19,7 +19,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/istreambuf_iterator.h b/libcxx/include/__iterator/istreambuf_iterator.h
index 3f2bb4f532c52..3b16f79476783 100644
--- a/libcxx/include/__iterator/istreambuf_iterator.h
+++ b/libcxx/include/__iterator/istreambuf_iterator.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/iter_move.h b/libcxx/include/__iterator/iter_move.h
index 351077380ea05..4a89662927860 100644
--- a/libcxx/include/__iterator/iter_move.h
+++ b/libcxx/include/__iterator/iter_move.h
@@ -19,7 +19,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/iter_swap.h b/libcxx/include/__iterator/iter_swap.h
index dec8ce79be292..291558fadc061 100644
--- a/libcxx/include/__iterator/iter_swap.h
+++ b/libcxx/include/__iterator/iter_swap.h
@@ -21,7 +21,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/iterator.h b/libcxx/include/__iterator/iterator.h
index e7f74368efe8b..b417eeab79bfe 100644
--- a/libcxx/include/__iterator/iterator.h
+++ b/libcxx/include/__iterator/iterator.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/iterator_traits.h b/libcxx/include/__iterator/iterator_traits.h
index 58aef847fc74c..6ffb2ab806ff3 100644
--- a/libcxx/include/__iterator/iterator_traits.h
+++ b/libcxx/include/__iterator/iterator_traits.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/mergeable.h b/libcxx/include/__iterator/mergeable.h
index f8d1cf6ebb7e0..13db6c7f0bb2a 100644
--- a/libcxx/include/__iterator/mergeable.h
+++ b/libcxx/include/__iterator/mergeable.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/move_iterator.h b/libcxx/include/__iterator/move_iterator.h
index e8ba0a7b0c760..e157b71a2f281 100644
--- a/libcxx/include/__iterator/move_iterator.h
+++ b/libcxx/include/__iterator/move_iterator.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/next.h b/libcxx/include/__iterator/next.h
index c3b75ef5df3ff..fae5989c2aaf4 100644
--- a/libcxx/include/__iterator/next.h
+++ b/libcxx/include/__iterator/next.h
@@ -20,7 +20,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/ostream_iterator.h b/libcxx/include/__iterator/ostream_iterator.h
index fde1a7ff2a739..f6601b23d6ef1 100644
--- a/libcxx/include/__iterator/ostream_iterator.h
+++ b/libcxx/include/__iterator/ostream_iterator.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/ostreambuf_iterator.h b/libcxx/include/__iterator/ostreambuf_iterator.h
index b21c78b04dc37..16ddb6525ae8e 100644
--- a/libcxx/include/__iterator/ostreambuf_iterator.h
+++ b/libcxx/include/__iterator/ostreambuf_iterator.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/permutable.h b/libcxx/include/__iterator/permutable.h
index d823df68cf169..85834a23c8fca 100644
--- a/libcxx/include/__iterator/permutable.h
+++ b/libcxx/include/__iterator/permutable.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/prev.h b/libcxx/include/__iterator/prev.h
index ebe0abc08f33f..5839621eefe1e 100644
--- a/libcxx/include/__iterator/prev.h
+++ b/libcxx/include/__iterator/prev.h
@@ -20,7 +20,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/projected.h b/libcxx/include/__iterator/projected.h
index 4d025d7948880..2edbe0da61fc4 100644
--- a/libcxx/include/__iterator/projected.h
+++ b/libcxx/include/__iterator/projected.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/readable_traits.h b/libcxx/include/__iterator/readable_traits.h
index 07cf17cfeaa19..5bc59a89f3459 100644
--- a/libcxx/include/__iterator/readable_traits.h
+++ b/libcxx/include/__iterator/readable_traits.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/reverse_access.h b/libcxx/include/__iterator/reverse_access.h
index 98a3f05b5f293..40c266378d365 100644
--- a/libcxx/include/__iterator/reverse_access.h
+++ b/libcxx/include/__iterator/reverse_access.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/reverse_iterator.h b/libcxx/include/__iterator/reverse_iterator.h
index 3af69393efacd..90bc2d752e0ef 100644
--- a/libcxx/include/__iterator/reverse_iterator.h
+++ b/libcxx/include/__iterator/reverse_iterator.h
@@ -20,7 +20,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/size.h b/libcxx/include/__iterator/size.h
index 90f57dc25fd40..bf40207a8628f 100644
--- a/libcxx/include/__iterator/size.h
+++ b/libcxx/include/__iterator/size.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/sortable.h b/libcxx/include/__iterator/sortable.h
index 3d108911f416c..057e1549dfa1a 100644
--- a/libcxx/include/__iterator/sortable.h
+++ b/libcxx/include/__iterator/sortable.h
@@ -19,7 +19,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/unreachable_sentinel.h b/libcxx/include/__iterator/unreachable_sentinel.h
index 5aa5b55a30d16..b94ca53f4000b 100644
--- a/libcxx/include/__iterator/unreachable_sentinel.h
+++ b/libcxx/include/__iterator/unreachable_sentinel.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__iterator/wrap_iter.h b/libcxx/include/__iterator/wrap_iter.h
index e964cc5b6f6da..d91a25ee6c8e7 100644
--- a/libcxx/include/__iterator/wrap_iter.h
+++ b/libcxx/include/__iterator/wrap_iter.h
@@ -19,7 +19,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<iterator>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__locale b/libcxx/include/__locale
index cabc578268de1..ad97be0f66c82 100644
--- a/libcxx/include/__locale
+++ b/libcxx/include/__locale
@@ -48,7 +48,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<locale>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__memory/addressof.h b/libcxx/include/__memory/addressof.h
index 8377a8fb65f38..75e3dd0647b2d 100644
--- a/libcxx/include/__memory/addressof.h
+++ b/libcxx/include/__memory/addressof.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<memory>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__memory/allocation_guard.h b/libcxx/include/__memory/allocation_guard.h
index 4e7846d49e6cb..424598cc81585 100644
--- a/libcxx/include/__memory/allocation_guard.h
+++ b/libcxx/include/__memory/allocation_guard.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<memory>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__memory/allocator.h b/libcxx/include/__memory/allocator.h
index 9dbf616f126d6..915ff7c3a516a 100644
--- a/libcxx/include/__memory/allocator.h
+++ b/libcxx/include/__memory/allocator.h
@@ -20,7 +20,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<memory>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__memory/allocator_arg_t.h b/libcxx/include/__memory/allocator_arg_t.h
index bacea754365d9..2d63b1f905e59 100644
--- a/libcxx/include/__memory/allocator_arg_t.h
+++ b/libcxx/include/__memory/allocator_arg_t.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<memory>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__memory/allocator_traits.h b/libcxx/include/__memory/allocator_traits.h
index bc5ce77509659..5215556cdf3cb 100644
--- a/libcxx/include/__memory/allocator_traits.h
+++ b/libcxx/include/__memory/allocator_traits.h
@@ -19,7 +19,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<memory>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__memory/auto_ptr.h b/libcxx/include/__memory/auto_ptr.h
index 1e97f67ad9e9c..163a46b631f0c 100644
--- a/libcxx/include/__memory/auto_ptr.h
+++ b/libcxx/include/__memory/auto_ptr.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<memory>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__memory/compressed_pair.h b/libcxx/include/__memory/compressed_pair.h
index a2349bf65a82b..852031f17d2f5 100644
--- a/libcxx/include/__memory/compressed_pair.h
+++ b/libcxx/include/__memory/compressed_pair.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<memory>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__memory/concepts.h b/libcxx/include/__memory/concepts.h
index fe9ca2e5f47f5..816c553e85548 100644
--- a/libcxx/include/__memory/concepts.h
+++ b/libcxx/include/__memory/concepts.h
@@ -21,7 +21,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<memory>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__memory/construct_at.h b/libcxx/include/__memory/construct_at.h
index 229cd50a7e40d..8a7bf40d7f716 100644
--- a/libcxx/include/__memory/construct_at.h
+++ b/libcxx/include/__memory/construct_at.h
@@ -21,7 +21,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<memory>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__memory/pointer_traits.h b/libcxx/include/__memory/pointer_traits.h
index 351f34d74e6c0..f1e8070684395 100644
--- a/libcxx/include/__memory/pointer_traits.h
+++ b/libcxx/include/__memory/pointer_traits.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<memory>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__memory/ranges_construct_at.h b/libcxx/include/__memory/ranges_construct_at.h
index 90d3cadab8a30..3064f811e94e4 100644
--- a/libcxx/include/__memory/ranges_construct_at.h
+++ b/libcxx/include/__memory/ranges_construct_at.h
@@ -25,7 +25,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<memory>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__memory/ranges_uninitialized_algorithms.h b/libcxx/include/__memory/ranges_uninitialized_algorithms.h
index c025e4fe5f026..e036c1858b522 100644
--- a/libcxx/include/__memory/ranges_uninitialized_algorithms.h
+++ b/libcxx/include/__memory/ranges_uninitialized_algorithms.h
@@ -28,7 +28,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<memory>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__memory/raw_storage_iterator.h b/libcxx/include/__memory/raw_storage_iterator.h
index fc155442ccaa1..f25f7b1a728ad 100644
--- a/libcxx/include/__memory/raw_storage_iterator.h
+++ b/libcxx/include/__memory/raw_storage_iterator.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<memory>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__memory/shared_ptr.h b/libcxx/include/__memory/shared_ptr.h
index 451d74e09ae6d..0f28bcdfac11b 100644
--- a/libcxx/include/__memory/shared_ptr.h
+++ b/libcxx/include/__memory/shared_ptr.h
@@ -40,7 +40,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<memory>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__memory/temporary_buffer.h b/libcxx/include/__memory/temporary_buffer.h
index 56ac3b27b21a4..2c6e333eba081 100644
--- a/libcxx/include/__memory/temporary_buffer.h
+++ b/libcxx/include/__memory/temporary_buffer.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<memory>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__memory/uninitialized_algorithms.h b/libcxx/include/__memory/uninitialized_algorithms.h
index 611590582d18e..fc55b49aef2eb 100644
--- a/libcxx/include/__memory/uninitialized_algorithms.h
+++ b/libcxx/include/__memory/uninitialized_algorithms.h
@@ -20,7 +20,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<memory>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__memory/unique_ptr.h b/libcxx/include/__memory/unique_ptr.h
index 37f969f9fd6e1..348c90325e6ff 100644
--- a/libcxx/include/__memory/unique_ptr.h
+++ b/libcxx/include/__memory/unique_ptr.h
@@ -26,7 +26,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<memory>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__memory/uses_allocator.h b/libcxx/include/__memory/uses_allocator.h
index 705dbf1a929d2..05c500cd97b13 100644
--- a/libcxx/include/__memory/uses_allocator.h
+++ b/libcxx/include/__memory/uses_allocator.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<memory>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__memory/voidify.h b/libcxx/include/__memory/voidify.h
index 20249ed7d091e..3a65c0e83fb7f 100644
--- a/libcxx/include/__memory/voidify.h
+++ b/libcxx/include/__memory/voidify.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<memory>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__mutex_base b/libcxx/include/__mutex_base
index ce1101c0ea73b..da056b6d14237 100644
--- a/libcxx/include/__mutex_base
+++ b/libcxx/include/__mutex_base
@@ -22,8 +22,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<mutex>)
-#  pragma clang include_instead(<shared_mutex>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__node_handle b/libcxx/include/__node_handle
index 84da7eb31184f..71309be62f3ca 100644
--- a/libcxx/include/__node_handle
+++ b/libcxx/include/__node_handle
@@ -65,10 +65,6 @@ public:
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<map>)
-#  pragma clang include_instead(<set>)
-#  pragma clang include_instead(<unordered_map>)
-#  pragma clang include_instead(<unordered_set>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__numeric/accumulate.h b/libcxx/include/__numeric/accumulate.h
index bcb95c74266a6..fa759872ce771 100644
--- a/libcxx/include/__numeric/accumulate.h
+++ b/libcxx/include/__numeric/accumulate.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<numeric>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__numeric/adjacent_
diff erence.h b/libcxx/include/__numeric/adjacent_
diff erence.h
index 0a47f3f34e3f7..5c712ecdf77df 100644
--- a/libcxx/include/__numeric/adjacent_
diff erence.h
+++ b/libcxx/include/__numeric/adjacent_
diff erence.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<numeric>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__numeric/exclusive_scan.h b/libcxx/include/__numeric/exclusive_scan.h
index 86d9c229cfc76..c0c89b38805d8 100644
--- a/libcxx/include/__numeric/exclusive_scan.h
+++ b/libcxx/include/__numeric/exclusive_scan.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<numeric>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__numeric/gcd_lcm.h b/libcxx/include/__numeric/gcd_lcm.h
index b5d5499c3c532..9a53a001f2114 100644
--- a/libcxx/include/__numeric/gcd_lcm.h
+++ b/libcxx/include/__numeric/gcd_lcm.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<numeric>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__numeric/inclusive_scan.h b/libcxx/include/__numeric/inclusive_scan.h
index bc523e51f3909..a6b005075835d 100644
--- a/libcxx/include/__numeric/inclusive_scan.h
+++ b/libcxx/include/__numeric/inclusive_scan.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<numeric>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__numeric/inner_product.h b/libcxx/include/__numeric/inner_product.h
index aace2e8f2cbb1..6fe18bb2b19e5 100644
--- a/libcxx/include/__numeric/inner_product.h
+++ b/libcxx/include/__numeric/inner_product.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<numeric>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__numeric/iota.h b/libcxx/include/__numeric/iota.h
index 91eb23e724756..b30e0e0a54844 100644
--- a/libcxx/include/__numeric/iota.h
+++ b/libcxx/include/__numeric/iota.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<numeric>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__numeric/midpoint.h b/libcxx/include/__numeric/midpoint.h
index d0db307817b9f..668030c46bcba 100644
--- a/libcxx/include/__numeric/midpoint.h
+++ b/libcxx/include/__numeric/midpoint.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<numeric>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__numeric/partial_sum.h b/libcxx/include/__numeric/partial_sum.h
index db882ea883c44..9acee3afc2b0d 100644
--- a/libcxx/include/__numeric/partial_sum.h
+++ b/libcxx/include/__numeric/partial_sum.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<numeric>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__numeric/reduce.h b/libcxx/include/__numeric/reduce.h
index 830cff07ceca9..90e4d238d868e 100644
--- a/libcxx/include/__numeric/reduce.h
+++ b/libcxx/include/__numeric/reduce.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<numeric>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__numeric/transform_exclusive_scan.h b/libcxx/include/__numeric/transform_exclusive_scan.h
index 3ccd8da7eb342..45b3077f6649d 100644
--- a/libcxx/include/__numeric/transform_exclusive_scan.h
+++ b/libcxx/include/__numeric/transform_exclusive_scan.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<numeric>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__numeric/transform_inclusive_scan.h b/libcxx/include/__numeric/transform_inclusive_scan.h
index ff8c92f3a36dd..b0d4ab5a88fdc 100644
--- a/libcxx/include/__numeric/transform_inclusive_scan.h
+++ b/libcxx/include/__numeric/transform_inclusive_scan.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<numeric>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__numeric/transform_reduce.h b/libcxx/include/__numeric/transform_reduce.h
index 6ec6149f62b1d..da5a77988c382 100644
--- a/libcxx/include/__numeric/transform_reduce.h
+++ b/libcxx/include/__numeric/transform_reduce.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<numeric>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__random/bernoulli_distribution.h b/libcxx/include/__random/bernoulli_distribution.h
index 6e7488700f3ae..cf019519ab7f4 100644
--- a/libcxx/include/__random/bernoulli_distribution.h
+++ b/libcxx/include/__random/bernoulli_distribution.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/binomial_distribution.h b/libcxx/include/__random/binomial_distribution.h
index 6447d3d22eb28..774f9d0bba305 100644
--- a/libcxx/include/__random/binomial_distribution.h
+++ b/libcxx/include/__random/binomial_distribution.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/cauchy_distribution.h b/libcxx/include/__random/cauchy_distribution.h
index dead3a25b6ed1..288118e1d22db 100644
--- a/libcxx/include/__random/cauchy_distribution.h
+++ b/libcxx/include/__random/cauchy_distribution.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/chi_squared_distribution.h b/libcxx/include/__random/chi_squared_distribution.h
index 2dce18be1987a..b98488c20d280 100644
--- a/libcxx/include/__random/chi_squared_distribution.h
+++ b/libcxx/include/__random/chi_squared_distribution.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/clamp_to_integral.h b/libcxx/include/__random/clamp_to_integral.h
index 2eef04f7b436d..7d44ff9cfcadc 100644
--- a/libcxx/include/__random/clamp_to_integral.h
+++ b/libcxx/include/__random/clamp_to_integral.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/default_random_engine.h b/libcxx/include/__random/default_random_engine.h
index 02d607948e153..89792f4f0d43e 100644
--- a/libcxx/include/__random/default_random_engine.h
+++ b/libcxx/include/__random/default_random_engine.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__random/discard_block_engine.h b/libcxx/include/__random/discard_block_engine.h
index 83ae20f7a3756..c58d66b588696 100644
--- a/libcxx/include/__random/discard_block_engine.h
+++ b/libcxx/include/__random/discard_block_engine.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/discrete_distribution.h b/libcxx/include/__random/discrete_distribution.h
index 7e5a6b77ae9b7..bd47b8b46539c 100644
--- a/libcxx/include/__random/discrete_distribution.h
+++ b/libcxx/include/__random/discrete_distribution.h
@@ -20,7 +20,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/exponential_distribution.h b/libcxx/include/__random/exponential_distribution.h
index f3ff78f54d372..e51871dd53bc3 100644
--- a/libcxx/include/__random/exponential_distribution.h
+++ b/libcxx/include/__random/exponential_distribution.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/extreme_value_distribution.h b/libcxx/include/__random/extreme_value_distribution.h
index c93f0cfd7a9ea..15cebd8e95649 100644
--- a/libcxx/include/__random/extreme_value_distribution.h
+++ b/libcxx/include/__random/extreme_value_distribution.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/fisher_f_distribution.h b/libcxx/include/__random/fisher_f_distribution.h
index cf8705809199b..72f1f40aaa493 100644
--- a/libcxx/include/__random/fisher_f_distribution.h
+++ b/libcxx/include/__random/fisher_f_distribution.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/gamma_distribution.h b/libcxx/include/__random/gamma_distribution.h
index 784fc2c5c94d6..a8504961b2881 100644
--- a/libcxx/include/__random/gamma_distribution.h
+++ b/libcxx/include/__random/gamma_distribution.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/generate_canonical.h b/libcxx/include/__random/generate_canonical.h
index 8b0e7a86972f9..84efa7803c945 100644
--- a/libcxx/include/__random/generate_canonical.h
+++ b/libcxx/include/__random/generate_canonical.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/geometric_distribution.h b/libcxx/include/__random/geometric_distribution.h
index e565eb783a7f0..8e1be522e0e32 100644
--- a/libcxx/include/__random/geometric_distribution.h
+++ b/libcxx/include/__random/geometric_distribution.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/independent_bits_engine.h b/libcxx/include/__random/independent_bits_engine.h
index 6e48d33f4c096..e80d6eec49cbc 100644
--- a/libcxx/include/__random/independent_bits_engine.h
+++ b/libcxx/include/__random/independent_bits_engine.h
@@ -19,7 +19,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/is_seed_sequence.h b/libcxx/include/__random/is_seed_sequence.h
index 244f564576dd7..a6832f51c1eea 100644
--- a/libcxx/include/__random/is_seed_sequence.h
+++ b/libcxx/include/__random/is_seed_sequence.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__random/knuth_b.h b/libcxx/include/__random/knuth_b.h
index 70330fc7d8439..f5b31cb64fa4a 100644
--- a/libcxx/include/__random/knuth_b.h
+++ b/libcxx/include/__random/knuth_b.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__random/linear_congruential_engine.h b/libcxx/include/__random/linear_congruential_engine.h
index 18ce4cb2bbf6a..f5aba75d572a2 100644
--- a/libcxx/include/__random/linear_congruential_engine.h
+++ b/libcxx/include/__random/linear_congruential_engine.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/log2.h b/libcxx/include/__random/log2.h
index 5fe4bbed34c85..b077d211cefae 100644
--- a/libcxx/include/__random/log2.h
+++ b/libcxx/include/__random/log2.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__random/lognormal_distribution.h b/libcxx/include/__random/lognormal_distribution.h
index bfecca0e323c3..048d7dade9eba 100644
--- a/libcxx/include/__random/lognormal_distribution.h
+++ b/libcxx/include/__random/lognormal_distribution.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/mersenne_twister_engine.h b/libcxx/include/__random/mersenne_twister_engine.h
index 250aa501633e0..8bceac05dce99 100644
--- a/libcxx/include/__random/mersenne_twister_engine.h
+++ b/libcxx/include/__random/mersenne_twister_engine.h
@@ -21,7 +21,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/negative_binomial_distribution.h b/libcxx/include/__random/negative_binomial_distribution.h
index 3aff91089666d..a4b96fb5f33f4 100644
--- a/libcxx/include/__random/negative_binomial_distribution.h
+++ b/libcxx/include/__random/negative_binomial_distribution.h
@@ -19,7 +19,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/normal_distribution.h b/libcxx/include/__random/normal_distribution.h
index 6458d048dd9d0..dc4de78e9273c 100644
--- a/libcxx/include/__random/normal_distribution.h
+++ b/libcxx/include/__random/normal_distribution.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/piecewise_constant_distribution.h b/libcxx/include/__random/piecewise_constant_distribution.h
index 90b30ef800cce..eec9b7540a968 100644
--- a/libcxx/include/__random/piecewise_constant_distribution.h
+++ b/libcxx/include/__random/piecewise_constant_distribution.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/piecewise_linear_distribution.h b/libcxx/include/__random/piecewise_linear_distribution.h
index 5841d4ea20f56..0d7591af10565 100644
--- a/libcxx/include/__random/piecewise_linear_distribution.h
+++ b/libcxx/include/__random/piecewise_linear_distribution.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/poisson_distribution.h b/libcxx/include/__random/poisson_distribution.h
index e2df27f4d70ca..32f5223d0650c 100644
--- a/libcxx/include/__random/poisson_distribution.h
+++ b/libcxx/include/__random/poisson_distribution.h
@@ -21,7 +21,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/random_device.h b/libcxx/include/__random/random_device.h
index 811a5ba177b40..e82b437a3b540 100644
--- a/libcxx/include/__random/random_device.h
+++ b/libcxx/include/__random/random_device.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/ranlux.h b/libcxx/include/__random/ranlux.h
index ba06750d9f795..e44cece39dfc0 100644
--- a/libcxx/include/__random/ranlux.h
+++ b/libcxx/include/__random/ranlux.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__random/seed_seq.h b/libcxx/include/__random/seed_seq.h
index 5746a8c8ced68..8640cd1b4e43a 100644
--- a/libcxx/include/__random/seed_seq.h
+++ b/libcxx/include/__random/seed_seq.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/shuffle_order_engine.h b/libcxx/include/__random/shuffle_order_engine.h
index 4a4715ca769bf..c2f76f609ae57 100644
--- a/libcxx/include/__random/shuffle_order_engine.h
+++ b/libcxx/include/__random/shuffle_order_engine.h
@@ -19,7 +19,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/student_t_distribution.h b/libcxx/include/__random/student_t_distribution.h
index 5a9caea83849d..dc38a8b3d2f8e 100644
--- a/libcxx/include/__random/student_t_distribution.h
+++ b/libcxx/include/__random/student_t_distribution.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/subtract_with_carry_engine.h b/libcxx/include/__random/subtract_with_carry_engine.h
index 0d21470fed0d7..fdbe2d2e9be34 100644
--- a/libcxx/include/__random/subtract_with_carry_engine.h
+++ b/libcxx/include/__random/subtract_with_carry_engine.h
@@ -22,7 +22,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/uniform_int_distribution.h b/libcxx/include/__random/uniform_int_distribution.h
index 844ad5f70cb28..70cf698b187a7 100644
--- a/libcxx/include/__random/uniform_int_distribution.h
+++ b/libcxx/include/__random/uniform_int_distribution.h
@@ -22,7 +22,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/uniform_random_bit_generator.h b/libcxx/include/__random/uniform_random_bit_generator.h
index 97a75c88f872d..99f2e6bc30dbd 100644
--- a/libcxx/include/__random/uniform_random_bit_generator.h
+++ b/libcxx/include/__random/uniform_random_bit_generator.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/uniform_real_distribution.h b/libcxx/include/__random/uniform_real_distribution.h
index 2ee579012488b..e11222540b47e 100644
--- a/libcxx/include/__random/uniform_real_distribution.h
+++ b/libcxx/include/__random/uniform_real_distribution.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__random/weibull_distribution.h b/libcxx/include/__random/weibull_distribution.h
index fe8ea37f1e1e0..85bae65096cba 100644
--- a/libcxx/include/__random/weibull_distribution.h
+++ b/libcxx/include/__random/weibull_distribution.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<random>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__ranges/access.h b/libcxx/include/__ranges/access.h
index 9a35d4e769348..2ebdab4eb8cd9 100644
--- a/libcxx/include/__ranges/access.h
+++ b/libcxx/include/__ranges/access.h
@@ -19,7 +19,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/all.h b/libcxx/include/__ranges/all.h
index b606bd14c3480..77396222d63ac 100644
--- a/libcxx/include/__ranges/all.h
+++ b/libcxx/include/__ranges/all.h
@@ -24,7 +24,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/common_view.h b/libcxx/include/__ranges/common_view.h
index a63062a0f80f6..78911284bbc44 100644
--- a/libcxx/include/__ranges/common_view.h
+++ b/libcxx/include/__ranges/common_view.h
@@ -26,7 +26,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/concepts.h b/libcxx/include/__ranges/concepts.h
index 4425273a5c867..709f3d80f7eae 100644
--- a/libcxx/include/__ranges/concepts.h
+++ b/libcxx/include/__ranges/concepts.h
@@ -28,7 +28,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/copyable_box.h b/libcxx/include/__ranges/copyable_box.h
index 615bd49b85bd7..e1c08a7ea1c3e 100644
--- a/libcxx/include/__ranges/copyable_box.h
+++ b/libcxx/include/__ranges/copyable_box.h
@@ -20,7 +20,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/counted.h b/libcxx/include/__ranges/counted.h
index 0a985107fea5c..0a2d8285788a3 100644
--- a/libcxx/include/__ranges/counted.h
+++ b/libcxx/include/__ranges/counted.h
@@ -25,7 +25,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/dangling.h b/libcxx/include/__ranges/dangling.h
index 2b736e21e4d9d..3a200ed96543e 100644
--- a/libcxx/include/__ranges/dangling.h
+++ b/libcxx/include/__ranges/dangling.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/data.h b/libcxx/include/__ranges/data.h
index c297af25a1879..dbb4767e53b51 100644
--- a/libcxx/include/__ranges/data.h
+++ b/libcxx/include/__ranges/data.h
@@ -20,7 +20,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/drop_view.h b/libcxx/include/__ranges/drop_view.h
index c3f79535e32a3..079a74d4b84c2 100644
--- a/libcxx/include/__ranges/drop_view.h
+++ b/libcxx/include/__ranges/drop_view.h
@@ -27,7 +27,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/empty.h b/libcxx/include/__ranges/empty.h
index 75c2241cb2257..c0b55b221a049 100644
--- a/libcxx/include/__ranges/empty.h
+++ b/libcxx/include/__ranges/empty.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/empty_view.h b/libcxx/include/__ranges/empty_view.h
index 9675cba186fcb..6a087276783cb 100644
--- a/libcxx/include/__ranges/empty_view.h
+++ b/libcxx/include/__ranges/empty_view.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/enable_borrowed_range.h b/libcxx/include/__ranges/enable_borrowed_range.h
index bca488ef1a4a3..b8f809b6ceb12 100644
--- a/libcxx/include/__ranges/enable_borrowed_range.h
+++ b/libcxx/include/__ranges/enable_borrowed_range.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/enable_view.h b/libcxx/include/__ranges/enable_view.h
index 8f6d94419cb12..4b4b63a42c036 100644
--- a/libcxx/include/__ranges/enable_view.h
+++ b/libcxx/include/__ranges/enable_view.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/iota_view.h b/libcxx/include/__ranges/iota_view.h
index 119edd623d5f4..b7c099e049007 100644
--- a/libcxx/include/__ranges/iota_view.h
+++ b/libcxx/include/__ranges/iota_view.h
@@ -35,7 +35,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/join_view.h b/libcxx/include/__ranges/join_view.h
index 57162540054bd..395e5c7ece5a6 100644
--- a/libcxx/include/__ranges/join_view.h
+++ b/libcxx/include/__ranges/join_view.h
@@ -26,7 +26,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/non_propagating_cache.h b/libcxx/include/__ranges/non_propagating_cache.h
index 41bc714e28c62..d9589ae46c33e 100644
--- a/libcxx/include/__ranges/non_propagating_cache.h
+++ b/libcxx/include/__ranges/non_propagating_cache.h
@@ -20,7 +20,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/owning_view.h b/libcxx/include/__ranges/owning_view.h
index 6fddd3c6e6b2b..7987c607510b6 100644
--- a/libcxx/include/__ranges/owning_view.h
+++ b/libcxx/include/__ranges/owning_view.h
@@ -24,7 +24,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/range_adaptor.h b/libcxx/include/__ranges/range_adaptor.h
index cf7ec837d6325..9c53488ba6ce3 100644
--- a/libcxx/include/__ranges/range_adaptor.h
+++ b/libcxx/include/__ranges/range_adaptor.h
@@ -21,7 +21,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/rbegin.h b/libcxx/include/__ranges/rbegin.h
index 3d4e4228030e9..20f5489c50bb6 100644
--- a/libcxx/include/__ranges/rbegin.h
+++ b/libcxx/include/__ranges/rbegin.h
@@ -21,7 +21,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/ref_view.h b/libcxx/include/__ranges/ref_view.h
index be46ed81e2499..255a468606f2b 100644
--- a/libcxx/include/__ranges/ref_view.h
+++ b/libcxx/include/__ranges/ref_view.h
@@ -27,7 +27,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/rend.h b/libcxx/include/__ranges/rend.h
index 9795f6600007f..4f1597e0738cf 100644
--- a/libcxx/include/__ranges/rend.h
+++ b/libcxx/include/__ranges/rend.h
@@ -22,7 +22,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/reverse_view.h b/libcxx/include/__ranges/reverse_view.h
index 9c736ea9bc7dc..b5de7e9e32209 100644
--- a/libcxx/include/__ranges/reverse_view.h
+++ b/libcxx/include/__ranges/reverse_view.h
@@ -29,7 +29,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/single_view.h b/libcxx/include/__ranges/single_view.h
index 42e6fbe946f42..e0fd4849f44bc 100644
--- a/libcxx/include/__ranges/single_view.h
+++ b/libcxx/include/__ranges/single_view.h
@@ -20,7 +20,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/size.h b/libcxx/include/__ranges/size.h
index 7f832b6ecb0bb..2c5a96e63b7c0 100644
--- a/libcxx/include/__ranges/size.h
+++ b/libcxx/include/__ranges/size.h
@@ -20,7 +20,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/subrange.h b/libcxx/include/__ranges/subrange.h
index 42e0697d31ccd..c54f7710fce64 100644
--- a/libcxx/include/__ranges/subrange.h
+++ b/libcxx/include/__ranges/subrange.h
@@ -32,7 +32,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/take_view.h b/libcxx/include/__ranges/take_view.h
index 59eded0b7d729..b5f194f9a0e61 100644
--- a/libcxx/include/__ranges/take_view.h
+++ b/libcxx/include/__ranges/take_view.h
@@ -27,7 +27,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__ranges/transform_view.h b/libcxx/include/__ranges/transform_view.h
index a1dd1bdc10246..4cc582faebfa8 100644
--- a/libcxx/include/__ranges/transform_view.h
+++ b/libcxx/include/__ranges/transform_view.h
@@ -37,7 +37,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/view_interface.h b/libcxx/include/__ranges/view_interface.h
index 6bc615a1fe85d..eecc47511139e 100644
--- a/libcxx/include/__ranges/view_interface.h
+++ b/libcxx/include/__ranges/view_interface.h
@@ -24,7 +24,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__ranges/views.h b/libcxx/include/__ranges/views.h
index e89cd13a09dcb..8cc5ba3d2aca5 100644
--- a/libcxx/include/__ranges/views.h
+++ b/libcxx/include/__ranges/views.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<ranges>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__split_buffer b/libcxx/include/__split_buffer
index 3b9c674fe7f9b..9565e16960f3d 100644
--- a/libcxx/include/__split_buffer
+++ b/libcxx/include/__split_buffer
@@ -17,8 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<vector>)
-#  pragma clang include_instead(<deque>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__std_stream b/libcxx/include/__std_stream
index 07dd7e7643e29..e419e8c03af07 100644
--- a/libcxx/include/__std_stream
+++ b/libcxx/include/__std_stream
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<streambuf>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__string b/libcxx/include/__string
index ca068f357cd14..479893bbde907 100644
--- a/libcxx/include/__string
+++ b/libcxx/include/__string
@@ -34,7 +34,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<string>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__thread/poll_with_backoff.h b/libcxx/include/__thread/poll_with_backoff.h
index 8532607719c15..0bbafd186657c 100644
--- a/libcxx/include/__thread/poll_with_backoff.h
+++ b/libcxx/include/__thread/poll_with_backoff.h
@@ -19,7 +19,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<thread>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__thread/timed_backoff_policy.h b/libcxx/include/__thread/timed_backoff_policy.h
index fd0effb8632d3..28fe75d6fd805 100644
--- a/libcxx/include/__thread/timed_backoff_policy.h
+++ b/libcxx/include/__thread/timed_backoff_policy.h
@@ -18,7 +18,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<thread>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__threading_support b/libcxx/include/__threading_support
index b8482824796f3..4f1640ab36d0c 100644
--- a/libcxx/include/__threading_support
+++ b/libcxx/include/__threading_support
@@ -25,10 +25,6 @@
 
 #ifndef _LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
 #  pragma GCC system_header
-#  pragma clang include_instead(<atomic>)
-#  pragma clang include_instead(<mutex>)
-#  pragma clang include_instead(<semaphore>)
-#  pragma clang include_instead(<thread>)
 #endif
 
 #if defined(_LIBCPP_HAS_THREAD_API_EXTERNAL)

diff  --git a/libcxx/include/__tree b/libcxx/include/__tree
index d22d26c0b1930..384d3835049bb 100644
--- a/libcxx/include/__tree
+++ b/libcxx/include/__tree
@@ -20,8 +20,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<map>)
-#  pragma clang include_instead(<set>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__tuple b/libcxx/include/__tuple
index 361ded184792b..6d13bb24c5795 100644
--- a/libcxx/include/__tuple
+++ b/libcxx/include/__tuple
@@ -16,8 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<tuple>)
-#  pragma clang include_instead(<utility>)
 #endif
 
 

diff  --git a/libcxx/include/__utility/as_const.h b/libcxx/include/__utility/as_const.h
index 47b7f8d3d169b..be7dd8c7cf23a 100644
--- a/libcxx/include/__utility/as_const.h
+++ b/libcxx/include/__utility/as_const.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<utility>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__utility/auto_cast.h b/libcxx/include/__utility/auto_cast.h
index 65fa8cf479027..e9079443959f1 100644
--- a/libcxx/include/__utility/auto_cast.h
+++ b/libcxx/include/__utility/auto_cast.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<utility>)
 #endif
 
 #define _LIBCPP_AUTO_CAST(expr) static_cast<typename decay<decltype((expr))>::type>(expr)

diff  --git a/libcxx/include/__utility/cmp.h b/libcxx/include/__utility/cmp.h
index 3d3a240d640d1..f36d53ad4654d 100644
--- a/libcxx/include/__utility/cmp.h
+++ b/libcxx/include/__utility/cmp.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<utility>)
 #endif
 
 _LIBCPP_PUSH_MACROS

diff  --git a/libcxx/include/__utility/declval.h b/libcxx/include/__utility/declval.h
index f8717dac9ec90..97fd1eba91c68 100644
--- a/libcxx/include/__utility/declval.h
+++ b/libcxx/include/__utility/declval.h
@@ -13,7 +13,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<utility>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__utility/exchange.h b/libcxx/include/__utility/exchange.h
index 603b3069d9b5a..d9b3c151755fa 100644
--- a/libcxx/include/__utility/exchange.h
+++ b/libcxx/include/__utility/exchange.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<utility>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__utility/forward.h b/libcxx/include/__utility/forward.h
index 467bfd6e39795..6ee1f818baca3 100644
--- a/libcxx/include/__utility/forward.h
+++ b/libcxx/include/__utility/forward.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<utility>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__utility/in_place.h b/libcxx/include/__utility/in_place.h
index bc3d68f21f06e..7a4973fa04076 100644
--- a/libcxx/include/__utility/in_place.h
+++ b/libcxx/include/__utility/in_place.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<utility>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__utility/integer_sequence.h b/libcxx/include/__utility/integer_sequence.h
index a4046e5634b9e..633f1333e2479 100644
--- a/libcxx/include/__utility/integer_sequence.h
+++ b/libcxx/include/__utility/integer_sequence.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<utility>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__utility/move.h b/libcxx/include/__utility/move.h
index a6f36269f641d..7d1c8c2522ad9 100644
--- a/libcxx/include/__utility/move.h
+++ b/libcxx/include/__utility/move.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<utility>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__utility/pair.h b/libcxx/include/__utility/pair.h
index 9564ede086d5a..15532f6132646 100644
--- a/libcxx/include/__utility/pair.h
+++ b/libcxx/include/__utility/pair.h
@@ -22,7 +22,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<utility>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__utility/piecewise_construct.h b/libcxx/include/__utility/piecewise_construct.h
index e1d157693953f..3cc86fef2a0fb 100644
--- a/libcxx/include/__utility/piecewise_construct.h
+++ b/libcxx/include/__utility/piecewise_construct.h
@@ -13,7 +13,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<utility>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__utility/priority_tag.h b/libcxx/include/__utility/priority_tag.h
index 339e29bc7e9a3..e51ba6bfcc050 100644
--- a/libcxx/include/__utility/priority_tag.h
+++ b/libcxx/include/__utility/priority_tag.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<utility>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__utility/rel_ops.h b/libcxx/include/__utility/rel_ops.h
index 208419017b66c..2577e94e91f60 100644
--- a/libcxx/include/__utility/rel_ops.h
+++ b/libcxx/include/__utility/rel_ops.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<utility>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__utility/swap.h b/libcxx/include/__utility/swap.h
index f16d6cd1a78e8..f9e7f36678ba4 100644
--- a/libcxx/include/__utility/swap.h
+++ b/libcxx/include/__utility/swap.h
@@ -17,7 +17,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<utility>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__utility/to_underlying.h b/libcxx/include/__utility/to_underlying.h
index 24edd966d8ac7..3428406e8d3a2 100644
--- a/libcxx/include/__utility/to_underlying.h
+++ b/libcxx/include/__utility/to_underlying.h
@@ -15,7 +15,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<utility>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__utility/transaction.h b/libcxx/include/__utility/transaction.h
index 0d3e93b093ca3..87e51c0b198e0 100644
--- a/libcxx/include/__utility/transaction.h
+++ b/libcxx/include/__utility/transaction.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<utility>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__utility/unreachable.h b/libcxx/include/__utility/unreachable.h
index 071aef98ddf38..485edb227c92c 100644
--- a/libcxx/include/__utility/unreachable.h
+++ b/libcxx/include/__utility/unreachable.h
@@ -14,7 +14,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<utility>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/include/__variant/monostate.h b/libcxx/include/__variant/monostate.h
index f4e19d2929ac3..b389c3b56b36e 100644
--- a/libcxx/include/__variant/monostate.h
+++ b/libcxx/include/__variant/monostate.h
@@ -16,7 +16,6 @@
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
-#  pragma clang include_instead(<variant>)
 #endif
 
 _LIBCPP_BEGIN_NAMESPACE_STD

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/adjacent_find.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/adjacent_find.header.verify.cpp
deleted file mode 100644
index 53bcc2cc6a620..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/adjacent_find.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/adjacent_find.h>
-// expected-error at -1 {{header '<__algorithm/adjacent_find.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/all_of.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/all_of.header.verify.cpp
deleted file mode 100644
index 6ecaa5f1cea8a..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/all_of.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/all_of.h>
-// expected-error at -1 {{header '<__algorithm/all_of.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/any_of.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/any_of.header.verify.cpp
deleted file mode 100644
index 9bf78ce8e80b7..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/any_of.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/any_of.h>
-// expected-error at -1 {{header '<__algorithm/any_of.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/binary_search.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/binary_search.header.verify.cpp
deleted file mode 100644
index c939e633993f2..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/binary_search.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/binary_search.h>
-// expected-error at -1 {{header '<__algorithm/binary_search.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/clamp.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/clamp.header.verify.cpp
deleted file mode 100644
index d8df75776ea1d..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/clamp.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/clamp.h>
-// expected-error at -1 {{header '<__algorithm/clamp.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/comp.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/comp.header.verify.cpp
deleted file mode 100644
index 19d6468632951..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/comp.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/comp.h>
-// expected-error at -1 {{header '<__algorithm/comp.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/comp_ref_type.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/comp_ref_type.header.verify.cpp
deleted file mode 100644
index 95608faaf8054..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/comp_ref_type.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/comp_ref_type.h>
-// expected-error at -1 {{header '<__algorithm/comp_ref_type.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy.header.verify.cpp
deleted file mode 100644
index dfad0486e01b5..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/copy.h>
-// expected-error at -1 {{header '<__algorithm/copy.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_backward.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_backward.header.verify.cpp
deleted file mode 100644
index 7d173e207bff7..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_backward.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/copy_backward.h>
-// expected-error at -1 {{header '<__algorithm/copy_backward.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_if.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_if.header.verify.cpp
deleted file mode 100644
index 350601658f8f1..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_if.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/copy_if.h>
-// expected-error at -1 {{header '<__algorithm/copy_if.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_n.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_n.header.verify.cpp
deleted file mode 100644
index 70896d01117c4..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_n.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/copy_n.h>
-// expected-error at -1 {{header '<__algorithm/copy_n.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/count.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/count.header.verify.cpp
deleted file mode 100644
index c6dd298941b0e..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/count.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/count.h>
-// expected-error at -1 {{header '<__algorithm/count.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/count_if.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/count_if.header.verify.cpp
deleted file mode 100644
index 0bb35906ed9aa..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/count_if.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/count_if.h>
-// expected-error at -1 {{header '<__algorithm/count_if.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/equal.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/equal.header.verify.cpp
deleted file mode 100644
index e1b5fc35852e3..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/equal.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/equal.h>
-// expected-error at -1 {{header '<__algorithm/equal.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/equal_range.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/equal_range.header.verify.cpp
deleted file mode 100644
index 665efcb307366..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/equal_range.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/equal_range.h>
-// expected-error at -1 {{header '<__algorithm/equal_range.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/fill.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/fill.header.verify.cpp
deleted file mode 100644
index 78a139e6bda2e..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/fill.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/fill.h>
-// expected-error at -1 {{header '<__algorithm/fill.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/fill_n.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/fill_n.header.verify.cpp
deleted file mode 100644
index c838b08daa9d3..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/fill_n.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/fill_n.h>
-// expected-error at -1 {{header '<__algorithm/fill_n.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find.header.verify.cpp
deleted file mode 100644
index a057231420256..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/find.h>
-// expected-error at -1 {{header '<__algorithm/find.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_end.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_end.header.verify.cpp
deleted file mode 100644
index a638236a58809..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_end.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/find_end.h>
-// expected-error at -1 {{header '<__algorithm/find_end.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_first_of.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_first_of.header.verify.cpp
deleted file mode 100644
index 9c7b3284d7791..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_first_of.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/find_first_of.h>
-// expected-error at -1 {{header '<__algorithm/find_first_of.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_if.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_if.header.verify.cpp
deleted file mode 100644
index c3bc689b00e3f..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_if.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/find_if.h>
-// expected-error at -1 {{header '<__algorithm/find_if.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_if_not.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_if_not.header.verify.cpp
deleted file mode 100644
index 0713709cdf379..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_if_not.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/find_if_not.h>
-// expected-error at -1 {{header '<__algorithm/find_if_not.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/for_each.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/for_each.header.verify.cpp
deleted file mode 100644
index 7419537861b36..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/for_each.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/for_each.h>
-// expected-error at -1 {{header '<__algorithm/for_each.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/for_each_n.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/for_each_n.header.verify.cpp
deleted file mode 100644
index e34d4114c9978..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/for_each_n.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/for_each_n.h>
-// expected-error at -1 {{header '<__algorithm/for_each_n.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/generate.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/generate.header.verify.cpp
deleted file mode 100644
index 3d5d08367aa5d..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/generate.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/generate.h>
-// expected-error at -1 {{header '<__algorithm/generate.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/generate_n.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/generate_n.header.verify.cpp
deleted file mode 100644
index b0ece731a5319..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/generate_n.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/generate_n.h>
-// expected-error at -1 {{header '<__algorithm/generate_n.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/half_positive.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/half_positive.header.verify.cpp
deleted file mode 100644
index d074323afed74..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/half_positive.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/half_positive.h>
-// expected-error at -1 {{header '<__algorithm/half_positive.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_found_result.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_found_result.header.verify.cpp
deleted file mode 100644
index 1c6a1923eca07..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_found_result.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/in_found_result.h>
-// expected-error at -1 {{header '<__algorithm/in_found_result.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_fun_result.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_fun_result.header.verify.cpp
deleted file mode 100644
index 36fd0b00fdc12..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_fun_result.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/in_fun_result.h>
-// expected-error at -1 {{header '<__algorithm/in_fun_result.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_in_out_result.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_in_out_result.header.verify.cpp
deleted file mode 100644
index 288363e4848c4..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_in_out_result.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/in_in_out_result.h>
-// expected-error at -1 {{header '<__algorithm/in_in_out_result.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_in_result.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_in_result.header.verify.cpp
deleted file mode 100644
index 251e0dab5a997..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_in_result.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/in_in_result.h>
-// expected-error at -1 {{header '<__algorithm/in_in_result.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_out_out_result.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_out_out_result.header.verify.cpp
deleted file mode 100644
index 8ffe63e0f8925..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_out_out_result.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/in_out_out_result.h>
-// expected-error at -1 {{header '<__algorithm/in_out_out_result.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_out_result.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_out_result.header.verify.cpp
deleted file mode 100644
index b3dbe26ae3ef2..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_out_result.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/in_out_result.h>
-// expected-error at -1 {{header '<__algorithm/in_out_result.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/includes.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/includes.header.verify.cpp
deleted file mode 100644
index 8bbb82126482f..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/includes.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/includes.h>
-// expected-error at -1 {{header '<__algorithm/includes.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/inplace_merge.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/inplace_merge.header.verify.cpp
deleted file mode 100644
index 9f1c2dae79c15..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/inplace_merge.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/inplace_merge.h>
-// expected-error at -1 {{header '<__algorithm/inplace_merge.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_heap.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_heap.header.verify.cpp
deleted file mode 100644
index 9b4613a322444..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_heap.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/is_heap.h>
-// expected-error at -1 {{header '<__algorithm/is_heap.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_heap_until.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_heap_until.header.verify.cpp
deleted file mode 100644
index 7aeb1f4b791fa..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_heap_until.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/is_heap_until.h>
-// expected-error at -1 {{header '<__algorithm/is_heap_until.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_partitioned.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_partitioned.header.verify.cpp
deleted file mode 100644
index 5885b33f94485..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_partitioned.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/is_partitioned.h>
-// expected-error at -1 {{header '<__algorithm/is_partitioned.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_permutation.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_permutation.header.verify.cpp
deleted file mode 100644
index e88477f95b921..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_permutation.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/is_permutation.h>
-// expected-error at -1 {{header '<__algorithm/is_permutation.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_sorted.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_sorted.header.verify.cpp
deleted file mode 100644
index 8b993debca8cd..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_sorted.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/is_sorted.h>
-// expected-error at -1 {{header '<__algorithm/is_sorted.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_sorted_until.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_sorted_until.header.verify.cpp
deleted file mode 100644
index d7bddcbe4ad8c..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_sorted_until.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/is_sorted_until.h>
-// expected-error at -1 {{header '<__algorithm/is_sorted_until.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/iter_swap.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/iter_swap.header.verify.cpp
deleted file mode 100644
index 977c27eddcbcd..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/iter_swap.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/iter_swap.h>
-// expected-error at -1 {{header '<__algorithm/iter_swap.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/lexicographical_compare.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/lexicographical_compare.header.verify.cpp
deleted file mode 100644
index f3dfa04d172d6..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/lexicographical_compare.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/lexicographical_compare.h>
-// expected-error at -1 {{header '<__algorithm/lexicographical_compare.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/lower_bound.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/lower_bound.header.verify.cpp
deleted file mode 100644
index afe3608773d7c..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/lower_bound.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/lower_bound.h>
-// expected-error at -1 {{header '<__algorithm/lower_bound.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/make_heap.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/make_heap.header.verify.cpp
deleted file mode 100644
index 38e79a6483ada..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/make_heap.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/make_heap.h>
-// expected-error at -1 {{header '<__algorithm/make_heap.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/max.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/max.header.verify.cpp
deleted file mode 100644
index c95593a2a911f..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/max.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/max.h>
-// expected-error at -1 {{header '<__algorithm/max.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/max_element.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/max_element.header.verify.cpp
deleted file mode 100644
index 532cbedc600db..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/max_element.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/max_element.h>
-// expected-error at -1 {{header '<__algorithm/max_element.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/merge.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/merge.header.verify.cpp
deleted file mode 100644
index b709587ac7567..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/merge.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/merge.h>
-// expected-error at -1 {{header '<__algorithm/merge.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min.header.verify.cpp
deleted file mode 100644
index 86a44165b83bb..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/min.h>
-// expected-error at -1 {{header '<__algorithm/min.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min_element.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min_element.header.verify.cpp
deleted file mode 100644
index ab7ac5f9c1b1e..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min_element.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/min_element.h>
-// expected-error at -1 {{header '<__algorithm/min_element.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min_max_result.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min_max_result.header.verify.cpp
deleted file mode 100644
index d435b1e2399fd..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min_max_result.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/min_max_result.h>
-// expected-error at -1 {{header '<__algorithm/min_max_result.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/minmax.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/minmax.header.verify.cpp
deleted file mode 100644
index 69ee501f5087c..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/minmax.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/minmax.h>
-// expected-error at -1 {{header '<__algorithm/minmax.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/minmax_element.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/minmax_element.header.verify.cpp
deleted file mode 100644
index 6669f8f491c15..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/minmax_element.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/minmax_element.h>
-// expected-error at -1 {{header '<__algorithm/minmax_element.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/mismatch.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/mismatch.header.verify.cpp
deleted file mode 100644
index b4482518b71d4..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/mismatch.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/mismatch.h>
-// expected-error at -1 {{header '<__algorithm/mismatch.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/move.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/move.header.verify.cpp
deleted file mode 100644
index d44aa58af892d..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/move.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/move.h>
-// expected-error at -1 {{header '<__algorithm/move.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/move_backward.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/move_backward.header.verify.cpp
deleted file mode 100644
index 8bba26749d1de..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/move_backward.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/move_backward.h>
-// expected-error at -1 {{header '<__algorithm/move_backward.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/next_permutation.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/next_permutation.header.verify.cpp
deleted file mode 100644
index 7d17804bbe740..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/next_permutation.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/next_permutation.h>
-// expected-error at -1 {{header '<__algorithm/next_permutation.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/none_of.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/none_of.header.verify.cpp
deleted file mode 100644
index 864fcd990dc03..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/none_of.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/none_of.h>
-// expected-error at -1 {{header '<__algorithm/none_of.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/nth_element.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/nth_element.header.verify.cpp
deleted file mode 100644
index 7da4a3945e549..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/nth_element.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/nth_element.h>
-// expected-error at -1 {{header '<__algorithm/nth_element.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partial_sort.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partial_sort.header.verify.cpp
deleted file mode 100644
index 5ea114c6b000d..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partial_sort.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/partial_sort.h>
-// expected-error at -1 {{header '<__algorithm/partial_sort.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partial_sort_copy.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partial_sort_copy.header.verify.cpp
deleted file mode 100644
index 86cccf8d5af10..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partial_sort_copy.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/partial_sort_copy.h>
-// expected-error at -1 {{header '<__algorithm/partial_sort_copy.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition.header.verify.cpp
deleted file mode 100644
index 059af31e47f49..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/partition.h>
-// expected-error at -1 {{header '<__algorithm/partition.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition_copy.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition_copy.header.verify.cpp
deleted file mode 100644
index cf1b8defa1e89..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition_copy.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/partition_copy.h>
-// expected-error at -1 {{header '<__algorithm/partition_copy.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition_point.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition_point.header.verify.cpp
deleted file mode 100644
index 89d8366557fd2..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition_point.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/partition_point.h>
-// expected-error at -1 {{header '<__algorithm/partition_point.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/pop_heap.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/pop_heap.header.verify.cpp
deleted file mode 100644
index dd1136ce8b248..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/pop_heap.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/pop_heap.h>
-// expected-error at -1 {{header '<__algorithm/pop_heap.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/prev_permutation.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/prev_permutation.header.verify.cpp
deleted file mode 100644
index 30ad6c4b37289..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/prev_permutation.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/prev_permutation.h>
-// expected-error at -1 {{header '<__algorithm/prev_permutation.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/push_heap.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/push_heap.header.verify.cpp
deleted file mode 100644
index 6c3dbca15703e..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/push_heap.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/push_heap.h>
-// expected-error at -1 {{header '<__algorithm/push_heap.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/ranges_min_element.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/ranges_min_element.header.verify.cpp
deleted file mode 100644
index bd001e34fd908..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/ranges_min_element.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/ranges_min_element.h>
-// expected-error at -1 {{header '<__algorithm/ranges_min_element.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/ranges_swap_ranges.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/ranges_swap_ranges.header.verify.cpp
deleted file mode 100644
index 75effec55717f..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/ranges_swap_ranges.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/ranges_swap_ranges.h>
-// expected-error at -1 {{header '<__algorithm/ranges_swap_ranges.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove.header.verify.cpp
deleted file mode 100644
index 28bd2ae4ec574..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/remove.h>
-// expected-error at -1 {{header '<__algorithm/remove.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_copy.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_copy.header.verify.cpp
deleted file mode 100644
index 9295ee87c3172..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_copy.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/remove_copy.h>
-// expected-error at -1 {{header '<__algorithm/remove_copy.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_copy_if.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_copy_if.header.verify.cpp
deleted file mode 100644
index c459322be2180..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_copy_if.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/remove_copy_if.h>
-// expected-error at -1 {{header '<__algorithm/remove_copy_if.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_if.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_if.header.verify.cpp
deleted file mode 100644
index 2686f21e637bf..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_if.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/remove_if.h>
-// expected-error at -1 {{header '<__algorithm/remove_if.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace.header.verify.cpp
deleted file mode 100644
index 1699ab23bda94..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/replace.h>
-// expected-error at -1 {{header '<__algorithm/replace.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_copy.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_copy.header.verify.cpp
deleted file mode 100644
index 71ec2246a4b78..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_copy.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/replace_copy.h>
-// expected-error at -1 {{header '<__algorithm/replace_copy.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_copy_if.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_copy_if.header.verify.cpp
deleted file mode 100644
index e1b0e315042b6..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_copy_if.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/replace_copy_if.h>
-// expected-error at -1 {{header '<__algorithm/replace_copy_if.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_if.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_if.header.verify.cpp
deleted file mode 100644
index 6de27219ee5f1..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_if.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/replace_if.h>
-// expected-error at -1 {{header '<__algorithm/replace_if.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/reverse.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/reverse.header.verify.cpp
deleted file mode 100644
index e3582c339af11..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/reverse.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/reverse.h>
-// expected-error at -1 {{header '<__algorithm/reverse.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/reverse_copy.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/reverse_copy.header.verify.cpp
deleted file mode 100644
index e5a8b1b1cdfae..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/reverse_copy.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/reverse_copy.h>
-// expected-error at -1 {{header '<__algorithm/reverse_copy.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/rotate.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/rotate.header.verify.cpp
deleted file mode 100644
index 184cdfbf91cb3..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/rotate.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/rotate.h>
-// expected-error at -1 {{header '<__algorithm/rotate.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/rotate_copy.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/rotate_copy.header.verify.cpp
deleted file mode 100644
index dfde90437dab4..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/rotate_copy.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/rotate_copy.h>
-// expected-error at -1 {{header '<__algorithm/rotate_copy.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sample.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sample.header.verify.cpp
deleted file mode 100644
index 05b151fb96a6b..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sample.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/sample.h>
-// expected-error at -1 {{header '<__algorithm/sample.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/search.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/search.header.verify.cpp
deleted file mode 100644
index d3406b6a17f29..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/search.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/search.h>
-// expected-error at -1 {{header '<__algorithm/search.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/search_n.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/search_n.header.verify.cpp
deleted file mode 100644
index 5f0f4d261e844..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/search_n.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/search_n.h>
-// expected-error at -1 {{header '<__algorithm/search_n.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_
diff erence.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_
diff erence.header.verify.cpp
deleted file mode 100644
index f431fbee96569..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_
diff erence.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/set_
diff erence.h>
-// expected-error at -1 {{header '<__algorithm/set_
diff erence.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_intersection.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_intersection.header.verify.cpp
deleted file mode 100644
index f6a26a5482e7f..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_intersection.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/set_intersection.h>
-// expected-error at -1 {{header '<__algorithm/set_intersection.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_symmetric_
diff erence.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_symmetric_
diff erence.header.verify.cpp
deleted file mode 100644
index 229c510907ecb..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_symmetric_
diff erence.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/set_symmetric_
diff erence.h>
-// expected-error at -1 {{header '<__algorithm/set_symmetric_
diff erence.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_union.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_union.header.verify.cpp
deleted file mode 100644
index b35ab32b18e28..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_union.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/set_union.h>
-// expected-error at -1 {{header '<__algorithm/set_union.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shift_left.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shift_left.header.verify.cpp
deleted file mode 100644
index f2fecec92cf65..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shift_left.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/shift_left.h>
-// expected-error at -1 {{header '<__algorithm/shift_left.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shift_right.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shift_right.header.verify.cpp
deleted file mode 100644
index 6bd216ef1e4d3..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shift_right.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/shift_right.h>
-// expected-error at -1 {{header '<__algorithm/shift_right.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shuffle.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shuffle.header.verify.cpp
deleted file mode 100644
index 4c44073842fd3..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shuffle.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/shuffle.h>
-// expected-error at -1 {{header '<__algorithm/shuffle.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sift_down.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sift_down.header.verify.cpp
deleted file mode 100644
index 18b904e80d8f6..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sift_down.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/sift_down.h>
-// expected-error at -1 {{header '<__algorithm/sift_down.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sort.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sort.header.verify.cpp
deleted file mode 100644
index 75349208f59e4..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sort.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/sort.h>
-// expected-error at -1 {{header '<__algorithm/sort.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sort_heap.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sort_heap.header.verify.cpp
deleted file mode 100644
index cfae00bc156db..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sort_heap.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/sort_heap.h>
-// expected-error at -1 {{header '<__algorithm/sort_heap.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/stable_partition.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/stable_partition.header.verify.cpp
deleted file mode 100644
index 2f6e1dad16108..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/stable_partition.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/stable_partition.h>
-// expected-error at -1 {{header '<__algorithm/stable_partition.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/stable_sort.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/stable_sort.header.verify.cpp
deleted file mode 100644
index b4ffe259a2978..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/stable_sort.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/stable_sort.h>
-// expected-error at -1 {{header '<__algorithm/stable_sort.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/swap_ranges.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/swap_ranges.header.verify.cpp
deleted file mode 100644
index 21e329bc699cf..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/swap_ranges.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/swap_ranges.h>
-// expected-error at -1 {{header '<__algorithm/swap_ranges.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/transform.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/transform.header.verify.cpp
deleted file mode 100644
index 70c9ba0ed1527..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/transform.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/transform.h>
-// expected-error at -1 {{header '<__algorithm/transform.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unique.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unique.header.verify.cpp
deleted file mode 100644
index 6515e2b525221..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unique.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/unique.h>
-// expected-error at -1 {{header '<__algorithm/unique.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unique_copy.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unique_copy.header.verify.cpp
deleted file mode 100644
index 3a69cae6fe943..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unique_copy.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/unique_copy.h>
-// expected-error at -1 {{header '<__algorithm/unique_copy.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unwrap_iter.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unwrap_iter.header.verify.cpp
deleted file mode 100644
index 1ca3e447d338d..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unwrap_iter.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/unwrap_iter.h>
-// expected-error at -1 {{header '<__algorithm/unwrap_iter.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/upper_bound.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/upper_bound.header.verify.cpp
deleted file mode 100644
index 0bb7cb152b239..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/upper_bound.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__algorithm/upper_bound.h>
-// expected-error at -1 {{header '<__algorithm/upper_bound.h>' is an implementation detail; #include '<algorithm>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/bit/bit_cast.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/bit/bit_cast.header.verify.cpp
deleted file mode 100644
index eddf2385c3616..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/bit/bit_cast.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__bit/bit_cast.h>
-// expected-error at -1 {{header '<__bit/bit_cast.h>' is an implementation detail; #include '<bit>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/bit/byteswap.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/bit/byteswap.header.verify.cpp
deleted file mode 100644
index 7b3e5d21ec150..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/bit/byteswap.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__bit/byteswap.h>
-// expected-error at -1 {{header '<__bit/byteswap.h>' is an implementation detail; #include '<bit>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/bit_reference.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/bit_reference.header.verify.cpp
deleted file mode 100644
index 0c933bf447037..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/bit_reference.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__bit_reference>
-// expected-error at -1 {{header '<__bit_reference>' is an implementation detail; #include either '<bitset>' or '<vector>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/bits.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/bits.header.verify.cpp
deleted file mode 100644
index 84da00edd49e3..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/bits.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__bits>
-// expected-error at -1 {{header '<__bits>' is an implementation detail; #include one of {'<algorithm>', '<bit>', '<bitset>', '<numeric>', '<random>', '<unordered_map>', '<unordered_set>', '<vector>'} instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/charconv/chars_format.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/charconv/chars_format.header.verify.cpp
deleted file mode 100644
index 2012abe405865..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/charconv/chars_format.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__charconv/chars_format.h>
-// expected-error at -1 {{header '<__charconv/chars_format.h>' is an implementation detail; #include '<charconv>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/charconv/from_chars_result.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/charconv/from_chars_result.header.verify.cpp
deleted file mode 100644
index 709bccd110a11..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/charconv/from_chars_result.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__charconv/from_chars_result.h>
-// expected-error at -1 {{header '<__charconv/from_chars_result.h>' is an implementation detail; #include '<charconv>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/charconv/to_chars_result.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/charconv/to_chars_result.header.verify.cpp
deleted file mode 100644
index 0f33f6b5a60cf..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/charconv/to_chars_result.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__charconv/to_chars_result.h>
-// expected-error at -1 {{header '<__charconv/to_chars_result.h>' is an implementation detail; #include '<charconv>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/chrono/calendar.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/chrono/calendar.header.verify.cpp
deleted file mode 100644
index 6dd355dde00c1..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/chrono/calendar.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__chrono/calendar.h>
-// expected-error at -1 {{header '<__chrono/calendar.h>' is an implementation detail; #include '<chrono>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/chrono/convert_to_timespec.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/chrono/convert_to_timespec.header.verify.cpp
deleted file mode 100644
index 3ef663800ba61..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/chrono/convert_to_timespec.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__chrono/convert_to_timespec.h>
-// expected-error at -1 {{header '<__chrono/convert_to_timespec.h>' is an implementation detail; #include '<chrono>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/chrono/duration.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/chrono/duration.header.verify.cpp
deleted file mode 100644
index 86c9557411a3b..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/chrono/duration.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__chrono/duration.h>
-// expected-error at -1 {{header '<__chrono/duration.h>' is an implementation detail; #include '<chrono>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/chrono/file_clock.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/chrono/file_clock.header.verify.cpp
deleted file mode 100644
index 659e5be23b663..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/chrono/file_clock.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__chrono/file_clock.h>
-// expected-error at -1 {{header '<__chrono/file_clock.h>' is an implementation detail; #include '<chrono>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/chrono/high_resolution_clock.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/chrono/high_resolution_clock.header.verify.cpp
deleted file mode 100644
index c83012ccd63cd..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/chrono/high_resolution_clock.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__chrono/high_resolution_clock.h>
-// expected-error at -1 {{header '<__chrono/high_resolution_clock.h>' is an implementation detail; #include '<chrono>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/chrono/steady_clock.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/chrono/steady_clock.header.verify.cpp
deleted file mode 100644
index 2410ab2782f4e..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/chrono/steady_clock.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__chrono/steady_clock.h>
-// expected-error at -1 {{header '<__chrono/steady_clock.h>' is an implementation detail; #include '<chrono>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/chrono/system_clock.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/chrono/system_clock.header.verify.cpp
deleted file mode 100644
index fb6a22cbdca5c..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/chrono/system_clock.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__chrono/system_clock.h>
-// expected-error at -1 {{header '<__chrono/system_clock.h>' is an implementation detail; #include '<chrono>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/chrono/time_point.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/chrono/time_point.header.verify.cpp
deleted file mode 100644
index 8767066514647..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/chrono/time_point.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__chrono/time_point.h>
-// expected-error at -1 {{header '<__chrono/time_point.h>' is an implementation detail; #include '<chrono>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/compare/common_comparison_category.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/compare/common_comparison_category.header.verify.cpp
deleted file mode 100644
index 95ee7008565fc..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/compare/common_comparison_category.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__compare/common_comparison_category.h>
-// expected-error at -1 {{header '<__compare/common_comparison_category.h>' is an implementation detail; #include '<compare>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_partial_order_fallback.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_partial_order_fallback.header.verify.cpp
deleted file mode 100644
index cf3722e72647a..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_partial_order_fallback.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__compare/compare_partial_order_fallback.h>
-// expected-error at -1 {{header '<__compare/compare_partial_order_fallback.h>' is an implementation detail; #include '<compare>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_strong_order_fallback.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_strong_order_fallback.header.verify.cpp
deleted file mode 100644
index 83454ddec36a2..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_strong_order_fallback.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__compare/compare_strong_order_fallback.h>
-// expected-error at -1 {{header '<__compare/compare_strong_order_fallback.h>' is an implementation detail; #include '<compare>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_three_way.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_three_way.header.verify.cpp
deleted file mode 100644
index 9ae046d7b85d5..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_three_way.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__compare/compare_three_way.h>
-// expected-error at -1 {{header '<__compare/compare_three_way.h>' is an implementation detail; #include '<compare>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_three_way_result.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_three_way_result.header.verify.cpp
deleted file mode 100644
index 0433bf1835b87..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_three_way_result.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__compare/compare_three_way_result.h>
-// expected-error at -1 {{header '<__compare/compare_three_way_result.h>' is an implementation detail; #include '<compare>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_weak_order_fallback.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_weak_order_fallback.header.verify.cpp
deleted file mode 100644
index b0905d33c24cc..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_weak_order_fallback.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__compare/compare_weak_order_fallback.h>
-// expected-error at -1 {{header '<__compare/compare_weak_order_fallback.h>' is an implementation detail; #include '<compare>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/compare/is_eq.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/compare/is_eq.header.verify.cpp
deleted file mode 100644
index 498f90836c3b9..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/compare/is_eq.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__compare/is_eq.h>
-// expected-error at -1 {{header '<__compare/is_eq.h>' is an implementation detail; #include '<compare>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/compare/ordering.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/compare/ordering.header.verify.cpp
deleted file mode 100644
index 630176a03b2de..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/compare/ordering.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__compare/ordering.h>
-// expected-error at -1 {{header '<__compare/ordering.h>' is an implementation detail; #include '<compare>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/compare/partial_order.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/compare/partial_order.header.verify.cpp
deleted file mode 100644
index d3e2ea3df5cce..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/compare/partial_order.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__compare/partial_order.h>
-// expected-error at -1 {{header '<__compare/partial_order.h>' is an implementation detail; #include '<compare>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/compare/strong_order.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/compare/strong_order.header.verify.cpp
deleted file mode 100644
index 191489cefd591..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/compare/strong_order.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__compare/strong_order.h>
-// expected-error at -1 {{header '<__compare/strong_order.h>' is an implementation detail; #include '<compare>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/compare/synth_three_way.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/compare/synth_three_way.header.verify.cpp
deleted file mode 100644
index 39f5577c74635..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/compare/synth_three_way.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__compare/synth_three_way.h>
-// expected-error at -1 {{header '<__compare/synth_three_way.h>' is an implementation detail; #include '<compare>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/compare/three_way_comparable.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/compare/three_way_comparable.header.verify.cpp
deleted file mode 100644
index c8cd9acafd54c..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/compare/three_way_comparable.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__compare/three_way_comparable.h>
-// expected-error at -1 {{header '<__compare/three_way_comparable.h>' is an implementation detail; #include '<compare>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/compare/weak_order.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/compare/weak_order.header.verify.cpp
deleted file mode 100644
index e62639b4a5dbb..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/compare/weak_order.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__compare/weak_order.h>
-// expected-error at -1 {{header '<__compare/weak_order.h>' is an implementation detail; #include '<compare>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/arithmetic.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/arithmetic.header.verify.cpp
deleted file mode 100644
index b9eafc39e187b..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/arithmetic.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__concepts/arithmetic.h>
-// expected-error at -1 {{header '<__concepts/arithmetic.h>' is an implementation detail; #include '<concepts>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/assignable.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/assignable.header.verify.cpp
deleted file mode 100644
index e211df44a8a66..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/assignable.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__concepts/assignable.h>
-// expected-error at -1 {{header '<__concepts/assignable.h>' is an implementation detail; #include '<concepts>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/boolean_testable.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/boolean_testable.header.verify.cpp
deleted file mode 100644
index 65855566d1755..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/boolean_testable.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__concepts/boolean_testable.h>
-// expected-error at -1 {{header '<__concepts/boolean_testable.h>' is an implementation detail; #include '<concepts>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/class_or_enum.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/class_or_enum.header.verify.cpp
deleted file mode 100644
index 04955ccd889b9..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/class_or_enum.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__concepts/class_or_enum.h>
-// expected-error at -1 {{header '<__concepts/class_or_enum.h>' is an implementation detail; #include '<concepts>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/common_reference_with.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/common_reference_with.header.verify.cpp
deleted file mode 100644
index 9cf4ace1f6aec..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/common_reference_with.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__concepts/common_reference_with.h>
-// expected-error at -1 {{header '<__concepts/common_reference_with.h>' is an implementation detail; #include '<concepts>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/common_with.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/common_with.header.verify.cpp
deleted file mode 100644
index 22b100964f2a9..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/common_with.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__concepts/common_with.h>
-// expected-error at -1 {{header '<__concepts/common_with.h>' is an implementation detail; #include '<concepts>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/constructible.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/constructible.header.verify.cpp
deleted file mode 100644
index 2798aaafdb0c6..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/constructible.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__concepts/constructible.h>
-// expected-error at -1 {{header '<__concepts/constructible.h>' is an implementation detail; #include '<concepts>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/convertible_to.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/convertible_to.header.verify.cpp
deleted file mode 100644
index a1f4cf581c9e4..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/convertible_to.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__concepts/convertible_to.h>
-// expected-error at -1 {{header '<__concepts/convertible_to.h>' is an implementation detail; #include '<concepts>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/copyable.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/copyable.header.verify.cpp
deleted file mode 100644
index ec58700180506..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/copyable.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__concepts/copyable.h>
-// expected-error at -1 {{header '<__concepts/copyable.h>' is an implementation detail; #include '<concepts>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/derived_from.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/derived_from.header.verify.cpp
deleted file mode 100644
index cb0398c81ca19..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/derived_from.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__concepts/derived_from.h>
-// expected-error at -1 {{header '<__concepts/derived_from.h>' is an implementation detail; #include '<concepts>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/destructible.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/destructible.header.verify.cpp
deleted file mode 100644
index 976081755e457..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/destructible.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__concepts/destructible.h>
-// expected-error at -1 {{header '<__concepts/destructible.h>' is an implementation detail; #include '<concepts>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/
diff erent_from.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/
diff erent_from.header.verify.cpp
deleted file mode 100644
index 03879286350c6..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/
diff erent_from.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__concepts/
diff erent_from.h>
-// expected-error at -1 {{header '<__concepts/
diff erent_from.h>' is an implementation detail; #include '<concepts>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/equality_comparable.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/equality_comparable.header.verify.cpp
deleted file mode 100644
index 7223d23068c3e..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/equality_comparable.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__concepts/equality_comparable.h>
-// expected-error at -1 {{header '<__concepts/equality_comparable.h>' is an implementation detail; #include '<concepts>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/invocable.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/invocable.header.verify.cpp
deleted file mode 100644
index 9014f50907a39..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/invocable.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__concepts/invocable.h>
-// expected-error at -1 {{header '<__concepts/invocable.h>' is an implementation detail; #include '<concepts>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/movable.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/movable.header.verify.cpp
deleted file mode 100644
index bfb3ccfa05175..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/movable.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__concepts/movable.h>
-// expected-error at -1 {{header '<__concepts/movable.h>' is an implementation detail; #include '<concepts>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/predicate.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/predicate.header.verify.cpp
deleted file mode 100644
index fbf2c8854fbec..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/predicate.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__concepts/predicate.h>
-// expected-error at -1 {{header '<__concepts/predicate.h>' is an implementation detail; #include '<concepts>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/regular.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/regular.header.verify.cpp
deleted file mode 100644
index 5a8e6302a0194..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/regular.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__concepts/regular.h>
-// expected-error at -1 {{header '<__concepts/regular.h>' is an implementation detail; #include '<concepts>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/relation.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/relation.header.verify.cpp
deleted file mode 100644
index 7e42452313dda..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/relation.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__concepts/relation.h>
-// expected-error at -1 {{header '<__concepts/relation.h>' is an implementation detail; #include '<concepts>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/same_as.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/same_as.header.verify.cpp
deleted file mode 100644
index da65a3aeef219..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/same_as.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__concepts/same_as.h>
-// expected-error at -1 {{header '<__concepts/same_as.h>' is an implementation detail; #include '<concepts>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/semiregular.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/semiregular.header.verify.cpp
deleted file mode 100644
index a64adbe87355f..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/semiregular.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__concepts/semiregular.h>
-// expected-error at -1 {{header '<__concepts/semiregular.h>' is an implementation detail; #include '<concepts>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/swappable.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/swappable.header.verify.cpp
deleted file mode 100644
index 9e8f242f060f9..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/swappable.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__concepts/swappable.h>
-// expected-error at -1 {{header '<__concepts/swappable.h>' is an implementation detail; #include '<concepts>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/totally_ordered.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/totally_ordered.header.verify.cpp
deleted file mode 100644
index 10ac945917dc2..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/totally_ordered.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__concepts/totally_ordered.h>
-// expected-error at -1 {{header '<__concepts/totally_ordered.h>' is an implementation detail; #include '<concepts>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/coroutine/coroutine_handle.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/coroutine/coroutine_handle.header.verify.cpp
deleted file mode 100644
index 79bb431606e5d..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/coroutine/coroutine_handle.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__coroutine/coroutine_handle.h>
-// expected-error at -1 {{header '<__coroutine/coroutine_handle.h>' is an implementation detail; #include '<coroutine>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/coroutine/coroutine_traits.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/coroutine/coroutine_traits.header.verify.cpp
deleted file mode 100644
index 7457a8daed9f8..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/coroutine/coroutine_traits.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__coroutine/coroutine_traits.h>
-// expected-error at -1 {{header '<__coroutine/coroutine_traits.h>' is an implementation detail; #include '<coroutine>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/coroutine/noop_coroutine_handle.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/coroutine/noop_coroutine_handle.header.verify.cpp
deleted file mode 100644
index 618da50394825..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/coroutine/noop_coroutine_handle.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__coroutine/noop_coroutine_handle.h>
-// expected-error at -1 {{header '<__coroutine/noop_coroutine_handle.h>' is an implementation detail; #include '<coroutine>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/coroutine/trivial_awaitables.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/coroutine/trivial_awaitables.header.verify.cpp
deleted file mode 100644
index 9cbf71ec02cf3..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/coroutine/trivial_awaitables.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__coroutine/trivial_awaitables.h>
-// expected-error at -1 {{header '<__coroutine/trivial_awaitables.h>' is an implementation detail; #include '<coroutine>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/copy_options.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/copy_options.header.verify.cpp
deleted file mode 100644
index 9c237decf24e3..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/copy_options.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__filesystem/copy_options.h>
-// expected-error at -1 {{header '<__filesystem/copy_options.h>' is an implementation detail; #include '<filesystem>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/directory_entry.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/directory_entry.header.verify.cpp
deleted file mode 100644
index dfff24ac9fa1a..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/directory_entry.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__filesystem/directory_entry.h>
-// expected-error at -1 {{header '<__filesystem/directory_entry.h>' is an implementation detail; #include '<filesystem>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/directory_iterator.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/directory_iterator.header.verify.cpp
deleted file mode 100644
index 5f0eef2129ce3..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/directory_iterator.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__filesystem/directory_iterator.h>
-// expected-error at -1 {{header '<__filesystem/directory_iterator.h>' is an implementation detail; #include '<filesystem>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/directory_options.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/directory_options.header.verify.cpp
deleted file mode 100644
index a4ff03e95a1f0..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/directory_options.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__filesystem/directory_options.h>
-// expected-error at -1 {{header '<__filesystem/directory_options.h>' is an implementation detail; #include '<filesystem>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/file_status.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/file_status.header.verify.cpp
deleted file mode 100644
index ca4571d85721a..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/file_status.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__filesystem/file_status.h>
-// expected-error at -1 {{header '<__filesystem/file_status.h>' is an implementation detail; #include '<filesystem>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/file_time_type.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/file_time_type.header.verify.cpp
deleted file mode 100644
index 6d5d939df4617..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/file_time_type.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__filesystem/file_time_type.h>
-// expected-error at -1 {{header '<__filesystem/file_time_type.h>' is an implementation detail; #include '<filesystem>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/file_type.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/file_type.header.verify.cpp
deleted file mode 100644
index f05dccdb340cc..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/file_type.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__filesystem/file_type.h>
-// expected-error at -1 {{header '<__filesystem/file_type.h>' is an implementation detail; #include '<filesystem>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/filesystem_error.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/filesystem_error.header.verify.cpp
deleted file mode 100644
index b109cc0900cae..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/filesystem_error.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__filesystem/filesystem_error.h>
-// expected-error at -1 {{header '<__filesystem/filesystem_error.h>' is an implementation detail; #include '<filesystem>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/operations.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/operations.header.verify.cpp
deleted file mode 100644
index f87159ff40ba9..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/operations.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__filesystem/operations.h>
-// expected-error at -1 {{header '<__filesystem/operations.h>' is an implementation detail; #include '<filesystem>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/path.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/path.header.verify.cpp
deleted file mode 100644
index fb549c5418548..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/path.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__filesystem/path.h>
-// expected-error at -1 {{header '<__filesystem/path.h>' is an implementation detail; #include '<filesystem>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/path_iterator.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/path_iterator.header.verify.cpp
deleted file mode 100644
index 274cf3a932d83..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/path_iterator.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__filesystem/path_iterator.h>
-// expected-error at -1 {{header '<__filesystem/path_iterator.h>' is an implementation detail; #include '<filesystem>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/perm_options.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/perm_options.header.verify.cpp
deleted file mode 100644
index cf657cddc5dad..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/perm_options.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__filesystem/perm_options.h>
-// expected-error at -1 {{header '<__filesystem/perm_options.h>' is an implementation detail; #include '<filesystem>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/perms.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/perms.header.verify.cpp
deleted file mode 100644
index 5fc3b72fd686d..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/perms.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__filesystem/perms.h>
-// expected-error at -1 {{header '<__filesystem/perms.h>' is an implementation detail; #include '<filesystem>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/recursive_directory_iterator.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/recursive_directory_iterator.header.verify.cpp
deleted file mode 100644
index d280380df5956..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/recursive_directory_iterator.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__filesystem/recursive_directory_iterator.h>
-// expected-error at -1 {{header '<__filesystem/recursive_directory_iterator.h>' is an implementation detail; #include '<filesystem>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/space_info.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/space_info.header.verify.cpp
deleted file mode 100644
index a2b4b7dc49b57..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/space_info.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__filesystem/space_info.h>
-// expected-error at -1 {{header '<__filesystem/space_info.h>' is an implementation detail; #include '<filesystem>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/u8path.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/u8path.header.verify.cpp
deleted file mode 100644
index 12aea946b0dbe..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/filesystem/u8path.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__filesystem/u8path.h>
-// expected-error at -1 {{header '<__filesystem/u8path.h>' is an implementation detail; #include '<filesystem>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_arg.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/format_arg.header.verify.cpp
deleted file mode 100644
index 28dd063370901..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_arg.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__format/format_arg.h>
-// expected-error at -1 {{header '<__format/format_arg.h>' is an implementation detail; #include '<format>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_args.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/format_args.header.verify.cpp
deleted file mode 100644
index 1d014024fc4cd..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_args.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__format/format_args.h>
-// expected-error at -1 {{header '<__format/format_args.h>' is an implementation detail; #include '<format>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_context.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/format_context.header.verify.cpp
deleted file mode 100644
index cbf08156bc0d0..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_context.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__format/format_context.h>
-// expected-error at -1 {{header '<__format/format_context.h>' is an implementation detail; #include '<format>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_error.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/format_error.header.verify.cpp
deleted file mode 100644
index b4575974090b7..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_error.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__format/format_error.h>
-// expected-error at -1 {{header '<__format/format_error.h>' is an implementation detail; #include '<format>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_fwd.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/format_fwd.header.verify.cpp
deleted file mode 100644
index ea53ccbf7b114..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_fwd.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__format/format_fwd.h>
-// expected-error at -1 {{header '<__format/format_fwd.h>' is an implementation detail; #include '<format>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_parse_context.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/format_parse_context.header.verify.cpp
deleted file mode 100644
index b494e0c416544..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_parse_context.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__format/format_parse_context.h>
-// expected-error at -1 {{header '<__format/format_parse_context.h>' is an implementation detail; #include '<format>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_string.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/format_string.header.verify.cpp
deleted file mode 100644
index ba2d2ed42d50a..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_string.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__format/format_string.h>
-// expected-error at -1 {{header '<__format/format_string.h>' is an implementation detail; #include '<format>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_to_n_result.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/format_to_n_result.header.verify.cpp
deleted file mode 100644
index 235c6cd7645c4..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/format_to_n_result.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__format/format_to_n_result.h>
-// expected-error at -1 {{header '<__format/format_to_n_result.h>' is an implementation detail; #include '<format>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter.header.verify.cpp
deleted file mode 100644
index b7681bc4339c9..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__format/formatter.h>
-// expected-error at -1 {{header '<__format/formatter.h>' is an implementation detail; #include '<format>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_bool.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_bool.header.verify.cpp
deleted file mode 100644
index ddba2326ecb56..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_bool.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__format/formatter_bool.h>
-// expected-error at -1 {{header '<__format/formatter_bool.h>' is an implementation detail; #include '<format>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_char.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_char.header.verify.cpp
deleted file mode 100644
index 5360cf0783e48..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_char.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__format/formatter_char.h>
-// expected-error at -1 {{header '<__format/formatter_char.h>' is an implementation detail; #include '<format>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_floating_point.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_floating_point.header.verify.cpp
deleted file mode 100644
index dc672749e71ff..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_floating_point.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__format/formatter_floating_point.h>
-// expected-error at -1 {{header '<__format/formatter_floating_point.h>' is an implementation detail; #include '<format>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_integer.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_integer.header.verify.cpp
deleted file mode 100644
index ce986d0cec47c..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_integer.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__format/formatter_integer.h>
-// expected-error at -1 {{header '<__format/formatter_integer.h>' is an implementation detail; #include '<format>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_integral.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_integral.header.verify.cpp
deleted file mode 100644
index 5945bed564cf0..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_integral.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__format/formatter_integral.h>
-// expected-error at -1 {{header '<__format/formatter_integral.h>' is an implementation detail; #include '<format>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_pointer.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_pointer.header.verify.cpp
deleted file mode 100644
index f65759f6cccc0..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_pointer.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__format/formatter_pointer.h>
-// expected-error at -1 {{header '<__format/formatter_pointer.h>' is an implementation detail; #include '<format>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_string.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_string.header.verify.cpp
deleted file mode 100644
index 5caea05f2bf38..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_string.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__format/formatter_string.h>
-// expected-error at -1 {{header '<__format/formatter_string.h>' is an implementation detail; #include '<format>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/format/parser_std_format_spec.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/format/parser_std_format_spec.header.verify.cpp
deleted file mode 100644
index b1db7db78a0e3..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/format/parser_std_format_spec.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__format/parser_std_format_spec.h>
-// expected-error at -1 {{header '<__format/parser_std_format_spec.h>' is an implementation detail; #include '<format>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/binary_function.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/binary_function.header.verify.cpp
deleted file mode 100644
index 1c8046304121a..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/binary_function.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/binary_function.h>
-// expected-error at -1 {{header '<__functional/binary_function.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/binary_negate.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/binary_negate.header.verify.cpp
deleted file mode 100644
index 3cf5bd5b495e4..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/binary_negate.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/binary_negate.h>
-// expected-error at -1 {{header '<__functional/binary_negate.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/bind.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/bind.header.verify.cpp
deleted file mode 100644
index 3e24fad757bdb..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/bind.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/bind.h>
-// expected-error at -1 {{header '<__functional/bind.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/bind_back.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/bind_back.header.verify.cpp
deleted file mode 100644
index de078765f77ee..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/bind_back.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/bind_back.h>
-// expected-error at -1 {{header '<__functional/bind_back.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/bind_front.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/bind_front.header.verify.cpp
deleted file mode 100644
index e81725457b403..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/bind_front.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/bind_front.h>
-// expected-error at -1 {{header '<__functional/bind_front.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/binder1st.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/binder1st.header.verify.cpp
deleted file mode 100644
index 03922432fb269..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/binder1st.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/binder1st.h>
-// expected-error at -1 {{header '<__functional/binder1st.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/binder2nd.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/binder2nd.header.verify.cpp
deleted file mode 100644
index 4755190909773..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/binder2nd.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/binder2nd.h>
-// expected-error at -1 {{header '<__functional/binder2nd.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/compose.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/compose.header.verify.cpp
deleted file mode 100644
index 6c2a74bec52a2..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/compose.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/compose.h>
-// expected-error at -1 {{header '<__functional/compose.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/default_searcher.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/default_searcher.header.verify.cpp
deleted file mode 100644
index 91c87e422d8ab..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/default_searcher.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/default_searcher.h>
-// expected-error at -1 {{header '<__functional/default_searcher.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/function.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/function.header.verify.cpp
deleted file mode 100644
index 1e89dd01ff337..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/function.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/function.h>
-// expected-error at -1 {{header '<__functional/function.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/hash.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/hash.header.verify.cpp
deleted file mode 100644
index 33ff916c650d9..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/hash.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/hash.h>
-// expected-error at -1 {{header '<__functional/hash.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/identity.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/identity.header.verify.cpp
deleted file mode 100644
index bf9039623a42b..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/identity.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/identity.h>
-// expected-error at -1 {{header '<__functional/identity.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/invoke.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/invoke.header.verify.cpp
deleted file mode 100644
index 9a44e3d88db14..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/invoke.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/invoke.h>
-// expected-error at -1 {{header '<__functional/invoke.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/is_transparent.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/is_transparent.header.verify.cpp
deleted file mode 100644
index efba9ca1c693e..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/is_transparent.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/is_transparent.h>
-// expected-error at -1 {{header '<__functional/is_transparent.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/mem_fn.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/mem_fn.header.verify.cpp
deleted file mode 100644
index 8b7e92277a0cf..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/mem_fn.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/mem_fn.h>
-// expected-error at -1 {{header '<__functional/mem_fn.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/mem_fun_ref.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/mem_fun_ref.header.verify.cpp
deleted file mode 100644
index 400f78b63369c..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/mem_fun_ref.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/mem_fun_ref.h>
-// expected-error at -1 {{header '<__functional/mem_fun_ref.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/not_fn.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/not_fn.header.verify.cpp
deleted file mode 100644
index 034b976219b66..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/not_fn.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/not_fn.h>
-// expected-error at -1 {{header '<__functional/not_fn.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/operations.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/operations.header.verify.cpp
deleted file mode 100644
index 480358764243f..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/operations.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/operations.h>
-// expected-error at -1 {{header '<__functional/operations.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/perfect_forward.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/perfect_forward.header.verify.cpp
deleted file mode 100644
index 2832238da9b0b..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/perfect_forward.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/perfect_forward.h>
-// expected-error at -1 {{header '<__functional/perfect_forward.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/pointer_to_binary_function.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/pointer_to_binary_function.header.verify.cpp
deleted file mode 100644
index d0826597e0a03..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/pointer_to_binary_function.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/pointer_to_binary_function.h>
-// expected-error at -1 {{header '<__functional/pointer_to_binary_function.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/pointer_to_unary_function.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/pointer_to_unary_function.header.verify.cpp
deleted file mode 100644
index 549f83d73fffe..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/pointer_to_unary_function.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/pointer_to_unary_function.h>
-// expected-error at -1 {{header '<__functional/pointer_to_unary_function.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/ranges_operations.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/ranges_operations.header.verify.cpp
deleted file mode 100644
index 9af27d0c8f04b..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/ranges_operations.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/ranges_operations.h>
-// expected-error at -1 {{header '<__functional/ranges_operations.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/reference_wrapper.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/reference_wrapper.header.verify.cpp
deleted file mode 100644
index d295cd2700675..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/reference_wrapper.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/reference_wrapper.h>
-// expected-error at -1 {{header '<__functional/reference_wrapper.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/unary_function.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/unary_function.header.verify.cpp
deleted file mode 100644
index d56433acdc101..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/unary_function.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/unary_function.h>
-// expected-error at -1 {{header '<__functional/unary_function.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/unary_negate.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/unary_negate.header.verify.cpp
deleted file mode 100644
index 00f8bffc0ccac..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/unary_negate.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/unary_negate.h>
-// expected-error at -1 {{header '<__functional/unary_negate.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/unwrap_ref.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/unwrap_ref.header.verify.cpp
deleted file mode 100644
index c5d1c52205196..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/unwrap_ref.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/unwrap_ref.h>
-// expected-error at -1 {{header '<__functional/unwrap_ref.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/functional/weak_result_type.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/functional/weak_result_type.header.verify.cpp
deleted file mode 100644
index 7e0999aa38e11..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/functional/weak_result_type.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__functional/weak_result_type.h>
-// expected-error at -1 {{header '<__functional/weak_result_type.h>' is an implementation detail; #include '<functional>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ios/fpos.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ios/fpos.header.verify.cpp
deleted file mode 100644
index e89487fe5f062..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ios/fpos.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ios/fpos.h>
-// expected-error at -1 {{header '<__ios/fpos.h>' is an implementation detail; #include '<ios>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/access.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/access.header.verify.cpp
deleted file mode 100644
index 79535bd0eb20a..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/access.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/access.h>
-// expected-error at -1 {{header '<__iterator/access.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/advance.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/advance.header.verify.cpp
deleted file mode 100644
index e11370874c368..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/advance.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/advance.h>
-// expected-error at -1 {{header '<__iterator/advance.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/back_insert_iterator.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/back_insert_iterator.header.verify.cpp
deleted file mode 100644
index 8602b0bc773ce..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/back_insert_iterator.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/back_insert_iterator.h>
-// expected-error at -1 {{header '<__iterator/back_insert_iterator.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/common_iterator.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/common_iterator.header.verify.cpp
deleted file mode 100644
index 1f3b6ecea91c3..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/common_iterator.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/common_iterator.h>
-// expected-error at -1 {{header '<__iterator/common_iterator.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/concepts.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/concepts.header.verify.cpp
deleted file mode 100644
index 78955c97a12de..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/concepts.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/concepts.h>
-// expected-error at -1 {{header '<__iterator/concepts.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/counted_iterator.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/counted_iterator.header.verify.cpp
deleted file mode 100644
index ee80345e1f117..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/counted_iterator.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/counted_iterator.h>
-// expected-error at -1 {{header '<__iterator/counted_iterator.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/data.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/data.header.verify.cpp
deleted file mode 100644
index 782b7c18cdc3d..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/data.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/data.h>
-// expected-error at -1 {{header '<__iterator/data.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/default_sentinel.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/default_sentinel.header.verify.cpp
deleted file mode 100644
index 3a09394918bc1..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/default_sentinel.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/default_sentinel.h>
-// expected-error at -1 {{header '<__iterator/default_sentinel.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/distance.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/distance.header.verify.cpp
deleted file mode 100644
index fbf5172947d66..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/distance.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/distance.h>
-// expected-error at -1 {{header '<__iterator/distance.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/empty.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/empty.header.verify.cpp
deleted file mode 100644
index f5485cc7bcca0..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/empty.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/empty.h>
-// expected-error at -1 {{header '<__iterator/empty.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/erase_if_container.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/erase_if_container.header.verify.cpp
deleted file mode 100644
index db5ff983283f5..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/erase_if_container.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/erase_if_container.h>
-// expected-error at -1 {{header '<__iterator/erase_if_container.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/front_insert_iterator.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/front_insert_iterator.header.verify.cpp
deleted file mode 100644
index eac90efc7c1f6..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/front_insert_iterator.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/front_insert_iterator.h>
-// expected-error at -1 {{header '<__iterator/front_insert_iterator.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/incrementable_traits.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/incrementable_traits.header.verify.cpp
deleted file mode 100644
index 4668050b36872..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/incrementable_traits.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/incrementable_traits.h>
-// expected-error at -1 {{header '<__iterator/incrementable_traits.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/indirectly_comparable.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/indirectly_comparable.header.verify.cpp
deleted file mode 100644
index ec36018ac006d..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/indirectly_comparable.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/indirectly_comparable.h>
-// expected-error at -1 {{header '<__iterator/indirectly_comparable.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/insert_iterator.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/insert_iterator.header.verify.cpp
deleted file mode 100644
index 1cedde0c51754..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/insert_iterator.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/insert_iterator.h>
-// expected-error at -1 {{header '<__iterator/insert_iterator.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/istream_iterator.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/istream_iterator.header.verify.cpp
deleted file mode 100644
index 72e813fb1aaaf..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/istream_iterator.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/istream_iterator.h>
-// expected-error at -1 {{header '<__iterator/istream_iterator.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/istreambuf_iterator.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/istreambuf_iterator.header.verify.cpp
deleted file mode 100644
index 53358d847d8af..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/istreambuf_iterator.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/istreambuf_iterator.h>
-// expected-error at -1 {{header '<__iterator/istreambuf_iterator.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iter_move.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iter_move.header.verify.cpp
deleted file mode 100644
index 479b7d1559588..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iter_move.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/iter_move.h>
-// expected-error at -1 {{header '<__iterator/iter_move.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iter_swap.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iter_swap.header.verify.cpp
deleted file mode 100644
index 7d863d1b64873..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iter_swap.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/iter_swap.h>
-// expected-error at -1 {{header '<__iterator/iter_swap.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iterator.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iterator.header.verify.cpp
deleted file mode 100644
index 43c691945d6d1..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iterator.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/iterator.h>
-// expected-error at -1 {{header '<__iterator/iterator.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iterator_traits.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iterator_traits.header.verify.cpp
deleted file mode 100644
index 5f8e27cfc03d2..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/iterator_traits.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/iterator_traits.h>
-// expected-error at -1 {{header '<__iterator/iterator_traits.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/mergeable.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/mergeable.header.verify.cpp
deleted file mode 100644
index 7a3fd4040b07b..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/mergeable.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/mergeable.h>
-// expected-error at -1 {{header '<__iterator/mergeable.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/move_iterator.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/move_iterator.header.verify.cpp
deleted file mode 100644
index 5a209b771e264..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/move_iterator.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/move_iterator.h>
-// expected-error at -1 {{header '<__iterator/move_iterator.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/next.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/next.header.verify.cpp
deleted file mode 100644
index eb13fd697871b..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/next.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/next.h>
-// expected-error at -1 {{header '<__iterator/next.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/ostream_iterator.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/ostream_iterator.header.verify.cpp
deleted file mode 100644
index bb732c57511ed..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/ostream_iterator.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/ostream_iterator.h>
-// expected-error at -1 {{header '<__iterator/ostream_iterator.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/ostreambuf_iterator.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/ostreambuf_iterator.header.verify.cpp
deleted file mode 100644
index f40c05327df79..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/ostreambuf_iterator.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/ostreambuf_iterator.h>
-// expected-error at -1 {{header '<__iterator/ostreambuf_iterator.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/permutable.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/permutable.header.verify.cpp
deleted file mode 100644
index c4a8467d7ad2b..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/permutable.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/permutable.h>
-// expected-error at -1 {{header '<__iterator/permutable.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/prev.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/prev.header.verify.cpp
deleted file mode 100644
index 66cf921a243a7..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/prev.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/prev.h>
-// expected-error at -1 {{header '<__iterator/prev.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/projected.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/projected.header.verify.cpp
deleted file mode 100644
index b679891b53d15..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/projected.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/projected.h>
-// expected-error at -1 {{header '<__iterator/projected.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/readable_traits.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/readable_traits.header.verify.cpp
deleted file mode 100644
index 46141daed71d1..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/readable_traits.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/readable_traits.h>
-// expected-error at -1 {{header '<__iterator/readable_traits.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/reverse_access.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/reverse_access.header.verify.cpp
deleted file mode 100644
index ff57c07b54019..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/reverse_access.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/reverse_access.h>
-// expected-error at -1 {{header '<__iterator/reverse_access.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/reverse_iterator.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/reverse_iterator.header.verify.cpp
deleted file mode 100644
index 9c384b51c470d..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/reverse_iterator.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/reverse_iterator.h>
-// expected-error at -1 {{header '<__iterator/reverse_iterator.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/size.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/size.header.verify.cpp
deleted file mode 100644
index 7b584cad1cf2e..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/size.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/size.h>
-// expected-error at -1 {{header '<__iterator/size.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/sortable.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/sortable.header.verify.cpp
deleted file mode 100644
index b6ab55586db86..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/sortable.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/sortable.h>
-// expected-error at -1 {{header '<__iterator/sortable.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/unreachable_sentinel.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/unreachable_sentinel.header.verify.cpp
deleted file mode 100644
index 840d27a42fd29..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/unreachable_sentinel.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/unreachable_sentinel.h>
-// expected-error at -1 {{header '<__iterator/unreachable_sentinel.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/wrap_iter.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/iterator/wrap_iter.header.verify.cpp
deleted file mode 100644
index b91b557416109..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/iterator/wrap_iter.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__iterator/wrap_iter.h>
-// expected-error at -1 {{header '<__iterator/wrap_iter.h>' is an implementation detail; #include '<iterator>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/locale.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/locale.header.verify.cpp
deleted file mode 100644
index 0e292cd3fa2ff..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/locale.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__locale>
-// expected-error at -1 {{header '<__locale>' is an implementation detail; #include '<locale>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/addressof.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/addressof.header.verify.cpp
deleted file mode 100644
index be058159c013d..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/addressof.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__memory/addressof.h>
-// expected-error at -1 {{header '<__memory/addressof.h>' is an implementation detail; #include '<memory>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocation_guard.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocation_guard.header.verify.cpp
deleted file mode 100644
index 5b7b85b3c7ec1..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocation_guard.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__memory/allocation_guard.h>
-// expected-error at -1 {{header '<__memory/allocation_guard.h>' is an implementation detail; #include '<memory>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator.header.verify.cpp
deleted file mode 100644
index b566354c96c59..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__memory/allocator.h>
-// expected-error at -1 {{header '<__memory/allocator.h>' is an implementation detail; #include '<memory>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator_arg_t.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator_arg_t.header.verify.cpp
deleted file mode 100644
index 6dcfaf06a14cb..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator_arg_t.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__memory/allocator_arg_t.h>
-// expected-error at -1 {{header '<__memory/allocator_arg_t.h>' is an implementation detail; #include '<memory>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator_traits.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator_traits.header.verify.cpp
deleted file mode 100644
index 22b14cb292b51..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator_traits.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__memory/allocator_traits.h>
-// expected-error at -1 {{header '<__memory/allocator_traits.h>' is an implementation detail; #include '<memory>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/auto_ptr.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/auto_ptr.header.verify.cpp
deleted file mode 100644
index 804ed70eb0798..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/auto_ptr.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__memory/auto_ptr.h>
-// expected-error at -1 {{header '<__memory/auto_ptr.h>' is an implementation detail; #include '<memory>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/compressed_pair.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/compressed_pair.header.verify.cpp
deleted file mode 100644
index 8aea12ca764fb..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/compressed_pair.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__memory/compressed_pair.h>
-// expected-error at -1 {{header '<__memory/compressed_pair.h>' is an implementation detail; #include '<memory>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/concepts.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/concepts.header.verify.cpp
deleted file mode 100644
index d20bfdd59cca3..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/concepts.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__memory/concepts.h>
-// expected-error at -1 {{header '<__memory/concepts.h>' is an implementation detail; #include '<memory>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/construct_at.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/construct_at.header.verify.cpp
deleted file mode 100644
index 1e81ab0acebdb..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/construct_at.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__memory/construct_at.h>
-// expected-error at -1 {{header '<__memory/construct_at.h>' is an implementation detail; #include '<memory>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/pointer_traits.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/pointer_traits.header.verify.cpp
deleted file mode 100644
index ac55a78c8a213..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/pointer_traits.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__memory/pointer_traits.h>
-// expected-error at -1 {{header '<__memory/pointer_traits.h>' is an implementation detail; #include '<memory>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/ranges_construct_at.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/ranges_construct_at.header.verify.cpp
deleted file mode 100644
index ae99c73d348f5..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/ranges_construct_at.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__memory/ranges_construct_at.h>
-// expected-error at -1 {{header '<__memory/ranges_construct_at.h>' is an implementation detail; #include '<memory>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/ranges_uninitialized_algorithms.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/ranges_uninitialized_algorithms.header.verify.cpp
deleted file mode 100644
index 1b2127900f1ea..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/ranges_uninitialized_algorithms.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__memory/ranges_uninitialized_algorithms.h>
-// expected-error at -1 {{header '<__memory/ranges_uninitialized_algorithms.h>' is an implementation detail; #include '<memory>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/raw_storage_iterator.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/raw_storage_iterator.header.verify.cpp
deleted file mode 100644
index 72276678bced1..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/raw_storage_iterator.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__memory/raw_storage_iterator.h>
-// expected-error at -1 {{header '<__memory/raw_storage_iterator.h>' is an implementation detail; #include '<memory>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/shared_ptr.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/shared_ptr.header.verify.cpp
deleted file mode 100644
index add331fd182ac..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/shared_ptr.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__memory/shared_ptr.h>
-// expected-error at -1 {{header '<__memory/shared_ptr.h>' is an implementation detail; #include '<memory>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/temporary_buffer.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/temporary_buffer.header.verify.cpp
deleted file mode 100644
index d3bb9fb3019cc..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/temporary_buffer.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__memory/temporary_buffer.h>
-// expected-error at -1 {{header '<__memory/temporary_buffer.h>' is an implementation detail; #include '<memory>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/uninitialized_algorithms.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/uninitialized_algorithms.header.verify.cpp
deleted file mode 100644
index 3bbb30a51a0f4..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/uninitialized_algorithms.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__memory/uninitialized_algorithms.h>
-// expected-error at -1 {{header '<__memory/uninitialized_algorithms.h>' is an implementation detail; #include '<memory>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/unique_ptr.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/unique_ptr.header.verify.cpp
deleted file mode 100644
index aca4913eaffeb..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/unique_ptr.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__memory/unique_ptr.h>
-// expected-error at -1 {{header '<__memory/unique_ptr.h>' is an implementation detail; #include '<memory>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/uses_allocator.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/uses_allocator.header.verify.cpp
deleted file mode 100644
index 7e7015ae4d139..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/uses_allocator.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__memory/uses_allocator.h>
-// expected-error at -1 {{header '<__memory/uses_allocator.h>' is an implementation detail; #include '<memory>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/memory/voidify.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/memory/voidify.header.verify.cpp
deleted file mode 100644
index bbd3f9c27ac34..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/memory/voidify.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__memory/voidify.h>
-// expected-error at -1 {{header '<__memory/voidify.h>' is an implementation detail; #include '<memory>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/mutex_base.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/mutex_base.header.verify.cpp
deleted file mode 100644
index f591466781cf6..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/mutex_base.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__mutex_base>
-// expected-error at -1 {{header '<__mutex_base>' is an implementation detail; #include either '<mutex>' or '<shared_mutex>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/node_handle.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/node_handle.header.verify.cpp
deleted file mode 100644
index d436894e6166f..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/node_handle.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__node_handle>
-// expected-error at -1 {{header '<__node_handle>' is an implementation detail; #include one of {'<map>', '<set>', '<unordered_map>', '<unordered_set>'} instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/accumulate.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/numeric/accumulate.header.verify.cpp
deleted file mode 100644
index 80572fe9c351d..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/accumulate.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__numeric/accumulate.h>
-// expected-error at -1 {{header '<__numeric/accumulate.h>' is an implementation detail; #include '<numeric>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/adjacent_
diff erence.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/numeric/adjacent_
diff erence.header.verify.cpp
deleted file mode 100644
index 2ae81dc749ac8..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/adjacent_
diff erence.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__numeric/adjacent_
diff erence.h>
-// expected-error at -1 {{header '<__numeric/adjacent_
diff erence.h>' is an implementation detail; #include '<numeric>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/exclusive_scan.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/numeric/exclusive_scan.header.verify.cpp
deleted file mode 100644
index 6262db775d2da..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/exclusive_scan.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__numeric/exclusive_scan.h>
-// expected-error at -1 {{header '<__numeric/exclusive_scan.h>' is an implementation detail; #include '<numeric>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/gcd_lcm.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/numeric/gcd_lcm.header.verify.cpp
deleted file mode 100644
index 9b883f6d010fb..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/gcd_lcm.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__numeric/gcd_lcm.h>
-// expected-error at -1 {{header '<__numeric/gcd_lcm.h>' is an implementation detail; #include '<numeric>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/inclusive_scan.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/numeric/inclusive_scan.header.verify.cpp
deleted file mode 100644
index 68e76d2d18421..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/inclusive_scan.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__numeric/inclusive_scan.h>
-// expected-error at -1 {{header '<__numeric/inclusive_scan.h>' is an implementation detail; #include '<numeric>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/inner_product.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/numeric/inner_product.header.verify.cpp
deleted file mode 100644
index add4f4a780998..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/inner_product.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__numeric/inner_product.h>
-// expected-error at -1 {{header '<__numeric/inner_product.h>' is an implementation detail; #include '<numeric>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/iota.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/numeric/iota.header.verify.cpp
deleted file mode 100644
index 9e59836022668..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/iota.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__numeric/iota.h>
-// expected-error at -1 {{header '<__numeric/iota.h>' is an implementation detail; #include '<numeric>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/midpoint.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/numeric/midpoint.header.verify.cpp
deleted file mode 100644
index 9c02085bc0cc9..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/midpoint.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__numeric/midpoint.h>
-// expected-error at -1 {{header '<__numeric/midpoint.h>' is an implementation detail; #include '<numeric>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/partial_sum.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/numeric/partial_sum.header.verify.cpp
deleted file mode 100644
index 8cec77fe1d8d3..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/partial_sum.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__numeric/partial_sum.h>
-// expected-error at -1 {{header '<__numeric/partial_sum.h>' is an implementation detail; #include '<numeric>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/reduce.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/numeric/reduce.header.verify.cpp
deleted file mode 100644
index 0664641e6470a..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/reduce.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__numeric/reduce.h>
-// expected-error at -1 {{header '<__numeric/reduce.h>' is an implementation detail; #include '<numeric>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/transform_exclusive_scan.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/numeric/transform_exclusive_scan.header.verify.cpp
deleted file mode 100644
index cc47065de10f8..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/transform_exclusive_scan.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__numeric/transform_exclusive_scan.h>
-// expected-error at -1 {{header '<__numeric/transform_exclusive_scan.h>' is an implementation detail; #include '<numeric>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/transform_inclusive_scan.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/numeric/transform_inclusive_scan.header.verify.cpp
deleted file mode 100644
index d2dbd10753235..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/transform_inclusive_scan.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__numeric/transform_inclusive_scan.h>
-// expected-error at -1 {{header '<__numeric/transform_inclusive_scan.h>' is an implementation detail; #include '<numeric>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/transform_reduce.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/numeric/transform_reduce.header.verify.cpp
deleted file mode 100644
index c51f4f8d5e553..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/transform_reduce.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__numeric/transform_reduce.h>
-// expected-error at -1 {{header '<__numeric/transform_reduce.h>' is an implementation detail; #include '<numeric>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/bernoulli_distribution.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/bernoulli_distribution.header.verify.cpp
deleted file mode 100644
index 5f752c6865b0e..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/bernoulli_distribution.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/bernoulli_distribution.h>
-// expected-error at -1 {{header '<__random/bernoulli_distribution.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/binomial_distribution.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/binomial_distribution.header.verify.cpp
deleted file mode 100644
index 341c947ceece6..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/binomial_distribution.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/binomial_distribution.h>
-// expected-error at -1 {{header '<__random/binomial_distribution.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/cauchy_distribution.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/cauchy_distribution.header.verify.cpp
deleted file mode 100644
index 6b5ca88a341b4..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/cauchy_distribution.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/cauchy_distribution.h>
-// expected-error at -1 {{header '<__random/cauchy_distribution.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/chi_squared_distribution.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/chi_squared_distribution.header.verify.cpp
deleted file mode 100644
index 0bba97503c44d..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/chi_squared_distribution.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/chi_squared_distribution.h>
-// expected-error at -1 {{header '<__random/chi_squared_distribution.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/clamp_to_integral.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/clamp_to_integral.header.verify.cpp
deleted file mode 100644
index 30404cbb39bd0..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/clamp_to_integral.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/clamp_to_integral.h>
-// expected-error at -1 {{header '<__random/clamp_to_integral.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/default_random_engine.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/default_random_engine.header.verify.cpp
deleted file mode 100644
index a8ff1ac65d1ba..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/default_random_engine.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/default_random_engine.h>
-// expected-error at -1 {{header '<__random/default_random_engine.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/discard_block_engine.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/discard_block_engine.header.verify.cpp
deleted file mode 100644
index 6cee35ef1ecba..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/discard_block_engine.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/discard_block_engine.h>
-// expected-error at -1 {{header '<__random/discard_block_engine.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/discrete_distribution.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/discrete_distribution.header.verify.cpp
deleted file mode 100644
index e50e0270fcafc..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/discrete_distribution.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/discrete_distribution.h>
-// expected-error at -1 {{header '<__random/discrete_distribution.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/exponential_distribution.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/exponential_distribution.header.verify.cpp
deleted file mode 100644
index f4d408226d780..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/exponential_distribution.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/exponential_distribution.h>
-// expected-error at -1 {{header '<__random/exponential_distribution.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/extreme_value_distribution.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/extreme_value_distribution.header.verify.cpp
deleted file mode 100644
index 37894b1710927..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/extreme_value_distribution.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/extreme_value_distribution.h>
-// expected-error at -1 {{header '<__random/extreme_value_distribution.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/fisher_f_distribution.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/fisher_f_distribution.header.verify.cpp
deleted file mode 100644
index a5d0160729d9d..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/fisher_f_distribution.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/fisher_f_distribution.h>
-// expected-error at -1 {{header '<__random/fisher_f_distribution.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/gamma_distribution.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/gamma_distribution.header.verify.cpp
deleted file mode 100644
index 1ef8fb1177809..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/gamma_distribution.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/gamma_distribution.h>
-// expected-error at -1 {{header '<__random/gamma_distribution.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/generate_canonical.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/generate_canonical.header.verify.cpp
deleted file mode 100644
index 3fc47e9b04304..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/generate_canonical.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/generate_canonical.h>
-// expected-error at -1 {{header '<__random/generate_canonical.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/geometric_distribution.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/geometric_distribution.header.verify.cpp
deleted file mode 100644
index 04a80df515c81..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/geometric_distribution.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/geometric_distribution.h>
-// expected-error at -1 {{header '<__random/geometric_distribution.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/independent_bits_engine.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/independent_bits_engine.header.verify.cpp
deleted file mode 100644
index 1b24aa6ecbf4f..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/independent_bits_engine.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/independent_bits_engine.h>
-// expected-error at -1 {{header '<__random/independent_bits_engine.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/is_seed_sequence.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/is_seed_sequence.header.verify.cpp
deleted file mode 100644
index 423e34b6d03ef..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/is_seed_sequence.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/is_seed_sequence.h>
-// expected-error at -1 {{header '<__random/is_seed_sequence.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/knuth_b.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/knuth_b.header.verify.cpp
deleted file mode 100644
index b2bbc47a12464..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/knuth_b.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/knuth_b.h>
-// expected-error at -1 {{header '<__random/knuth_b.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/linear_congruential_engine.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/linear_congruential_engine.header.verify.cpp
deleted file mode 100644
index b9e670ebf4a7c..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/linear_congruential_engine.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/linear_congruential_engine.h>
-// expected-error at -1 {{header '<__random/linear_congruential_engine.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/log2.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/log2.header.verify.cpp
deleted file mode 100644
index 7f200c95f2bad..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/log2.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/log2.h>
-// expected-error at -1 {{header '<__random/log2.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/lognormal_distribution.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/lognormal_distribution.header.verify.cpp
deleted file mode 100644
index 0d4198e767a71..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/lognormal_distribution.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/lognormal_distribution.h>
-// expected-error at -1 {{header '<__random/lognormal_distribution.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/mersenne_twister_engine.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/mersenne_twister_engine.header.verify.cpp
deleted file mode 100644
index 7afd84f1cfc2a..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/mersenne_twister_engine.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/mersenne_twister_engine.h>
-// expected-error at -1 {{header '<__random/mersenne_twister_engine.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/negative_binomial_distribution.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/negative_binomial_distribution.header.verify.cpp
deleted file mode 100644
index 8fd2371d4aace..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/negative_binomial_distribution.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/negative_binomial_distribution.h>
-// expected-error at -1 {{header '<__random/negative_binomial_distribution.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/normal_distribution.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/normal_distribution.header.verify.cpp
deleted file mode 100644
index 048406392ff1e..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/normal_distribution.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/normal_distribution.h>
-// expected-error at -1 {{header '<__random/normal_distribution.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/piecewise_constant_distribution.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/piecewise_constant_distribution.header.verify.cpp
deleted file mode 100644
index be34948dff144..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/piecewise_constant_distribution.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/piecewise_constant_distribution.h>
-// expected-error at -1 {{header '<__random/piecewise_constant_distribution.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/piecewise_linear_distribution.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/piecewise_linear_distribution.header.verify.cpp
deleted file mode 100644
index 7266fda624c0a..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/piecewise_linear_distribution.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/piecewise_linear_distribution.h>
-// expected-error at -1 {{header '<__random/piecewise_linear_distribution.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/poisson_distribution.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/poisson_distribution.header.verify.cpp
deleted file mode 100644
index acf012981426b..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/poisson_distribution.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/poisson_distribution.h>
-// expected-error at -1 {{header '<__random/poisson_distribution.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/random_device.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/random_device.header.verify.cpp
deleted file mode 100644
index 7bcbaaf8582ba..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/random_device.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/random_device.h>
-// expected-error at -1 {{header '<__random/random_device.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/ranlux.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/ranlux.header.verify.cpp
deleted file mode 100644
index 8dd8f2b4feda8..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/ranlux.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/ranlux.h>
-// expected-error at -1 {{header '<__random/ranlux.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/seed_seq.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/seed_seq.header.verify.cpp
deleted file mode 100644
index 100eaa8a10189..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/seed_seq.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/seed_seq.h>
-// expected-error at -1 {{header '<__random/seed_seq.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/shuffle_order_engine.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/shuffle_order_engine.header.verify.cpp
deleted file mode 100644
index 56237a48d6b9f..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/shuffle_order_engine.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/shuffle_order_engine.h>
-// expected-error at -1 {{header '<__random/shuffle_order_engine.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/student_t_distribution.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/student_t_distribution.header.verify.cpp
deleted file mode 100644
index 045601af8af46..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/student_t_distribution.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/student_t_distribution.h>
-// expected-error at -1 {{header '<__random/student_t_distribution.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/subtract_with_carry_engine.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/subtract_with_carry_engine.header.verify.cpp
deleted file mode 100644
index 2044688d38dbd..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/subtract_with_carry_engine.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/subtract_with_carry_engine.h>
-// expected-error at -1 {{header '<__random/subtract_with_carry_engine.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/uniform_int_distribution.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/uniform_int_distribution.header.verify.cpp
deleted file mode 100644
index 93d16a5aac1ea..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/uniform_int_distribution.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/uniform_int_distribution.h>
-// expected-error at -1 {{header '<__random/uniform_int_distribution.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/uniform_random_bit_generator.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/uniform_random_bit_generator.header.verify.cpp
deleted file mode 100644
index 3df804026d2cc..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/uniform_random_bit_generator.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/uniform_random_bit_generator.h>
-// expected-error at -1 {{header '<__random/uniform_random_bit_generator.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/uniform_real_distribution.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/uniform_real_distribution.header.verify.cpp
deleted file mode 100644
index d05c78835f3e0..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/uniform_real_distribution.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/uniform_real_distribution.h>
-// expected-error at -1 {{header '<__random/uniform_real_distribution.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/random/weibull_distribution.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/random/weibull_distribution.header.verify.cpp
deleted file mode 100644
index c6e3b7c2a1bbf..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/random/weibull_distribution.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__random/weibull_distribution.h>
-// expected-error at -1 {{header '<__random/weibull_distribution.h>' is an implementation detail; #include '<random>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/access.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/access.header.verify.cpp
deleted file mode 100644
index 8c72d6edb253a..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/access.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/access.h>
-// expected-error at -1 {{header '<__ranges/access.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/all.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/all.header.verify.cpp
deleted file mode 100644
index a78144ed17077..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/all.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/all.h>
-// expected-error at -1 {{header '<__ranges/all.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/common_view.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/common_view.header.verify.cpp
deleted file mode 100644
index cc1eb93409ae6..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/common_view.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/common_view.h>
-// expected-error at -1 {{header '<__ranges/common_view.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/concepts.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/concepts.header.verify.cpp
deleted file mode 100644
index d7f8e677dab9e..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/concepts.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/concepts.h>
-// expected-error at -1 {{header '<__ranges/concepts.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/copyable_box.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/copyable_box.header.verify.cpp
deleted file mode 100644
index 4b92271ea105b..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/copyable_box.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/copyable_box.h>
-// expected-error at -1 {{header '<__ranges/copyable_box.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/counted.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/counted.header.verify.cpp
deleted file mode 100644
index 4fa425e9b1e9a..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/counted.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/counted.h>
-// expected-error at -1 {{header '<__ranges/counted.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/dangling.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/dangling.header.verify.cpp
deleted file mode 100644
index 16c222bb92c5f..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/dangling.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/dangling.h>
-// expected-error at -1 {{header '<__ranges/dangling.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/data.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/data.header.verify.cpp
deleted file mode 100644
index 15f2a16d1a44b..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/data.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/data.h>
-// expected-error at -1 {{header '<__ranges/data.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/drop_view.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/drop_view.header.verify.cpp
deleted file mode 100644
index edb7e12ced48e..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/drop_view.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/drop_view.h>
-// expected-error at -1 {{header '<__ranges/drop_view.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/empty.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/empty.header.verify.cpp
deleted file mode 100644
index 2e4fc0ea82240..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/empty.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/empty.h>
-// expected-error at -1 {{header '<__ranges/empty.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/empty_view.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/empty_view.header.verify.cpp
deleted file mode 100644
index bf7992f3e1ed2..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/empty_view.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/empty_view.h>
-// expected-error at -1 {{header '<__ranges/empty_view.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/enable_borrowed_range.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/enable_borrowed_range.header.verify.cpp
deleted file mode 100644
index adade7282123e..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/enable_borrowed_range.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/enable_borrowed_range.h>
-// expected-error at -1 {{header '<__ranges/enable_borrowed_range.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/enable_view.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/enable_view.header.verify.cpp
deleted file mode 100644
index 3cfe1ab8e03f6..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/enable_view.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/enable_view.h>
-// expected-error at -1 {{header '<__ranges/enable_view.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/iota_view.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/iota_view.header.verify.cpp
deleted file mode 100644
index dc1ac446c8123..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/iota_view.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/iota_view.h>
-// expected-error at -1 {{header '<__ranges/iota_view.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/join_view.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/join_view.header.verify.cpp
deleted file mode 100644
index 6a996af4420aa..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/join_view.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/join_view.h>
-// expected-error at -1 {{header '<__ranges/join_view.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/non_propagating_cache.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/non_propagating_cache.header.verify.cpp
deleted file mode 100644
index ca16f52087901..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/non_propagating_cache.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/non_propagating_cache.h>
-// expected-error at -1 {{header '<__ranges/non_propagating_cache.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/owning_view.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/owning_view.header.verify.cpp
deleted file mode 100644
index 194b42d2c3661..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/owning_view.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/owning_view.h>
-// expected-error at -1 {{header '<__ranges/owning_view.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/range_adaptor.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/range_adaptor.header.verify.cpp
deleted file mode 100644
index 67d88f0ec99c2..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/range_adaptor.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/range_adaptor.h>
-// expected-error at -1 {{header '<__ranges/range_adaptor.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/rbegin.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/rbegin.header.verify.cpp
deleted file mode 100644
index 95ec5a712c426..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/rbegin.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/rbegin.h>
-// expected-error at -1 {{header '<__ranges/rbegin.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/ref_view.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/ref_view.header.verify.cpp
deleted file mode 100644
index e40eff54c1b00..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/ref_view.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/ref_view.h>
-// expected-error at -1 {{header '<__ranges/ref_view.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/rend.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/rend.header.verify.cpp
deleted file mode 100644
index 28d575ac41c5b..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/rend.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/rend.h>
-// expected-error at -1 {{header '<__ranges/rend.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/reverse_view.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/reverse_view.header.verify.cpp
deleted file mode 100644
index a7f65a7e5a978..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/reverse_view.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/reverse_view.h>
-// expected-error at -1 {{header '<__ranges/reverse_view.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/single_view.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/single_view.header.verify.cpp
deleted file mode 100644
index 4f96e162113fb..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/single_view.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/single_view.h>
-// expected-error at -1 {{header '<__ranges/single_view.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/size.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/size.header.verify.cpp
deleted file mode 100644
index ff62dd88842d7..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/size.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/size.h>
-// expected-error at -1 {{header '<__ranges/size.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/subrange.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/subrange.header.verify.cpp
deleted file mode 100644
index 5ade94b47e820..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/subrange.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/subrange.h>
-// expected-error at -1 {{header '<__ranges/subrange.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/take_view.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/take_view.header.verify.cpp
deleted file mode 100644
index 7933661bf2dce..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/take_view.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/take_view.h>
-// expected-error at -1 {{header '<__ranges/take_view.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/transform_view.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/transform_view.header.verify.cpp
deleted file mode 100644
index e70110f920467..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/transform_view.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/transform_view.h>
-// expected-error at -1 {{header '<__ranges/transform_view.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/view_interface.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/view_interface.header.verify.cpp
deleted file mode 100644
index f515614cc76f0..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/view_interface.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/view_interface.h>
-// expected-error at -1 {{header '<__ranges/view_interface.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/views.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/ranges/views.header.verify.cpp
deleted file mode 100644
index 60ee669c70243..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/ranges/views.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__ranges/views.h>
-// expected-error at -1 {{header '<__ranges/views.h>' is an implementation detail; #include '<ranges>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/split_buffer.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/split_buffer.header.verify.cpp
deleted file mode 100644
index 60c8319fc3080..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/split_buffer.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__split_buffer>
-// expected-error at -1 {{header '<__split_buffer>' is an implementation detail; #include either '<vector>' or '<deque>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/std_stream.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/std_stream.header.verify.cpp
deleted file mode 100644
index f2c1da3ce502a..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/std_stream.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__std_stream>
-// expected-error at -1 {{header '<__std_stream>' is an implementation detail; #include '<streambuf>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/string.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/string.header.verify.cpp
deleted file mode 100644
index 30f1fb47b6e1c..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/string.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__string>
-// expected-error at -1 {{header '<__string>' is an implementation detail; #include '<string>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/thread/poll_with_backoff.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/thread/poll_with_backoff.header.verify.cpp
deleted file mode 100644
index 63c78eaa38e72..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/thread/poll_with_backoff.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__thread/poll_with_backoff.h>
-// expected-error at -1 {{header '<__thread/poll_with_backoff.h>' is an implementation detail; #include '<thread>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/thread/timed_backoff_policy.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/thread/timed_backoff_policy.header.verify.cpp
deleted file mode 100644
index 182edf2ed665a..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/thread/timed_backoff_policy.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__thread/timed_backoff_policy.h>
-// expected-error at -1 {{header '<__thread/timed_backoff_policy.h>' is an implementation detail; #include '<thread>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/tuple.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/tuple.header.verify.cpp
deleted file mode 100644
index 215ff6ec0faa6..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/tuple.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__tuple>
-// expected-error at -1 {{header '<__tuple>' is an implementation detail; #include either '<tuple>' or '<utility>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/as_const.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/as_const.header.verify.cpp
deleted file mode 100644
index 283bdf561e0b9..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/as_const.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__utility/as_const.h>
-// expected-error at -1 {{header '<__utility/as_const.h>' is an implementation detail; #include '<utility>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/auto_cast.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/auto_cast.header.verify.cpp
deleted file mode 100644
index 5620a9a782ac6..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/auto_cast.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__utility/auto_cast.h>
-// expected-error at -1 {{header '<__utility/auto_cast.h>' is an implementation detail; #include '<utility>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/cmp.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/cmp.header.verify.cpp
deleted file mode 100644
index 5509436115d18..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/cmp.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__utility/cmp.h>
-// expected-error at -1 {{header '<__utility/cmp.h>' is an implementation detail; #include '<utility>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/declval.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/declval.header.verify.cpp
deleted file mode 100644
index 249e973b20107..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/declval.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__utility/declval.h>
-// expected-error at -1 {{header '<__utility/declval.h>' is an implementation detail; #include '<utility>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/exchange.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/exchange.header.verify.cpp
deleted file mode 100644
index bde39c2855b4a..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/exchange.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__utility/exchange.h>
-// expected-error at -1 {{header '<__utility/exchange.h>' is an implementation detail; #include '<utility>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/forward.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/forward.header.verify.cpp
deleted file mode 100644
index 0df29f16dd63b..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/forward.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__utility/forward.h>
-// expected-error at -1 {{header '<__utility/forward.h>' is an implementation detail; #include '<utility>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/in_place.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/in_place.header.verify.cpp
deleted file mode 100644
index 04a2023352b18..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/in_place.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__utility/in_place.h>
-// expected-error at -1 {{header '<__utility/in_place.h>' is an implementation detail; #include '<utility>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/integer_sequence.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/integer_sequence.header.verify.cpp
deleted file mode 100644
index 98af96aa12a2e..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/integer_sequence.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__utility/integer_sequence.h>
-// expected-error at -1 {{header '<__utility/integer_sequence.h>' is an implementation detail; #include '<utility>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/move.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/move.header.verify.cpp
deleted file mode 100644
index e444233ad9e0b..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/move.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__utility/move.h>
-// expected-error at -1 {{header '<__utility/move.h>' is an implementation detail; #include '<utility>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/pair.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/pair.header.verify.cpp
deleted file mode 100644
index 686eb5a3c9fcf..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/pair.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__utility/pair.h>
-// expected-error at -1 {{header '<__utility/pair.h>' is an implementation detail; #include '<utility>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/piecewise_construct.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/piecewise_construct.header.verify.cpp
deleted file mode 100644
index e10484b8a7ec3..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/piecewise_construct.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__utility/piecewise_construct.h>
-// expected-error at -1 {{header '<__utility/piecewise_construct.h>' is an implementation detail; #include '<utility>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/priority_tag.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/priority_tag.header.verify.cpp
deleted file mode 100644
index 444c548b4f5e3..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/priority_tag.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__utility/priority_tag.h>
-// expected-error at -1 {{header '<__utility/priority_tag.h>' is an implementation detail; #include '<utility>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/rel_ops.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/rel_ops.header.verify.cpp
deleted file mode 100644
index ce60351cf7d7c..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/rel_ops.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__utility/rel_ops.h>
-// expected-error at -1 {{header '<__utility/rel_ops.h>' is an implementation detail; #include '<utility>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/swap.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/swap.header.verify.cpp
deleted file mode 100644
index 0067fe1041cfa..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/swap.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__utility/swap.h>
-// expected-error at -1 {{header '<__utility/swap.h>' is an implementation detail; #include '<utility>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/to_underlying.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/to_underlying.header.verify.cpp
deleted file mode 100644
index 451f9cd7d4919..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/to_underlying.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__utility/to_underlying.h>
-// expected-error at -1 {{header '<__utility/to_underlying.h>' is an implementation detail; #include '<utility>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/transaction.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/transaction.header.verify.cpp
deleted file mode 100644
index 7e5a84ea011a1..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/transaction.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__utility/transaction.h>
-// expected-error at -1 {{header '<__utility/transaction.h>' is an implementation detail; #include '<utility>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/utility/unreachable.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/utility/unreachable.header.verify.cpp
deleted file mode 100644
index bc31bde4d9af9..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/utility/unreachable.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__utility/unreachable.h>
-// expected-error at -1 {{header '<__utility/unreachable.h>' is an implementation detail; #include '<utility>' instead}}

diff  --git a/libcxx/test/libcxx/diagnostics/detail.headers/variant/monostate.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/variant/monostate.header.verify.cpp
deleted file mode 100644
index 3fbf9e1671650..0000000000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/variant/monostate.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by 'generate_private_header_tests.py'
-// and should not be edited manually.
-
-#include <__variant/monostate.h>
-// expected-error at -1 {{header '<__variant/monostate.h>' is an implementation detail; #include '<variant>' instead}}

diff  --git a/libcxx/test/libcxx/lint/lint_headers.sh.py b/libcxx/test/libcxx/lint/lint_headers.sh.py
index 5f3f128c02b75..94adac3b163e3 100644
--- a/libcxx/test/libcxx/lint/lint_headers.sh.py
+++ b/libcxx/test/libcxx/lint/lint_headers.sh.py
@@ -26,26 +26,6 @@ def check_for_pragma_GCC_system_header(pretty_fname, lines):
             return False
     return True
 
-def check_for_pragma_clang_include_instead(pretty_fname, lines):
-    expect_include_instead = pretty_fname.startswith('__') and pretty_fname not in [
-        '__assert',
-        '__bsd_locale_fallbacks.h',
-        '__bsd_locale_defaults.h',
-        '__availability',
-        '__debug',
-        '__errc',
-        '__mbstate_t.h',
-        '__undef_macros',
-    ]
-    found_include_instead = any(line.startswith('#  pragma clang include_instead') for line in lines)
-    if expect_include_instead and not found_include_instead:
-        print('FAILED TO FIND #  pragma clang include_instead in libcxx/include/%s!' % pretty_fname)
-        return False
-    elif found_include_instead and not expect_include_instead:
-        print('UNEXPECTEDLY FOUND #  pragma clang include_instead in libcxx/include/%s!' % pretty_fname)
-        return False
-    return True
-
 
 if __name__ == '__main__':
     libcxx_test_libcxx_lint = os.path.dirname(os.path.abspath(__file__))
@@ -69,6 +49,5 @@ def pretty(path):
             lines = f.readlines()
 
         okay = check_for_pragma_GCC_system_header(pretty_fname, lines) and okay
-        okay = check_for_pragma_clang_include_instead(pretty_fname, lines) and okay
 
     assert okay

diff  --git a/libcxx/utils/generate_private_header_tests.py b/libcxx/utils/generate_private_header_tests.py
index 075dcfcabc1c5..810657ea4f418 100755
--- a/libcxx/utils/generate_private_header_tests.py
+++ b/libcxx/utils/generate_private_header_tests.py
@@ -25,32 +25,7 @@ def get_libcxx_paths():
 script_name, include_path, detail_header_test_root = get_libcxx_paths()
 
 
-def generate_header_test(header, include_instead):
-    return f'''
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER
-
-// WARNING: This test was generated by '{script_name}'
-// and should not be edited manually.
-
-#include <{header}>
-// expected-error at -1 {{{{header '<{header}>' is an implementation detail; #include {include_instead} instead}}}}
-'''[1:]
-
-
-def generate_module_test(header):
+def generate_test(header):
     return f'''
 //===----------------------------------------------------------------------===//
 //
@@ -83,35 +58,6 @@ def is_still_public(path):
     ]
 
 
-def find_header_name(header, directory):
-    """Returns part of the diagnostic for `#pragma clang include_instead`. This
-     usually matches the subdirectory the header lives in (e.g. a header in
-     `__algorithm` will return "'<algorithm>'"), but some headers are
-     special-cased.
-    """
-
-    # Most of the special-cased headers are in the top-level include directory
-    # (and don't have a point of reference for us to hook on to), but any
-    # sub-level header that is exported by multiple top-level headers (e.g.
-    # __compare/compare_three_way.h) is also included in this module map, as the
-    # diagnostic needs to include more than our simple heuristic.
-    header_map = {
-        'bit_reference':     "either '<bitset>' or '<vector>'",
-        'bits':              "one of {'<algorithm>', '<bit>', '<bitset>', '<numeric>', '<random>', '<unordered_map>', '<unordered_set>', '<vector>'}",
-        'hash_table':        "either '<unordered_map>' or '<unordered_set>'",
-        'locale':            "'<locale>'",
-        'mutex_base':        "either '<mutex>' or '<shared_mutex>'",
-        'node_handle':       "one of {'<map>', '<set>', '<unordered_map>', '<unordered_set>'}",
-        'split_buffer':      "either '<vector>' or '<deque>'",
-        'std_stream':        "'<streambuf>'",
-        'string':            "'<string>'",
-        'threading_support': "one of {'<atomic>', '<mutex>', '<semaphore>', '<thread>'}",
-        'tree':              "either '<map>' or '<set>'",
-        'tuple':             "either '<tuple>' or '<utility>'",
-    }
-    return header_map[header] if header in header_map else f"'<{directory[:-1]}>'"
-
-
 def main():
     paths = [
         relative_path(p) for p in Path(include_path).rglob('*')
@@ -122,18 +68,11 @@ def main():
         path_with_subdir = re.search(r'__(\w+)/(\w+)', path)
         directory = path_with_subdir.group(1) + '/' if path_with_subdir else ""
         file = path_with_subdir.group(2) if path_with_subdir else path[2:]
+        path_to_write = f'{detail_header_test_root}/{directory}{file}.module.verify.cpp'
         Path(f'{detail_header_test_root}/{directory}').mkdir(exist_ok=True)
         assert os.path.exists(f'{detail_header_test_root}/{directory}')
-
-        path_to_write = f'{detail_header_test_root}/{directory}{file}.header.verify.cpp'
-        include_instead = find_header_name(file, directory)
-        if include_instead != "'<>'":
-            with open(path_to_write, 'w') as f:
-                f.write(generate_header_test(path, include_instead))
-
-        path_to_write = f'{detail_header_test_root}/{directory}{file}.module.verify.cpp'
         with open(path_to_write, 'w') as f:
-            f.write(generate_module_test(path))
+            f.write(generate_test(path))
 
 
 if __name__ == '__main__':

diff  --git a/libcxxabi/include/threading_support.h b/libcxxabi/include/threading_support.h
deleted file mode 100644
index 3e533f91ee7f4..0000000000000
--- a/libcxxabi/include/threading_support.h
+++ /dev/null
@@ -1,14 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#ifndef _LIBCXXABI_THREADING_SUPPORT_H
-#define _LIBCXXABI_THREADING_SUPPORT_H
-
-#pragma GCC system_header
-#include <__threading_support>
-
-#endif // _LIBCXXABI_THREADING_SUPPORT_H

diff  --git a/libcxxabi/src/cxa_exception_storage.cpp b/libcxxabi/src/cxa_exception_storage.cpp
index ce44c3a176a41..3a3233a1b9272 100644
--- a/libcxxabi/src/cxa_exception_storage.cpp
+++ b/libcxxabi/src/cxa_exception_storage.cpp
@@ -12,7 +12,7 @@
 
 #include "cxa_exception.h"
 
-#include "threading_support.h"
+#include <__threading_support>
 
 #if defined(_LIBCXXABI_HAS_NO_THREADS)
 

diff  --git a/libcxxabi/src/cxa_guard_impl.h b/libcxxabi/src/cxa_guard_impl.h
index b3c32028dc5a0..72940cc7e869a 100644
--- a/libcxxabi/src/cxa_guard_impl.h
+++ b/libcxxabi/src/cxa_guard_impl.h
@@ -56,7 +56,7 @@
 
 #include <limits.h>
 #include <stdlib.h>
-#include "threading_support.h"
+#include <__threading_support>
 #ifndef _LIBCXXABI_HAS_NO_THREADS
 #  if defined(__ELF__) && defined(_LIBCXXABI_LINK_PTHREAD_LIB)
 #    pragma comment(lib, "pthread")

diff  --git a/libcxxabi/src/cxa_thread_atexit.cpp b/libcxxabi/src/cxa_thread_atexit.cpp
index 1a04dddb34be7..665f9e55694ab 100644
--- a/libcxxabi/src/cxa_thread_atexit.cpp
+++ b/libcxxabi/src/cxa_thread_atexit.cpp
@@ -8,7 +8,7 @@
 
 #include "abort_message.h"
 #include "cxxabi.h"
-#include "threading_support.h"
+#include <__threading_support>
 #ifndef _LIBCXXABI_HAS_NO_THREADS
 #if defined(__ELF__) && defined(_LIBCXXABI_LINK_PTHREAD_LIB)
 #pragma comment(lib, "pthread")

diff  --git a/libcxxabi/src/fallback_malloc.cpp b/libcxxabi/src/fallback_malloc.cpp
index 9db431ee8297a..1d6c3808b2174 100644
--- a/libcxxabi/src/fallback_malloc.cpp
+++ b/libcxxabi/src/fallback_malloc.cpp
@@ -8,7 +8,7 @@
 
 #include "fallback_malloc.h"
 
-#include "threading_support.h"
+#include <__threading_support>
 #ifndef _LIBCXXABI_HAS_NO_THREADS
 #if defined(__ELF__) && defined(_LIBCXXABI_LINK_PTHREAD_LIB)
 #pragma comment(lib, "pthread")

diff  --git a/libcxxabi/test/test_exception_storage.pass.cpp b/libcxxabi/test/test_exception_storage.pass.cpp
index 4f1121bc7f39b..934cc4b6a7cba 100644
--- a/libcxxabi/test/test_exception_storage.pass.cpp
+++ b/libcxxabi/test/test_exception_storage.pass.cpp
@@ -9,7 +9,7 @@
 #include <algorithm>
 #include <cstdio>
 #include <cstdlib>
-#include "threading_support.h"
+#include <__threading_support>
 #include <unistd.h>
 
 #include "../src/cxa_exception.h"

diff  --git a/libcxxabi/test/test_fallback_malloc.pass.cpp b/libcxxabi/test/test_fallback_malloc.pass.cpp
index 886b9a5f895ad..cc59129bf6608 100644
--- a/libcxxabi/test/test_fallback_malloc.pass.cpp
+++ b/libcxxabi/test/test_fallback_malloc.pass.cpp
@@ -9,7 +9,7 @@
 #include <cstdio>
 #include <deque>
 
-#include "threading_support.h"
+#include <__threading_support>
 
 typedef std::deque<void *> container;
 


        
