aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libcxx/cmake/Modules/HandleLibCXXABI.cmake2
-rw-r--r--libcxx/include/__algorithm/adjacent_find.h1
-rw-r--r--libcxx/include/__algorithm/all_of.h1
-rw-r--r--libcxx/include/__algorithm/any_of.h1
-rw-r--r--libcxx/include/__algorithm/binary_search.h1
-rw-r--r--libcxx/include/__algorithm/clamp.h1
-rw-r--r--libcxx/include/__algorithm/comp.h1
-rw-r--r--libcxx/include/__algorithm/comp_ref_type.h1
-rw-r--r--libcxx/include/__algorithm/copy.h1
-rw-r--r--libcxx/include/__algorithm/copy_backward.h1
-rw-r--r--libcxx/include/__algorithm/copy_if.h1
-rw-r--r--libcxx/include/__algorithm/copy_n.h1
-rw-r--r--libcxx/include/__algorithm/count.h1
-rw-r--r--libcxx/include/__algorithm/count_if.h1
-rw-r--r--libcxx/include/__algorithm/equal.h1
-rw-r--r--libcxx/include/__algorithm/equal_range.h1
-rw-r--r--libcxx/include/__algorithm/fill.h1
-rw-r--r--libcxx/include/__algorithm/fill_n.h1
-rw-r--r--libcxx/include/__algorithm/find.h1
-rw-r--r--libcxx/include/__algorithm/find_end.h1
-rw-r--r--libcxx/include/__algorithm/find_first_of.h1
-rw-r--r--libcxx/include/__algorithm/find_if.h1
-rw-r--r--libcxx/include/__algorithm/find_if_not.h1
-rw-r--r--libcxx/include/__algorithm/for_each.h1
-rw-r--r--libcxx/include/__algorithm/for_each_n.h1
-rw-r--r--libcxx/include/__algorithm/generate.h1
-rw-r--r--libcxx/include/__algorithm/generate_n.h1
-rw-r--r--libcxx/include/__algorithm/half_positive.h1
-rw-r--r--libcxx/include/__algorithm/in_found_result.h1
-rw-r--r--libcxx/include/__algorithm/in_fun_result.h1
-rw-r--r--libcxx/include/__algorithm/in_in_out_result.h1
-rw-r--r--libcxx/include/__algorithm/in_in_result.h1
-rw-r--r--libcxx/include/__algorithm/in_out_out_result.h1
-rw-r--r--libcxx/include/__algorithm/in_out_result.h1
-rw-r--r--libcxx/include/__algorithm/includes.h1
-rw-r--r--libcxx/include/__algorithm/inplace_merge.h1
-rw-r--r--libcxx/include/__algorithm/is_heap.h1
-rw-r--r--libcxx/include/__algorithm/is_heap_until.h1
-rw-r--r--libcxx/include/__algorithm/is_partitioned.h1
-rw-r--r--libcxx/include/__algorithm/is_permutation.h1
-rw-r--r--libcxx/include/__algorithm/is_sorted.h1
-rw-r--r--libcxx/include/__algorithm/is_sorted_until.h1
-rw-r--r--libcxx/include/__algorithm/iter_swap.h1
-rw-r--r--libcxx/include/__algorithm/lexicographical_compare.h1
-rw-r--r--libcxx/include/__algorithm/lower_bound.h1
-rw-r--r--libcxx/include/__algorithm/make_heap.h1
-rw-r--r--libcxx/include/__algorithm/max.h1
-rw-r--r--libcxx/include/__algorithm/max_element.h1
-rw-r--r--libcxx/include/__algorithm/merge.h1
-rw-r--r--libcxx/include/__algorithm/min.h1
-rw-r--r--libcxx/include/__algorithm/min_element.h1
-rw-r--r--libcxx/include/__algorithm/min_max_result.h1
-rw-r--r--libcxx/include/__algorithm/minmax.h1
-rw-r--r--libcxx/include/__algorithm/minmax_element.h1
-rw-r--r--libcxx/include/__algorithm/mismatch.h1
-rw-r--r--libcxx/include/__algorithm/move.h1
-rw-r--r--libcxx/include/__algorithm/move_backward.h1
-rw-r--r--libcxx/include/__algorithm/next_permutation.h1
-rw-r--r--libcxx/include/__algorithm/none_of.h1
-rw-r--r--libcxx/include/__algorithm/nth_element.h1
-rw-r--r--libcxx/include/__algorithm/partial_sort.h1
-rw-r--r--libcxx/include/__algorithm/partial_sort_copy.h1
-rw-r--r--libcxx/include/__algorithm/partition.h1
-rw-r--r--libcxx/include/__algorithm/partition_copy.h1
-rw-r--r--libcxx/include/__algorithm/partition_point.h1
-rw-r--r--libcxx/include/__algorithm/pop_heap.h1
-rw-r--r--libcxx/include/__algorithm/prev_permutation.h1
-rw-r--r--libcxx/include/__algorithm/push_heap.h1
-rw-r--r--libcxx/include/__algorithm/ranges_min_element.h1
-rw-r--r--libcxx/include/__algorithm/ranges_swap_ranges.h1
-rw-r--r--libcxx/include/__algorithm/remove.h1
-rw-r--r--libcxx/include/__algorithm/remove_copy.h1
-rw-r--r--libcxx/include/__algorithm/remove_copy_if.h1
-rw-r--r--libcxx/include/__algorithm/remove_if.h1
-rw-r--r--libcxx/include/__algorithm/replace.h1
-rw-r--r--libcxx/include/__algorithm/replace_copy.h1
-rw-r--r--libcxx/include/__algorithm/replace_copy_if.h1
-rw-r--r--libcxx/include/__algorithm/replace_if.h1
-rw-r--r--libcxx/include/__algorithm/reverse.h1
-rw-r--r--libcxx/include/__algorithm/reverse_copy.h1
-rw-r--r--libcxx/include/__algorithm/rotate.h1
-rw-r--r--libcxx/include/__algorithm/rotate_copy.h1
-rw-r--r--libcxx/include/__algorithm/sample.h1
-rw-r--r--libcxx/include/__algorithm/search.h1
-rw-r--r--libcxx/include/__algorithm/search_n.h1
-rw-r--r--libcxx/include/__algorithm/set_difference.h1
-rw-r--r--libcxx/include/__algorithm/set_intersection.h1
-rw-r--r--libcxx/include/__algorithm/set_symmetric_difference.h1
-rw-r--r--libcxx/include/__algorithm/set_union.h1
-rw-r--r--libcxx/include/__algorithm/shift_left.h1
-rw-r--r--libcxx/include/__algorithm/shift_right.h1
-rw-r--r--libcxx/include/__algorithm/shuffle.h1
-rw-r--r--libcxx/include/__algorithm/sift_down.h1
-rw-r--r--libcxx/include/__algorithm/sort.h1
-rw-r--r--libcxx/include/__algorithm/sort_heap.h1
-rw-r--r--libcxx/include/__algorithm/stable_partition.h1
-rw-r--r--libcxx/include/__algorithm/stable_sort.h1
-rw-r--r--libcxx/include/__algorithm/swap_ranges.h1
-rw-r--r--libcxx/include/__algorithm/transform.h1
-rw-r--r--libcxx/include/__algorithm/unique.h1
-rw-r--r--libcxx/include/__algorithm/unique_copy.h1
-rw-r--r--libcxx/include/__algorithm/unwrap_iter.h1
-rw-r--r--libcxx/include/__algorithm/upper_bound.h1
-rw-r--r--libcxx/include/__bit/bit_cast.h1
-rw-r--r--libcxx/include/__bit/byteswap.h1
-rw-r--r--libcxx/include/__bit_reference2
-rw-r--r--libcxx/include/__bits8
-rw-r--r--libcxx/include/__charconv/chars_format.h1
-rw-r--r--libcxx/include/__charconv/from_chars_result.h1
-rw-r--r--libcxx/include/__charconv/to_chars_result.h1
-rw-r--r--libcxx/include/__chrono/calendar.h1
-rw-r--r--libcxx/include/__chrono/convert_to_timespec.h1
-rw-r--r--libcxx/include/__chrono/duration.h1
-rw-r--r--libcxx/include/__chrono/file_clock.h1
-rw-r--r--libcxx/include/__chrono/high_resolution_clock.h1
-rw-r--r--libcxx/include/__chrono/steady_clock.h1
-rw-r--r--libcxx/include/__chrono/system_clock.h1
-rw-r--r--libcxx/include/__chrono/time_point.h1
-rw-r--r--libcxx/include/__compare/common_comparison_category.h1
-rw-r--r--libcxx/include/__compare/compare_partial_order_fallback.h1
-rw-r--r--libcxx/include/__compare/compare_strong_order_fallback.h1
-rw-r--r--libcxx/include/__compare/compare_three_way.h1
-rw-r--r--libcxx/include/__compare/compare_three_way_result.h1
-rw-r--r--libcxx/include/__compare/compare_weak_order_fallback.h1
-rw-r--r--libcxx/include/__compare/is_eq.h1
-rw-r--r--libcxx/include/__compare/ordering.h1
-rw-r--r--libcxx/include/__compare/partial_order.h1
-rw-r--r--libcxx/include/__compare/strong_order.h1
-rw-r--r--libcxx/include/__compare/synth_three_way.h1
-rw-r--r--libcxx/include/__compare/three_way_comparable.h1
-rw-r--r--libcxx/include/__compare/weak_order.h1
-rw-r--r--libcxx/include/__concepts/arithmetic.h1
-rw-r--r--libcxx/include/__concepts/assignable.h1
-rw-r--r--libcxx/include/__concepts/boolean_testable.h1
-rw-r--r--libcxx/include/__concepts/class_or_enum.h1
-rw-r--r--libcxx/include/__concepts/common_reference_with.h1
-rw-r--r--libcxx/include/__concepts/common_with.h1
-rw-r--r--libcxx/include/__concepts/constructible.h1
-rw-r--r--libcxx/include/__concepts/convertible_to.h1
-rw-r--r--libcxx/include/__concepts/copyable.h1
-rw-r--r--libcxx/include/__concepts/derived_from.h1
-rw-r--r--libcxx/include/__concepts/destructible.h1
-rw-r--r--libcxx/include/__concepts/different_from.h1
-rw-r--r--libcxx/include/__concepts/equality_comparable.h1
-rw-r--r--libcxx/include/__concepts/invocable.h1
-rw-r--r--libcxx/include/__concepts/movable.h1
-rw-r--r--libcxx/include/__concepts/predicate.h1
-rw-r--r--libcxx/include/__concepts/regular.h1
-rw-r--r--libcxx/include/__concepts/relation.h1
-rw-r--r--libcxx/include/__concepts/same_as.h1
-rw-r--r--libcxx/include/__concepts/semiregular.h1
-rw-r--r--libcxx/include/__concepts/swappable.h1
-rw-r--r--libcxx/include/__concepts/totally_ordered.h1
-rw-r--r--libcxx/include/__coroutine/coroutine_handle.h1
-rw-r--r--libcxx/include/__coroutine/coroutine_traits.h1
-rw-r--r--libcxx/include/__coroutine/noop_coroutine_handle.h1
-rw-r--r--libcxx/include/__coroutine/trivial_awaitables.h1
-rw-r--r--libcxx/include/__filesystem/copy_options.h1
-rw-r--r--libcxx/include/__filesystem/directory_entry.h1
-rw-r--r--libcxx/include/__filesystem/directory_iterator.h1
-rw-r--r--libcxx/include/__filesystem/directory_options.h1
-rw-r--r--libcxx/include/__filesystem/file_status.h1
-rw-r--r--libcxx/include/__filesystem/file_time_type.h1
-rw-r--r--libcxx/include/__filesystem/file_type.h1
-rw-r--r--libcxx/include/__filesystem/filesystem_error.h1
-rw-r--r--libcxx/include/__filesystem/operations.h1
-rw-r--r--libcxx/include/__filesystem/path.h1
-rw-r--r--libcxx/include/__filesystem/path_iterator.h1
-rw-r--r--libcxx/include/__filesystem/perm_options.h1
-rw-r--r--libcxx/include/__filesystem/perms.h1
-rw-r--r--libcxx/include/__filesystem/recursive_directory_iterator.h1
-rw-r--r--libcxx/include/__filesystem/space_info.h1
-rw-r--r--libcxx/include/__filesystem/u8path.h1
-rw-r--r--libcxx/include/__format/format_arg.h1
-rw-r--r--libcxx/include/__format/format_args.h1
-rw-r--r--libcxx/include/__format/format_context.h1
-rw-r--r--libcxx/include/__format/format_error.h1
-rw-r--r--libcxx/include/__format/format_fwd.h1
-rw-r--r--libcxx/include/__format/format_parse_context.h1
-rw-r--r--libcxx/include/__format/format_string.h1
-rw-r--r--libcxx/include/__format/format_to_n_result.h1
-rw-r--r--libcxx/include/__format/formatter.h1
-rw-r--r--libcxx/include/__format/formatter_bool.h1
-rw-r--r--libcxx/include/__format/formatter_char.h1
-rw-r--r--libcxx/include/__format/formatter_floating_point.h1
-rw-r--r--libcxx/include/__format/formatter_integer.h1
-rw-r--r--libcxx/include/__format/formatter_integral.h1
-rw-r--r--libcxx/include/__format/formatter_pointer.h1
-rw-r--r--libcxx/include/__format/formatter_string.h1
-rw-r--r--libcxx/include/__format/parser_std_format_spec.h1
-rw-r--r--libcxx/include/__functional/binary_function.h1
-rw-r--r--libcxx/include/__functional/binary_negate.h1
-rw-r--r--libcxx/include/__functional/bind.h1
-rw-r--r--libcxx/include/__functional/bind_back.h1
-rw-r--r--libcxx/include/__functional/bind_front.h1
-rw-r--r--libcxx/include/__functional/binder1st.h1
-rw-r--r--libcxx/include/__functional/binder2nd.h1
-rw-r--r--libcxx/include/__functional/compose.h1
-rw-r--r--libcxx/include/__functional/default_searcher.h1
-rw-r--r--libcxx/include/__functional/function.h1
-rw-r--r--libcxx/include/__functional/hash.h1
-rw-r--r--libcxx/include/__functional/identity.h1
-rw-r--r--libcxx/include/__functional/invoke.h1
-rw-r--r--libcxx/include/__functional/is_transparent.h1
-rw-r--r--libcxx/include/__functional/mem_fn.h1
-rw-r--r--libcxx/include/__functional/mem_fun_ref.h1
-rw-r--r--libcxx/include/__functional/not_fn.h1
-rw-r--r--libcxx/include/__functional/operations.h1
-rw-r--r--libcxx/include/__functional/perfect_forward.h1
-rw-r--r--libcxx/include/__functional/pointer_to_binary_function.h1
-rw-r--r--libcxx/include/__functional/pointer_to_unary_function.h1
-rw-r--r--libcxx/include/__functional/ranges_operations.h1
-rw-r--r--libcxx/include/__functional/reference_wrapper.h1
-rw-r--r--libcxx/include/__functional/unary_function.h1
-rw-r--r--libcxx/include/__functional/unary_negate.h1
-rw-r--r--libcxx/include/__functional/unwrap_ref.h1
-rw-r--r--libcxx/include/__functional/weak_result_type.h1
-rw-r--r--libcxx/include/__hash_table2
-rw-r--r--libcxx/include/__ios/fpos.h1
-rw-r--r--libcxx/include/__iterator/access.h1
-rw-r--r--libcxx/include/__iterator/advance.h1
-rw-r--r--libcxx/include/__iterator/back_insert_iterator.h1
-rw-r--r--libcxx/include/__iterator/common_iterator.h1
-rw-r--r--libcxx/include/__iterator/concepts.h1
-rw-r--r--libcxx/include/__iterator/counted_iterator.h1
-rw-r--r--libcxx/include/__iterator/data.h1
-rw-r--r--libcxx/include/__iterator/default_sentinel.h1
-rw-r--r--libcxx/include/__iterator/distance.h1
-rw-r--r--libcxx/include/__iterator/empty.h1
-rw-r--r--libcxx/include/__iterator/erase_if_container.h1
-rw-r--r--libcxx/include/__iterator/front_insert_iterator.h1
-rw-r--r--libcxx/include/__iterator/incrementable_traits.h1
-rw-r--r--libcxx/include/__iterator/indirectly_comparable.h1
-rw-r--r--libcxx/include/__iterator/insert_iterator.h1
-rw-r--r--libcxx/include/__iterator/istream_iterator.h1
-rw-r--r--libcxx/include/__iterator/istreambuf_iterator.h1
-rw-r--r--libcxx/include/__iterator/iter_move.h1
-rw-r--r--libcxx/include/__iterator/iter_swap.h1
-rw-r--r--libcxx/include/__iterator/iterator.h1
-rw-r--r--libcxx/include/__iterator/iterator_traits.h1
-rw-r--r--libcxx/include/__iterator/mergeable.h1
-rw-r--r--libcxx/include/__iterator/move_iterator.h1
-rw-r--r--libcxx/include/__iterator/next.h1
-rw-r--r--libcxx/include/__iterator/ostream_iterator.h1
-rw-r--r--libcxx/include/__iterator/ostreambuf_iterator.h1
-rw-r--r--libcxx/include/__iterator/permutable.h1
-rw-r--r--libcxx/include/__iterator/prev.h1
-rw-r--r--libcxx/include/__iterator/projected.h1
-rw-r--r--libcxx/include/__iterator/readable_traits.h1
-rw-r--r--libcxx/include/__iterator/reverse_access.h1
-rw-r--r--libcxx/include/__iterator/reverse_iterator.h1
-rw-r--r--libcxx/include/__iterator/size.h1
-rw-r--r--libcxx/include/__iterator/sortable.h1
-rw-r--r--libcxx/include/__iterator/unreachable_sentinel.h1
-rw-r--r--libcxx/include/__iterator/wrap_iter.h1
-rw-r--r--libcxx/include/__locale1
-rw-r--r--libcxx/include/__memory/addressof.h1
-rw-r--r--libcxx/include/__memory/allocation_guard.h1
-rw-r--r--libcxx/include/__memory/allocator.h1
-rw-r--r--libcxx/include/__memory/allocator_arg_t.h1
-rw-r--r--libcxx/include/__memory/allocator_traits.h1
-rw-r--r--libcxx/include/__memory/auto_ptr.h1
-rw-r--r--libcxx/include/__memory/compressed_pair.h1
-rw-r--r--libcxx/include/__memory/concepts.h1
-rw-r--r--libcxx/include/__memory/construct_at.h1
-rw-r--r--libcxx/include/__memory/pointer_traits.h1
-rw-r--r--libcxx/include/__memory/ranges_construct_at.h1
-rw-r--r--libcxx/include/__memory/ranges_uninitialized_algorithms.h1
-rw-r--r--libcxx/include/__memory/raw_storage_iterator.h1
-rw-r--r--libcxx/include/__memory/shared_ptr.h1
-rw-r--r--libcxx/include/__memory/temporary_buffer.h1
-rw-r--r--libcxx/include/__memory/uninitialized_algorithms.h1
-rw-r--r--libcxx/include/__memory/unique_ptr.h1
-rw-r--r--libcxx/include/__memory/uses_allocator.h1
-rw-r--r--libcxx/include/__memory/voidify.h1
-rw-r--r--libcxx/include/__mutex_base2
-rw-r--r--libcxx/include/__node_handle4
-rw-r--r--libcxx/include/__numeric/accumulate.h1
-rw-r--r--libcxx/include/__numeric/adjacent_difference.h1
-rw-r--r--libcxx/include/__numeric/exclusive_scan.h1
-rw-r--r--libcxx/include/__numeric/gcd_lcm.h1
-rw-r--r--libcxx/include/__numeric/inclusive_scan.h1
-rw-r--r--libcxx/include/__numeric/inner_product.h1
-rw-r--r--libcxx/include/__numeric/iota.h1
-rw-r--r--libcxx/include/__numeric/midpoint.h1
-rw-r--r--libcxx/include/__numeric/partial_sum.h1
-rw-r--r--libcxx/include/__numeric/reduce.h1
-rw-r--r--libcxx/include/__numeric/transform_exclusive_scan.h1
-rw-r--r--libcxx/include/__numeric/transform_inclusive_scan.h1
-rw-r--r--libcxx/include/__numeric/transform_reduce.h1
-rw-r--r--libcxx/include/__random/bernoulli_distribution.h1
-rw-r--r--libcxx/include/__random/binomial_distribution.h1
-rw-r--r--libcxx/include/__random/cauchy_distribution.h1
-rw-r--r--libcxx/include/__random/chi_squared_distribution.h1
-rw-r--r--libcxx/include/__random/clamp_to_integral.h1
-rw-r--r--libcxx/include/__random/default_random_engine.h1
-rw-r--r--libcxx/include/__random/discard_block_engine.h1
-rw-r--r--libcxx/include/__random/discrete_distribution.h1
-rw-r--r--libcxx/include/__random/exponential_distribution.h1
-rw-r--r--libcxx/include/__random/extreme_value_distribution.h1
-rw-r--r--libcxx/include/__random/fisher_f_distribution.h1
-rw-r--r--libcxx/include/__random/gamma_distribution.h1
-rw-r--r--libcxx/include/__random/generate_canonical.h1
-rw-r--r--libcxx/include/__random/geometric_distribution.h1
-rw-r--r--libcxx/include/__random/independent_bits_engine.h1
-rw-r--r--libcxx/include/__random/is_seed_sequence.h1
-rw-r--r--libcxx/include/__random/knuth_b.h1
-rw-r--r--libcxx/include/__random/linear_congruential_engine.h1
-rw-r--r--libcxx/include/__random/log2.h1
-rw-r--r--libcxx/include/__random/lognormal_distribution.h1
-rw-r--r--libcxx/include/__random/mersenne_twister_engine.h1
-rw-r--r--libcxx/include/__random/negative_binomial_distribution.h1
-rw-r--r--libcxx/include/__random/normal_distribution.h1
-rw-r--r--libcxx/include/__random/piecewise_constant_distribution.h1
-rw-r--r--libcxx/include/__random/piecewise_linear_distribution.h1
-rw-r--r--libcxx/include/__random/poisson_distribution.h1
-rw-r--r--libcxx/include/__random/random_device.h1
-rw-r--r--libcxx/include/__random/ranlux.h1
-rw-r--r--libcxx/include/__random/seed_seq.h1
-rw-r--r--libcxx/include/__random/shuffle_order_engine.h1
-rw-r--r--libcxx/include/__random/student_t_distribution.h1
-rw-r--r--libcxx/include/__random/subtract_with_carry_engine.h1
-rw-r--r--libcxx/include/__random/uniform_int_distribution.h1
-rw-r--r--libcxx/include/__random/uniform_random_bit_generator.h1
-rw-r--r--libcxx/include/__random/uniform_real_distribution.h1
-rw-r--r--libcxx/include/__random/weibull_distribution.h1
-rw-r--r--libcxx/include/__ranges/access.h1
-rw-r--r--libcxx/include/__ranges/all.h1
-rw-r--r--libcxx/include/__ranges/common_view.h1
-rw-r--r--libcxx/include/__ranges/concepts.h1
-rw-r--r--libcxx/include/__ranges/copyable_box.h1
-rw-r--r--libcxx/include/__ranges/counted.h1
-rw-r--r--libcxx/include/__ranges/dangling.h1
-rw-r--r--libcxx/include/__ranges/data.h1
-rw-r--r--libcxx/include/__ranges/drop_view.h1
-rw-r--r--libcxx/include/__ranges/empty.h1
-rw-r--r--libcxx/include/__ranges/empty_view.h1
-rw-r--r--libcxx/include/__ranges/enable_borrowed_range.h1
-rw-r--r--libcxx/include/__ranges/enable_view.h1
-rw-r--r--libcxx/include/__ranges/iota_view.h1
-rw-r--r--libcxx/include/__ranges/join_view.h1
-rw-r--r--libcxx/include/__ranges/non_propagating_cache.h1
-rw-r--r--libcxx/include/__ranges/owning_view.h1
-rw-r--r--libcxx/include/__ranges/range_adaptor.h1
-rw-r--r--libcxx/include/__ranges/rbegin.h1
-rw-r--r--libcxx/include/__ranges/ref_view.h1
-rw-r--r--libcxx/include/__ranges/rend.h1
-rw-r--r--libcxx/include/__ranges/reverse_view.h1
-rw-r--r--libcxx/include/__ranges/single_view.h1
-rw-r--r--libcxx/include/__ranges/size.h1
-rw-r--r--libcxx/include/__ranges/subrange.h1
-rw-r--r--libcxx/include/__ranges/take_view.h1
-rw-r--r--libcxx/include/__ranges/transform_view.h1
-rw-r--r--libcxx/include/__ranges/view_interface.h1
-rw-r--r--libcxx/include/__ranges/views.h1
-rw-r--r--libcxx/include/__split_buffer2
-rw-r--r--libcxx/include/__std_stream1
-rw-r--r--libcxx/include/__string1
-rw-r--r--libcxx/include/__thread/poll_with_backoff.h1
-rw-r--r--libcxx/include/__thread/timed_backoff_policy.h1
-rw-r--r--libcxx/include/__threading_support4
-rw-r--r--libcxx/include/__tree2
-rw-r--r--libcxx/include/__tuple2
-rw-r--r--libcxx/include/__utility/as_const.h1
-rw-r--r--libcxx/include/__utility/auto_cast.h1
-rw-r--r--libcxx/include/__utility/cmp.h1
-rw-r--r--libcxx/include/__utility/declval.h1
-rw-r--r--libcxx/include/__utility/exchange.h1
-rw-r--r--libcxx/include/__utility/forward.h1
-rw-r--r--libcxx/include/__utility/in_place.h1
-rw-r--r--libcxx/include/__utility/integer_sequence.h1
-rw-r--r--libcxx/include/__utility/move.h1
-rw-r--r--libcxx/include/__utility/pair.h1
-rw-r--r--libcxx/include/__utility/piecewise_construct.h1
-rw-r--r--libcxx/include/__utility/priority_tag.h1
-rw-r--r--libcxx/include/__utility/rel_ops.h1
-rw-r--r--libcxx/include/__utility/swap.h1
-rw-r--r--libcxx/include/__utility/to_underlying.h1
-rw-r--r--libcxx/include/__utility/transaction.h1
-rw-r--r--libcxx/include/__utility/unreachable.h1
-rw-r--r--libcxx/include/__variant/monostate.h1
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/adjacent_find.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/all_of.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/any_of.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/binary_search.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/clamp.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/comp.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/comp_ref_type.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_backward.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_if.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/copy_n.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/count.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/count_if.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/equal.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/equal_range.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/fill.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/fill_n.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_end.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_first_of.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_if.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/find_if_not.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/for_each.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/for_each_n.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/generate.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/generate_n.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/half_positive.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_found_result.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_fun_result.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_in_out_result.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_in_result.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_out_out_result.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/in_out_result.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/includes.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/inplace_merge.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_heap.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_heap_until.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_partitioned.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_permutation.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_sorted.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/is_sorted_until.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/iter_swap.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/lexicographical_compare.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/lower_bound.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/make_heap.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/max.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/max_element.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/merge.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min_element.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/min_max_result.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/minmax.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/minmax_element.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/mismatch.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/move.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/move_backward.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/next_permutation.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/none_of.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/nth_element.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partial_sort.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partial_sort_copy.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition_copy.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/partition_point.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/pop_heap.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/prev_permutation.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/push_heap.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/ranges_min_element.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/ranges_swap_ranges.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_copy.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_copy_if.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/remove_if.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_copy.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_copy_if.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/replace_if.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/reverse.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/reverse_copy.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/rotate.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/rotate_copy.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sample.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/search.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/search_n.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_difference.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_intersection.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_symmetric_difference.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_union.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shift_left.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shift_right.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/shuffle.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sift_down.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sort.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/sort_heap.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/stable_partition.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/stable_sort.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/swap_ranges.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/transform.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unique.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unique_copy.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/unwrap_iter.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/algorithm/upper_bound.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/bit/bit_cast.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/bit/byteswap.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/bit_reference.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/bits.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/charconv/chars_format.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/charconv/from_chars_result.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/charconv/to_chars_result.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/chrono/calendar.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/chrono/convert_to_timespec.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/chrono/duration.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/chrono/file_clock.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/chrono/high_resolution_clock.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/chrono/steady_clock.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/chrono/system_clock.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/chrono/time_point.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/compare/common_comparison_category.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_partial_order_fallback.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_strong_order_fallback.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_three_way.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_three_way_result.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/compare/compare_weak_order_fallback.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/compare/is_eq.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/compare/ordering.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/compare/partial_order.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/compare/strong_order.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/compare/synth_three_way.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/compare/three_way_comparable.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/compare/weak_order.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/concepts/arithmetic.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/concepts/assignable.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/concepts/boolean_testable.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/concepts/class_or_enum.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/concepts/common_reference_with.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/concepts/common_with.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/concepts/constructible.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/concepts/convertible_to.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/concepts/copyable.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/concepts/derived_from.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/concepts/destructible.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/concepts/different_from.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/concepts/equality_comparable.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/concepts/invocable.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/concepts/movable.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/concepts/predicate.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/concepts/regular.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/concepts/relation.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/concepts/same_as.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/concepts/semiregular.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/concepts/swappable.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/concepts/totally_ordered.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/coroutine/coroutine_handle.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/coroutine/coroutine_traits.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/coroutine/noop_coroutine_handle.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/coroutine/trivial_awaitables.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/filesystem/copy_options.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/filesystem/directory_entry.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/filesystem/directory_iterator.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/filesystem/directory_options.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/filesystem/file_status.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/filesystem/file_time_type.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/filesystem/file_type.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/filesystem/filesystem_error.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/filesystem/operations.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/filesystem/path.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/filesystem/path_iterator.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/filesystem/perm_options.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/filesystem/perms.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/filesystem/recursive_directory_iterator.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/filesystem/space_info.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/filesystem/u8path.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/format/format_arg.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/format/format_args.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/format/format_context.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/format/format_error.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/format/format_fwd.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/format/format_parse_context.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/format/format_string.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/format/format_to_n_result.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/format/formatter.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_bool.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_char.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_floating_point.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_integer.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_integral.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_pointer.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/format/formatter_string.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/format/parser_std_format_spec.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/binary_function.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/binary_negate.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/bind.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/bind_back.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/bind_front.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/binder1st.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/binder2nd.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/compose.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/default_searcher.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/function.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/hash.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/identity.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/invoke.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/is_transparent.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/mem_fn.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/mem_fun_ref.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/not_fn.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/operations.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/perfect_forward.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/pointer_to_binary_function.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/pointer_to_unary_function.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/ranges_operations.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/reference_wrapper.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/unary_function.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/unary_negate.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/unwrap_ref.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/functional/weak_result_type.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ios/fpos.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/access.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/advance.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/back_insert_iterator.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/common_iterator.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/concepts.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/counted_iterator.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/data.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/default_sentinel.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/distance.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/empty.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/erase_if_container.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/front_insert_iterator.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/incrementable_traits.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/indirectly_comparable.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/insert_iterator.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/istream_iterator.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/istreambuf_iterator.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/iter_move.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/iter_swap.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/iterator.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/iterator_traits.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/mergeable.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/move_iterator.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/next.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/ostream_iterator.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/ostreambuf_iterator.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/permutable.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/prev.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/projected.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/readable_traits.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/reverse_access.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/reverse_iterator.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/size.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/sortable.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/unreachable_sentinel.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/iterator/wrap_iter.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/locale.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/memory/addressof.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/memory/allocation_guard.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator_arg_t.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/memory/allocator_traits.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/memory/auto_ptr.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/memory/compressed_pair.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/memory/concepts.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/memory/construct_at.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/memory/pointer_traits.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/memory/ranges_construct_at.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/memory/ranges_uninitialized_algorithms.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/memory/raw_storage_iterator.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/memory/shared_ptr.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/memory/temporary_buffer.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/memory/uninitialized_algorithms.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/memory/unique_ptr.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/memory/uses_allocator.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/memory/voidify.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/mutex_base.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/node_handle.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/numeric/accumulate.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/numeric/adjacent_difference.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/numeric/exclusive_scan.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/numeric/gcd_lcm.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/numeric/inclusive_scan.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/numeric/inner_product.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/numeric/iota.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/numeric/midpoint.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/numeric/partial_sum.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/numeric/reduce.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/numeric/transform_exclusive_scan.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/numeric/transform_inclusive_scan.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/numeric/transform_reduce.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/bernoulli_distribution.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/binomial_distribution.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/cauchy_distribution.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/chi_squared_distribution.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/clamp_to_integral.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/default_random_engine.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/discard_block_engine.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/discrete_distribution.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/exponential_distribution.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/extreme_value_distribution.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/fisher_f_distribution.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/gamma_distribution.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/generate_canonical.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/geometric_distribution.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/independent_bits_engine.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/is_seed_sequence.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/knuth_b.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/linear_congruential_engine.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/log2.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/lognormal_distribution.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/mersenne_twister_engine.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/negative_binomial_distribution.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/normal_distribution.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/piecewise_constant_distribution.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/piecewise_linear_distribution.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/poisson_distribution.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/random_device.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/ranlux.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/seed_seq.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/shuffle_order_engine.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/student_t_distribution.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/subtract_with_carry_engine.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/uniform_int_distribution.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/uniform_random_bit_generator.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/uniform_real_distribution.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/random/weibull_distribution.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/access.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/all.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/common_view.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/concepts.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/copyable_box.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/counted.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/dangling.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/data.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/drop_view.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/empty.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/empty_view.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/enable_borrowed_range.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/enable_view.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/iota_view.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/join_view.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/non_propagating_cache.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/owning_view.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/range_adaptor.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/rbegin.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/ref_view.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/rend.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/reverse_view.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/single_view.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/size.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/subrange.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/take_view.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/transform_view.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/view_interface.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/ranges/views.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/split_buffer.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/std_stream.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/string.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/thread/poll_with_backoff.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/thread/timed_backoff_policy.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/tuple.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/utility/as_const.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/utility/auto_cast.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/utility/cmp.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/utility/declval.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/utility/exchange.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/utility/forward.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/utility/in_place.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/utility/integer_sequence.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/utility/move.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/utility/pair.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/utility/piecewise_construct.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/utility/priority_tag.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/utility/rel_ops.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/utility/swap.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/utility/to_underlying.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/utility/transaction.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/utility/unreachable.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/diagnostics/detail.headers/variant/monostate.header.verify.cpp20
-rw-r--r--libcxx/test/libcxx/lint/lint_headers.sh.py21
-rwxr-xr-xlibcxx/utils/generate_private_header_tests.py67
-rw-r--r--libcxxabi/include/threading_support.h14
-rw-r--r--libcxxabi/src/cxa_exception_storage.cpp2
-rw-r--r--libcxxabi/src/cxa_guard_impl.h2
-rw-r--r--libcxxabi/src/cxa_thread_atexit.cpp2
-rw-r--r--libcxxabi/src/fallback_malloc.cpp2
-rw-r--r--libcxxabi/test/test_exception_storage.pass.cpp2
-rw-r--r--libcxxabi/test/test_fallback_malloc.pass.cpp2
767 files changed, 10 insertions, 8045 deletions
diff --git a/libcxx/cmake/Modules/HandleLibCXXABI.cmake b/libcxx/cmake/Modules/HandleLibCXXABI.cmake
index 5b92ebb..d69405d 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 e892ff4..83d8c26 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 7b4a52c..3af32a5 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 193f9bd..6fe6a0b 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 60f91f2..15a17e1 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 79eab53..b3762b8 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 beb2b68..62c06ae5 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 70993d1..ed0ed59 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 7c0ccb7..b4045cd 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 cd21620..9754f0c 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 8960ce2..9c3cd29 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 93bcea6..8b915af 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 e29a84b..e18128c 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 b6432e9..1ec2d83 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 bfd3bf1..ca1bc6b 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 f4654a0..37a2c29 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 ecbdc50..be5b474 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 3a0aca7..590c8f3 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 b9ed3c8..641b85e 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 294f09e..0220c09 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 1d3f0e9..b968329 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 8fc59b5..aa98171 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 58fc6c3..61ddab0 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 4d869ea..bfbd37c 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 75245c3..2552b40 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 0b49f36..dacbd8c 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 0184c1f..2650e9e 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 a3d7e18..7666ef1 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 9cbcd31..08ebf2f 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 d971bc3..d5186e1 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 5b17226..f7cb698 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 0de12db..1590921 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 d429d4f..9788fbf 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 6edd15d..fd394a3 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 ec7d831..4c87e8d 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 d22c26d..90ca152 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 cf57ef1..fe44e63 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 f39cf9d..39f313e 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 849fdab..b4f421c 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 2a58dcf..cdd7420 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 b4bc21b..56de95b 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 c920073..338d285 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 8963325..038859e 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 26ae99d..30ddf24 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 6bac873..26b64ec 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 7e1b9a2..acac0aa 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 f41a29c..345b235 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 ce1dfae..795ec8e 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 82855fa..48360ed 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 7a092fe..3d8c73d 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 b8da52b..129833d 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 9d0226a..1d56a74 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 fddfcc6..30a1194 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 38e280d9..80afbdf 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 d919e14..f2011fa 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 7769225..72bf3d7 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 38d361d..a56f6b8 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 1ea0b0d..05e56f4 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 d9dbec0..b34b1e00 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 fb754fb..0f9f66d 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 9714e4f..8adf5b2f 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 5a11963..7ed1e53 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 d2ed4b4..73d9483 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 a53916e..cacde0b 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 24fd5d8..c2fa841 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 6680369..2a69f6e 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 2f127ea..9dbc1da 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 8ff6df4..66973e0 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 218cfce..82aaeea 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 b05bff2e..59a875a 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 88bf9b4..c00f96f 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 411723f..a29a385 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 0dbe6fd..36ddba4 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 5974643..0ae1314 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 3454403..d0ae8f6 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 f260c81..7c8a5a0 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 2dc6f6b..9d8a68f 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 c5a06f8..37c719a 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 1bde1b0..0202cd7 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 9db7379..1583907 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 61e5cf1..344c2f8 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 7dc29dc..ab569ef 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 e8b9ebf..5234961 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 6d1d77f..d89ec2b 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 5e563b5..4c083de6 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_difference.h b/libcxx/include/__algorithm/set_difference.h
index 23eae01..5e2dca2 100644
--- a/libcxx/include/__algorithm/set_difference.h
+++ b/libcxx/include/__algorithm/set_difference.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 563ee66..c4163fc 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_difference.h b/libcxx/include/__algorithm/set_symmetric_difference.h
index 1e0d325..2dbfb35 100644
--- a/libcxx/include/__algorithm/set_symmetric_difference.h
+++ b/libcxx/include/__algorithm/set_symmetric_difference.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 78ee9e2..0ec6b09 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 5171009..33f06d57 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 65d52d3..14bc761 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 123a6a7..647aa3f 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 b617153..b636da7 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 3159452..27ce647 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 9ab129a..3a63d74 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 9e13234b..1233cc1 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 8658069..33df6e8b 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 4d7844d..0422265 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 2983b71..f9db806 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 cb80ee3..264d727 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 4cb861d..f585177 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 bbadd53..e738cb2 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 a4963cf..cfa021e 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 589594b..fbb70b3 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 6bb1980..970074e 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 7c0f332..423acee 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 56508e1..1eee8f5 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 59e17df..0875079 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 e281567..2cc3c11 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 c0e3a9a..b4bc6ac 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 f9feab8..9e5642f 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 23c6415..e8631d1 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 1097412..f520759 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 f2bbdb3..b8e08e7 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 36c9d3f..778ff44 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 9827601..657e5ee 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 972da25..2922b78 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 3ac44e7..ac2d347 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 9538f3f..deab171 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 a403403..b1fd5e8 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 fdcd60a..9365a1e 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 5445afa..25563bb 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 bdcce13..7b03597 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 d72c1ee..160e45e 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 fcf9e6c..4964892 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 7913129..1d466d6 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 f3d8e63..ad29701 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 6e1e2858..49a6106 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 1d15342..f55edd4 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 7fdf9fe..f17382e 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 c02011f..725ac831 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 b9a1d2a..f86908c 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 7f28afc..4d8a230 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 222c35f..89f6620 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 e3c0f6f..729e444 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 a16a59b..bb5801a 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 f1661a6..2b7cb83 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 7d97490..f537108 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 2e5d8a6..6bf1922 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 bfde923..8d5f28a 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 12aa88b..b91ce13 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 54941fb..429e82e 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/different_from.h b/libcxx/include/__concepts/different_from.h
index fdeef642..f882205 100644
--- a/libcxx/include/__concepts/different_from.h
+++ b/libcxx/include/__concepts/different_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 86078026..36ac870 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 193e813..8a669f1 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 bb95690..53e36eb 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 5e11205..04cdd97 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 870b254..63c9fb3 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 2bfeacd..1d68755 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 12057a2..1337193 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 6654ae1..eac5ec2 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 dc185cf..866e9f7 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 853b490..5ede92a 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 d166601..4bf3237 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 1acca38..0a5229b 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 7ec0cb9..7a2c672 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 e09c0b2..31399ab 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 411cec2..2e03740 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 0684140..3db2445 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 8994427..87bbbfa 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 6a72146..d3f8cc1 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 5adcc33..ac3f6cb 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 7c4b025..7c4932e 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 24e5930..c756a05 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 0e76f39..e32b14c 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 2f92922..85c71f0 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 c353738..6b4b1ae 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 8be8101..6f2baf8 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 7484f750..f7580a2 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 3d6d1b9..0e5c7ed 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 e17c6f8..9536037 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 c220e50..d7dc03a 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 82dcf89..ee25521 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 7953903..5e1565b 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 84cb51b..2739d11 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 71d6c1c..d4bc35d 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 ee0cd9c..67ff41c 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 e590f5f..9421aa8 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 1110f0e..3147be8 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 b26fc48..32af660 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 11edcec..b973dc5 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 1ca4160..f9e0b6c 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 d4218ee..f428683 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 07d408a..f565135 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 557aeb7..aa32815 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 256ff8a..e6143a4 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 1657713..8360826 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 ce7af24..83d21e1 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 850cf2e..54aa121 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 1ec87ea..92c8986 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 74aa70e..51135ef 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 c085856..17c5c20 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 8a2d0b3..c352406 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 93cdecb..d64981a 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 f3f96ff..22fb3a6 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 8327010..13b2459 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 56a3b08..ff0f5f0 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 41a81f9..25213f2 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 4ad333d..05fb23d 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 ee51a07..4698c8c 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 029ba04..2b3b96e 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 1a181a3..646325a 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 cb38c0f..b4c3e76 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 f102bb5c..74326c76 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 36fef44..10967a8 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 9d61c4d..81f48e6 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 89f2d37..b5c415c 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 4824583..9df6d77 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 92811e0..9acaa7e 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 437b518..187e309 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 8984217..a0f98c1 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 e7afe67..b89d595 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 6fc8182..b7d2f87 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 aa091d3..af2a0b9 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 c09ec84..7ff1f6e 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 8367b5f..f720793 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 2799f0b..e1c553e 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 4ea55c7..36f2ef7 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 870cc8a..87f0135 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 fb5e881..7abd4c5 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 766adce..da6bf05 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 27df535..9a4b057 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 a1f0fc6..505e4f1 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 8f4d201..92ef781 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 76499ac..826d5de 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 6f7469c..88eb752 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 7734027..669032a 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 61e4157..78b8177 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 7b55ddd..748ca9e 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 d44d006..d7c71a9 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 b7b6bc3..69b2d32 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 2a66874..f36b417 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 b14ae7d..9002b21 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 dc260ab..aba197ec 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 d5241a9a..9ee0a98 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 3f2bb4f..3b16f79 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 3510773..4a89662 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 dec8ce7..291558f 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 e7f7436..b417eeab 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 58aef84..6ffb2ab 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 f8d1cf6..13db6c7 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 e8ba0a7..e157b71 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 c3b75ef..fae5989 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 fde1a7f..f6601b2 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 b21c78b..16ddb65 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 d823df6..85834a2 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 ebe0abc..5839621 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 4d025d7..2edbe0d 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 07cf17c..5bc59a8 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 98a3f05..40c2663 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 3af6939..90bc2d7 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 90f57dc..bf40207 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 3d10891..057e154 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 5aa5b55..b94ca53 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 e964cc5..d91a25e 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 cabc578..ad97be0 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 8377a8f..75e3dd0 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 4e7846d..424598c 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 9dbf616..915ff7c 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 bacea75..2d63b1f 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 bc5ce77..5215556c 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 1e97f67..163a46b 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 a2349bf..852031f 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 fe9ca2e..816c553 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 229cd50..8a7bf40 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 351f34d..f1e8070 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 90d3cad..3064f81 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 c025e4f..e036c18 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 fc15544..f25f7b1 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 451d74e..0f28bcd 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 56ac3b2..2c6e333 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 6115905..fc55b49 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 37f969f..348c903 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 705dbf1..05c500c 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 20249ed7..3a65c0e 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 ce1101c..da056b6 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 84da7eb..71309be6 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 bcb95c7..fa75987 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_difference.h b/libcxx/include/__numeric/adjacent_difference.h
index 0a47f3f..5c712ec 100644
--- a/libcxx/include/__numeric/adjacent_difference.h
+++ b/libcxx/include/__numeric/adjacent_difference.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 86d9c22..c0c89b3 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 b5d5499..9a53a00 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 bc523e5..a6b0050 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 aace2e8..6fe18bb 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 91eb23e..b30e0e0 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 d0db307..668030c 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 db882ea..9acee3a 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 830cff0..90e4d23 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 3ccd8da..45b3077 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 ff8c92f..b0d4ab5 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 6ec6149..da5a779 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 6e74887..cf01951 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 6447d3d..774f9d0 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 dead3a2..288118e 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 2dce18b..b98488c 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 2eef04f..7d44ff9 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 02d6079..89792f4 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 83ae20f..c58d66b 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 7e5a6b7..bd47b8b 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 f3ff78f..e51871d 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 c93f0cf..15cebd8 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 cf87058..72f1f40 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 784fc2c..a850496 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 8b0e7a8..84efa78 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 e565eb7..8e1be52 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 6e48d33..e80d6ee 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 244f564..a6832f5 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 70330fc..f5b31cb 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 18ce4cb..f5aba75 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 5fe4bbe..b077d21 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 bfecca0..048d7da 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 250aa50..8bceac0 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 3aff910..a4b96fb 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 6458d04..dc4de78 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 90b30ef..eec9b75 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 5841d4e..0d7591a 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 e2df27f..32f5223 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 811a5ba..e82b437 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 ba06750..e44cece 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 5746a8c..8640cd1 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 4a4715c..c2f76f6 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 5a9caea..dc38a8b3 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 0d21470..fdbe2d2 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 844ad5f..70cf698 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 97a75c8..99f2e6b 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 2ee5790..e112225 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 fe8ea37..85bae65 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 9a35d4e..2ebdab4 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 b606bd1..7739622 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 a63062a..7891128 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 4425273..709f3d8 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 615bd49..e1c08a7 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 0a98510..0a2d828 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 2b736e2..3a200ed 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 c297af2..dbb4767 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 c3f7953..079a74d 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 75c2241..c0b55b2 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 9675cba..6a087276 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 bca488e..b8f809b 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 8f6d9441..4b4b63a 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 119edd6..b7c099e 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 5716254..395e5c7 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 41bc714..d9589ae 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 6fddd3c..7987c60 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 cf7ec83..9c53488 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 3d4e422..20f5489 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 be46ed8..255a468 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 9795f66..4f1597e 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 9c736ea..b5de7e9 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 42e6fbe..e0fd484 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 7f832b6..2c5a96e 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 42e0697..c54f771 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 59eded0..b5f194f 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 a1dd1bd..4cc582f 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 6bc615a..eecc475 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 e89cd13..8cc5ba3 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 3b9c674..9565e16 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 07dd7e7..e419e8c 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 ca068f3..479893b 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 8532607..0bbafd1 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 fd0effb..28fe75d 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 b848282..4f1640a 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 d22d26c..384d383 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 361ded1..6d13bb2 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 47b7f8d..be7dd8c 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 65fa8cf..e907944 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 3d3a240..f36d53a 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 f8717da..97fd1eb 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 603b306..d9b3c15 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 467bfd6..6ee1f81 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 bc3d68f..7a4973f 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 a4046e5..633f133 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 a6f3626..7d1c8c2 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 9564ede..15532f6 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 e1d1576..3cc86fe 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 339e29b..e51ba6b 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 2084190..2577e94 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 f16d6cd..f9e7f36 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 24edd96..3428406 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 0d3e93b..87e51c0 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 071aef9..485edb2 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 f4e19d2..b389c3b5 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 53bcc2c..0000000
--- 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@-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 6ecaa5f..0000000
--- 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@-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 9bf78ce..0000000
--- 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@-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 c939e63..0000000
--- 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@-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 d8df757..0000000
--- 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@-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 19d6468..0000000
--- 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@-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 95608fa..0000000
--- 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@-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 dfad048..0000000
--- 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@-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 7d173e2..0000000
--- 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@-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 3506016..0000000
--- 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@-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 70896d0..0000000
--- 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@-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 c6dd298..0000000
--- 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@-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 0bb3590..0000000
--- 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@-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 e1b5fc3..0000000
--- 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@-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 665efcb..0000000
--- 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@-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 78a139e..0000000
--- 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@-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 c838b08..0000000
--- 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@-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 a057231..0000000
--- 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@-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 a638236..0000000
--- 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@-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 9c7b328..0000000
--- 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@-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 c3bc689..0000000
--- 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@-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 0713709..0000000
--- 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@-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 7419537..0000000
--- 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@-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 e34d411..0000000
--- 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@-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 3d5d0836..0000000
--- 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@-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 b0ece73..0000000
--- 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@-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 d074323..0000000
--- 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@-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 1c6a192..0000000
--- 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@-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 36fd0b0..0000000
--- 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@-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 288363e..0000000
--- 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@-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 251e0da..0000000
--- 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@-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 8ffe63e..0000000
--- 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@-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 b3dbe26..0000000
--- 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@-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 8bbb821..0000000
--- 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@-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 9f1c2da..0000000
--- 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@-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 9b4613a..0000000
--- 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@-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 7aeb1f4..0000000
--- 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@-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 5885b33..0000000
--- 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@-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 e88477f..0000000
--- 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@-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 8b993de..0000000
--- 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@-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 d7bddcb..0000000
--- 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@-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 977c27e..0000000
--- 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@-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 f3dfa04..0000000
--- 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@-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 afe3608..0000000
--- 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@-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 38e79a6..0000000
--- 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@-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 c95593a..0000000
--- 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@-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 532cbed..0000000
--- 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@-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 b709587..0000000
--- 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@-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 86a4416..0000000
--- 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@-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 ab7ac5f..0000000
--- 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@-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 d435b1e..0000000
--- 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@-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 69ee501..0000000
--- 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@-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 6669f8f..0000000
--- 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@-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 b448251..0000000
--- 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@-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 d44aa58..0000000
--- 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@-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 8bba267..0000000
--- 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@-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 7d17804..0000000
--- 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@-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 864fcd9..0000000
--- 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@-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 7da4a39..0000000
--- 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@-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 5ea114c..0000000
--- 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@-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 86cccf8..0000000
--- 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@-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 059af31e..0000000
--- 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@-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 cf1b8de..0000000
--- 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@-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 89d8366..0000000
--- 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@-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 dd1136c..0000000
--- 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@-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 30ad6c4..0000000
--- 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@-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 6c3dbca..0000000
--- 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@-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 bd001e3..0000000
--- 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@-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 75effec..0000000
--- 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@-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 28bd2ae..0000000
--- 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@-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 9295ee87..0000000
--- 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@-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 c459322..0000000
--- 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@-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 2686f21..0000000
--- 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@-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 1699ab2..0000000
--- 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@-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 71ec224..0000000
--- 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@-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 e1b0e31..0000000
--- 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@-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 6de2721..0000000
--- 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@-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 e3582c3..0000000
--- 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@-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 e5a8b1b..0000000
--- 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@-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 184cdfb..0000000
--- 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@-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 dfde904..0000000
--- 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@-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 05b151f..0000000
--- 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@-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 d3406b6..0000000
--- 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@-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 5f0f4d2..0000000
--- 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@-1 {{header '<__algorithm/search_n.h>' is an implementation detail; #include '<algorithm>' instead}}
diff --git a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_difference.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_difference.header.verify.cpp
deleted file mode 100644
index f431fbe..0000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_difference.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_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_difference.h>
-// expected-error@-1 {{header '<__algorithm/set_difference.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 f6a26a5..0000000
--- 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@-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_difference.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_symmetric_difference.header.verify.cpp
deleted file mode 100644
index 229c510..0000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/algorithm/set_symmetric_difference.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_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_difference.h>
-// expected-error@-1 {{header '<__algorithm/set_symmetric_difference.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 b35ab32..0000000
--- 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@-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 f2fecec..0000000
--- 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@-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 6bd216e..0000000
--- 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@-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 4c44073..0000000
--- 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@-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 18b904e..0000000
--- 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@-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 7534920..0000000
--- 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@-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 cfae00b..0000000
--- 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@-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 2f6e1da..0000000
--- 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@-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 b4ffe25..0000000
--- 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@-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 21e329b..0000000
--- 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@-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 70c9ba0..0000000
--- 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@-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 6515e2b..0000000
--- 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@-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 3a69cae..0000000
--- 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@-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 1ca3e44..0000000
--- 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@-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 0bb7cb1..0000000
--- 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@-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 eddf2385..0000000
--- 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@-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 7b3e5d2..0000000
--- 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@-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 0c933bf4..0000000
--- 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@-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 84da00e..0000000
--- 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@-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 2012abe..0000000
--- 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@-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 709bccd..0000000
--- 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@-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 0f33f6b5..0000000
--- 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@-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 6dd355d..0000000
--- 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@-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 3ef6638..0000000
--- 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@-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 86c9557..0000000
--- 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@-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 659e5be..0000000
--- 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@-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 c83012c..0000000
--- 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@-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 2410ab2..0000000
--- 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@-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 fb6a22c..0000000
--- 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@-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 8767066..0000000
--- 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@-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 95ee700..0000000
--- 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@-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 cf3722e..0000000
--- 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@-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 83454dd..0000000
--- 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@-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 9ae046d..0000000
--- 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@-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 0433bf1..0000000
--- 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@-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 b0905d3..0000000
--- 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@-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 498f908..0000000
--- 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@-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 630176a..0000000
--- 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@-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 d3e2ea3..0000000
--- 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@-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 191489c..0000000
--- 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@-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 39f5577..0000000
--- 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@-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 c8cd9ac..0000000
--- 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@-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 e62639b..0000000
--- 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@-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 b9eafc3..0000000
--- 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@-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 e211df4..0000000
--- 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@-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 6585556..0000000
--- 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@-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 04955cc..0000000
--- 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@-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 9cf4ace..0000000
--- 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@-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 22b1009..0000000
--- 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@-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 2798aaa..0000000
--- 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@-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 a1f4cf5..0000000
--- 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@-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 ec58700..0000000
--- 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@-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 cb0398c..0000000
--- 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@-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 97608175..0000000
--- 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@-1 {{header '<__concepts/destructible.h>' is an implementation detail; #include '<concepts>' instead}}
diff --git a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/different_from.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/concepts/different_from.header.verify.cpp
deleted file mode 100644
index 0387928..0000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/concepts/different_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/different_from.h>
-// expected-error@-1 {{header '<__concepts/different_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 7223d23..0000000
--- 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@-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 9014f50..0000000
--- 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@-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 bfb3ccf..0000000
--- 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@-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 fbf2c88..0000000
--- 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@-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 5a8e630..0000000
--- 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@-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 7e42452..0000000
--- 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@-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 da65a3a..0000000
--- 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@-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 a64adbe..0000000
--- 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@-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 9e8f242..0000000
--- 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@-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 10ac945..0000000
--- 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@-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 79bb431..0000000
--- 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@-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 7457a8d..0000000
--- 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@-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 618da50..0000000
--- 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@-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 9cbf71e..0000000
--- 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@-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 9c237de..0000000
--- 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@-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 dfff24a..0000000
--- 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@-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 5f0eef2..0000000
--- 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@-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 a4ff03e..0000000
--- 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@-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 ca4571d..0000000
--- 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@-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 6d5d939..0000000
--- 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@-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 f05dccd..0000000
--- 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@-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 b109cc0..0000000
--- 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@-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 f87159f..0000000
--- 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@-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 fb549c5..0000000
--- 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@-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 274cf3a..0000000
--- 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@-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 cf657cd..0000000
--- 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@-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 5fc3b72..0000000
--- 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@-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 d280380..0000000
--- 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@-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 a2b4b7d..0000000
--- 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@-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 12aea94..0000000
--- 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@-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 28dd063..0000000
--- 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@-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 1d01402..0000000
--- 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@-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 cbf0815..0000000
--- 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@-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 b457597..0000000
--- 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@-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 ea53ccb..0000000
--- 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@-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 b494e0c..0000000
--- 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@-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 ba2d2ed..0000000
--- 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@-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 235c6cd..0000000
--- 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@-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 b7681bc..0000000
--- 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@-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 ddba232..0000000
--- 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@-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 5360cf0..0000000
--- 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@-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 dc67274..0000000
--- 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@-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 ce986d0..0000000
--- 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@-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 5945bed..0000000
--- 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@-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 f65759f..0000000
--- 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@-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 5caea05..0000000
--- 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@-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 b1db7db..0000000
--- 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@-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 1c80463..0000000
--- 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@-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 3cf5bd5b..0000000
--- 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@-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 3e24fad..0000000
--- 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@-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 de07876..0000000
--- 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@-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 e817254..0000000
--- 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@-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 0392243..0000000
--- 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@-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 4755190..0000000
--- 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@-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 6c2a74b..0000000
--- 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@-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 91c87e4..0000000
--- 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@-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 1e89dd0..0000000
--- 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@-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 33ff916..0000000
--- 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@-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 bf90396..0000000
--- 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@-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 9a44e3d..0000000
--- 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@-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 efba9ca..0000000
--- 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@-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 8b7e922..0000000
--- 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@-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 400f78b..0000000
--- 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@-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 034b976..0000000
--- 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@-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 4803587..0000000
--- 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@-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 2832238..0000000
--- 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@-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 d082659..0000000
--- 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@-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 549f83d..0000000
--- 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@-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 9af27d0..0000000
--- 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@-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 d295cd2..0000000
--- 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@-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 d56433a..0000000
--- 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@-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 00f8bff..0000000
--- 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@-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 c5d1c52..0000000
--- 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@-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 7e0999a..0000000
--- 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@-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 e89487f..0000000
--- 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@-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 79535bd..0000000
--- 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@-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 e113708..0000000
--- 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@-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 8602b0b..0000000
--- 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@-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 1f3b6ece..0000000
--- 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@-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 78955c9..0000000
--- 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@-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 ee80345..0000000
--- 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@-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 782b7c1..0000000
--- 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@-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 3a09394..0000000
--- 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@-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 fbf5172..0000000
--- 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@-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 f5485cc..0000000
--- 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@-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 db5ff98..0000000
--- 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@-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 eac90ef..0000000
--- 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@-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 4668050..0000000
--- 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@-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 ec36018..0000000
--- 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@-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 1cedde0..0000000
--- 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@-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 72e813f..0000000
--- 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@-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 53358d8..0000000
--- 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@-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 479b7d1..0000000
--- 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@-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 7d863d1..0000000
--- 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@-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 43c6919..0000000
--- 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@-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 5f8e27c..0000000
--- 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@-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 7a3fd40..0000000
--- 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@-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 5a209b7..0000000
--- 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@-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 eb13fd6..0000000
--- 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@-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 bb732c5..0000000
--- 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@-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 f40c053..0000000
--- 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@-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 c4a8467..0000000
--- 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@-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 66cf921..0000000
--- 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@-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 b679891..0000000
--- 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@-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 46141da..0000000
--- 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@-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 ff57c07..0000000
--- 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@-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 9c384b5..0000000
--- 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@-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 7b584ca..0000000
--- 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@-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 b6ab555..0000000
--- 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@-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 840d27a..0000000
--- 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@-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 b91b557..0000000
--- 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@-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 0e292cd..0000000
--- 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@-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 be05815..0000000
--- 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@-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 5b7b85b..0000000
--- 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@-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 b566354..0000000
--- 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@-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 6dcfaf0..0000000
--- 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@-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 22b14cb..0000000
--- 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@-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 804ed70..0000000
--- 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@-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 8aea12c..0000000
--- 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@-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 d20bfdd5..0000000
--- 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@-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 1e81ab0..0000000
--- 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@-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 ac55a78..0000000
--- 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@-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 ae99c73..0000000
--- 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@-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 1b21279..0000000
--- 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@-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 7227667..0000000
--- 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@-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 add331f..0000000
--- 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@-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 d3bb9fb..0000000
--- 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@-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 3bbb30a..0000000
--- 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@-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 aca4913..0000000
--- 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@-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 7e7015a..0000000
--- 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@-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 bbd3f9c..0000000
--- 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@-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 f591466..0000000
--- 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@-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 d436894..0000000
--- 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@-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 80572fe..0000000
--- 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@-1 {{header '<__numeric/accumulate.h>' is an implementation detail; #include '<numeric>' instead}}
diff --git a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/adjacent_difference.header.verify.cpp b/libcxx/test/libcxx/diagnostics/detail.headers/numeric/adjacent_difference.header.verify.cpp
deleted file mode 100644
index 2ae81dc..0000000
--- a/libcxx/test/libcxx/diagnostics/detail.headers/numeric/adjacent_difference.header.verify.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-// UNSUPPORTED: modules-build
-// UNSUPPORTED: clang-11, clang-12, clang-13
-// UNSUPPORTED: apple-clang-11, apple-clang-12, apple-clang-13
-// UNSUPPORTED: gcc-11
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-threads
-// ADDITIONAL_COMPILE_FLAGS: -U_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_difference.h>
-// expected-error@-1 {{header '<__numeric/adjacent_difference.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 6262db7..0000000
--- 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@-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 9b883f6..0000000
--- 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@-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 68e76d2..0000000
--- 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@-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 add4f4a..0000000
--- 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@-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 9e59836..0000000
--- 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@-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 9c02085..0000000
--- 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@-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 8cec77f..0000000
--- 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@-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 0664641..0000000
--- 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@-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 cc47065..0000000
--- 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@-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 d2dbd10..0000000
--- 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@-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 c51f4f8..0000000
--- 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@-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 5f752c6..0000000
--- 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@-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 341c947..0000000
--- 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@-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 6b5ca88..0000000
--- 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@-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 0bba975..0000000
--- 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@-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 30404cb..0000000
--- 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@-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 a8ff1ac..0000000
--- 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@-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 6cee35ef..0000000
--- 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@-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 e50e027..0000000
--- 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@-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 f4d4082..0000000
--- 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@-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 37894b1..0000000
--- 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@-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 a5d0160..0000000
--- 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@-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 1ef8fb1..0000000
--- 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@-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 3fc47e9..0000000
--- 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@-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 04a80df..0000000
--- 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@-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 1b24aa6..0000000
--- 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@-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 423e34b..0000000
--- 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@-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 b2bbc47..0000000
--- 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@-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 b9e670e..0000000
--- 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@-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 7f200c9..0000000
--- 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@-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 0d4198e..0000000
--- 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@-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 7afd84f..0000000
--- 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@-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 8fd2371..0000000
--- 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@-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 04840639..0000000
--- 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@-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 be34948..0000000
--- 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@-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 7266fda..0000000
--- 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@-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 acf0129..0000000
--- 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@-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 7bcbaaf..0000000
--- 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@-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 8dd8f2b4..0000000
--- 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@-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 100eaa8..0000000
--- 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@-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 56237a4..0000000
--- 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@-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 045601a..0000000
--- 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@-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 2044688..0000000
--- 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@-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 93d16a5..0000000
--- 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@-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 3df8040..0000000
--- 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@-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 d05c788..0000000
--- 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@-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 c6e3b7c..0000000
--- 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@-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 8c72d6ed..0000000
--- 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@-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 a78144e..0000000
--- 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@-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 cc1eb93..0000000
--- 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@-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 d7f8e67..0000000
--- 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@-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 4b92271..0000000
--- 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@-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 4fa425e..0000000
--- 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@-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 16c222b..0000000
--- 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@-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 15f2a16..0000000
--- 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@-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 edb7e12..0000000
--- 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@-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 2e4fc0e..0000000
--- 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@-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 bf7992f..0000000
--- 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@-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 adade72..0000000
--- 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@-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 3cfe1ab..0000000
--- 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@-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 dc1ac44..0000000
--- 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@-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 6a996af..0000000
--- 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@-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 ca16f52..0000000
--- 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@-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 194b42d..0000000
--- 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@-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 67d88f0..0000000
--- 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@-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 95ec5a7..0000000
--- 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@-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 e40eff5..0000000
--- 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@-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 28d575a..0000000
--- 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@-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 a7f65a7..0000000
--- 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@-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 4f96e16..0000000
--- 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@-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 ff62dd8..0000000
--- 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@-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 5ade94b..0000000
--- 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@-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 7933661..0000000
--- 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@-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 e70110f..0000000
--- 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@-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 f515614..0000000
--- 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@-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 60ee669..0000000
--- 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@-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 60c8319..0000000
--- 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@-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 f2c1da3..0000000
--- 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@-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 30f1fb4..0000000
--- 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@-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 63c78ea..0000000
--- 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@-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 182edf2..0000000
--- 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@-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 215ff6e..0000000
--- 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@-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 283bdf5..0000000
--- 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@-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 5620a9a..0000000
--- 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@-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 5509436..0000000
--- 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@-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 249e973..0000000
--- 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@-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 bde39c2..0000000
--- 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@-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 0df29f1..0000000
--- 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@-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 04a2023..0000000
--- 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@-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 98af96a..0000000
--- 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@-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 e444233..0000000
--- 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@-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 686eb5a3..0000000
--- 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@-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 e10484b..0000000
--- 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@-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 444c548..0000000
--- 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@-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 ce60351..0000000
--- 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@-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 0067fe1..0000000
--- 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@-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 451f9cd..0000000
--- 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@-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 7e5a84e..0000000
--- 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@-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 bc31bde..0000000
--- 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@-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 3fbf9e1..0000000
--- 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@-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 5f3f128..94adac3 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 @@ if __name__ == '__main__':
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 075dcfc..810657e 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@-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 3e533f9..0000000
--- 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 ce44c3a..3a3233a 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 b3c3202..72940cc 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 1a04ddd..665f9e5 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 9db431e..1d6c380 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 4f1121b..934cc4b 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 886b9a5..cc59129 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;