[libcxx-commits] [libcxx] [libc++][C++03] Update include guards (PR #109001)
Nikolas Klauser via libcxx-commits
libcxx-commits at lists.llvm.org
Mon Dec 9 03:15:38 PST 2024
https://github.com/philnik777 updated https://github.com/llvm/llvm-project/pull/109001
>From bea0f2b1df3950ac1de65c5bee87c953ab139d44 Mon Sep 17 00:00:00 2001
From: Nikolas Klauser <nikolasklauser at berlin.de>
Date: Tue, 17 Sep 2024 16:25:05 +0200
Subject: [PATCH] [libc++][C++03] Update include guards
---
libcxx/include/__cxx03/__algorithm/adjacent_find.h | 6 +++---
libcxx/include/__cxx03/__algorithm/all_of.h | 6 +++---
libcxx/include/__cxx03/__algorithm/any_of.h | 6 +++---
libcxx/include/__cxx03/__algorithm/binary_search.h | 6 +++---
libcxx/include/__cxx03/__algorithm/clamp.h | 6 +++---
libcxx/include/__cxx03/__algorithm/comp.h | 6 +++---
libcxx/include/__cxx03/__algorithm/comp_ref_type.h | 6 +++---
libcxx/include/__cxx03/__algorithm/copy.h | 6 +++---
libcxx/include/__cxx03/__algorithm/copy_backward.h | 6 +++---
libcxx/include/__cxx03/__algorithm/copy_if.h | 6 +++---
libcxx/include/__cxx03/__algorithm/copy_move_common.h | 6 +++---
libcxx/include/__cxx03/__algorithm/copy_n.h | 6 +++---
libcxx/include/__cxx03/__algorithm/count.h | 6 +++---
libcxx/include/__cxx03/__algorithm/count_if.h | 6 +++---
libcxx/include/__cxx03/__algorithm/equal.h | 6 +++---
libcxx/include/__cxx03/__algorithm/equal_range.h | 6 +++---
libcxx/include/__cxx03/__algorithm/fill.h | 6 +++---
libcxx/include/__cxx03/__algorithm/fill_n.h | 6 +++---
libcxx/include/__cxx03/__algorithm/find.h | 6 +++---
libcxx/include/__cxx03/__algorithm/find_end.h | 6 +++---
libcxx/include/__cxx03/__algorithm/find_first_of.h | 6 +++---
libcxx/include/__cxx03/__algorithm/find_if.h | 6 +++---
libcxx/include/__cxx03/__algorithm/find_if_not.h | 6 +++---
libcxx/include/__cxx03/__algorithm/find_segment_if.h | 6 +++---
libcxx/include/__cxx03/__algorithm/fold.h | 6 +++---
libcxx/include/__cxx03/__algorithm/for_each.h | 6 +++---
libcxx/include/__cxx03/__algorithm/for_each_n.h | 6 +++---
libcxx/include/__cxx03/__algorithm/for_each_segment.h | 6 +++---
libcxx/include/__cxx03/__algorithm/generate.h | 6 +++---
libcxx/include/__cxx03/__algorithm/generate_n.h | 6 +++---
libcxx/include/__cxx03/__algorithm/half_positive.h | 6 +++---
libcxx/include/__cxx03/__algorithm/in_found_result.h | 6 +++---
libcxx/include/__cxx03/__algorithm/in_fun_result.h | 6 +++---
libcxx/include/__cxx03/__algorithm/in_in_out_result.h | 6 +++---
libcxx/include/__cxx03/__algorithm/in_in_result.h | 6 +++---
libcxx/include/__cxx03/__algorithm/in_out_out_result.h | 6 +++---
libcxx/include/__cxx03/__algorithm/in_out_result.h | 6 +++---
libcxx/include/__cxx03/__algorithm/includes.h | 6 +++---
libcxx/include/__cxx03/__algorithm/inplace_merge.h | 6 +++---
libcxx/include/__cxx03/__algorithm/is_heap.h | 6 +++---
libcxx/include/__cxx03/__algorithm/is_heap_until.h | 6 +++---
libcxx/include/__cxx03/__algorithm/is_partitioned.h | 6 +++---
libcxx/include/__cxx03/__algorithm/is_permutation.h | 6 +++---
libcxx/include/__cxx03/__algorithm/is_sorted.h | 6 +++---
libcxx/include/__cxx03/__algorithm/is_sorted_until.h | 6 +++---
libcxx/include/__cxx03/__algorithm/iter_swap.h | 6 +++---
libcxx/include/__cxx03/__algorithm/iterator_operations.h | 6 +++---
.../include/__cxx03/__algorithm/lexicographical_compare.h | 6 +++---
.../__algorithm/lexicographical_compare_three_way.h | 6 +++---
libcxx/include/__cxx03/__algorithm/lower_bound.h | 6 +++---
libcxx/include/__cxx03/__algorithm/make_heap.h | 6 +++---
libcxx/include/__cxx03/__algorithm/make_projected.h | 6 +++---
libcxx/include/__cxx03/__algorithm/max.h | 6 +++---
libcxx/include/__cxx03/__algorithm/max_element.h | 6 +++---
libcxx/include/__cxx03/__algorithm/merge.h | 6 +++---
libcxx/include/__cxx03/__algorithm/min.h | 6 +++---
libcxx/include/__cxx03/__algorithm/min_element.h | 6 +++---
libcxx/include/__cxx03/__algorithm/min_max_result.h | 6 +++---
libcxx/include/__cxx03/__algorithm/minmax.h | 6 +++---
libcxx/include/__cxx03/__algorithm/minmax_element.h | 6 +++---
libcxx/include/__cxx03/__algorithm/mismatch.h | 6 +++---
libcxx/include/__cxx03/__algorithm/move.h | 6 +++---
libcxx/include/__cxx03/__algorithm/move_backward.h | 6 +++---
libcxx/include/__cxx03/__algorithm/next_permutation.h | 6 +++---
libcxx/include/__cxx03/__algorithm/none_of.h | 6 +++---
libcxx/include/__cxx03/__algorithm/nth_element.h | 6 +++---
libcxx/include/__cxx03/__algorithm/partial_sort.h | 6 +++---
libcxx/include/__cxx03/__algorithm/partial_sort_copy.h | 6 +++---
libcxx/include/__cxx03/__algorithm/partition.h | 6 +++---
libcxx/include/__cxx03/__algorithm/partition_copy.h | 6 +++---
libcxx/include/__cxx03/__algorithm/partition_point.h | 6 +++---
libcxx/include/__cxx03/__algorithm/pop_heap.h | 6 +++---
libcxx/include/__cxx03/__algorithm/prev_permutation.h | 6 +++---
libcxx/include/__cxx03/__algorithm/pstl.h | 6 +++---
libcxx/include/__cxx03/__algorithm/push_heap.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_adjacent_find.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_all_of.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_any_of.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_binary_search.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_clamp.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_contains.h | 6 +++---
.../__cxx03/__algorithm/ranges_contains_subrange.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_copy.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_copy_backward.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_copy_if.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_copy_n.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_count.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_count_if.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_ends_with.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_equal.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_equal_range.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_fill.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_fill_n.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_find.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_find_end.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_find_first_of.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_find_if.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_find_if_not.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_find_last.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_for_each.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_for_each_n.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_generate.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_generate_n.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_includes.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_inplace_merge.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_is_heap.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_is_heap_until.h | 6 +++---
.../include/__cxx03/__algorithm/ranges_is_partitioned.h | 6 +++---
.../include/__cxx03/__algorithm/ranges_is_permutation.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_is_sorted.h | 6 +++---
.../include/__cxx03/__algorithm/ranges_is_sorted_until.h | 6 +++---
.../include/__cxx03/__algorithm/ranges_iterator_concept.h | 6 +++---
.../__cxx03/__algorithm/ranges_lexicographical_compare.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_lower_bound.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_make_heap.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_max.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_max_element.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_merge.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_min.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_min_element.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_minmax.h | 6 +++---
.../include/__cxx03/__algorithm/ranges_minmax_element.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_mismatch.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_move.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_move_backward.h | 6 +++---
.../include/__cxx03/__algorithm/ranges_next_permutation.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_none_of.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_nth_element.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_partial_sort.h | 6 +++---
.../__cxx03/__algorithm/ranges_partial_sort_copy.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_partition.h | 6 +++---
.../include/__cxx03/__algorithm/ranges_partition_copy.h | 6 +++---
.../include/__cxx03/__algorithm/ranges_partition_point.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_pop_heap.h | 6 +++---
.../include/__cxx03/__algorithm/ranges_prev_permutation.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_push_heap.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_remove.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_remove_copy.h | 6 +++---
.../include/__cxx03/__algorithm/ranges_remove_copy_if.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_remove_if.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_replace.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_replace_copy.h | 6 +++---
.../include/__cxx03/__algorithm/ranges_replace_copy_if.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_replace_if.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_reverse.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_reverse_copy.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_rotate.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_rotate_copy.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_sample.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_search.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_search_n.h | 6 +++---
.../include/__cxx03/__algorithm/ranges_set_difference.h | 6 +++---
.../include/__cxx03/__algorithm/ranges_set_intersection.h | 6 +++---
.../__cxx03/__algorithm/ranges_set_symmetric_difference.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_set_union.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_shuffle.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_sort.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_sort_heap.h | 6 +++---
.../include/__cxx03/__algorithm/ranges_stable_partition.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_stable_sort.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_starts_with.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_swap_ranges.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_transform.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_unique.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_unique_copy.h | 6 +++---
libcxx/include/__cxx03/__algorithm/ranges_upper_bound.h | 6 +++---
libcxx/include/__cxx03/__algorithm/remove.h | 6 +++---
libcxx/include/__cxx03/__algorithm/remove_copy.h | 6 +++---
libcxx/include/__cxx03/__algorithm/remove_copy_if.h | 6 +++---
libcxx/include/__cxx03/__algorithm/remove_if.h | 6 +++---
libcxx/include/__cxx03/__algorithm/replace.h | 6 +++---
libcxx/include/__cxx03/__algorithm/replace_copy.h | 6 +++---
libcxx/include/__cxx03/__algorithm/replace_copy_if.h | 6 +++---
libcxx/include/__cxx03/__algorithm/replace_if.h | 6 +++---
libcxx/include/__cxx03/__algorithm/reverse.h | 6 +++---
libcxx/include/__cxx03/__algorithm/reverse_copy.h | 6 +++---
libcxx/include/__cxx03/__algorithm/rotate.h | 6 +++---
libcxx/include/__cxx03/__algorithm/rotate_copy.h | 6 +++---
libcxx/include/__cxx03/__algorithm/sample.h | 6 +++---
libcxx/include/__cxx03/__algorithm/search.h | 6 +++---
libcxx/include/__cxx03/__algorithm/search_n.h | 6 +++---
libcxx/include/__cxx03/__algorithm/set_difference.h | 6 +++---
libcxx/include/__cxx03/__algorithm/set_intersection.h | 6 +++---
.../__cxx03/__algorithm/set_symmetric_difference.h | 6 +++---
libcxx/include/__cxx03/__algorithm/set_union.h | 6 +++---
libcxx/include/__cxx03/__algorithm/shift_left.h | 6 +++---
libcxx/include/__cxx03/__algorithm/shift_right.h | 6 +++---
libcxx/include/__cxx03/__algorithm/shuffle.h | 6 +++---
libcxx/include/__cxx03/__algorithm/sift_down.h | 6 +++---
libcxx/include/__cxx03/__algorithm/simd_utils.h | 6 +++---
libcxx/include/__cxx03/__algorithm/sort.h | 6 +++---
libcxx/include/__cxx03/__algorithm/sort_heap.h | 6 +++---
libcxx/include/__cxx03/__algorithm/stable_partition.h | 6 +++---
libcxx/include/__cxx03/__algorithm/stable_sort.h | 6 +++---
libcxx/include/__cxx03/__algorithm/swap_ranges.h | 6 +++---
.../include/__cxx03/__algorithm/three_way_comp_ref_type.h | 6 +++---
libcxx/include/__cxx03/__algorithm/transform.h | 6 +++---
.../__algorithm/uniform_random_bit_generator_adaptor.h | 6 +++---
libcxx/include/__cxx03/__algorithm/unique.h | 6 +++---
libcxx/include/__cxx03/__algorithm/unique_copy.h | 6 +++---
libcxx/include/__cxx03/__algorithm/unwrap_iter.h | 6 +++---
libcxx/include/__cxx03/__algorithm/unwrap_range.h | 6 +++---
libcxx/include/__cxx03/__algorithm/upper_bound.h | 6 +++---
libcxx/include/__cxx03/__assert | 6 +++---
libcxx/include/__cxx03/__atomic/aliases.h | 6 +++---
libcxx/include/__cxx03/__atomic/atomic.h | 6 +++---
libcxx/include/__cxx03/__atomic/atomic_base.h | 6 +++---
libcxx/include/__cxx03/__atomic/atomic_flag.h | 6 +++---
libcxx/include/__cxx03/__atomic/atomic_init.h | 6 +++---
libcxx/include/__cxx03/__atomic/atomic_lock_free.h | 6 +++---
libcxx/include/__cxx03/__atomic/atomic_ref.h | 6 +++---
libcxx/include/__cxx03/__atomic/atomic_sync.h | 6 +++---
libcxx/include/__cxx03/__atomic/check_memory_order.h | 6 +++---
libcxx/include/__cxx03/__atomic/contention_t.h | 6 +++---
libcxx/include/__cxx03/__atomic/cxx_atomic_impl.h | 6 +++---
libcxx/include/__cxx03/__atomic/fence.h | 6 +++---
libcxx/include/__cxx03/__atomic/is_always_lock_free.h | 6 +++---
libcxx/include/__cxx03/__atomic/kill_dependency.h | 6 +++---
libcxx/include/__cxx03/__atomic/memory_order.h | 6 +++---
libcxx/include/__cxx03/__atomic/to_gcc_order.h | 6 +++---
libcxx/include/__cxx03/__bit/bit_cast.h | 6 +++---
libcxx/include/__cxx03/__bit/bit_ceil.h | 6 +++---
libcxx/include/__cxx03/__bit/bit_floor.h | 6 +++---
libcxx/include/__cxx03/__bit/bit_log2.h | 6 +++---
libcxx/include/__cxx03/__bit/bit_width.h | 6 +++---
libcxx/include/__cxx03/__bit/blsr.h | 6 +++---
libcxx/include/__cxx03/__bit/byteswap.h | 6 +++---
libcxx/include/__cxx03/__bit/countl.h | 6 +++---
libcxx/include/__cxx03/__bit/countr.h | 6 +++---
libcxx/include/__cxx03/__bit/endian.h | 6 +++---
libcxx/include/__cxx03/__bit/has_single_bit.h | 6 +++---
libcxx/include/__cxx03/__bit/invert_if.h | 6 +++---
libcxx/include/__cxx03/__bit/popcount.h | 6 +++---
libcxx/include/__cxx03/__bit/rotate.h | 6 +++---
libcxx/include/__cxx03/__bit_reference | 6 +++---
libcxx/include/__cxx03/__charconv/chars_format.h | 6 +++---
libcxx/include/__cxx03/__charconv/from_chars_integral.h | 6 +++---
libcxx/include/__cxx03/__charconv/from_chars_result.h | 6 +++---
libcxx/include/__cxx03/__charconv/tables.h | 6 +++---
libcxx/include/__cxx03/__charconv/to_chars.h | 6 +++---
libcxx/include/__cxx03/__charconv/to_chars_base_10.h | 6 +++---
.../include/__cxx03/__charconv/to_chars_floating_point.h | 6 +++---
libcxx/include/__cxx03/__charconv/to_chars_integral.h | 6 +++---
libcxx/include/__cxx03/__charconv/to_chars_result.h | 6 +++---
libcxx/include/__cxx03/__charconv/traits.h | 6 +++---
libcxx/include/__cxx03/__chrono/calendar.h | 6 +++---
libcxx/include/__cxx03/__chrono/concepts.h | 6 +++---
libcxx/include/__cxx03/__chrono/convert_to_timespec.h | 6 +++---
libcxx/include/__cxx03/__chrono/convert_to_tm.h | 6 +++---
libcxx/include/__cxx03/__chrono/day.h | 6 +++---
libcxx/include/__cxx03/__chrono/duration.h | 6 +++---
libcxx/include/__cxx03/__chrono/exception.h | 6 +++---
libcxx/include/__cxx03/__chrono/file_clock.h | 6 +++---
libcxx/include/__cxx03/__chrono/formatter.h | 6 +++---
libcxx/include/__cxx03/__chrono/hh_mm_ss.h | 6 +++---
libcxx/include/__cxx03/__chrono/high_resolution_clock.h | 6 +++---
libcxx/include/__cxx03/__chrono/leap_second.h | 6 +++---
libcxx/include/__cxx03/__chrono/literals.h | 6 +++---
libcxx/include/__cxx03/__chrono/local_info.h | 6 +++---
libcxx/include/__cxx03/__chrono/month.h | 6 +++---
libcxx/include/__cxx03/__chrono/month_weekday.h | 6 +++---
libcxx/include/__cxx03/__chrono/monthday.h | 6 +++---
libcxx/include/__cxx03/__chrono/ostream.h | 6 +++---
libcxx/include/__cxx03/__chrono/parser_std_format_spec.h | 6 +++---
libcxx/include/__cxx03/__chrono/statically_widen.h | 6 +++---
libcxx/include/__cxx03/__chrono/steady_clock.h | 6 +++---
libcxx/include/__cxx03/__chrono/sys_info.h | 6 +++---
libcxx/include/__cxx03/__chrono/system_clock.h | 6 +++---
libcxx/include/__cxx03/__chrono/time_point.h | 6 +++---
libcxx/include/__cxx03/__chrono/time_zone.h | 6 +++---
libcxx/include/__cxx03/__chrono/time_zone_link.h | 6 +++---
libcxx/include/__cxx03/__chrono/tzdb.h | 6 +++---
libcxx/include/__cxx03/__chrono/tzdb_list.h | 6 +++---
libcxx/include/__cxx03/__chrono/weekday.h | 6 +++---
libcxx/include/__cxx03/__chrono/year.h | 6 +++---
libcxx/include/__cxx03/__chrono/year_month.h | 6 +++---
libcxx/include/__cxx03/__chrono/year_month_day.h | 6 +++---
libcxx/include/__cxx03/__chrono/year_month_weekday.h | 6 +++---
libcxx/include/__cxx03/__chrono/zoned_time.h | 6 +++---
.../__cxx03/__compare/common_comparison_category.h | 6 +++---
.../__cxx03/__compare/compare_partial_order_fallback.h | 6 +++---
.../__cxx03/__compare/compare_strong_order_fallback.h | 6 +++---
libcxx/include/__cxx03/__compare/compare_three_way.h | 6 +++---
.../include/__cxx03/__compare/compare_three_way_result.h | 6 +++---
.../__cxx03/__compare/compare_weak_order_fallback.h | 6 +++---
libcxx/include/__cxx03/__compare/is_eq.h | 6 +++---
libcxx/include/__cxx03/__compare/ordering.h | 6 +++---
libcxx/include/__cxx03/__compare/partial_order.h | 6 +++---
libcxx/include/__cxx03/__compare/strong_order.h | 6 +++---
libcxx/include/__cxx03/__compare/synth_three_way.h | 6 +++---
libcxx/include/__cxx03/__compare/three_way_comparable.h | 6 +++---
libcxx/include/__cxx03/__compare/weak_order.h | 6 +++---
libcxx/include/__cxx03/__concepts/arithmetic.h | 6 +++---
libcxx/include/__cxx03/__concepts/assignable.h | 6 +++---
libcxx/include/__cxx03/__concepts/boolean_testable.h | 6 +++---
libcxx/include/__cxx03/__concepts/class_or_enum.h | 6 +++---
libcxx/include/__cxx03/__concepts/common_reference_with.h | 6 +++---
libcxx/include/__cxx03/__concepts/common_with.h | 6 +++---
libcxx/include/__cxx03/__concepts/constructible.h | 6 +++---
libcxx/include/__cxx03/__concepts/convertible_to.h | 6 +++---
libcxx/include/__cxx03/__concepts/copyable.h | 6 +++---
libcxx/include/__cxx03/__concepts/derived_from.h | 6 +++---
libcxx/include/__cxx03/__concepts/destructible.h | 6 +++---
libcxx/include/__cxx03/__concepts/different_from.h | 6 +++---
libcxx/include/__cxx03/__concepts/equality_comparable.h | 6 +++---
libcxx/include/__cxx03/__concepts/invocable.h | 6 +++---
libcxx/include/__cxx03/__concepts/movable.h | 6 +++---
libcxx/include/__cxx03/__concepts/predicate.h | 6 +++---
libcxx/include/__cxx03/__concepts/regular.h | 6 +++---
libcxx/include/__cxx03/__concepts/relation.h | 6 +++---
libcxx/include/__cxx03/__concepts/same_as.h | 6 +++---
libcxx/include/__cxx03/__concepts/semiregular.h | 6 +++---
libcxx/include/__cxx03/__concepts/swappable.h | 6 +++---
libcxx/include/__cxx03/__concepts/totally_ordered.h | 6 +++---
.../__cxx03/__condition_variable/condition_variable.h | 6 +++---
libcxx/include/__cxx03/__config | 6 +++---
libcxx/include/__cxx03/__config_site.in | 6 +++---
libcxx/include/__cxx03/__configuration/abi.h | 6 +++---
libcxx/include/__cxx03/__configuration/availability.h | 6 +++---
libcxx/include/__cxx03/__configuration/compiler.h | 6 +++---
libcxx/include/__cxx03/__configuration/language.h | 6 +++---
libcxx/include/__cxx03/__configuration/platform.h | 6 +++---
libcxx/include/__cxx03/__coroutine/coroutine_handle.h | 6 +++---
libcxx/include/__cxx03/__coroutine/coroutine_traits.h | 6 +++---
.../include/__cxx03/__coroutine/noop_coroutine_handle.h | 6 +++---
libcxx/include/__cxx03/__coroutine/trivial_awaitables.h | 6 +++---
libcxx/include/__cxx03/__debug_utils/randomize_range.h | 6 +++---
libcxx/include/__cxx03/__debug_utils/sanitizers.h | 6 +++---
.../__cxx03/__debug_utils/strict_weak_ordering_check.h | 6 +++---
libcxx/include/__cxx03/__exception/exception.h | 6 +++---
libcxx/include/__cxx03/__exception/exception_ptr.h | 6 +++---
libcxx/include/__cxx03/__exception/nested_exception.h | 6 +++---
libcxx/include/__cxx03/__exception/operations.h | 6 +++---
libcxx/include/__cxx03/__exception/terminate.h | 6 +++---
libcxx/include/__cxx03/__expected/bad_expected_access.h | 6 +++---
libcxx/include/__cxx03/__expected/expected.h | 6 +++---
libcxx/include/__cxx03/__expected/unexpect.h | 6 +++---
libcxx/include/__cxx03/__expected/unexpected.h | 6 +++---
libcxx/include/__cxx03/__filesystem/copy_options.h | 6 +++---
libcxx/include/__cxx03/__filesystem/directory_entry.h | 6 +++---
libcxx/include/__cxx03/__filesystem/directory_iterator.h | 6 +++---
libcxx/include/__cxx03/__filesystem/directory_options.h | 6 +++---
libcxx/include/__cxx03/__filesystem/file_status.h | 6 +++---
libcxx/include/__cxx03/__filesystem/file_time_type.h | 6 +++---
libcxx/include/__cxx03/__filesystem/file_type.h | 6 +++---
libcxx/include/__cxx03/__filesystem/filesystem_error.h | 6 +++---
libcxx/include/__cxx03/__filesystem/operations.h | 6 +++---
libcxx/include/__cxx03/__filesystem/path.h | 6 +++---
libcxx/include/__cxx03/__filesystem/path_iterator.h | 6 +++---
libcxx/include/__cxx03/__filesystem/perm_options.h | 6 +++---
libcxx/include/__cxx03/__filesystem/perms.h | 6 +++---
.../__cxx03/__filesystem/recursive_directory_iterator.h | 6 +++---
libcxx/include/__cxx03/__filesystem/space_info.h | 6 +++---
libcxx/include/__cxx03/__filesystem/u8path.h | 6 +++---
libcxx/include/__cxx03/__format/buffer.h | 6 +++---
libcxx/include/__cxx03/__format/concepts.h | 6 +++---
libcxx/include/__cxx03/__format/container_adaptor.h | 6 +++---
libcxx/include/__cxx03/__format/enable_insertable.h | 6 +++---
libcxx/include/__cxx03/__format/escaped_output_table.h | 6 +++---
.../__cxx03/__format/extended_grapheme_cluster_table.h | 6 +++---
libcxx/include/__cxx03/__format/format_arg.h | 6 +++---
libcxx/include/__cxx03/__format/format_arg_store.h | 6 +++---
libcxx/include/__cxx03/__format/format_args.h | 6 +++---
libcxx/include/__cxx03/__format/format_context.h | 6 +++---
libcxx/include/__cxx03/__format/format_error.h | 6 +++---
libcxx/include/__cxx03/__format/format_functions.h | 6 +++---
libcxx/include/__cxx03/__format/format_parse_context.h | 6 +++---
libcxx/include/__cxx03/__format/format_string.h | 6 +++---
libcxx/include/__cxx03/__format/format_to_n_result.h | 6 +++---
libcxx/include/__cxx03/__format/formatter.h | 6 +++---
libcxx/include/__cxx03/__format/formatter_bool.h | 6 +++---
libcxx/include/__cxx03/__format/formatter_char.h | 6 +++---
.../include/__cxx03/__format/formatter_floating_point.h | 6 +++---
libcxx/include/__cxx03/__format/formatter_integer.h | 6 +++---
libcxx/include/__cxx03/__format/formatter_integral.h | 6 +++---
libcxx/include/__cxx03/__format/formatter_output.h | 6 +++---
libcxx/include/__cxx03/__format/formatter_pointer.h | 6 +++---
libcxx/include/__cxx03/__format/formatter_string.h | 6 +++---
libcxx/include/__cxx03/__format/formatter_tuple.h | 6 +++---
.../include/__cxx03/__format/indic_conjunct_break_table.h | 6 +++---
libcxx/include/__cxx03/__format/parser_std_format_spec.h | 6 +++---
libcxx/include/__cxx03/__format/range_default_formatter.h | 6 +++---
libcxx/include/__cxx03/__format/range_formatter.h | 6 +++---
libcxx/include/__cxx03/__format/unicode.h | 6 +++---
libcxx/include/__cxx03/__format/width_estimation_table.h | 6 +++---
libcxx/include/__cxx03/__format/write_escaped.h | 6 +++---
libcxx/include/__cxx03/__functional/binary_function.h | 6 +++---
libcxx/include/__cxx03/__functional/binary_negate.h | 6 +++---
libcxx/include/__cxx03/__functional/bind.h | 6 +++---
libcxx/include/__cxx03/__functional/bind_back.h | 6 +++---
libcxx/include/__cxx03/__functional/bind_front.h | 6 +++---
libcxx/include/__cxx03/__functional/binder1st.h | 6 +++---
libcxx/include/__cxx03/__functional/binder2nd.h | 6 +++---
.../include/__cxx03/__functional/boyer_moore_searcher.h | 6 +++---
libcxx/include/__cxx03/__functional/compose.h | 6 +++---
libcxx/include/__cxx03/__functional/default_searcher.h | 6 +++---
libcxx/include/__cxx03/__functional/function.h | 6 +++---
libcxx/include/__cxx03/__functional/hash.h | 6 +++---
libcxx/include/__cxx03/__functional/identity.h | 6 +++---
libcxx/include/__cxx03/__functional/invoke.h | 6 +++---
libcxx/include/__cxx03/__functional/is_transparent.h | 6 +++---
libcxx/include/__cxx03/__functional/mem_fn.h | 6 +++---
libcxx/include/__cxx03/__functional/mem_fun_ref.h | 6 +++---
libcxx/include/__cxx03/__functional/not_fn.h | 6 +++---
libcxx/include/__cxx03/__functional/operations.h | 6 +++---
libcxx/include/__cxx03/__functional/perfect_forward.h | 6 +++---
.../__cxx03/__functional/pointer_to_binary_function.h | 6 +++---
.../__cxx03/__functional/pointer_to_unary_function.h | 6 +++---
libcxx/include/__cxx03/__functional/ranges_operations.h | 6 +++---
libcxx/include/__cxx03/__functional/reference_wrapper.h | 6 +++---
libcxx/include/__cxx03/__functional/unary_function.h | 6 +++---
libcxx/include/__cxx03/__functional/unary_negate.h | 6 +++---
libcxx/include/__cxx03/__functional/weak_result_type.h | 6 +++---
libcxx/include/__cxx03/__fwd/array.h | 6 +++---
libcxx/include/__cxx03/__fwd/bit_reference.h | 6 +++---
libcxx/include/__cxx03/__fwd/complex.h | 6 +++---
libcxx/include/__cxx03/__fwd/deque.h | 6 +++---
libcxx/include/__cxx03/__fwd/format.h | 6 +++---
libcxx/include/__cxx03/__fwd/fstream.h | 6 +++---
libcxx/include/__cxx03/__fwd/functional.h | 6 +++---
libcxx/include/__cxx03/__fwd/ios.h | 6 +++---
libcxx/include/__cxx03/__fwd/istream.h | 6 +++---
libcxx/include/__cxx03/__fwd/mdspan.h | 6 +++---
libcxx/include/__cxx03/__fwd/memory.h | 6 +++---
libcxx/include/__cxx03/__fwd/memory_resource.h | 6 +++---
libcxx/include/__cxx03/__fwd/ostream.h | 6 +++---
libcxx/include/__cxx03/__fwd/pair.h | 6 +++---
libcxx/include/__cxx03/__fwd/queue.h | 6 +++---
libcxx/include/__cxx03/__fwd/span.h | 6 +++---
libcxx/include/__cxx03/__fwd/sstream.h | 6 +++---
libcxx/include/__cxx03/__fwd/stack.h | 6 +++---
libcxx/include/__cxx03/__fwd/streambuf.h | 6 +++---
libcxx/include/__cxx03/__fwd/string.h | 6 +++---
libcxx/include/__cxx03/__fwd/string_view.h | 6 +++---
libcxx/include/__cxx03/__fwd/subrange.h | 6 +++---
libcxx/include/__cxx03/__fwd/tuple.h | 6 +++---
libcxx/include/__cxx03/__fwd/vector.h | 6 +++---
libcxx/include/__cxx03/__hash_table | 6 +++---
libcxx/include/__cxx03/__ios/fpos.h | 6 +++---
libcxx/include/__cxx03/__iterator/access.h | 6 +++---
libcxx/include/__cxx03/__iterator/advance.h | 6 +++---
libcxx/include/__cxx03/__iterator/aliasing_iterator.h | 6 +++---
libcxx/include/__cxx03/__iterator/back_insert_iterator.h | 6 +++---
libcxx/include/__cxx03/__iterator/bounded_iter.h | 6 +++---
libcxx/include/__cxx03/__iterator/common_iterator.h | 6 +++---
libcxx/include/__cxx03/__iterator/concepts.h | 6 +++---
libcxx/include/__cxx03/__iterator/counted_iterator.h | 6 +++---
.../include/__cxx03/__iterator/cpp17_iterator_concepts.h | 6 +++---
libcxx/include/__cxx03/__iterator/data.h | 6 +++---
libcxx/include/__cxx03/__iterator/default_sentinel.h | 6 +++---
libcxx/include/__cxx03/__iterator/distance.h | 6 +++---
libcxx/include/__cxx03/__iterator/empty.h | 6 +++---
libcxx/include/__cxx03/__iterator/erase_if_container.h | 6 +++---
libcxx/include/__cxx03/__iterator/front_insert_iterator.h | 6 +++---
libcxx/include/__cxx03/__iterator/incrementable_traits.h | 6 +++---
libcxx/include/__cxx03/__iterator/indirectly_comparable.h | 6 +++---
libcxx/include/__cxx03/__iterator/insert_iterator.h | 6 +++---
libcxx/include/__cxx03/__iterator/istream_iterator.h | 6 +++---
libcxx/include/__cxx03/__iterator/istreambuf_iterator.h | 6 +++---
libcxx/include/__cxx03/__iterator/iter_move.h | 6 +++---
libcxx/include/__cxx03/__iterator/iter_swap.h | 6 +++---
libcxx/include/__cxx03/__iterator/iterator.h | 6 +++---
libcxx/include/__cxx03/__iterator/iterator_traits.h | 6 +++---
libcxx/include/__cxx03/__iterator/iterator_with_data.h | 6 +++---
libcxx/include/__cxx03/__iterator/mergeable.h | 6 +++---
libcxx/include/__cxx03/__iterator/move_iterator.h | 6 +++---
libcxx/include/__cxx03/__iterator/move_sentinel.h | 6 +++---
libcxx/include/__cxx03/__iterator/next.h | 6 +++---
libcxx/include/__cxx03/__iterator/ostream_iterator.h | 6 +++---
libcxx/include/__cxx03/__iterator/ostreambuf_iterator.h | 6 +++---
libcxx/include/__cxx03/__iterator/permutable.h | 6 +++---
libcxx/include/__cxx03/__iterator/prev.h | 6 +++---
libcxx/include/__cxx03/__iterator/projected.h | 6 +++---
.../include/__cxx03/__iterator/ranges_iterator_traits.h | 6 +++---
libcxx/include/__cxx03/__iterator/readable_traits.h | 6 +++---
libcxx/include/__cxx03/__iterator/reverse_access.h | 6 +++---
libcxx/include/__cxx03/__iterator/reverse_iterator.h | 6 +++---
libcxx/include/__cxx03/__iterator/segmented_iterator.h | 6 +++---
libcxx/include/__cxx03/__iterator/size.h | 6 +++---
libcxx/include/__cxx03/__iterator/sortable.h | 6 +++---
libcxx/include/__cxx03/__iterator/unreachable_sentinel.h | 6 +++---
libcxx/include/__cxx03/__iterator/wrap_iter.h | 6 +++---
libcxx/include/__cxx03/__locale | 6 +++---
libcxx/include/__cxx03/__locale_dir/locale_base_api.h | 6 +++---
.../__cxx03/__locale_dir/locale_base_api/android.h | 6 +++---
.../__locale_dir/locale_base_api/bsd_locale_defaults.h | 6 +++---
.../__locale_dir/locale_base_api/bsd_locale_fallbacks.h | 6 +++---
.../__cxx03/__locale_dir/locale_base_api/fuchsia.h | 6 +++---
libcxx/include/__cxx03/__locale_dir/locale_base_api/ibm.h | 6 +++---
.../__cxx03/__locale_dir/locale_base_api/locale_guard.h | 6 +++---
.../include/__cxx03/__locale_dir/locale_base_api/musl.h | 6 +++---
.../include/__cxx03/__locale_dir/locale_base_api/newlib.h | 6 +++---
.../__cxx03/__locale_dir/locale_base_api/openbsd.h | 6 +++---
.../include/__cxx03/__locale_dir/locale_base_api/win32.h | 6 +++---
libcxx/include/__cxx03/__math/abs.h | 6 +++---
libcxx/include/__cxx03/__math/copysign.h | 6 +++---
libcxx/include/__cxx03/__math/error_functions.h | 6 +++---
libcxx/include/__cxx03/__math/exponential_functions.h | 6 +++---
libcxx/include/__cxx03/__math/fdim.h | 6 +++---
libcxx/include/__cxx03/__math/fma.h | 6 +++---
libcxx/include/__cxx03/__math/gamma.h | 6 +++---
libcxx/include/__cxx03/__math/hyperbolic_functions.h | 6 +++---
libcxx/include/__cxx03/__math/hypot.h | 6 +++---
.../include/__cxx03/__math/inverse_hyperbolic_functions.h | 6 +++---
.../__cxx03/__math/inverse_trigonometric_functions.h | 6 +++---
libcxx/include/__cxx03/__math/logarithms.h | 6 +++---
libcxx/include/__cxx03/__math/min_max.h | 6 +++---
libcxx/include/__cxx03/__math/modulo.h | 6 +++---
libcxx/include/__cxx03/__math/remainder.h | 6 +++---
libcxx/include/__cxx03/__math/roots.h | 6 +++---
libcxx/include/__cxx03/__math/rounding_functions.h | 6 +++---
libcxx/include/__cxx03/__math/special_functions.h | 6 +++---
libcxx/include/__cxx03/__math/traits.h | 6 +++---
libcxx/include/__cxx03/__math/trigonometric_functions.h | 6 +++---
libcxx/include/__cxx03/__mbstate_t.h | 6 +++---
libcxx/include/__cxx03/__mdspan/default_accessor.h | 6 +++---
libcxx/include/__cxx03/__mdspan/extents.h | 6 +++---
libcxx/include/__cxx03/__mdspan/layout_left.h | 6 +++---
libcxx/include/__cxx03/__mdspan/layout_right.h | 6 +++---
libcxx/include/__cxx03/__mdspan/layout_stride.h | 6 +++---
libcxx/include/__cxx03/__mdspan/mdspan.h | 6 +++---
libcxx/include/__cxx03/__memory/addressof.h | 6 +++---
libcxx/include/__cxx03/__memory/align.h | 6 +++---
libcxx/include/__cxx03/__memory/aligned_alloc.h | 6 +++---
libcxx/include/__cxx03/__memory/allocate_at_least.h | 6 +++---
libcxx/include/__cxx03/__memory/allocation_guard.h | 6 +++---
libcxx/include/__cxx03/__memory/allocator.h | 6 +++---
libcxx/include/__cxx03/__memory/allocator_arg_t.h | 6 +++---
libcxx/include/__cxx03/__memory/allocator_destructor.h | 6 +++---
libcxx/include/__cxx03/__memory/allocator_traits.h | 6 +++---
libcxx/include/__cxx03/__memory/assume_aligned.h | 6 +++---
libcxx/include/__cxx03/__memory/auto_ptr.h | 6 +++---
libcxx/include/__cxx03/__memory/builtin_new_allocator.h | 6 +++---
libcxx/include/__cxx03/__memory/compressed_pair.h | 6 +++---
libcxx/include/__cxx03/__memory/concepts.h | 6 +++---
libcxx/include/__cxx03/__memory/construct_at.h | 6 +++---
libcxx/include/__cxx03/__memory/destruct_n.h | 6 +++---
libcxx/include/__cxx03/__memory/inout_ptr.h | 6 +++---
libcxx/include/__cxx03/__memory/out_ptr.h | 6 +++---
libcxx/include/__cxx03/__memory/pointer_traits.h | 6 +++---
libcxx/include/__cxx03/__memory/ranges_construct_at.h | 6 +++---
.../__cxx03/__memory/ranges_uninitialized_algorithms.h | 6 +++---
libcxx/include/__cxx03/__memory/raw_storage_iterator.h | 6 +++---
libcxx/include/__cxx03/__memory/shared_ptr.h | 6 +++---
libcxx/include/__cxx03/__memory/swap_allocator.h | 6 +++---
libcxx/include/__cxx03/__memory/temp_value.h | 6 +++---
libcxx/include/__cxx03/__memory/temporary_buffer.h | 6 +++---
.../include/__cxx03/__memory/uninitialized_algorithms.h | 6 +++---
libcxx/include/__cxx03/__memory/unique_ptr.h | 6 +++---
libcxx/include/__cxx03/__memory/uses_allocator.h | 6 +++---
.../__cxx03/__memory/uses_allocator_construction.h | 6 +++---
libcxx/include/__cxx03/__memory/voidify.h | 6 +++---
.../include/__cxx03/__memory_resource/memory_resource.h | 6 +++---
.../__cxx03/__memory_resource/monotonic_buffer_resource.h | 6 +++---
.../__cxx03/__memory_resource/polymorphic_allocator.h | 6 +++---
libcxx/include/__cxx03/__memory_resource/pool_options.h | 6 +++---
.../__memory_resource/synchronized_pool_resource.h | 6 +++---
.../__memory_resource/unsynchronized_pool_resource.h | 6 +++---
libcxx/include/__cxx03/__mutex/lock_guard.h | 6 +++---
libcxx/include/__cxx03/__mutex/mutex.h | 6 +++---
libcxx/include/__cxx03/__mutex/once_flag.h | 6 +++---
libcxx/include/__cxx03/__mutex/tag_types.h | 6 +++---
libcxx/include/__cxx03/__mutex/unique_lock.h | 6 +++---
libcxx/include/__cxx03/__node_handle | 6 +++---
libcxx/include/__cxx03/__numeric/accumulate.h | 6 +++---
libcxx/include/__cxx03/__numeric/adjacent_difference.h | 6 +++---
libcxx/include/__cxx03/__numeric/exclusive_scan.h | 6 +++---
libcxx/include/__cxx03/__numeric/gcd_lcm.h | 6 +++---
libcxx/include/__cxx03/__numeric/inclusive_scan.h | 6 +++---
libcxx/include/__cxx03/__numeric/inner_product.h | 6 +++---
libcxx/include/__cxx03/__numeric/iota.h | 6 +++---
libcxx/include/__cxx03/__numeric/midpoint.h | 6 +++---
libcxx/include/__cxx03/__numeric/partial_sum.h | 6 +++---
libcxx/include/__cxx03/__numeric/pstl.h | 6 +++---
libcxx/include/__cxx03/__numeric/reduce.h | 6 +++---
libcxx/include/__cxx03/__numeric/saturation_arithmetic.h | 6 +++---
.../include/__cxx03/__numeric/transform_exclusive_scan.h | 6 +++---
.../include/__cxx03/__numeric/transform_inclusive_scan.h | 6 +++---
libcxx/include/__cxx03/__numeric/transform_reduce.h | 6 +++---
libcxx/include/__cxx03/__ostream/basic_ostream.h | 6 +++---
libcxx/include/__cxx03/__ostream/print.h | 6 +++---
libcxx/include/__cxx03/__pstl/backend.h | 6 +++---
libcxx/include/__cxx03/__pstl/backend_fwd.h | 6 +++---
libcxx/include/__cxx03/__pstl/backends/default.h | 6 +++---
libcxx/include/__cxx03/__pstl/backends/libdispatch.h | 6 +++---
libcxx/include/__cxx03/__pstl/backends/serial.h | 6 +++---
libcxx/include/__cxx03/__pstl/backends/std_thread.h | 6 +++---
libcxx/include/__cxx03/__pstl/cpu_algos/any_of.h | 6 +++---
libcxx/include/__cxx03/__pstl/cpu_algos/cpu_traits.h | 6 +++---
libcxx/include/__cxx03/__pstl/cpu_algos/fill.h | 6 +++---
libcxx/include/__cxx03/__pstl/cpu_algos/find_if.h | 6 +++---
libcxx/include/__cxx03/__pstl/cpu_algos/for_each.h | 6 +++---
libcxx/include/__cxx03/__pstl/cpu_algos/merge.h | 6 +++---
libcxx/include/__cxx03/__pstl/cpu_algos/stable_sort.h | 6 +++---
libcxx/include/__cxx03/__pstl/cpu_algos/transform.h | 6 +++---
.../include/__cxx03/__pstl/cpu_algos/transform_reduce.h | 6 +++---
libcxx/include/__cxx03/__pstl/dispatch.h | 6 +++---
libcxx/include/__cxx03/__pstl/handle_exception.h | 6 +++---
libcxx/include/__cxx03/__random/bernoulli_distribution.h | 6 +++---
libcxx/include/__cxx03/__random/binomial_distribution.h | 6 +++---
libcxx/include/__cxx03/__random/cauchy_distribution.h | 6 +++---
.../include/__cxx03/__random/chi_squared_distribution.h | 6 +++---
libcxx/include/__cxx03/__random/clamp_to_integral.h | 6 +++---
libcxx/include/__cxx03/__random/default_random_engine.h | 6 +++---
libcxx/include/__cxx03/__random/discard_block_engine.h | 6 +++---
libcxx/include/__cxx03/__random/discrete_distribution.h | 6 +++---
.../include/__cxx03/__random/exponential_distribution.h | 6 +++---
.../include/__cxx03/__random/extreme_value_distribution.h | 6 +++---
libcxx/include/__cxx03/__random/fisher_f_distribution.h | 6 +++---
libcxx/include/__cxx03/__random/gamma_distribution.h | 6 +++---
libcxx/include/__cxx03/__random/generate_canonical.h | 6 +++---
libcxx/include/__cxx03/__random/geometric_distribution.h | 6 +++---
libcxx/include/__cxx03/__random/independent_bits_engine.h | 6 +++---
libcxx/include/__cxx03/__random/is_seed_sequence.h | 6 +++---
libcxx/include/__cxx03/__random/is_valid.h | 6 +++---
libcxx/include/__cxx03/__random/knuth_b.h | 6 +++---
.../include/__cxx03/__random/linear_congruential_engine.h | 6 +++---
libcxx/include/__cxx03/__random/log2.h | 6 +++---
libcxx/include/__cxx03/__random/lognormal_distribution.h | 6 +++---
libcxx/include/__cxx03/__random/mersenne_twister_engine.h | 6 +++---
.../__cxx03/__random/negative_binomial_distribution.h | 6 +++---
libcxx/include/__cxx03/__random/normal_distribution.h | 6 +++---
.../__cxx03/__random/piecewise_constant_distribution.h | 6 +++---
.../__cxx03/__random/piecewise_linear_distribution.h | 6 +++---
libcxx/include/__cxx03/__random/poisson_distribution.h | 6 +++---
libcxx/include/__cxx03/__random/random_device.h | 6 +++---
libcxx/include/__cxx03/__random/ranlux.h | 6 +++---
libcxx/include/__cxx03/__random/seed_seq.h | 6 +++---
libcxx/include/__cxx03/__random/shuffle_order_engine.h | 6 +++---
libcxx/include/__cxx03/__random/student_t_distribution.h | 6 +++---
.../include/__cxx03/__random/subtract_with_carry_engine.h | 6 +++---
.../include/__cxx03/__random/uniform_int_distribution.h | 6 +++---
.../__cxx03/__random/uniform_random_bit_generator.h | 6 +++---
.../include/__cxx03/__random/uniform_real_distribution.h | 6 +++---
libcxx/include/__cxx03/__random/weibull_distribution.h | 6 +++---
libcxx/include/__cxx03/__ranges/access.h | 6 +++---
libcxx/include/__cxx03/__ranges/all.h | 6 +++---
libcxx/include/__cxx03/__ranges/as_rvalue_view.h | 6 +++---
libcxx/include/__cxx03/__ranges/chunk_by_view.h | 6 +++---
libcxx/include/__cxx03/__ranges/common_view.h | 6 +++---
libcxx/include/__cxx03/__ranges/concepts.h | 6 +++---
.../include/__cxx03/__ranges/container_compatible_range.h | 6 +++---
libcxx/include/__cxx03/__ranges/counted.h | 6 +++---
libcxx/include/__cxx03/__ranges/dangling.h | 6 +++---
libcxx/include/__cxx03/__ranges/data.h | 6 +++---
libcxx/include/__cxx03/__ranges/drop_view.h | 6 +++---
libcxx/include/__cxx03/__ranges/drop_while_view.h | 6 +++---
libcxx/include/__cxx03/__ranges/elements_view.h | 6 +++---
libcxx/include/__cxx03/__ranges/empty.h | 6 +++---
libcxx/include/__cxx03/__ranges/empty_view.h | 6 +++---
libcxx/include/__cxx03/__ranges/enable_borrowed_range.h | 6 +++---
libcxx/include/__cxx03/__ranges/enable_view.h | 6 +++---
libcxx/include/__cxx03/__ranges/filter_view.h | 6 +++---
libcxx/include/__cxx03/__ranges/from_range.h | 6 +++---
libcxx/include/__cxx03/__ranges/iota_view.h | 6 +++---
libcxx/include/__cxx03/__ranges/istream_view.h | 6 +++---
libcxx/include/__cxx03/__ranges/join_view.h | 6 +++---
libcxx/include/__cxx03/__ranges/lazy_split_view.h | 6 +++---
libcxx/include/__cxx03/__ranges/movable_box.h | 6 +++---
libcxx/include/__cxx03/__ranges/non_propagating_cache.h | 6 +++---
libcxx/include/__cxx03/__ranges/owning_view.h | 6 +++---
libcxx/include/__cxx03/__ranges/range_adaptor.h | 6 +++---
libcxx/include/__cxx03/__ranges/rbegin.h | 6 +++---
libcxx/include/__cxx03/__ranges/ref_view.h | 6 +++---
libcxx/include/__cxx03/__ranges/rend.h | 6 +++---
libcxx/include/__cxx03/__ranges/repeat_view.h | 6 +++---
libcxx/include/__cxx03/__ranges/reverse_view.h | 6 +++---
libcxx/include/__cxx03/__ranges/single_view.h | 6 +++---
libcxx/include/__cxx03/__ranges/size.h | 6 +++---
libcxx/include/__cxx03/__ranges/split_view.h | 6 +++---
libcxx/include/__cxx03/__ranges/subrange.h | 6 +++---
libcxx/include/__cxx03/__ranges/take_view.h | 6 +++---
libcxx/include/__cxx03/__ranges/take_while_view.h | 6 +++---
libcxx/include/__cxx03/__ranges/to.h | 6 +++---
libcxx/include/__cxx03/__ranges/transform_view.h | 6 +++---
libcxx/include/__cxx03/__ranges/view_interface.h | 6 +++---
libcxx/include/__cxx03/__ranges/views.h | 6 +++---
libcxx/include/__cxx03/__ranges/zip_view.h | 6 +++---
libcxx/include/__cxx03/__split_buffer | 6 +++---
libcxx/include/__cxx03/__std_mbstate_t.h | 6 +++---
libcxx/include/__cxx03/__stop_token/atomic_unique_lock.h | 6 +++---
libcxx/include/__cxx03/__stop_token/intrusive_list_view.h | 6 +++---
.../include/__cxx03/__stop_token/intrusive_shared_ptr.h | 6 +++---
libcxx/include/__cxx03/__stop_token/stop_callback.h | 6 +++---
libcxx/include/__cxx03/__stop_token/stop_source.h | 6 +++---
libcxx/include/__cxx03/__stop_token/stop_state.h | 6 +++---
libcxx/include/__cxx03/__stop_token/stop_token.h | 6 +++---
libcxx/include/__cxx03/__string/char_traits.h | 6 +++---
libcxx/include/__cxx03/__string/constexpr_c_functions.h | 6 +++---
libcxx/include/__cxx03/__string/extern_template_lists.h | 6 +++---
libcxx/include/__cxx03/__support/ibm/gettod_zos.h | 6 +++---
libcxx/include/__cxx03/__support/ibm/locale_mgmt_zos.h | 6 +++---
libcxx/include/__cxx03/__support/ibm/nanosleep.h | 6 +++---
.../include/__cxx03/__support/xlocale/__nop_locale_mgmt.h | 6 +++---
.../__cxx03/__support/xlocale/__posix_l_fallback.h | 6 +++---
.../__cxx03/__support/xlocale/__strtonum_fallback.h | 6 +++---
libcxx/include/__cxx03/__system_error/errc.h | 6 +++---
libcxx/include/__cxx03/__system_error/error_category.h | 6 +++---
libcxx/include/__cxx03/__system_error/error_code.h | 6 +++---
libcxx/include/__cxx03/__system_error/error_condition.h | 6 +++---
libcxx/include/__cxx03/__system_error/system_error.h | 6 +++---
libcxx/include/__cxx03/__thread/formatter.h | 6 +++---
libcxx/include/__cxx03/__thread/id.h | 6 +++---
libcxx/include/__cxx03/__thread/jthread.h | 6 +++---
libcxx/include/__cxx03/__thread/poll_with_backoff.h | 6 +++---
libcxx/include/__cxx03/__thread/support.h | 6 +++---
libcxx/include/__cxx03/__thread/support/c11.h | 6 +++---
libcxx/include/__cxx03/__thread/support/external.h | 6 +++---
libcxx/include/__cxx03/__thread/support/pthread.h | 6 +++---
libcxx/include/__cxx03/__thread/support/windows.h | 6 +++---
libcxx/include/__cxx03/__thread/this_thread.h | 6 +++---
libcxx/include/__cxx03/__thread/thread.h | 6 +++---
libcxx/include/__cxx03/__thread/timed_backoff_policy.h | 6 +++---
libcxx/include/__cxx03/__tree | 6 +++---
libcxx/include/__cxx03/__tuple/find_index.h | 6 +++---
libcxx/include/__cxx03/__tuple/ignore.h | 6 +++---
libcxx/include/__cxx03/__tuple/make_tuple_types.h | 6 +++---
libcxx/include/__cxx03/__tuple/sfinae_helpers.h | 6 +++---
libcxx/include/__cxx03/__tuple/tuple_element.h | 6 +++---
libcxx/include/__cxx03/__tuple/tuple_indices.h | 6 +++---
libcxx/include/__cxx03/__tuple/tuple_like.h | 6 +++---
libcxx/include/__cxx03/__tuple/tuple_like_ext.h | 6 +++---
libcxx/include/__cxx03/__tuple/tuple_like_no_subrange.h | 6 +++---
libcxx/include/__cxx03/__tuple/tuple_size.h | 6 +++---
libcxx/include/__cxx03/__tuple/tuple_types.h | 6 +++---
libcxx/include/__cxx03/__type_traits/add_const.h | 6 +++---
libcxx/include/__cxx03/__type_traits/add_cv.h | 6 +++---
.../include/__cxx03/__type_traits/add_lvalue_reference.h | 6 +++---
libcxx/include/__cxx03/__type_traits/add_pointer.h | 6 +++---
.../include/__cxx03/__type_traits/add_rvalue_reference.h | 6 +++---
libcxx/include/__cxx03/__type_traits/add_volatile.h | 6 +++---
libcxx/include/__cxx03/__type_traits/aligned_storage.h | 6 +++---
libcxx/include/__cxx03/__type_traits/aligned_union.h | 6 +++---
libcxx/include/__cxx03/__type_traits/alignment_of.h | 6 +++---
libcxx/include/__cxx03/__type_traits/can_extract_key.h | 6 +++---
libcxx/include/__cxx03/__type_traits/common_reference.h | 6 +++---
libcxx/include/__cxx03/__type_traits/common_type.h | 6 +++---
libcxx/include/__cxx03/__type_traits/conditional.h | 6 +++---
libcxx/include/__cxx03/__type_traits/conjunction.h | 6 +++---
libcxx/include/__cxx03/__type_traits/copy_cv.h | 6 +++---
libcxx/include/__cxx03/__type_traits/copy_cvref.h | 6 +++---
libcxx/include/__cxx03/__type_traits/datasizeof.h | 6 +++---
libcxx/include/__cxx03/__type_traits/decay.h | 6 +++---
libcxx/include/__cxx03/__type_traits/dependent_type.h | 6 +++---
libcxx/include/__cxx03/__type_traits/desugars_to.h | 6 +++---
libcxx/include/__cxx03/__type_traits/disjunction.h | 6 +++---
libcxx/include/__cxx03/__type_traits/enable_if.h | 6 +++---
libcxx/include/__cxx03/__type_traits/extent.h | 6 +++---
.../__type_traits/has_unique_object_representation.h | 6 +++---
.../__cxx03/__type_traits/has_virtual_destructor.h | 6 +++---
libcxx/include/__cxx03/__type_traits/integral_constant.h | 6 +++---
libcxx/include/__cxx03/__type_traits/invoke.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_abstract.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_aggregate.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_allocator.h | 6 +++---
.../include/__cxx03/__type_traits/is_always_bitcastable.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_arithmetic.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_array.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_assignable.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_base_of.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_bounded_array.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_callable.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_char_like_type.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_class.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_compound.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_const.h | 6 +++---
.../include/__cxx03/__type_traits/is_constant_evaluated.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_constructible.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_convertible.h | 6 +++---
.../include/__cxx03/__type_traits/is_core_convertible.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_destructible.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_empty.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_enum.h | 6 +++---
.../__cxx03/__type_traits/is_equality_comparable.h | 6 +++---
.../include/__cxx03/__type_traits/is_execution_policy.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_final.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_floating_point.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_function.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_fundamental.h | 6 +++---
.../__type_traits/is_implicitly_default_constructible.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_integral.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_literal_type.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_member_pointer.h | 6 +++---
.../include/__cxx03/__type_traits/is_nothrow_assignable.h | 6 +++---
.../__cxx03/__type_traits/is_nothrow_constructible.h | 6 +++---
.../__cxx03/__type_traits/is_nothrow_convertible.h | 6 +++---
.../__cxx03/__type_traits/is_nothrow_destructible.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_null_pointer.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_object.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_pod.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_pointer.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_polymorphic.h | 6 +++---
.../include/__cxx03/__type_traits/is_primary_template.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_reference.h | 6 +++---
.../include/__cxx03/__type_traits/is_reference_wrapper.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_referenceable.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_same.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_scalar.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_signed.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_signed_integer.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_specialization.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_standard_layout.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_swappable.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_trivial.h | 6 +++---
.../__cxx03/__type_traits/is_trivially_assignable.h | 6 +++---
.../__cxx03/__type_traits/is_trivially_constructible.h | 6 +++---
.../include/__cxx03/__type_traits/is_trivially_copyable.h | 6 +++---
.../__cxx03/__type_traits/is_trivially_destructible.h | 6 +++---
.../is_trivially_lexicographically_comparable.h | 6 +++---
.../__cxx03/__type_traits/is_trivially_relocatable.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_unbounded_array.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_union.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_unsigned.h | 6 +++---
.../include/__cxx03/__type_traits/is_unsigned_integer.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_valid_expansion.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_void.h | 6 +++---
libcxx/include/__cxx03/__type_traits/is_volatile.h | 6 +++---
libcxx/include/__cxx03/__type_traits/lazy.h | 6 +++---
.../include/__cxx03/__type_traits/make_32_64_or_128_bit.h | 6 +++---
.../include/__cxx03/__type_traits/make_const_lvalue_ref.h | 6 +++---
libcxx/include/__cxx03/__type_traits/make_signed.h | 6 +++---
libcxx/include/__cxx03/__type_traits/make_unsigned.h | 6 +++---
libcxx/include/__cxx03/__type_traits/maybe_const.h | 6 +++---
libcxx/include/__cxx03/__type_traits/nat.h | 6 +++---
libcxx/include/__cxx03/__type_traits/negation.h | 6 +++---
.../__type_traits/noexcept_move_assign_container.h | 6 +++---
libcxx/include/__cxx03/__type_traits/promote.h | 6 +++---
libcxx/include/__cxx03/__type_traits/rank.h | 6 +++---
libcxx/include/__cxx03/__type_traits/remove_all_extents.h | 6 +++---
libcxx/include/__cxx03/__type_traits/remove_const.h | 6 +++---
libcxx/include/__cxx03/__type_traits/remove_const_ref.h | 6 +++---
libcxx/include/__cxx03/__type_traits/remove_cv.h | 6 +++---
libcxx/include/__cxx03/__type_traits/remove_cvref.h | 6 +++---
libcxx/include/__cxx03/__type_traits/remove_extent.h | 6 +++---
libcxx/include/__cxx03/__type_traits/remove_pointer.h | 6 +++---
libcxx/include/__cxx03/__type_traits/remove_reference.h | 6 +++---
libcxx/include/__cxx03/__type_traits/remove_volatile.h | 6 +++---
libcxx/include/__cxx03/__type_traits/result_of.h | 6 +++---
libcxx/include/__cxx03/__type_traits/strip_signature.h | 6 +++---
libcxx/include/__cxx03/__type_traits/type_identity.h | 6 +++---
libcxx/include/__cxx03/__type_traits/type_list.h | 6 +++---
libcxx/include/__cxx03/__type_traits/underlying_type.h | 6 +++---
libcxx/include/__cxx03/__type_traits/unwrap_ref.h | 6 +++---
libcxx/include/__cxx03/__type_traits/void_t.h | 6 +++---
libcxx/include/__cxx03/__utility/as_const.h | 6 +++---
libcxx/include/__cxx03/__utility/as_lvalue.h | 6 +++---
libcxx/include/__cxx03/__utility/auto_cast.h | 6 +++---
libcxx/include/__cxx03/__utility/cmp.h | 6 +++---
libcxx/include/__cxx03/__utility/convert_to_integral.h | 6 +++---
libcxx/include/__cxx03/__utility/declval.h | 6 +++---
libcxx/include/__cxx03/__utility/empty.h | 6 +++---
libcxx/include/__cxx03/__utility/exception_guard.h | 6 +++---
libcxx/include/__cxx03/__utility/exchange.h | 6 +++---
libcxx/include/__cxx03/__utility/forward.h | 6 +++---
libcxx/include/__cxx03/__utility/forward_like.h | 6 +++---
libcxx/include/__cxx03/__utility/in_place.h | 6 +++---
libcxx/include/__cxx03/__utility/integer_sequence.h | 6 +++---
libcxx/include/__cxx03/__utility/is_pointer_in_range.h | 6 +++---
libcxx/include/__cxx03/__utility/is_valid_range.h | 6 +++---
libcxx/include/__cxx03/__utility/move.h | 6 +++---
libcxx/include/__cxx03/__utility/no_destroy.h | 6 +++---
libcxx/include/__cxx03/__utility/pair.h | 6 +++---
libcxx/include/__cxx03/__utility/piecewise_construct.h | 6 +++---
libcxx/include/__cxx03/__utility/priority_tag.h | 6 +++---
.../include/__cxx03/__utility/private_constructor_tag.h | 6 +++---
libcxx/include/__cxx03/__utility/rel_ops.h | 6 +++---
libcxx/include/__cxx03/__utility/small_buffer.h | 6 +++---
libcxx/include/__cxx03/__utility/swap.h | 6 +++---
libcxx/include/__cxx03/__utility/to_underlying.h | 6 +++---
libcxx/include/__cxx03/__utility/unreachable.h | 6 +++---
libcxx/include/__cxx03/__variant/monostate.h | 6 +++---
libcxx/include/__cxx03/__verbose_abort | 6 +++---
libcxx/include/__cxx03/algorithm | 6 +++---
libcxx/include/__cxx03/any | 6 +++---
libcxx/include/__cxx03/array | 6 +++---
libcxx/include/__cxx03/atomic | 8 ++++----
libcxx/include/__cxx03/barrier | 6 +++---
libcxx/include/__cxx03/bit | 6 +++---
libcxx/include/__cxx03/bitset | 6 +++---
libcxx/include/__cxx03/ccomplex | 6 +++---
libcxx/include/__cxx03/cctype | 8 ++++----
libcxx/include/__cxx03/cerrno | 8 ++++----
libcxx/include/__cxx03/cfenv | 8 ++++----
libcxx/include/__cxx03/cfloat | 8 ++++----
libcxx/include/__cxx03/charconv | 6 +++---
libcxx/include/__cxx03/chrono | 6 +++---
libcxx/include/__cxx03/cinttypes | 8 ++++----
libcxx/include/__cxx03/ciso646 | 6 +++---
libcxx/include/__cxx03/climits | 6 +++---
libcxx/include/__cxx03/clocale | 8 ++++----
libcxx/include/__cxx03/cmath | 8 ++++----
libcxx/include/__cxx03/codecvt | 6 +++---
libcxx/include/__cxx03/compare | 6 +++---
libcxx/include/__cxx03/complex | 6 +++---
libcxx/include/__cxx03/complex.h | 6 +++---
libcxx/include/__cxx03/concepts | 6 +++---
libcxx/include/__cxx03/condition_variable | 6 +++---
libcxx/include/__cxx03/coroutine | 6 +++---
libcxx/include/__cxx03/csetjmp | 8 ++++----
libcxx/include/__cxx03/csignal | 8 ++++----
libcxx/include/__cxx03/cstdarg | 8 ++++----
libcxx/include/__cxx03/cstdbool | 6 +++---
libcxx/include/__cxx03/cstddef | 8 ++++----
libcxx/include/__cxx03/cstdint | 8 ++++----
libcxx/include/__cxx03/cstdio | 8 ++++----
libcxx/include/__cxx03/cstdlib | 8 ++++----
libcxx/include/__cxx03/cstring | 8 ++++----
libcxx/include/__cxx03/ctgmath | 6 +++---
libcxx/include/__cxx03/ctime | 8 ++++----
libcxx/include/__cxx03/ctype.h | 6 +++---
libcxx/include/__cxx03/cuchar | 8 ++++----
libcxx/include/__cxx03/cwchar | 8 ++++----
libcxx/include/__cxx03/cwctype | 8 ++++----
libcxx/include/__cxx03/deque | 6 +++---
libcxx/include/__cxx03/errno.h | 6 +++---
libcxx/include/__cxx03/exception | 6 +++---
libcxx/include/__cxx03/execution | 6 +++---
libcxx/include/__cxx03/expected | 6 +++---
libcxx/include/__cxx03/experimental/__config | 4 ++--
libcxx/include/__cxx03/experimental/__simd/aligned_tag.h | 6 +++---
libcxx/include/__cxx03/experimental/__simd/declaration.h | 6 +++---
libcxx/include/__cxx03/experimental/__simd/reference.h | 6 +++---
libcxx/include/__cxx03/experimental/__simd/scalar.h | 6 +++---
libcxx/include/__cxx03/experimental/__simd/simd.h | 6 +++---
libcxx/include/__cxx03/experimental/__simd/simd_mask.h | 6 +++---
libcxx/include/__cxx03/experimental/__simd/traits.h | 6 +++---
libcxx/include/__cxx03/experimental/__simd/utility.h | 6 +++---
libcxx/include/__cxx03/experimental/__simd/vec_ext.h | 6 +++---
libcxx/include/__cxx03/experimental/iterator | 6 +++---
libcxx/include/__cxx03/experimental/memory | 6 +++---
libcxx/include/__cxx03/experimental/propagate_const | 6 +++---
libcxx/include/__cxx03/experimental/simd | 6 +++---
libcxx/include/__cxx03/experimental/type_traits | 6 +++---
libcxx/include/__cxx03/experimental/utility | 6 +++---
libcxx/include/__cxx03/ext/__hash | 6 +++---
libcxx/include/__cxx03/ext/hash_map | 6 +++---
libcxx/include/__cxx03/ext/hash_set | 6 +++---
libcxx/include/__cxx03/fenv.h | 6 +++---
libcxx/include/__cxx03/filesystem | 6 +++---
libcxx/include/__cxx03/float.h | 6 +++---
libcxx/include/__cxx03/format | 6 +++---
libcxx/include/__cxx03/forward_list | 6 +++---
libcxx/include/__cxx03/fstream | 6 +++---
libcxx/include/__cxx03/functional | 6 +++---
libcxx/include/__cxx03/future | 6 +++---
libcxx/include/__cxx03/initializer_list | 6 +++---
libcxx/include/__cxx03/inttypes.h | 6 +++---
libcxx/include/__cxx03/iomanip | 6 +++---
libcxx/include/__cxx03/ios | 6 +++---
libcxx/include/__cxx03/iosfwd | 6 +++---
libcxx/include/__cxx03/iostream | 6 +++---
libcxx/include/__cxx03/istream | 6 +++---
libcxx/include/__cxx03/iterator | 6 +++---
libcxx/include/__cxx03/latch | 6 +++---
libcxx/include/__cxx03/limits | 6 +++---
libcxx/include/__cxx03/list | 6 +++---
libcxx/include/__cxx03/locale | 6 +++---
libcxx/include/__cxx03/locale.h | 6 +++---
libcxx/include/__cxx03/map | 6 +++---
libcxx/include/__cxx03/math.h | 8 ++++----
libcxx/include/__cxx03/mdspan | 6 +++---
libcxx/include/__cxx03/memory | 6 +++---
libcxx/include/__cxx03/memory_resource | 6 +++---
libcxx/include/__cxx03/mutex | 6 +++---
libcxx/include/__cxx03/new | 6 +++---
libcxx/include/__cxx03/numbers | 6 +++---
libcxx/include/__cxx03/numeric | 6 +++---
libcxx/include/__cxx03/optional | 6 +++---
libcxx/include/__cxx03/ostream | 6 +++---
libcxx/include/__cxx03/print | 6 +++---
libcxx/include/__cxx03/queue | 6 +++---
libcxx/include/__cxx03/random | 6 +++---
libcxx/include/__cxx03/ranges | 6 +++---
libcxx/include/__cxx03/ratio | 6 +++---
libcxx/include/__cxx03/regex | 6 +++---
libcxx/include/__cxx03/scoped_allocator | 6 +++---
libcxx/include/__cxx03/semaphore | 6 +++---
libcxx/include/__cxx03/set | 6 +++---
libcxx/include/__cxx03/shared_mutex | 6 +++---
libcxx/include/__cxx03/source_location | 6 +++---
libcxx/include/__cxx03/span | 6 +++---
libcxx/include/__cxx03/sstream | 6 +++---
libcxx/include/__cxx03/stack | 6 +++---
libcxx/include/__cxx03/stdatomic.h | 6 +++---
libcxx/include/__cxx03/stdbool.h | 6 +++---
libcxx/include/__cxx03/stddef.h | 6 +++---
libcxx/include/__cxx03/stdexcept | 6 +++---
libcxx/include/__cxx03/stdint.h | 6 +++---
libcxx/include/__cxx03/stdio.h | 6 +++---
libcxx/include/__cxx03/stdlib.h | 6 +++---
libcxx/include/__cxx03/stop_token | 6 +++---
libcxx/include/__cxx03/streambuf | 6 +++---
libcxx/include/__cxx03/string | 6 +++---
libcxx/include/__cxx03/string.h | 6 +++---
libcxx/include/__cxx03/string_view | 6 +++---
libcxx/include/__cxx03/strstream | 6 +++---
libcxx/include/__cxx03/syncstream | 6 +++---
libcxx/include/__cxx03/system_error | 6 +++---
libcxx/include/__cxx03/tgmath.h | 6 +++---
libcxx/include/__cxx03/thread | 6 +++---
libcxx/include/__cxx03/tuple | 6 +++---
libcxx/include/__cxx03/type_traits | 6 +++---
libcxx/include/__cxx03/typeindex | 6 +++---
libcxx/include/__cxx03/typeinfo | 6 +++---
libcxx/include/__cxx03/uchar.h | 6 +++---
libcxx/include/__cxx03/unordered_map | 6 +++---
libcxx/include/__cxx03/unordered_set | 6 +++---
libcxx/include/__cxx03/utility | 6 +++---
libcxx/include/__cxx03/valarray | 6 +++---
libcxx/include/__cxx03/variant | 6 +++---
libcxx/include/__cxx03/vector | 6 +++---
libcxx/include/__cxx03/wchar.h | 6 +++---
libcxx/include/__cxx03/wctype.h | 6 +++---
1013 files changed, 3059 insertions(+), 3059 deletions(-)
diff --git a/libcxx/include/__cxx03/__algorithm/adjacent_find.h b/libcxx/include/__cxx03/__algorithm/adjacent_find.h
index 88036db84de899..6add0f3fe2b53a 100644
--- a/libcxx/include/__cxx03/__algorithm/adjacent_find.h
+++ b/libcxx/include/__cxx03/__algorithm/adjacent_find.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_ADJACENT_FIND_H
-#define _LIBCPP___ALGORITHM_ADJACENT_FIND_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_ADJACENT_FIND_H
+#define _LIBCPP___CXX03___ALGORITHM_ADJACENT_FIND_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -55,4 +55,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_ADJACENT_FIND_H
+#endif // _LIBCPP___CXX03___ALGORITHM_ADJACENT_FIND_H
diff --git a/libcxx/include/__cxx03/__algorithm/all_of.h b/libcxx/include/__cxx03/__algorithm/all_of.h
index b32d97241506e0..fe46ee5fca43cf 100644
--- a/libcxx/include/__cxx03/__algorithm/all_of.h
+++ b/libcxx/include/__cxx03/__algorithm/all_of.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_ALL_OF_H
-#define _LIBCPP___ALGORITHM_ALL_OF_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_ALL_OF_H
+#define _LIBCPP___CXX03___ALGORITHM_ALL_OF_H
#include <__cxx03/__config>
@@ -29,4 +29,4 @@ all_of(_InputIterator __first, _InputIterator __last, _Predicate __pred) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_ALL_OF_H
+#endif // _LIBCPP___CXX03___ALGORITHM_ALL_OF_H
diff --git a/libcxx/include/__cxx03/__algorithm/any_of.h b/libcxx/include/__cxx03/__algorithm/any_of.h
index bd7de96fbef40c..26bf3996e8a6f0 100644
--- a/libcxx/include/__cxx03/__algorithm/any_of.h
+++ b/libcxx/include/__cxx03/__algorithm/any_of.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_ANY_OF_H
-#define _LIBCPP___ALGORITHM_ANY_OF_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_ANY_OF_H
+#define _LIBCPP___CXX03___ALGORITHM_ANY_OF_H
#include <__cxx03/__config>
@@ -29,4 +29,4 @@ any_of(_InputIterator __first, _InputIterator __last, _Predicate __pred) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_ANY_OF_H
+#endif // _LIBCPP___CXX03___ALGORITHM_ANY_OF_H
diff --git a/libcxx/include/__cxx03/__algorithm/binary_search.h b/libcxx/include/__cxx03/__algorithm/binary_search.h
index a93c62b32d7428..a72da8e3966394 100644
--- a/libcxx/include/__cxx03/__algorithm/binary_search.h
+++ b/libcxx/include/__cxx03/__algorithm/binary_search.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_BINARY_SEARCH_H
-#define _LIBCPP___ALGORITHM_BINARY_SEARCH_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_BINARY_SEARCH_H
+#define _LIBCPP___CXX03___ALGORITHM_BINARY_SEARCH_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -36,4 +36,4 @@ binary_search(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __va
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_BINARY_SEARCH_H
+#endif // _LIBCPP___CXX03___ALGORITHM_BINARY_SEARCH_H
diff --git a/libcxx/include/__cxx03/__algorithm/clamp.h b/libcxx/include/__cxx03/__algorithm/clamp.h
index e5e4dbf774dc31..0e4bb0eb6b9508 100644
--- a/libcxx/include/__cxx03/__algorithm/clamp.h
+++ b/libcxx/include/__cxx03/__algorithm/clamp.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_CLAMP_H
-#define _LIBCPP___ALGORITHM_CLAMP_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_CLAMP_H
+#define _LIBCPP___CXX03___ALGORITHM_CLAMP_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__assert>
@@ -41,4 +41,4 @@ clamp(_LIBCPP_LIFETIMEBOUND const _Tp& __v,
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_CLAMP_H
+#endif // _LIBCPP___CXX03___ALGORITHM_CLAMP_H
diff --git a/libcxx/include/__cxx03/__algorithm/comp.h b/libcxx/include/__cxx03/__algorithm/comp.h
index f01e395dc21ea5..0c638b4e4a651f 100644
--- a/libcxx/include/__cxx03/__algorithm/comp.h
+++ b/libcxx/include/__cxx03/__algorithm/comp.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_COMP_H
-#define _LIBCPP___ALGORITHM_COMP_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_COMP_H
+#define _LIBCPP___CXX03___ALGORITHM_COMP_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/desugars_to.h>
@@ -46,4 +46,4 @@ inline const bool __desugars_to_v<__less_tag, __less<>, _Tp, _Tp> = true;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_COMP_H
+#endif // _LIBCPP___CXX03___ALGORITHM_COMP_H
diff --git a/libcxx/include/__cxx03/__algorithm/comp_ref_type.h b/libcxx/include/__cxx03/__algorithm/comp_ref_type.h
index 413bf30c6a64ce..ab793da0ad293c 100644
--- a/libcxx/include/__cxx03/__algorithm/comp_ref_type.h
+++ b/libcxx/include/__cxx03/__algorithm/comp_ref_type.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_COMP_REF_TYPE_H
-#define _LIBCPP___ALGORITHM_COMP_REF_TYPE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_COMP_REF_TYPE_H
+#define _LIBCPP___CXX03___ALGORITHM_COMP_REF_TYPE_H
#include <__cxx03/__assert>
#include <__cxx03/__config>
@@ -64,4 +64,4 @@ using __comp_ref_type = _Comp&;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_COMP_REF_TYPE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_COMP_REF_TYPE_H
diff --git a/libcxx/include/__cxx03/__algorithm/copy.h b/libcxx/include/__cxx03/__algorithm/copy.h
index 6de8df3f980fea..2aa0ab78b78582 100644
--- a/libcxx/include/__cxx03/__algorithm/copy.h
+++ b/libcxx/include/__cxx03/__algorithm/copy.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_COPY_H
-#define _LIBCPP___ALGORITHM_COPY_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_COPY_H
+#define _LIBCPP___CXX03___ALGORITHM_COPY_H
#include <__cxx03/__algorithm/copy_move_common.h>
#include <__cxx03/__algorithm/for_each_segment.h>
@@ -120,4 +120,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_COPY_H
+#endif // _LIBCPP___CXX03___ALGORITHM_COPY_H
diff --git a/libcxx/include/__cxx03/__algorithm/copy_backward.h b/libcxx/include/__cxx03/__algorithm/copy_backward.h
index dd7ff8ada5280c..9262d13d6c1758 100644
--- a/libcxx/include/__cxx03/__algorithm/copy_backward.h
+++ b/libcxx/include/__cxx03/__algorithm/copy_backward.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_COPY_BACKWARD_H
-#define _LIBCPP___ALGORITHM_COPY_BACKWARD_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_COPY_BACKWARD_H
+#define _LIBCPP___CXX03___ALGORITHM_COPY_BACKWARD_H
#include <__cxx03/__algorithm/copy_move_common.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -134,4 +134,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_COPY_BACKWARD_H
+#endif // _LIBCPP___CXX03___ALGORITHM_COPY_BACKWARD_H
diff --git a/libcxx/include/__cxx03/__algorithm/copy_if.h b/libcxx/include/__cxx03/__algorithm/copy_if.h
index 345b12878d3333..2db0c26fb86be1 100644
--- a/libcxx/include/__cxx03/__algorithm/copy_if.h
+++ b/libcxx/include/__cxx03/__algorithm/copy_if.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_COPY_IF_H
-#define _LIBCPP___ALGORITHM_COPY_IF_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_COPY_IF_H
+#define _LIBCPP___CXX03___ALGORITHM_COPY_IF_H
#include <__cxx03/__config>
@@ -31,4 +31,4 @@ copy_if(_InputIterator __first, _InputIterator __last, _OutputIterator __result,
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_COPY_IF_H
+#endif // _LIBCPP___CXX03___ALGORITHM_COPY_IF_H
diff --git a/libcxx/include/__cxx03/__algorithm/copy_move_common.h b/libcxx/include/__cxx03/__algorithm/copy_move_common.h
index c5983070251764..637b5a01daa75e 100644
--- a/libcxx/include/__cxx03/__algorithm/copy_move_common.h
+++ b/libcxx/include/__cxx03/__algorithm/copy_move_common.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_COPY_MOVE_COMMON_H
-#define _LIBCPP___ALGORITHM_COPY_MOVE_COMMON_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_COPY_MOVE_COMMON_H
+#define _LIBCPP___CXX03___ALGORITHM_COPY_MOVE_COMMON_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__algorithm/unwrap_iter.h>
@@ -111,4 +111,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_COPY_MOVE_COMMON_H
+#endif // _LIBCPP___CXX03___ALGORITHM_COPY_MOVE_COMMON_H
diff --git a/libcxx/include/__cxx03/__algorithm/copy_n.h b/libcxx/include/__cxx03/__algorithm/copy_n.h
index 14f14029443359..aedb232b1bd5e3 100644
--- a/libcxx/include/__cxx03/__algorithm/copy_n.h
+++ b/libcxx/include/__cxx03/__algorithm/copy_n.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_COPY_N_H
-#define _LIBCPP___ALGORITHM_COPY_N_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_COPY_N_H
+#define _LIBCPP___CXX03___ALGORITHM_COPY_N_H
#include <__cxx03/__algorithm/copy.h>
#include <__cxx03/__config>
@@ -57,4 +57,4 @@ copy_n(_InputIterator __first, _Size __orig_n, _OutputIterator __result) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_COPY_N_H
+#endif // _LIBCPP___CXX03___ALGORITHM_COPY_N_H
diff --git a/libcxx/include/__cxx03/__algorithm/count.h b/libcxx/include/__cxx03/__algorithm/count.h
index b7024dc8c63180..7c1fc3e5798980 100644
--- a/libcxx/include/__cxx03/__algorithm/count.h
+++ b/libcxx/include/__cxx03/__algorithm/count.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_COUNT_H
-#define _LIBCPP___ALGORITHM_COUNT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_COUNT_H
+#define _LIBCPP___CXX03___ALGORITHM_COUNT_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__algorithm/min.h>
@@ -89,4 +89,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_COUNT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_COUNT_H
diff --git a/libcxx/include/__cxx03/__algorithm/count_if.h b/libcxx/include/__cxx03/__algorithm/count_if.h
index eeb42052b08ae1..d333e861891763 100644
--- a/libcxx/include/__cxx03/__algorithm/count_if.h
+++ b/libcxx/include/__cxx03/__algorithm/count_if.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_COUNT_IF_H
-#define _LIBCPP___ALGORITHM_COUNT_IF_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_COUNT_IF_H
+#define _LIBCPP___CXX03___ALGORITHM_COUNT_IF_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/iterator_traits.h>
@@ -32,4 +32,4 @@ count_if(_InputIterator __first, _InputIterator __last, _Predicate __pred) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_COUNT_IF_H
+#endif // _LIBCPP___CXX03___ALGORITHM_COUNT_IF_H
diff --git a/libcxx/include/__cxx03/__algorithm/equal.h b/libcxx/include/__cxx03/__algorithm/equal.h
index a4d0a999b18192..4e478932981e7b 100644
--- a/libcxx/include/__cxx03/__algorithm/equal.h
+++ b/libcxx/include/__cxx03/__algorithm/equal.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_EQUAL_H
-#define _LIBCPP___ALGORITHM_EQUAL_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_EQUAL_H
+#define _LIBCPP___CXX03___ALGORITHM_EQUAL_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/unwrap_iter.h>
@@ -130,4 +130,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_EQUAL_H
+#endif // _LIBCPP___CXX03___ALGORITHM_EQUAL_H
diff --git a/libcxx/include/__cxx03/__algorithm/equal_range.h b/libcxx/include/__cxx03/__algorithm/equal_range.h
index 9abda2bd2e36f9..4b3126a2840cf4 100644
--- a/libcxx/include/__cxx03/__algorithm/equal_range.h
+++ b/libcxx/include/__cxx03/__algorithm/equal_range.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_EQUAL_RANGE_H
-#define _LIBCPP___ALGORITHM_EQUAL_RANGE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_EQUAL_RANGE_H
+#define _LIBCPP___CXX03___ALGORITHM_EQUAL_RANGE_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -82,4 +82,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_EQUAL_RANGE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_EQUAL_RANGE_H
diff --git a/libcxx/include/__cxx03/__algorithm/fill.h b/libcxx/include/__cxx03/__algorithm/fill.h
index 5da0f4457daa69..4aaf2744e8a585 100644
--- a/libcxx/include/__cxx03/__algorithm/fill.h
+++ b/libcxx/include/__cxx03/__algorithm/fill.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_FILL_H
-#define _LIBCPP___ALGORITHM_FILL_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_FILL_H
+#define _LIBCPP___CXX03___ALGORITHM_FILL_H
#include <__cxx03/__algorithm/fill_n.h>
#include <__cxx03/__config>
@@ -42,4 +42,4 @@ fill(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_FILL_H
+#endif // _LIBCPP___CXX03___ALGORITHM_FILL_H
diff --git a/libcxx/include/__cxx03/__algorithm/fill_n.h b/libcxx/include/__cxx03/__algorithm/fill_n.h
index fd548f27056a17..99b712c7b0360c 100644
--- a/libcxx/include/__cxx03/__algorithm/fill_n.h
+++ b/libcxx/include/__cxx03/__algorithm/fill_n.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_FILL_N_H
-#define _LIBCPP___ALGORITHM_FILL_N_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_FILL_N_H
+#define _LIBCPP___CXX03___ALGORITHM_FILL_N_H
#include <__cxx03/__algorithm/min.h>
#include <__cxx03/__config>
@@ -95,4 +95,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_FILL_N_H
+#endif // _LIBCPP___CXX03___ALGORITHM_FILL_N_H
diff --git a/libcxx/include/__cxx03/__algorithm/find.h b/libcxx/include/__cxx03/__algorithm/find.h
index 7a48a449c897bb..ff5ac9b8b1bd0a 100644
--- a/libcxx/include/__cxx03/__algorithm/find.h
+++ b/libcxx/include/__cxx03/__algorithm/find.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_FIND_H
-#define _LIBCPP___ALGORITHM_FIND_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_FIND_H
+#define _LIBCPP___CXX03___ALGORITHM_FIND_H
#include <__cxx03/__algorithm/find_segment_if.h>
#include <__cxx03/__algorithm/min.h>
@@ -178,4 +178,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_FIND_H
+#endif // _LIBCPP___CXX03___ALGORITHM_FIND_H
diff --git a/libcxx/include/__cxx03/__algorithm/find_end.h b/libcxx/include/__cxx03/__algorithm/find_end.h
index 34a45e2c66fae9..3fa046bd0df3ec 100644
--- a/libcxx/include/__cxx03/__algorithm/find_end.h
+++ b/libcxx/include/__cxx03/__algorithm/find_end.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_FIND_END_OF_H
-#define _LIBCPP___ALGORITHM_FIND_END_OF_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_FIND_END_OF_H
+#define _LIBCPP___CXX03___ALGORITHM_FIND_END_OF_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -222,4 +222,4 @@ find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_FIND_END_OF_H
+#endif // _LIBCPP___CXX03___ALGORITHM_FIND_END_OF_H
diff --git a/libcxx/include/__cxx03/__algorithm/find_first_of.h b/libcxx/include/__cxx03/__algorithm/find_first_of.h
index 05eb85fd663d27..b1b3e5f3be01e5 100644
--- a/libcxx/include/__cxx03/__algorithm/find_first_of.h
+++ b/libcxx/include/__cxx03/__algorithm/find_first_of.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_FIND_FIRST_OF_H
-#define _LIBCPP___ALGORITHM_FIND_FIRST_OF_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_FIND_FIRST_OF_H
+#define _LIBCPP___CXX03___ALGORITHM_FIND_FIRST_OF_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__config>
@@ -52,4 +52,4 @@ _LIBCPP_NODISCARD inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _Fo
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_FIND_FIRST_OF_H
+#endif // _LIBCPP___CXX03___ALGORITHM_FIND_FIRST_OF_H
diff --git a/libcxx/include/__cxx03/__algorithm/find_if.h b/libcxx/include/__cxx03/__algorithm/find_if.h
index b0150e539f9abc..ca4139c86787c0 100644
--- a/libcxx/include/__cxx03/__algorithm/find_if.h
+++ b/libcxx/include/__cxx03/__algorithm/find_if.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_FIND_IF_H
-#define _LIBCPP___ALGORITHM_FIND_IF_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_FIND_IF_H
+#define _LIBCPP___CXX03___ALGORITHM_FIND_IF_H
#include <__cxx03/__config>
@@ -29,4 +29,4 @@ find_if(_InputIterator __first, _InputIterator __last, _Predicate __pred) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_FIND_IF_H
+#endif // _LIBCPP___CXX03___ALGORITHM_FIND_IF_H
diff --git a/libcxx/include/__cxx03/__algorithm/find_if_not.h b/libcxx/include/__cxx03/__algorithm/find_if_not.h
index 67d9a7deb2edd9..a662dfbddfbb93 100644
--- a/libcxx/include/__cxx03/__algorithm/find_if_not.h
+++ b/libcxx/include/__cxx03/__algorithm/find_if_not.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_FIND_IF_NOT_H
-#define _LIBCPP___ALGORITHM_FIND_IF_NOT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_FIND_IF_NOT_H
+#define _LIBCPP___CXX03___ALGORITHM_FIND_IF_NOT_H
#include <__cxx03/__config>
@@ -29,4 +29,4 @@ find_if_not(_InputIterator __first, _InputIterator __last, _Predicate __pred) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_FIND_IF_NOT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_FIND_IF_NOT_H
diff --git a/libcxx/include/__cxx03/__algorithm/find_segment_if.h b/libcxx/include/__cxx03/__algorithm/find_segment_if.h
index a6c016234418eb..3475e9e8bdacd6 100644
--- a/libcxx/include/__cxx03/__algorithm/find_segment_if.h
+++ b/libcxx/include/__cxx03/__algorithm/find_segment_if.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_FIND_SEGMENT_IF_H
-#define _LIBCPP___ALGORITHM_FIND_SEGMENT_IF_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_FIND_SEGMENT_IF_H
+#define _LIBCPP___CXX03___ALGORITHM_FIND_SEGMENT_IF_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/segmented_iterator.h>
@@ -59,4 +59,4 @@ __find_segment_if(_SegmentedIterator __first, _SegmentedIterator __last, _Pred _
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_FIND_SEGMENT_IF_H
+#endif // _LIBCPP___CXX03___ALGORITHM_FIND_SEGMENT_IF_H
diff --git a/libcxx/include/__cxx03/__algorithm/fold.h b/libcxx/include/__cxx03/__algorithm/fold.h
index 7e9c745bbbdb25..5ec0d747c009cb 100644
--- a/libcxx/include/__cxx03/__algorithm/fold.h
+++ b/libcxx/include/__cxx03/__algorithm/fold.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_FOLD_H
-#define _LIBCPP___ALGORITHM_FOLD_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_FOLD_H
+#define _LIBCPP___CXX03___ALGORITHM_FOLD_H
#include <__cxx03/__concepts/assignable.h>
#include <__cxx03/__concepts/convertible_to.h>
@@ -125,4 +125,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_FOLD_H
+#endif // _LIBCPP___CXX03___ALGORITHM_FOLD_H
diff --git a/libcxx/include/__cxx03/__algorithm/for_each.h b/libcxx/include/__cxx03/__algorithm/for_each.h
index d2b19310c60f55..a6faf805fe9cfb 100644
--- a/libcxx/include/__cxx03/__algorithm/for_each.h
+++ b/libcxx/include/__cxx03/__algorithm/for_each.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_FOR_EACH_H
-#define _LIBCPP___ALGORITHM_FOR_EACH_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_FOR_EACH_H
+#define _LIBCPP___CXX03___ALGORITHM_FOR_EACH_H
#include <__cxx03/__algorithm/for_each_segment.h>
#include <__cxx03/__config>
@@ -54,4 +54,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_FOR_EACH_H
+#endif // _LIBCPP___CXX03___ALGORITHM_FOR_EACH_H
diff --git a/libcxx/include/__cxx03/__algorithm/for_each_n.h b/libcxx/include/__cxx03/__algorithm/for_each_n.h
index 7b8c40eacf9671..486a5266ad0113 100644
--- a/libcxx/include/__cxx03/__algorithm/for_each_n.h
+++ b/libcxx/include/__cxx03/__algorithm/for_each_n.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_FOR_EACH_N_H
-#define _LIBCPP___ALGORITHM_FOR_EACH_N_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_FOR_EACH_N_H
+#define _LIBCPP___CXX03___ALGORITHM_FOR_EACH_N_H
#include <__cxx03/__config>
#include <__cxx03/__utility/convert_to_integral.h>
@@ -38,4 +38,4 @@ for_each_n(_InputIterator __first, _Size __orig_n, _Function __f) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_FOR_EACH_N_H
+#endif // _LIBCPP___CXX03___ALGORITHM_FOR_EACH_N_H
diff --git a/libcxx/include/__cxx03/__algorithm/for_each_segment.h b/libcxx/include/__cxx03/__algorithm/for_each_segment.h
index 50c4b28deba02c..02b4a1799d6a87 100644
--- a/libcxx/include/__cxx03/__algorithm/for_each_segment.h
+++ b/libcxx/include/__cxx03/__algorithm/for_each_segment.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_FOR_EACH_SEGMENT_H
-#define _LIBCPP___ALGORITHM_FOR_EACH_SEGMENT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_FOR_EACH_SEGMENT_H
+#define _LIBCPP___CXX03___ALGORITHM_FOR_EACH_SEGMENT_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/segmented_iterator.h>
@@ -50,4 +50,4 @@ __for_each_segment(_SegmentedIterator __first, _SegmentedIterator __last, _Funct
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_FOR_EACH_SEGMENT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_FOR_EACH_SEGMENT_H
diff --git a/libcxx/include/__cxx03/__algorithm/generate.h b/libcxx/include/__cxx03/__algorithm/generate.h
index 14da75cd44cebb..fa1929b639ad17 100644
--- a/libcxx/include/__cxx03/__algorithm/generate.h
+++ b/libcxx/include/__cxx03/__algorithm/generate.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_GENERATE_H
-#define _LIBCPP___ALGORITHM_GENERATE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_GENERATE_H
+#define _LIBCPP___CXX03___ALGORITHM_GENERATE_H
#include <__cxx03/__config>
@@ -26,4 +26,4 @@ generate(_ForwardIterator __first, _ForwardIterator __last, _Generator __gen) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_GENERATE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_GENERATE_H
diff --git a/libcxx/include/__cxx03/__algorithm/generate_n.h b/libcxx/include/__cxx03/__algorithm/generate_n.h
index 32cc86911815cd..5a421131070e96 100644
--- a/libcxx/include/__cxx03/__algorithm/generate_n.h
+++ b/libcxx/include/__cxx03/__algorithm/generate_n.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_GENERATE_N_H
-#define _LIBCPP___ALGORITHM_GENERATE_N_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_GENERATE_N_H
+#define _LIBCPP___CXX03___ALGORITHM_GENERATE_N_H
#include <__cxx03/__config>
#include <__cxx03/__utility/convert_to_integral.h>
@@ -30,4 +30,4 @@ generate_n(_OutputIterator __first, _Size __orig_n, _Generator __gen) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_GENERATE_N_H
+#endif // _LIBCPP___CXX03___ALGORITHM_GENERATE_N_H
diff --git a/libcxx/include/__cxx03/__algorithm/half_positive.h b/libcxx/include/__cxx03/__algorithm/half_positive.h
index 4378964d9d8367..a436a6086b5e93 100644
--- a/libcxx/include/__cxx03/__algorithm/half_positive.h
+++ b/libcxx/include/__cxx03/__algorithm/half_positive.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_HALF_POSITIVE_H
-#define _LIBCPP___ALGORITHM_HALF_POSITIVE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_HALF_POSITIVE_H
+#define _LIBCPP___CXX03___ALGORITHM_HALF_POSITIVE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -34,4 +34,4 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR _Tp __half_positive(_Tp __value) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_HALF_POSITIVE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_HALF_POSITIVE_H
diff --git a/libcxx/include/__cxx03/__algorithm/in_found_result.h b/libcxx/include/__cxx03/__algorithm/in_found_result.h
index 0f4895dab437ea..234e17cbd019ae 100644
--- a/libcxx/include/__cxx03/__algorithm/in_found_result.h
+++ b/libcxx/include/__cxx03/__algorithm/in_found_result.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_IN_FOUND_RESULT_H
-#define _LIBCPP___ALGORITHM_IN_FOUND_RESULT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_IN_FOUND_RESULT_H
+#define _LIBCPP___CXX03___ALGORITHM_IN_FOUND_RESULT_H
#include <__cxx03/__concepts/convertible_to.h>
#include <__cxx03/__config>
@@ -51,4 +51,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_IN_FOUND_RESULT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_IN_FOUND_RESULT_H
diff --git a/libcxx/include/__cxx03/__algorithm/in_fun_result.h b/libcxx/include/__cxx03/__algorithm/in_fun_result.h
index 998d4599ceac81..402fbecc3df042 100644
--- a/libcxx/include/__cxx03/__algorithm/in_fun_result.h
+++ b/libcxx/include/__cxx03/__algorithm/in_fun_result.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_IN_FUN_RESULT_H
-#define _LIBCPP___ALGORITHM_IN_FUN_RESULT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_IN_FUN_RESULT_H
+#define _LIBCPP___CXX03___ALGORITHM_IN_FUN_RESULT_H
#include <__cxx03/__concepts/convertible_to.h>
#include <__cxx03/__config>
@@ -51,4 +51,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_IN_FUN_RESULT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_IN_FUN_RESULT_H
diff --git a/libcxx/include/__cxx03/__algorithm/in_in_out_result.h b/libcxx/include/__cxx03/__algorithm/in_in_out_result.h
index bb3a7e5466de0c..cb14a7e654faaa 100644
--- a/libcxx/include/__cxx03/__algorithm/in_in_out_result.h
+++ b/libcxx/include/__cxx03/__algorithm/in_in_out_result.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_IN_IN_OUT_RESULT_H
-#define _LIBCPP___ALGORITHM_IN_IN_OUT_RESULT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_IN_IN_OUT_RESULT_H
+#define _LIBCPP___CXX03___ALGORITHM_IN_IN_OUT_RESULT_H
#include <__cxx03/__concepts/convertible_to.h>
#include <__cxx03/__config>
@@ -56,4 +56,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_IN_IN_OUT_RESULT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_IN_IN_OUT_RESULT_H
diff --git a/libcxx/include/__cxx03/__algorithm/in_in_result.h b/libcxx/include/__cxx03/__algorithm/in_in_result.h
index 12f1b572c58705..3ef349f87ff6cb 100644
--- a/libcxx/include/__cxx03/__algorithm/in_in_result.h
+++ b/libcxx/include/__cxx03/__algorithm/in_in_result.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_IN_IN_RESULT_H
-#define _LIBCPP___ALGORITHM_IN_IN_RESULT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_IN_IN_RESULT_H
+#define _LIBCPP___CXX03___ALGORITHM_IN_IN_RESULT_H
#include <__cxx03/__concepts/convertible_to.h>
#include <__cxx03/__config>
@@ -53,4 +53,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_IN_IN_RESULT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_IN_IN_RESULT_H
diff --git a/libcxx/include/__cxx03/__algorithm/in_out_out_result.h b/libcxx/include/__cxx03/__algorithm/in_out_out_result.h
index c7d18535d10140..de67ac89fefeb1 100644
--- a/libcxx/include/__cxx03/__algorithm/in_out_out_result.h
+++ b/libcxx/include/__cxx03/__algorithm/in_out_out_result.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_IN_OUT_OUT_RESULT_H
-#define _LIBCPP___ALGORITHM_IN_OUT_OUT_RESULT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_IN_OUT_OUT_RESULT_H
+#define _LIBCPP___CXX03___ALGORITHM_IN_OUT_OUT_RESULT_H
#include <__cxx03/__concepts/convertible_to.h>
#include <__cxx03/__config>
@@ -54,4 +54,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_IN_OUT_OUT_RESULT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_IN_OUT_OUT_RESULT_H
diff --git a/libcxx/include/__cxx03/__algorithm/in_out_result.h b/libcxx/include/__cxx03/__algorithm/in_out_result.h
index 66bd1a16669886..e80f5fd7ba77b3 100644
--- a/libcxx/include/__cxx03/__algorithm/in_out_result.h
+++ b/libcxx/include/__cxx03/__algorithm/in_out_result.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_IN_OUT_RESULT_H
-#define _LIBCPP___ALGORITHM_IN_OUT_RESULT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_IN_OUT_RESULT_H
+#define _LIBCPP___CXX03___ALGORITHM_IN_OUT_RESULT_H
#include <__cxx03/__concepts/convertible_to.h>
#include <__cxx03/__config>
@@ -53,4 +53,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_IN_OUT_RESULT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_IN_OUT_RESULT_H
diff --git a/libcxx/include/__cxx03/__algorithm/includes.h b/libcxx/include/__cxx03/__algorithm/includes.h
index 6d3eb44bb8c441..24b46d1f10cb5f 100644
--- a/libcxx/include/__cxx03/__algorithm/includes.h
+++ b/libcxx/include/__cxx03/__algorithm/includes.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_INCLUDES_H
-#define _LIBCPP___ALGORITHM_INCLUDES_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_INCLUDES_H
+#define _LIBCPP___CXX03___ALGORITHM_INCLUDES_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -76,4 +76,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_INCLUDES_H
+#endif // _LIBCPP___CXX03___ALGORITHM_INCLUDES_H
diff --git a/libcxx/include/__cxx03/__algorithm/inplace_merge.h b/libcxx/include/__cxx03/__algorithm/inplace_merge.h
index 3816ba5793c0d8..187969dcc4029e 100644
--- a/libcxx/include/__cxx03/__algorithm/inplace_merge.h
+++ b/libcxx/include/__cxx03/__algorithm/inplace_merge.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_INPLACE_MERGE_H
-#define _LIBCPP___ALGORITHM_INPLACE_MERGE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_INPLACE_MERGE_H
+#define _LIBCPP___CXX03___ALGORITHM_INPLACE_MERGE_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -237,4 +237,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_INPLACE_MERGE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_INPLACE_MERGE_H
diff --git a/libcxx/include/__cxx03/__algorithm/is_heap.h b/libcxx/include/__cxx03/__algorithm/is_heap.h
index dde4bfb6ff2db1..c19adb84ba5705 100644
--- a/libcxx/include/__cxx03/__algorithm/is_heap.h
+++ b/libcxx/include/__cxx03/__algorithm/is_heap.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_IS_HEAP_H
-#define _LIBCPP___ALGORITHM_IS_HEAP_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_IS_HEAP_H
+#define _LIBCPP___CXX03___ALGORITHM_IS_HEAP_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -35,4 +35,4 @@ is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_IS_HEAP_H
+#endif // _LIBCPP___CXX03___ALGORITHM_IS_HEAP_H
diff --git a/libcxx/include/__cxx03/__algorithm/is_heap_until.h b/libcxx/include/__cxx03/__algorithm/is_heap_until.h
index d46dd343115c38..e3a6d9769fcc5b 100644
--- a/libcxx/include/__cxx03/__algorithm/is_heap_until.h
+++ b/libcxx/include/__cxx03/__algorithm/is_heap_until.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_IS_HEAP_UNTIL_H
-#define _LIBCPP___ALGORITHM_IS_HEAP_UNTIL_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_IS_HEAP_UNTIL_H
+#define _LIBCPP___CXX03___ALGORITHM_IS_HEAP_UNTIL_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -59,4 +59,4 @@ is_heap_until(_RandomAccessIterator __first, _RandomAccessIterator __last) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_IS_HEAP_UNTIL_H
+#endif // _LIBCPP___CXX03___ALGORITHM_IS_HEAP_UNTIL_H
diff --git a/libcxx/include/__cxx03/__algorithm/is_partitioned.h b/libcxx/include/__cxx03/__algorithm/is_partitioned.h
index 8bd202f3e2429f..a7dff7bf42544e 100644
--- a/libcxx/include/__cxx03/__algorithm/is_partitioned.h
+++ b/libcxx/include/__cxx03/__algorithm/is_partitioned.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_IS_PARTITIONED_H
-#define _LIBCPP___ALGORITHM_IS_PARTITIONED_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_IS_PARTITIONED_H
+#define _LIBCPP___CXX03___ALGORITHM_IS_PARTITIONED_H
#include <__cxx03/__config>
@@ -34,4 +34,4 @@ is_partitioned(_InputIterator __first, _InputIterator __last, _Predicate __pred)
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_IS_PARTITIONED_H
+#endif // _LIBCPP___CXX03___ALGORITHM_IS_PARTITIONED_H
diff --git a/libcxx/include/__cxx03/__algorithm/is_permutation.h b/libcxx/include/__cxx03/__algorithm/is_permutation.h
index 0274ba98fcd167..fd29e82656a3c2 100644
--- a/libcxx/include/__cxx03/__algorithm/is_permutation.h
+++ b/libcxx/include/__cxx03/__algorithm/is_permutation.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_IS_PERMUTATION_H
-#define _LIBCPP___ALGORITHM_IS_PERMUTATION_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_IS_PERMUTATION_H
+#define _LIBCPP___CXX03___ALGORITHM_IS_PERMUTATION_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -305,4 +305,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_IS_PERMUTATION_H
+#endif // _LIBCPP___CXX03___ALGORITHM_IS_PERMUTATION_H
diff --git a/libcxx/include/__cxx03/__algorithm/is_sorted.h b/libcxx/include/__cxx03/__algorithm/is_sorted.h
index 0a003a86b99132..1318f5baf8394b 100644
--- a/libcxx/include/__cxx03/__algorithm/is_sorted.h
+++ b/libcxx/include/__cxx03/__algorithm/is_sorted.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_IS_SORTED_H
-#define _LIBCPP___ALGORITHM_IS_SORTED_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_IS_SORTED_H
+#define _LIBCPP___CXX03___ALGORITHM_IS_SORTED_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -35,4 +35,4 @@ is_sorted(_ForwardIterator __first, _ForwardIterator __last) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_IS_SORTED_H
+#endif // _LIBCPP___CXX03___ALGORITHM_IS_SORTED_H
diff --git a/libcxx/include/__cxx03/__algorithm/is_sorted_until.h b/libcxx/include/__cxx03/__algorithm/is_sorted_until.h
index eb90e5dd88e676..f97fb7c2e53ef3 100644
--- a/libcxx/include/__cxx03/__algorithm/is_sorted_until.h
+++ b/libcxx/include/__cxx03/__algorithm/is_sorted_until.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_IS_SORTED_UNTIL_H
-#define _LIBCPP___ALGORITHM_IS_SORTED_UNTIL_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_IS_SORTED_UNTIL_H
+#define _LIBCPP___CXX03___ALGORITHM_IS_SORTED_UNTIL_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -48,4 +48,4 @@ is_sorted_until(_ForwardIterator __first, _ForwardIterator __last) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_IS_SORTED_UNTIL_H
+#endif // _LIBCPP___CXX03___ALGORITHM_IS_SORTED_UNTIL_H
diff --git a/libcxx/include/__cxx03/__algorithm/iter_swap.h b/libcxx/include/__cxx03/__algorithm/iter_swap.h
index 837a603d23e322..4fcbcdcf1e050b 100644
--- a/libcxx/include/__cxx03/__algorithm/iter_swap.h
+++ b/libcxx/include/__cxx03/__algorithm/iter_swap.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_ITER_SWAP_H
-#define _LIBCPP___ALGORITHM_ITER_SWAP_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_ITER_SWAP_H
+#define _LIBCPP___CXX03___ALGORITHM_ITER_SWAP_H
#include <__cxx03/__config>
#include <__cxx03/__utility/declval.h>
@@ -28,4 +28,4 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void iter_swap(_Forwa
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_ITER_SWAP_H
+#endif // _LIBCPP___CXX03___ALGORITHM_ITER_SWAP_H
diff --git a/libcxx/include/__cxx03/__algorithm/iterator_operations.h b/libcxx/include/__cxx03/__algorithm/iterator_operations.h
index b4f1f9e3ffca94..24973b66e4f964 100644
--- a/libcxx/include/__cxx03/__algorithm/iterator_operations.h
+++ b/libcxx/include/__cxx03/__algorithm/iterator_operations.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_ITERATOR_OPERATIONS_H
-#define _LIBCPP___ALGORITHM_ITERATOR_OPERATIONS_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_ITERATOR_OPERATIONS_H
+#define _LIBCPP___CXX03___ALGORITHM_ITERATOR_OPERATIONS_H
#include <__cxx03/__algorithm/iter_swap.h>
#include <__cxx03/__algorithm/ranges_iterator_concept.h>
@@ -220,4 +220,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_ITERATOR_OPERATIONS_H
+#endif // _LIBCPP___CXX03___ALGORITHM_ITERATOR_OPERATIONS_H
diff --git a/libcxx/include/__cxx03/__algorithm/lexicographical_compare.h b/libcxx/include/__cxx03/__algorithm/lexicographical_compare.h
index e3d93be6177e7e..b019e4b5021b49 100644
--- a/libcxx/include/__cxx03/__algorithm/lexicographical_compare.h
+++ b/libcxx/include/__cxx03/__algorithm/lexicographical_compare.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_LEXICOGRAPHICAL_COMPARE_H
-#define _LIBCPP___ALGORITHM_LEXICOGRAPHICAL_COMPARE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_LEXICOGRAPHICAL_COMPARE_H
+#define _LIBCPP___CXX03___ALGORITHM_LEXICOGRAPHICAL_COMPARE_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -54,4 +54,4 @@ _LIBCPP_NODISCARD inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 boo
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_LEXICOGRAPHICAL_COMPARE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_LEXICOGRAPHICAL_COMPARE_H
diff --git a/libcxx/include/__cxx03/__algorithm/lexicographical_compare_three_way.h b/libcxx/include/__cxx03/__algorithm/lexicographical_compare_three_way.h
index bea67a79376599..2fc53636abbd44 100644
--- a/libcxx/include/__cxx03/__algorithm/lexicographical_compare_three_way.h
+++ b/libcxx/include/__cxx03/__algorithm/lexicographical_compare_three_way.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_LEXICOGRAPHICAL_COMPARE_THREE_WAY_H
-#define _LIBCPP___ALGORITHM_LEXICOGRAPHICAL_COMPARE_THREE_WAY_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_LEXICOGRAPHICAL_COMPARE_THREE_WAY_H
+#define _LIBCPP___CXX03___ALGORITHM_LEXICOGRAPHICAL_COMPARE_THREE_WAY_H
#include <__cxx03/__algorithm/min.h>
#include <__cxx03/__algorithm/three_way_comp_ref_type.h>
@@ -122,4 +122,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_LEXICOGRAPHICAL_COMPARE_THREE_WAY_H
+#endif // _LIBCPP___CXX03___ALGORITHM_LEXICOGRAPHICAL_COMPARE_THREE_WAY_H
diff --git a/libcxx/include/__cxx03/__algorithm/lower_bound.h b/libcxx/include/__cxx03/__algorithm/lower_bound.h
index 844674cb786043..810792bfe8fe13 100644
--- a/libcxx/include/__cxx03/__algorithm/lower_bound.h
+++ b/libcxx/include/__cxx03/__algorithm/lower_bound.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_LOWER_BOUND_H
-#define _LIBCPP___ALGORITHM_LOWER_BOUND_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_LOWER_BOUND_H
+#define _LIBCPP___CXX03___ALGORITHM_LOWER_BOUND_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/half_positive.h>
@@ -106,4 +106,4 @@ lower_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __valu
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_LOWER_BOUND_H
+#endif // _LIBCPP___CXX03___ALGORITHM_LOWER_BOUND_H
diff --git a/libcxx/include/__cxx03/__algorithm/make_heap.h b/libcxx/include/__cxx03/__algorithm/make_heap.h
index 5239a99083f504..35a7f7bf9779f4 100644
--- a/libcxx/include/__cxx03/__algorithm/make_heap.h
+++ b/libcxx/include/__cxx03/__algorithm/make_heap.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_MAKE_HEAP_H
-#define _LIBCPP___ALGORITHM_MAKE_HEAP_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_MAKE_HEAP_H
+#define _LIBCPP___CXX03___ALGORITHM_MAKE_HEAP_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -57,4 +57,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_MAKE_HEAP_H
+#endif // _LIBCPP___CXX03___ALGORITHM_MAKE_HEAP_H
diff --git a/libcxx/include/__cxx03/__algorithm/make_projected.h b/libcxx/include/__cxx03/__algorithm/make_projected.h
index 8368e269385f4c..ac17c2bba7ba8d 100644
--- a/libcxx/include/__cxx03/__algorithm/make_projected.h
+++ b/libcxx/include/__cxx03/__algorithm/make_projected.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_MAKE_PROJECTED_H
-#define _LIBCPP___ALGORITHM_MAKE_PROJECTED_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_MAKE_PROJECTED_H
+#define _LIBCPP___CXX03___ALGORITHM_MAKE_PROJECTED_H
#include <__cxx03/__concepts/same_as.h>
#include <__cxx03/__config>
@@ -103,4 +103,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___ALGORITHM_MAKE_PROJECTED_H
+#endif // _LIBCPP___CXX03___ALGORITHM_MAKE_PROJECTED_H
diff --git a/libcxx/include/__cxx03/__algorithm/max.h b/libcxx/include/__cxx03/__algorithm/max.h
index 983e81cd24bc48..7726d168271576 100644
--- a/libcxx/include/__cxx03/__algorithm/max.h
+++ b/libcxx/include/__cxx03/__algorithm/max.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_MAX_H
-#define _LIBCPP___ALGORITHM_MAX_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_MAX_H
+#define _LIBCPP___CXX03___ALGORITHM_MAX_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -55,4 +55,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_MAX_H
+#endif // _LIBCPP___CXX03___ALGORITHM_MAX_H
diff --git a/libcxx/include/__cxx03/__algorithm/max_element.h b/libcxx/include/__cxx03/__algorithm/max_element.h
index 686c116ab0105b..20a22e74c8be7d 100644
--- a/libcxx/include/__cxx03/__algorithm/max_element.h
+++ b/libcxx/include/__cxx03/__algorithm/max_element.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_MAX_ELEMENT_H
-#define _LIBCPP___ALGORITHM_MAX_ELEMENT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_MAX_ELEMENT_H
+#define _LIBCPP___CXX03___ALGORITHM_MAX_ELEMENT_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -48,4 +48,4 @@ max_element(_ForwardIterator __first, _ForwardIterator __last) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_MAX_ELEMENT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_MAX_ELEMENT_H
diff --git a/libcxx/include/__cxx03/__algorithm/merge.h b/libcxx/include/__cxx03/__algorithm/merge.h
index 41b0c9263e2fd9..90b986f747a3c1 100644
--- a/libcxx/include/__cxx03/__algorithm/merge.h
+++ b/libcxx/include/__cxx03/__algorithm/merge.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_MERGE_H
-#define _LIBCPP___ALGORITHM_MERGE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_MERGE_H
+#define _LIBCPP___CXX03___ALGORITHM_MERGE_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -66,4 +66,4 @@ merge(_InputIterator1 __first1,
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_MERGE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_MERGE_H
diff --git a/libcxx/include/__cxx03/__algorithm/min.h b/libcxx/include/__cxx03/__algorithm/min.h
index 836f8f00287484..d4801ab3330dad 100644
--- a/libcxx/include/__cxx03/__algorithm/min.h
+++ b/libcxx/include/__cxx03/__algorithm/min.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_MIN_H
-#define _LIBCPP___ALGORITHM_MIN_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_MIN_H
+#define _LIBCPP___CXX03___ALGORITHM_MIN_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -55,4 +55,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_MIN_H
+#endif // _LIBCPP___CXX03___ALGORITHM_MIN_H
diff --git a/libcxx/include/__cxx03/__algorithm/min_element.h b/libcxx/include/__cxx03/__algorithm/min_element.h
index d625ab0886cf7d..aa4f6013e87521 100644
--- a/libcxx/include/__cxx03/__algorithm/min_element.h
+++ b/libcxx/include/__cxx03/__algorithm/min_element.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_MIN_ELEMENT_H
-#define _LIBCPP___ALGORITHM_MIN_ELEMENT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_MIN_ELEMENT_H
+#define _LIBCPP___CXX03___ALGORITHM_MIN_ELEMENT_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -68,4 +68,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_MIN_ELEMENT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_MIN_ELEMENT_H
diff --git a/libcxx/include/__cxx03/__algorithm/min_max_result.h b/libcxx/include/__cxx03/__algorithm/min_max_result.h
index 2b56f88f1f9fec..2098aada70a520 100644
--- a/libcxx/include/__cxx03/__algorithm/min_max_result.h
+++ b/libcxx/include/__cxx03/__algorithm/min_max_result.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_MIN_MAX_RESULT_H
-#define _LIBCPP___ALGORITHM_MIN_MAX_RESULT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_MIN_MAX_RESULT_H
+#define _LIBCPP___CXX03___ALGORITHM_MIN_MAX_RESULT_H
#include <__cxx03/__concepts/convertible_to.h>
#include <__cxx03/__config>
@@ -53,4 +53,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_MIN_MAX_RESULT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_MIN_MAX_RESULT_H
diff --git a/libcxx/include/__cxx03/__algorithm/minmax.h b/libcxx/include/__cxx03/__algorithm/minmax.h
index a36970a0565fee..e09a5b04104aad 100644
--- a/libcxx/include/__cxx03/__algorithm/minmax.h
+++ b/libcxx/include/__cxx03/__algorithm/minmax.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_MINMAX_H
-#define _LIBCPP___ALGORITHM_MINMAX_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_MINMAX_H
+#define _LIBCPP___CXX03___ALGORITHM_MINMAX_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/minmax_element.h>
@@ -56,4 +56,4 @@ minmax(initializer_list<_Tp> __t) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_MINMAX_H
+#endif // _LIBCPP___CXX03___ALGORITHM_MINMAX_H
diff --git a/libcxx/include/__cxx03/__algorithm/minmax_element.h b/libcxx/include/__cxx03/__algorithm/minmax_element.h
index 62987840923540..673c22020ef3ad 100644
--- a/libcxx/include/__cxx03/__algorithm/minmax_element.h
+++ b/libcxx/include/__cxx03/__algorithm/minmax_element.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_MINMAX_ELEMENT_H
-#define _LIBCPP___ALGORITHM_MINMAX_ELEMENT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_MINMAX_ELEMENT_H
+#define _LIBCPP___CXX03___ALGORITHM_MINMAX_ELEMENT_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__config>
@@ -97,4 +97,4 @@ minmax_element(_ForwardIterator __first, _ForwardIterator __last) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_MINMAX_ELEMENT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_MINMAX_ELEMENT_H
diff --git a/libcxx/include/__cxx03/__algorithm/mismatch.h b/libcxx/include/__cxx03/__algorithm/mismatch.h
index 1eb9717c9ae6c9..163bc8fb165c01 100644
--- a/libcxx/include/__cxx03/__algorithm/mismatch.h
+++ b/libcxx/include/__cxx03/__algorithm/mismatch.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_MISMATCH_H
-#define _LIBCPP___ALGORITHM_MISMATCH_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_MISMATCH_H
+#define _LIBCPP___CXX03___ALGORITHM_MISMATCH_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/min.h>
@@ -214,4 +214,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_MISMATCH_H
+#endif // _LIBCPP___CXX03___ALGORITHM_MISMATCH_H
diff --git a/libcxx/include/__cxx03/__algorithm/move.h b/libcxx/include/__cxx03/__algorithm/move.h
index 11366afe99ffb2..cb158e15f19f59 100644
--- a/libcxx/include/__cxx03/__algorithm/move.h
+++ b/libcxx/include/__cxx03/__algorithm/move.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_MOVE_H
-#define _LIBCPP___ALGORITHM_MOVE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_MOVE_H
+#define _LIBCPP___CXX03___ALGORITHM_MOVE_H
#include <__cxx03/__algorithm/copy_move_common.h>
#include <__cxx03/__algorithm/for_each_segment.h>
@@ -124,4 +124,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_MOVE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_MOVE_H
diff --git a/libcxx/include/__cxx03/__algorithm/move_backward.h b/libcxx/include/__cxx03/__algorithm/move_backward.h
index 9d3e87bb9667ee..d4da82382a4c75 100644
--- a/libcxx/include/__cxx03/__algorithm/move_backward.h
+++ b/libcxx/include/__cxx03/__algorithm/move_backward.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_MOVE_BACKWARD_H
-#define _LIBCPP___ALGORITHM_MOVE_BACKWARD_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_MOVE_BACKWARD_H
+#define _LIBCPP___CXX03___ALGORITHM_MOVE_BACKWARD_H
#include <__cxx03/__algorithm/copy_move_common.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -134,4 +134,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_MOVE_BACKWARD_H
+#endif // _LIBCPP___CXX03___ALGORITHM_MOVE_BACKWARD_H
diff --git a/libcxx/include/__cxx03/__algorithm/next_permutation.h b/libcxx/include/__cxx03/__algorithm/next_permutation.h
index 02aa9113d1830c..7d6b2ddad50566 100644
--- a/libcxx/include/__cxx03/__algorithm/next_permutation.h
+++ b/libcxx/include/__cxx03/__algorithm/next_permutation.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_NEXT_PERMUTATION_H
-#define _LIBCPP___ALGORITHM_NEXT_PERMUTATION_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_NEXT_PERMUTATION_H
+#define _LIBCPP___CXX03___ALGORITHM_NEXT_PERMUTATION_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -72,4 +72,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_NEXT_PERMUTATION_H
+#endif // _LIBCPP___CXX03___ALGORITHM_NEXT_PERMUTATION_H
diff --git a/libcxx/include/__cxx03/__algorithm/none_of.h b/libcxx/include/__cxx03/__algorithm/none_of.h
index e5d095da234820..91162ec24ab1dd 100644
--- a/libcxx/include/__cxx03/__algorithm/none_of.h
+++ b/libcxx/include/__cxx03/__algorithm/none_of.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_NONE_OF_H
-#define _LIBCPP___ALGORITHM_NONE_OF_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_NONE_OF_H
+#define _LIBCPP___CXX03___ALGORITHM_NONE_OF_H
#include <__cxx03/__config>
@@ -29,4 +29,4 @@ none_of(_InputIterator __first, _InputIterator __last, _Predicate __pred) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_NONE_OF_H
+#endif // _LIBCPP___CXX03___ALGORITHM_NONE_OF_H
diff --git a/libcxx/include/__cxx03/__algorithm/nth_element.h b/libcxx/include/__cxx03/__algorithm/nth_element.h
index f840864c531c5a..232966e0d26702 100644
--- a/libcxx/include/__cxx03/__algorithm/nth_element.h
+++ b/libcxx/include/__cxx03/__algorithm/nth_element.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_NTH_ELEMENT_H
-#define _LIBCPP___ALGORITHM_NTH_ELEMENT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_NTH_ELEMENT_H
+#define _LIBCPP___CXX03___ALGORITHM_NTH_ELEMENT_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -258,4 +258,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_NTH_ELEMENT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_NTH_ELEMENT_H
diff --git a/libcxx/include/__cxx03/__algorithm/partial_sort.h b/libcxx/include/__cxx03/__algorithm/partial_sort.h
index 6984b1c91f2013..04597fc32b9a2e 100644
--- a/libcxx/include/__cxx03/__algorithm/partial_sort.h
+++ b/libcxx/include/__cxx03/__algorithm/partial_sort.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_PARTIAL_SORT_H
-#define _LIBCPP___ALGORITHM_PARTIAL_SORT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_PARTIAL_SORT_H
+#define _LIBCPP___CXX03___ALGORITHM_PARTIAL_SORT_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -88,4 +88,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_PARTIAL_SORT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_PARTIAL_SORT_H
diff --git a/libcxx/include/__cxx03/__algorithm/partial_sort_copy.h b/libcxx/include/__cxx03/__algorithm/partial_sort_copy.h
index c8849b9f6175f4..d4b5fafba96784 100644
--- a/libcxx/include/__cxx03/__algorithm/partial_sort_copy.h
+++ b/libcxx/include/__cxx03/__algorithm/partial_sort_copy.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_PARTIAL_SORT_COPY_H
-#define _LIBCPP___ALGORITHM_PARTIAL_SORT_COPY_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_PARTIAL_SORT_COPY_H
+#define _LIBCPP___CXX03___ALGORITHM_PARTIAL_SORT_COPY_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -103,4 +103,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_PARTIAL_SORT_COPY_H
+#endif // _LIBCPP___CXX03___ALGORITHM_PARTIAL_SORT_COPY_H
diff --git a/libcxx/include/__cxx03/__algorithm/partition.h b/libcxx/include/__cxx03/__algorithm/partition.h
index 5f26384b7c8efd..d39dbbbd0b185b 100644
--- a/libcxx/include/__cxx03/__algorithm/partition.h
+++ b/libcxx/include/__cxx03/__algorithm/partition.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_PARTITION_H
-#define _LIBCPP___ALGORITHM_PARTITION_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_PARTITION_H
+#define _LIBCPP___CXX03___ALGORITHM_PARTITION_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__config>
@@ -87,4 +87,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_PARTITION_H
+#endif // _LIBCPP___CXX03___ALGORITHM_PARTITION_H
diff --git a/libcxx/include/__cxx03/__algorithm/partition_copy.h b/libcxx/include/__cxx03/__algorithm/partition_copy.h
index 916a1c301d6d55..18d82cfa20326c 100644
--- a/libcxx/include/__cxx03/__algorithm/partition_copy.h
+++ b/libcxx/include/__cxx03/__algorithm/partition_copy.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_PARTITION_COPY_H
-#define _LIBCPP___ALGORITHM_PARTITION_COPY_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_PARTITION_COPY_H
+#define _LIBCPP___CXX03___ALGORITHM_PARTITION_COPY_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/iterator_traits.h>
@@ -40,4 +40,4 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 pair<_OutputIterator1, _Outp
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_PARTITION_COPY_H
+#endif // _LIBCPP___CXX03___ALGORITHM_PARTITION_COPY_H
diff --git a/libcxx/include/__cxx03/__algorithm/partition_point.h b/libcxx/include/__cxx03/__algorithm/partition_point.h
index c28ee8cae0e6dc..ccf203bbf245eb 100644
--- a/libcxx/include/__cxx03/__algorithm/partition_point.h
+++ b/libcxx/include/__cxx03/__algorithm/partition_point.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_PARTITION_POINT_H
-#define _LIBCPP___ALGORITHM_PARTITION_POINT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_PARTITION_POINT_H
+#define _LIBCPP___CXX03___ALGORITHM_PARTITION_POINT_H
#include <__cxx03/__algorithm/half_positive.h>
#include <__cxx03/__config>
@@ -41,4 +41,4 @@ partition_point(_ForwardIterator __first, _ForwardIterator __last, _Predicate __
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_PARTITION_POINT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_PARTITION_POINT_H
diff --git a/libcxx/include/__cxx03/__algorithm/pop_heap.h b/libcxx/include/__cxx03/__algorithm/pop_heap.h
index 800cabf94eaa92..5d19e902ff13b2 100644
--- a/libcxx/include/__cxx03/__algorithm/pop_heap.h
+++ b/libcxx/include/__cxx03/__algorithm/pop_heap.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_POP_HEAP_H
-#define _LIBCPP___ALGORITHM_POP_HEAP_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_POP_HEAP_H
+#define _LIBCPP___CXX03___ALGORITHM_POP_HEAP_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -78,4 +78,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_POP_HEAP_H
+#endif // _LIBCPP___CXX03___ALGORITHM_POP_HEAP_H
diff --git a/libcxx/include/__cxx03/__algorithm/prev_permutation.h b/libcxx/include/__cxx03/__algorithm/prev_permutation.h
index 2569156eac642d..b050d9cf337a7d 100644
--- a/libcxx/include/__cxx03/__algorithm/prev_permutation.h
+++ b/libcxx/include/__cxx03/__algorithm/prev_permutation.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_PREV_PERMUTATION_H
-#define _LIBCPP___ALGORITHM_PREV_PERMUTATION_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_PREV_PERMUTATION_H
+#define _LIBCPP___CXX03___ALGORITHM_PREV_PERMUTATION_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -72,4 +72,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_PREV_PERMUTATION_H
+#endif // _LIBCPP___CXX03___ALGORITHM_PREV_PERMUTATION_H
diff --git a/libcxx/include/__cxx03/__algorithm/pstl.h b/libcxx/include/__cxx03/__algorithm/pstl.h
index 8dea15e09cb440..4fc0d479961071 100644
--- a/libcxx/include/__cxx03/__algorithm/pstl.h
+++ b/libcxx/include/__cxx03/__algorithm/pstl.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_PSTL_H
-#define _LIBCPP___ALGORITHM_PSTL_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_PSTL_H
+#define _LIBCPP___CXX03___ALGORITHM_PSTL_H
#include <__cxx03/__config>
@@ -660,4 +660,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_PSTL_H
+#endif // _LIBCPP___CXX03___ALGORITHM_PSTL_H
diff --git a/libcxx/include/__cxx03/__algorithm/push_heap.h b/libcxx/include/__cxx03/__algorithm/push_heap.h
index de4dcc33fb1fdb..9ef44cdb3feeaa 100644
--- a/libcxx/include/__cxx03/__algorithm/push_heap.h
+++ b/libcxx/include/__cxx03/__algorithm/push_heap.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_PUSH_HEAP_H
-#define _LIBCPP___ALGORITHM_PUSH_HEAP_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_PUSH_HEAP_H
+#define _LIBCPP___CXX03___ALGORITHM_PUSH_HEAP_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -81,4 +81,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_PUSH_HEAP_H
+#endif // _LIBCPP___CXX03___ALGORITHM_PUSH_HEAP_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_adjacent_find.h b/libcxx/include/__cxx03/__algorithm/ranges_adjacent_find.h
index 26caf4fe40ae0e..e62db90f83c18d 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_adjacent_find.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_adjacent_find.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_ADJACENT_FIND_H
-#define _LIBCPP___ALGORITHM_RANGES_ADJACENT_FIND_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_ADJACENT_FIND_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_ADJACENT_FIND_H
#include <__cxx03/__config>
#include <__cxx03/__functional/identity.h>
@@ -80,4 +80,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_ADJACENT_FIND_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_ADJACENT_FIND_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_all_of.h b/libcxx/include/__cxx03/__algorithm/ranges_all_of.h
index 7e92c37b8fd99b..e03f48b23c2226 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_all_of.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_all_of.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_ALL_OF_H
-#define _LIBCPP___ALGORITHM_RANGES_ALL_OF_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_ALL_OF_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_ALL_OF_H
#include <__cxx03/__config>
#include <__cxx03/__functional/identity.h>
@@ -71,4 +71,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_ALL_OF_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_ALL_OF_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_any_of.h b/libcxx/include/__cxx03/__algorithm/ranges_any_of.h
index d20177223fc6b2..23b21f9a8bf139 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_any_of.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_any_of.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_ANY_OF_H
-#define _LIBCPP___ALGORITHM_RANGES_ANY_OF_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_ANY_OF_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_ANY_OF_H
#include <__cxx03/__config>
#include <__cxx03/__functional/identity.h>
@@ -71,4 +71,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_ANY_OF_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_ANY_OF_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_binary_search.h b/libcxx/include/__cxx03/__algorithm/ranges_binary_search.h
index 675cc1ac8074ab..18ebf2b07bdb6f 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_binary_search.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_binary_search.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_BINARY_SEARCH_H
-#define _LIBCPP___ALGORITHM_RANGES_BINARY_SEARCH_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_BINARY_SEARCH_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_BINARY_SEARCH_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__algorithm/lower_bound.h>
@@ -70,4 +70,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_BINARY_SEARCH_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_BINARY_SEARCH_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_clamp.h b/libcxx/include/__cxx03/__algorithm/ranges_clamp.h
index 3f9f6b1f9944f1..da4dda06a22553 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_clamp.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_clamp.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_CLAMP_H
-#define _LIBCPP___ALGORITHM_RANGES_CLAMP_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_CLAMP_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_CLAMP_H
#include <__cxx03/__assert>
#include <__cxx03/__config>
@@ -63,4 +63,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_CLAMP_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_CLAMP_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_contains.h b/libcxx/include/__cxx03/__algorithm/ranges_contains.h
index 312de975efa5fa..00b9d08c83c6cc 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_contains.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_contains.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_CONTAINS_H
-#define _LIBCPP___ALGORITHM_RANGES_CONTAINS_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_CONTAINS_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_CONTAINS_H
#include <__cxx03/__algorithm/ranges_find.h>
#include <__cxx03/__config>
@@ -63,4 +63,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_CONTAINS_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_CONTAINS_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_contains_subrange.h b/libcxx/include/__cxx03/__algorithm/ranges_contains_subrange.h
index d3302f1c915df4..6ac67b43ca6cc0 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_contains_subrange.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_contains_subrange.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_CONTAINS_SUBRANGE_H
-#define _LIBCPP___ALGORITHM_RANGES_CONTAINS_SUBRANGE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_CONTAINS_SUBRANGE_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_CONTAINS_SUBRANGE_H
#include <__cxx03/__algorithm/ranges_search.h>
#include <__cxx03/__config>
@@ -94,4 +94,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_CONTAINS_SUBRANGE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_CONTAINS_SUBRANGE_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_copy.h b/libcxx/include/__cxx03/__algorithm/ranges_copy.h
index cf3f9974936ad4..e94a2089a692ce 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_copy.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_copy.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_COPY_H
-#define _LIBCPP___ALGORITHM_RANGES_COPY_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_COPY_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_COPY_H
#include <__cxx03/__algorithm/copy.h>
#include <__cxx03/__algorithm/in_out_result.h>
@@ -68,4 +68,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_COPY_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_COPY_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_copy_backward.h b/libcxx/include/__cxx03/__algorithm/ranges_copy_backward.h
index a6bb781397dec1..90928177491f5c 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_copy_backward.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_copy_backward.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_COPY_BACKWARD_H
-#define _LIBCPP___ALGORITHM_RANGES_COPY_BACKWARD_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_COPY_BACKWARD_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_COPY_BACKWARD_H
#include <__cxx03/__algorithm/copy_backward.h>
#include <__cxx03/__algorithm/in_out_result.h>
@@ -66,4 +66,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_COPY_BACKWARD_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_COPY_BACKWARD_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_copy_if.h b/libcxx/include/__cxx03/__algorithm/ranges_copy_if.h
index f0d3005a4982b2..814d408cb703ec 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_copy_if.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_copy_if.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_COPY_IF_H
-#define _LIBCPP___ALGORITHM_RANGES_COPY_IF_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_COPY_IF_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_COPY_IF_H
#include <__cxx03/__algorithm/in_out_result.h>
#include <__cxx03/__config>
@@ -84,4 +84,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_COPY_IF_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_COPY_IF_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_copy_n.h b/libcxx/include/__cxx03/__algorithm/ranges_copy_n.h
index 92f10e7466e537..67639e7c19aff3 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_copy_n.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_copy_n.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_COPY_N_H
-#define _LIBCPP___ALGORITHM_RANGES_COPY_N_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_COPY_N_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_COPY_N_H
#include <__cxx03/__algorithm/copy.h>
#include <__cxx03/__algorithm/in_out_result.h>
@@ -78,4 +78,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_COPY_N_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_COPY_N_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_count.h b/libcxx/include/__cxx03/__algorithm/ranges_count.h
index ae24b57c17d0a4..b8553badfce025 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_count.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_count.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_COUNT_H
-#define _LIBCPP___ALGORITHM_RANGES_COUNT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_COUNT_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_COUNT_H
#include <__cxx03/__algorithm/count.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -63,4 +63,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_COUNT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_COUNT_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_count_if.h b/libcxx/include/__cxx03/__algorithm/ranges_count_if.h
index ecadf6fac71287..10850c857d6dff 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_count_if.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_count_if.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_COUNT_IF_H
-#define _LIBCPP___ALGORITHM_RANGES_COUNT_IF_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_COUNT_IF_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_COUNT_IF_H
#include <__cxx03/__config>
#include <__cxx03/__functional/identity.h>
@@ -76,4 +76,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_COUNT_IF_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_COUNT_IF_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_ends_with.h b/libcxx/include/__cxx03/__algorithm/ranges_ends_with.h
index 85329f8f4e58a5..39dcb79559c22d 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_ends_with.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_ends_with.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_ENDS_WITH_H
-#define _LIBCPP___ALGORITHM_RANGES_ENDS_WITH_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_ENDS_WITH_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_ENDS_WITH_H
#include <__cxx03/__algorithm/ranges_equal.h>
#include <__cxx03/__algorithm/ranges_starts_with.h>
@@ -198,4 +198,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_ENDS_WITH_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_ENDS_WITH_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_equal.h b/libcxx/include/__cxx03/__algorithm/ranges_equal.h
index b89235a2994149..abc701a9f11883 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_equal.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_equal.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_EQUAL_H
-#define _LIBCPP___ALGORITHM_RANGES_EQUAL_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_EQUAL_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_EQUAL_H
#include <__cxx03/__algorithm/equal.h>
#include <__cxx03/__algorithm/unwrap_range.h>
@@ -106,4 +106,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_EQUAL_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_EQUAL_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_equal_range.h b/libcxx/include/__cxx03/__algorithm/ranges_equal_range.h
index d6a38e5edd3127..64e686704efd21 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_equal_range.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_equal_range.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_EQUAL_RANGE_H
-#define _LIBCPP___ALGORITHM_RANGES_EQUAL_RANGE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_EQUAL_RANGE_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_EQUAL_RANGE_H
#include <__cxx03/__algorithm/equal_range.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -77,4 +77,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_EQUAL_RANGE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_EQUAL_RANGE_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_fill.h b/libcxx/include/__cxx03/__algorithm/ranges_fill.h
index 56008ec7304dab..f85a1f4ed21c10 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_fill.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_fill.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_FILL_H
-#define _LIBCPP___ALGORITHM_RANGES_FILL_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_FILL_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_FILL_H
#include <__cxx03/__algorithm/ranges_fill_n.h>
#include <__cxx03/__config>
@@ -59,4 +59,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_FILL_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_FILL_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_fill_n.h b/libcxx/include/__cxx03/__algorithm/ranges_fill_n.h
index bb00676943a6cc..07f04c293451fe 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_fill_n.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_fill_n.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_FILL_N_H
-#define _LIBCPP___ALGORITHM_RANGES_FILL_N_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_FILL_N_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_FILL_N_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/concepts.h>
@@ -50,4 +50,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_FILL_N_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_FILL_N_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_find.h b/libcxx/include/__cxx03/__algorithm/ranges_find.h
index 896fe920fd8151..0b2c865476db07 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_find.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_find.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_FIND_H
-#define _LIBCPP___ALGORITHM_RANGES_FIND_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_FIND_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_FIND_H
#include <__cxx03/__algorithm/find.h>
#include <__cxx03/__algorithm/ranges_find_if.h>
@@ -77,4 +77,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_FIND_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_FIND_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_find_end.h b/libcxx/include/__cxx03/__algorithm/ranges_find_end.h
index c71f32546afb15..117753b3d86b6f 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_find_end.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_find_end.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_FIND_END_H
-#define _LIBCPP___ALGORITHM_RANGES_FIND_END_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_FIND_END_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_FIND_END_H
#include <__cxx03/__algorithm/find_end.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -100,4 +100,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_FIND_END_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_FIND_END_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_find_first_of.h b/libcxx/include/__cxx03/__algorithm/ranges_find_first_of.h
index 23ae82eb4685f8..ebf01681419cac 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_find_first_of.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_find_first_of.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_FIND_FIRST_OF_H
-#define _LIBCPP___ALGORITHM_RANGES_FIND_FIRST_OF_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_FIND_FIRST_OF_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_FIND_FIRST_OF_H
#include <__cxx03/__config>
#include <__cxx03/__functional/identity.h>
@@ -103,4 +103,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_FIND_FIRST_OF_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_FIND_FIRST_OF_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_find_if.h b/libcxx/include/__cxx03/__algorithm/ranges_find_if.h
index a518f532a73e22..a1098e0de1824a 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_find_if.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_find_if.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_FIND_IF_H
-#define _LIBCPP___ALGORITHM_RANGES_FIND_IF_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_FIND_IF_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_FIND_IF_H
#include <__cxx03/__config>
#include <__cxx03/__functional/identity.h>
@@ -72,4 +72,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_FIND_IF_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_FIND_IF_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_find_if_not.h b/libcxx/include/__cxx03/__algorithm/ranges_find_if_not.h
index c54d565188c4f4..6bc8f163958738 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_find_if_not.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_find_if_not.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_FIND_IF_NOT_H
-#define _LIBCPP___ALGORITHM_RANGES_FIND_IF_NOT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_FIND_IF_NOT_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_FIND_IF_NOT_H
#include <__cxx03/__algorithm/ranges_find_if.h>
#include <__cxx03/__config>
@@ -66,4 +66,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_FIND_IF_NOT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_FIND_IF_NOT_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_find_last.h b/libcxx/include/__cxx03/__algorithm/ranges_find_last.h
index 3028dc5bf53cbe..506452c7c001d8 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_find_last.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_find_last.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_FIND_LAST_H
-#define _LIBCPP___ALGORITHM_RANGES_FIND_LAST_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_FIND_LAST_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_FIND_LAST_H
#include <__cxx03/__config>
#include <__cxx03/__functional/identity.h>
@@ -172,4 +172,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_FIND_LAST_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_FIND_LAST_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_for_each.h b/libcxx/include/__cxx03/__algorithm/ranges_for_each.h
index eca0f35e49fbdd..3e926e9d2c4d11 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_for_each.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_for_each.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_FOR_EACH_H
-#define _LIBCPP___ALGORITHM_RANGES_FOR_EACH_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_FOR_EACH_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_FOR_EACH_H
#include <__cxx03/__algorithm/in_fun_result.h>
#include <__cxx03/__config>
@@ -78,4 +78,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_FOR_EACH_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_FOR_EACH_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_for_each_n.h b/libcxx/include/__cxx03/__algorithm/ranges_for_each_n.h
index fa3051fa8a0aa2..96df2112985413 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_for_each_n.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_for_each_n.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_FOR_EACH_N_H
-#define _LIBCPP___ALGORITHM_RANGES_FOR_EACH_N_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_FOR_EACH_N_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_FOR_EACH_N_H
#include <__cxx03/__algorithm/in_fun_result.h>
#include <__cxx03/__config>
@@ -61,4 +61,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_FOR_EACH_N_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_FOR_EACH_N_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_generate.h b/libcxx/include/__cxx03/__algorithm/ranges_generate.h
index 570ed73a295503..96d43592d2a768 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_generate.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_generate.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_GENERATE_H
-#define _LIBCPP___ALGORITHM_RANGES_GENERATE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_GENERATE_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_GENERATE_H
#include <__cxx03/__concepts/constructible.h>
#include <__cxx03/__concepts/invocable.h>
@@ -70,4 +70,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_GENERATE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_GENERATE_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_generate_n.h b/libcxx/include/__cxx03/__algorithm/ranges_generate_n.h
index b7c684be2e03f7..dd43e21618718d 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_generate_n.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_generate_n.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_GENERATE_N_H
-#define _LIBCPP___ALGORITHM_RANGES_GENERATE_N_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_GENERATE_N_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_GENERATE_N_H
#include <__cxx03/__concepts/constructible.h>
#include <__cxx03/__concepts/invocable.h>
@@ -62,4 +62,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_GENERATE_N_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_GENERATE_N_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_includes.h b/libcxx/include/__cxx03/__algorithm/ranges_includes.h
index 3abe69118f20a0..587a0eda16da56 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_includes.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_includes.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_INCLUDES_H
-#define _LIBCPP___ALGORITHM_RANGES_INCLUDES_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_INCLUDES_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_INCLUDES_H
#include <__cxx03/__algorithm/includes.h>
#include <__cxx03/__algorithm/make_projected.h>
@@ -95,4 +95,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_INCLUDES_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_INCLUDES_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_inplace_merge.h b/libcxx/include/__cxx03/__algorithm/ranges_inplace_merge.h
index ebb711d7312095..34668f4d57baf8 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_inplace_merge.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_inplace_merge.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_INPLACE_MERGE_H
-#define _LIBCPP___ALGORITHM_RANGES_INPLACE_MERGE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_INPLACE_MERGE_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_INPLACE_MERGE_H
#include <__cxx03/__algorithm/inplace_merge.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -81,4 +81,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_INPLACE_MERGE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_INPLACE_MERGE_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_is_heap.h b/libcxx/include/__cxx03/__algorithm/ranges_is_heap.h
index 7c6b60a56f6c76..47112bdddd0577 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_is_heap.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_is_heap.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_IS_HEAP_H
-#define _LIBCPP___ALGORITHM_RANGES_IS_HEAP_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_IS_HEAP_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_IS_HEAP_H
#include <__cxx03/__algorithm/is_heap_until.h>
#include <__cxx03/__algorithm/make_projected.h>
@@ -78,4 +78,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_IS_HEAP_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_IS_HEAP_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_is_heap_until.h b/libcxx/include/__cxx03/__algorithm/ranges_is_heap_until.h
index e32e802f447328..d7176f784037ca 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_is_heap_until.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_is_heap_until.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_IS_HEAP_UNTIL_H
-#define _LIBCPP___ALGORITHM_RANGES_IS_HEAP_UNTIL_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_IS_HEAP_UNTIL_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_IS_HEAP_UNTIL_H
#include <__cxx03/__algorithm/is_heap_until.h>
#include <__cxx03/__algorithm/make_projected.h>
@@ -78,4 +78,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_IS_HEAP_UNTIL_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_IS_HEAP_UNTIL_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_is_partitioned.h b/libcxx/include/__cxx03/__algorithm/ranges_is_partitioned.h
index 87d59d0410fe50..d746f55322e780 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_is_partitioned.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_is_partitioned.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_IS_PARTITIONED_H
-#define _LIBCPP___ALGORITHM_RANGES_IS_PARTITIONED_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_IS_PARTITIONED_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_IS_PARTITIONED_H
#include <__cxx03/__config>
#include <__cxx03/__functional/identity.h>
@@ -83,4 +83,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_IS_PARTITIONED_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_IS_PARTITIONED_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_is_permutation.h b/libcxx/include/__cxx03/__algorithm/ranges_is_permutation.h
index a894854a8b65aa..31d85e5fb27cdc 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_is_permutation.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_is_permutation.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_IS_PERMUTATION_H
-#define _LIBCPP___ALGORITHM_RANGES_IS_PERMUTATION_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_IS_PERMUTATION_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_IS_PERMUTATION_H
#include <__cxx03/__algorithm/is_permutation.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -104,4 +104,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_IS_PERMUTATION_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_IS_PERMUTATION_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_is_sorted.h b/libcxx/include/__cxx03/__algorithm/ranges_is_sorted.h
index 201673553fd4fe..f5c4e6f4191ad3 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_is_sorted.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_is_sorted.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP__ALGORITHM_RANGES_IS_SORTED_H
-#define _LIBCPP__ALGORITHM_RANGES_IS_SORTED_H
+#ifndef _LIBCPP___CXX03__ALGORITHM_RANGES_IS_SORTED_H
+#define _LIBCPP___CXX03__ALGORITHM_RANGES_IS_SORTED_H
#include <__cxx03/__algorithm/ranges_is_sorted_until.h>
#include <__cxx03/__config>
@@ -64,4 +64,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP__ALGORITHM_RANGES_IS_SORTED_H
+#endif // _LIBCPP___CXX03__ALGORITHM_RANGES_IS_SORTED_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_is_sorted_until.h b/libcxx/include/__cxx03/__algorithm/ranges_is_sorted_until.h
index 713d2664884acd..701c01749c2605 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_is_sorted_until.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_is_sorted_until.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP__ALGORITHM_RANGES_IS_SORTED_UNTIL_H
-#define _LIBCPP__ALGORITHM_RANGES_IS_SORTED_UNTIL_H
+#ifndef _LIBCPP___CXX03__ALGORITHM_RANGES_IS_SORTED_UNTIL_H
+#define _LIBCPP___CXX03__ALGORITHM_RANGES_IS_SORTED_UNTIL_H
#include <__cxx03/__config>
#include <__cxx03/__functional/identity.h>
@@ -79,4 +79,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP__ALGORITHM_RANGES_IS_SORTED_UNTIL_H
+#endif // _LIBCPP___CXX03__ALGORITHM_RANGES_IS_SORTED_UNTIL_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_iterator_concept.h b/libcxx/include/__cxx03/__algorithm/ranges_iterator_concept.h
index eb2025c234ba1c..1ff6328cfc150b 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_iterator_concept.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_iterator_concept.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_ITERATOR_CONCEPT_H
-#define _LIBCPP___ALGORITHM_RANGES_ITERATOR_CONCEPT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_ITERATOR_CONCEPT_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_ITERATOR_CONCEPT_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/concepts.h>
@@ -53,4 +53,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_ITERATOR_CONCEPT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_ITERATOR_CONCEPT_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_lexicographical_compare.h b/libcxx/include/__cxx03/__algorithm/ranges_lexicographical_compare.h
index ba87a20b425b4d..e3fec1c416519c 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_lexicographical_compare.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_lexicographical_compare.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_LEXICOGRAPHICAL_COMPARE_H
-#define _LIBCPP___ALGORITHM_RANGES_LEXICOGRAPHICAL_COMPARE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_LEXICOGRAPHICAL_COMPARE_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_LEXICOGRAPHICAL_COMPARE_H
#include <__cxx03/__config>
#include <__cxx03/__functional/identity.h>
@@ -103,4 +103,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_LEXICOGRAPHICAL_COMPARE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_LEXICOGRAPHICAL_COMPARE_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_lower_bound.h b/libcxx/include/__cxx03/__algorithm/ranges_lower_bound.h
index 2c312866ee9305..bed4c815e5b4f0 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_lower_bound.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_lower_bound.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_LOWER_BOUND_H
-#define _LIBCPP___ALGORITHM_RANGES_LOWER_BOUND_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_LOWER_BOUND_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_LOWER_BOUND_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__algorithm/lower_bound.h>
@@ -70,4 +70,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_LOWER_BOUND_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_LOWER_BOUND_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_make_heap.h b/libcxx/include/__cxx03/__algorithm/ranges_make_heap.h
index 5a00575abbd346..ba8ccb89baad6d 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_make_heap.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_make_heap.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_MAKE_HEAP_H
-#define _LIBCPP___ALGORITHM_RANGES_MAKE_HEAP_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_MAKE_HEAP_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_MAKE_HEAP_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__algorithm/make_heap.h>
@@ -82,4 +82,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_MAKE_HEAP_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_MAKE_HEAP_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_max.h b/libcxx/include/__cxx03/__algorithm/ranges_max.h
index d61a54fa7fff77..58ea541d3e4935 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_max.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_max.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_MAX_H
-#define _LIBCPP___ALGORITHM_RANGES_MAX_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_MAX_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_MAX_H
#include <__cxx03/__algorithm/ranges_min_element.h>
#include <__cxx03/__assert>
@@ -100,4 +100,4 @@ _LIBCPP_POP_MACROS
#endif // _LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___ALGORITHM_RANGES_MAX_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_MAX_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_max_element.h b/libcxx/include/__cxx03/__algorithm/ranges_max_element.h
index 6bcf77bc29d4dd..cbe50d1bf41274 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_max_element.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_max_element.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_MAX_ELEMENT_H
-#define _LIBCPP___ALGORITHM_RANGES_MAX_ELEMENT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_MAX_ELEMENT_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_MAX_ELEMENT_H
#include <__cxx03/__algorithm/ranges_min_element.h>
#include <__cxx03/__config>
@@ -66,4 +66,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_MAX_ELEMENT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_MAX_ELEMENT_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_merge.h b/libcxx/include/__cxx03/__algorithm/ranges_merge.h
index 697dfdae0b3006..8b8b8fbbab2cb4 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_merge.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_merge.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_MERGE_H
-#define _LIBCPP___ALGORITHM_RANGES_MERGE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_MERGE_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_MERGE_H
#include <__cxx03/__algorithm/in_in_out_result.h>
#include <__cxx03/__algorithm/ranges_copy.h>
@@ -135,4 +135,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_MERGE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_MERGE_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_min.h b/libcxx/include/__cxx03/__algorithm/ranges_min.h
index bcf0705071318e..72f06e72e3003f 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_min.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_min.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_MIN_H
-#define _LIBCPP___ALGORITHM_RANGES_MIN_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_MIN_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_MIN_H
#include <__cxx03/__algorithm/ranges_min_element.h>
#include <__cxx03/__assert>
@@ -92,4 +92,4 @@ _LIBCPP_POP_MACROS
#endif // _LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___ALGORITHM_RANGES_MIN_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_MIN_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_min_element.h b/libcxx/include/__cxx03/__algorithm/ranges_min_element.h
index 320a47a57ec6d7..b3854233966b07 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_min_element.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_min_element.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_MIN_ELEMENT_H
-#define _LIBCPP___ALGORITHM_RANGES_MIN_ELEMENT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_MIN_ELEMENT_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_MIN_ELEMENT_H
#include <__cxx03/__config>
#include <__cxx03/__functional/identity.h>
@@ -78,4 +78,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_MIN_ELEMENT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_MIN_ELEMENT_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_minmax.h b/libcxx/include/__cxx03/__algorithm/ranges_minmax.h
index 8adf1af5855186..8ce4e438382e52 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_minmax.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_minmax.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_MINMAX_H
-#define _LIBCPP___ALGORITHM_RANGES_MINMAX_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_MINMAX_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_MINMAX_H
#include <__cxx03/__algorithm/min_max_result.h>
#include <__cxx03/__algorithm/minmax_element.h>
@@ -172,4 +172,4 @@ _LIBCPP_POP_MACROS
#endif // _LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___ALGORITHM_RANGES_MINMAX_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_MINMAX_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_minmax_element.h b/libcxx/include/__cxx03/__algorithm/ranges_minmax_element.h
index ebc44082f4c3a3..1e92a63a9d33e9 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_minmax_element.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_minmax_element.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_MINMAX_ELEMENT_H
-#define _LIBCPP___ALGORITHM_RANGES_MINMAX_ELEMENT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_MINMAX_ELEMENT_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_MINMAX_ELEMENT_H
#include <__cxx03/__algorithm/min_max_result.h>
#include <__cxx03/__algorithm/minmax_element.h>
@@ -75,4 +75,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_MINMAX_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_MINMAX_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_mismatch.h b/libcxx/include/__cxx03/__algorithm/ranges_mismatch.h
index ccca6c7f6eb550..d3ebb7ded9c0b8 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_mismatch.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_mismatch.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_MISMATCH_H
-#define _LIBCPP___ALGORITHM_RANGES_MISMATCH_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_MISMATCH_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_MISMATCH_H
#include <__cxx03/__algorithm/in_in_result.h>
#include <__cxx03/__algorithm/mismatch.h>
@@ -97,4 +97,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_MISMATCH_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_MISMATCH_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_move.h b/libcxx/include/__cxx03/__algorithm/ranges_move.h
index 452608bef74563..e20f4d8854db2b 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_move.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_move.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_MOVE_H
-#define _LIBCPP___ALGORITHM_RANGES_MOVE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_MOVE_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_MOVE_H
#include <__cxx03/__algorithm/in_out_result.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -71,4 +71,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_MOVE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_MOVE_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_move_backward.h b/libcxx/include/__cxx03/__algorithm/ranges_move_backward.h
index e353d9e2ffd102..cecaa7d8d657b0 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_move_backward.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_move_backward.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_MOVE_BACKWARD_H
-#define _LIBCPP___ALGORITHM_RANGES_MOVE_BACKWARD_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_MOVE_BACKWARD_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_MOVE_BACKWARD_H
#include <__cxx03/__algorithm/in_out_result.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -73,4 +73,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_MOVE_BACKWARD_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_MOVE_BACKWARD_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_next_permutation.h b/libcxx/include/__cxx03/__algorithm/ranges_next_permutation.h
index b134cfca38195c..337c7a892cfbac 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_next_permutation.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_next_permutation.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_NEXT_PERMUTATION_H
-#define _LIBCPP___ALGORITHM_RANGES_NEXT_PERMUTATION_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_NEXT_PERMUTATION_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_NEXT_PERMUTATION_H
#include <__cxx03/__algorithm/in_found_result.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -75,4 +75,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_NEXT_PERMUTATION_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_NEXT_PERMUTATION_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_none_of.h b/libcxx/include/__cxx03/__algorithm/ranges_none_of.h
index 36d5477e14dee0..461fbc87c5d24b 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_none_of.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_none_of.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_NONE_OF_H
-#define _LIBCPP___ALGORITHM_RANGES_NONE_OF_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_NONE_OF_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_NONE_OF_H
#include <__cxx03/__config>
#include <__cxx03/__functional/identity.h>
@@ -72,4 +72,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_NONE_OF_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_NONE_OF_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_nth_element.h b/libcxx/include/__cxx03/__algorithm/ranges_nth_element.h
index df428390f7a3d2..27bf33e7703de9 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_nth_element.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_nth_element.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_NTH_ELEMENT_H
-#define _LIBCPP___ALGORITHM_RANGES_NTH_ELEMENT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_NTH_ELEMENT_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_NTH_ELEMENT_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__algorithm/make_projected.h>
@@ -81,4 +81,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_NTH_ELEMENT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_NTH_ELEMENT_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_partial_sort.h b/libcxx/include/__cxx03/__algorithm/ranges_partial_sort.h
index d19fc9b5297eb8..06aab77f65f3c6 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_partial_sort.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_partial_sort.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_PARTIAL_SORT_H
-#define _LIBCPP___ALGORITHM_RANGES_PARTIAL_SORT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_PARTIAL_SORT_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_PARTIAL_SORT_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__algorithm/make_projected.h>
@@ -79,4 +79,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_PARTIAL_SORT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_PARTIAL_SORT_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_partial_sort_copy.h b/libcxx/include/__cxx03/__algorithm/ranges_partial_sort_copy.h
index bd2be3cb2cf2d0..3fda0e58e74d06 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_partial_sort_copy.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_partial_sort_copy.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_PARTIAL_SORT_COPY_H
-#define _LIBCPP___ALGORITHM_RANGES_PARTIAL_SORT_COPY_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_PARTIAL_SORT_COPY_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_PARTIAL_SORT_COPY_H
#include <__cxx03/__algorithm/in_out_result.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -111,4 +111,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_PARTIAL_SORT_COPY_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_PARTIAL_SORT_COPY_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_partition.h b/libcxx/include/__cxx03/__algorithm/ranges_partition.h
index d6c147c441def8..261972ada56836 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_partition.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_partition.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_PARTITION_H
-#define _LIBCPP___ALGORITHM_RANGES_PARTITION_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_PARTITION_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_PARTITION_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__algorithm/make_projected.h>
@@ -85,4 +85,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_PARTITION_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_PARTITION_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_partition_copy.h b/libcxx/include/__cxx03/__algorithm/ranges_partition_copy.h
index 42cbb3a96a2375..c80108022d0961 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_partition_copy.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_partition_copy.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_PARTITION_COPY_H
-#define _LIBCPP___ALGORITHM_RANGES_PARTITION_COPY_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_PARTITION_COPY_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_PARTITION_COPY_H
#include <__cxx03/__algorithm/in_out_out_result.h>
#include <__cxx03/__config>
@@ -107,4 +107,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_PARTITION_COPY_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_PARTITION_COPY_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_partition_point.h b/libcxx/include/__cxx03/__algorithm/ranges_partition_point.h
index 60731b2ddcf3c9..337e1261f01c5b 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_partition_point.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_partition_point.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_PARTITION_POINT_H
-#define _LIBCPP___ALGORITHM_RANGES_PARTITION_POINT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_PARTITION_POINT_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_PARTITION_POINT_H
#include <__cxx03/__algorithm/half_positive.h>
#include <__cxx03/__config>
@@ -90,4 +90,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_PARTITION_POINT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_PARTITION_POINT_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_pop_heap.h b/libcxx/include/__cxx03/__algorithm/ranges_pop_heap.h
index d201d62c735752..ecbfb44888edfc 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_pop_heap.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_pop_heap.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_POP_HEAP_H
-#define _LIBCPP___ALGORITHM_RANGES_POP_HEAP_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_POP_HEAP_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_POP_HEAP_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__algorithm/make_projected.h>
@@ -83,4 +83,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_POP_HEAP_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_POP_HEAP_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_prev_permutation.h b/libcxx/include/__cxx03/__algorithm/ranges_prev_permutation.h
index 8d40d44e6ac1ee..ded9eb2c471559 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_prev_permutation.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_prev_permutation.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_PREV_PERMUTATION_H
-#define _LIBCPP___ALGORITHM_RANGES_PREV_PERMUTATION_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_PREV_PERMUTATION_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_PREV_PERMUTATION_H
#include <__cxx03/__algorithm/in_found_result.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -75,4 +75,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_PREV_PERMUTATION_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_PREV_PERMUTATION_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_push_heap.h b/libcxx/include/__cxx03/__algorithm/ranges_push_heap.h
index 39d219e763deea..33479d9bfad669 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_push_heap.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_push_heap.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_PUSH_HEAP_H
-#define _LIBCPP___ALGORITHM_RANGES_PUSH_HEAP_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_PUSH_HEAP_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_PUSH_HEAP_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__algorithm/make_projected.h>
@@ -82,4 +82,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_PUSH_HEAP_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_PUSH_HEAP_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_remove.h b/libcxx/include/__cxx03/__algorithm/ranges_remove.h
index d766a7b4a846f8..13b4efb9f5c3bf 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_remove.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_remove.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_REMOVE_H
-#define _LIBCPP___ALGORITHM_RANGES_REMOVE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_REMOVE_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_REMOVE_H
#include <__cxx03/__config>
#include <__cxx03/__algorithm/ranges_remove_if.h>
@@ -65,4 +65,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_REMOVE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_REMOVE_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_remove_copy.h b/libcxx/include/__cxx03/__algorithm/ranges_remove_copy.h
index fdb04cd96cf894..47c2d6c0869209 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_remove_copy.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_remove_copy.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_REMOVE_COPY_H
-#define _LIBCPP___ALGORITHM_RANGES_REMOVE_COPY_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_REMOVE_COPY_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_REMOVE_COPY_H
#include <__cxx03/__algorithm/in_out_result.h>
#include <__cxx03/__algorithm/ranges_remove_copy_if.h>
@@ -78,4 +78,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_REMOVE_COPY_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_REMOVE_COPY_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_remove_copy_if.h b/libcxx/include/__cxx03/__algorithm/ranges_remove_copy_if.h
index dd643a581a1d27..3674e4c4207b7d 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_remove_copy_if.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_remove_copy_if.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_REMOVE_COPY_IF_H
-#define _LIBCPP___ALGORITHM_RANGES_REMOVE_COPY_IF_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_REMOVE_COPY_IF_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_REMOVE_COPY_IF_H
#include <__cxx03/__algorithm/in_out_result.h>
#include <__cxx03/__algorithm/make_projected.h>
@@ -92,4 +92,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_REMOVE_COPY_IF_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_REMOVE_COPY_IF_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_remove_if.h b/libcxx/include/__cxx03/__algorithm/ranges_remove_if.h
index 9d4ccd0f0b52da..546acf8b78da33 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_remove_if.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_remove_if.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_REMOVE_IF_H
-#define _LIBCPP___ALGORITHM_RANGES_REMOVE_IF_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_REMOVE_IF_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_REMOVE_IF_H
#include <__cxx03/__config>
#include <__cxx03/__algorithm/ranges_find_if.h>
@@ -86,4 +86,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_REMOVE_IF_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_REMOVE_IF_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_replace.h b/libcxx/include/__cxx03/__algorithm/ranges_replace.h
index 774d7632e41cf5..f5c030e7993c2e 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_replace.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_replace.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_REPLACE_H
-#define _LIBCPP___ALGORITHM_RANGES_REPLACE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_REPLACE_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_REPLACE_H
#include <__cxx03/__algorithm/ranges_replace_if.h>
#include <__cxx03/__config>
@@ -65,4 +65,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_REPLACE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_REPLACE_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_replace_copy.h b/libcxx/include/__cxx03/__algorithm/ranges_replace_copy.h
index d90715d3661baf..387b7a42f24c87 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_replace_copy.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_replace_copy.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_REPLACE_COPY_H
-#define _LIBCPP___ALGORITHM_RANGES_REPLACE_COPY_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_REPLACE_COPY_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_REPLACE_COPY_H
#include <__cxx03/__algorithm/in_out_result.h>
#include <__cxx03/__algorithm/ranges_replace_copy_if.h>
@@ -90,4 +90,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_REPLACE_COPY_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_REPLACE_COPY_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_replace_copy_if.h b/libcxx/include/__cxx03/__algorithm/ranges_replace_copy_if.h
index 88e5ff71c58c50..f5786d9f8948d3 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_replace_copy_if.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_replace_copy_if.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_REPLACE_COPY_IF_H
-#define _LIBCPP___ALGORITHM_RANGES_REPLACE_COPY_IF_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_REPLACE_COPY_IF_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_REPLACE_COPY_IF_H
#include <__cxx03/__algorithm/in_out_result.h>
#include <__cxx03/__config>
@@ -95,4 +95,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_REPLACE_COPY_IF_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_REPLACE_COPY_IF_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_replace_if.h b/libcxx/include/__cxx03/__algorithm/ranges_replace_if.h
index 6d9ff45a59c975..499cc7887b16c1 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_replace_if.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_replace_if.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_REPLACE_IF_H
-#define _LIBCPP___ALGORITHM_RANGES_REPLACE_IF_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_REPLACE_IF_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_REPLACE_IF_H
#include <__cxx03/__config>
#include <__cxx03/__functional/identity.h>
@@ -78,4 +78,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_REPLACE_IF_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_REPLACE_IF_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_reverse.h b/libcxx/include/__cxx03/__algorithm/ranges_reverse.h
index 78614666200ef8..577a4310f21529 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_reverse.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_reverse.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_REVERSE_H
-#define _LIBCPP___ALGORITHM_RANGES_REVERSE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_REVERSE_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_REVERSE_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/concepts.h>
@@ -76,4 +76,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___ALGORITHM_RANGES_REVERSE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_REVERSE_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_reverse_copy.h b/libcxx/include/__cxx03/__algorithm/ranges_reverse_copy.h
index 7aab06d721430a..d727202365b081 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_reverse_copy.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_reverse_copy.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_REVERSE_COPY_H
-#define _LIBCPP___ALGORITHM_RANGES_REVERSE_COPY_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_REVERSE_COPY_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_REVERSE_COPY_H
#include <__cxx03/__algorithm/in_out_result.h>
#include <__cxx03/__algorithm/ranges_copy.h>
@@ -67,4 +67,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_REVERSE_COPY_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_REVERSE_COPY_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_rotate.h b/libcxx/include/__cxx03/__algorithm/ranges_rotate.h
index 2efa88748ff702..e6bef76b3cb74f 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_rotate.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_rotate.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_ROTATE_H
-#define _LIBCPP___ALGORITHM_RANGES_ROTATE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_ROTATE_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_ROTATE_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__algorithm/ranges_iterator_concept.h>
@@ -68,4 +68,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_ROTATE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_ROTATE_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_rotate_copy.h b/libcxx/include/__cxx03/__algorithm/ranges_rotate_copy.h
index 7aa1fa13fedddd..40975ad7213de1 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_rotate_copy.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_rotate_copy.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_ROTATE_COPY_H
-#define _LIBCPP___ALGORITHM_RANGES_ROTATE_COPY_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_ROTATE_COPY_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_ROTATE_COPY_H
#include <__cxx03/__algorithm/in_out_result.h>
#include <__cxx03/__algorithm/ranges_copy.h>
@@ -65,4 +65,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_ROTATE_COPY_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_ROTATE_COPY_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_sample.h b/libcxx/include/__cxx03/__algorithm/ranges_sample.h
index 08a44d3a3c8559..778661c2ce413e 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_sample.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_sample.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_SAMPLE_H
-#define _LIBCPP___ALGORITHM_RANGES_SAMPLE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_SAMPLE_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_SAMPLE_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__algorithm/sample.h>
@@ -71,4 +71,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_SAMPLE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_SAMPLE_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_search.h b/libcxx/include/__cxx03/__algorithm/ranges_search.h
index 68ac1fce9e7bf8..a4d56b80c9452c 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_search.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_search.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_SEARCH_H
-#define _LIBCPP___ALGORITHM_RANGES_SEARCH_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_SEARCH_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_SEARCH_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__algorithm/search.h>
@@ -131,4 +131,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___ALGORITHM_RANGES_SEARCH_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_SEARCH_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_search_n.h b/libcxx/include/__cxx03/__algorithm/ranges_search_n.h
index c7c670f02c20ce..eac6e33a4da9e7 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_search_n.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_search_n.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_SEARCH_N_H
-#define _LIBCPP___ALGORITHM_RANGES_SEARCH_N_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_SEARCH_N_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_SEARCH_N_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__algorithm/search_n.h>
@@ -113,4 +113,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_SEARCH_N_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_SEARCH_N_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_set_difference.h b/libcxx/include/__cxx03/__algorithm/ranges_set_difference.h
index 764384b970833b..0343b68f8534d4 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_set_difference.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_set_difference.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_SET_DIFFERENCE_H
-#define _LIBCPP___ALGORITHM_RANGES_SET_DIFFERENCE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_SET_DIFFERENCE_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_SET_DIFFERENCE_H
#include <__cxx03/__algorithm/in_out_result.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -106,4 +106,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_SET_DIFFERENCE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_SET_DIFFERENCE_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_set_intersection.h b/libcxx/include/__cxx03/__algorithm/ranges_set_intersection.h
index 4aebb5e195da26..ff0ae0fe1446ff 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_set_intersection.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_set_intersection.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_SET_INTERSECTION_H
-#define _LIBCPP___ALGORITHM_RANGES_SET_INTERSECTION_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_SET_INTERSECTION_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_SET_INTERSECTION_H
#include <__cxx03/__algorithm/in_in_out_result.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -111,4 +111,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_SET_INTERSECTION_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_SET_INTERSECTION_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_set_symmetric_difference.h b/libcxx/include/__cxx03/__algorithm/ranges_set_symmetric_difference.h
index 50ec574fcc301b..4c7413d5a656aa 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_set_symmetric_difference.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_set_symmetric_difference.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_SET_SYMMETRIC_DIFFERENCE_H
-#define _LIBCPP___ALGORITHM_RANGES_SET_SYMMETRIC_DIFFERENCE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_SET_SYMMETRIC_DIFFERENCE_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_SET_SYMMETRIC_DIFFERENCE_H
#include <__cxx03/__algorithm/in_in_out_result.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -111,4 +111,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_SET_SYMMETRIC_DIFFERENCE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_SET_SYMMETRIC_DIFFERENCE_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_set_union.h b/libcxx/include/__cxx03/__algorithm/ranges_set_union.h
index 87d08e4cfedcca..0752ee51d37d17 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_set_union.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_set_union.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_SET_UNION_H
-#define _LIBCPP___ALGORITHM_RANGES_SET_UNION_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_SET_UNION_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_SET_UNION_H
#include <__cxx03/__algorithm/in_in_out_result.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -112,4 +112,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_SET_UNION_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_SET_UNION_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_shuffle.h b/libcxx/include/__cxx03/__algorithm/ranges_shuffle.h
index 44e3a73e1b4b77..2728d5df97f585 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_shuffle.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_shuffle.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_SHUFFLE_H
-#define _LIBCPP___ALGORITHM_RANGES_SHUFFLE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_SHUFFLE_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_SHUFFLE_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__algorithm/shuffle.h>
@@ -69,4 +69,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_SHUFFLE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_SHUFFLE_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_sort.h b/libcxx/include/__cxx03/__algorithm/ranges_sort.h
index ad24cea344e8b6..4fa26ad238fa1e 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_sort.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_sort.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_SORT_H
-#define _LIBCPP___ALGORITHM_RANGES_SORT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_SORT_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_SORT_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__algorithm/make_projected.h>
@@ -81,4 +81,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_SORT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_SORT_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_sort_heap.h b/libcxx/include/__cxx03/__algorithm/ranges_sort_heap.h
index 403917b032ddcb..7c45fca156bae8 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_sort_heap.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_sort_heap.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_SORT_HEAP_H
-#define _LIBCPP___ALGORITHM_RANGES_SORT_HEAP_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_SORT_HEAP_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_SORT_HEAP_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__algorithm/make_projected.h>
@@ -82,4 +82,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_SORT_HEAP_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_SORT_HEAP_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_stable_partition.h b/libcxx/include/__cxx03/__algorithm/ranges_stable_partition.h
index cd4ae07bf9c705..b7d84dc6a0ccb7 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_stable_partition.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_stable_partition.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_STABLE_PARTITION_H
-#define _LIBCPP___ALGORITHM_RANGES_STABLE_PARTITION_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_STABLE_PARTITION_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_STABLE_PARTITION_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__algorithm/make_projected.h>
@@ -89,4 +89,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_STABLE_PARTITION_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_STABLE_PARTITION_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_stable_sort.h b/libcxx/include/__cxx03/__algorithm/ranges_stable_sort.h
index 20c83283b9606a..83ff06971d081d 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_stable_sort.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_stable_sort.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_STABLE_SORT_H
-#define _LIBCPP___ALGORITHM_RANGES_STABLE_SORT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_STABLE_SORT_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_STABLE_SORT_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__algorithm/make_projected.h>
@@ -79,4 +79,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_STABLE_SORT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_STABLE_SORT_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_starts_with.h b/libcxx/include/__cxx03/__algorithm/ranges_starts_with.h
index 0e2424a0d8a032..91117ec29413fc 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_starts_with.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_starts_with.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_STARTS_WITH_H
-#define _LIBCPP___ALGORITHM_RANGES_STARTS_WITH_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_STARTS_WITH_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_STARTS_WITH_H
#include <__cxx03/__algorithm/in_in_result.h>
#include <__cxx03/__algorithm/ranges_mismatch.h>
@@ -92,4 +92,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_STARTS_WITH_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_STARTS_WITH_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_swap_ranges.h b/libcxx/include/__cxx03/__algorithm/ranges_swap_ranges.h
index 610e7c315486bd..46a868f3a563f7 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_swap_ranges.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_swap_ranges.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_SWAP_RANGES_H
-#define _LIBCPP___ALGORITHM_RANGES_SWAP_RANGES_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_SWAP_RANGES_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_SWAP_RANGES_H
#include <__cxx03/__algorithm/in_in_result.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -67,4 +67,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_SWAP_RANGES_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_SWAP_RANGES_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_transform.h b/libcxx/include/__cxx03/__algorithm/ranges_transform.h
index 12e4a50154aaed..ba6ec5a3ea201c 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_transform.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_transform.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_TRANSFORM_H
-#define _LIBCPP___ALGORITHM_RANGES_TRANSFORM_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_TRANSFORM_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_TRANSFORM_H
#include <__cxx03/__algorithm/in_in_out_result.h>
#include <__cxx03/__algorithm/in_out_result.h>
@@ -174,4 +174,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_TRANSFORM_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_TRANSFORM_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_unique.h b/libcxx/include/__cxx03/__algorithm/ranges_unique.h
index 0893127dd9d178..d54b1c5205c28d 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_unique.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_unique.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_UNIQUE_H
-#define _LIBCPP___ALGORITHM_RANGES_UNIQUE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_UNIQUE_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_UNIQUE_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__algorithm/make_projected.h>
@@ -79,4 +79,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_UNIQUE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_UNIQUE_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_unique_copy.h b/libcxx/include/__cxx03/__algorithm/ranges_unique_copy.h
index c30332a217f7ee..6eed79b2589980 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_unique_copy.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_unique_copy.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_UNIQUE_COPY_H
-#define _LIBCPP___ALGORITHM_RANGES_UNIQUE_COPY_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_UNIQUE_COPY_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_UNIQUE_COPY_H
#include <__cxx03/__algorithm/in_out_result.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -117,4 +117,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_RANGES_UNIQUE_COPY_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_UNIQUE_COPY_H
diff --git a/libcxx/include/__cxx03/__algorithm/ranges_upper_bound.h b/libcxx/include/__cxx03/__algorithm/ranges_upper_bound.h
index 79b49ab804b3ba..004b9ae654f855 100644
--- a/libcxx/include/__cxx03/__algorithm/ranges_upper_bound.h
+++ b/libcxx/include/__cxx03/__algorithm/ranges_upper_bound.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_UPPER_BOUND_H
-#define _LIBCPP___ALGORITHM_RANGES_UPPER_BOUND_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_UPPER_BOUND_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_UPPER_BOUND_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__algorithm/lower_bound.h>
@@ -71,4 +71,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___ALGORITHM_RANGES_UPPER_BOUND_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_UPPER_BOUND_H
diff --git a/libcxx/include/__cxx03/__algorithm/remove.h b/libcxx/include/__cxx03/__algorithm/remove.h
index 7849527585b175..208351e22ac907 100644
--- a/libcxx/include/__cxx03/__algorithm/remove.h
+++ b/libcxx/include/__cxx03/__algorithm/remove.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_REMOVE_H
-#define _LIBCPP___ALGORITHM_REMOVE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_REMOVE_H
+#define _LIBCPP___CXX03___ALGORITHM_REMOVE_H
#include <__cxx03/__algorithm/find.h>
#include <__cxx03/__algorithm/find_if.h>
@@ -43,4 +43,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_REMOVE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_REMOVE_H
diff --git a/libcxx/include/__cxx03/__algorithm/remove_copy.h b/libcxx/include/__cxx03/__algorithm/remove_copy.h
index e79c7981271613..1bed25224281bb 100644
--- a/libcxx/include/__cxx03/__algorithm/remove_copy.h
+++ b/libcxx/include/__cxx03/__algorithm/remove_copy.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_REMOVE_COPY_H
-#define _LIBCPP___ALGORITHM_REMOVE_COPY_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_REMOVE_COPY_H
+#define _LIBCPP___CXX03___ALGORITHM_REMOVE_COPY_H
#include <__cxx03/__config>
@@ -31,4 +31,4 @@ remove_copy(_InputIterator __first, _InputIterator __last, _OutputIterator __res
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_REMOVE_COPY_H
+#endif // _LIBCPP___CXX03___ALGORITHM_REMOVE_COPY_H
diff --git a/libcxx/include/__cxx03/__algorithm/remove_copy_if.h b/libcxx/include/__cxx03/__algorithm/remove_copy_if.h
index 7132e3c0bdb1ae..3ec019dfd59125 100644
--- a/libcxx/include/__cxx03/__algorithm/remove_copy_if.h
+++ b/libcxx/include/__cxx03/__algorithm/remove_copy_if.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_REMOVE_COPY_IF_H
-#define _LIBCPP___ALGORITHM_REMOVE_COPY_IF_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_REMOVE_COPY_IF_H
+#define _LIBCPP___CXX03___ALGORITHM_REMOVE_COPY_IF_H
#include <__cxx03/__config>
@@ -31,4 +31,4 @@ remove_copy_if(_InputIterator __first, _InputIterator __last, _OutputIterator __
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_REMOVE_COPY_IF_H
+#endif // _LIBCPP___CXX03___ALGORITHM_REMOVE_COPY_IF_H
diff --git a/libcxx/include/__cxx03/__algorithm/remove_if.h b/libcxx/include/__cxx03/__algorithm/remove_if.h
index e6dc3d15fbc9cb..c64e0aa4477e5c 100644
--- a/libcxx/include/__cxx03/__algorithm/remove_if.h
+++ b/libcxx/include/__cxx03/__algorithm/remove_if.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_REMOVE_IF_H
-#define _LIBCPP___ALGORITHM_REMOVE_IF_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_REMOVE_IF_H
+#define _LIBCPP___CXX03___ALGORITHM_REMOVE_IF_H
#include <__cxx03/__algorithm/find_if.h>
#include <__cxx03/__config>
@@ -42,4 +42,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_REMOVE_IF_H
+#endif // _LIBCPP___CXX03___ALGORITHM_REMOVE_IF_H
diff --git a/libcxx/include/__cxx03/__algorithm/replace.h b/libcxx/include/__cxx03/__algorithm/replace.h
index 2b24752f048ef5..692cece1708f93 100644
--- a/libcxx/include/__cxx03/__algorithm/replace.h
+++ b/libcxx/include/__cxx03/__algorithm/replace.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_REPLACE_H
-#define _LIBCPP___ALGORITHM_REPLACE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_REPLACE_H
+#define _LIBCPP___CXX03___ALGORITHM_REPLACE_H
#include <__cxx03/__config>
@@ -27,4 +27,4 @@ replace(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __old_valu
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_REPLACE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_REPLACE_H
diff --git a/libcxx/include/__cxx03/__algorithm/replace_copy.h b/libcxx/include/__cxx03/__algorithm/replace_copy.h
index 6c50dd4e14f576..4f8b375df2fb7b 100644
--- a/libcxx/include/__cxx03/__algorithm/replace_copy.h
+++ b/libcxx/include/__cxx03/__algorithm/replace_copy.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_REPLACE_COPY_H
-#define _LIBCPP___ALGORITHM_REPLACE_COPY_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_REPLACE_COPY_H
+#define _LIBCPP___CXX03___ALGORITHM_REPLACE_COPY_H
#include <__cxx03/__config>
@@ -34,4 +34,4 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator repla
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_REPLACE_COPY_H
+#endif // _LIBCPP___CXX03___ALGORITHM_REPLACE_COPY_H
diff --git a/libcxx/include/__cxx03/__algorithm/replace_copy_if.h b/libcxx/include/__cxx03/__algorithm/replace_copy_if.h
index c714d500373394..cfc7b0aa2d34c1 100644
--- a/libcxx/include/__cxx03/__algorithm/replace_copy_if.h
+++ b/libcxx/include/__cxx03/__algorithm/replace_copy_if.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_REPLACE_COPY_IF_H
-#define _LIBCPP___ALGORITHM_REPLACE_COPY_IF_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_REPLACE_COPY_IF_H
+#define _LIBCPP___CXX03___ALGORITHM_REPLACE_COPY_IF_H
#include <__cxx03/__config>
@@ -34,4 +34,4 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator repla
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_REPLACE_COPY_IF_H
+#endif // _LIBCPP___CXX03___ALGORITHM_REPLACE_COPY_IF_H
diff --git a/libcxx/include/__cxx03/__algorithm/replace_if.h b/libcxx/include/__cxx03/__algorithm/replace_if.h
index 8bd9a9c0db9790..f46da35714ef37 100644
--- a/libcxx/include/__cxx03/__algorithm/replace_if.h
+++ b/libcxx/include/__cxx03/__algorithm/replace_if.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_REPLACE_IF_H
-#define _LIBCPP___ALGORITHM_REPLACE_IF_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_REPLACE_IF_H
+#define _LIBCPP___CXX03___ALGORITHM_REPLACE_IF_H
#include <__cxx03/__config>
@@ -27,4 +27,4 @@ replace_if(_ForwardIterator __first, _ForwardIterator __last, _Predicate __pred,
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_REPLACE_IF_H
+#endif // _LIBCPP___CXX03___ALGORITHM_REPLACE_IF_H
diff --git a/libcxx/include/__cxx03/__algorithm/reverse.h b/libcxx/include/__cxx03/__algorithm/reverse.h
index b97ec38490a22f..868377c7b26bd5 100644
--- a/libcxx/include/__cxx03/__algorithm/reverse.h
+++ b/libcxx/include/__cxx03/__algorithm/reverse.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_REVERSE_H
-#define _LIBCPP___ALGORITHM_REVERSE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_REVERSE_H
+#define _LIBCPP___CXX03___ALGORITHM_REVERSE_H
#include <__cxx03/__algorithm/iter_swap.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -59,4 +59,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_REVERSE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_REVERSE_H
diff --git a/libcxx/include/__cxx03/__algorithm/reverse_copy.h b/libcxx/include/__cxx03/__algorithm/reverse_copy.h
index 29070fec8448c1..3553102a2d03cc 100644
--- a/libcxx/include/__cxx03/__algorithm/reverse_copy.h
+++ b/libcxx/include/__cxx03/__algorithm/reverse_copy.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_REVERSE_COPY_H
-#define _LIBCPP___ALGORITHM_REVERSE_COPY_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_REVERSE_COPY_H
+#define _LIBCPP___CXX03___ALGORITHM_REVERSE_COPY_H
#include <__cxx03/__config>
@@ -27,4 +27,4 @@ reverse_copy(_BidirectionalIterator __first, _BidirectionalIterator __last, _Out
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_REVERSE_COPY_H
+#endif // _LIBCPP___CXX03___ALGORITHM_REVERSE_COPY_H
diff --git a/libcxx/include/__cxx03/__algorithm/rotate.h b/libcxx/include/__cxx03/__algorithm/rotate.h
index d6ca9230731edd..e41edf00e79930 100644
--- a/libcxx/include/__cxx03/__algorithm/rotate.h
+++ b/libcxx/include/__cxx03/__algorithm/rotate.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_ROTATE_H
-#define _LIBCPP___ALGORITHM_ROTATE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_ROTATE_H
+#define _LIBCPP___CXX03___ALGORITHM_ROTATE_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__algorithm/move.h>
@@ -195,4 +195,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_ROTATE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_ROTATE_H
diff --git a/libcxx/include/__cxx03/__algorithm/rotate_copy.h b/libcxx/include/__cxx03/__algorithm/rotate_copy.h
index c20d9571e6ffda..6970cdc5a2c56b 100644
--- a/libcxx/include/__cxx03/__algorithm/rotate_copy.h
+++ b/libcxx/include/__cxx03/__algorithm/rotate_copy.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_ROTATE_COPY_H
-#define _LIBCPP___ALGORITHM_ROTATE_COPY_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_ROTATE_COPY_H
+#define _LIBCPP___CXX03___ALGORITHM_ROTATE_COPY_H
#include <__cxx03/__algorithm/copy.h>
#include <__cxx03/__config>
@@ -26,4 +26,4 @@ rotate_copy(_ForwardIterator __first, _ForwardIterator __middle, _ForwardIterato
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_ROTATE_COPY_H
+#endif // _LIBCPP___CXX03___ALGORITHM_ROTATE_COPY_H
diff --git a/libcxx/include/__cxx03/__algorithm/sample.h b/libcxx/include/__cxx03/__algorithm/sample.h
index e6743cf3828c01..55e34c9f248135 100644
--- a/libcxx/include/__cxx03/__algorithm/sample.h
+++ b/libcxx/include/__cxx03/__algorithm/sample.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_SAMPLE_H
-#define _LIBCPP___ALGORITHM_SAMPLE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_SAMPLE_H
+#define _LIBCPP___CXX03___ALGORITHM_SAMPLE_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__algorithm/min.h>
@@ -120,4 +120,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_SAMPLE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_SAMPLE_H
diff --git a/libcxx/include/__cxx03/__algorithm/search.h b/libcxx/include/__cxx03/__algorithm/search.h
index eb862f4ad7ca98..7ca6bdbc2beb5a 100644
--- a/libcxx/include/__cxx03/__algorithm/search.h
+++ b/libcxx/include/__cxx03/__algorithm/search.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_SEARCH_H
-#define _LIBCPP___ALGORITHM_SEARCH_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_SEARCH_H
+#define _LIBCPP___CXX03___ALGORITHM_SEARCH_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -189,4 +189,4 @@ search(_ForwardIterator __f, _ForwardIterator __l, const _Searcher& __s) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_SEARCH_H
+#endif // _LIBCPP___CXX03___ALGORITHM_SEARCH_H
diff --git a/libcxx/include/__cxx03/__algorithm/search_n.h b/libcxx/include/__cxx03/__algorithm/search_n.h
index d6458b8ca90d84..cf63de27666b24 100644
--- a/libcxx/include/__cxx03/__algorithm/search_n.h
+++ b/libcxx/include/__cxx03/__algorithm/search_n.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_SEARCH_N_H
-#define _LIBCPP___ALGORITHM_SEARCH_N_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_SEARCH_N_H
+#define _LIBCPP___CXX03___ALGORITHM_SEARCH_N_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -152,4 +152,4 @@ search_n(_ForwardIterator __first, _ForwardIterator __last, _Size __count, const
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_SEARCH_N_H
+#endif // _LIBCPP___CXX03___ALGORITHM_SEARCH_N_H
diff --git a/libcxx/include/__cxx03/__algorithm/set_difference.h b/libcxx/include/__cxx03/__algorithm/set_difference.h
index 13d6f0249e4365..1bdddd39559803 100644
--- a/libcxx/include/__cxx03/__algorithm/set_difference.h
+++ b/libcxx/include/__cxx03/__algorithm/set_difference.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_SET_DIFFERENCE_H
-#define _LIBCPP___ALGORITHM_SET_DIFFERENCE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_SET_DIFFERENCE_H
+#define _LIBCPP___CXX03___ALGORITHM_SET_DIFFERENCE_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -76,4 +76,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_SET_DIFFERENCE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_SET_DIFFERENCE_H
diff --git a/libcxx/include/__cxx03/__algorithm/set_intersection.h b/libcxx/include/__cxx03/__algorithm/set_intersection.h
index f1193ec349cfd5..8164ced338d20e 100644
--- a/libcxx/include/__cxx03/__algorithm/set_intersection.h
+++ b/libcxx/include/__cxx03/__algorithm/set_intersection.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_SET_INTERSECTION_H
-#define _LIBCPP___ALGORITHM_SET_INTERSECTION_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_SET_INTERSECTION_H
+#define _LIBCPP___CXX03___ALGORITHM_SET_INTERSECTION_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -214,4 +214,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_SET_INTERSECTION_H
+#endif // _LIBCPP___CXX03___ALGORITHM_SET_INTERSECTION_H
diff --git a/libcxx/include/__cxx03/__algorithm/set_symmetric_difference.h b/libcxx/include/__cxx03/__algorithm/set_symmetric_difference.h
index 71aca2b8ed03b0..64fdf4543be9c0 100644
--- a/libcxx/include/__cxx03/__algorithm/set_symmetric_difference.h
+++ b/libcxx/include/__cxx03/__algorithm/set_symmetric_difference.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_SET_SYMMETRIC_DIFFERENCE_H
-#define _LIBCPP___ALGORITHM_SET_SYMMETRIC_DIFFERENCE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_SET_SYMMETRIC_DIFFERENCE_H
+#define _LIBCPP___CXX03___ALGORITHM_SET_SYMMETRIC_DIFFERENCE_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -106,4 +106,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_SET_SYMMETRIC_DIFFERENCE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_SET_SYMMETRIC_DIFFERENCE_H
diff --git a/libcxx/include/__cxx03/__algorithm/set_union.h b/libcxx/include/__cxx03/__algorithm/set_union.h
index f60221cce3cd83..a5c6d5eabd3941 100644
--- a/libcxx/include/__cxx03/__algorithm/set_union.h
+++ b/libcxx/include/__cxx03/__algorithm/set_union.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_SET_UNION_H
-#define _LIBCPP___ALGORITHM_SET_UNION_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_SET_UNION_H
+#define _LIBCPP___CXX03___ALGORITHM_SET_UNION_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -102,4 +102,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_SET_UNION_H
+#endif // _LIBCPP___CXX03___ALGORITHM_SET_UNION_H
diff --git a/libcxx/include/__cxx03/__algorithm/shift_left.h b/libcxx/include/__cxx03/__algorithm/shift_left.h
index b59a0698267108..886f353f2814cb 100644
--- a/libcxx/include/__cxx03/__algorithm/shift_left.h
+++ b/libcxx/include/__cxx03/__algorithm/shift_left.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_SHIFT_LEFT_H
-#define _LIBCPP___ALGORITHM_SHIFT_LEFT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_SHIFT_LEFT_H
+#define _LIBCPP___CXX03___ALGORITHM_SHIFT_LEFT_H
#include <__cxx03/__algorithm/move.h>
#include <__cxx03/__config>
@@ -56,4 +56,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_SHIFT_LEFT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_SHIFT_LEFT_H
diff --git a/libcxx/include/__cxx03/__algorithm/shift_right.h b/libcxx/include/__cxx03/__algorithm/shift_right.h
index 51d8ea613245dd..4bff76af2fd99d 100644
--- a/libcxx/include/__cxx03/__algorithm/shift_right.h
+++ b/libcxx/include/__cxx03/__algorithm/shift_right.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_SHIFT_RIGHT_H
-#define _LIBCPP___ALGORITHM_SHIFT_RIGHT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_SHIFT_RIGHT_H
+#define _LIBCPP___CXX03___ALGORITHM_SHIFT_RIGHT_H
#include <__cxx03/__algorithm/move.h>
#include <__cxx03/__algorithm/move_backward.h>
@@ -102,4 +102,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_SHIFT_RIGHT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_SHIFT_RIGHT_H
diff --git a/libcxx/include/__cxx03/__algorithm/shuffle.h b/libcxx/include/__cxx03/__algorithm/shuffle.h
index 30b372ffe767a3..abb96bce402361 100644
--- a/libcxx/include/__cxx03/__algorithm/shuffle.h
+++ b/libcxx/include/__cxx03/__algorithm/shuffle.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_SHUFFLE_H
-#define _LIBCPP___ALGORITHM_SHUFFLE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_SHUFFLE_H
+#define _LIBCPP___CXX03___ALGORITHM_SHUFFLE_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__config>
@@ -164,4 +164,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_SHUFFLE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_SHUFFLE_H
diff --git a/libcxx/include/__cxx03/__algorithm/sift_down.h b/libcxx/include/__cxx03/__algorithm/sift_down.h
index 85f0aa92c568d5..774a6d2450d578 100644
--- a/libcxx/include/__cxx03/__algorithm/sift_down.h
+++ b/libcxx/include/__cxx03/__algorithm/sift_down.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_SIFT_DOWN_H
-#define _LIBCPP___ALGORITHM_SIFT_DOWN_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_SIFT_DOWN_H
+#define _LIBCPP___CXX03___ALGORITHM_SIFT_DOWN_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__assert>
@@ -115,4 +115,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_SIFT_DOWN_H
+#endif // _LIBCPP___CXX03___ALGORITHM_SIFT_DOWN_H
diff --git a/libcxx/include/__cxx03/__algorithm/simd_utils.h b/libcxx/include/__cxx03/__algorithm/simd_utils.h
index 4769a8176a8855..db2e20fb65ece3 100644
--- a/libcxx/include/__cxx03/__algorithm/simd_utils.h
+++ b/libcxx/include/__cxx03/__algorithm/simd_utils.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_SIMD_UTILS_H
-#define _LIBCPP___ALGORITHM_SIMD_UTILS_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_SIMD_UTILS_H
+#define _LIBCPP___CXX03___ALGORITHM_SIMD_UTILS_H
#include <__cxx03/__algorithm/min.h>
#include <__cxx03/__bit/bit_cast.h>
@@ -161,4 +161,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_SIMD_UTILS_H
+#endif // _LIBCPP___CXX03___ALGORITHM_SIMD_UTILS_H
diff --git a/libcxx/include/__cxx03/__algorithm/sort.h b/libcxx/include/__cxx03/__algorithm/sort.h
index d14ec87b4aea89..009ebf717bbd88 100644
--- a/libcxx/include/__cxx03/__algorithm/sort.h
+++ b/libcxx/include/__cxx03/__algorithm/sort.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_SORT_H
-#define _LIBCPP___ALGORITHM_SORT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_SORT_H
+#define _LIBCPP___CXX03___ALGORITHM_SORT_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -1013,4 +1013,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_SORT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_SORT_H
diff --git a/libcxx/include/__cxx03/__algorithm/sort_heap.h b/libcxx/include/__cxx03/__algorithm/sort_heap.h
index c2d218b8f5e0d9..b5a341103980eb 100644
--- a/libcxx/include/__cxx03/__algorithm/sort_heap.h
+++ b/libcxx/include/__cxx03/__algorithm/sort_heap.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_SORT_HEAP_H
-#define _LIBCPP___ALGORITHM_SORT_HEAP_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_SORT_HEAP_H
+#define _LIBCPP___CXX03___ALGORITHM_SORT_HEAP_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -60,4 +60,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_SORT_HEAP_H
+#endif // _LIBCPP___CXX03___ALGORITHM_SORT_HEAP_H
diff --git a/libcxx/include/__cxx03/__algorithm/stable_partition.h b/libcxx/include/__cxx03/__algorithm/stable_partition.h
index cea18b30fbb376..c8044987e247a8 100644
--- a/libcxx/include/__cxx03/__algorithm/stable_partition.h
+++ b/libcxx/include/__cxx03/__algorithm/stable_partition.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_STABLE_PARTITION_H
-#define _LIBCPP___ALGORITHM_STABLE_PARTITION_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_STABLE_PARTITION_H
+#define _LIBCPP___CXX03___ALGORITHM_STABLE_PARTITION_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__algorithm/rotate.h>
@@ -304,4 +304,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_STABLE_PARTITION_H
+#endif // _LIBCPP___CXX03___ALGORITHM_STABLE_PARTITION_H
diff --git a/libcxx/include/__cxx03/__algorithm/stable_sort.h b/libcxx/include/__cxx03/__algorithm/stable_sort.h
index 6a3cef7ec1b661..e1f89f6341b9fb 100644
--- a/libcxx/include/__cxx03/__algorithm/stable_sort.h
+++ b/libcxx/include/__cxx03/__algorithm/stable_sort.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_STABLE_SORT_H
-#define _LIBCPP___ALGORITHM_STABLE_SORT_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_STABLE_SORT_H
+#define _LIBCPP___CXX03___ALGORITHM_STABLE_SORT_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/comp_ref_type.h>
@@ -270,4 +270,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_STABLE_SORT_H
+#endif // _LIBCPP___CXX03___ALGORITHM_STABLE_SORT_H
diff --git a/libcxx/include/__cxx03/__algorithm/swap_ranges.h b/libcxx/include/__cxx03/__algorithm/swap_ranges.h
index 12bc8056e35770..9a19ffe602b336 100644
--- a/libcxx/include/__cxx03/__algorithm/swap_ranges.h
+++ b/libcxx/include/__cxx03/__algorithm/swap_ranges.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_SWAP_RANGES_H
-#define _LIBCPP___ALGORITHM_SWAP_RANGES_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_SWAP_RANGES_H
+#define _LIBCPP___CXX03___ALGORITHM_SWAP_RANGES_H
#include <__cxx03/__algorithm/iterator_operations.h>
#include <__cxx03/__config>
@@ -59,4 +59,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_SWAP_RANGES_H
+#endif // _LIBCPP___CXX03___ALGORITHM_SWAP_RANGES_H
diff --git a/libcxx/include/__cxx03/__algorithm/three_way_comp_ref_type.h b/libcxx/include/__cxx03/__algorithm/three_way_comp_ref_type.h
index be6a4e4d014822..4463bd21154822 100644
--- a/libcxx/include/__cxx03/__algorithm/three_way_comp_ref_type.h
+++ b/libcxx/include/__cxx03/__algorithm/three_way_comp_ref_type.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_THREE_WAY_COMP_REF_TYPE_H
-#define _LIBCPP___ALGORITHM_THREE_WAY_COMP_REF_TYPE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_THREE_WAY_COMP_REF_TYPE_H
+#define _LIBCPP___CXX03___ALGORITHM_THREE_WAY_COMP_REF_TYPE_H
#include <__cxx03/__assert>
#include <__cxx03/__compare/ordering.h>
@@ -71,4 +71,4 @@ using __three_way_comp_ref_type = _Comp&;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_THREE_WAY_COMP_REF_TYPE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_THREE_WAY_COMP_REF_TYPE_H
diff --git a/libcxx/include/__cxx03/__algorithm/transform.h b/libcxx/include/__cxx03/__algorithm/transform.h
index 1608932b050b42..4bed1ed4f8d591 100644
--- a/libcxx/include/__cxx03/__algorithm/transform.h
+++ b/libcxx/include/__cxx03/__algorithm/transform.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_TRANSFORM_H
-#define _LIBCPP___ALGORITHM_TRANSFORM_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_TRANSFORM_H
+#define _LIBCPP___CXX03___ALGORITHM_TRANSFORM_H
#include <__cxx03/__config>
@@ -39,4 +39,4 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator trans
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ALGORITHM_TRANSFORM_H
+#endif // _LIBCPP___CXX03___ALGORITHM_TRANSFORM_H
diff --git a/libcxx/include/__cxx03/__algorithm/uniform_random_bit_generator_adaptor.h b/libcxx/include/__cxx03/__algorithm/uniform_random_bit_generator_adaptor.h
index 25a9e35fd7aa7a..8d3858226b992f 100644
--- a/libcxx/include/__cxx03/__algorithm/uniform_random_bit_generator_adaptor.h
+++ b/libcxx/include/__cxx03/__algorithm/uniform_random_bit_generator_adaptor.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_RANGES_UNIFORM_RANDOM_BIT_GENERATOR_ADAPTOR_H
-#define _LIBCPP___ALGORITHM_RANGES_UNIFORM_RANDOM_BIT_GENERATOR_ADAPTOR_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_RANGES_UNIFORM_RANDOM_BIT_GENERATOR_ADAPTOR_H
+#define _LIBCPP___CXX03___ALGORITHM_RANGES_UNIFORM_RANDOM_BIT_GENERATOR_ADAPTOR_H
#include <__cxx03/__config>
#include <__cxx03/__functional/invoke.h>
@@ -55,4 +55,4 @@ _LIBCPP_POP_MACROS
#endif // _LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___ALGORITHM_RANGES_UNIFORM_RANDOM_BIT_GENERATOR_ADAPTOR_H
+#endif // _LIBCPP___CXX03___ALGORITHM_RANGES_UNIFORM_RANDOM_BIT_GENERATOR_ADAPTOR_H
diff --git a/libcxx/include/__cxx03/__algorithm/unique.h b/libcxx/include/__cxx03/__algorithm/unique.h
index 8d21c63eb2b7da..b7eb2849e4e37d 100644
--- a/libcxx/include/__cxx03/__algorithm/unique.h
+++ b/libcxx/include/__cxx03/__algorithm/unique.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_UNIQUE_H
-#define _LIBCPP___ALGORITHM_UNIQUE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_UNIQUE_H
+#define _LIBCPP___CXX03___ALGORITHM_UNIQUE_H
#include <__cxx03/__algorithm/adjacent_find.h>
#include <__cxx03/__algorithm/comp.h>
@@ -61,4 +61,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_UNIQUE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_UNIQUE_H
diff --git a/libcxx/include/__cxx03/__algorithm/unique_copy.h b/libcxx/include/__cxx03/__algorithm/unique_copy.h
index cfa95a58f7b09a..6d3daefaa1ca52 100644
--- a/libcxx/include/__cxx03/__algorithm/unique_copy.h
+++ b/libcxx/include/__cxx03/__algorithm/unique_copy.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_UNIQUE_COPY_H
-#define _LIBCPP___ALGORITHM_UNIQUE_COPY_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_UNIQUE_COPY_H
+#define _LIBCPP___CXX03___ALGORITHM_UNIQUE_COPY_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/iterator_operations.h>
@@ -124,4 +124,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_UNIQUE_COPY_H
+#endif // _LIBCPP___CXX03___ALGORITHM_UNIQUE_COPY_H
diff --git a/libcxx/include/__cxx03/__algorithm/unwrap_iter.h b/libcxx/include/__cxx03/__algorithm/unwrap_iter.h
index b3259af17dd032..055f56b9db1558 100644
--- a/libcxx/include/__cxx03/__algorithm/unwrap_iter.h
+++ b/libcxx/include/__cxx03/__algorithm/unwrap_iter.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_UNWRAP_ITER_H
-#define _LIBCPP___ALGORITHM_UNWRAP_ITER_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_UNWRAP_ITER_H
+#define _LIBCPP___CXX03___ALGORITHM_UNWRAP_ITER_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/iterator_traits.h>
@@ -82,4 +82,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_UNWRAP_ITER_H
+#endif // _LIBCPP___CXX03___ALGORITHM_UNWRAP_ITER_H
diff --git a/libcxx/include/__cxx03/__algorithm/unwrap_range.h b/libcxx/include/__cxx03/__algorithm/unwrap_range.h
index 26045ef7075afb..0b81f1e805c8a1 100644
--- a/libcxx/include/__cxx03/__algorithm/unwrap_range.h
+++ b/libcxx/include/__cxx03/__algorithm/unwrap_range.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_UNWRAP_RANGE_H
-#define _LIBCPP___ALGORITHM_UNWRAP_RANGE_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_UNWRAP_RANGE_H
+#define _LIBCPP___CXX03___ALGORITHM_UNWRAP_RANGE_H
#include <__cxx03/__algorithm/unwrap_iter.h>
#include <__cxx03/__concepts/constructible.h>
@@ -96,4 +96,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_UNWRAP_RANGE_H
+#endif // _LIBCPP___CXX03___ALGORITHM_UNWRAP_RANGE_H
diff --git a/libcxx/include/__cxx03/__algorithm/upper_bound.h b/libcxx/include/__cxx03/__algorithm/upper_bound.h
index 069dd6d253e285..3a0f1f560cb77a 100644
--- a/libcxx/include/__cxx03/__algorithm/upper_bound.h
+++ b/libcxx/include/__cxx03/__algorithm/upper_bound.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ALGORITHM_UPPER_BOUND_H
-#define _LIBCPP___ALGORITHM_UPPER_BOUND_H
+#ifndef _LIBCPP___CXX03___ALGORITHM_UPPER_BOUND_H
+#define _LIBCPP___CXX03___ALGORITHM_UPPER_BOUND_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__algorithm/half_positive.h>
@@ -65,4 +65,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ALGORITHM_UPPER_BOUND_H
+#endif // _LIBCPP___CXX03___ALGORITHM_UPPER_BOUND_H
diff --git a/libcxx/include/__cxx03/__assert b/libcxx/include/__cxx03/__assert
index 19a322934e41d9..f6c4d8e4a5d09b 100644
--- a/libcxx/include/__cxx03/__assert
+++ b/libcxx/include/__cxx03/__assert
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ASSERT
-#define _LIBCPP___ASSERT
+#ifndef _LIBCPP___CXX03___ASSERT
+#define _LIBCPP___CXX03___ASSERT
#include <__assertion_handler> // Note: this include is generated by CMake and is potentially vendor-provided.
#include <__cxx03/__config>
@@ -115,4 +115,4 @@
#endif // _LIBCPP_HARDENING_MODE == _LIBCPP_HARDENING_MODE_FAST
// clang-format on
-#endif // _LIBCPP___ASSERT
+#endif // _LIBCPP___CXX03___ASSERT
diff --git a/libcxx/include/__cxx03/__atomic/aliases.h b/libcxx/include/__cxx03/__atomic/aliases.h
index b5a7685eb4fa84..918ffc35ccf636 100644
--- a/libcxx/include/__cxx03/__atomic/aliases.h
+++ b/libcxx/include/__cxx03/__atomic/aliases.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ATOMIC_ALIASES_H
-#define _LIBCPP___ATOMIC_ALIASES_H
+#ifndef _LIBCPP___CXX03___ATOMIC_ALIASES_H
+#define _LIBCPP___CXX03___ATOMIC_ALIASES_H
#include <__cxx03/__atomic/atomic.h>
#include <__cxx03/__atomic/atomic_lock_free.h>
@@ -107,4 +107,4 @@ using atomic_unsigned_lock_free = atomic<make_unsigned_t<__contention_t_or_large
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ATOMIC_ALIASES_H
+#endif // _LIBCPP___CXX03___ATOMIC_ALIASES_H
diff --git a/libcxx/include/__cxx03/__atomic/atomic.h b/libcxx/include/__cxx03/__atomic/atomic.h
index 0e5936e2eb5428..9ac800613f8246 100644
--- a/libcxx/include/__cxx03/__atomic/atomic.h
+++ b/libcxx/include/__cxx03/__atomic/atomic.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ATOMIC_ATOMIC_H
-#define _LIBCPP___ATOMIC_ATOMIC_H
+#ifndef _LIBCPP___CXX03___ATOMIC_ATOMIC_H
+#define _LIBCPP___CXX03___ATOMIC_ATOMIC_H
#include <__cxx03/__atomic/atomic_base.h>
#include <__cxx03/__atomic/check_memory_order.h>
@@ -619,4 +619,4 @@ atomic_fetch_xor_explicit(atomic<_Tp>* __o, typename atomic<_Tp>::value_type __o
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ATOMIC_ATOMIC_H
+#endif // _LIBCPP___CXX03___ATOMIC_ATOMIC_H
diff --git a/libcxx/include/__cxx03/__atomic/atomic_base.h b/libcxx/include/__cxx03/__atomic/atomic_base.h
index ae6aaf4f8284f5..e4d4929b8912e9 100644
--- a/libcxx/include/__cxx03/__atomic/atomic_base.h
+++ b/libcxx/include/__cxx03/__atomic/atomic_base.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ATOMIC_ATOMIC_BASE_H
-#define _LIBCPP___ATOMIC_ATOMIC_BASE_H
+#ifndef _LIBCPP___CXX03___ATOMIC_ATOMIC_BASE_H
+#define _LIBCPP___CXX03___ATOMIC_ATOMIC_BASE_H
#include <__cxx03/__atomic/atomic_sync.h>
#include <__cxx03/__atomic/check_memory_order.h>
@@ -218,4 +218,4 @@ struct __atomic_waitable_traits<__atomic_base<_Tp, _IsIntegral> > {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ATOMIC_ATOMIC_BASE_H
+#endif // _LIBCPP___CXX03___ATOMIC_ATOMIC_BASE_H
diff --git a/libcxx/include/__cxx03/__atomic/atomic_flag.h b/libcxx/include/__cxx03/__atomic/atomic_flag.h
index 6a8471e1f1ec86..c119e9bc498e6f 100644
--- a/libcxx/include/__cxx03/__atomic/atomic_flag.h
+++ b/libcxx/include/__cxx03/__atomic/atomic_flag.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ATOMIC_ATOMIC_FLAG_H
-#define _LIBCPP___ATOMIC_ATOMIC_FLAG_H
+#ifndef _LIBCPP___CXX03___ATOMIC_ATOMIC_FLAG_H
+#define _LIBCPP___CXX03___ATOMIC_ATOMIC_FLAG_H
#include <__cxx03/__atomic/atomic_sync.h>
#include <__cxx03/__atomic/contention_t.h>
@@ -186,4 +186,4 @@ atomic_flag_notify_all(atomic_flag* __o) _NOEXCEPT {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ATOMIC_ATOMIC_FLAG_H
+#endif // _LIBCPP___CXX03___ATOMIC_ATOMIC_FLAG_H
diff --git a/libcxx/include/__cxx03/__atomic/atomic_init.h b/libcxx/include/__cxx03/__atomic/atomic_init.h
index 666afb93268d6d..edabfe1a12bb4a 100644
--- a/libcxx/include/__cxx03/__atomic/atomic_init.h
+++ b/libcxx/include/__cxx03/__atomic/atomic_init.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ATOMIC_ATOMIC_INIT_H
-#define _LIBCPP___ATOMIC_ATOMIC_INIT_H
+#ifndef _LIBCPP___CXX03___ATOMIC_ATOMIC_INIT_H
+#define _LIBCPP___CXX03___ATOMIC_ATOMIC_INIT_H
#include <__cxx03/__config>
@@ -22,4 +22,4 @@
# pragma clang deprecated(ATOMIC_VAR_INIT)
#endif
-#endif // _LIBCPP___ATOMIC_ATOMIC_INIT_H
+#endif // _LIBCPP___CXX03___ATOMIC_ATOMIC_INIT_H
diff --git a/libcxx/include/__cxx03/__atomic/atomic_lock_free.h b/libcxx/include/__cxx03/__atomic/atomic_lock_free.h
index 17dfcfd46106ea..297d148babc83a 100644
--- a/libcxx/include/__cxx03/__atomic/atomic_lock_free.h
+++ b/libcxx/include/__cxx03/__atomic/atomic_lock_free.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ATOMIC_ATOMIC_LOCK_FREE_H
-#define _LIBCPP___ATOMIC_ATOMIC_LOCK_FREE_H
+#ifndef _LIBCPP___CXX03___ATOMIC_ATOMIC_LOCK_FREE_H
+#define _LIBCPP___CXX03___ATOMIC_ATOMIC_LOCK_FREE_H
#include <__cxx03/__config>
@@ -45,4 +45,4 @@
# define ATOMIC_POINTER_LOCK_FREE __GCC_ATOMIC_POINTER_LOCK_FREE
#endif
-#endif // _LIBCPP___ATOMIC_ATOMIC_LOCK_FREE_H
+#endif // _LIBCPP___CXX03___ATOMIC_ATOMIC_LOCK_FREE_H
diff --git a/libcxx/include/__cxx03/__atomic/atomic_ref.h b/libcxx/include/__cxx03/__atomic/atomic_ref.h
index c19e6a2e5d26d7..f30aac3210e27f 100644
--- a/libcxx/include/__cxx03/__atomic/atomic_ref.h
+++ b/libcxx/include/__cxx03/__atomic/atomic_ref.h
@@ -14,8 +14,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP___ATOMIC_ATOMIC_REF_H
-#define _LIBCPP___ATOMIC_ATOMIC_REF_H
+#ifndef _LIBCPP___CXX03___ATOMIC_ATOMIC_REF_H
+#define _LIBCPP___CXX03___ATOMIC_ATOMIC_REF_H
#include <__cxx03/__assert>
#include <__cxx03/__atomic/atomic_sync.h>
@@ -375,4 +375,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP__ATOMIC_ATOMIC_REF_H
+#endif // _LIBCPP___CXX03__ATOMIC_ATOMIC_REF_H
diff --git a/libcxx/include/__cxx03/__atomic/atomic_sync.h b/libcxx/include/__cxx03/__atomic/atomic_sync.h
index 815c8a1459649a..ca029f0384058e 100644
--- a/libcxx/include/__cxx03/__atomic/atomic_sync.h
+++ b/libcxx/include/__cxx03/__atomic/atomic_sync.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ATOMIC_ATOMIC_SYNC_H
-#define _LIBCPP___ATOMIC_ATOMIC_SYNC_H
+#ifndef _LIBCPP___CXX03___ATOMIC_ATOMIC_SYNC_H
+#define _LIBCPP___CXX03___ATOMIC_ATOMIC_SYNC_H
#include <__cxx03/__atomic/contention_t.h>
#include <__cxx03/__atomic/cxx_atomic_impl.h>
@@ -202,4 +202,4 @@ __atomic_wait(_AtomicWaitable& __a, _Up __val, memory_order __order) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ATOMIC_ATOMIC_SYNC_H
+#endif // _LIBCPP___CXX03___ATOMIC_ATOMIC_SYNC_H
diff --git a/libcxx/include/__cxx03/__atomic/check_memory_order.h b/libcxx/include/__cxx03/__atomic/check_memory_order.h
index 11033ef2c3b494..5661efd4bad277 100644
--- a/libcxx/include/__cxx03/__atomic/check_memory_order.h
+++ b/libcxx/include/__cxx03/__atomic/check_memory_order.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ATOMIC_CHECK_MEMORY_ORDER_H
-#define _LIBCPP___ATOMIC_CHECK_MEMORY_ORDER_H
+#ifndef _LIBCPP___CXX03___ATOMIC_CHECK_MEMORY_ORDER_H
+#define _LIBCPP___CXX03___ATOMIC_CHECK_MEMORY_ORDER_H
#include <__cxx03/__config>
@@ -31,4 +31,4 @@
_LIBCPP_DIAGNOSE_WARNING(__m == memory_order_release || __m == memory_order_acq_rel, \
"memory order argument to atomic operation is invalid")
-#endif // _LIBCPP___ATOMIC_CHECK_MEMORY_ORDER_H
+#endif // _LIBCPP___CXX03___ATOMIC_CHECK_MEMORY_ORDER_H
diff --git a/libcxx/include/__cxx03/__atomic/contention_t.h b/libcxx/include/__cxx03/__atomic/contention_t.h
index 1f069b01b28e78..a97f0668da2fe7 100644
--- a/libcxx/include/__cxx03/__atomic/contention_t.h
+++ b/libcxx/include/__cxx03/__atomic/contention_t.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ATOMIC_CONTENTION_T_H
-#define _LIBCPP___ATOMIC_CONTENTION_T_H
+#ifndef _LIBCPP___CXX03___ATOMIC_CONTENTION_T_H
+#define _LIBCPP___CXX03___ATOMIC_CONTENTION_T_H
#include <__cxx03/__atomic/cxx_atomic_impl.h>
#include <__cxx03/__config>
@@ -29,4 +29,4 @@ using __cxx_atomic_contention_t = __cxx_atomic_impl<__cxx_contention_t>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ATOMIC_CONTENTION_T_H
+#endif // _LIBCPP___CXX03___ATOMIC_CONTENTION_T_H
diff --git a/libcxx/include/__cxx03/__atomic/cxx_atomic_impl.h b/libcxx/include/__cxx03/__atomic/cxx_atomic_impl.h
index f06627f1a8f669..990d283c62d1a5 100644
--- a/libcxx/include/__cxx03/__atomic/cxx_atomic_impl.h
+++ b/libcxx/include/__cxx03/__atomic/cxx_atomic_impl.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ATOMIC_CXX_ATOMIC_IMPL_H
-#define _LIBCPP___ATOMIC_CXX_ATOMIC_IMPL_H
+#ifndef _LIBCPP___CXX03___ATOMIC_CXX_ATOMIC_IMPL_H
+#define _LIBCPP___CXX03___ATOMIC_CXX_ATOMIC_IMPL_H
#include <__cxx03/__atomic/memory_order.h>
#include <__cxx03/__atomic/to_gcc_order.h>
@@ -507,4 +507,4 @@ struct __cxx_atomic_impl : public _Base {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ATOMIC_CXX_ATOMIC_IMPL_H
+#endif // _LIBCPP___CXX03___ATOMIC_CXX_ATOMIC_IMPL_H
diff --git a/libcxx/include/__cxx03/__atomic/fence.h b/libcxx/include/__cxx03/__atomic/fence.h
index 5200cd533bdeb3..05eaa83f364060 100644
--- a/libcxx/include/__cxx03/__atomic/fence.h
+++ b/libcxx/include/__cxx03/__atomic/fence.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ATOMIC_FENCE_H
-#define _LIBCPP___ATOMIC_FENCE_H
+#ifndef _LIBCPP___CXX03___ATOMIC_FENCE_H
+#define _LIBCPP___CXX03___ATOMIC_FENCE_H
#include <__cxx03/__atomic/cxx_atomic_impl.h>
#include <__cxx03/__atomic/memory_order.h>
@@ -25,4 +25,4 @@ inline _LIBCPP_HIDE_FROM_ABI void atomic_signal_fence(memory_order __m) _NOEXCEP
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ATOMIC_FENCE_H
+#endif // _LIBCPP___CXX03___ATOMIC_FENCE_H
diff --git a/libcxx/include/__cxx03/__atomic/is_always_lock_free.h b/libcxx/include/__cxx03/__atomic/is_always_lock_free.h
index 29c42d9340fdbb..45628ae53214b4 100644
--- a/libcxx/include/__cxx03/__atomic/is_always_lock_free.h
+++ b/libcxx/include/__cxx03/__atomic/is_always_lock_free.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ATOMIC_IS_ALWAYS_LOCK_FREE_H
-#define _LIBCPP___ATOMIC_IS_ALWAYS_LOCK_FREE_H
+#ifndef _LIBCPP___CXX03___ATOMIC_IS_ALWAYS_LOCK_FREE_H
+#define _LIBCPP___CXX03___ATOMIC_IS_ALWAYS_LOCK_FREE_H
#include <__cxx03/__config>
@@ -25,4 +25,4 @@ struct __libcpp_is_always_lock_free {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ATOMIC_IS_ALWAYS_LOCK_FREE_H
+#endif // _LIBCPP___CXX03___ATOMIC_IS_ALWAYS_LOCK_FREE_H
diff --git a/libcxx/include/__cxx03/__atomic/kill_dependency.h b/libcxx/include/__cxx03/__atomic/kill_dependency.h
index 3deb29f0dbda1d..1e0dfc81e3c5c3 100644
--- a/libcxx/include/__cxx03/__atomic/kill_dependency.h
+++ b/libcxx/include/__cxx03/__atomic/kill_dependency.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ATOMIC_KILL_DEPENDENCY_H
-#define _LIBCPP___ATOMIC_KILL_DEPENDENCY_H
+#ifndef _LIBCPP___CXX03___ATOMIC_KILL_DEPENDENCY_H
+#define _LIBCPP___CXX03___ATOMIC_KILL_DEPENDENCY_H
#include <__cxx03/__config>
@@ -24,4 +24,4 @@ _LIBCPP_HIDE_FROM_ABI _Tp kill_dependency(_Tp __y) _NOEXCEPT {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ATOMIC_KILL_DEPENDENCY_H
+#endif // _LIBCPP___CXX03___ATOMIC_KILL_DEPENDENCY_H
diff --git a/libcxx/include/__cxx03/__atomic/memory_order.h b/libcxx/include/__cxx03/__atomic/memory_order.h
index 8a7564dc1553e2..b8b9dda3d1150c 100644
--- a/libcxx/include/__cxx03/__atomic/memory_order.h
+++ b/libcxx/include/__cxx03/__atomic/memory_order.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ATOMIC_MEMORY_ORDER_H
-#define _LIBCPP___ATOMIC_MEMORY_ORDER_H
+#ifndef _LIBCPP___CXX03___ATOMIC_MEMORY_ORDER_H
+#define _LIBCPP___CXX03___ATOMIC_MEMORY_ORDER_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_same.h>
@@ -62,4 +62,4 @@ enum memory_order {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ATOMIC_MEMORY_ORDER_H
+#endif // _LIBCPP___CXX03___ATOMIC_MEMORY_ORDER_H
diff --git a/libcxx/include/__cxx03/__atomic/to_gcc_order.h b/libcxx/include/__cxx03/__atomic/to_gcc_order.h
index 41ada882817321..aab3c59602f112 100644
--- a/libcxx/include/__cxx03/__atomic/to_gcc_order.h
+++ b/libcxx/include/__cxx03/__atomic/to_gcc_order.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ATOMIC_TO_GCC_ORDER_H
-#define _LIBCPP___ATOMIC_TO_GCC_ORDER_H
+#ifndef _LIBCPP___CXX03___ATOMIC_TO_GCC_ORDER_H
+#define _LIBCPP___CXX03___ATOMIC_TO_GCC_ORDER_H
#include <__cxx03/__atomic/memory_order.h>
#include <__cxx03/__config>
@@ -51,4 +51,4 @@ _LIBCPP_HIDE_FROM_ABI inline _LIBCPP_CONSTEXPR int __to_gcc_failure_order(memory
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ATOMIC_TO_GCC_ORDER_H
+#endif // _LIBCPP___CXX03___ATOMIC_TO_GCC_ORDER_H
diff --git a/libcxx/include/__cxx03/__bit/bit_cast.h b/libcxx/include/__cxx03/__bit/bit_cast.h
index 9f88805e125dc7..2613dc4aa332a2 100644
--- a/libcxx/include/__cxx03/__bit/bit_cast.h
+++ b/libcxx/include/__cxx03/__bit/bit_cast.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___BIT_BIT_CAST_H
-#define _LIBCPP___BIT_BIT_CAST_H
+#ifndef _LIBCPP___CXX03___BIT_BIT_CAST_H
+#define _LIBCPP___CXX03___BIT_BIT_CAST_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_trivially_copyable.h>
@@ -41,4 +41,4 @@ template <class _ToType, class _FromType>
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___BIT_BIT_CAST_H
+#endif // _LIBCPP___CXX03___BIT_BIT_CAST_H
diff --git a/libcxx/include/__cxx03/__bit/bit_ceil.h b/libcxx/include/__cxx03/__bit/bit_ceil.h
index b5cb5cc08f422c..598344b1d4268f 100644
--- a/libcxx/include/__cxx03/__bit/bit_ceil.h
+++ b/libcxx/include/__cxx03/__bit/bit_ceil.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___BIT_BIT_CEIL_H
-#define _LIBCPP___BIT_BIT_CEIL_H
+#ifndef _LIBCPP___CXX03___BIT_BIT_CEIL_H
+#define _LIBCPP___CXX03___BIT_BIT_CEIL_H
#include <__cxx03/__assert>
#include <__cxx03/__bit/countl.h>
@@ -51,4 +51,4 @@ template <__libcpp_unsigned_integer _Tp>
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___BIT_BIT_CEIL_H
+#endif // _LIBCPP___CXX03___BIT_BIT_CEIL_H
diff --git a/libcxx/include/__cxx03/__bit/bit_floor.h b/libcxx/include/__cxx03/__bit/bit_floor.h
index 93379be5e21623..b39d73a64e078d 100644
--- a/libcxx/include/__cxx03/__bit/bit_floor.h
+++ b/libcxx/include/__cxx03/__bit/bit_floor.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___BIT_BIT_FLOOR_H
-#define _LIBCPP___BIT_BIT_FLOOR_H
+#ifndef _LIBCPP___CXX03___BIT_BIT_FLOOR_H
+#define _LIBCPP___CXX03___BIT_BIT_FLOOR_H
#include <__cxx03/__bit/bit_log2.h>
#include <__cxx03/__concepts/arithmetic.h>
@@ -31,4 +31,4 @@ template <__libcpp_unsigned_integer _Tp>
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___BIT_BIT_FLOOR_H
+#endif // _LIBCPP___CXX03___BIT_BIT_FLOOR_H
diff --git a/libcxx/include/__cxx03/__bit/bit_log2.h b/libcxx/include/__cxx03/__bit/bit_log2.h
index 16a7fb1ec33645..1ca80959e6dac8 100644
--- a/libcxx/include/__cxx03/__bit/bit_log2.h
+++ b/libcxx/include/__cxx03/__bit/bit_log2.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___BIT_BIT_LOG2_H
-#define _LIBCPP___BIT_BIT_LOG2_H
+#ifndef _LIBCPP___CXX03___BIT_BIT_LOG2_H
+#define _LIBCPP___CXX03___BIT_BIT_LOG2_H
#include <__cxx03/__bit/countl.h>
#include <__cxx03/__concepts/arithmetic.h>
@@ -31,4 +31,4 @@ _LIBCPP_HIDE_FROM_ABI constexpr _Tp __bit_log2(_Tp __t) noexcept {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___BIT_BIT_LOG2_H
+#endif // _LIBCPP___CXX03___BIT_BIT_LOG2_H
diff --git a/libcxx/include/__cxx03/__bit/bit_width.h b/libcxx/include/__cxx03/__bit/bit_width.h
index 4832359f753260..e5d9ffd03ca7ff 100644
--- a/libcxx/include/__cxx03/__bit/bit_width.h
+++ b/libcxx/include/__cxx03/__bit/bit_width.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___BIT_BIT_WIDTH_H
-#define _LIBCPP___BIT_BIT_WIDTH_H
+#ifndef _LIBCPP___CXX03___BIT_BIT_WIDTH_H
+#define _LIBCPP___CXX03___BIT_BIT_WIDTH_H
#include <__cxx03/__bit/bit_log2.h>
#include <__cxx03/__concepts/arithmetic.h>
@@ -30,4 +30,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___BIT_BIT_WIDTH_H
+#endif // _LIBCPP___CXX03___BIT_BIT_WIDTH_H
diff --git a/libcxx/include/__cxx03/__bit/blsr.h b/libcxx/include/__cxx03/__bit/blsr.h
index 5375bdf9208d79..ae1d8b588925d4 100644
--- a/libcxx/include/__cxx03/__bit/blsr.h
+++ b/libcxx/include/__cxx03/__bit/blsr.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___BIT_BLSR_H
-#define _LIBCPP___BIT_BLSR_H
+#ifndef _LIBCPP___CXX03___BIT_BLSR_H
+#define _LIBCPP___CXX03___BIT_BLSR_H
#include <__cxx03/__config>
@@ -31,4 +31,4 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR unsigned long long __libcpp_blsr(
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___BIT_BLSR_H
+#endif // _LIBCPP___CXX03___BIT_BLSR_H
diff --git a/libcxx/include/__cxx03/__bit/byteswap.h b/libcxx/include/__cxx03/__bit/byteswap.h
index 6e65600512284a..f40d870ca7fc29 100644
--- a/libcxx/include/__cxx03/__bit/byteswap.h
+++ b/libcxx/include/__cxx03/__bit/byteswap.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___BIT_BYTESWAP_H
-#define _LIBCPP___BIT_BYTESWAP_H
+#ifndef _LIBCPP___CXX03___BIT_BYTESWAP_H
+#define _LIBCPP___CXX03___BIT_BYTESWAP_H
#include <__cxx03/__concepts/arithmetic.h>
#include <__cxx03/__config>
@@ -50,4 +50,4 @@ template <integral _Tp>
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___BIT_BYTESWAP_H
+#endif // _LIBCPP___CXX03___BIT_BYTESWAP_H
diff --git a/libcxx/include/__cxx03/__bit/countl.h b/libcxx/include/__cxx03/__bit/countl.h
index 9a4a269a7da2d4..0c8181b53408cb 100644
--- a/libcxx/include/__cxx03/__bit/countl.h
+++ b/libcxx/include/__cxx03/__bit/countl.h
@@ -9,8 +9,8 @@
// TODO: __builtin_clzg is available since Clang 19 and GCC 14. When support for older versions is dropped, we can
// refactor this code to exclusively use __builtin_clzg.
-#ifndef _LIBCPP___BIT_COUNTL_H
-#define _LIBCPP___BIT_COUNTL_H
+#ifndef _LIBCPP___CXX03___BIT_COUNTL_H
+#define _LIBCPP___CXX03___BIT_COUNTL_H
#include <__cxx03/__bit/rotate.h>
#include <__cxx03/__concepts/arithmetic.h>
@@ -110,4 +110,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___BIT_COUNTL_H
+#endif // _LIBCPP___CXX03___BIT_COUNTL_H
diff --git a/libcxx/include/__cxx03/__bit/countr.h b/libcxx/include/__cxx03/__bit/countr.h
index 34525f591048b4..d9306a234cb303 100644
--- a/libcxx/include/__cxx03/__bit/countr.h
+++ b/libcxx/include/__cxx03/__bit/countr.h
@@ -9,8 +9,8 @@
// TODO: __builtin_ctzg is available since Clang 19 and GCC 14. When support for older versions is dropped, we can
// refactor this code to exclusively use __builtin_ctzg.
-#ifndef _LIBCPP___BIT_COUNTR_H
-#define _LIBCPP___BIT_COUNTR_H
+#ifndef _LIBCPP___CXX03___BIT_COUNTR_H
+#define _LIBCPP___CXX03___BIT_COUNTR_H
#include <__cxx03/__bit/rotate.h>
#include <__cxx03/__concepts/arithmetic.h>
@@ -81,4 +81,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___BIT_COUNTR_H
+#endif // _LIBCPP___CXX03___BIT_COUNTR_H
diff --git a/libcxx/include/__cxx03/__bit/endian.h b/libcxx/include/__cxx03/__bit/endian.h
index ba0a5ac4c2d081..641f827736b4fc 100644
--- a/libcxx/include/__cxx03/__bit/endian.h
+++ b/libcxx/include/__cxx03/__bit/endian.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___BIT_ENDIAN_H
-#define _LIBCPP___BIT_ENDIAN_H
+#ifndef _LIBCPP___CXX03___BIT_ENDIAN_H
+#define _LIBCPP___CXX03___BIT_ENDIAN_H
#include <__cxx03/__config>
@@ -35,4 +35,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___BIT_ENDIAN_H
+#endif // _LIBCPP___CXX03___BIT_ENDIAN_H
diff --git a/libcxx/include/__cxx03/__bit/has_single_bit.h b/libcxx/include/__cxx03/__bit/has_single_bit.h
index 8f69d343a60872..07f3f8523d585d 100644
--- a/libcxx/include/__cxx03/__bit/has_single_bit.h
+++ b/libcxx/include/__cxx03/__bit/has_single_bit.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___BIT_HAS_SINGLE_BIT_H
-#define _LIBCPP___BIT_HAS_SINGLE_BIT_H
+#ifndef _LIBCPP___CXX03___BIT_HAS_SINGLE_BIT_H
+#define _LIBCPP___CXX03___BIT_HAS_SINGLE_BIT_H
#include <__cxx03/__concepts/arithmetic.h>
#include <__cxx03/__config>
@@ -34,4 +34,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___BIT_HAS_SINGLE_BIT_H
+#endif // _LIBCPP___CXX03___BIT_HAS_SINGLE_BIT_H
diff --git a/libcxx/include/__cxx03/__bit/invert_if.h b/libcxx/include/__cxx03/__bit/invert_if.h
index 0b729bc79c192e..b111d702ea7550 100644
--- a/libcxx/include/__cxx03/__bit/invert_if.h
+++ b/libcxx/include/__cxx03/__bit/invert_if.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___BIT_INVERT_IF_H
-#define _LIBCPP___BIT_INVERT_IF_H
+#ifndef _LIBCPP___CXX03___BIT_INVERT_IF_H
+#define _LIBCPP___CXX03___BIT_INVERT_IF_H
#include <__cxx03/__concepts/arithmetic.h>
#include <__cxx03/__config>
@@ -27,4 +27,4 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _Tp __invert_if(_Tp __v) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___BIT_INVERT_IF_H
+#endif // _LIBCPP___CXX03___BIT_INVERT_IF_H
diff --git a/libcxx/include/__cxx03/__bit/popcount.h b/libcxx/include/__cxx03/__bit/popcount.h
index 70a12ea2607410..835c07703f2335 100644
--- a/libcxx/include/__cxx03/__bit/popcount.h
+++ b/libcxx/include/__cxx03/__bit/popcount.h
@@ -9,8 +9,8 @@
// TODO: __builtin_popcountg is available since Clang 19 and GCC 14. When support for older versions is dropped, we can
// refactor this code to exclusively use __builtin_popcountg.
-#ifndef _LIBCPP___BIT_POPCOUNT_H
-#define _LIBCPP___BIT_POPCOUNT_H
+#ifndef _LIBCPP___CXX03___BIT_POPCOUNT_H
+#define _LIBCPP___CXX03___BIT_POPCOUNT_H
#include <__cxx03/__bit/rotate.h>
#include <__cxx03/__concepts/arithmetic.h>
@@ -68,4 +68,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___BIT_POPCOUNT_H
+#endif // _LIBCPP___CXX03___BIT_POPCOUNT_H
diff --git a/libcxx/include/__cxx03/__bit/rotate.h b/libcxx/include/__cxx03/__bit/rotate.h
index 02b4ac66af1091..0ce3d2c7629dbf 100644
--- a/libcxx/include/__cxx03/__bit/rotate.h
+++ b/libcxx/include/__cxx03/__bit/rotate.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___BIT_ROTATE_H
-#define _LIBCPP___BIT_ROTATE_H
+#ifndef _LIBCPP___CXX03___BIT_ROTATE_H
+#define _LIBCPP___CXX03___BIT_ROTATE_H
#include <__cxx03/__concepts/arithmetic.h>
#include <__cxx03/__config>
@@ -69,4 +69,4 @@ template <__libcpp_unsigned_integer _Tp>
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___BIT_ROTATE_H
+#endif // _LIBCPP___CXX03___BIT_ROTATE_H
diff --git a/libcxx/include/__cxx03/__bit_reference b/libcxx/include/__cxx03/__bit_reference
index 7339f5bd8c9e13..bf86f9a76e24a1 100644
--- a/libcxx/include/__cxx03/__bit_reference
+++ b/libcxx/include/__cxx03/__bit_reference
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___BIT_REFERENCE
-#define _LIBCPP___BIT_REFERENCE
+#ifndef _LIBCPP___CXX03___BIT_REFERENCE
+#define _LIBCPP___CXX03___BIT_REFERENCE
#include <__cxx03/__algorithm/copy_n.h>
#include <__cxx03/__algorithm/fill_n.h>
@@ -1021,4 +1021,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___BIT_REFERENCE
+#endif // _LIBCPP___CXX03___BIT_REFERENCE
diff --git a/libcxx/include/__cxx03/__charconv/chars_format.h b/libcxx/include/__cxx03/__charconv/chars_format.h
index c206289c0c2581..a886521832effa 100644
--- a/libcxx/include/__cxx03/__charconv/chars_format.h
+++ b/libcxx/include/__cxx03/__charconv/chars_format.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHARCONV_CHARS_FORMAT_H
-#define _LIBCPP___CHARCONV_CHARS_FORMAT_H
+#ifndef _LIBCPP___CXX03___CHARCONV_CHARS_FORMAT_H
+#define _LIBCPP___CXX03___CHARCONV_CHARS_FORMAT_H
#include <__cxx03/__config>
#include <__cxx03/__utility/to_underlying.h>
@@ -58,4 +58,4 @@ inline _LIBCPP_HIDE_FROM_ABI constexpr chars_format& operator^=(chars_format& __
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CHARCONV_CHARS_FORMAT_H
+#endif // _LIBCPP___CXX03___CHARCONV_CHARS_FORMAT_H
diff --git a/libcxx/include/__cxx03/__charconv/from_chars_integral.h b/libcxx/include/__cxx03/__charconv/from_chars_integral.h
index a3d6e5537280d4..ba3746fcf776e5 100644
--- a/libcxx/include/__cxx03/__charconv/from_chars_integral.h
+++ b/libcxx/include/__cxx03/__charconv/from_chars_integral.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHARCONV_FROM_CHARS_INTEGRAL_H
-#define _LIBCPP___CHARCONV_FROM_CHARS_INTEGRAL_H
+#ifndef _LIBCPP___CXX03___CHARCONV_FROM_CHARS_INTEGRAL_H
+#define _LIBCPP___CXX03___CHARCONV_FROM_CHARS_INTEGRAL_H
#include <__cxx03/__algorithm/copy_n.h>
#include <__cxx03/__assert>
@@ -237,4 +237,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___CHARCONV_FROM_CHARS_INTEGRAL_H
+#endif // _LIBCPP___CXX03___CHARCONV_FROM_CHARS_INTEGRAL_H
diff --git a/libcxx/include/__cxx03/__charconv/from_chars_result.h b/libcxx/include/__cxx03/__charconv/from_chars_result.h
index 8bba738969e346..03e490fce56a91 100644
--- a/libcxx/include/__cxx03/__charconv/from_chars_result.h
+++ b/libcxx/include/__cxx03/__charconv/from_chars_result.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHARCONV_FROM_CHARS_RESULT_H
-#define _LIBCPP___CHARCONV_FROM_CHARS_RESULT_H
+#ifndef _LIBCPP___CXX03___CHARCONV_FROM_CHARS_RESULT_H
+#define _LIBCPP___CXX03___CHARCONV_FROM_CHARS_RESULT_H
#include <__cxx03/__config>
#include <__cxx03/__system_error/errc.h>
@@ -36,4 +36,4 @@ struct _LIBCPP_EXPORTED_FROM_ABI from_chars_result {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CHARCONV_FROM_CHARS_RESULT_H
+#endif // _LIBCPP___CXX03___CHARCONV_FROM_CHARS_RESULT_H
diff --git a/libcxx/include/__cxx03/__charconv/tables.h b/libcxx/include/__cxx03/__charconv/tables.h
index 110352a4be0c75..8c9fd3daf170ce 100644
--- a/libcxx/include/__cxx03/__charconv/tables.h
+++ b/libcxx/include/__cxx03/__charconv/tables.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHARCONV_TABLES
-#define _LIBCPP___CHARCONV_TABLES
+#ifndef _LIBCPP___CXX03___CHARCONV_TABLES
+#define _LIBCPP___CXX03___CHARCONV_TABLES
#include <__cxx03/__config>
#include <__cxx03/cstdint>
@@ -160,4 +160,4 @@ inline constexpr char __digits_base_10[200] = {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CHARCONV_TABLES
+#endif // _LIBCPP___CXX03___CHARCONV_TABLES
diff --git a/libcxx/include/__cxx03/__charconv/to_chars.h b/libcxx/include/__cxx03/__charconv/to_chars.h
index 2db35ace09439e..e526ce427c22f8 100644
--- a/libcxx/include/__cxx03/__charconv/to_chars.h
+++ b/libcxx/include/__cxx03/__charconv/to_chars.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHARCONV_TO_CHARS
-#define _LIBCPP___CHARCONV_TO_CHARS
+#ifndef _LIBCPP___CXX03___CHARCONV_TO_CHARS
+#define _LIBCPP___CXX03___CHARCONV_TO_CHARS
#include <__cxx03/__charconv/to_chars_floating_point.h>
#include <__cxx03/__charconv/to_chars_integral.h>
@@ -22,4 +22,4 @@ _LIBCPP_BEGIN_NAMESPACE_STD
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CHARCONV_TO_CHARS
+#endif // _LIBCPP___CXX03___CHARCONV_TO_CHARS
diff --git a/libcxx/include/__cxx03/__charconv/to_chars_base_10.h b/libcxx/include/__cxx03/__charconv/to_chars_base_10.h
index 33baaf63caeef4..b13b3e33d8f97f 100644
--- a/libcxx/include/__cxx03/__charconv/to_chars_base_10.h
+++ b/libcxx/include/__cxx03/__charconv/to_chars_base_10.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHARCONV_TO_CHARS_BASE_10_H
-#define _LIBCPP___CHARCONV_TO_CHARS_BASE_10_H
+#ifndef _LIBCPP___CXX03___CHARCONV_TO_CHARS_BASE_10_H
+#define _LIBCPP___CXX03___CHARCONV_TO_CHARS_BASE_10_H
#include <__cxx03/__algorithm/copy_n.h>
#include <__cxx03/__assert>
@@ -185,4 +185,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___CHARCONV_TO_CHARS_BASE_10_H
+#endif // _LIBCPP___CXX03___CHARCONV_TO_CHARS_BASE_10_H
diff --git a/libcxx/include/__cxx03/__charconv/to_chars_floating_point.h b/libcxx/include/__cxx03/__charconv/to_chars_floating_point.h
index 305b7e71a6b7e9..167ffeae7bedd5 100644
--- a/libcxx/include/__cxx03/__charconv/to_chars_floating_point.h
+++ b/libcxx/include/__cxx03/__charconv/to_chars_floating_point.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHARCONV_TO_CHARS_FLOATING_POINT_H
-#define _LIBCPP___CHARCONV_TO_CHARS_FLOATING_POINT_H
+#ifndef _LIBCPP___CXX03___CHARCONV_TO_CHARS_FLOATING_POINT_H
+#define _LIBCPP___CXX03___CHARCONV_TO_CHARS_FLOATING_POINT_H
#include <__cxx03/__charconv/chars_format.h>
#include <__cxx03/__charconv/to_chars_result.h>
@@ -52,4 +52,4 @@ to_chars(char* __first, char* __last, long double __value, chars_format __fmt, i
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CHARCONV_TO_CHARS_FLOATING_POINT_H
+#endif // _LIBCPP___CXX03___CHARCONV_TO_CHARS_FLOATING_POINT_H
diff --git a/libcxx/include/__cxx03/__charconv/to_chars_integral.h b/libcxx/include/__cxx03/__charconv/to_chars_integral.h
index 0b3f319e751252..2579e022298516 100644
--- a/libcxx/include/__cxx03/__charconv/to_chars_integral.h
+++ b/libcxx/include/__cxx03/__charconv/to_chars_integral.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHARCONV_TO_CHARS_INTEGRAL_H
-#define _LIBCPP___CHARCONV_TO_CHARS_INTEGRAL_H
+#ifndef _LIBCPP___CXX03___CHARCONV_TO_CHARS_INTEGRAL_H
+#define _LIBCPP___CXX03___CHARCONV_TO_CHARS_INTEGRAL_H
#include <__cxx03/__algorithm/copy_n.h>
#include <__cxx03/__assert>
@@ -324,4 +324,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___CHARCONV_TO_CHARS_INTEGRAL_H
+#endif // _LIBCPP___CXX03___CHARCONV_TO_CHARS_INTEGRAL_H
diff --git a/libcxx/include/__cxx03/__charconv/to_chars_result.h b/libcxx/include/__cxx03/__charconv/to_chars_result.h
index 72fef89dcc5f57..82a60db6f6741f 100644
--- a/libcxx/include/__cxx03/__charconv/to_chars_result.h
+++ b/libcxx/include/__cxx03/__charconv/to_chars_result.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHARCONV_TO_CHARS_RESULT_H
-#define _LIBCPP___CHARCONV_TO_CHARS_RESULT_H
+#ifndef _LIBCPP___CXX03___CHARCONV_TO_CHARS_RESULT_H
+#define _LIBCPP___CXX03___CHARCONV_TO_CHARS_RESULT_H
#include <__cxx03/__config>
#include <__cxx03/__system_error/errc.h>
@@ -36,4 +36,4 @@ struct _LIBCPP_EXPORTED_FROM_ABI to_chars_result {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CHARCONV_TO_CHARS_RESULT_H
+#endif // _LIBCPP___CXX03___CHARCONV_TO_CHARS_RESULT_H
diff --git a/libcxx/include/__cxx03/__charconv/traits.h b/libcxx/include/__cxx03/__charconv/traits.h
index 5eafa6caa39e55..110ff9c07e7d00 100644
--- a/libcxx/include/__cxx03/__charconv/traits.h
+++ b/libcxx/include/__cxx03/__charconv/traits.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHARCONV_TRAITS
-#define _LIBCPP___CHARCONV_TRAITS
+#ifndef _LIBCPP___CXX03___CHARCONV_TRAITS
+#define _LIBCPP___CXX03___CHARCONV_TRAITS
#include <__cxx03/__assert>
#include <__cxx03/__bit/countl.h>
@@ -197,4 +197,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___CHARCONV_TRAITS
+#endif // _LIBCPP___CXX03___CHARCONV_TRAITS
diff --git a/libcxx/include/__cxx03/__chrono/calendar.h b/libcxx/include/__cxx03/__chrono/calendar.h
index 5d8e396851ae86..4113ca435cc1e3 100644
--- a/libcxx/include/__cxx03/__chrono/calendar.h
+++ b/libcxx/include/__cxx03/__chrono/calendar.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_CALENDAR_H
-#define _LIBCPP___CHRONO_CALENDAR_H
+#ifndef _LIBCPP___CXX03___CHRONO_CALENDAR_H
+#define _LIBCPP___CXX03___CHRONO_CALENDAR_H
#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__chrono/time_point.h>
@@ -41,4 +41,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___CHRONO_CALENDAR_H
+#endif // _LIBCPP___CXX03___CHRONO_CALENDAR_H
diff --git a/libcxx/include/__cxx03/__chrono/concepts.h b/libcxx/include/__cxx03/__chrono/concepts.h
index 1fb5241055474e..55a2c54fc3f5b1 100644
--- a/libcxx/include/__cxx03/__chrono/concepts.h
+++ b/libcxx/include/__cxx03/__chrono/concepts.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_CONCEPTS_H
-#define _LIBCPP___CHRONO_CONCEPTS_H
+#ifndef _LIBCPP___CXX03___CHRONO_CONCEPTS_H
+#define _LIBCPP___CXX03___CHRONO_CONCEPTS_H
#include <__cxx03/__chrono/hh_mm_ss.h>
#include <__cxx03/__chrono/time_point.h>
@@ -33,4 +33,4 @@ concept __is_time_point = __is_specialization_v<_Tp, chrono::time_point>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CHRONO_CONCEPTS_H
+#endif // _LIBCPP___CXX03___CHRONO_CONCEPTS_H
diff --git a/libcxx/include/__cxx03/__chrono/convert_to_timespec.h b/libcxx/include/__cxx03/__chrono/convert_to_timespec.h
index df0e7714ddd707..24d77c21807eb2 100644
--- a/libcxx/include/__cxx03/__chrono/convert_to_timespec.h
+++ b/libcxx/include/__cxx03/__chrono/convert_to_timespec.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_CONVERT_TO_TIMESPEC_H
-#define _LIBCPP___CHRONO_CONVERT_TO_TIMESPEC_H
+#ifndef _LIBCPP___CXX03___CHRONO_CONVERT_TO_TIMESPEC_H
+#define _LIBCPP___CXX03___CHRONO_CONVERT_TO_TIMESPEC_H
#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__config>
@@ -48,4 +48,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___CHRONO_CONVERT_TO_TIMESPEC_H
+#endif // _LIBCPP___CXX03___CHRONO_CONVERT_TO_TIMESPEC_H
diff --git a/libcxx/include/__cxx03/__chrono/convert_to_tm.h b/libcxx/include/__cxx03/__chrono/convert_to_tm.h
index ccc7ee7b11973d..e02ede48317b7f 100644
--- a/libcxx/include/__cxx03/__chrono/convert_to_tm.h
+++ b/libcxx/include/__cxx03/__chrono/convert_to_tm.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_CONVERT_TO_TM_H
-#define _LIBCPP___CHRONO_CONVERT_TO_TM_H
+#ifndef _LIBCPP___CXX03___CHRONO_CONVERT_TO_TM_H
+#define _LIBCPP___CXX03___CHRONO_CONVERT_TO_TM_H
#include <__cxx03/__chrono/calendar.h>
#include <__cxx03/__chrono/concepts.h>
@@ -199,4 +199,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___CHRONO_CONVERT_TO_TM_H
+#endif // _LIBCPP___CXX03___CHRONO_CONVERT_TO_TM_H
diff --git a/libcxx/include/__cxx03/__chrono/day.h b/libcxx/include/__cxx03/__chrono/day.h
index 6df2aa42834617..6b989ea3c6c241 100644
--- a/libcxx/include/__cxx03/__chrono/day.h
+++ b/libcxx/include/__cxx03/__chrono/day.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_DAY_H
-#define _LIBCPP___CHRONO_DAY_H
+#ifndef _LIBCPP___CXX03___CHRONO_DAY_H
+#define _LIBCPP___CXX03___CHRONO_DAY_H
#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__config>
@@ -96,4 +96,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___CHRONO_DAY_H
+#endif // _LIBCPP___CXX03___CHRONO_DAY_H
diff --git a/libcxx/include/__cxx03/__chrono/duration.h b/libcxx/include/__cxx03/__chrono/duration.h
index 5fabe08db1bfcd..fd936eda44eefc 100644
--- a/libcxx/include/__cxx03/__chrono/duration.h
+++ b/libcxx/include/__cxx03/__chrono/duration.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_DURATION_H
-#define _LIBCPP___CHRONO_DURATION_H
+#ifndef _LIBCPP___CXX03___CHRONO_DURATION_H
+#define _LIBCPP___CXX03___CHRONO_DURATION_H
#include <__cxx03/__compare/ordering.h>
#include <__cxx03/__compare/three_way_comparable.h>
@@ -547,4 +547,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP___CHRONO_DURATION_H
+#endif // _LIBCPP___CXX03___CHRONO_DURATION_H
diff --git a/libcxx/include/__cxx03/__chrono/exception.h b/libcxx/include/__cxx03/__chrono/exception.h
index 3e1a29c2037722..4db9d8c1c4edf0 100644
--- a/libcxx/include/__cxx03/__chrono/exception.h
+++ b/libcxx/include/__cxx03/__chrono/exception.h
@@ -9,8 +9,8 @@
// For information see https://libcxx.llvm.org/DesignDocs/TimeZone.html
-#ifndef _LIBCPP___CHRONO_EXCEPTION_H
-#define _LIBCPP___CHRONO_EXCEPTION_H
+#ifndef _LIBCPP___CXX03___CHRONO_EXCEPTION_H
+#define _LIBCPP___CXX03___CHRONO_EXCEPTION_H
#include <__cxx03/version>
// Enable the contents of the header only when libc++ was built with experimental features enabled.
@@ -132,4 +132,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB)
-#endif // _LIBCPP___CHRONO_EXCEPTION_H
+#endif // _LIBCPP___CXX03___CHRONO_EXCEPTION_H
diff --git a/libcxx/include/__cxx03/__chrono/file_clock.h b/libcxx/include/__cxx03/__chrono/file_clock.h
index aef92057bd04ab..6e2d32b4ef88a2 100644
--- a/libcxx/include/__cxx03/__chrono/file_clock.h
+++ b/libcxx/include/__cxx03/__chrono/file_clock.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_FILE_CLOCK_H
-#define _LIBCPP___CHRONO_FILE_CLOCK_H
+#ifndef _LIBCPP___CXX03___CHRONO_FILE_CLOCK_H
+#define _LIBCPP___CXX03___CHRONO_FILE_CLOCK_H
#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__chrono/system_clock.h>
@@ -77,4 +77,4 @@ struct _FilesystemClock {
_LIBCPP_END_NAMESPACE_FILESYSTEM
#endif // !_LIBCPP_CXX03_LANG
-#endif // _LIBCPP___CHRONO_FILE_CLOCK_H
+#endif // _LIBCPP___CXX03___CHRONO_FILE_CLOCK_H
diff --git a/libcxx/include/__cxx03/__chrono/formatter.h b/libcxx/include/__cxx03/__chrono/formatter.h
index 54e5dff6b97dc3..823f6e34c53618 100644
--- a/libcxx/include/__cxx03/__chrono/formatter.h
+++ b/libcxx/include/__cxx03/__chrono/formatter.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_FORMATTER_H
-#define _LIBCPP___CHRONO_FORMATTER_H
+#ifndef _LIBCPP___CXX03___CHRONO_FORMATTER_H
+#define _LIBCPP___CXX03___CHRONO_FORMATTER_H
#include <__cxx03/__algorithm/ranges_copy.h>
#include <__cxx03/__chrono/calendar.h>
@@ -987,4 +987,4 @@ struct formatter<chrono::zoned_time<_Duration, _TimeZonePtr>, _CharT> : public _
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CHRONO_FORMATTER_H
+#endif // _LIBCPP___CXX03___CHRONO_FORMATTER_H
diff --git a/libcxx/include/__cxx03/__chrono/hh_mm_ss.h b/libcxx/include/__cxx03/__chrono/hh_mm_ss.h
index 100687064ed886..e40cfa3a58b8d9 100644
--- a/libcxx/include/__cxx03/__chrono/hh_mm_ss.h
+++ b/libcxx/include/__cxx03/__chrono/hh_mm_ss.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_HH_MM_SS_H
-#define _LIBCPP___CHRONO_HH_MM_SS_H
+#ifndef _LIBCPP___CXX03___CHRONO_HH_MM_SS_H
+#define _LIBCPP___CXX03___CHRONO_HH_MM_SS_H
#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__chrono/time_point.h>
@@ -109,4 +109,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___CHRONO_HH_MM_SS_H
+#endif // _LIBCPP___CXX03___CHRONO_HH_MM_SS_H
diff --git a/libcxx/include/__cxx03/__chrono/high_resolution_clock.h b/libcxx/include/__cxx03/__chrono/high_resolution_clock.h
index 9c5104338421b6..3371d16112f978 100644
--- a/libcxx/include/__cxx03/__chrono/high_resolution_clock.h
+++ b/libcxx/include/__cxx03/__chrono/high_resolution_clock.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_HIGH_RESOLUTION_CLOCK_H
-#define _LIBCPP___CHRONO_HIGH_RESOLUTION_CLOCK_H
+#ifndef _LIBCPP___CXX03___CHRONO_HIGH_RESOLUTION_CLOCK_H
+#define _LIBCPP___CXX03___CHRONO_HIGH_RESOLUTION_CLOCK_H
#include <__cxx03/__chrono/steady_clock.h>
#include <__cxx03/__chrono/system_clock.h>
@@ -32,4 +32,4 @@ typedef system_clock high_resolution_clock;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CHRONO_HIGH_RESOLUTION_CLOCK_H
+#endif // _LIBCPP___CXX03___CHRONO_HIGH_RESOLUTION_CLOCK_H
diff --git a/libcxx/include/__cxx03/__chrono/leap_second.h b/libcxx/include/__cxx03/__chrono/leap_second.h
index 900eff22aa8562..d6678bc58d7b16 100644
--- a/libcxx/include/__cxx03/__chrono/leap_second.h
+++ b/libcxx/include/__cxx03/__chrono/leap_second.h
@@ -9,8 +9,8 @@
// For information see https://libcxx.llvm.org/DesignDocs/TimeZone.html
-#ifndef _LIBCPP___CHRONO_LEAP_SECOND_H
-#define _LIBCPP___CHRONO_LEAP_SECOND_H
+#ifndef _LIBCPP___CXX03___CHRONO_LEAP_SECOND_H
+#define _LIBCPP___CXX03___CHRONO_LEAP_SECOND_H
#include <__cxx03/version>
// Enable the contents of the header only when libc++ was built with experimental features enabled.
@@ -123,4 +123,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB)
-#endif // _LIBCPP___CHRONO_LEAP_SECOND_H
+#endif // _LIBCPP___CXX03___CHRONO_LEAP_SECOND_H
diff --git a/libcxx/include/__cxx03/__chrono/literals.h b/libcxx/include/__cxx03/__chrono/literals.h
index d299fb97da3c90..6d0f596aa4ce5f 100644
--- a/libcxx/include/__cxx03/__chrono/literals.h
+++ b/libcxx/include/__cxx03/__chrono/literals.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_LITERALS_H
-#define _LIBCPP___CHRONO_LITERALS_H
+#ifndef _LIBCPP___CXX03___CHRONO_LITERALS_H
+#define _LIBCPP___CXX03___CHRONO_LITERALS_H
#include <__cxx03/__chrono/day.h>
#include <__cxx03/__chrono/year.h>
@@ -42,4 +42,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___CHRONO_LITERALS_H
+#endif // _LIBCPP___CXX03___CHRONO_LITERALS_H
diff --git a/libcxx/include/__cxx03/__chrono/local_info.h b/libcxx/include/__cxx03/__chrono/local_info.h
index 8e2194c05aba1d..1c475ec93c1679 100644
--- a/libcxx/include/__cxx03/__chrono/local_info.h
+++ b/libcxx/include/__cxx03/__chrono/local_info.h
@@ -9,8 +9,8 @@
// For information see https://libcxx.llvm.org/DesignDocs/TimeZone.html
-#ifndef _LIBCPP___CHRONO_LOCAL_INFO_H
-#define _LIBCPP___CHRONO_LOCAL_INFO_H
+#ifndef _LIBCPP___CXX03___CHRONO_LOCAL_INFO_H
+#define _LIBCPP___CXX03___CHRONO_LOCAL_INFO_H
#include <__cxx03/version>
// Enable the contents of the header only when libc++ was built with experimental features enabled.
@@ -47,4 +47,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB)
-#endif // _LIBCPP___CHRONO_LOCAL_INFO_H
+#endif // _LIBCPP___CXX03___CHRONO_LOCAL_INFO_H
diff --git a/libcxx/include/__cxx03/__chrono/month.h b/libcxx/include/__cxx03/__chrono/month.h
index fd66bfea2f60d9..9ccc85991af710 100644
--- a/libcxx/include/__cxx03/__chrono/month.h
+++ b/libcxx/include/__cxx03/__chrono/month.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_MONTH_H
-#define _LIBCPP___CHRONO_MONTH_H
+#ifndef _LIBCPP___CXX03___CHRONO_MONTH_H
+#define _LIBCPP___CXX03___CHRONO_MONTH_H
#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__config>
@@ -112,4 +112,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___CHRONO_MONTH_H
+#endif // _LIBCPP___CXX03___CHRONO_MONTH_H
diff --git a/libcxx/include/__cxx03/__chrono/month_weekday.h b/libcxx/include/__cxx03/__chrono/month_weekday.h
index 6595618d822c0e..eedc6e9a784bb9 100644
--- a/libcxx/include/__cxx03/__chrono/month_weekday.h
+++ b/libcxx/include/__cxx03/__chrono/month_weekday.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_MONTH_WEEKDAY_H
-#define _LIBCPP___CHRONO_MONTH_WEEKDAY_H
+#ifndef _LIBCPP___CXX03___CHRONO_MONTH_WEEKDAY_H
+#define _LIBCPP___CXX03___CHRONO_MONTH_WEEKDAY_H
#include <__cxx03/__chrono/month.h>
#include <__cxx03/__chrono/weekday.h>
@@ -102,4 +102,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___CHRONO_MONTH_WEEKDAY_H
+#endif // _LIBCPP___CXX03___CHRONO_MONTH_WEEKDAY_H
diff --git a/libcxx/include/__cxx03/__chrono/monthday.h b/libcxx/include/__cxx03/__chrono/monthday.h
index fe85e6b8bab32a..a64584ee2e5f90 100644
--- a/libcxx/include/__cxx03/__chrono/monthday.h
+++ b/libcxx/include/__cxx03/__chrono/monthday.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_MONTHDAY_H
-#define _LIBCPP___CHRONO_MONTHDAY_H
+#ifndef _LIBCPP___CXX03___CHRONO_MONTHDAY_H
+#define _LIBCPP___CXX03___CHRONO_MONTHDAY_H
#include <__cxx03/__chrono/calendar.h>
#include <__cxx03/__chrono/day.h>
@@ -130,4 +130,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___CHRONO_MONTHDAY_H
+#endif // _LIBCPP___CXX03___CHRONO_MONTHDAY_H
diff --git a/libcxx/include/__cxx03/__chrono/ostream.h b/libcxx/include/__cxx03/__chrono/ostream.h
index 6ac6b2831e117f..fed43890c39b7a 100644
--- a/libcxx/include/__cxx03/__chrono/ostream.h
+++ b/libcxx/include/__cxx03/__chrono/ostream.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_OSTREAM_H
-#define _LIBCPP___CHRONO_OSTREAM_H
+#ifndef _LIBCPP___CXX03___CHRONO_OSTREAM_H
+#define _LIBCPP___CXX03___CHRONO_OSTREAM_H
#include <__cxx03/__chrono/calendar.h>
#include <__cxx03/__chrono/day.h>
@@ -319,4 +319,4 @@ operator<<(basic_ostream<_CharT, _Traits>& __os, const zoned_time<_Duration, _Ti
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CHRONO_OSTREAM_H
+#endif // _LIBCPP___CXX03___CHRONO_OSTREAM_H
diff --git a/libcxx/include/__cxx03/__chrono/parser_std_format_spec.h b/libcxx/include/__cxx03/__chrono/parser_std_format_spec.h
index 3a09a21ac54b3a..2bec77d8c74dd4 100644
--- a/libcxx/include/__cxx03/__chrono/parser_std_format_spec.h
+++ b/libcxx/include/__cxx03/__chrono/parser_std_format_spec.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_PARSER_STD_FORMAT_SPEC_H
-#define _LIBCPP___CHRONO_PARSER_STD_FORMAT_SPEC_H
+#ifndef _LIBCPP___CXX03___CHRONO_PARSER_STD_FORMAT_SPEC_H
+#define _LIBCPP___CXX03___CHRONO_PARSER_STD_FORMAT_SPEC_H
#include <__cxx03/__config>
#include <__cxx03/__format/concepts.h>
@@ -413,4 +413,4 @@ class _LIBCPP_TEMPLATE_VIS __parser_chrono {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CHRONO_PARSER_STD_FORMAT_SPEC_H
+#endif // _LIBCPP___CXX03___CHRONO_PARSER_STD_FORMAT_SPEC_H
diff --git a/libcxx/include/__cxx03/__chrono/statically_widen.h b/libcxx/include/__cxx03/__chrono/statically_widen.h
index 101a903bc3f287..183078152f61ce 100644
--- a/libcxx/include/__cxx03/__chrono/statically_widen.h
+++ b/libcxx/include/__cxx03/__chrono/statically_widen.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_STATICALLY_WIDEN_H
-#define _LIBCPP___CHRONO_STATICALLY_WIDEN_H
+#ifndef _LIBCPP___CXX03___CHRONO_STATICALLY_WIDEN_H
+#define _LIBCPP___CXX03___CHRONO_STATICALLY_WIDEN_H
// Implements the STATICALLY-WIDEN exposition-only function. ([time.general]/2)
@@ -49,4 +49,4 @@ _LIBCPP_HIDE_FROM_ABI constexpr const _CharT* __statically_widen(const char* __s
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CHRONO_STATICALLY_WIDEN_H
+#endif // _LIBCPP___CXX03___CHRONO_STATICALLY_WIDEN_H
diff --git a/libcxx/include/__cxx03/__chrono/steady_clock.h b/libcxx/include/__cxx03/__chrono/steady_clock.h
index ad5b64b8142bcc..f8a56954f31ad6 100644
--- a/libcxx/include/__cxx03/__chrono/steady_clock.h
+++ b/libcxx/include/__cxx03/__chrono/steady_clock.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_STEADY_CLOCK_H
-#define _LIBCPP___CHRONO_STEADY_CLOCK_H
+#ifndef _LIBCPP___CXX03___CHRONO_STEADY_CLOCK_H
+#define _LIBCPP___CXX03___CHRONO_STEADY_CLOCK_H
#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__chrono/time_point.h>
@@ -39,4 +39,4 @@ class _LIBCPP_EXPORTED_FROM_ABI steady_clock {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CHRONO_STEADY_CLOCK_H
+#endif // _LIBCPP___CXX03___CHRONO_STEADY_CLOCK_H
diff --git a/libcxx/include/__cxx03/__chrono/sys_info.h b/libcxx/include/__cxx03/__chrono/sys_info.h
index ed1c7cabd9b604..45c230de91cc13 100644
--- a/libcxx/include/__cxx03/__chrono/sys_info.h
+++ b/libcxx/include/__cxx03/__chrono/sys_info.h
@@ -9,8 +9,8 @@
// For information see https://libcxx.llvm.org/DesignDocs/TimeZone.html
-#ifndef _LIBCPP___CHRONO_SYS_INFO_H
-#define _LIBCPP___CHRONO_SYS_INFO_H
+#ifndef _LIBCPP___CXX03___CHRONO_SYS_INFO_H
+#define _LIBCPP___CXX03___CHRONO_SYS_INFO_H
#include <__cxx03/version>
// Enable the contents of the header only when libc++ was built with experimental features enabled.
@@ -48,4 +48,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB)
-#endif // _LIBCPP___CHRONO_SYS_INFO_H
+#endif // _LIBCPP___CXX03___CHRONO_SYS_INFO_H
diff --git a/libcxx/include/__cxx03/__chrono/system_clock.h b/libcxx/include/__cxx03/__chrono/system_clock.h
index 61382ebdfbe6df..7ae053f3bb409b 100644
--- a/libcxx/include/__cxx03/__chrono/system_clock.h
+++ b/libcxx/include/__cxx03/__chrono/system_clock.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_SYSTEM_CLOCK_H
-#define _LIBCPP___CHRONO_SYSTEM_CLOCK_H
+#ifndef _LIBCPP___CXX03___CHRONO_SYSTEM_CLOCK_H
+#define _LIBCPP___CXX03___CHRONO_SYSTEM_CLOCK_H
#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__chrono/time_point.h>
@@ -49,4 +49,4 @@ using sys_days = sys_time<days>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CHRONO_SYSTEM_CLOCK_H
+#endif // _LIBCPP___CXX03___CHRONO_SYSTEM_CLOCK_H
diff --git a/libcxx/include/__cxx03/__chrono/time_point.h b/libcxx/include/__cxx03/__chrono/time_point.h
index a26423efb15b4f..8703275a75ea75 100644
--- a/libcxx/include/__cxx03/__chrono/time_point.h
+++ b/libcxx/include/__cxx03/__chrono/time_point.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_TIME_POINT_H
-#define _LIBCPP___CHRONO_TIME_POINT_H
+#ifndef _LIBCPP___CXX03___CHRONO_TIME_POINT_H
+#define _LIBCPP___CXX03___CHRONO_TIME_POINT_H
#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__compare/ordering.h>
@@ -217,4 +217,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___CHRONO_TIME_POINT_H
+#endif // _LIBCPP___CXX03___CHRONO_TIME_POINT_H
diff --git a/libcxx/include/__cxx03/__chrono/time_zone.h b/libcxx/include/__cxx03/__chrono/time_zone.h
index f14646787cf034..a49e9023c0a6a5 100644
--- a/libcxx/include/__cxx03/__chrono/time_zone.h
+++ b/libcxx/include/__cxx03/__chrono/time_zone.h
@@ -9,8 +9,8 @@
// For information see https://libcxx.llvm.org/DesignDocs/TimeZone.html
-#ifndef _LIBCPP___CHRONO_TIME_ZONE_H
-#define _LIBCPP___CHRONO_TIME_ZONE_H
+#ifndef _LIBCPP___CXX03___CHRONO_TIME_ZONE_H
+#define _LIBCPP___CXX03___CHRONO_TIME_ZONE_H
#include <__cxx03/version>
// Enable the contents of the header only when libc++ was built with experimental features enabled.
@@ -179,4 +179,4 @@ _LIBCPP_POP_MACROS
#endif // !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB)
-#endif // _LIBCPP___CHRONO_TIME_ZONE_H
+#endif // _LIBCPP___CXX03___CHRONO_TIME_ZONE_H
diff --git a/libcxx/include/__cxx03/__chrono/time_zone_link.h b/libcxx/include/__cxx03/__chrono/time_zone_link.h
index a19226b06d8663..f97851bcd98111 100644
--- a/libcxx/include/__cxx03/__chrono/time_zone_link.h
+++ b/libcxx/include/__cxx03/__chrono/time_zone_link.h
@@ -9,8 +9,8 @@
// For information see https://libcxx.llvm.org/DesignDocs/TimeZone.html
-#ifndef _LIBCPP___CHRONO_TIME_ZONE_LINK_H
-#define _LIBCPP___CHRONO_TIME_ZONE_LINK_H
+#ifndef _LIBCPP___CXX03___CHRONO_TIME_ZONE_LINK_H
+#define _LIBCPP___CXX03___CHRONO_TIME_ZONE_LINK_H
#include <__cxx03/version>
// Enable the contents of the header only when libc++ was built with experimental features enabled.
@@ -76,4 +76,4 @@ _LIBCPP_POP_MACROS
#endif // !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB)
-#endif // _LIBCPP___CHRONO_TIME_ZONE_LINK_H
+#endif // _LIBCPP___CXX03___CHRONO_TIME_ZONE_LINK_H
diff --git a/libcxx/include/__cxx03/__chrono/tzdb.h b/libcxx/include/__cxx03/__chrono/tzdb.h
index cb218314a8e85a..69cd19042c35a5 100644
--- a/libcxx/include/__cxx03/__chrono/tzdb.h
+++ b/libcxx/include/__cxx03/__chrono/tzdb.h
@@ -9,8 +9,8 @@
// For information see https://libcxx.llvm.org/DesignDocs/TimeZone.html
-#ifndef _LIBCPP___CHRONO_TZDB_H
-#define _LIBCPP___CHRONO_TZDB_H
+#ifndef _LIBCPP___CXX03___CHRONO_TZDB_H
+#define _LIBCPP___CXX03___CHRONO_TZDB_H
#include <__cxx03/version>
// Enable the contents of the header only when libc++ was built with experimental features enabled.
@@ -91,4 +91,4 @@ _LIBCPP_POP_MACROS
#endif // !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB)
-#endif // _LIBCPP___CHRONO_TZDB_H
+#endif // _LIBCPP___CXX03___CHRONO_TZDB_H
diff --git a/libcxx/include/__cxx03/__chrono/tzdb_list.h b/libcxx/include/__cxx03/__chrono/tzdb_list.h
index 96d52da88b108f..e3fb2a01161a50 100644
--- a/libcxx/include/__cxx03/__chrono/tzdb_list.h
+++ b/libcxx/include/__cxx03/__chrono/tzdb_list.h
@@ -9,8 +9,8 @@
// For information see https://libcxx.llvm.org/DesignDocs/TimeZone.html
-#ifndef _LIBCPP___CHRONO_TZDB_LIST_H
-#define _LIBCPP___CHRONO_TZDB_LIST_H
+#ifndef _LIBCPP___CXX03___CHRONO_TZDB_LIST_H
+#define _LIBCPP___CXX03___CHRONO_TZDB_LIST_H
#include <__cxx03/version>
// Enable the contents of the header only when libc++ was built with experimental features enabled.
@@ -105,4 +105,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB)
-#endif // _LIBCPP___CHRONO_TZDB_LIST_H
+#endif // _LIBCPP___CXX03___CHRONO_TZDB_LIST_H
diff --git a/libcxx/include/__cxx03/__chrono/weekday.h b/libcxx/include/__cxx03/__chrono/weekday.h
index d7a0cc8496dcdc..3c152653118d40 100644
--- a/libcxx/include/__cxx03/__chrono/weekday.h
+++ b/libcxx/include/__cxx03/__chrono/weekday.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_WEEKDAY_H
-#define _LIBCPP___CHRONO_WEEKDAY_H
+#ifndef _LIBCPP___CXX03___CHRONO_WEEKDAY_H
+#define _LIBCPP___CXX03___CHRONO_WEEKDAY_H
#include <__cxx03/__chrono/calendar.h>
#include <__cxx03/__chrono/duration.h>
@@ -183,4 +183,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___CHRONO_WEEKDAY_H
+#endif // _LIBCPP___CXX03___CHRONO_WEEKDAY_H
diff --git a/libcxx/include/__cxx03/__chrono/year.h b/libcxx/include/__cxx03/__chrono/year.h
index 2850616a7aa214..3594977e2be990 100644
--- a/libcxx/include/__cxx03/__chrono/year.h
+++ b/libcxx/include/__cxx03/__chrono/year.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_YEAR_H
-#define _LIBCPP___CHRONO_YEAR_H
+#ifndef _LIBCPP___CXX03___CHRONO_YEAR_H
+#define _LIBCPP___CXX03___CHRONO_YEAR_H
#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__config>
@@ -115,4 +115,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___CHRONO_YEAR_H
+#endif // _LIBCPP___CXX03___CHRONO_YEAR_H
diff --git a/libcxx/include/__cxx03/__chrono/year_month.h b/libcxx/include/__cxx03/__chrono/year_month.h
index 75784df9386d8e..07652cfc868c17 100644
--- a/libcxx/include/__cxx03/__chrono/year_month.h
+++ b/libcxx/include/__cxx03/__chrono/year_month.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_YEAR_MONTH_H
-#define _LIBCPP___CHRONO_YEAR_MONTH_H
+#ifndef _LIBCPP___CXX03___CHRONO_YEAR_MONTH_H
+#define _LIBCPP___CXX03___CHRONO_YEAR_MONTH_H
#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__chrono/month.h>
@@ -120,4 +120,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___CHRONO_YEAR_MONTH_H
+#endif // _LIBCPP___CXX03___CHRONO_YEAR_MONTH_H
diff --git a/libcxx/include/__cxx03/__chrono/year_month_day.h b/libcxx/include/__cxx03/__chrono/year_month_day.h
index dff7423a0ffb3e..551da3e3a1ffda 100644
--- a/libcxx/include/__cxx03/__chrono/year_month_day.h
+++ b/libcxx/include/__cxx03/__chrono/year_month_day.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_YEAR_MONTH_DAY_H
-#define _LIBCPP___CHRONO_YEAR_MONTH_DAY_H
+#ifndef _LIBCPP___CXX03___CHRONO_YEAR_MONTH_DAY_H
+#define _LIBCPP___CXX03___CHRONO_YEAR_MONTH_DAY_H
#include <__cxx03/__chrono/calendar.h>
#include <__cxx03/__chrono/day.h>
@@ -334,4 +334,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___CHRONO_YEAR_MONTH_DAY_H
+#endif // _LIBCPP___CXX03___CHRONO_YEAR_MONTH_DAY_H
diff --git a/libcxx/include/__cxx03/__chrono/year_month_weekday.h b/libcxx/include/__cxx03/__chrono/year_month_weekday.h
index 3177f21964862f..3f6974abeb3cca 100644
--- a/libcxx/include/__cxx03/__chrono/year_month_weekday.h
+++ b/libcxx/include/__cxx03/__chrono/year_month_weekday.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CHRONO_YEAR_MONTH_WEEKDAY_H
-#define _LIBCPP___CHRONO_YEAR_MONTH_WEEKDAY_H
+#ifndef _LIBCPP___CXX03___CHRONO_YEAR_MONTH_WEEKDAY_H
+#define _LIBCPP___CXX03___CHRONO_YEAR_MONTH_WEEKDAY_H
#include <__cxx03/__chrono/calendar.h>
#include <__cxx03/__chrono/day.h>
@@ -284,4 +284,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___CHRONO_YEAR_MONTH_WEEKDAY_H
+#endif // _LIBCPP___CXX03___CHRONO_YEAR_MONTH_WEEKDAY_H
diff --git a/libcxx/include/__cxx03/__chrono/zoned_time.h b/libcxx/include/__cxx03/__chrono/zoned_time.h
index f3333a4189cc53..7f83dcfc31a84a 100644
--- a/libcxx/include/__cxx03/__chrono/zoned_time.h
+++ b/libcxx/include/__cxx03/__chrono/zoned_time.h
@@ -9,8 +9,8 @@
// For information see https://libcxx.llvm.org/DesignDocs/TimeZone.html
-#ifndef _LIBCPP___CHRONO_ZONED_TIME_H
-#define _LIBCPP___CHRONO_ZONED_TIME_H
+#ifndef _LIBCPP___CXX03___CHRONO_ZONED_TIME_H
+#define _LIBCPP___CXX03___CHRONO_ZONED_TIME_H
#include <__cxx03/version>
// Enable the contents of the header only when libc++ was built with experimental features enabled.
@@ -224,4 +224,4 @@ _LIBCPP_POP_MACROS
#endif // !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_TZDB)
-#endif // _LIBCPP___CHRONO_ZONED_TIME_H
+#endif // _LIBCPP___CXX03___CHRONO_ZONED_TIME_H
diff --git a/libcxx/include/__cxx03/__compare/common_comparison_category.h b/libcxx/include/__cxx03/__compare/common_comparison_category.h
index 795884d13177fc..22375e5fe2dcdf 100644
--- a/libcxx/include/__cxx03/__compare/common_comparison_category.h
+++ b/libcxx/include/__cxx03/__compare/common_comparison_category.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___COMPARE_COMMON_COMPARISON_CATEGORY_H
-#define _LIBCPP___COMPARE_COMMON_COMPARISON_CATEGORY_H
+#ifndef _LIBCPP___CXX03___COMPARE_COMMON_COMPARISON_CATEGORY_H
+#define _LIBCPP___CXX03___COMPARE_COMMON_COMPARISON_CATEGORY_H
#include <__cxx03/__compare/ordering.h>
#include <__cxx03/__config>
@@ -83,4 +83,4 @@ using common_comparison_category_t = typename common_comparison_category<_Ts...>
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___COMPARE_COMMON_COMPARISON_CATEGORY_H
+#endif // _LIBCPP___CXX03___COMPARE_COMMON_COMPARISON_CATEGORY_H
diff --git a/libcxx/include/__cxx03/__compare/compare_partial_order_fallback.h b/libcxx/include/__cxx03/__compare/compare_partial_order_fallback.h
index dc939d8f9a6b85..faddc2faaa8535 100644
--- a/libcxx/include/__cxx03/__compare/compare_partial_order_fallback.h
+++ b/libcxx/include/__cxx03/__compare/compare_partial_order_fallback.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___COMPARE_COMPARE_PARTIAL_ORDER_FALLBACK
-#define _LIBCPP___COMPARE_COMPARE_PARTIAL_ORDER_FALLBACK
+#ifndef _LIBCPP___CXX03___COMPARE_COMPARE_PARTIAL_ORDER_FALLBACK
+#define _LIBCPP___CXX03___COMPARE_COMPARE_PARTIAL_ORDER_FALLBACK
#include <__cxx03/__compare/ordering.h>
#include <__cxx03/__compare/partial_order.h>
@@ -73,4 +73,4 @@ inline constexpr auto compare_partial_order_fallback = __compare_partial_order_f
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___COMPARE_COMPARE_PARTIAL_ORDER_FALLBACK
+#endif // _LIBCPP___CXX03___COMPARE_COMPARE_PARTIAL_ORDER_FALLBACK
diff --git a/libcxx/include/__cxx03/__compare/compare_strong_order_fallback.h b/libcxx/include/__cxx03/__compare/compare_strong_order_fallback.h
index 5ea1ce7c64d123..6ba4e49712c07a 100644
--- a/libcxx/include/__cxx03/__compare/compare_strong_order_fallback.h
+++ b/libcxx/include/__cxx03/__compare/compare_strong_order_fallback.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___COMPARE_COMPARE_STRONG_ORDER_FALLBACK
-#define _LIBCPP___COMPARE_COMPARE_STRONG_ORDER_FALLBACK
+#ifndef _LIBCPP___CXX03___COMPARE_COMPARE_STRONG_ORDER_FALLBACK
+#define _LIBCPP___CXX03___COMPARE_COMPARE_STRONG_ORDER_FALLBACK
#include <__cxx03/__compare/ordering.h>
#include <__cxx03/__compare/strong_order.h>
@@ -70,4 +70,4 @@ inline constexpr auto compare_strong_order_fallback = __compare_strong_order_fal
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___COMPARE_COMPARE_STRONG_ORDER_FALLBACK
+#endif // _LIBCPP___CXX03___COMPARE_COMPARE_STRONG_ORDER_FALLBACK
diff --git a/libcxx/include/__cxx03/__compare/compare_three_way.h b/libcxx/include/__cxx03/__compare/compare_three_way.h
index 258ad431034291..78354b107f213a 100644
--- a/libcxx/include/__cxx03/__compare/compare_three_way.h
+++ b/libcxx/include/__cxx03/__compare/compare_three_way.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___COMPARE_COMPARE_THREE_WAY_H
-#define _LIBCPP___COMPARE_COMPARE_THREE_WAY_H
+#ifndef _LIBCPP___CXX03___COMPARE_COMPARE_THREE_WAY_H
+#define _LIBCPP___CXX03___COMPARE_COMPARE_THREE_WAY_H
#include <__cxx03/__compare/three_way_comparable.h>
#include <__cxx03/__config>
@@ -37,4 +37,4 @@ struct _LIBCPP_TEMPLATE_VIS compare_three_way {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___COMPARE_COMPARE_THREE_WAY_H
+#endif // _LIBCPP___CXX03___COMPARE_COMPARE_THREE_WAY_H
diff --git a/libcxx/include/__cxx03/__compare/compare_three_way_result.h b/libcxx/include/__cxx03/__compare/compare_three_way_result.h
index 7577b9ee15f90f..3b5dccc042e549 100644
--- a/libcxx/include/__cxx03/__compare/compare_three_way_result.h
+++ b/libcxx/include/__cxx03/__compare/compare_three_way_result.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___COMPARE_COMPARE_THREE_WAY_RESULT_H
-#define _LIBCPP___COMPARE_COMPARE_THREE_WAY_RESULT_H
+#ifndef _LIBCPP___CXX03___COMPARE_COMPARE_THREE_WAY_RESULT_H
+#define _LIBCPP___CXX03___COMPARE_COMPARE_THREE_WAY_RESULT_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/make_const_lvalue_ref.h>
@@ -42,4 +42,4 @@ using compare_three_way_result_t = typename compare_three_way_result<_Tp, _Up>::
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___COMPARE_COMPARE_THREE_WAY_RESULT_H
+#endif // _LIBCPP___CXX03___COMPARE_COMPARE_THREE_WAY_RESULT_H
diff --git a/libcxx/include/__cxx03/__compare/compare_weak_order_fallback.h b/libcxx/include/__cxx03/__compare/compare_weak_order_fallback.h
index e12dc8eb5c9c0b..ecfee76dff2724 100644
--- a/libcxx/include/__cxx03/__compare/compare_weak_order_fallback.h
+++ b/libcxx/include/__cxx03/__compare/compare_weak_order_fallback.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___COMPARE_COMPARE_WEAK_ORDER_FALLBACK
-#define _LIBCPP___COMPARE_COMPARE_WEAK_ORDER_FALLBACK
+#ifndef _LIBCPP___CXX03___COMPARE_COMPARE_WEAK_ORDER_FALLBACK
+#define _LIBCPP___CXX03___COMPARE_COMPARE_WEAK_ORDER_FALLBACK
#include <__cxx03/__compare/ordering.h>
#include <__cxx03/__compare/weak_order.h>
@@ -70,4 +70,4 @@ inline constexpr auto compare_weak_order_fallback = __compare_weak_order_fallbac
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___COMPARE_COMPARE_WEAK_ORDER_FALLBACK
+#endif // _LIBCPP___CXX03___COMPARE_COMPARE_WEAK_ORDER_FALLBACK
diff --git a/libcxx/include/__cxx03/__compare/is_eq.h b/libcxx/include/__cxx03/__compare/is_eq.h
index 09cc7a2c85d4e5..52370834dc4089 100644
--- a/libcxx/include/__cxx03/__compare/is_eq.h
+++ b/libcxx/include/__cxx03/__compare/is_eq.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___COMPARE_IS_EQ_H
-#define _LIBCPP___COMPARE_IS_EQ_H
+#ifndef _LIBCPP___CXX03___COMPARE_IS_EQ_H
+#define _LIBCPP___CXX03___COMPARE_IS_EQ_H
#include <__cxx03/__compare/ordering.h>
#include <__cxx03/__config>
@@ -31,4 +31,4 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr bool is_gteq(partial_ordering __c) noexce
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___COMPARE_IS_EQ_H
+#endif // _LIBCPP___CXX03___COMPARE_IS_EQ_H
diff --git a/libcxx/include/__cxx03/__compare/ordering.h b/libcxx/include/__cxx03/__compare/ordering.h
index 71c199991f3303..0a497cba682df7 100644
--- a/libcxx/include/__cxx03/__compare/ordering.h
+++ b/libcxx/include/__cxx03/__compare/ordering.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___COMPARE_ORDERING_H
-#define _LIBCPP___COMPARE_ORDERING_H
+#ifndef _LIBCPP___CXX03___COMPARE_ORDERING_H
+#define _LIBCPP___CXX03___COMPARE_ORDERING_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -275,4 +275,4 @@ concept __comparison_category = __one_of_v<_Tp, partial_ordering, weak_ordering,
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___COMPARE_ORDERING_H
+#endif // _LIBCPP___CXX03___COMPARE_ORDERING_H
diff --git a/libcxx/include/__cxx03/__compare/partial_order.h b/libcxx/include/__cxx03/__compare/partial_order.h
index df8b842e7bf844..119d6581f12420 100644
--- a/libcxx/include/__cxx03/__compare/partial_order.h
+++ b/libcxx/include/__cxx03/__compare/partial_order.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___COMPARE_PARTIAL_ORDER
-#define _LIBCPP___COMPARE_PARTIAL_ORDER
+#ifndef _LIBCPP___CXX03___COMPARE_PARTIAL_ORDER
+#define _LIBCPP___CXX03___COMPARE_PARTIAL_ORDER
#include <__cxx03/__compare/compare_three_way.h>
#include <__cxx03/__compare/ordering.h>
@@ -74,4 +74,4 @@ inline constexpr auto partial_order = __partial_order::__fn{};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___COMPARE_PARTIAL_ORDER
+#endif // _LIBCPP___CXX03___COMPARE_PARTIAL_ORDER
diff --git a/libcxx/include/__cxx03/__compare/strong_order.h b/libcxx/include/__cxx03/__compare/strong_order.h
index 7522325912351a..ee29de2b9260ff 100644
--- a/libcxx/include/__cxx03/__compare/strong_order.h
+++ b/libcxx/include/__cxx03/__compare/strong_order.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___COMPARE_STRONG_ORDER
-#define _LIBCPP___COMPARE_STRONG_ORDER
+#ifndef _LIBCPP___CXX03___COMPARE_STRONG_ORDER
+#define _LIBCPP___CXX03___COMPARE_STRONG_ORDER
#include <__cxx03/__bit/bit_cast.h>
#include <__cxx03/__compare/compare_three_way.h>
@@ -140,4 +140,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___COMPARE_STRONG_ORDER
+#endif // _LIBCPP___CXX03___COMPARE_STRONG_ORDER
diff --git a/libcxx/include/__cxx03/__compare/synth_three_way.h b/libcxx/include/__cxx03/__compare/synth_three_way.h
index fbaaf618642998..2625ea80bf1b77 100644
--- a/libcxx/include/__cxx03/__compare/synth_three_way.h
+++ b/libcxx/include/__cxx03/__compare/synth_three_way.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___COMPARE_SYNTH_THREE_WAY_H
-#define _LIBCPP___COMPARE_SYNTH_THREE_WAY_H
+#ifndef _LIBCPP___CXX03___COMPARE_SYNTH_THREE_WAY_H
+#define _LIBCPP___CXX03___COMPARE_SYNTH_THREE_WAY_H
#include <__cxx03/__compare/ordering.h>
#include <__cxx03/__compare/three_way_comparable.h>
@@ -49,4 +49,4 @@ using __synth_three_way_result = decltype(std::__synth_three_way(std::declval<_T
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___COMPARE_SYNTH_THREE_WAY_H
+#endif // _LIBCPP___CXX03___COMPARE_SYNTH_THREE_WAY_H
diff --git a/libcxx/include/__cxx03/__compare/three_way_comparable.h b/libcxx/include/__cxx03/__compare/three_way_comparable.h
index 9ad84d2bde4987..a3539459ea25cc 100644
--- a/libcxx/include/__cxx03/__compare/three_way_comparable.h
+++ b/libcxx/include/__cxx03/__compare/three_way_comparable.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___COMPARE_THREE_WAY_COMPARABLE_H
-#define _LIBCPP___COMPARE_THREE_WAY_COMPARABLE_H
+#ifndef _LIBCPP___CXX03___COMPARE_THREE_WAY_COMPARABLE_H
+#define _LIBCPP___CXX03___COMPARE_THREE_WAY_COMPARABLE_H
#include <__cxx03/__compare/common_comparison_category.h>
#include <__cxx03/__compare/ordering.h>
@@ -52,4 +52,4 @@ concept three_way_comparable_with =
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___COMPARE_THREE_WAY_COMPARABLE_H
+#endif // _LIBCPP___CXX03___COMPARE_THREE_WAY_COMPARABLE_H
diff --git a/libcxx/include/__cxx03/__compare/weak_order.h b/libcxx/include/__cxx03/__compare/weak_order.h
index e4c4797c06db60..32ab1b68e459a3 100644
--- a/libcxx/include/__cxx03/__compare/weak_order.h
+++ b/libcxx/include/__cxx03/__compare/weak_order.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___COMPARE_WEAK_ORDER
-#define _LIBCPP___COMPARE_WEAK_ORDER
+#ifndef _LIBCPP___CXX03___COMPARE_WEAK_ORDER
+#define _LIBCPP___CXX03___COMPARE_WEAK_ORDER
#include <__cxx03/__compare/compare_three_way.h>
#include <__cxx03/__compare/ordering.h>
@@ -102,4 +102,4 @@ inline constexpr auto weak_order = __weak_order::__fn{};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___COMPARE_WEAK_ORDER
+#endif // _LIBCPP___CXX03___COMPARE_WEAK_ORDER
diff --git a/libcxx/include/__cxx03/__concepts/arithmetic.h b/libcxx/include/__cxx03/__concepts/arithmetic.h
index a8ef1d1532cacb..6c5196bcdf7908 100644
--- a/libcxx/include/__cxx03/__concepts/arithmetic.h
+++ b/libcxx/include/__cxx03/__concepts/arithmetic.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONCEPTS_ARITHMETIC_H
-#define _LIBCPP___CONCEPTS_ARITHMETIC_H
+#ifndef _LIBCPP___CXX03___CONCEPTS_ARITHMETIC_H
+#define _LIBCPP___CXX03___CONCEPTS_ARITHMETIC_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_floating_point.h>
@@ -53,4 +53,4 @@ concept __libcpp_integer = __libcpp_unsigned_integer<_Tp> || __libcpp_signed_int
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CONCEPTS_ARITHMETIC_H
+#endif // _LIBCPP___CXX03___CONCEPTS_ARITHMETIC_H
diff --git a/libcxx/include/__cxx03/__concepts/assignable.h b/libcxx/include/__cxx03/__concepts/assignable.h
index 563deb5e4cd690..8b69770222b0a2 100644
--- a/libcxx/include/__cxx03/__concepts/assignable.h
+++ b/libcxx/include/__cxx03/__concepts/assignable.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONCEPTS_ASSIGNABLE_H
-#define _LIBCPP___CONCEPTS_ASSIGNABLE_H
+#ifndef _LIBCPP___CXX03___CONCEPTS_ASSIGNABLE_H
+#define _LIBCPP___CXX03___CONCEPTS_ASSIGNABLE_H
#include <__cxx03/__concepts/common_reference_with.h>
#include <__cxx03/__concepts/same_as.h>
@@ -38,4 +38,4 @@ concept assignable_from =
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CONCEPTS_ASSIGNABLE_H
+#endif // _LIBCPP___CXX03___CONCEPTS_ASSIGNABLE_H
diff --git a/libcxx/include/__cxx03/__concepts/boolean_testable.h b/libcxx/include/__cxx03/__concepts/boolean_testable.h
index 1f655c1b19cdfe..21e03f76d8bb17 100644
--- a/libcxx/include/__cxx03/__concepts/boolean_testable.h
+++ b/libcxx/include/__cxx03/__concepts/boolean_testable.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONCEPTS_BOOLEAN_TESTABLE_H
-#define _LIBCPP___CONCEPTS_BOOLEAN_TESTABLE_H
+#ifndef _LIBCPP___CXX03___CONCEPTS_BOOLEAN_TESTABLE_H
+#define _LIBCPP___CXX03___CONCEPTS_BOOLEAN_TESTABLE_H
#include <__cxx03/__concepts/convertible_to.h>
#include <__cxx03/__config>
@@ -35,4 +35,4 @@ concept __boolean_testable = __boolean_testable_impl<_Tp> && requires(_Tp&& __t)
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CONCEPTS_BOOLEAN_TESTABLE_H
+#endif // _LIBCPP___CXX03___CONCEPTS_BOOLEAN_TESTABLE_H
diff --git a/libcxx/include/__cxx03/__concepts/class_or_enum.h b/libcxx/include/__cxx03/__concepts/class_or_enum.h
index ef9a61cdbebf78..a8604e6d9eb615 100644
--- a/libcxx/include/__cxx03/__concepts/class_or_enum.h
+++ b/libcxx/include/__cxx03/__concepts/class_or_enum.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONCEPTS_CLASS_OR_ENUM_H
-#define _LIBCPP___CONCEPTS_CLASS_OR_ENUM_H
+#ifndef _LIBCPP___CXX03___CONCEPTS_CLASS_OR_ENUM_H
+#define _LIBCPP___CXX03___CONCEPTS_CLASS_OR_ENUM_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_class.h>
@@ -32,4 +32,4 @@ concept __class_or_enum = is_class_v<_Tp> || is_union_v<_Tp> || is_enum_v<_Tp>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CONCEPTS_CLASS_OR_ENUM_H
+#endif // _LIBCPP___CXX03___CONCEPTS_CLASS_OR_ENUM_H
diff --git a/libcxx/include/__cxx03/__concepts/common_reference_with.h b/libcxx/include/__cxx03/__concepts/common_reference_with.h
index 8e0b5bafe78622..1ffe9f67be48b2 100644
--- a/libcxx/include/__cxx03/__concepts/common_reference_with.h
+++ b/libcxx/include/__cxx03/__concepts/common_reference_with.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONCEPTS_COMMON_REFERENCE_WITH_H
-#define _LIBCPP___CONCEPTS_COMMON_REFERENCE_WITH_H
+#ifndef _LIBCPP___CXX03___CONCEPTS_COMMON_REFERENCE_WITH_H
+#define _LIBCPP___CXX03___CONCEPTS_COMMON_REFERENCE_WITH_H
#include <__cxx03/__concepts/convertible_to.h>
#include <__cxx03/__concepts/same_as.h>
@@ -33,4 +33,4 @@ concept common_reference_with =
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CONCEPTS_COMMON_REFERENCE_WITH_H
+#endif // _LIBCPP___CXX03___CONCEPTS_COMMON_REFERENCE_WITH_H
diff --git a/libcxx/include/__cxx03/__concepts/common_with.h b/libcxx/include/__cxx03/__concepts/common_with.h
index 37f4e3c30c2b26..ee100052c0c529 100644
--- a/libcxx/include/__cxx03/__concepts/common_with.h
+++ b/libcxx/include/__cxx03/__concepts/common_with.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONCEPTS_COMMON_WITH_H
-#define _LIBCPP___CONCEPTS_COMMON_WITH_H
+#ifndef _LIBCPP___CXX03___CONCEPTS_COMMON_WITH_H
+#define _LIBCPP___CXX03___CONCEPTS_COMMON_WITH_H
#include <__cxx03/__concepts/common_reference_with.h>
#include <__cxx03/__concepts/same_as.h>
@@ -49,4 +49,4 @@ concept common_with =
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CONCEPTS_COMMON_WITH_H
+#endif // _LIBCPP___CXX03___CONCEPTS_COMMON_WITH_H
diff --git a/libcxx/include/__cxx03/__concepts/constructible.h b/libcxx/include/__cxx03/__concepts/constructible.h
index 356ca476260711..2d04667f7d3e4a 100644
--- a/libcxx/include/__cxx03/__concepts/constructible.h
+++ b/libcxx/include/__cxx03/__concepts/constructible.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONCEPTS_CONSTRUCTIBLE_H
-#define _LIBCPP___CONCEPTS_CONSTRUCTIBLE_H
+#ifndef _LIBCPP___CXX03___CONCEPTS_CONSTRUCTIBLE_H
+#define _LIBCPP___CXX03___CONCEPTS_CONSTRUCTIBLE_H
#include <__cxx03/__concepts/convertible_to.h>
#include <__cxx03/__concepts/destructible.h>
@@ -52,4 +52,4 @@ concept copy_constructible =
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CONCEPTS_CONSTRUCTIBLE_H
+#endif // _LIBCPP___CXX03___CONCEPTS_CONSTRUCTIBLE_H
diff --git a/libcxx/include/__cxx03/__concepts/convertible_to.h b/libcxx/include/__cxx03/__concepts/convertible_to.h
index 4802621c93ef7f..af27b76c9c04a4 100644
--- a/libcxx/include/__cxx03/__concepts/convertible_to.h
+++ b/libcxx/include/__cxx03/__concepts/convertible_to.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONCEPTS_CONVERTIBLE_TO_H
-#define _LIBCPP___CONCEPTS_CONVERTIBLE_TO_H
+#ifndef _LIBCPP___CXX03___CONCEPTS_CONVERTIBLE_TO_H
+#define _LIBCPP___CXX03___CONCEPTS_CONVERTIBLE_TO_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_convertible.h>
@@ -30,4 +30,4 @@ concept convertible_to = is_convertible_v<_From, _To> && requires { static_cast<
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CONCEPTS_CONVERTIBLE_TO_H
+#endif // _LIBCPP___CXX03___CONCEPTS_CONVERTIBLE_TO_H
diff --git a/libcxx/include/__cxx03/__concepts/copyable.h b/libcxx/include/__cxx03/__concepts/copyable.h
index bcadc7382f50f0..8ca2d4f9408344 100644
--- a/libcxx/include/__cxx03/__concepts/copyable.h
+++ b/libcxx/include/__cxx03/__concepts/copyable.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONCEPTS_COPYABLE_H
-#define _LIBCPP___CONCEPTS_COPYABLE_H
+#ifndef _LIBCPP___CXX03___CONCEPTS_COPYABLE_H
+#define _LIBCPP___CXX03___CONCEPTS_COPYABLE_H
#include <__cxx03/__concepts/assignable.h>
#include <__cxx03/__concepts/constructible.h>
@@ -38,4 +38,4 @@ concept copyable =
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CONCEPTS_COPYABLE_H
+#endif // _LIBCPP___CXX03___CONCEPTS_COPYABLE_H
diff --git a/libcxx/include/__cxx03/__concepts/derived_from.h b/libcxx/include/__cxx03/__concepts/derived_from.h
index 861c84f0cf6bae..8112b6c2b70f90 100644
--- a/libcxx/include/__cxx03/__concepts/derived_from.h
+++ b/libcxx/include/__cxx03/__concepts/derived_from.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONCEPTS_DERIVED_FROM_H
-#define _LIBCPP___CONCEPTS_DERIVED_FROM_H
+#ifndef _LIBCPP___CXX03___CONCEPTS_DERIVED_FROM_H
+#define _LIBCPP___CXX03___CONCEPTS_DERIVED_FROM_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_base_of.h>
@@ -30,4 +30,4 @@ concept derived_from = is_base_of_v<_Bp, _Dp> && is_convertible_v<const volatile
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CONCEPTS_DERIVED_FROM_H
+#endif // _LIBCPP___CXX03___CONCEPTS_DERIVED_FROM_H
diff --git a/libcxx/include/__cxx03/__concepts/destructible.h b/libcxx/include/__cxx03/__concepts/destructible.h
index 5aa9a908648cdf..bd302c3acb62cc 100644
--- a/libcxx/include/__cxx03/__concepts/destructible.h
+++ b/libcxx/include/__cxx03/__concepts/destructible.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONCEPTS_DESTRUCTIBLE_H
-#define _LIBCPP___CONCEPTS_DESTRUCTIBLE_H
+#ifndef _LIBCPP___CXX03___CONCEPTS_DESTRUCTIBLE_H
+#define _LIBCPP___CXX03___CONCEPTS_DESTRUCTIBLE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_nothrow_destructible.h>
@@ -29,4 +29,4 @@ concept destructible = is_nothrow_destructible_v<_Tp>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CONCEPTS_DESTRUCTIBLE_H
+#endif // _LIBCPP___CXX03___CONCEPTS_DESTRUCTIBLE_H
diff --git a/libcxx/include/__cxx03/__concepts/different_from.h b/libcxx/include/__cxx03/__concepts/different_from.h
index bedf3a0bf0b7f5..a5d59d47be1d40 100644
--- a/libcxx/include/__cxx03/__concepts/different_from.h
+++ b/libcxx/include/__cxx03/__concepts/different_from.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONCEPTS_DIFFERENT_FROM_H
-#define _LIBCPP___CONCEPTS_DIFFERENT_FROM_H
+#ifndef _LIBCPP___CXX03___CONCEPTS_DIFFERENT_FROM_H
+#define _LIBCPP___CXX03___CONCEPTS_DIFFERENT_FROM_H
#include <__cxx03/__concepts/same_as.h>
#include <__cxx03/__config>
@@ -28,4 +28,4 @@ concept __different_from = !same_as<remove_cvref_t<_Tp>, remove_cvref_t<_Up>>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CONCEPTS_DIFFERENT_FROM_H
+#endif // _LIBCPP___CXX03___CONCEPTS_DIFFERENT_FROM_H
diff --git a/libcxx/include/__cxx03/__concepts/equality_comparable.h b/libcxx/include/__cxx03/__concepts/equality_comparable.h
index a77f8f3de60b29..a3a4504bcb627a 100644
--- a/libcxx/include/__cxx03/__concepts/equality_comparable.h
+++ b/libcxx/include/__cxx03/__concepts/equality_comparable.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONCEPTS_EQUALITY_COMPARABLE_H
-#define _LIBCPP___CONCEPTS_EQUALITY_COMPARABLE_H
+#ifndef _LIBCPP___CXX03___CONCEPTS_EQUALITY_COMPARABLE_H
+#define _LIBCPP___CXX03___CONCEPTS_EQUALITY_COMPARABLE_H
#include <__cxx03/__concepts/boolean_testable.h>
#include <__cxx03/__concepts/common_reference_with.h>
@@ -53,4 +53,4 @@ concept equality_comparable_with =
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CONCEPTS_EQUALITY_COMPARABLE_H
+#endif // _LIBCPP___CXX03___CONCEPTS_EQUALITY_COMPARABLE_H
diff --git a/libcxx/include/__cxx03/__concepts/invocable.h b/libcxx/include/__cxx03/__concepts/invocable.h
index fbbbf16e32fe92..624d8b0a92465c 100644
--- a/libcxx/include/__cxx03/__concepts/invocable.h
+++ b/libcxx/include/__cxx03/__concepts/invocable.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONCEPTS_INVOCABLE_H
-#define _LIBCPP___CONCEPTS_INVOCABLE_H
+#ifndef _LIBCPP___CXX03___CONCEPTS_INVOCABLE_H
+#define _LIBCPP___CXX03___CONCEPTS_INVOCABLE_H
#include <__cxx03/__config>
#include <__cxx03/__functional/invoke.h>
@@ -37,4 +37,4 @@ concept regular_invocable = invocable<_Fn, _Args...>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CONCEPTS_INVOCABLE_H
+#endif // _LIBCPP___CXX03___CONCEPTS_INVOCABLE_H
diff --git a/libcxx/include/__cxx03/__concepts/movable.h b/libcxx/include/__cxx03/__concepts/movable.h
index 883eda880b6f09..a0c3372e88c962 100644
--- a/libcxx/include/__cxx03/__concepts/movable.h
+++ b/libcxx/include/__cxx03/__concepts/movable.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONCEPTS_MOVABLE_H
-#define _LIBCPP___CONCEPTS_MOVABLE_H
+#ifndef _LIBCPP___CXX03___CONCEPTS_MOVABLE_H
+#define _LIBCPP___CXX03___CONCEPTS_MOVABLE_H
#include <__cxx03/__concepts/assignable.h>
#include <__cxx03/__concepts/constructible.h>
@@ -32,4 +32,4 @@ concept movable = is_object_v<_Tp> && move_constructible<_Tp> && assignable_from
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CONCEPTS_MOVABLE_H
+#endif // _LIBCPP___CXX03___CONCEPTS_MOVABLE_H
diff --git a/libcxx/include/__cxx03/__concepts/predicate.h b/libcxx/include/__cxx03/__concepts/predicate.h
index 15007f3b09926f..5268854d50269d 100644
--- a/libcxx/include/__cxx03/__concepts/predicate.h
+++ b/libcxx/include/__cxx03/__concepts/predicate.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONCEPTS_PREDICATE_H
-#define _LIBCPP___CONCEPTS_PREDICATE_H
+#ifndef _LIBCPP___CXX03___CONCEPTS_PREDICATE_H
+#define _LIBCPP___CXX03___CONCEPTS_PREDICATE_H
#include <__cxx03/__concepts/boolean_testable.h>
#include <__cxx03/__concepts/invocable.h>
@@ -31,4 +31,4 @@ concept predicate = regular_invocable<_Fn, _Args...> && __boolean_testable<invok
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CONCEPTS_PREDICATE_H
+#endif // _LIBCPP___CXX03___CONCEPTS_PREDICATE_H
diff --git a/libcxx/include/__cxx03/__concepts/regular.h b/libcxx/include/__cxx03/__concepts/regular.h
index faf04f2c6b9430..fd0365ab704357 100644
--- a/libcxx/include/__cxx03/__concepts/regular.h
+++ b/libcxx/include/__cxx03/__concepts/regular.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONCEPTS_REGULAR_H
-#define _LIBCPP___CONCEPTS_REGULAR_H
+#ifndef _LIBCPP___CXX03___CONCEPTS_REGULAR_H
+#define _LIBCPP___CXX03___CONCEPTS_REGULAR_H
#include <__cxx03/__concepts/equality_comparable.h>
#include <__cxx03/__concepts/semiregular.h>
@@ -30,4 +30,4 @@ concept regular = semiregular<_Tp> && equality_comparable<_Tp>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CONCEPTS_REGULAR_H
+#endif // _LIBCPP___CXX03___CONCEPTS_REGULAR_H
diff --git a/libcxx/include/__cxx03/__concepts/relation.h b/libcxx/include/__cxx03/__concepts/relation.h
index 0d90406012e33e..67a612979daabf 100644
--- a/libcxx/include/__cxx03/__concepts/relation.h
+++ b/libcxx/include/__cxx03/__concepts/relation.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONCEPTS_RELATION_H
-#define _LIBCPP___CONCEPTS_RELATION_H
+#ifndef _LIBCPP___CXX03___CONCEPTS_RELATION_H
+#define _LIBCPP___CXX03___CONCEPTS_RELATION_H
#include <__cxx03/__concepts/predicate.h>
#include <__cxx03/__config>
@@ -40,4 +40,4 @@ concept strict_weak_order = relation<_Rp, _Tp, _Up>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CONCEPTS_RELATION_H
+#endif // _LIBCPP___CXX03___CONCEPTS_RELATION_H
diff --git a/libcxx/include/__cxx03/__concepts/same_as.h b/libcxx/include/__cxx03/__concepts/same_as.h
index 6c81ecfbbfe5b2..5318cda953189e 100644
--- a/libcxx/include/__cxx03/__concepts/same_as.h
+++ b/libcxx/include/__cxx03/__concepts/same_as.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONCEPTS_SAME_AS_H
-#define _LIBCPP___CONCEPTS_SAME_AS_H
+#ifndef _LIBCPP___CXX03___CONCEPTS_SAME_AS_H
+#define _LIBCPP___CXX03___CONCEPTS_SAME_AS_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_same.h>
@@ -32,4 +32,4 @@ concept same_as = __same_as_impl<_Tp, _Up> && __same_as_impl<_Up, _Tp>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CONCEPTS_SAME_AS_H
+#endif // _LIBCPP___CXX03___CONCEPTS_SAME_AS_H
diff --git a/libcxx/include/__cxx03/__concepts/semiregular.h b/libcxx/include/__cxx03/__concepts/semiregular.h
index 2a3eb3d6672929..06505080f8d363 100644
--- a/libcxx/include/__cxx03/__concepts/semiregular.h
+++ b/libcxx/include/__cxx03/__concepts/semiregular.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONCEPTS_SEMIREGULAR_H
-#define _LIBCPP___CONCEPTS_SEMIREGULAR_H
+#ifndef _LIBCPP___CXX03___CONCEPTS_SEMIREGULAR_H
+#define _LIBCPP___CXX03___CONCEPTS_SEMIREGULAR_H
#include <__cxx03/__concepts/constructible.h>
#include <__cxx03/__concepts/copyable.h>
@@ -30,4 +30,4 @@ concept semiregular = copyable<_Tp> && default_initializable<_Tp>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CONCEPTS_SEMIREGULAR_H
+#endif // _LIBCPP___CXX03___CONCEPTS_SEMIREGULAR_H
diff --git a/libcxx/include/__cxx03/__concepts/swappable.h b/libcxx/include/__cxx03/__concepts/swappable.h
index 333a42ad0c500f..95adb0f1b8dad7 100644
--- a/libcxx/include/__cxx03/__concepts/swappable.h
+++ b/libcxx/include/__cxx03/__concepts/swappable.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONCEPTS_SWAPPABLE_H
-#define _LIBCPP___CONCEPTS_SWAPPABLE_H
+#ifndef _LIBCPP___CXX03___CONCEPTS_SWAPPABLE_H
+#define _LIBCPP___CXX03___CONCEPTS_SWAPPABLE_H
#include <__cxx03/__concepts/assignable.h>
#include <__cxx03/__concepts/class_or_enum.h>
@@ -120,4 +120,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___CONCEPTS_SWAPPABLE_H
+#endif // _LIBCPP___CXX03___CONCEPTS_SWAPPABLE_H
diff --git a/libcxx/include/__cxx03/__concepts/totally_ordered.h b/libcxx/include/__cxx03/__concepts/totally_ordered.h
index f35502b58f125b..85ba0e4fdf47da 100644
--- a/libcxx/include/__cxx03/__concepts/totally_ordered.h
+++ b/libcxx/include/__cxx03/__concepts/totally_ordered.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONCEPTS_TOTALLY_ORDERED_H
-#define _LIBCPP___CONCEPTS_TOTALLY_ORDERED_H
+#ifndef _LIBCPP___CXX03___CONCEPTS_TOTALLY_ORDERED_H
+#define _LIBCPP___CXX03___CONCEPTS_TOTALLY_ORDERED_H
#include <__cxx03/__concepts/boolean_testable.h>
#include <__cxx03/__concepts/equality_comparable.h>
@@ -56,4 +56,4 @@ concept totally_ordered_with =
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___CONCEPTS_TOTALLY_ORDERED_H
+#endif // _LIBCPP___CXX03___CONCEPTS_TOTALLY_ORDERED_H
diff --git a/libcxx/include/__cxx03/__condition_variable/condition_variable.h b/libcxx/include/__cxx03/__condition_variable/condition_variable.h
index d96c6928fa7be2..8e41ad89914f9c 100644
--- a/libcxx/include/__cxx03/__condition_variable/condition_variable.h
+++ b/libcxx/include/__cxx03/__condition_variable/condition_variable.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONDITION_VARIABLE_CONDITION_VARIABLE_H
-#define _LIBCPP___CONDITION_VARIABLE_CONDITION_VARIABLE_H
+#ifndef _LIBCPP___CXX03___CONDITION_VARIABLE_CONDITION_VARIABLE_H
+#define _LIBCPP___CXX03___CONDITION_VARIABLE_CONDITION_VARIABLE_H
#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__chrono/steady_clock.h>
@@ -241,4 +241,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___CONDITION_VARIABLE_CONDITION_VARIABLE_H
+#endif // _LIBCPP___CXX03___CONDITION_VARIABLE_CONDITION_VARIABLE_H
diff --git a/libcxx/include/__cxx03/__config b/libcxx/include/__cxx03/__config
index 6f77292387776c..935fa4cc404f4e 100644
--- a/libcxx/include/__cxx03/__config
+++ b/libcxx/include/__cxx03/__config
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONFIG
-#define _LIBCPP___CONFIG
+#ifndef _LIBCPP___CXX03___CONFIG
+#define _LIBCPP___CXX03___CONFIG
#include <__config_site>
#include <__cxx03/__configuration/abi.h>
@@ -1225,4 +1225,4 @@ typedef __char32_t char32_t;
#endif // __cplusplus
-#endif // _LIBCPP___CONFIG
+#endif // _LIBCPP___CXX03___CONFIG
diff --git a/libcxx/include/__cxx03/__config_site.in b/libcxx/include/__cxx03/__config_site.in
index 67022146c9082b..174af4be5c4e5d 100644
--- a/libcxx/include/__cxx03/__config_site.in
+++ b/libcxx/include/__cxx03/__config_site.in
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONFIG_SITE
-#define _LIBCPP___CONFIG_SITE
+#ifndef _LIBCPP___CXX03___CONFIG_SITE
+#define _LIBCPP___CXX03___CONFIG_SITE
#cmakedefine _LIBCPP_ABI_VERSION @_LIBCPP_ABI_VERSION@
#cmakedefine _LIBCPP_ABI_NAMESPACE @_LIBCPP_ABI_NAMESPACE@
@@ -53,4 +53,4 @@
# pragma clang diagnostic pop
#endif
-#endif // _LIBCPP___CONFIG_SITE
+#endif // _LIBCPP___CXX03___CONFIG_SITE
diff --git a/libcxx/include/__cxx03/__configuration/abi.h b/libcxx/include/__cxx03/__configuration/abi.h
index 0d115288776971..9e7f7313c8834f 100644
--- a/libcxx/include/__cxx03/__configuration/abi.h
+++ b/libcxx/include/__cxx03/__configuration/abi.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONFIGURATION_ABI_H
-#define _LIBCPP___CONFIGURATION_ABI_H
+#ifndef _LIBCPP___CXX03___CONFIGURATION_ABI_H
+#define _LIBCPP___CXX03___CONFIGURATION_ABI_H
#include <__config_site>
#include <__cxx03/__configuration/compiler.h>
@@ -169,4 +169,4 @@
# endif
#endif
-#endif // _LIBCPP___CONFIGURATION_ABI_H
+#endif // _LIBCPP___CXX03___CONFIGURATION_ABI_H
diff --git a/libcxx/include/__cxx03/__configuration/availability.h b/libcxx/include/__cxx03/__configuration/availability.h
index e54ba50ae9a02d..ad45ce01d0a7eb 100644
--- a/libcxx/include/__cxx03/__configuration/availability.h
+++ b/libcxx/include/__cxx03/__configuration/availability.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONFIGURATION_AVAILABILITY_H
-#define _LIBCPP___CONFIGURATION_AVAILABILITY_H
+#ifndef _LIBCPP___CXX03___CONFIGURATION_AVAILABILITY_H
+#define _LIBCPP___CXX03___CONFIGURATION_AVAILABILITY_H
#include <__cxx03/__configuration/compiler.h>
#include <__cxx03/__configuration/language.h>
@@ -397,4 +397,4 @@
# define _LIBCPP_AVAILABILITY_INIT_PRIMARY_EXCEPTION
#endif
-#endif // _LIBCPP___CONFIGURATION_AVAILABILITY_H
+#endif // _LIBCPP___CXX03___CONFIGURATION_AVAILABILITY_H
diff --git a/libcxx/include/__cxx03/__configuration/compiler.h b/libcxx/include/__cxx03/__configuration/compiler.h
index 80ece22bb50bd6..2f33fb1f6ef4d4 100644
--- a/libcxx/include/__cxx03/__configuration/compiler.h
+++ b/libcxx/include/__cxx03/__configuration/compiler.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONFIGURATION_COMPILER_H
-#define _LIBCPP___CONFIGURATION_COMPILER_H
+#ifndef _LIBCPP___CXX03___CONFIGURATION_COMPILER_H
+#define _LIBCPP___CXX03___CONFIGURATION_COMPILER_H
#include <__config_site>
@@ -48,4 +48,4 @@
#endif
-#endif // _LIBCPP___CONFIGURATION_COMPILER_H
+#endif // _LIBCPP___CXX03___CONFIGURATION_COMPILER_H
diff --git a/libcxx/include/__cxx03/__configuration/language.h b/libcxx/include/__cxx03/__configuration/language.h
index fa62a7b6f5c2a1..604f2d2cd532a8 100644
--- a/libcxx/include/__cxx03/__configuration/language.h
+++ b/libcxx/include/__cxx03/__configuration/language.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONFIGURATION_LANGUAGE_H
-#define _LIBCPP___CONFIGURATION_LANGUAGE_H
+#ifndef _LIBCPP___CXX03___CONFIGURATION_LANGUAGE_H
+#define _LIBCPP___CXX03___CONFIGURATION_LANGUAGE_H
#include <__config_site>
@@ -43,4 +43,4 @@
# define _LIBCPP_HAS_NO_EXCEPTIONS
#endif
-#endif // _LIBCPP___CONFIGURATION_LANGUAGE_H
+#endif // _LIBCPP___CXX03___CONFIGURATION_LANGUAGE_H
diff --git a/libcxx/include/__cxx03/__configuration/platform.h b/libcxx/include/__cxx03/__configuration/platform.h
index 27f68d04e8a8d9..b4718986ad10d8 100644
--- a/libcxx/include/__cxx03/__configuration/platform.h
+++ b/libcxx/include/__cxx03/__configuration/platform.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___CONFIGURATION_PLATFORM_H
-#define _LIBCPP___CONFIGURATION_PLATFORM_H
+#ifndef _LIBCPP___CXX03___CONFIGURATION_PLATFORM_H
+#define _LIBCPP___CXX03___CONFIGURATION_PLATFORM_H
#include <__config_site>
@@ -51,4 +51,4 @@
# define _LIBCPP_BIG_ENDIAN
#endif // __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-#endif // _LIBCPP___CONFIGURATION_PLATFORM_H
+#endif // _LIBCPP___CXX03___CONFIGURATION_PLATFORM_H
diff --git a/libcxx/include/__cxx03/__coroutine/coroutine_handle.h b/libcxx/include/__cxx03/__coroutine/coroutine_handle.h
index 183d113e2e69b5..f96c56bae168b5 100644
--- a/libcxx/include/__cxx03/__coroutine/coroutine_handle.h
+++ b/libcxx/include/__cxx03/__coroutine/coroutine_handle.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___COROUTINE_COROUTINE_HANDLE_H
-#define _LIBCPP___COROUTINE_COROUTINE_HANDLE_H
+#ifndef _LIBCPP___CXX03___COROUTINE_COROUTINE_HANDLE_H
+#define _LIBCPP___CXX03___COROUTINE_COROUTINE_HANDLE_H
#include <__cxx03/__assert>
#include <__cxx03/__config>
@@ -173,4 +173,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // __LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___COROUTINE_COROUTINE_HANDLE_H
+#endif // _LIBCPP___CXX03___COROUTINE_COROUTINE_HANDLE_H
diff --git a/libcxx/include/__cxx03/__coroutine/coroutine_traits.h b/libcxx/include/__cxx03/__coroutine/coroutine_traits.h
index b4fc2f45a1ac40..2380b7a2339100 100644
--- a/libcxx/include/__cxx03/__coroutine/coroutine_traits.h
+++ b/libcxx/include/__cxx03/__coroutine/coroutine_traits.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___COROUTINE_COROUTINE_TRAITS_H
-#define _LIBCPP___COROUTINE_COROUTINE_TRAITS_H
+#ifndef _LIBCPP___CXX03___COROUTINE_COROUTINE_TRAITS_H
+#define _LIBCPP___CXX03___COROUTINE_COROUTINE_TRAITS_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/void_t.h>
@@ -45,4 +45,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // __LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___COROUTINE_COROUTINE_TRAITS_H
+#endif // _LIBCPP___CXX03___COROUTINE_COROUTINE_TRAITS_H
diff --git a/libcxx/include/__cxx03/__coroutine/noop_coroutine_handle.h b/libcxx/include/__cxx03/__coroutine/noop_coroutine_handle.h
index 2a6e25cde2f68d..c6ec745dbc2fc9 100644
--- a/libcxx/include/__cxx03/__coroutine/noop_coroutine_handle.h
+++ b/libcxx/include/__cxx03/__coroutine/noop_coroutine_handle.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___COROUTINE_NOOP_COROUTINE_HANDLE_H
-#define _LIBCPP___COROUTINE_NOOP_COROUTINE_HANDLE_H
+#ifndef _LIBCPP___CXX03___COROUTINE_NOOP_COROUTINE_HANDLE_H
+#define _LIBCPP___CXX03___COROUTINE_NOOP_COROUTINE_HANDLE_H
#include <__cxx03/__config>
#include <__cxx03/__coroutine/coroutine_handle.h>
@@ -96,4 +96,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // __LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___COROUTINE_NOOP_COROUTINE_HANDLE_H
+#endif // _LIBCPP___CXX03___COROUTINE_NOOP_COROUTINE_HANDLE_H
diff --git a/libcxx/include/__cxx03/__coroutine/trivial_awaitables.h b/libcxx/include/__cxx03/__coroutine/trivial_awaitables.h
index 9420824b6cefc7..7e34aad9cfce81 100644
--- a/libcxx/include/__cxx03/__coroutine/trivial_awaitables.h
+++ b/libcxx/include/__cxx03/__coroutine/trivial_awaitables.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef __LIBCPP___COROUTINE_TRIVIAL_AWAITABLES_H
-#define __LIBCPP___COROUTINE_TRIVIAL_AWAITABLES_H
+#ifndef __LIBCPP___CXX03___COROUTINE_TRIVIAL_AWAITABLES_H
+#define __LIBCPP___CXX03___COROUTINE_TRIVIAL_AWAITABLES_H
#include <__cxx03/__config>
#include <__cxx03/__coroutine/coroutine_handle.h>
@@ -37,4 +37,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // __LIBCPP_STD_VER >= 20
-#endif // __LIBCPP___COROUTINE_TRIVIAL_AWAITABLES_H
+#endif // __LIBCPP___CXX03___COROUTINE_TRIVIAL_AWAITABLES_H
diff --git a/libcxx/include/__cxx03/__debug_utils/randomize_range.h b/libcxx/include/__cxx03/__debug_utils/randomize_range.h
index 59e3a04f6d1ada..1baf4f5361ffd0 100644
--- a/libcxx/include/__cxx03/__debug_utils/randomize_range.h
+++ b/libcxx/include/__cxx03/__debug_utils/randomize_range.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___LIBCXX_DEBUG_RANDOMIZE_RANGE_H
-#define _LIBCPP___LIBCXX_DEBUG_RANDOMIZE_RANGE_H
+#ifndef _LIBCPP___CXX03___LIBCXX_DEBUG_RANDOMIZE_RANGE_H
+#define _LIBCPP___CXX03___LIBCXX_DEBUG_RANDOMIZE_RANGE_H
#include <__cxx03/__config>
@@ -39,4 +39,4 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 void __debug_randomize_range
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___LIBCXX_DEBUG_RANDOMIZE_RANGE_H
+#endif // _LIBCPP___CXX03___LIBCXX_DEBUG_RANDOMIZE_RANGE_H
diff --git a/libcxx/include/__cxx03/__debug_utils/sanitizers.h b/libcxx/include/__cxx03/__debug_utils/sanitizers.h
index cd0caa9ed0a3ff..e3cda20468b537 100644
--- a/libcxx/include/__cxx03/__debug_utils/sanitizers.h
+++ b/libcxx/include/__cxx03/__debug_utils/sanitizers.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___LIBCXX_DEBUG_UTILS_SANITIZERS_H
-#define _LIBCPP___LIBCXX_DEBUG_UTILS_SANITIZERS_H
+#ifndef _LIBCPP___CXX03___LIBCXX_DEBUG_UTILS_SANITIZERS_H
+#define _LIBCPP___CXX03___LIBCXX_DEBUG_UTILS_SANITIZERS_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -101,4 +101,4 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 void __annotate_contiguous_c
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___LIBCXX_DEBUG_UTILS_SANITIZERS_H
+#endif // _LIBCPP___CXX03___LIBCXX_DEBUG_UTILS_SANITIZERS_H
diff --git a/libcxx/include/__cxx03/__debug_utils/strict_weak_ordering_check.h b/libcxx/include/__cxx03/__debug_utils/strict_weak_ordering_check.h
index 6aec78e46ff899..8d3a918d9b5578 100644
--- a/libcxx/include/__cxx03/__debug_utils/strict_weak_ordering_check.h
+++ b/libcxx/include/__cxx03/__debug_utils/strict_weak_ordering_check.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___LIBCXX_DEBUG_STRICT_WEAK_ORDERING_CHECK
-#define _LIBCPP___LIBCXX_DEBUG_STRICT_WEAK_ORDERING_CHECK
+#ifndef _LIBCPP___CXX03___LIBCXX_DEBUG_STRICT_WEAK_ORDERING_CHECK
+#define _LIBCPP___CXX03___LIBCXX_DEBUG_STRICT_WEAK_ORDERING_CHECK
#include <__cxx03/__config>
@@ -74,4 +74,4 @@ __check_strict_weak_ordering_sorted(_RandomAccessIterator __first, _RandomAccess
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___LIBCXX_DEBUG_STRICT_WEAK_ORDERING_CHECK
+#endif // _LIBCPP___CXX03___LIBCXX_DEBUG_STRICT_WEAK_ORDERING_CHECK
diff --git a/libcxx/include/__cxx03/__exception/exception.h b/libcxx/include/__cxx03/__exception/exception.h
index 8557cbd4945e46..27b1e4353ec468 100644
--- a/libcxx/include/__cxx03/__exception/exception.h
+++ b/libcxx/include/__cxx03/__exception/exception.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___EXCEPTION_EXCEPTION_H
-#define _LIBCPP___EXCEPTION_EXCEPTION_H
+#ifndef _LIBCPP___CXX03___EXCEPTION_EXCEPTION_H
+#define _LIBCPP___CXX03___EXCEPTION_EXCEPTION_H
#include <__cxx03/__config>
@@ -91,4 +91,4 @@ class _LIBCPP_EXPORTED_FROM_ABI bad_exception : public exception {
} // namespace std
-#endif // _LIBCPP___EXCEPTION_EXCEPTION_H
+#endif // _LIBCPP___CXX03___EXCEPTION_EXCEPTION_H
diff --git a/libcxx/include/__cxx03/__exception/exception_ptr.h b/libcxx/include/__cxx03/__exception/exception_ptr.h
index 6bdb47fd395f02..33dbd40bef42c9 100644
--- a/libcxx/include/__cxx03/__exception/exception_ptr.h
+++ b/libcxx/include/__cxx03/__exception/exception_ptr.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___EXCEPTION_EXCEPTION_PTR_H
-#define _LIBCPP___EXCEPTION_EXCEPTION_PTR_H
+#ifndef _LIBCPP___CXX03___EXCEPTION_EXCEPTION_PTR_H
+#define _LIBCPP___CXX03___EXCEPTION_EXCEPTION_PTR_H
#include <__cxx03/__config>
#include <__cxx03/__exception/operations.h>
@@ -174,4 +174,4 @@ _LIBCPP_HIDE_FROM_ABI exception_ptr make_exception_ptr(_Ep __e) _NOEXCEPT {
#endif // _LIBCPP_ABI_MICROSOFT
} // namespace std
-#endif // _LIBCPP___EXCEPTION_EXCEPTION_PTR_H
+#endif // _LIBCPP___CXX03___EXCEPTION_EXCEPTION_PTR_H
diff --git a/libcxx/include/__cxx03/__exception/nested_exception.h b/libcxx/include/__cxx03/__exception/nested_exception.h
index 1b889e6bf5d877..60799942fb1362 100644
--- a/libcxx/include/__cxx03/__exception/nested_exception.h
+++ b/libcxx/include/__cxx03/__exception/nested_exception.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___EXCEPTION_NESTED_EXCEPTION_H
-#define _LIBCPP___EXCEPTION_NESTED_EXCEPTION_H
+#ifndef _LIBCPP___CXX03___EXCEPTION_NESTED_EXCEPTION_H
+#define _LIBCPP___CXX03___EXCEPTION_NESTED_EXCEPTION_H
#include <__cxx03/__config>
#include <__cxx03/__exception/exception_ptr.h>
@@ -96,4 +96,4 @@ inline _LIBCPP_HIDE_FROM_ABI void rethrow_if_nested(const _Ep&) {}
} // namespace std
-#endif // _LIBCPP___EXCEPTION_NESTED_EXCEPTION_H
+#endif // _LIBCPP___CXX03___EXCEPTION_NESTED_EXCEPTION_H
diff --git a/libcxx/include/__cxx03/__exception/operations.h b/libcxx/include/__cxx03/__exception/operations.h
index cb67194553d375..9049a0f313fae7 100644
--- a/libcxx/include/__cxx03/__exception/operations.h
+++ b/libcxx/include/__cxx03/__exception/operations.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___EXCEPTION_OPERATIONS_H
-#define _LIBCPP___EXCEPTION_OPERATIONS_H
+#ifndef _LIBCPP___CXX03___EXCEPTION_OPERATIONS_H
+#define _LIBCPP___CXX03___EXCEPTION_OPERATIONS_H
#include <__cxx03/__config>
#include <__cxx03/cstddef>
@@ -38,4 +38,4 @@ _LIBCPP_EXPORTED_FROM_ABI exception_ptr current_exception() _NOEXCEPT;
_LIBCPP_NORETURN _LIBCPP_EXPORTED_FROM_ABI void rethrow_exception(exception_ptr);
} // namespace std
-#endif // _LIBCPP___EXCEPTION_OPERATIONS_H
+#endif // _LIBCPP___CXX03___EXCEPTION_OPERATIONS_H
diff --git a/libcxx/include/__cxx03/__exception/terminate.h b/libcxx/include/__cxx03/__exception/terminate.h
index 78ccd16c91393a..5f0cfa930f9afe 100644
--- a/libcxx/include/__cxx03/__exception/terminate.h
+++ b/libcxx/include/__cxx03/__exception/terminate.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___EXCEPTION_TERMINATE_H
-#define _LIBCPP___EXCEPTION_TERMINATE_H
+#ifndef _LIBCPP___CXX03___EXCEPTION_TERMINATE_H
+#define _LIBCPP___CXX03___EXCEPTION_TERMINATE_H
#include <__cxx03/__config>
@@ -19,4 +19,4 @@ namespace std { // purposefully not using versioning namespace
_LIBCPP_NORETURN _LIBCPP_EXPORTED_FROM_ABI void terminate() _NOEXCEPT;
} // namespace std
-#endif // _LIBCPP___EXCEPTION_TERMINATE_H
+#endif // _LIBCPP___CXX03___EXCEPTION_TERMINATE_H
diff --git a/libcxx/include/__cxx03/__expected/bad_expected_access.h b/libcxx/include/__cxx03/__expected/bad_expected_access.h
index 4f7e33d2c69867..d9c64976c25b92 100644
--- a/libcxx/include/__cxx03/__expected/bad_expected_access.h
+++ b/libcxx/include/__cxx03/__expected/bad_expected_access.h
@@ -6,8 +6,8 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___EXPECTED_BAD_EXPECTED_ACCESS_H
-#define _LIBCPP___EXPECTED_BAD_EXPECTED_ACCESS_H
+#ifndef _LIBCPP___CXX03___EXPECTED_BAD_EXPECTED_ACCESS_H
+#define _LIBCPP___CXX03___EXPECTED_BAD_EXPECTED_ACCESS_H
#include <__cxx03/__config>
#include <__cxx03/__exception/exception.h>
@@ -70,4 +70,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___EXPECTED_BAD_EXPECTED_ACCESS_H
+#endif // _LIBCPP___CXX03___EXPECTED_BAD_EXPECTED_ACCESS_H
diff --git a/libcxx/include/__cxx03/__expected/expected.h b/libcxx/include/__cxx03/__expected/expected.h
index adadea8e4b39c4..1d54bb9f6edeba 100644
--- a/libcxx/include/__cxx03/__expected/expected.h
+++ b/libcxx/include/__cxx03/__expected/expected.h
@@ -6,8 +6,8 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___EXPECTED_EXPECTED_H
-#define _LIBCPP___EXPECTED_EXPECTED_H
+#ifndef _LIBCPP___CXX03___EXPECTED_EXPECTED_H
+#define _LIBCPP___CXX03___EXPECTED_EXPECTED_H
#include <__cxx03/__assert>
#include <__cxx03/__config>
@@ -1871,4 +1871,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___EXPECTED_EXPECTED_H
+#endif // _LIBCPP___CXX03___EXPECTED_EXPECTED_H
diff --git a/libcxx/include/__cxx03/__expected/unexpect.h b/libcxx/include/__cxx03/__expected/unexpect.h
index 895f053a1e3331..d8de027cabc5b0 100644
--- a/libcxx/include/__cxx03/__expected/unexpect.h
+++ b/libcxx/include/__cxx03/__expected/unexpect.h
@@ -6,8 +6,8 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___EXPECTED_UNEXPECT_H
-#define _LIBCPP___EXPECTED_UNEXPECT_H
+#ifndef _LIBCPP___CXX03___EXPECTED_UNEXPECT_H
+#define _LIBCPP___CXX03___EXPECTED_UNEXPECT_H
#include <__cxx03/__config>
@@ -29,4 +29,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 23
-#endif // _LIBCPP___EXPECTED_UNEXPECT_H
+#endif // _LIBCPP___CXX03___EXPECTED_UNEXPECT_H
diff --git a/libcxx/include/__cxx03/__expected/unexpected.h b/libcxx/include/__cxx03/__expected/unexpected.h
index fe2ab407b41515..bafa33a011eeae 100644
--- a/libcxx/include/__cxx03/__expected/unexpected.h
+++ b/libcxx/include/__cxx03/__expected/unexpected.h
@@ -6,8 +6,8 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___EXPECTED_UNEXPECTED_H
-#define _LIBCPP___EXPECTED_UNEXPECTED_H
+#ifndef _LIBCPP___CXX03___EXPECTED_UNEXPECTED_H
+#define _LIBCPP___CXX03___EXPECTED_UNEXPECTED_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/conjunction.h>
@@ -124,4 +124,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___EXPECTED_UNEXPECTED_H
+#endif // _LIBCPP___CXX03___EXPECTED_UNEXPECTED_H
diff --git a/libcxx/include/__cxx03/__filesystem/copy_options.h b/libcxx/include/__cxx03/__filesystem/copy_options.h
index c9adf3cd64eb44..01abb5042b7e43 100644
--- a/libcxx/include/__cxx03/__filesystem/copy_options.h
+++ b/libcxx/include/__cxx03/__filesystem/copy_options.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FILESYSTEM_COPY_OPTIONS_H
-#define _LIBCPP___FILESYSTEM_COPY_OPTIONS_H
+#ifndef _LIBCPP___CXX03___FILESYSTEM_COPY_OPTIONS_H
+#define _LIBCPP___CXX03___FILESYSTEM_COPY_OPTIONS_H
#include <__cxx03/__config>
@@ -66,4 +66,4 @@ _LIBCPP_END_NAMESPACE_FILESYSTEM
#endif // _LIBCPP_STD_VER >= 17
-#endif // _LIBCPP___FILESYSTEM_COPY_OPTIONS_H
+#endif // _LIBCPP___CXX03___FILESYSTEM_COPY_OPTIONS_H
diff --git a/libcxx/include/__cxx03/__filesystem/directory_entry.h b/libcxx/include/__cxx03/__filesystem/directory_entry.h
index a78f43d6b1c5c2..1a8ebf470bf89b 100644
--- a/libcxx/include/__cxx03/__filesystem/directory_entry.h
+++ b/libcxx/include/__cxx03/__filesystem/directory_entry.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FILESYSTEM_DIRECTORY_ENTRY_H
-#define _LIBCPP___FILESYSTEM_DIRECTORY_ENTRY_H
+#ifndef _LIBCPP___CXX03___FILESYSTEM_DIRECTORY_ENTRY_H
+#define _LIBCPP___CXX03___FILESYSTEM_DIRECTORY_ENTRY_H
#include <__cxx03/__chrono/time_point.h>
#include <__cxx03/__compare/ordering.h>
@@ -432,4 +432,4 @@ _LIBCPP_END_NAMESPACE_FILESYSTEM
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___FILESYSTEM_DIRECTORY_ENTRY_H
+#endif // _LIBCPP___CXX03___FILESYSTEM_DIRECTORY_ENTRY_H
diff --git a/libcxx/include/__cxx03/__filesystem/directory_iterator.h b/libcxx/include/__cxx03/__filesystem/directory_iterator.h
index 667007f5c2cdf7..226ef7a27f9427 100644
--- a/libcxx/include/__cxx03/__filesystem/directory_iterator.h
+++ b/libcxx/include/__cxx03/__filesystem/directory_iterator.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FILESYSTEM_DIRECTORY_ITERATOR_H
-#define _LIBCPP___FILESYSTEM_DIRECTORY_ITERATOR_H
+#ifndef _LIBCPP___CXX03___FILESYSTEM_DIRECTORY_ITERATOR_H
+#define _LIBCPP___CXX03___FILESYSTEM_DIRECTORY_ITERATOR_H
#include <__cxx03/__assert>
#include <__cxx03/__config>
@@ -148,4 +148,4 @@ _LIBCPP_AVAILABILITY_FILESYSTEM_LIBRARY inline constexpr bool
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___FILESYSTEM_DIRECTORY_ITERATOR_H
+#endif // _LIBCPP___CXX03___FILESYSTEM_DIRECTORY_ITERATOR_H
diff --git a/libcxx/include/__cxx03/__filesystem/directory_options.h b/libcxx/include/__cxx03/__filesystem/directory_options.h
index eeb87936f2bd1c..babdf9c911beea 100644
--- a/libcxx/include/__cxx03/__filesystem/directory_options.h
+++ b/libcxx/include/__cxx03/__filesystem/directory_options.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FILESYSTEM_DIRECTORY_OPTIONS_H
-#define _LIBCPP___FILESYSTEM_DIRECTORY_OPTIONS_H
+#ifndef _LIBCPP___CXX03___FILESYSTEM_DIRECTORY_OPTIONS_H
+#define _LIBCPP___CXX03___FILESYSTEM_DIRECTORY_OPTIONS_H
#include <__cxx03/__config>
@@ -54,4 +54,4 @@ _LIBCPP_END_NAMESPACE_FILESYSTEM
#endif // _LIBCPP_STD_VER >= 17
-#endif // _LIBCPP___FILESYSTEM_DIRECTORY_OPTIONS_H
+#endif // _LIBCPP___CXX03___FILESYSTEM_DIRECTORY_OPTIONS_H
diff --git a/libcxx/include/__cxx03/__filesystem/file_status.h b/libcxx/include/__cxx03/__filesystem/file_status.h
index 0022518842af74..1e5ea497434d90 100644
--- a/libcxx/include/__cxx03/__filesystem/file_status.h
+++ b/libcxx/include/__cxx03/__filesystem/file_status.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FILESYSTEM_FILE_STATUS_H
-#define _LIBCPP___FILESYSTEM_FILE_STATUS_H
+#ifndef _LIBCPP___CXX03___FILESYSTEM_FILE_STATUS_H
+#define _LIBCPP___CXX03___FILESYSTEM_FILE_STATUS_H
#include <__cxx03/__config>
#include <__cxx03/__filesystem/file_type.h>
@@ -64,4 +64,4 @@ _LIBCPP_END_NAMESPACE_FILESYSTEM
#endif // _LIBCPP_STD_VER >= 17
-#endif // _LIBCPP___FILESYSTEM_FILE_STATUS_H
+#endif // _LIBCPP___CXX03___FILESYSTEM_FILE_STATUS_H
diff --git a/libcxx/include/__cxx03/__filesystem/file_time_type.h b/libcxx/include/__cxx03/__filesystem/file_time_type.h
index 1e964bbe32522d..cd52453b0b8794 100644
--- a/libcxx/include/__cxx03/__filesystem/file_time_type.h
+++ b/libcxx/include/__cxx03/__filesystem/file_time_type.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FILESYSTEM_FILE_TIME_TYPE_H
-#define _LIBCPP___FILESYSTEM_FILE_TIME_TYPE_H
+#ifndef _LIBCPP___CXX03___FILESYSTEM_FILE_TIME_TYPE_H
+#define _LIBCPP___CXX03___FILESYSTEM_FILE_TIME_TYPE_H
#include <__cxx03/__chrono/file_clock.h>
#include <__cxx03/__chrono/time_point.h>
@@ -28,4 +28,4 @@ _LIBCPP_END_NAMESPACE_FILESYSTEM
#endif // _LIBCPP_STD_VER >= 17
-#endif // _LIBCPP___FILESYSTEM_FILE_TIME_TYPE_H
+#endif // _LIBCPP___CXX03___FILESYSTEM_FILE_TIME_TYPE_H
diff --git a/libcxx/include/__cxx03/__filesystem/file_type.h b/libcxx/include/__cxx03/__filesystem/file_type.h
index 392ca2b57c26b5..34f0aba3071285 100644
--- a/libcxx/include/__cxx03/__filesystem/file_type.h
+++ b/libcxx/include/__cxx03/__filesystem/file_type.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FILESYSTEM_FILE_TYPE_H
-#define _LIBCPP___FILESYSTEM_FILE_TYPE_H
+#ifndef _LIBCPP___CXX03___FILESYSTEM_FILE_TYPE_H
+#define _LIBCPP___CXX03___FILESYSTEM_FILE_TYPE_H
#include <__cxx03/__config>
@@ -39,4 +39,4 @@ _LIBCPP_END_NAMESPACE_FILESYSTEM
#endif // _LIBCPP_STD_VER >= 17
-#endif // _LIBCPP___FILESYSTEM_FILE_TYPE_H
+#endif // _LIBCPP___CXX03___FILESYSTEM_FILE_TYPE_H
diff --git a/libcxx/include/__cxx03/__filesystem/filesystem_error.h b/libcxx/include/__cxx03/__filesystem/filesystem_error.h
index 8b68bac2e36fac..ef9e0d78464363 100644
--- a/libcxx/include/__cxx03/__filesystem/filesystem_error.h
+++ b/libcxx/include/__cxx03/__filesystem/filesystem_error.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FILESYSTEM_FILESYSTEM_ERROR_H
-#define _LIBCPP___FILESYSTEM_FILESYSTEM_ERROR_H
+#ifndef _LIBCPP___CXX03___FILESYSTEM_FILESYSTEM_ERROR_H
+#define _LIBCPP___CXX03___FILESYSTEM_FILESYSTEM_ERROR_H
#include <__cxx03/__config>
#include <__cxx03/__filesystem/path.h>
@@ -85,4 +85,4 @@ _LIBCPP_END_NAMESPACE_FILESYSTEM
#endif // _LIBCPP_STD_VER >= 17
-#endif // _LIBCPP___FILESYSTEM_FILESYSTEM_ERROR_H
+#endif // _LIBCPP___CXX03___FILESYSTEM_FILESYSTEM_ERROR_H
diff --git a/libcxx/include/__cxx03/__filesystem/operations.h b/libcxx/include/__cxx03/__filesystem/operations.h
index 90b90bbaace93b..fdb3dab858f503 100644
--- a/libcxx/include/__cxx03/__filesystem/operations.h
+++ b/libcxx/include/__cxx03/__filesystem/operations.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FILESYSTEM_OPERATIONS_H
-#define _LIBCPP___FILESYSTEM_OPERATIONS_H
+#ifndef _LIBCPP___CXX03___FILESYSTEM_OPERATIONS_H
+#define _LIBCPP___CXX03___FILESYSTEM_OPERATIONS_H
#include <__cxx03/__chrono/time_point.h>
#include <__cxx03/__config>
@@ -307,4 +307,4 @@ _LIBCPP_END_NAMESPACE_FILESYSTEM
#endif // _LIBCPP_STD_VER >= 17 && !defined(_LIBCPP_HAS_NO_FILESYSTEM)
-#endif // _LIBCPP___FILESYSTEM_OPERATIONS_H
+#endif // _LIBCPP___CXX03___FILESYSTEM_OPERATIONS_H
diff --git a/libcxx/include/__cxx03/__filesystem/path.h b/libcxx/include/__cxx03/__filesystem/path.h
index 815d881d8a0990..e5eed68e4d6c4e 100644
--- a/libcxx/include/__cxx03/__filesystem/path.h
+++ b/libcxx/include/__cxx03/__filesystem/path.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FILESYSTEM_PATH_H
-#define _LIBCPP___FILESYSTEM_PATH_H
+#ifndef _LIBCPP___CXX03___FILESYSTEM_PATH_H
+#define _LIBCPP___CXX03___FILESYSTEM_PATH_H
#include <__cxx03/__algorithm/replace.h>
#include <__cxx03/__algorithm/replace_copy.h>
@@ -928,4 +928,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___FILESYSTEM_PATH_H
+#endif // _LIBCPP___CXX03___FILESYSTEM_PATH_H
diff --git a/libcxx/include/__cxx03/__filesystem/path_iterator.h b/libcxx/include/__cxx03/__filesystem/path_iterator.h
index c439782a2a6afc..121626b4b6ca09 100644
--- a/libcxx/include/__cxx03/__filesystem/path_iterator.h
+++ b/libcxx/include/__cxx03/__filesystem/path_iterator.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FILESYSTEM_PATH_ITERATOR_H
-#define _LIBCPP___FILESYSTEM_PATH_ITERATOR_H
+#ifndef _LIBCPP___CXX03___FILESYSTEM_PATH_ITERATOR_H
+#define _LIBCPP___CXX03___FILESYSTEM_PATH_ITERATOR_H
#include <__cxx03/__assert>
#include <__cxx03/__config>
@@ -112,4 +112,4 @@ _LIBCPP_END_NAMESPACE_FILESYSTEM
#endif // _LIBCPP_STD_VER >= 17
-#endif // _LIBCPP___FILESYSTEM_PATH_ITERATOR_H
+#endif // _LIBCPP___CXX03___FILESYSTEM_PATH_ITERATOR_H
diff --git a/libcxx/include/__cxx03/__filesystem/perm_options.h b/libcxx/include/__cxx03/__filesystem/perm_options.h
index bfd7941cf10031..bebb3038bf6eb6 100644
--- a/libcxx/include/__cxx03/__filesystem/perm_options.h
+++ b/libcxx/include/__cxx03/__filesystem/perm_options.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FILESYSTEM_PERM_OPTIONS_H
-#define _LIBCPP___FILESYSTEM_PERM_OPTIONS_H
+#ifndef _LIBCPP___CXX03___FILESYSTEM_PERM_OPTIONS_H
+#define _LIBCPP___CXX03___FILESYSTEM_PERM_OPTIONS_H
#include <__cxx03/__config>
@@ -54,4 +54,4 @@ _LIBCPP_END_NAMESPACE_FILESYSTEM
#endif // _LIBCPP_STD_VER >= 17
-#endif // _LIBCPP___FILESYSTEM_PERM_OPTIONS_H
+#endif // _LIBCPP___CXX03___FILESYSTEM_PERM_OPTIONS_H
diff --git a/libcxx/include/__cxx03/__filesystem/perms.h b/libcxx/include/__cxx03/__filesystem/perms.h
index d14023730938c8..139352c3a8f890 100644
--- a/libcxx/include/__cxx03/__filesystem/perms.h
+++ b/libcxx/include/__cxx03/__filesystem/perms.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FILESYSTEM_PERMS_H
-#define _LIBCPP___FILESYSTEM_PERMS_H
+#ifndef _LIBCPP___CXX03___FILESYSTEM_PERMS_H
+#define _LIBCPP___CXX03___FILESYSTEM_PERMS_H
#include <__cxx03/__config>
@@ -77,4 +77,4 @@ _LIBCPP_END_NAMESPACE_FILESYSTEM
#endif // _LIBCPP_STD_VER >= 17
-#endif // _LIBCPP___FILESYSTEM_PERMS_H
+#endif // _LIBCPP___CXX03___FILESYSTEM_PERMS_H
diff --git a/libcxx/include/__cxx03/__filesystem/recursive_directory_iterator.h b/libcxx/include/__cxx03/__filesystem/recursive_directory_iterator.h
index 43da731cc5b9ce..a459bd3db4bb21 100644
--- a/libcxx/include/__cxx03/__filesystem/recursive_directory_iterator.h
+++ b/libcxx/include/__cxx03/__filesystem/recursive_directory_iterator.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FILESYSTEM_RECURSIVE_DIRECTORY_ITERATOR_H
-#define _LIBCPP___FILESYSTEM_RECURSIVE_DIRECTORY_ITERATOR_H
+#ifndef _LIBCPP___CXX03___FILESYSTEM_RECURSIVE_DIRECTORY_ITERATOR_H
+#define _LIBCPP___CXX03___FILESYSTEM_RECURSIVE_DIRECTORY_ITERATOR_H
#include <__cxx03/__config>
#include <__cxx03/__filesystem/directory_entry.h>
@@ -161,4 +161,4 @@ _LIBCPP_AVAILABILITY_FILESYSTEM_LIBRARY inline constexpr bool
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___FILESYSTEM_RECURSIVE_DIRECTORY_ITERATOR_H
+#endif // _LIBCPP___CXX03___FILESYSTEM_RECURSIVE_DIRECTORY_ITERATOR_H
diff --git a/libcxx/include/__cxx03/__filesystem/space_info.h b/libcxx/include/__cxx03/__filesystem/space_info.h
index 8e2f260249793a..0a998f87329a84 100644
--- a/libcxx/include/__cxx03/__filesystem/space_info.h
+++ b/libcxx/include/__cxx03/__filesystem/space_info.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FILESYSTEM_SPACE_INFO_H
-#define _LIBCPP___FILESYSTEM_SPACE_INFO_H
+#ifndef _LIBCPP___CXX03___FILESYSTEM_SPACE_INFO_H
+#define _LIBCPP___CXX03___FILESYSTEM_SPACE_INFO_H
#include <__cxx03/__config>
#include <__cxx03/cstdint>
@@ -35,4 +35,4 @@ _LIBCPP_END_NAMESPACE_FILESYSTEM
#endif // _LIBCPP_STD_VER >= 17
-#endif // _LIBCPP___FILESYSTEM_SPACE_INFO_H
+#endif // _LIBCPP___CXX03___FILESYSTEM_SPACE_INFO_H
diff --git a/libcxx/include/__cxx03/__filesystem/u8path.h b/libcxx/include/__cxx03/__filesystem/u8path.h
index 7f1fe89bf25225..f60ef6a83f5cc1 100644
--- a/libcxx/include/__cxx03/__filesystem/u8path.h
+++ b/libcxx/include/__cxx03/__filesystem/u8path.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FILESYSTEM_U8PATH_H
-#define _LIBCPP___FILESYSTEM_U8PATH_H
+#ifndef _LIBCPP___CXX03___FILESYSTEM_U8PATH_H
+#define _LIBCPP___CXX03___FILESYSTEM_U8PATH_H
#include <__cxx03/__algorithm/unwrap_iter.h>
#include <__cxx03/__config>
@@ -97,4 +97,4 @@ _LIBCPP_END_NAMESPACE_FILESYSTEM
#endif // _LIBCPP_STD_VER >= 17
-#endif // _LIBCPP___FILESYSTEM_U8PATH_H
+#endif // _LIBCPP___CXX03___FILESYSTEM_U8PATH_H
diff --git a/libcxx/include/__cxx03/__format/buffer.h b/libcxx/include/__cxx03/__format/buffer.h
index d4162086b84f4b..167b06d7fd2260 100644
--- a/libcxx/include/__cxx03/__format/buffer.h
+++ b/libcxx/include/__cxx03/__format/buffer.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_BUFFER_H
-#define _LIBCPP___FORMAT_BUFFER_H
+#ifndef _LIBCPP___CXX03___FORMAT_BUFFER_H
+#define _LIBCPP___CXX03___FORMAT_BUFFER_H
#include <__cxx03/__algorithm/copy_n.h>
#include <__cxx03/__algorithm/fill_n.h>
@@ -652,4 +652,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___FORMAT_BUFFER_H
+#endif // _LIBCPP___CXX03___FORMAT_BUFFER_H
diff --git a/libcxx/include/__cxx03/__format/concepts.h b/libcxx/include/__cxx03/__format/concepts.h
index ffe937e207ffed..90fcb7ed0b8f60 100644
--- a/libcxx/include/__cxx03/__format/concepts.h
+++ b/libcxx/include/__cxx03/__format/concepts.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_CONCEPTS_H
-#define _LIBCPP___FORMAT_CONCEPTS_H
+#ifndef _LIBCPP___CXX03___FORMAT_CONCEPTS_H
+#define _LIBCPP___CXX03___FORMAT_CONCEPTS_H
#include <__cxx03/__concepts/same_as.h>
#include <__cxx03/__concepts/semiregular.h>
@@ -80,4 +80,4 @@ concept __fmt_pair_like =
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FORMAT_CONCEPTS_H
+#endif // _LIBCPP___CXX03___FORMAT_CONCEPTS_H
diff --git a/libcxx/include/__cxx03/__format/container_adaptor.h b/libcxx/include/__cxx03/__format/container_adaptor.h
index 5d47677d8d5378..42c0d14be61a8e 100644
--- a/libcxx/include/__cxx03/__format/container_adaptor.h
+++ b/libcxx/include/__cxx03/__format/container_adaptor.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_CONTAINER_ADAPTOR_H
-#define _LIBCPP___FORMAT_CONTAINER_ADAPTOR_H
+#ifndef _LIBCPP___CXX03___FORMAT_CONTAINER_ADAPTOR_H
+#define _LIBCPP___CXX03___FORMAT_CONTAINER_ADAPTOR_H
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
@@ -70,4 +70,4 @@ struct _LIBCPP_TEMPLATE_VIS formatter<stack<_Tp, _Container>, _CharT>
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FORMAT_CONTAINER_ADAPTOR_H
+#endif // _LIBCPP___CXX03___FORMAT_CONTAINER_ADAPTOR_H
diff --git a/libcxx/include/__cxx03/__format/enable_insertable.h b/libcxx/include/__cxx03/__format/enable_insertable.h
index 8bcae600a54ea5..d52ca8cfd442cf 100644
--- a/libcxx/include/__cxx03/__format/enable_insertable.h
+++ b/libcxx/include/__cxx03/__format/enable_insertable.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_ENABLE_INSERTABLE_H
-#define _LIBCPP___FORMAT_ENABLE_INSERTABLE_H
+#ifndef _LIBCPP___CXX03___FORMAT_ENABLE_INSERTABLE_H
+#define _LIBCPP___CXX03___FORMAT_ENABLE_INSERTABLE_H
#include <__cxx03/__config>
@@ -32,4 +32,4 @@ inline constexpr bool __enable_insertable = false;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FORMAT_ENABLE_INSERTABLE_H
+#endif // _LIBCPP___CXX03___FORMAT_ENABLE_INSERTABLE_H
diff --git a/libcxx/include/__cxx03/__format/escaped_output_table.h b/libcxx/include/__cxx03/__format/escaped_output_table.h
index 0039968566f882..c5142849865ba9 100644
--- a/libcxx/include/__cxx03/__format/escaped_output_table.h
+++ b/libcxx/include/__cxx03/__format/escaped_output_table.h
@@ -58,8 +58,8 @@
// use or other dealings in these Data Files or Software without prior
// written authorization of the copyright holder.
-#ifndef _LIBCPP___FORMAT_ESCAPED_OUTPUT_TABLE_H
-#define _LIBCPP___FORMAT_ESCAPED_OUTPUT_TABLE_H
+#ifndef _LIBCPP___CXX03___FORMAT_ESCAPED_OUTPUT_TABLE_H
+#define _LIBCPP___CXX03___FORMAT_ESCAPED_OUTPUT_TABLE_H
#include <__cxx03/__algorithm/ranges_upper_bound.h>
#include <__cxx03/__config>
@@ -860,4 +860,4 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr uint32_t __entries[711] = {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FORMAT_ESCAPED_OUTPUT_TABLE_H
+#endif // _LIBCPP___CXX03___FORMAT_ESCAPED_OUTPUT_TABLE_H
diff --git a/libcxx/include/__cxx03/__format/extended_grapheme_cluster_table.h b/libcxx/include/__cxx03/__format/extended_grapheme_cluster_table.h
index d83838bbc83a75..c26b870d30378a 100644
--- a/libcxx/include/__cxx03/__format/extended_grapheme_cluster_table.h
+++ b/libcxx/include/__cxx03/__format/extended_grapheme_cluster_table.h
@@ -58,8 +58,8 @@
// use or other dealings in these Data Files or Software without prior
// written authorization of the copyright holder.
-#ifndef _LIBCPP___FORMAT_EXTENDED_GRAPHEME_CLUSTER_TABLE_H
-#define _LIBCPP___FORMAT_EXTENDED_GRAPHEME_CLUSTER_TABLE_H
+#ifndef _LIBCPP___CXX03___FORMAT_EXTENDED_GRAPHEME_CLUSTER_TABLE_H
+#define _LIBCPP___CXX03___FORMAT_EXTENDED_GRAPHEME_CLUSTER_TABLE_H
#include <__cxx03/__algorithm/ranges_upper_bound.h>
#include <__cxx03/__config>
@@ -1660,4 +1660,4 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr uint32_t __entries[1496] = {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FORMAT_EXTENDED_GRAPHEME_CLUSTER_TABLE_H
+#endif // _LIBCPP___CXX03___FORMAT_EXTENDED_GRAPHEME_CLUSTER_TABLE_H
diff --git a/libcxx/include/__cxx03/__format/format_arg.h b/libcxx/include/__cxx03/__format/format_arg.h
index 3d37555c0e2df5..cf9bf75e60df9b 100644
--- a/libcxx/include/__cxx03/__format/format_arg.h
+++ b/libcxx/include/__cxx03/__format/format_arg.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_FORMAT_ARG_H
-#define _LIBCPP___FORMAT_FORMAT_ARG_H
+#ifndef _LIBCPP___CXX03___FORMAT_FORMAT_ARG_H
+#define _LIBCPP___CXX03___FORMAT_FORMAT_ARG_H
#include <__cxx03/__assert>
#include <__cxx03/__concepts/arithmetic.h>
@@ -398,4 +398,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___FORMAT_FORMAT_ARG_H
+#endif // _LIBCPP___CXX03___FORMAT_FORMAT_ARG_H
diff --git a/libcxx/include/__cxx03/__format/format_arg_store.h b/libcxx/include/__cxx03/__format/format_arg_store.h
index 836a5a2ffc456e..1116b53edc20c4 100644
--- a/libcxx/include/__cxx03/__format/format_arg_store.h
+++ b/libcxx/include/__cxx03/__format/format_arg_store.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_FORMAT_ARG_STORE_H
-#define _LIBCPP___FORMAT_FORMAT_ARG_STORE_H
+#ifndef _LIBCPP___CXX03___FORMAT_FORMAT_ARG_STORE_H
+#define _LIBCPP___CXX03___FORMAT_FORMAT_ARG_STORE_H
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
@@ -263,4 +263,4 @@ struct _LIBCPP_TEMPLATE_VIS __format_arg_store {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FORMAT_FORMAT_ARG_STORE_H
+#endif // _LIBCPP___CXX03___FORMAT_FORMAT_ARG_STORE_H
diff --git a/libcxx/include/__cxx03/__format/format_args.h b/libcxx/include/__cxx03/__format/format_args.h
index 494ba91cf55aed..702b8763d31e58 100644
--- a/libcxx/include/__cxx03/__format/format_args.h
+++ b/libcxx/include/__cxx03/__format/format_args.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_FORMAT_ARGS_H
-#define _LIBCPP___FORMAT_FORMAT_ARGS_H
+#ifndef _LIBCPP___CXX03___FORMAT_FORMAT_ARGS_H
+#define _LIBCPP___CXX03___FORMAT_FORMAT_ARGS_H
#include <__cxx03/__config>
#include <__cxx03/__format/format_arg.h>
@@ -75,4 +75,4 @@ basic_format_args(__format_arg_store<_Context, _Args...>) -> basic_format_args<_
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FORMAT_FORMAT_ARGS_H
+#endif // _LIBCPP___CXX03___FORMAT_FORMAT_ARGS_H
diff --git a/libcxx/include/__cxx03/__format/format_context.h b/libcxx/include/__cxx03/__format/format_context.h
index 04f2d69a247dbc..7f1011581133b9 100644
--- a/libcxx/include/__cxx03/__format/format_context.h
+++ b/libcxx/include/__cxx03/__format/format_context.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_FORMAT_CONTEXT_H
-#define _LIBCPP___FORMAT_FORMAT_CONTEXT_H
+#ifndef _LIBCPP___CXX03___FORMAT_FORMAT_CONTEXT_H
+#define _LIBCPP___CXX03___FORMAT_FORMAT_CONTEXT_H
#include <__cxx03/__concepts/same_as.h>
#include <__cxx03/__config>
@@ -217,4 +217,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___FORMAT_FORMAT_CONTEXT_H
+#endif // _LIBCPP___CXX03___FORMAT_FORMAT_CONTEXT_H
diff --git a/libcxx/include/__cxx03/__format/format_error.h b/libcxx/include/__cxx03/__format/format_error.h
index 701bf3ad0dcc5a..c0a2959131e481 100644
--- a/libcxx/include/__cxx03/__format/format_error.h
+++ b/libcxx/include/__cxx03/__format/format_error.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_FORMAT_ERROR_H
-#define _LIBCPP___FORMAT_FORMAT_ERROR_H
+#ifndef _LIBCPP___CXX03___FORMAT_FORMAT_ERROR_H
+#define _LIBCPP___CXX03___FORMAT_FORMAT_ERROR_H
#include <__cxx03/__config>
#include <__cxx03/__verbose_abort>
@@ -47,4 +47,4 @@ _LIBCPP_NORETURN inline _LIBCPP_HIDE_FROM_ABI void __throw_format_error(const ch
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FORMAT_FORMAT_ERROR_H
+#endif // _LIBCPP___CXX03___FORMAT_FORMAT_ERROR_H
diff --git a/libcxx/include/__cxx03/__format/format_functions.h b/libcxx/include/__cxx03/__format/format_functions.h
index bc9056dd0bdebb..d3a1bc46c8a7d5 100644
--- a/libcxx/include/__cxx03/__format/format_functions.h
+++ b/libcxx/include/__cxx03/__format/format_functions.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_FORMAT_FUNCTIONS
-#define _LIBCPP___FORMAT_FORMAT_FUNCTIONS
+#ifndef _LIBCPP___CXX03___FORMAT_FORMAT_FUNCTIONS
+#define _LIBCPP___CXX03___FORMAT_FORMAT_FUNCTIONS
#include <__cxx03/__algorithm/clamp.h>
#include <__cxx03/__concepts/convertible_to.h>
@@ -677,4 +677,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___FORMAT_FORMAT_FUNCTIONS
+#endif // _LIBCPP___CXX03___FORMAT_FORMAT_FUNCTIONS
diff --git a/libcxx/include/__cxx03/__format/format_parse_context.h b/libcxx/include/__cxx03/__format/format_parse_context.h
index 1df545987659ba..81338506aee693 100644
--- a/libcxx/include/__cxx03/__format/format_parse_context.h
+++ b/libcxx/include/__cxx03/__format/format_parse_context.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_FORMAT_PARSE_CONTEXT_H
-#define _LIBCPP___FORMAT_FORMAT_PARSE_CONTEXT_H
+#ifndef _LIBCPP___CXX03___FORMAT_FORMAT_PARSE_CONTEXT_H
+#define _LIBCPP___CXX03___FORMAT_FORMAT_PARSE_CONTEXT_H
#include <__cxx03/__config>
#include <__cxx03/__format/format_error.h>
@@ -102,4 +102,4 @@ using wformat_parse_context = basic_format_parse_context<wchar_t>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FORMAT_FORMAT_PARSE_CONTEXT_H
+#endif // _LIBCPP___CXX03___FORMAT_FORMAT_PARSE_CONTEXT_H
diff --git a/libcxx/include/__cxx03/__format/format_string.h b/libcxx/include/__cxx03/__format/format_string.h
index c48719337372d6..6a7276419167a8 100644
--- a/libcxx/include/__cxx03/__format/format_string.h
+++ b/libcxx/include/__cxx03/__format/format_string.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_FORMAT_STRING_H
-#define _LIBCPP___FORMAT_FORMAT_STRING_H
+#ifndef _LIBCPP___CXX03___FORMAT_FORMAT_STRING_H
+#define _LIBCPP___CXX03___FORMAT_FORMAT_STRING_H
#include <__cxx03/__assert>
#include <__cxx03/__config>
@@ -157,4 +157,4 @@ __parse_arg_id(_Iterator __begin, _Iterator __end, auto& __parse_ctx) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FORMAT_FORMAT_STRING_H
+#endif // _LIBCPP___CXX03___FORMAT_FORMAT_STRING_H
diff --git a/libcxx/include/__cxx03/__format/format_to_n_result.h b/libcxx/include/__cxx03/__format/format_to_n_result.h
index 8797432922eb95..65e7031f576480 100644
--- a/libcxx/include/__cxx03/__format/format_to_n_result.h
+++ b/libcxx/include/__cxx03/__format/format_to_n_result.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_FORMAT_TO_N_RESULT_H
-#define _LIBCPP___FORMAT_FORMAT_TO_N_RESULT_H
+#ifndef _LIBCPP___CXX03___FORMAT_FORMAT_TO_N_RESULT_H
+#define _LIBCPP___CXX03___FORMAT_FORMAT_TO_N_RESULT_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/incrementable_traits.h>
@@ -32,4 +32,4 @@ _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(format_to_n_result);
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FORMAT_FORMAT_TO_N_RESULT_H
+#endif // _LIBCPP___CXX03___FORMAT_FORMAT_TO_N_RESULT_H
diff --git a/libcxx/include/__cxx03/__format/formatter.h b/libcxx/include/__cxx03/__format/formatter.h
index 98457d0a2c65ea..9afc9dfce3cb53 100644
--- a/libcxx/include/__cxx03/__format/formatter.h
+++ b/libcxx/include/__cxx03/__format/formatter.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_FORMATTER_H
-#define _LIBCPP___FORMAT_FORMATTER_H
+#ifndef _LIBCPP___CXX03___FORMAT_FORMATTER_H
+#define _LIBCPP___CXX03___FORMAT_FORMATTER_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/format.h>
@@ -50,4 +50,4 @@ _LIBCPP_HIDE_FROM_ABI constexpr void __set_debug_format(_Tp& __formatter) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FORMAT_FORMATTER_H
+#endif // _LIBCPP___CXX03___FORMAT_FORMATTER_H
diff --git a/libcxx/include/__cxx03/__format/formatter_bool.h b/libcxx/include/__cxx03/__format/formatter_bool.h
index dd8e97bfc7f483..12a29c2c560403 100644
--- a/libcxx/include/__cxx03/__format/formatter_bool.h
+++ b/libcxx/include/__cxx03/__format/formatter_bool.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_FORMATTER_BOOL_H
-#define _LIBCPP___FORMAT_FORMATTER_BOOL_H
+#ifndef _LIBCPP___CXX03___FORMAT_FORMATTER_BOOL_H
+#define _LIBCPP___CXX03___FORMAT_FORMATTER_BOOL_H
#include <__cxx03/__algorithm/copy.h>
#include <__cxx03/__assert>
@@ -73,4 +73,4 @@ struct _LIBCPP_TEMPLATE_VIS formatter<bool, _CharT> {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FORMAT_FORMATTER_BOOL_H
+#endif // _LIBCPP___CXX03___FORMAT_FORMATTER_BOOL_H
diff --git a/libcxx/include/__cxx03/__format/formatter_char.h b/libcxx/include/__cxx03/__format/formatter_char.h
index b743433c2891d5..f0a7d153ea3431 100644
--- a/libcxx/include/__cxx03/__format/formatter_char.h
+++ b/libcxx/include/__cxx03/__format/formatter_char.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_FORMATTER_CHAR_H
-#define _LIBCPP___FORMAT_FORMATTER_CHAR_H
+#ifndef _LIBCPP___CXX03___FORMAT_FORMATTER_CHAR_H
+#define _LIBCPP___CXX03___FORMAT_FORMATTER_CHAR_H
#include <__cxx03/__concepts/same_as.h>
#include <__cxx03/__config>
@@ -90,4 +90,4 @@ struct _LIBCPP_TEMPLATE_VIS formatter<wchar_t, wchar_t> : public __formatter_cha
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FORMAT_FORMATTER_CHAR_H
+#endif // _LIBCPP___CXX03___FORMAT_FORMATTER_CHAR_H
diff --git a/libcxx/include/__cxx03/__format/formatter_floating_point.h b/libcxx/include/__cxx03/__format/formatter_floating_point.h
index 36663fb90716b1..9f7eec0addcf26 100644
--- a/libcxx/include/__cxx03/__format/formatter_floating_point.h
+++ b/libcxx/include/__cxx03/__format/formatter_floating_point.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_FORMATTER_FLOATING_POINT_H
-#define _LIBCPP___FORMAT_FORMATTER_FLOATING_POINT_H
+#ifndef _LIBCPP___CXX03___FORMAT_FORMATTER_FLOATING_POINT_H
+#define _LIBCPP___CXX03___FORMAT_FORMATTER_FLOATING_POINT_H
#include <__cxx03/__algorithm/copy_n.h>
#include <__cxx03/__algorithm/find.h>
@@ -780,4 +780,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___FORMAT_FORMATTER_FLOATING_POINT_H
+#endif // _LIBCPP___CXX03___FORMAT_FORMATTER_FLOATING_POINT_H
diff --git a/libcxx/include/__cxx03/__format/formatter_integer.h b/libcxx/include/__cxx03/__format/formatter_integer.h
index 0d4dd15de4f9db..365b44093ede27 100644
--- a/libcxx/include/__cxx03/__format/formatter_integer.h
+++ b/libcxx/include/__cxx03/__format/formatter_integer.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_FORMATTER_INTEGER_H
-#define _LIBCPP___FORMAT_FORMATTER_INTEGER_H
+#ifndef _LIBCPP___CXX03___FORMAT_FORMATTER_INTEGER_H
+#define _LIBCPP___CXX03___FORMAT_FORMATTER_INTEGER_H
#include <__cxx03/__concepts/arithmetic.h>
#include <__cxx03/__config>
@@ -92,4 +92,4 @@ struct _LIBCPP_TEMPLATE_VIS formatter<__uint128_t, _CharT> : public __formatter_
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FORMAT_FORMATTER_INTEGER_H
+#endif // _LIBCPP___CXX03___FORMAT_FORMATTER_INTEGER_H
diff --git a/libcxx/include/__cxx03/__format/formatter_integral.h b/libcxx/include/__cxx03/__format/formatter_integral.h
index 6bab831244498c..fc846549dabdc7 100644
--- a/libcxx/include/__cxx03/__format/formatter_integral.h
+++ b/libcxx/include/__cxx03/__format/formatter_integral.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_FORMATTER_INTEGRAL_H
-#define _LIBCPP___FORMAT_FORMATTER_INTEGRAL_H
+#ifndef _LIBCPP___CXX03___FORMAT_FORMATTER_INTEGRAL_H
+#define _LIBCPP___CXX03___FORMAT_FORMATTER_INTEGRAL_H
#include <__cxx03/__charconv/to_chars_integral.h>
#include <__cxx03/__charconv/to_chars_result.h>
@@ -442,4 +442,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___FORMAT_FORMATTER_INTEGRAL_H
+#endif // _LIBCPP___CXX03___FORMAT_FORMATTER_INTEGRAL_H
diff --git a/libcxx/include/__cxx03/__format/formatter_output.h b/libcxx/include/__cxx03/__format/formatter_output.h
index edf6909de750aa..1f3ab7f2ff692a 100644
--- a/libcxx/include/__cxx03/__format/formatter_output.h
+++ b/libcxx/include/__cxx03/__format/formatter_output.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_FORMATTER_OUTPUT_H
-#define _LIBCPP___FORMAT_FORMATTER_OUTPUT_H
+#ifndef _LIBCPP___CXX03___FORMAT_FORMATTER_OUTPUT_H
+#define _LIBCPP___CXX03___FORMAT_FORMATTER_OUTPUT_H
#include <__cxx03/__algorithm/ranges_copy.h>
#include <__cxx03/__algorithm/ranges_fill_n.h>
@@ -332,4 +332,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___FORMAT_FORMATTER_OUTPUT_H
+#endif // _LIBCPP___CXX03___FORMAT_FORMATTER_OUTPUT_H
diff --git a/libcxx/include/__cxx03/__format/formatter_pointer.h b/libcxx/include/__cxx03/__format/formatter_pointer.h
index 166a2e93b622fc..906d62a83e33b7 100644
--- a/libcxx/include/__cxx03/__format/formatter_pointer.h
+++ b/libcxx/include/__cxx03/__format/formatter_pointer.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_FORMATTER_POINTER_H
-#define _LIBCPP___FORMAT_FORMATTER_POINTER_H
+#ifndef _LIBCPP___CXX03___FORMAT_FORMATTER_POINTER_H
+#define _LIBCPP___CXX03___FORMAT_FORMATTER_POINTER_H
#include <__cxx03/__config>
#include <__cxx03/__format/concepts.h>
@@ -69,4 +69,4 @@ struct _LIBCPP_TEMPLATE_VIS formatter<const void*, _CharT> : public __formatter_
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FORMAT_FORMATTER_POINTER_H
+#endif // _LIBCPP___CXX03___FORMAT_FORMATTER_POINTER_H
diff --git a/libcxx/include/__cxx03/__format/formatter_string.h b/libcxx/include/__cxx03/__format/formatter_string.h
index 9cc862a4545c71..024f7936875eca 100644
--- a/libcxx/include/__cxx03/__format/formatter_string.h
+++ b/libcxx/include/__cxx03/__format/formatter_string.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_FORMATTER_STRING_H
-#define _LIBCPP___FORMAT_FORMATTER_STRING_H
+#ifndef _LIBCPP___CXX03___FORMAT_FORMATTER_STRING_H
+#define _LIBCPP___CXX03___FORMAT_FORMATTER_STRING_H
#include <__cxx03/__config>
#include <__cxx03/__format/concepts.h>
@@ -147,4 +147,4 @@ struct _LIBCPP_TEMPLATE_VIS formatter<basic_string_view<_CharT, _Traits>, _CharT
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FORMAT_FORMATTER_STRING_H
+#endif // _LIBCPP___CXX03___FORMAT_FORMATTER_STRING_H
diff --git a/libcxx/include/__cxx03/__format/formatter_tuple.h b/libcxx/include/__cxx03/__format/formatter_tuple.h
index 911552f6635050..0a5ce4e070a643 100644
--- a/libcxx/include/__cxx03/__format/formatter_tuple.h
+++ b/libcxx/include/__cxx03/__format/formatter_tuple.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_FORMATTER_TUPLE_H
-#define _LIBCPP___FORMAT_FORMATTER_TUPLE_H
+#ifndef _LIBCPP___CXX03___FORMAT_FORMATTER_TUPLE_H
+#define _LIBCPP___CXX03___FORMAT_FORMATTER_TUPLE_H
#include <__cxx03/__algorithm/ranges_copy.h>
#include <__cxx03/__chrono/statically_widen.h>
@@ -147,4 +147,4 @@ struct _LIBCPP_TEMPLATE_VIS formatter<tuple<_Args...>, _CharT>
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FORMAT_FORMATTER_TUPLE_H
+#endif // _LIBCPP___CXX03___FORMAT_FORMATTER_TUPLE_H
diff --git a/libcxx/include/__cxx03/__format/indic_conjunct_break_table.h b/libcxx/include/__cxx03/__format/indic_conjunct_break_table.h
index b02c2c324573cc..37fbde29987364 100644
--- a/libcxx/include/__cxx03/__format/indic_conjunct_break_table.h
+++ b/libcxx/include/__cxx03/__format/indic_conjunct_break_table.h
@@ -58,8 +58,8 @@
// use or other dealings in these Data Files or Software without prior
// written authorization of the copyright holder.
-#ifndef _LIBCPP___FORMAT_INDIC_CONJUNCT_BREAK_TABLE_H
-#define _LIBCPP___FORMAT_INDIC_CONJUNCT_BREAK_TABLE_H
+#ifndef _LIBCPP___CXX03___FORMAT_INDIC_CONJUNCT_BREAK_TABLE_H
+#define _LIBCPP___CXX03___FORMAT_INDIC_CONJUNCT_BREAK_TABLE_H
#include <__cxx03/__algorithm/ranges_upper_bound.h>
#include <__cxx03/__config>
@@ -347,4 +347,4 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr uint32_t __entries[201] = {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FORMAT_INDIC_CONJUNCT_BREAK_TABLE_H
+#endif // _LIBCPP___CXX03___FORMAT_INDIC_CONJUNCT_BREAK_TABLE_H
diff --git a/libcxx/include/__cxx03/__format/parser_std_format_spec.h b/libcxx/include/__cxx03/__format/parser_std_format_spec.h
index 1afb5b2c5dd14f..394b6e655e726d 100644
--- a/libcxx/include/__cxx03/__format/parser_std_format_spec.h
+++ b/libcxx/include/__cxx03/__format/parser_std_format_spec.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_PARSER_STD_FORMAT_SPEC_H
-#define _LIBCPP___FORMAT_PARSER_STD_FORMAT_SPEC_H
+#ifndef _LIBCPP___CXX03___FORMAT_PARSER_STD_FORMAT_SPEC_H
+#define _LIBCPP___CXX03___FORMAT_PARSER_STD_FORMAT_SPEC_H
/// \file Contains the std-format-spec parser.
///
@@ -1169,4 +1169,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___FORMAT_PARSER_STD_FORMAT_SPEC_H
+#endif // _LIBCPP___CXX03___FORMAT_PARSER_STD_FORMAT_SPEC_H
diff --git a/libcxx/include/__cxx03/__format/range_default_formatter.h b/libcxx/include/__cxx03/__format/range_default_formatter.h
index c0e07870430e87..ca51a0f0a82274 100644
--- a/libcxx/include/__cxx03/__format/range_default_formatter.h
+++ b/libcxx/include/__cxx03/__format/range_default_formatter.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_RANGE_DEFAULT_FORMATTER_H
-#define _LIBCPP___FORMAT_RANGE_DEFAULT_FORMATTER_H
+#ifndef _LIBCPP___CXX03___FORMAT_RANGE_DEFAULT_FORMATTER_H
+#define _LIBCPP___CXX03___FORMAT_RANGE_DEFAULT_FORMATTER_H
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
@@ -211,4 +211,4 @@ struct _LIBCPP_TEMPLATE_VIS formatter<_Rp, _CharT> : __range_default_formatter<f
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FORMAT_RANGE_DEFAULT_FORMATTER_H
+#endif // _LIBCPP___CXX03___FORMAT_RANGE_DEFAULT_FORMATTER_H
diff --git a/libcxx/include/__cxx03/__format/range_formatter.h b/libcxx/include/__cxx03/__format/range_formatter.h
index 57bb5ff726ba66..0b6ee4401fc751 100644
--- a/libcxx/include/__cxx03/__format/range_formatter.h
+++ b/libcxx/include/__cxx03/__format/range_formatter.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_RANGE_FORMATTER_H
-#define _LIBCPP___FORMAT_RANGE_FORMATTER_H
+#ifndef _LIBCPP___CXX03___FORMAT_RANGE_FORMATTER_H
+#define _LIBCPP___CXX03___FORMAT_RANGE_FORMATTER_H
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
@@ -261,4 +261,4 @@ struct _LIBCPP_TEMPLATE_VIS range_formatter {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FORMAT_RANGE_FORMATTER_H
+#endif // _LIBCPP___CXX03___FORMAT_RANGE_FORMATTER_H
diff --git a/libcxx/include/__cxx03/__format/unicode.h b/libcxx/include/__cxx03/__format/unicode.h
index 5cf1a8967ab97c..e6e9b895df9a75 100644
--- a/libcxx/include/__cxx03/__format/unicode.h
+++ b/libcxx/include/__cxx03/__format/unicode.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_UNICODE_H
-#define _LIBCPP___FORMAT_UNICODE_H
+#ifndef _LIBCPP___CXX03___FORMAT_UNICODE_H
+#define _LIBCPP___CXX03___FORMAT_UNICODE_H
#include <__cxx03/__assert>
#include <__cxx03/__bit/countl.h>
@@ -599,4 +599,4 @@ class __code_point_view {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FORMAT_UNICODE_H
+#endif // _LIBCPP___CXX03___FORMAT_UNICODE_H
diff --git a/libcxx/include/__cxx03/__format/width_estimation_table.h b/libcxx/include/__cxx03/__format/width_estimation_table.h
index 2f0367d1c8f98e..0929c4bbf0f097 100644
--- a/libcxx/include/__cxx03/__format/width_estimation_table.h
+++ b/libcxx/include/__cxx03/__format/width_estimation_table.h
@@ -58,8 +58,8 @@
// use or other dealings in these Data Files or Software without prior
// written authorization of the copyright holder.
-#ifndef _LIBCPP___FORMAT_WIDTH_ESTIMATION_TABLE_H
-#define _LIBCPP___FORMAT_WIDTH_ESTIMATION_TABLE_H
+#ifndef _LIBCPP___CXX03___FORMAT_WIDTH_ESTIMATION_TABLE_H
+#define _LIBCPP___CXX03___FORMAT_WIDTH_ESTIMATION_TABLE_H
#include <__cxx03/__algorithm/ranges_upper_bound.h>
#include <__cxx03/__config>
@@ -267,4 +267,4 @@ inline constexpr uint32_t __table_upper_bound = 0x0003fffd;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FORMAT_WIDTH_ESTIMATION_TABLE_H
+#endif // _LIBCPP___CXX03___FORMAT_WIDTH_ESTIMATION_TABLE_H
diff --git a/libcxx/include/__cxx03/__format/write_escaped.h b/libcxx/include/__cxx03/__format/write_escaped.h
index 82e65ca988ebfd..5711e7c539d02b 100644
--- a/libcxx/include/__cxx03/__format/write_escaped.h
+++ b/libcxx/include/__cxx03/__format/write_escaped.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FORMAT_WRITE_ESCAPED_H
-#define _LIBCPP___FORMAT_WRITE_ESCAPED_H
+#ifndef _LIBCPP___CXX03___FORMAT_WRITE_ESCAPED_H
+#define _LIBCPP___CXX03___FORMAT_WRITE_ESCAPED_H
#include <__cxx03/__algorithm/ranges_copy.h>
#include <__cxx03/__algorithm/ranges_for_each.h>
@@ -239,4 +239,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___FORMAT_WRITE_ESCAPED_H
+#endif // _LIBCPP___CXX03___FORMAT_WRITE_ESCAPED_H
diff --git a/libcxx/include/__cxx03/__functional/binary_function.h b/libcxx/include/__cxx03/__functional/binary_function.h
index 0e54bc5e3c6113..cc247eacb8e37c 100644
--- a/libcxx/include/__cxx03/__functional/binary_function.h
+++ b/libcxx/include/__cxx03/__functional/binary_function.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_BINARY_FUNCTION_H
-#define _LIBCPP___FUNCTIONAL_BINARY_FUNCTION_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_BINARY_FUNCTION_H
+#define _LIBCPP___CXX03___FUNCTIONAL_BINARY_FUNCTION_H
#include <__cxx03/__config>
@@ -51,4 +51,4 @@ using __binary_function = __binary_function_keep_layout_base<_Arg1, _Arg2, _Resu
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_BINARY_FUNCTION_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_BINARY_FUNCTION_H
diff --git a/libcxx/include/__cxx03/__functional/binary_negate.h b/libcxx/include/__cxx03/__functional/binary_negate.h
index 60dfb199186568..e2173d72dc4046 100644
--- a/libcxx/include/__cxx03/__functional/binary_negate.h
+++ b/libcxx/include/__cxx03/__functional/binary_negate.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_BINARY_NEGATE_H
-#define _LIBCPP___FUNCTIONAL_BINARY_NEGATE_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_BINARY_NEGATE_H
+#define _LIBCPP___CXX03___FUNCTIONAL_BINARY_NEGATE_H
#include <__cxx03/__config>
#include <__cxx03/__functional/binary_function.h>
@@ -48,4 +48,4 @@ not2(const _Predicate& __pred) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_BINARY_NEGATE_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_BINARY_NEGATE_H
diff --git a/libcxx/include/__cxx03/__functional/bind.h b/libcxx/include/__cxx03/__functional/bind.h
index 5a1a76a6f1f7a7..70c4be05ce65ea 100644
--- a/libcxx/include/__cxx03/__functional/bind.h
+++ b/libcxx/include/__cxx03/__functional/bind.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_BIND_H
-#define _LIBCPP___FUNCTIONAL_BIND_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_BIND_H
+#define _LIBCPP___CXX03___FUNCTIONAL_BIND_H
#include <__cxx03/__config>
#include <__cxx03/__functional/invoke.h>
@@ -293,4 +293,4 @@ bind(_Fp&& __f, _BoundArgs&&... __bound_args) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_BIND_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_BIND_H
diff --git a/libcxx/include/__cxx03/__functional/bind_back.h b/libcxx/include/__cxx03/__functional/bind_back.h
index fef99f1852377d..2e333b1b14d6a0 100644
--- a/libcxx/include/__cxx03/__functional/bind_back.h
+++ b/libcxx/include/__cxx03/__functional/bind_back.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_BIND_BACK_H
-#define _LIBCPP___FUNCTIONAL_BIND_BACK_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_BIND_BACK_H
+#define _LIBCPP___CXX03___FUNCTIONAL_BIND_BACK_H
#include <__cxx03/__config>
#include <__cxx03/__functional/invoke.h>
@@ -80,4 +80,4 @@ _LIBCPP_HIDE_FROM_ABI constexpr auto bind_back(_Fn&& __f, _Args&&... __args) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_BIND_BACK_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_BIND_BACK_H
diff --git a/libcxx/include/__cxx03/__functional/bind_front.h b/libcxx/include/__cxx03/__functional/bind_front.h
index 1156f53be096e9..6447c2d1bc2eba 100644
--- a/libcxx/include/__cxx03/__functional/bind_front.h
+++ b/libcxx/include/__cxx03/__functional/bind_front.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_BIND_FRONT_H
-#define _LIBCPP___FUNCTIONAL_BIND_FRONT_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_BIND_FRONT_H
+#define _LIBCPP___CXX03___FUNCTIONAL_BIND_FRONT_H
#include <__cxx03/__config>
#include <__cxx03/__functional/invoke.h>
@@ -51,4 +51,4 @@ _LIBCPP_HIDE_FROM_ABI constexpr auto bind_front(_Fn&& __f, _Args&&... __args) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_BIND_FRONT_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_BIND_FRONT_H
diff --git a/libcxx/include/__cxx03/__functional/binder1st.h b/libcxx/include/__cxx03/__functional/binder1st.h
index 1f2f7ebb9c8535..21c136ff16d8cb 100644
--- a/libcxx/include/__cxx03/__functional/binder1st.h
+++ b/libcxx/include/__cxx03/__functional/binder1st.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_BINDER1ST_H
-#define _LIBCPP___FUNCTIONAL_BINDER1ST_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_BINDER1ST_H
+#define _LIBCPP___CXX03___FUNCTIONAL_BINDER1ST_H
#include <__cxx03/__config>
#include <__cxx03/__functional/unary_function.h>
@@ -51,4 +51,4 @@ bind1st(const _Operation& __op, const _Tp& __x) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_BINDER1ST_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_BINDER1ST_H
diff --git a/libcxx/include/__cxx03/__functional/binder2nd.h b/libcxx/include/__cxx03/__functional/binder2nd.h
index d70fab8c93b4a7..397215b3d9e117 100644
--- a/libcxx/include/__cxx03/__functional/binder2nd.h
+++ b/libcxx/include/__cxx03/__functional/binder2nd.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_BINDER2ND_H
-#define _LIBCPP___FUNCTIONAL_BINDER2ND_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_BINDER2ND_H
+#define _LIBCPP___CXX03___FUNCTIONAL_BINDER2ND_H
#include <__cxx03/__config>
#include <__cxx03/__functional/unary_function.h>
@@ -51,4 +51,4 @@ bind2nd(const _Operation& __op, const _Tp& __x) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_BINDER2ND_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_BINDER2ND_H
diff --git a/libcxx/include/__cxx03/__functional/boyer_moore_searcher.h b/libcxx/include/__cxx03/__functional/boyer_moore_searcher.h
index e7724ce6f44c06..384c4b53cc2700 100644
--- a/libcxx/include/__cxx03/__functional/boyer_moore_searcher.h
+++ b/libcxx/include/__cxx03/__functional/boyer_moore_searcher.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_BOYER_MOORE_SEARCHER_H
-#define _LIBCPP___FUNCTIONAL_BOYER_MOORE_SEARCHER_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_BOYER_MOORE_SEARCHER_H
+#define _LIBCPP___CXX03___FUNCTIONAL_BOYER_MOORE_SEARCHER_H
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
@@ -303,4 +303,4 @@ _LIBCPP_POP_MACROS
#endif // _LIBCPP_STD_VER >= 17
-#endif // _LIBCPP___FUNCTIONAL_BOYER_MOORE_SEARCHER_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_BOYER_MOORE_SEARCHER_H
diff --git a/libcxx/include/__cxx03/__functional/compose.h b/libcxx/include/__cxx03/__functional/compose.h
index 504a7e1ca14269..afb6358ad535ef 100644
--- a/libcxx/include/__cxx03/__functional/compose.h
+++ b/libcxx/include/__cxx03/__functional/compose.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_COMPOSE_H
-#define _LIBCPP___FUNCTIONAL_COMPOSE_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_COMPOSE_H
+#define _LIBCPP___CXX03___FUNCTIONAL_COMPOSE_H
#include <__cxx03/__config>
#include <__cxx03/__functional/invoke.h>
@@ -50,4 +50,4 @@ _LIBCPP_HIDE_FROM_ABI constexpr auto __compose(_Fn1&& __f1, _Fn2&& __f2) noexcep
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_COMPOSE_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_COMPOSE_H
diff --git a/libcxx/include/__cxx03/__functional/default_searcher.h b/libcxx/include/__cxx03/__functional/default_searcher.h
index 90ee48fc5e93bd..f1ad66990c257d 100644
--- a/libcxx/include/__cxx03/__functional/default_searcher.h
+++ b/libcxx/include/__cxx03/__functional/default_searcher.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_DEFAULT_SEARCHER_H
-#define _LIBCPP___FUNCTIONAL_DEFAULT_SEARCHER_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_DEFAULT_SEARCHER_H
+#define _LIBCPP___CXX03___FUNCTIONAL_DEFAULT_SEARCHER_H
#include <__cxx03/__algorithm/search.h>
#include <__cxx03/__config>
@@ -51,4 +51,4 @@ _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(default_searcher);
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_DEFAULT_SEARCHER_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_DEFAULT_SEARCHER_H
diff --git a/libcxx/include/__cxx03/__functional/function.h b/libcxx/include/__cxx03/__functional/function.h
index fe3cc8accac63c..1d60391494da80 100644
--- a/libcxx/include/__cxx03/__functional/function.h
+++ b/libcxx/include/__cxx03/__functional/function.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_FUNCTION_H
-#define _LIBCPP___FUNCTIONAL_FUNCTION_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_FUNCTION_H
+#define _LIBCPP___CXX03___FUNCTIONAL_FUNCTION_H
#include <__cxx03/__assert>
#include <__cxx03/__config>
@@ -1045,4 +1045,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___FUNCTIONAL_FUNCTION_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_FUNCTION_H
diff --git a/libcxx/include/__cxx03/__functional/hash.h b/libcxx/include/__cxx03/__functional/hash.h
index 216d2ae4d1bc5b..15473a85724352 100644
--- a/libcxx/include/__cxx03/__functional/hash.h
+++ b/libcxx/include/__cxx03/__functional/hash.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_HASH_H
-#define _LIBCPP___FUNCTIONAL_HASH_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_HASH_H
+#define _LIBCPP___CXX03___FUNCTIONAL_HASH_H
#include <__cxx03/__config>
#include <__cxx03/__functional/unary_function.h>
@@ -539,4 +539,4 @@ using __enable_hash_helper _LIBCPP_NODEBUG = _Type;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_HASH_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_HASH_H
diff --git a/libcxx/include/__cxx03/__functional/identity.h b/libcxx/include/__cxx03/__functional/identity.h
index 7d016af84f8546..61e5ebdb31e6ed 100644
--- a/libcxx/include/__cxx03/__functional/identity.h
+++ b/libcxx/include/__cxx03/__functional/identity.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_IDENTITY_H
-#define _LIBCPP___FUNCTIONAL_IDENTITY_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_IDENTITY_H
+#define _LIBCPP___CXX03___FUNCTIONAL_IDENTITY_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/functional.h>
@@ -62,4 +62,4 @@ struct __is_identity<reference_wrapper<const identity> > : true_type {};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_IDENTITY_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_IDENTITY_H
diff --git a/libcxx/include/__cxx03/__functional/invoke.h b/libcxx/include/__cxx03/__functional/invoke.h
index a9c039bc0379bd..d17a2d58e471fa 100644
--- a/libcxx/include/__cxx03/__functional/invoke.h
+++ b/libcxx/include/__cxx03/__functional/invoke.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_INVOKE_H
-#define _LIBCPP___FUNCTIONAL_INVOKE_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_INVOKE_H
+#define _LIBCPP___CXX03___FUNCTIONAL_INVOKE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/invoke.h>
@@ -51,4 +51,4 @@ invoke_r(_Fn&& __f, _Args&&... __args) noexcept(is_nothrow_invocable_r_v<_Result
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_INVOKE_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_INVOKE_H
diff --git a/libcxx/include/__cxx03/__functional/is_transparent.h b/libcxx/include/__cxx03/__functional/is_transparent.h
index de978871404b83..b630aca633672a 100644
--- a/libcxx/include/__cxx03/__functional/is_transparent.h
+++ b/libcxx/include/__cxx03/__functional/is_transparent.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_IS_TRANSPARENT
-#define _LIBCPP___FUNCTIONAL_IS_TRANSPARENT
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_IS_TRANSPARENT
+#define _LIBCPP___CXX03___FUNCTIONAL_IS_TRANSPARENT
#include <__cxx03/__config>
#include <__cxx03/__type_traits/void_t.h>
@@ -31,4 +31,4 @@ inline const bool __is_transparent_v<_Tp, _Up, __void_t<typename _Tp::is_transpa
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_IS_TRANSPARENT
+#endif // _LIBCPP___CXX03___FUNCTIONAL_IS_TRANSPARENT
diff --git a/libcxx/include/__cxx03/__functional/mem_fn.h b/libcxx/include/__cxx03/__functional/mem_fn.h
index 31bf5a86bffdc3..b3257f8302f1bf 100644
--- a/libcxx/include/__cxx03/__functional/mem_fn.h
+++ b/libcxx/include/__cxx03/__functional/mem_fn.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_MEM_FN_H
-#define _LIBCPP___FUNCTIONAL_MEM_FN_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_MEM_FN_H
+#define _LIBCPP___CXX03___FUNCTIONAL_MEM_FN_H
#include <__cxx03/__config>
#include <__cxx03/__functional/binary_function.h>
@@ -51,4 +51,4 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 __mem_fn<_Rp _Tp::*>
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_MEM_FN_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_MEM_FN_H
diff --git a/libcxx/include/__cxx03/__functional/mem_fun_ref.h b/libcxx/include/__cxx03/__functional/mem_fun_ref.h
index e0e2f29b95d169..ef962231dc92b7 100644
--- a/libcxx/include/__cxx03/__functional/mem_fun_ref.h
+++ b/libcxx/include/__cxx03/__functional/mem_fun_ref.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_MEM_FUN_REF_H
-#define _LIBCPP___FUNCTIONAL_MEM_FUN_REF_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_MEM_FUN_REF_H
+#define _LIBCPP___CXX03___FUNCTIONAL_MEM_FUN_REF_H
#include <__cxx03/__config>
#include <__cxx03/__functional/binary_function.h>
@@ -143,4 +143,4 @@ mem_fun_ref(_Sp (_Tp::*__f)(_Ap) const) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_MEM_FUN_REF_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_MEM_FUN_REF_H
diff --git a/libcxx/include/__cxx03/__functional/not_fn.h b/libcxx/include/__cxx03/__functional/not_fn.h
index 8b9264af64c58f..a6c648bc0beb20 100644
--- a/libcxx/include/__cxx03/__functional/not_fn.h
+++ b/libcxx/include/__cxx03/__functional/not_fn.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_NOT_FN_H
-#define _LIBCPP___FUNCTIONAL_NOT_FN_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_NOT_FN_H
+#define _LIBCPP___CXX03___FUNCTIONAL_NOT_FN_H
#include <__cxx03/__config>
#include <__cxx03/__functional/invoke.h>
@@ -50,4 +50,4 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 auto not_fn(_Fn&& __f) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_NOT_FN_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_NOT_FN_H
diff --git a/libcxx/include/__cxx03/__functional/operations.h b/libcxx/include/__cxx03/__functional/operations.h
index c05579e35e835c..ddbe71bdc8b68b 100644
--- a/libcxx/include/__cxx03/__functional/operations.h
+++ b/libcxx/include/__cxx03/__functional/operations.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_OPERATIONS_H
-#define _LIBCPP___FUNCTIONAL_OPERATIONS_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_OPERATIONS_H
+#define _LIBCPP___CXX03___FUNCTIONAL_OPERATIONS_H
#include <__cxx03/__config>
#include <__cxx03/__functional/binary_function.h>
@@ -538,4 +538,4 @@ struct _LIBCPP_TEMPLATE_VIS logical_or<void> {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_OPERATIONS_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_OPERATIONS_H
diff --git a/libcxx/include/__cxx03/__functional/perfect_forward.h b/libcxx/include/__cxx03/__functional/perfect_forward.h
index 45ecb68250dc95..230e0dc21b429a 100644
--- a/libcxx/include/__cxx03/__functional/perfect_forward.h
+++ b/libcxx/include/__cxx03/__functional/perfect_forward.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_PERFECT_FORWARD_H
-#define _LIBCPP___FUNCTIONAL_PERFECT_FORWARD_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_PERFECT_FORWARD_H
+#define _LIBCPP___CXX03___FUNCTIONAL_PERFECT_FORWARD_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -101,4 +101,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___FUNCTIONAL_PERFECT_FORWARD_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_PERFECT_FORWARD_H
diff --git a/libcxx/include/__cxx03/__functional/pointer_to_binary_function.h b/libcxx/include/__cxx03/__functional/pointer_to_binary_function.h
index d033f9050f0c3f..72474255d7fe2f 100644
--- a/libcxx/include/__cxx03/__functional/pointer_to_binary_function.h
+++ b/libcxx/include/__cxx03/__functional/pointer_to_binary_function.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_POINTER_TO_BINARY_FUNCTION_H
-#define _LIBCPP___FUNCTIONAL_POINTER_TO_BINARY_FUNCTION_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_POINTER_TO_BINARY_FUNCTION_H
+#define _LIBCPP___CXX03___FUNCTIONAL_POINTER_TO_BINARY_FUNCTION_H
#include <__cxx03/__config>
#include <__cxx03/__functional/binary_function.h>
@@ -41,4 +41,4 @@ ptr_fun(_Result (*__f)(_Arg1, _Arg2)) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_POINTER_TO_BINARY_FUNCTION_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_POINTER_TO_BINARY_FUNCTION_H
diff --git a/libcxx/include/__cxx03/__functional/pointer_to_unary_function.h b/libcxx/include/__cxx03/__functional/pointer_to_unary_function.h
index 9e7f62915c91fc..8540ad07f3ec0a 100644
--- a/libcxx/include/__cxx03/__functional/pointer_to_unary_function.h
+++ b/libcxx/include/__cxx03/__functional/pointer_to_unary_function.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_POINTER_TO_UNARY_FUNCTION_H
-#define _LIBCPP___FUNCTIONAL_POINTER_TO_UNARY_FUNCTION_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_POINTER_TO_UNARY_FUNCTION_H
+#define _LIBCPP___CXX03___FUNCTIONAL_POINTER_TO_UNARY_FUNCTION_H
#include <__cxx03/__config>
#include <__cxx03/__functional/unary_function.h>
@@ -41,4 +41,4 @@ ptr_fun(_Result (*__f)(_Arg)) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_POINTER_TO_UNARY_FUNCTION_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_POINTER_TO_UNARY_FUNCTION_H
diff --git a/libcxx/include/__cxx03/__functional/ranges_operations.h b/libcxx/include/__cxx03/__functional/ranges_operations.h
index e8a2b367c9350c..e48593824852d8 100644
--- a/libcxx/include/__cxx03/__functional/ranges_operations.h
+++ b/libcxx/include/__cxx03/__functional/ranges_operations.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_RANGES_OPERATIONS_H
-#define _LIBCPP___FUNCTIONAL_RANGES_OPERATIONS_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_RANGES_OPERATIONS_H
+#define _LIBCPP___CXX03___FUNCTIONAL_RANGES_OPERATIONS_H
#include <__cxx03/__concepts/equality_comparable.h>
#include <__cxx03/__concepts/totally_ordered.h>
@@ -106,4 +106,4 @@ inline const bool __desugars_to_v<__less_tag, ranges::less, _Tp, _Up> = true;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_RANGES_OPERATIONS_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_RANGES_OPERATIONS_H
diff --git a/libcxx/include/__cxx03/__functional/reference_wrapper.h b/libcxx/include/__cxx03/__functional/reference_wrapper.h
index 73788e1fdb89b5..e217bdf543351c 100644
--- a/libcxx/include/__cxx03/__functional/reference_wrapper.h
+++ b/libcxx/include/__cxx03/__functional/reference_wrapper.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_REFERENCE_WRAPPER_H
-#define _LIBCPP___FUNCTIONAL_REFERENCE_WRAPPER_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_REFERENCE_WRAPPER_H
+#define _LIBCPP___CXX03___FUNCTIONAL_REFERENCE_WRAPPER_H
#include <__cxx03/__compare/synth_three_way.h>
#include <__cxx03/__concepts/boolean_testable.h>
@@ -151,4 +151,4 @@ void cref(const _Tp&&) = delete;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_REFERENCE_WRAPPER_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_REFERENCE_WRAPPER_H
diff --git a/libcxx/include/__cxx03/__functional/unary_function.h b/libcxx/include/__cxx03/__functional/unary_function.h
index 9b1e336f15fa4b..45ba29ee2cac5c 100644
--- a/libcxx/include/__cxx03/__functional/unary_function.h
+++ b/libcxx/include/__cxx03/__functional/unary_function.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_UNARY_FUNCTION_H
-#define _LIBCPP___FUNCTIONAL_UNARY_FUNCTION_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_UNARY_FUNCTION_H
+#define _LIBCPP___CXX03___FUNCTIONAL_UNARY_FUNCTION_H
#include <__cxx03/__config>
@@ -48,4 +48,4 @@ using __unary_function = __unary_function_keep_layout_base<_Arg, _Result>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_UNARY_FUNCTION_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_UNARY_FUNCTION_H
diff --git a/libcxx/include/__cxx03/__functional/unary_negate.h b/libcxx/include/__cxx03/__functional/unary_negate.h
index 7154d234b007f0..4d527865f378cb 100644
--- a/libcxx/include/__cxx03/__functional/unary_negate.h
+++ b/libcxx/include/__cxx03/__functional/unary_negate.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_UNARY_NEGATE_H
-#define _LIBCPP___FUNCTIONAL_UNARY_NEGATE_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_UNARY_NEGATE_H
+#define _LIBCPP___CXX03___FUNCTIONAL_UNARY_NEGATE_H
#include <__cxx03/__config>
#include <__cxx03/__functional/unary_function.h>
@@ -45,4 +45,4 @@ not1(const _Predicate& __pred) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_UNARY_NEGATE_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_UNARY_NEGATE_H
diff --git a/libcxx/include/__cxx03/__functional/weak_result_type.h b/libcxx/include/__cxx03/__functional/weak_result_type.h
index e1d62d634ca33c..539989dda2d972 100644
--- a/libcxx/include/__cxx03/__functional/weak_result_type.h
+++ b/libcxx/include/__cxx03/__functional/weak_result_type.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_WEAK_RESULT_TYPE_H
-#define _LIBCPP___FUNCTIONAL_WEAK_RESULT_TYPE_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_WEAK_RESULT_TYPE_H
+#define _LIBCPP___CXX03___FUNCTIONAL_WEAK_RESULT_TYPE_H
#include <__cxx03/__config>
#include <__cxx03/__functional/binary_function.h>
@@ -228,4 +228,4 @@ struct __invoke_return {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_WEAK_RESULT_TYPE_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_WEAK_RESULT_TYPE_H
diff --git a/libcxx/include/__cxx03/__fwd/array.h b/libcxx/include/__cxx03/__fwd/array.h
index 36343371a22783..f2648a1986e27f 100644
--- a/libcxx/include/__cxx03/__fwd/array.h
+++ b/libcxx/include/__cxx03/__fwd/array.h
@@ -6,8 +6,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP___FWD_ARRAY_H
-#define _LIBCPP___FWD_ARRAY_H
+#ifndef _LIBCPP___CXX03___FWD_ARRAY_H
+#define _LIBCPP___CXX03___FWD_ARRAY_H
#include <__cxx03/__config>
#include <__cxx03/cstddef>
@@ -43,4 +43,4 @@ struct __is_std_array<array<_Tp, _Size> > : true_type {};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FWD_ARRAY_H
+#endif // _LIBCPP___CXX03___FWD_ARRAY_H
diff --git a/libcxx/include/__cxx03/__fwd/bit_reference.h b/libcxx/include/__cxx03/__fwd/bit_reference.h
index 6bda18429c392a..e04a47ff97a61a 100644
--- a/libcxx/include/__cxx03/__fwd/bit_reference.h
+++ b/libcxx/include/__cxx03/__fwd/bit_reference.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FWD_BIT_REFERENCE_H
-#define _LIBCPP___FWD_BIT_REFERENCE_H
+#ifndef _LIBCPP___CXX03___FWD_BIT_REFERENCE_H
+#define _LIBCPP___CXX03___FWD_BIT_REFERENCE_H
#include <__cxx03/__config>
@@ -22,4 +22,4 @@ class __bit_iterator;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FWD_BIT_REFERENCE_H
+#endif // _LIBCPP___CXX03___FWD_BIT_REFERENCE_H
diff --git a/libcxx/include/__cxx03/__fwd/complex.h b/libcxx/include/__cxx03/__fwd/complex.h
index e734f2db76fed8..bb1ae20ab3bf80 100644
--- a/libcxx/include/__cxx03/__fwd/complex.h
+++ b/libcxx/include/__cxx03/__fwd/complex.h
@@ -6,8 +6,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP___FWD_COMPLEX_H
-#define _LIBCPP___FWD_COMPLEX_H
+#ifndef _LIBCPP___CXX03___FWD_COMPLEX_H
+#define _LIBCPP___CXX03___FWD_COMPLEX_H
#include <__cxx03/__config>
#include <__cxx03/cstddef>
@@ -39,4 +39,4 @@ _LIBCPP_HIDE_FROM_ABI constexpr const _Tp&& get(const complex<_Tp>&&) noexcept;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FWD_COMPLEX_H
+#endif // _LIBCPP___CXX03___FWD_COMPLEX_H
diff --git a/libcxx/include/__cxx03/__fwd/deque.h b/libcxx/include/__cxx03/__fwd/deque.h
index 31aa8c37998235..7d1c6f79d0d775 100644
--- a/libcxx/include/__cxx03/__fwd/deque.h
+++ b/libcxx/include/__cxx03/__fwd/deque.h
@@ -6,8 +6,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP___FWD_DEQUE_H
-#define _LIBCPP___FWD_DEQUE_H
+#ifndef _LIBCPP___CXX03___FWD_DEQUE_H
+#define _LIBCPP___CXX03___FWD_DEQUE_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/memory.h>
@@ -23,4 +23,4 @@ class _LIBCPP_TEMPLATE_VIS deque;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FWD_DEQUE_H
+#endif // _LIBCPP___CXX03___FWD_DEQUE_H
diff --git a/libcxx/include/__cxx03/__fwd/format.h b/libcxx/include/__cxx03/__fwd/format.h
index 27774333632702..3da3fd728266b2 100644
--- a/libcxx/include/__cxx03/__fwd/format.h
+++ b/libcxx/include/__cxx03/__fwd/format.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FWD_FORMAT_H
-#define _LIBCPP___FWD_FORMAT_H
+#ifndef _LIBCPP___CXX03___FWD_FORMAT_H
+#define _LIBCPP___CXX03___FWD_FORMAT_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/concepts.h>
@@ -35,4 +35,4 @@ struct _LIBCPP_TEMPLATE_VIS formatter;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FWD_FORMAT_H
+#endif // _LIBCPP___CXX03___FWD_FORMAT_H
diff --git a/libcxx/include/__cxx03/__fwd/fstream.h b/libcxx/include/__cxx03/__fwd/fstream.h
index 717cb8c583d2cf..8cc5d2b9efd4e6 100644
--- a/libcxx/include/__cxx03/__fwd/fstream.h
+++ b/libcxx/include/__cxx03/__fwd/fstream.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FWD_FSTREAM_H
-#define _LIBCPP___FWD_FSTREAM_H
+#ifndef _LIBCPP___CXX03___FWD_FSTREAM_H
+#define _LIBCPP___CXX03___FWD_FSTREAM_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/string.h>
@@ -50,4 +50,4 @@ class _LIBCPP_PREFERRED_NAME(fstream) _LIBCPP_IF_WIDE_CHARACTERS(_LIBCPP_PREFERR
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FWD_FSTREAM_H
+#endif // _LIBCPP___CXX03___FWD_FSTREAM_H
diff --git a/libcxx/include/__cxx03/__fwd/functional.h b/libcxx/include/__cxx03/__fwd/functional.h
index e19b802d178ca0..924874ca70050d 100644
--- a/libcxx/include/__cxx03/__fwd/functional.h
+++ b/libcxx/include/__cxx03/__fwd/functional.h
@@ -6,8 +6,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP___FWD_FUNCTIONAL_H
-#define _LIBCPP___FWD_FUNCTIONAL_H
+#ifndef _LIBCPP___CXX03___FWD_FUNCTIONAL_H
+#define _LIBCPP___CXX03___FWD_FUNCTIONAL_H
#include <__cxx03/__config>
@@ -25,4 +25,4 @@ class _LIBCPP_TEMPLATE_VIS reference_wrapper;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FWD_FUNCTIONAL_H
+#endif // _LIBCPP___CXX03___FWD_FUNCTIONAL_H
diff --git a/libcxx/include/__cxx03/__fwd/ios.h b/libcxx/include/__cxx03/__fwd/ios.h
index f5ba74c9067bb8..dc03e8c6bab2f2 100644
--- a/libcxx/include/__cxx03/__fwd/ios.h
+++ b/libcxx/include/__cxx03/__fwd/ios.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FWD_IOS_H
-#define _LIBCPP___FWD_IOS_H
+#ifndef _LIBCPP___CXX03___FWD_IOS_H
+#define _LIBCPP___CXX03___FWD_IOS_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/string.h>
@@ -40,4 +40,4 @@ using streamoff = long long; // for char_traits in <string>
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FWD_IOS_H
+#endif // _LIBCPP___CXX03___FWD_IOS_H
diff --git a/libcxx/include/__cxx03/__fwd/istream.h b/libcxx/include/__cxx03/__fwd/istream.h
index 8975ac26baf6bd..f3edc7859c642f 100644
--- a/libcxx/include/__cxx03/__fwd/istream.h
+++ b/libcxx/include/__cxx03/__fwd/istream.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FWD_ISTREAM_H
-#define _LIBCPP___FWD_ISTREAM_H
+#ifndef _LIBCPP___CXX03___FWD_ISTREAM_H
+#define _LIBCPP___CXX03___FWD_ISTREAM_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/string.h>
@@ -40,4 +40,4 @@ class _LIBCPP_PREFERRED_NAME(iostream) _LIBCPP_IF_WIDE_CHARACTERS(_LIBCPP_PREFER
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FWD_ISTREAM_H
+#endif // _LIBCPP___CXX03___FWD_ISTREAM_H
diff --git a/libcxx/include/__cxx03/__fwd/mdspan.h b/libcxx/include/__cxx03/__fwd/mdspan.h
index 369da43a20296a..50209798a1443d 100644
--- a/libcxx/include/__cxx03/__fwd/mdspan.h
+++ b/libcxx/include/__cxx03/__fwd/mdspan.h
@@ -14,8 +14,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP___MDSPAN_LAYOUTS_H
-#define _LIBCPP___MDSPAN_LAYOUTS_H
+#ifndef _LIBCPP___CXX03___MDSPAN_LAYOUTS_H
+#define _LIBCPP___CXX03___MDSPAN_LAYOUTS_H
#include <__cxx03/__config>
@@ -54,4 +54,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___MDSPAN_LAYOUTS_H
+#endif // _LIBCPP___CXX03___MDSPAN_LAYOUTS_H
diff --git a/libcxx/include/__cxx03/__fwd/memory.h b/libcxx/include/__cxx03/__fwd/memory.h
index 109c0f6c051cc9..df76b1747c20ac 100644
--- a/libcxx/include/__cxx03/__fwd/memory.h
+++ b/libcxx/include/__cxx03/__fwd/memory.h
@@ -6,8 +6,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP___FWD_MEMORY_H
-#define _LIBCPP___FWD_MEMORY_H
+#ifndef _LIBCPP___CXX03___FWD_MEMORY_H
+#define _LIBCPP___CXX03___FWD_MEMORY_H
#include <__cxx03/__config>
@@ -22,4 +22,4 @@ class _LIBCPP_TEMPLATE_VIS allocator;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FWD_MEMORY_H
+#endif // _LIBCPP___CXX03___FWD_MEMORY_H
diff --git a/libcxx/include/__cxx03/__fwd/memory_resource.h b/libcxx/include/__cxx03/__fwd/memory_resource.h
index 1a12dcfdaf6271..aefa00a12a8354 100644
--- a/libcxx/include/__cxx03/__fwd/memory_resource.h
+++ b/libcxx/include/__cxx03/__fwd/memory_resource.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FWD_MEMORY_RESOURCE_H
-#define _LIBCPP___FWD_MEMORY_RESOURCE_H
+#ifndef _LIBCPP___CXX03___FWD_MEMORY_RESOURCE_H
+#define _LIBCPP___CXX03___FWD_MEMORY_RESOURCE_H
#include <__cxx03/__config>
@@ -24,4 +24,4 @@ class _LIBCPP_AVAILABILITY_PMR _LIBCPP_TEMPLATE_VIS polymorphic_allocator;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FWD_MEMORY_RESOURCE_H
+#endif // _LIBCPP___CXX03___FWD_MEMORY_RESOURCE_H
diff --git a/libcxx/include/__cxx03/__fwd/ostream.h b/libcxx/include/__cxx03/__fwd/ostream.h
index 5660ac50aac466..b5061e6d3bc6d4 100644
--- a/libcxx/include/__cxx03/__fwd/ostream.h
+++ b/libcxx/include/__cxx03/__fwd/ostream.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FWD_OSTREAM_H
-#define _LIBCPP___FWD_OSTREAM_H
+#ifndef _LIBCPP___CXX03___FWD_OSTREAM_H
+#define _LIBCPP___CXX03___FWD_OSTREAM_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/string.h>
@@ -32,4 +32,4 @@ class _LIBCPP_PREFERRED_NAME(ostream) _LIBCPP_IF_WIDE_CHARACTERS(_LIBCPP_PREFERR
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FWD_OSTREAM_H
+#endif // _LIBCPP___CXX03___FWD_OSTREAM_H
diff --git a/libcxx/include/__cxx03/__fwd/pair.h b/libcxx/include/__cxx03/__fwd/pair.h
index 36656b454e0ab1..092374b509606f 100644
--- a/libcxx/include/__cxx03/__fwd/pair.h
+++ b/libcxx/include/__cxx03/__fwd/pair.h
@@ -6,8 +6,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP___FWD_PAIR_H
-#define _LIBCPP___FWD_PAIR_H
+#ifndef _LIBCPP___CXX03___FWD_PAIR_H
+#define _LIBCPP___CXX03___FWD_PAIR_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/tuple.h>
@@ -42,4 +42,4 @@ get(const pair<_T1, _T2>&&) _NOEXCEPT;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FWD_PAIR_H
+#endif // _LIBCPP___CXX03___FWD_PAIR_H
diff --git a/libcxx/include/__cxx03/__fwd/queue.h b/libcxx/include/__cxx03/__fwd/queue.h
index 54afd5113ba89d..c2f68089d0e330 100644
--- a/libcxx/include/__cxx03/__fwd/queue.h
+++ b/libcxx/include/__cxx03/__fwd/queue.h
@@ -6,8 +6,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP___FWD_QUEUE_H
-#define _LIBCPP___FWD_QUEUE_H
+#ifndef _LIBCPP___CXX03___FWD_QUEUE_H
+#define _LIBCPP___CXX03___FWD_QUEUE_H
#include <__cxx03/__config>
#include <__cxx03/__functional/operations.h>
@@ -28,4 +28,4 @@ class _LIBCPP_TEMPLATE_VIS priority_queue;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FWD_QUEUE_H
+#endif // _LIBCPP___CXX03___FWD_QUEUE_H
diff --git a/libcxx/include/__cxx03/__fwd/span.h b/libcxx/include/__cxx03/__fwd/span.h
index 47ed3eca5af4e5..415a3c5ba8a551 100644
--- a/libcxx/include/__cxx03/__fwd/span.h
+++ b/libcxx/include/__cxx03/__fwd/span.h
@@ -7,8 +7,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP___FWD_SPAN_H
-#define _LIBCPP___FWD_SPAN_H
+#ifndef _LIBCPP___CXX03___FWD_SPAN_H
+#define _LIBCPP___CXX03___FWD_SPAN_H
#include <__cxx03/__config>
#include <__cxx03/cstddef>
@@ -35,4 +35,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___FWD_SPAN_H
+#endif // _LIBCPP___CXX03___FWD_SPAN_H
diff --git a/libcxx/include/__cxx03/__fwd/sstream.h b/libcxx/include/__cxx03/__fwd/sstream.h
index cbb53942c82129..32ae42cd7b020b 100644
--- a/libcxx/include/__cxx03/__fwd/sstream.h
+++ b/libcxx/include/__cxx03/__fwd/sstream.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FWD_SSTREAM_H
-#define _LIBCPP___FWD_SSTREAM_H
+#ifndef _LIBCPP___CXX03___FWD_SSTREAM_H
+#define _LIBCPP___CXX03___FWD_SSTREAM_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/memory.h>
@@ -55,4 +55,4 @@ class _LIBCPP_PREFERRED_NAME(stringstream)
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FWD_SSTREAM_H
+#endif // _LIBCPP___CXX03___FWD_SSTREAM_H
diff --git a/libcxx/include/__cxx03/__fwd/stack.h b/libcxx/include/__cxx03/__fwd/stack.h
index ddd7a676158764..715356e91b4116 100644
--- a/libcxx/include/__cxx03/__fwd/stack.h
+++ b/libcxx/include/__cxx03/__fwd/stack.h
@@ -6,8 +6,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP___FWD_STACK_H
-#define _LIBCPP___FWD_STACK_H
+#ifndef _LIBCPP___CXX03___FWD_STACK_H
+#define _LIBCPP___CXX03___FWD_STACK_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/deque.h>
@@ -23,4 +23,4 @@ class _LIBCPP_TEMPLATE_VIS stack;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FWD_STACK_H
+#endif // _LIBCPP___CXX03___FWD_STACK_H
diff --git a/libcxx/include/__cxx03/__fwd/streambuf.h b/libcxx/include/__cxx03/__fwd/streambuf.h
index 0b448836aaef7f..d22be50ce8ad15 100644
--- a/libcxx/include/__cxx03/__fwd/streambuf.h
+++ b/libcxx/include/__cxx03/__fwd/streambuf.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FWD_STREAMBUF_H
-#define _LIBCPP___FWD_STREAMBUF_H
+#ifndef _LIBCPP___CXX03___FWD_STREAMBUF_H
+#define _LIBCPP___CXX03___FWD_STREAMBUF_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/string.h>
@@ -32,4 +32,4 @@ class _LIBCPP_PREFERRED_NAME(streambuf) _LIBCPP_IF_WIDE_CHARACTERS(_LIBCPP_PREFE
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FWD_STREAMBUF_H
+#endif // _LIBCPP___CXX03___FWD_STREAMBUF_H
diff --git a/libcxx/include/__cxx03/__fwd/string.h b/libcxx/include/__cxx03/__fwd/string.h
index 07042b205e8ce3..21c2584c6e95b4 100644
--- a/libcxx/include/__cxx03/__fwd/string.h
+++ b/libcxx/include/__cxx03/__fwd/string.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FWD_STRING_H
-#define _LIBCPP___FWD_STRING_H
+#ifndef _LIBCPP___CXX03___FWD_STRING_H
+#define _LIBCPP___CXX03___FWD_STRING_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/memory.h>
@@ -104,4 +104,4 @@ class _LIBCPP_PREFERRED_NAME(string)
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FWD_STRING_H
+#endif // _LIBCPP___CXX03___FWD_STRING_H
diff --git a/libcxx/include/__cxx03/__fwd/string_view.h b/libcxx/include/__cxx03/__fwd/string_view.h
index 25ee230d20b334..76c608b46b1c6a 100644
--- a/libcxx/include/__cxx03/__fwd/string_view.h
+++ b/libcxx/include/__cxx03/__fwd/string_view.h
@@ -7,8 +7,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP___FWD_STRING_VIEW_H
-#define _LIBCPP___FWD_STRING_VIEW_H
+#ifndef _LIBCPP___CXX03___FWD_STRING_VIEW_H
+#define _LIBCPP___CXX03___FWD_STRING_VIEW_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/string.h>
@@ -47,4 +47,4 @@ class _LIBCPP_PREFERRED_NAME(string_view)
// clang-format on
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FWD_STRING_VIEW_H
+#endif // _LIBCPP___CXX03___FWD_STRING_VIEW_H
diff --git a/libcxx/include/__cxx03/__fwd/subrange.h b/libcxx/include/__cxx03/__fwd/subrange.h
index aebbd866daeb2d..34ba3504d04999 100644
--- a/libcxx/include/__cxx03/__fwd/subrange.h
+++ b/libcxx/include/__cxx03/__fwd/subrange.h
@@ -6,8 +6,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP___FWD_SUBRANGE_H
-#define _LIBCPP___FWD_SUBRANGE_H
+#ifndef _LIBCPP___CXX03___FWD_SUBRANGE_H
+#define _LIBCPP___CXX03___FWD_SUBRANGE_H
#include <__cxx03/__concepts/copyable.h>
#include <__cxx03/__config>
@@ -46,4 +46,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___FWD_SUBRANGE_H
+#endif // _LIBCPP___CXX03___FWD_SUBRANGE_H
diff --git a/libcxx/include/__cxx03/__fwd/tuple.h b/libcxx/include/__cxx03/__fwd/tuple.h
index 75f7e6d16aecf9..fed99583f199f0 100644
--- a/libcxx/include/__cxx03/__fwd/tuple.h
+++ b/libcxx/include/__cxx03/__fwd/tuple.h
@@ -6,8 +6,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP___FWD_TUPLE_H
-#define _LIBCPP___FWD_TUPLE_H
+#ifndef _LIBCPP___CXX03___FWD_TUPLE_H
+#define _LIBCPP___CXX03___FWD_TUPLE_H
#include <__cxx03/__config>
#include <__cxx03/cstddef>
@@ -49,4 +49,4 @@ get(const tuple<_Tp...>&&) _NOEXCEPT;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FWD_TUPLE_H
+#endif // _LIBCPP___CXX03___FWD_TUPLE_H
diff --git a/libcxx/include/__cxx03/__fwd/vector.h b/libcxx/include/__cxx03/__fwd/vector.h
index 3ed34e9f9ef94b..4133173d765c40 100644
--- a/libcxx/include/__cxx03/__fwd/vector.h
+++ b/libcxx/include/__cxx03/__fwd/vector.h
@@ -6,8 +6,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP___FWD_VECTOR_H
-#define _LIBCPP___FWD_VECTOR_H
+#ifndef _LIBCPP___CXX03___FWD_VECTOR_H
+#define _LIBCPP___CXX03___FWD_VECTOR_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/memory.h>
@@ -23,4 +23,4 @@ class _LIBCPP_TEMPLATE_VIS vector;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FWD_VECTOR_H
+#endif // _LIBCPP___CXX03___FWD_VECTOR_H
diff --git a/libcxx/include/__cxx03/__hash_table b/libcxx/include/__cxx03/__hash_table
index 348dcaf01e8c19..4a27681442c271 100644
--- a/libcxx/include/__cxx03/__hash_table
+++ b/libcxx/include/__cxx03/__hash_table
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___HASH_TABLE
-#define _LIBCPP___HASH_TABLE
+#ifndef _LIBCPP___CXX03___HASH_TABLE
+#define _LIBCPP___CXX03___HASH_TABLE
#include <__cxx03/__algorithm/max.h>
#include <__cxx03/__algorithm/min.h>
@@ -2041,4 +2041,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___HASH_TABLE
+#endif // _LIBCPP___CXX03___HASH_TABLE
diff --git a/libcxx/include/__cxx03/__ios/fpos.h b/libcxx/include/__cxx03/__ios/fpos.h
index 20904d3f5469d3..5f16bfd4caec95 100644
--- a/libcxx/include/__cxx03/__ios/fpos.h
+++ b/libcxx/include/__cxx03/__ios/fpos.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___IOS_FPOS_H
-#define _LIBCPP___IOS_FPOS_H
+#ifndef _LIBCPP___CXX03___IOS_FPOS_H
+#define _LIBCPP___CXX03___IOS_FPOS_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/ios.h>
@@ -73,4 +73,4 @@ inline _LIBCPP_HIDE_FROM_ABI bool operator!=(const fpos<_StateT>& __x, const fpo
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___IOS_FPOS_H
+#endif // _LIBCPP___CXX03___IOS_FPOS_H
diff --git a/libcxx/include/__cxx03/__iterator/access.h b/libcxx/include/__cxx03/__iterator/access.h
index 2d7b4d16d47ce0..2d61d4a879d4f7 100644
--- a/libcxx/include/__cxx03/__iterator/access.h
+++ b/libcxx/include/__cxx03/__iterator/access.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_ACCESS_H
-#define _LIBCPP___ITERATOR_ACCESS_H
+#ifndef _LIBCPP___CXX03___ITERATOR_ACCESS_H
+#define _LIBCPP___CXX03___ITERATOR_ACCESS_H
#include <__cxx03/__config>
#include <__cxx03/cstddef>
@@ -92,4 +92,4 @@ _LIBCPP_HIDE_FROM_ABI typename _Cp::const_iterator end(const _Cp& __c) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_ACCESS_H
+#endif // _LIBCPP___CXX03___ITERATOR_ACCESS_H
diff --git a/libcxx/include/__cxx03/__iterator/advance.h b/libcxx/include/__cxx03/__iterator/advance.h
index b481652fbed9d5..ac4904829b7ee1 100644
--- a/libcxx/include/__cxx03/__iterator/advance.h
+++ b/libcxx/include/__cxx03/__iterator/advance.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_ADVANCE_H
-#define _LIBCPP___ITERATOR_ADVANCE_H
+#ifndef _LIBCPP___CXX03___ITERATOR_ADVANCE_H
+#define _LIBCPP___CXX03___ITERATOR_ADVANCE_H
#include <__cxx03/__assert>
#include <__cxx03/__concepts/assignable.h>
@@ -202,4 +202,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ITERATOR_ADVANCE_H
+#endif // _LIBCPP___CXX03___ITERATOR_ADVANCE_H
diff --git a/libcxx/include/__cxx03/__iterator/aliasing_iterator.h b/libcxx/include/__cxx03/__iterator/aliasing_iterator.h
index a3cb555606cb98..93da1d28ef094e 100644
--- a/libcxx/include/__cxx03/__iterator/aliasing_iterator.h
+++ b/libcxx/include/__cxx03/__iterator/aliasing_iterator.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_ALIASING_ITERATOR_H
-#define _LIBCPP___ITERATOR_ALIASING_ITERATOR_H
+#ifndef _LIBCPP___CXX03___ITERATOR_ALIASING_ITERATOR_H
+#define _LIBCPP___CXX03___ITERATOR_ALIASING_ITERATOR_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/iterator_traits.h>
@@ -124,4 +124,4 @@ using __aliasing_iterator = typename __aliasing_iterator_wrapper<_BaseT, _Alias>
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_ALIASING_ITERATOR_H
+#endif // _LIBCPP___CXX03___ITERATOR_ALIASING_ITERATOR_H
diff --git a/libcxx/include/__cxx03/__iterator/back_insert_iterator.h b/libcxx/include/__cxx03/__iterator/back_insert_iterator.h
index 2d3885951d1349..962639a2746bff 100644
--- a/libcxx/include/__cxx03/__iterator/back_insert_iterator.h
+++ b/libcxx/include/__cxx03/__iterator/back_insert_iterator.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_BACK_INSERT_ITERATOR_H
-#define _LIBCPP___ITERATOR_BACK_INSERT_ITERATOR_H
+#ifndef _LIBCPP___CXX03___ITERATOR_BACK_INSERT_ITERATOR_H
+#define _LIBCPP___CXX03___ITERATOR_BACK_INSERT_ITERATOR_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/iterator.h>
@@ -82,4 +82,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ITERATOR_BACK_INSERT_ITERATOR_H
+#endif // _LIBCPP___CXX03___ITERATOR_BACK_INSERT_ITERATOR_H
diff --git a/libcxx/include/__cxx03/__iterator/bounded_iter.h b/libcxx/include/__cxx03/__iterator/bounded_iter.h
index dc93be089b1b89..d361e74283de74 100644
--- a/libcxx/include/__cxx03/__iterator/bounded_iter.h
+++ b/libcxx/include/__cxx03/__iterator/bounded_iter.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_BOUNDED_ITER_H
-#define _LIBCPP___ITERATOR_BOUNDED_ITER_H
+#ifndef _LIBCPP___CXX03___ITERATOR_BOUNDED_ITER_H
+#define _LIBCPP___CXX03___ITERATOR_BOUNDED_ITER_H
#include <__cxx03/__assert>
#include <__cxx03/__compare/ordering.h>
@@ -280,4 +280,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ITERATOR_BOUNDED_ITER_H
+#endif // _LIBCPP___CXX03___ITERATOR_BOUNDED_ITER_H
diff --git a/libcxx/include/__cxx03/__iterator/common_iterator.h b/libcxx/include/__cxx03/__iterator/common_iterator.h
index 5d052c0d2300e5..6083a23e67a86a 100644
--- a/libcxx/include/__cxx03/__iterator/common_iterator.h
+++ b/libcxx/include/__cxx03/__iterator/common_iterator.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_COMMON_ITERATOR_H
-#define _LIBCPP___ITERATOR_COMMON_ITERATOR_H
+#ifndef _LIBCPP___CXX03___ITERATOR_COMMON_ITERATOR_H
+#define _LIBCPP___CXX03___ITERATOR_COMMON_ITERATOR_H
#include <__cxx03/__assert>
#include <__cxx03/__concepts/assignable.h>
@@ -296,4 +296,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ITERATOR_COMMON_ITERATOR_H
+#endif // _LIBCPP___CXX03___ITERATOR_COMMON_ITERATOR_H
diff --git a/libcxx/include/__cxx03/__iterator/concepts.h b/libcxx/include/__cxx03/__iterator/concepts.h
index 4973ce8987ef56..af7d0c9a0541d0 100644
--- a/libcxx/include/__cxx03/__iterator/concepts.h
+++ b/libcxx/include/__cxx03/__iterator/concepts.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_CONCEPTS_H
-#define _LIBCPP___ITERATOR_CONCEPTS_H
+#ifndef _LIBCPP___CXX03___ITERATOR_CONCEPTS_H
+#define _LIBCPP___CXX03___ITERATOR_CONCEPTS_H
#include <__cxx03/__concepts/arithmetic.h>
#include <__cxx03/__concepts/assignable.h>
@@ -254,4 +254,4 @@ using __has_random_access_iterator_category_or_concept
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_CONCEPTS_H
+#endif // _LIBCPP___CXX03___ITERATOR_CONCEPTS_H
diff --git a/libcxx/include/__cxx03/__iterator/counted_iterator.h b/libcxx/include/__cxx03/__iterator/counted_iterator.h
index 161ec54a1a3b17..9d6004dc90b84c 100644
--- a/libcxx/include/__cxx03/__iterator/counted_iterator.h
+++ b/libcxx/include/__cxx03/__iterator/counted_iterator.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_COUNTED_ITERATOR_H
-#define _LIBCPP___ITERATOR_COUNTED_ITERATOR_H
+#ifndef _LIBCPP___CXX03___ITERATOR_COUNTED_ITERATOR_H
+#define _LIBCPP___CXX03___ITERATOR_COUNTED_ITERATOR_H
#include <__cxx03/__assert>
#include <__cxx03/__concepts/assignable.h>
@@ -286,4 +286,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ITERATOR_COUNTED_ITERATOR_H
+#endif // _LIBCPP___CXX03___ITERATOR_COUNTED_ITERATOR_H
diff --git a/libcxx/include/__cxx03/__iterator/cpp17_iterator_concepts.h b/libcxx/include/__cxx03/__iterator/cpp17_iterator_concepts.h
index 938884e5f69abb..aed3527aee08ae 100644
--- a/libcxx/include/__cxx03/__iterator/cpp17_iterator_concepts.h
+++ b/libcxx/include/__cxx03/__iterator/cpp17_iterator_concepts.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_CPP17_ITERATOR_CONCEPTS_H
-#define _LIBCPP___ITERATOR_CPP17_ITERATOR_CONCEPTS_H
+#ifndef _LIBCPP___CXX03___ITERATOR_CPP17_ITERATOR_CONCEPTS_H
+#define _LIBCPP___CXX03___ITERATOR_CPP17_ITERATOR_CONCEPTS_H
#include <__cxx03/__concepts/boolean_testable.h>
#include <__cxx03/__concepts/convertible_to.h>
@@ -187,4 +187,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ITERATOR_CPP17_ITERATOR_CONCEPTS_H
+#endif // _LIBCPP___CXX03___ITERATOR_CPP17_ITERATOR_CONCEPTS_H
diff --git a/libcxx/include/__cxx03/__iterator/data.h b/libcxx/include/__cxx03/__iterator/data.h
index d4f26608d9c499..58047e4b6c755b 100644
--- a/libcxx/include/__cxx03/__iterator/data.h
+++ b/libcxx/include/__cxx03/__iterator/data.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_DATA_H
-#define _LIBCPP___ITERATOR_DATA_H
+#ifndef _LIBCPP___CXX03___ITERATOR_DATA_H
+#define _LIBCPP___CXX03___ITERATOR_DATA_H
#include <__cxx03/__config>
#include <__cxx03/cstddef>
@@ -46,4 +46,4 @@ _LIBCPP_HIDE_FROM_ABI constexpr const _Ep* data(initializer_list<_Ep> __il) noex
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_DATA_H
+#endif // _LIBCPP___CXX03___ITERATOR_DATA_H
diff --git a/libcxx/include/__cxx03/__iterator/default_sentinel.h b/libcxx/include/__cxx03/__iterator/default_sentinel.h
index fd05aeb59bce63..7e1099a3d11c56 100644
--- a/libcxx/include/__cxx03/__iterator/default_sentinel.h
+++ b/libcxx/include/__cxx03/__iterator/default_sentinel.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_DEFAULT_SENTINEL_H
-#define _LIBCPP___ITERATOR_DEFAULT_SENTINEL_H
+#ifndef _LIBCPP___CXX03___ITERATOR_DEFAULT_SENTINEL_H
+#define _LIBCPP___CXX03___ITERATOR_DEFAULT_SENTINEL_H
#include <__cxx03/__config>
@@ -27,4 +27,4 @@ inline constexpr default_sentinel_t default_sentinel{};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_DEFAULT_SENTINEL_H
+#endif // _LIBCPP___CXX03___ITERATOR_DEFAULT_SENTINEL_H
diff --git a/libcxx/include/__cxx03/__iterator/distance.h b/libcxx/include/__cxx03/__iterator/distance.h
index 20f2771efc4376..91dcc329137994 100644
--- a/libcxx/include/__cxx03/__iterator/distance.h
+++ b/libcxx/include/__cxx03/__iterator/distance.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_DISTANCE_H
-#define _LIBCPP___ITERATOR_DISTANCE_H
+#ifndef _LIBCPP___CXX03___ITERATOR_DISTANCE_H
+#define _LIBCPP___CXX03___ITERATOR_DISTANCE_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/concepts.h>
@@ -96,4 +96,4 @@ inline constexpr auto distance = __distance::__fn{};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_DISTANCE_H
+#endif // _LIBCPP___CXX03___ITERATOR_DISTANCE_H
diff --git a/libcxx/include/__cxx03/__iterator/empty.h b/libcxx/include/__cxx03/__iterator/empty.h
index 0bdb951ee12dcd..20f505e789c137 100644
--- a/libcxx/include/__cxx03/__iterator/empty.h
+++ b/libcxx/include/__cxx03/__iterator/empty.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_EMPTY_H
-#define _LIBCPP___ITERATOR_EMPTY_H
+#ifndef _LIBCPP___CXX03___ITERATOR_EMPTY_H
+#define _LIBCPP___CXX03___ITERATOR_EMPTY_H
#include <__cxx03/__config>
#include <__cxx03/cstddef>
@@ -42,4 +42,4 @@ template <class _Ep>
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_EMPTY_H
+#endif // _LIBCPP___CXX03___ITERATOR_EMPTY_H
diff --git a/libcxx/include/__cxx03/__iterator/erase_if_container.h b/libcxx/include/__cxx03/__iterator/erase_if_container.h
index 11edc9c1312c68..c83eccd133d1f5 100644
--- a/libcxx/include/__cxx03/__iterator/erase_if_container.h
+++ b/libcxx/include/__cxx03/__iterator/erase_if_container.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_ERASE_IF_CONTAINER_H
-#define _LIBCPP___ITERATOR_ERASE_IF_CONTAINER_H
+#ifndef _LIBCPP___CXX03___ITERATOR_ERASE_IF_CONTAINER_H
+#define _LIBCPP___CXX03___ITERATOR_ERASE_IF_CONTAINER_H
#include <__cxx03/__config>
@@ -40,4 +40,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ITERATOR_ERASE_IF_CONTAINER_H
+#endif // _LIBCPP___CXX03___ITERATOR_ERASE_IF_CONTAINER_H
diff --git a/libcxx/include/__cxx03/__iterator/front_insert_iterator.h b/libcxx/include/__cxx03/__iterator/front_insert_iterator.h
index f28b82840f2d67..9c2b987806f5bb 100644
--- a/libcxx/include/__cxx03/__iterator/front_insert_iterator.h
+++ b/libcxx/include/__cxx03/__iterator/front_insert_iterator.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_FRONT_INSERT_ITERATOR_H
-#define _LIBCPP___ITERATOR_FRONT_INSERT_ITERATOR_H
+#ifndef _LIBCPP___CXX03___ITERATOR_FRONT_INSERT_ITERATOR_H
+#define _LIBCPP___CXX03___ITERATOR_FRONT_INSERT_ITERATOR_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/iterator.h>
@@ -80,4 +80,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ITERATOR_FRONT_INSERT_ITERATOR_H
+#endif // _LIBCPP___CXX03___ITERATOR_FRONT_INSERT_ITERATOR_H
diff --git a/libcxx/include/__cxx03/__iterator/incrementable_traits.h b/libcxx/include/__cxx03/__iterator/incrementable_traits.h
index 8eb730bfe8ad9e..e861f80ecb4d67 100644
--- a/libcxx/include/__cxx03/__iterator/incrementable_traits.h
+++ b/libcxx/include/__cxx03/__iterator/incrementable_traits.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_INCREMENTABLE_TRAITS_H
-#define _LIBCPP___ITERATOR_INCREMENTABLE_TRAITS_H
+#ifndef _LIBCPP___CXX03___ITERATOR_INCREMENTABLE_TRAITS_H
+#define _LIBCPP___CXX03___ITERATOR_INCREMENTABLE_TRAITS_H
#include <__cxx03/__concepts/arithmetic.h>
#include <__cxx03/__config>
@@ -76,4 +76,4 @@ using iter_difference_t =
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_INCREMENTABLE_TRAITS_H
+#endif // _LIBCPP___CXX03___ITERATOR_INCREMENTABLE_TRAITS_H
diff --git a/libcxx/include/__cxx03/__iterator/indirectly_comparable.h b/libcxx/include/__cxx03/__iterator/indirectly_comparable.h
index caef64e6f08317..56de2de09eccdb 100644
--- a/libcxx/include/__cxx03/__iterator/indirectly_comparable.h
+++ b/libcxx/include/__cxx03/__iterator/indirectly_comparable.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_INDIRECTLY_COMPARABLE_H
-#define _LIBCPP___ITERATOR_INDIRECTLY_COMPARABLE_H
+#ifndef _LIBCPP___CXX03___ITERATOR_INDIRECTLY_COMPARABLE_H
+#define _LIBCPP___CXX03___ITERATOR_INDIRECTLY_COMPARABLE_H
#include <__cxx03/__config>
#include <__cxx03/__functional/identity.h>
@@ -30,4 +30,4 @@ concept indirectly_comparable = indirect_binary_predicate<_Rp, projected<_I1, _P
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_INDIRECTLY_COMPARABLE_H
+#endif // _LIBCPP___CXX03___ITERATOR_INDIRECTLY_COMPARABLE_H
diff --git a/libcxx/include/__cxx03/__iterator/insert_iterator.h b/libcxx/include/__cxx03/__iterator/insert_iterator.h
index 1f0320acda854d..ef063ab73fced7 100644
--- a/libcxx/include/__cxx03/__iterator/insert_iterator.h
+++ b/libcxx/include/__cxx03/__iterator/insert_iterator.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_INSERT_ITERATOR_H
-#define _LIBCPP___ITERATOR_INSERT_ITERATOR_H
+#ifndef _LIBCPP___CXX03___ITERATOR_INSERT_ITERATOR_H
+#define _LIBCPP___CXX03___ITERATOR_INSERT_ITERATOR_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/iterator.h>
@@ -92,4 +92,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ITERATOR_INSERT_ITERATOR_H
+#endif // _LIBCPP___CXX03___ITERATOR_INSERT_ITERATOR_H
diff --git a/libcxx/include/__cxx03/__iterator/istream_iterator.h b/libcxx/include/__cxx03/__iterator/istream_iterator.h
index af0f477358a7f9..71ca4ebc4a384e 100644
--- a/libcxx/include/__cxx03/__iterator/istream_iterator.h
+++ b/libcxx/include/__cxx03/__iterator/istream_iterator.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_ISTREAM_ITERATOR_H
-#define _LIBCPP___ITERATOR_ISTREAM_ITERATOR_H
+#ifndef _LIBCPP___CXX03___ITERATOR_ISTREAM_ITERATOR_H
+#define _LIBCPP___CXX03___ITERATOR_ISTREAM_ITERATOR_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/istream.h>
@@ -98,4 +98,4 @@ inline _LIBCPP_HIDE_FROM_ABI bool operator!=(const istream_iterator<_Tp, _CharT,
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_ISTREAM_ITERATOR_H
+#endif // _LIBCPP___CXX03___ITERATOR_ISTREAM_ITERATOR_H
diff --git a/libcxx/include/__cxx03/__iterator/istreambuf_iterator.h b/libcxx/include/__cxx03/__iterator/istreambuf_iterator.h
index 73da5951728482..768747d490cc0b 100644
--- a/libcxx/include/__cxx03/__iterator/istreambuf_iterator.h
+++ b/libcxx/include/__cxx03/__iterator/istreambuf_iterator.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_ISTREAMBUF_ITERATOR_H
-#define _LIBCPP___ITERATOR_ISTREAMBUF_ITERATOR_H
+#ifndef _LIBCPP___CXX03___ITERATOR_ISTREAMBUF_ITERATOR_H
+#define _LIBCPP___CXX03___ITERATOR_ISTREAMBUF_ITERATOR_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/istream.h>
@@ -106,4 +106,4 @@ operator!=(const istreambuf_iterator<_CharT, _Traits>& __a, const istreambuf_ite
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_ISTREAMBUF_ITERATOR_H
+#endif // _LIBCPP___CXX03___ITERATOR_ISTREAMBUF_ITERATOR_H
diff --git a/libcxx/include/__cxx03/__iterator/iter_move.h b/libcxx/include/__cxx03/__iterator/iter_move.h
index f45baaaf63c1ec..ad33ea065f003d 100644
--- a/libcxx/include/__cxx03/__iterator/iter_move.h
+++ b/libcxx/include/__cxx03/__iterator/iter_move.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_ITER_MOVE_H
-#define _LIBCPP___ITERATOR_ITER_MOVE_H
+#ifndef _LIBCPP___CXX03___ITERATOR_ITER_MOVE_H
+#define _LIBCPP___CXX03___ITERATOR_ITER_MOVE_H
#include <__cxx03/__concepts/class_or_enum.h>
#include <__cxx03/__config>
@@ -100,4 +100,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ITERATOR_ITER_MOVE_H
+#endif // _LIBCPP___CXX03___ITERATOR_ITER_MOVE_H
diff --git a/libcxx/include/__cxx03/__iterator/iter_swap.h b/libcxx/include/__cxx03/__iterator/iter_swap.h
index c3a7e164ff6f60..b61092dee724fe 100644
--- a/libcxx/include/__cxx03/__iterator/iter_swap.h
+++ b/libcxx/include/__cxx03/__iterator/iter_swap.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_ITER_SWAP_H
-#define _LIBCPP___ITERATOR_ITER_SWAP_H
+#ifndef _LIBCPP___CXX03___ITERATOR_ITER_SWAP_H
+#define _LIBCPP___CXX03___ITERATOR_ITER_SWAP_H
#include <__cxx03/__concepts/class_or_enum.h>
#include <__cxx03/__concepts/swappable.h>
@@ -105,4 +105,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ITERATOR_ITER_SWAP_H
+#endif // _LIBCPP___CXX03___ITERATOR_ITER_SWAP_H
diff --git a/libcxx/include/__cxx03/__iterator/iterator.h b/libcxx/include/__cxx03/__iterator/iterator.h
index 5d9648ce6a06f8..60114ffc5b4dcd 100644
--- a/libcxx/include/__cxx03/__iterator/iterator.h
+++ b/libcxx/include/__cxx03/__iterator/iterator.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_ITERATOR_H
-#define _LIBCPP___ITERATOR_ITERATOR_H
+#ifndef _LIBCPP___CXX03___ITERATOR_ITERATOR_H
+#define _LIBCPP___CXX03___ITERATOR_ITERATOR_H
#include <__cxx03/__config>
#include <__cxx03/cstddef>
@@ -30,4 +30,4 @@ struct _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX17 iterator {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_ITERATOR_H
+#endif // _LIBCPP___CXX03___ITERATOR_ITERATOR_H
diff --git a/libcxx/include/__cxx03/__iterator/iterator_traits.h b/libcxx/include/__cxx03/__iterator/iterator_traits.h
index 7efd0c81c9301c..66bab3ddd7e57c 100644
--- a/libcxx/include/__cxx03/__iterator/iterator_traits.h
+++ b/libcxx/include/__cxx03/__iterator/iterator_traits.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_ITERATOR_TRAITS_H
-#define _LIBCPP___ITERATOR_ITERATOR_TRAITS_H
+#ifndef _LIBCPP___CXX03___ITERATOR_ITERATOR_TRAITS_H
+#define _LIBCPP___CXX03___ITERATOR_ITERATOR_TRAITS_H
#include <__cxx03/__concepts/arithmetic.h>
#include <__cxx03/__concepts/constructible.h>
@@ -525,4 +525,4 @@ using iter_value_t =
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_ITERATOR_TRAITS_H
+#endif // _LIBCPP___CXX03___ITERATOR_ITERATOR_TRAITS_H
diff --git a/libcxx/include/__cxx03/__iterator/iterator_with_data.h b/libcxx/include/__cxx03/__iterator/iterator_with_data.h
index fb7aafc38a30c2..e6aa66922237b3 100644
--- a/libcxx/include/__cxx03/__iterator/iterator_with_data.h
+++ b/libcxx/include/__cxx03/__iterator/iterator_with_data.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_ITERATOR_WITH_DATA_H
-#define _LIBCPP___ITERATOR_ITERATOR_WITH_DATA_H
+#ifndef _LIBCPP___CXX03___ITERATOR_ITERATOR_WITH_DATA_H
+#define _LIBCPP___CXX03___ITERATOR_ITERATOR_WITH_DATA_H
#include <__cxx03/__compare/compare_three_way_result.h>
#include <__cxx03/__compare/three_way_comparable.h>
@@ -102,4 +102,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ITERATOR_ITERATOR_WITH_DATA_H
+#endif // _LIBCPP___CXX03___ITERATOR_ITERATOR_WITH_DATA_H
diff --git a/libcxx/include/__cxx03/__iterator/mergeable.h b/libcxx/include/__cxx03/__iterator/mergeable.h
index a20134defa87fd..5e54fd28a33ff5 100644
--- a/libcxx/include/__cxx03/__iterator/mergeable.h
+++ b/libcxx/include/__cxx03/__iterator/mergeable.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_MERGEABLE_H
-#define _LIBCPP___ITERATOR_MERGEABLE_H
+#ifndef _LIBCPP___CXX03___ITERATOR_MERGEABLE_H
+#define _LIBCPP___CXX03___ITERATOR_MERGEABLE_H
#include <__cxx03/__config>
#include <__cxx03/__functional/identity.h>
@@ -39,4 +39,4 @@ concept mergeable =
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_MERGEABLE_H
+#endif // _LIBCPP___CXX03___ITERATOR_MERGEABLE_H
diff --git a/libcxx/include/__cxx03/__iterator/move_iterator.h b/libcxx/include/__cxx03/__iterator/move_iterator.h
index 701f51a272da6c..0fbcfdd0c1d9f7 100644
--- a/libcxx/include/__cxx03/__iterator/move_iterator.h
+++ b/libcxx/include/__cxx03/__iterator/move_iterator.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_MOVE_ITERATOR_H
-#define _LIBCPP___ITERATOR_MOVE_ITERATOR_H
+#ifndef _LIBCPP___CXX03___ITERATOR_MOVE_ITERATOR_H
+#define _LIBCPP___CXX03___ITERATOR_MOVE_ITERATOR_H
#include <__cxx03/__compare/compare_three_way_result.h>
#include <__cxx03/__compare/three_way_comparable.h>
@@ -344,4 +344,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ITERATOR_MOVE_ITERATOR_H
+#endif // _LIBCPP___CXX03___ITERATOR_MOVE_ITERATOR_H
diff --git a/libcxx/include/__cxx03/__iterator/move_sentinel.h b/libcxx/include/__cxx03/__iterator/move_sentinel.h
index 8518bcf39ea96b..cb4cf95a8c6ecc 100644
--- a/libcxx/include/__cxx03/__iterator/move_sentinel.h
+++ b/libcxx/include/__cxx03/__iterator/move_sentinel.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_MOVE_SENTINEL_H
-#define _LIBCPP___ITERATOR_MOVE_SENTINEL_H
+#ifndef _LIBCPP___CXX03___ITERATOR_MOVE_SENTINEL_H
+#define _LIBCPP___CXX03___ITERATOR_MOVE_SENTINEL_H
#include <__cxx03/__concepts/assignable.h>
#include <__cxx03/__concepts/convertible_to.h>
@@ -58,4 +58,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___ITERATOR_MOVE_SENTINEL_H
+#endif // _LIBCPP___CXX03___ITERATOR_MOVE_SENTINEL_H
diff --git a/libcxx/include/__cxx03/__iterator/next.h b/libcxx/include/__cxx03/__iterator/next.h
index 554760347606ef..459702fd437439 100644
--- a/libcxx/include/__cxx03/__iterator/next.h
+++ b/libcxx/include/__cxx03/__iterator/next.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_NEXT_H
-#define _LIBCPP___ITERATOR_NEXT_H
+#ifndef _LIBCPP___CXX03___ITERATOR_NEXT_H
+#define _LIBCPP___CXX03___ITERATOR_NEXT_H
#include <__cxx03/__assert>
#include <__cxx03/__config>
@@ -80,4 +80,4 @@ inline constexpr auto next = __next::__fn{};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_NEXT_H
+#endif // _LIBCPP___CXX03___ITERATOR_NEXT_H
diff --git a/libcxx/include/__cxx03/__iterator/ostream_iterator.h b/libcxx/include/__cxx03/__iterator/ostream_iterator.h
index 40f737831f4098..100cc54045bb30 100644
--- a/libcxx/include/__cxx03/__iterator/ostream_iterator.h
+++ b/libcxx/include/__cxx03/__iterator/ostream_iterator.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_OSTREAM_ITERATOR_H
-#define _LIBCPP___ITERATOR_OSTREAM_ITERATOR_H
+#ifndef _LIBCPP___CXX03___ITERATOR_OSTREAM_ITERATOR_H
+#define _LIBCPP___CXX03___ITERATOR_OSTREAM_ITERATOR_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/ostream.h>
@@ -72,4 +72,4 @@ class _LIBCPP_TEMPLATE_VIS ostream_iterator
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_OSTREAM_ITERATOR_H
+#endif // _LIBCPP___CXX03___ITERATOR_OSTREAM_ITERATOR_H
diff --git a/libcxx/include/__cxx03/__iterator/ostreambuf_iterator.h b/libcxx/include/__cxx03/__iterator/ostreambuf_iterator.h
index 363279ce684e18..b5472b33b77114 100644
--- a/libcxx/include/__cxx03/__iterator/ostreambuf_iterator.h
+++ b/libcxx/include/__cxx03/__iterator/ostreambuf_iterator.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_OSTREAMBUF_ITERATOR_H
-#define _LIBCPP___ITERATOR_OSTREAMBUF_ITERATOR_H
+#ifndef _LIBCPP___CXX03___ITERATOR_OSTREAMBUF_ITERATOR_H
+#define _LIBCPP___CXX03___ITERATOR_OSTREAMBUF_ITERATOR_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/iterator.h>
@@ -69,4 +69,4 @@ class _LIBCPP_TEMPLATE_VIS ostreambuf_iterator
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_OSTREAMBUF_ITERATOR_H
+#endif // _LIBCPP___CXX03___ITERATOR_OSTREAMBUF_ITERATOR_H
diff --git a/libcxx/include/__cxx03/__iterator/permutable.h b/libcxx/include/__cxx03/__iterator/permutable.h
index c2641de963de75..368c4089f13162 100644
--- a/libcxx/include/__cxx03/__iterator/permutable.h
+++ b/libcxx/include/__cxx03/__iterator/permutable.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_PERMUTABLE_H
-#define _LIBCPP___ITERATOR_PERMUTABLE_H
+#ifndef _LIBCPP___CXX03___ITERATOR_PERMUTABLE_H
+#define _LIBCPP___CXX03___ITERATOR_PERMUTABLE_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/concepts.h>
@@ -31,4 +31,4 @@ concept permutable =
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_PERMUTABLE_H
+#endif // _LIBCPP___CXX03___ITERATOR_PERMUTABLE_H
diff --git a/libcxx/include/__cxx03/__iterator/prev.h b/libcxx/include/__cxx03/__iterator/prev.h
index 7256f2d0a0fafa..c272e52a9349b1 100644
--- a/libcxx/include/__cxx03/__iterator/prev.h
+++ b/libcxx/include/__cxx03/__iterator/prev.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_PREV_H
-#define _LIBCPP___ITERATOR_PREV_H
+#ifndef _LIBCPP___CXX03___ITERATOR_PREV_H
+#define _LIBCPP___CXX03___ITERATOR_PREV_H
#include <__cxx03/__assert>
#include <__cxx03/__config>
@@ -73,4 +73,4 @@ inline constexpr auto prev = __prev::__fn{};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_PREV_H
+#endif // _LIBCPP___CXX03___ITERATOR_PREV_H
diff --git a/libcxx/include/__cxx03/__iterator/projected.h b/libcxx/include/__cxx03/__iterator/projected.h
index 582d1921206202..b80b7d56da8905 100644
--- a/libcxx/include/__cxx03/__iterator/projected.h
+++ b/libcxx/include/__cxx03/__iterator/projected.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_PROJECTED_H
-#define _LIBCPP___ITERATOR_PROJECTED_H
+#ifndef _LIBCPP___CXX03___ITERATOR_PROJECTED_H
+#define _LIBCPP___CXX03___ITERATOR_PROJECTED_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/concepts.h>
@@ -50,4 +50,4 @@ using projected = typename __projected_impl<_It, _Proj>::__type;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_PROJECTED_H
+#endif // _LIBCPP___CXX03___ITERATOR_PROJECTED_H
diff --git a/libcxx/include/__cxx03/__iterator/ranges_iterator_traits.h b/libcxx/include/__cxx03/__iterator/ranges_iterator_traits.h
index 0dddc16575390c..b2333ace6d631a 100644
--- a/libcxx/include/__cxx03/__iterator/ranges_iterator_traits.h
+++ b/libcxx/include/__cxx03/__iterator/ranges_iterator_traits.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_RANGES_ITERATOR_TRAITS_H
-#define _LIBCPP___ITERATOR_RANGES_ITERATOR_TRAITS_H
+#ifndef _LIBCPP___CXX03___ITERATOR_RANGES_ITERATOR_TRAITS_H
+#define _LIBCPP___CXX03___ITERATOR_RANGES_ITERATOR_TRAITS_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/pair.h>
@@ -37,4 +37,4 @@ using __range_to_alloc_type =
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_RANGES_ITERATOR_TRAITS_H
+#endif // _LIBCPP___CXX03___ITERATOR_RANGES_ITERATOR_TRAITS_H
diff --git a/libcxx/include/__cxx03/__iterator/readable_traits.h b/libcxx/include/__cxx03/__iterator/readable_traits.h
index 07ef5e30ae4692..c7b21649d8a188 100644
--- a/libcxx/include/__cxx03/__iterator/readable_traits.h
+++ b/libcxx/include/__cxx03/__iterator/readable_traits.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_READABLE_TRAITS_H
-#define _LIBCPP___ITERATOR_READABLE_TRAITS_H
+#ifndef _LIBCPP___CXX03___ITERATOR_READABLE_TRAITS_H
+#define _LIBCPP___CXX03___ITERATOR_READABLE_TRAITS_H
#include <__cxx03/__concepts/same_as.h>
#include <__cxx03/__config>
@@ -78,4 +78,4 @@ struct indirectly_readable_traits<_Tp> : __cond_value_type<typename _Tp::value_t
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_READABLE_TRAITS_H
+#endif // _LIBCPP___CXX03___ITERATOR_READABLE_TRAITS_H
diff --git a/libcxx/include/__cxx03/__iterator/reverse_access.h b/libcxx/include/__cxx03/__iterator/reverse_access.h
index f307fd8b01b5eb..bea5b1412c1f94 100644
--- a/libcxx/include/__cxx03/__iterator/reverse_access.h
+++ b/libcxx/include/__cxx03/__iterator/reverse_access.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_REVERSE_ACCESS_H
-#define _LIBCPP___ITERATOR_REVERSE_ACCESS_H
+#ifndef _LIBCPP___CXX03___ITERATOR_REVERSE_ACCESS_H
+#define _LIBCPP___CXX03___ITERATOR_REVERSE_ACCESS_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/reverse_iterator.h>
@@ -77,4 +77,4 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX17 auto crend(const _Cp& __c) -
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_REVERSE_ACCESS_H
+#endif // _LIBCPP___CXX03___ITERATOR_REVERSE_ACCESS_H
diff --git a/libcxx/include/__cxx03/__iterator/reverse_iterator.h b/libcxx/include/__cxx03/__iterator/reverse_iterator.h
index 000da25a0f3305..b95ca27ff5fb05 100644
--- a/libcxx/include/__cxx03/__iterator/reverse_iterator.h
+++ b/libcxx/include/__cxx03/__iterator/reverse_iterator.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_REVERSE_ITERATOR_H
-#define _LIBCPP___ITERATOR_REVERSE_ITERATOR_H
+#ifndef _LIBCPP___CXX03___ITERATOR_REVERSE_ITERATOR_H
+#define _LIBCPP___CXX03___ITERATOR_REVERSE_ITERATOR_H
#include <__cxx03/__algorithm/unwrap_iter.h>
#include <__cxx03/__compare/compare_three_way_result.h>
@@ -343,4 +343,4 @@ struct __unwrap_iter_impl<reverse_iterator<reverse_iterator<_Iter> >, __b> {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_REVERSE_ITERATOR_H
+#endif // _LIBCPP___CXX03___ITERATOR_REVERSE_ITERATOR_H
diff --git a/libcxx/include/__cxx03/__iterator/segmented_iterator.h b/libcxx/include/__cxx03/__iterator/segmented_iterator.h
index 93cd8e195eb05b..7e353d620dc837 100644
--- a/libcxx/include/__cxx03/__iterator/segmented_iterator.h
+++ b/libcxx/include/__cxx03/__iterator/segmented_iterator.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___SEGMENTED_ITERATOR_H
-#define _LIBCPP___SEGMENTED_ITERATOR_H
+#ifndef _LIBCPP___CXX03___SEGMENTED_ITERATOR_H
+#define _LIBCPP___CXX03___SEGMENTED_ITERATOR_H
// Segmented iterators are iterators over (not necessarily contiguous) sub-ranges.
//
@@ -76,4 +76,4 @@ using __is_segmented_iterator = __has_specialization<__segmented_iterator_traits
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___SEGMENTED_ITERATOR_H
+#endif // _LIBCPP___CXX03___SEGMENTED_ITERATOR_H
diff --git a/libcxx/include/__cxx03/__iterator/size.h b/libcxx/include/__cxx03/__iterator/size.h
index 3e8c2537f723fb..b0374a6c59e1c9 100644
--- a/libcxx/include/__cxx03/__iterator/size.h
+++ b/libcxx/include/__cxx03/__iterator/size.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_SIZE_H
-#define _LIBCPP___ITERATOR_SIZE_H
+#ifndef _LIBCPP___CXX03___ITERATOR_SIZE_H
+#define _LIBCPP___CXX03___ITERATOR_SIZE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/common_type.h>
@@ -56,4 +56,4 @@ _LIBCPP_DIAGNOSTIC_POP
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_SIZE_H
+#endif // _LIBCPP___CXX03___ITERATOR_SIZE_H
diff --git a/libcxx/include/__cxx03/__iterator/sortable.h b/libcxx/include/__cxx03/__iterator/sortable.h
index 5c32629ff55dc2..ae82f0f615432e 100644
--- a/libcxx/include/__cxx03/__iterator/sortable.h
+++ b/libcxx/include/__cxx03/__iterator/sortable.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_SORTABLE_H
-#define _LIBCPP___ITERATOR_SORTABLE_H
+#ifndef _LIBCPP___CXX03___ITERATOR_SORTABLE_H
+#define _LIBCPP___CXX03___ITERATOR_SORTABLE_H
#include <__cxx03/__config>
#include <__cxx03/__functional/identity.h>
@@ -32,4 +32,4 @@ concept sortable = permutable<_Iter> && indirect_strict_weak_order<_Comp, projec
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_SORTABLE_H
+#endif // _LIBCPP___CXX03___ITERATOR_SORTABLE_H
diff --git a/libcxx/include/__cxx03/__iterator/unreachable_sentinel.h b/libcxx/include/__cxx03/__iterator/unreachable_sentinel.h
index 29d76409728ff5..6184692b4074a3 100644
--- a/libcxx/include/__cxx03/__iterator/unreachable_sentinel.h
+++ b/libcxx/include/__cxx03/__iterator/unreachable_sentinel.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_UNREACHABLE_SENTINEL_H
-#define _LIBCPP___ITERATOR_UNREACHABLE_SENTINEL_H
+#ifndef _LIBCPP___CXX03___ITERATOR_UNREACHABLE_SENTINEL_H
+#define _LIBCPP___CXX03___ITERATOR_UNREACHABLE_SENTINEL_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/concepts.h>
@@ -34,4 +34,4 @@ inline constexpr unreachable_sentinel_t unreachable_sentinel{};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_UNREACHABLE_SENTINEL_H
+#endif // _LIBCPP___CXX03___ITERATOR_UNREACHABLE_SENTINEL_H
diff --git a/libcxx/include/__cxx03/__iterator/wrap_iter.h b/libcxx/include/__cxx03/__iterator/wrap_iter.h
index 5ef909c19f4d34..8e7df134909746 100644
--- a/libcxx/include/__cxx03/__iterator/wrap_iter.h
+++ b/libcxx/include/__cxx03/__iterator/wrap_iter.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ITERATOR_WRAP_ITER_H
-#define _LIBCPP___ITERATOR_WRAP_ITER_H
+#ifndef _LIBCPP___CXX03___ITERATOR_WRAP_ITER_H
+#define _LIBCPP___CXX03___ITERATOR_WRAP_ITER_H
#include <__cxx03/__compare/ordering.h>
#include <__cxx03/__compare/three_way_comparable.h>
@@ -241,4 +241,4 @@ struct _LIBCPP_TEMPLATE_VIS pointer_traits<__wrap_iter<_It> > {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ITERATOR_WRAP_ITER_H
+#endif // _LIBCPP___CXX03___ITERATOR_WRAP_ITER_H
diff --git a/libcxx/include/__cxx03/__locale b/libcxx/include/__cxx03/__locale
index 7324aa2390ce70..383b56a1942e81 100644
--- a/libcxx/include/__cxx03/__locale
+++ b/libcxx/include/__cxx03/__locale
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___LOCALE
-#define _LIBCPP___LOCALE
+#ifndef _LIBCPP___CXX03___LOCALE
+#define _LIBCPP___CXX03___LOCALE
#include <__cxx03/__config>
#include <__cxx03/__locale_dir/locale_base_api.h>
@@ -1510,4 +1510,4 @@ private:
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___LOCALE
+#endif // _LIBCPP___CXX03___LOCALE
diff --git a/libcxx/include/__cxx03/__locale_dir/locale_base_api.h b/libcxx/include/__cxx03/__locale_dir/locale_base_api.h
index e62ebb17765d7a..a20f0952f52c3b 100644
--- a/libcxx/include/__cxx03/__locale_dir/locale_base_api.h
+++ b/libcxx/include/__cxx03/__locale_dir/locale_base_api.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_H
-#define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_H
+#ifndef _LIBCPP___CXX03___LOCALE_DIR_LOCALE_BASE_API_H
+#define _LIBCPP___CXX03___LOCALE_DIR_LOCALE_BASE_API_H
#if defined(_LIBCPP_MSVCRT_LIKE)
# include <__cxx03/__locale_dir/locale_base_api/win32.h>
@@ -95,4 +95,4 @@ except that locale_t is used instead of the current global locale.
The variadic functions may be implemented as templates with a parameter pack instead of variadic functions.
*/
-#endif // _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_H
+#endif // _LIBCPP___CXX03___LOCALE_DIR_LOCALE_BASE_API_H
diff --git a/libcxx/include/__cxx03/__locale_dir/locale_base_api/android.h b/libcxx/include/__cxx03/__locale_dir/locale_base_api/android.h
index b943c82c62298e..265dbf892a54f6 100644
--- a/libcxx/include/__cxx03/__locale_dir/locale_base_api/android.h
+++ b/libcxx/include/__cxx03/__locale_dir/locale_base_api/android.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___LOCALE_LOCALE_BASE_API_ANDROID_H
-#define _LIBCPP___LOCALE_LOCALE_BASE_API_ANDROID_H
+#ifndef _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_ANDROID_H
+#define _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_ANDROID_H
#include <__cxx03/stdlib.h>
@@ -47,4 +47,4 @@ inline _LIBCPP_HIDE_FROM_ABI double strtod_l(const char* __nptr, char** __endptr
# endif // __NDK_MAJOR__ <= 16
#endif // __has_include(<android/ndk-version.h>)
-#endif // _LIBCPP___LOCALE_LOCALE_BASE_API_ANDROID_H
+#endif // _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_ANDROID_H
diff --git a/libcxx/include/__cxx03/__locale_dir/locale_base_api/bsd_locale_defaults.h b/libcxx/include/__cxx03/__locale_dir/locale_base_api/bsd_locale_defaults.h
index 1f9607209842ca..35bf30c07fde18 100644
--- a/libcxx/include/__cxx03/__locale_dir/locale_base_api/bsd_locale_defaults.h
+++ b/libcxx/include/__cxx03/__locale_dir/locale_base_api/bsd_locale_defaults.h
@@ -11,8 +11,8 @@
// we will define the mapping from an internal macro to the real BSD symbol.
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___LOCALE_LOCALE_BASE_API_BSD_LOCALE_DEFAULTS_H
-#define _LIBCPP___LOCALE_LOCALE_BASE_API_BSD_LOCALE_DEFAULTS_H
+#ifndef _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_BSD_LOCALE_DEFAULTS_H
+#define _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_BSD_LOCALE_DEFAULTS_H
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
# pragma GCC system_header
@@ -33,4 +33,4 @@
#define __libcpp_asprintf_l(...) asprintf_l(__VA_ARGS__)
#define __libcpp_sscanf_l(...) sscanf_l(__VA_ARGS__)
-#endif // _LIBCPP___LOCALE_LOCALE_BASE_API_BSD_LOCALE_DEFAULTS_H
+#endif // _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_BSD_LOCALE_DEFAULTS_H
diff --git a/libcxx/include/__cxx03/__locale_dir/locale_base_api/bsd_locale_fallbacks.h b/libcxx/include/__cxx03/__locale_dir/locale_base_api/bsd_locale_fallbacks.h
index 129cacb317ee44..e61e950a42c77c 100644
--- a/libcxx/include/__cxx03/__locale_dir/locale_base_api/bsd_locale_fallbacks.h
+++ b/libcxx/include/__cxx03/__locale_dir/locale_base_api/bsd_locale_fallbacks.h
@@ -10,8 +10,8 @@
// of those functions for non-BSD platforms.
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___LOCALE_LOCALE_BASE_API_BSD_LOCALE_FALLBACKS_H
-#define _LIBCPP___LOCALE_LOCALE_BASE_API_BSD_LOCALE_FALLBACKS_H
+#ifndef _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_BSD_LOCALE_FALLBACKS_H
+#define _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_BSD_LOCALE_FALLBACKS_H
#include <__cxx03/__locale_dir/locale_base_api/locale_guard.h>
#include <__cxx03/cstdio>
@@ -123,4 +123,4 @@ inline _LIBCPP_ATTRIBUTE_FORMAT(__scanf__, 3, 4) int __libcpp_sscanf_l(
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___LOCALE_LOCALE_BASE_API_BSD_LOCALE_FALLBACKS_H
+#endif // _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_BSD_LOCALE_FALLBACKS_H
diff --git a/libcxx/include/__cxx03/__locale_dir/locale_base_api/fuchsia.h b/libcxx/include/__cxx03/__locale_dir/locale_base_api/fuchsia.h
index 74d017d07435d5..6ee6a3a1c87559 100644
--- a/libcxx/include/__cxx03/__locale_dir/locale_base_api/fuchsia.h
+++ b/libcxx/include/__cxx03/__locale_dir/locale_base_api/fuchsia.h
@@ -7,12 +7,12 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___LOCALE_LOCALE_BASE_API_FUCHSIA_H
-#define _LIBCPP___LOCALE_LOCALE_BASE_API_FUCHSIA_H
+#ifndef _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_FUCHSIA_H
+#define _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_FUCHSIA_H
#include <__cxx03/__support/xlocale/__posix_l_fallback.h>
#include <__cxx03/__support/xlocale/__strtonum_fallback.h>
#include <__cxx03/cstdlib>
#include <__cxx03/cwchar>
-#endif // _LIBCPP___LOCALE_LOCALE_BASE_API_FUCHSIA_H
+#endif // _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_FUCHSIA_H
diff --git a/libcxx/include/__cxx03/__locale_dir/locale_base_api/ibm.h b/libcxx/include/__cxx03/__locale_dir/locale_base_api/ibm.h
index ff4b2f8b272cd7..0fab9d24d84b68 100644
--- a/libcxx/include/__cxx03/__locale_dir/locale_base_api/ibm.h
+++ b/libcxx/include/__cxx03/__locale_dir/locale_base_api/ibm.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___LOCALE_LOCALE_BASE_API_IBM_H
-#define _LIBCPP___LOCALE_LOCALE_BASE_API_IBM_H
+#ifndef _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_IBM_H
+#define _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_IBM_H
#if defined(__MVS__)
# include <__cxx03/__support/ibm/locale_mgmt_zos.h>
@@ -105,4 +105,4 @@ _LIBCPP_ATTRIBUTE_FORMAT(__printf__, 2, 0) int vasprintf(char** strp, const char
return str_size;
}
-#endif // _LIBCPP___LOCALE_LOCALE_BASE_API_IBM_H
+#endif // _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_IBM_H
diff --git a/libcxx/include/__cxx03/__locale_dir/locale_base_api/locale_guard.h b/libcxx/include/__cxx03/__locale_dir/locale_base_api/locale_guard.h
index 17eade28f35f39..e3583634e4322b 100644
--- a/libcxx/include/__cxx03/__locale_dir/locale_base_api/locale_guard.h
+++ b/libcxx/include/__cxx03/__locale_dir/locale_base_api/locale_guard.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___LOCALE_LOCALE_BASE_API_LOCALE_GUARD_H
-#define _LIBCPP___LOCALE_LOCALE_BASE_API_LOCALE_GUARD_H
+#ifndef _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_LOCALE_GUARD_H
+#define _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_LOCALE_GUARD_H
#include <__cxx03/__config>
#include <__cxx03/__locale> // for locale_t
@@ -75,4 +75,4 @@ struct __libcpp_locale_guard {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___LOCALE_LOCALE_BASE_API_LOCALE_GUARD_H
+#endif // _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_LOCALE_GUARD_H
diff --git a/libcxx/include/__cxx03/__locale_dir/locale_base_api/musl.h b/libcxx/include/__cxx03/__locale_dir/locale_base_api/musl.h
index f67511f4a0bc54..e2d23d49c9e455 100644
--- a/libcxx/include/__cxx03/__locale_dir/locale_base_api/musl.h
+++ b/libcxx/include/__cxx03/__locale_dir/locale_base_api/musl.h
@@ -14,8 +14,8 @@
// in Musl.
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___LOCALE_LOCALE_BASE_API_MUSL_H
-#define _LIBCPP___LOCALE_LOCALE_BASE_API_MUSL_H
+#ifndef _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_MUSL_H
+#define _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_MUSL_H
#include <__cxx03/cstdlib>
#include <__cxx03/cwchar>
@@ -28,4 +28,4 @@ inline _LIBCPP_HIDE_FROM_ABI unsigned long long strtoull_l(const char* __nptr, c
return ::strtoull(__nptr, __endptr, __base);
}
-#endif // _LIBCPP___LOCALE_LOCALE_BASE_API_MUSL_H
+#endif // _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_MUSL_H
diff --git a/libcxx/include/__cxx03/__locale_dir/locale_base_api/newlib.h b/libcxx/include/__cxx03/__locale_dir/locale_base_api/newlib.h
index a8c1cff16e6d80..e52d90794556a4 100644
--- a/libcxx/include/__cxx03/__locale_dir/locale_base_api/newlib.h
+++ b/libcxx/include/__cxx03/__locale_dir/locale_base_api/newlib.h
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___LOCALE_LOCALE_BASE_API_NEWLIB_H
-#define _LIBCPP___LOCALE_LOCALE_BASE_API_NEWLIB_H
+#ifndef _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_NEWLIB_H
+#define _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_NEWLIB_H
-#endif // _LIBCPP___LOCALE_LOCALE_BASE_API_NEWLIB_H
+#endif // _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_NEWLIB_H
diff --git a/libcxx/include/__cxx03/__locale_dir/locale_base_api/openbsd.h b/libcxx/include/__cxx03/__locale_dir/locale_base_api/openbsd.h
index effd9e0d76b1c2..6b64607d484d34 100644
--- a/libcxx/include/__cxx03/__locale_dir/locale_base_api/openbsd.h
+++ b/libcxx/include/__cxx03/__locale_dir/locale_base_api/openbsd.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___LOCALE_LOCALE_BASE_API_OPENBSD_H
-#define _LIBCPP___LOCALE_LOCALE_BASE_API_OPENBSD_H
+#ifndef _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_OPENBSD_H
+#define _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_OPENBSD_H
#include <__cxx03/__support/xlocale/__strtonum_fallback.h>
#include <__cxx03/clocale>
@@ -16,4 +16,4 @@
#include <__cxx03/ctype.h>
#include <__cxx03/cwctype>
-#endif // _LIBCPP___LOCALE_LOCALE_BASE_API_OPENBSD_H
+#endif // _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_OPENBSD_H
diff --git a/libcxx/include/__cxx03/__locale_dir/locale_base_api/win32.h b/libcxx/include/__cxx03/__locale_dir/locale_base_api/win32.h
index 60b9435039f6d1..5f85acf88e6f0e 100644
--- a/libcxx/include/__cxx03/__locale_dir/locale_base_api/win32.h
+++ b/libcxx/include/__cxx03/__locale_dir/locale_base_api/win32.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___LOCALE_LOCALE_BASE_API_WIN32_H
-#define _LIBCPP___LOCALE_LOCALE_BASE_API_WIN32_H
+#ifndef _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_WIN32_H
+#define _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_WIN32_H
#include <__cxx03/__config>
#include <__cxx03/cstddef>
@@ -232,4 +232,4 @@ _LIBCPP_EXPORTED_FROM_ABI int vasprintf_l(char** __ret, locale_t __loc, const ch
// not-so-pressing FIXME: use locale to determine blank characters
inline int iswblank_l(wint_t __c, locale_t /*loc*/) { return (__c == L' ' || __c == L'\t'); }
-#endif // _LIBCPP___LOCALE_LOCALE_BASE_API_WIN32_H
+#endif // _LIBCPP___CXX03___LOCALE_LOCALE_BASE_API_WIN32_H
diff --git a/libcxx/include/__cxx03/__math/abs.h b/libcxx/include/__cxx03/__math/abs.h
index ad543e654c48b8..61fc58ac22692a 100644
--- a/libcxx/include/__cxx03/__math/abs.h
+++ b/libcxx/include/__cxx03/__math/abs.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MATH_ABS_H
-#define _LIBCPP___MATH_ABS_H
+#ifndef _LIBCPP___CXX03___MATH_ABS_H
+#define _LIBCPP___CXX03___MATH_ABS_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -43,4 +43,4 @@ _LIBCPP_NODISCARD inline _LIBCPP_HIDE_FROM_ABI double fabs(_A1 __x) _NOEXCEPT {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MATH_ABS_H
+#endif // _LIBCPP___CXX03___MATH_ABS_H
diff --git a/libcxx/include/__cxx03/__math/copysign.h b/libcxx/include/__cxx03/__math/copysign.h
index e70d6ee2867746..d20940604c6f99 100644
--- a/libcxx/include/__cxx03/__math/copysign.h
+++ b/libcxx/include/__cxx03/__math/copysign.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MATH_COPYSIGN_H
-#define _LIBCPP___MATH_COPYSIGN_H
+#ifndef _LIBCPP___CXX03___MATH_COPYSIGN_H
+#define _LIBCPP___CXX03___MATH_COPYSIGN_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -42,4 +42,4 @@ _LIBCPP_NODISCARD inline _LIBCPP_HIDE_FROM_ABI typename __promote<_A1, _A2>::typ
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MATH_COPYSIGN_H
+#endif // _LIBCPP___CXX03___MATH_COPYSIGN_H
diff --git a/libcxx/include/__cxx03/__math/error_functions.h b/libcxx/include/__cxx03/__math/error_functions.h
index 47f506096676e5..25cf059989862b 100644
--- a/libcxx/include/__cxx03/__math/error_functions.h
+++ b/libcxx/include/__cxx03/__math/error_functions.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MATH_ERROR_FUNCTIONS_H
-#define _LIBCPP___MATH_ERROR_FUNCTIONS_H
+#ifndef _LIBCPP___CXX03___MATH_ERROR_FUNCTIONS_H
+#define _LIBCPP___CXX03___MATH_ERROR_FUNCTIONS_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -57,4 +57,4 @@ inline _LIBCPP_HIDE_FROM_ABI double erfc(_A1 __x) _NOEXCEPT {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MATH_ERROR_FUNCTIONS_H
+#endif // _LIBCPP___CXX03___MATH_ERROR_FUNCTIONS_H
diff --git a/libcxx/include/__cxx03/__math/exponential_functions.h b/libcxx/include/__cxx03/__math/exponential_functions.h
index 2e988e1709541d..452d5d238f9104 100644
--- a/libcxx/include/__cxx03/__math/exponential_functions.h
+++ b/libcxx/include/__cxx03/__math/exponential_functions.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MATH_EXPONENTIAL_FUNCTIONS_H
-#define _LIBCPP___MATH_EXPONENTIAL_FUNCTIONS_H
+#ifndef _LIBCPP___CXX03___MATH_EXPONENTIAL_FUNCTIONS_H
+#define _LIBCPP___CXX03___MATH_EXPONENTIAL_FUNCTIONS_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -168,4 +168,4 @@ inline _LIBCPP_HIDE_FROM_ABI typename __promote<_A1, _A2>::type pow(_A1 __x, _A2
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MATH_EXPONENTIAL_FUNCTIONS_H
+#endif // _LIBCPP___CXX03___MATH_EXPONENTIAL_FUNCTIONS_H
diff --git a/libcxx/include/__cxx03/__math/fdim.h b/libcxx/include/__cxx03/__math/fdim.h
index 5f0c8ae34eba31..ac6fec44efcb44 100644
--- a/libcxx/include/__cxx03/__math/fdim.h
+++ b/libcxx/include/__cxx03/__math/fdim.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MATH_FDIM_H
-#define _LIBCPP___MATH_FDIM_H
+#ifndef _LIBCPP___CXX03___MATH_FDIM_H
+#define _LIBCPP___CXX03___MATH_FDIM_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -45,4 +45,4 @@ inline _LIBCPP_HIDE_FROM_ABI typename __promote<_A1, _A2>::type fdim(_A1 __x, _A
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MATH_FDIM_H
+#endif // _LIBCPP___CXX03___MATH_FDIM_H
diff --git a/libcxx/include/__cxx03/__math/fma.h b/libcxx/include/__cxx03/__math/fma.h
index b58bc1a9855f7b..ce7e92a330376b 100644
--- a/libcxx/include/__cxx03/__math/fma.h
+++ b/libcxx/include/__cxx03/__math/fma.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MATH_FMA_H
-#define _LIBCPP___MATH_FMA_H
+#ifndef _LIBCPP___CXX03___MATH_FMA_H
+#define _LIBCPP___CXX03___MATH_FMA_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -52,4 +52,4 @@ inline _LIBCPP_HIDE_FROM_ABI typename __promote<_A1, _A2, _A3>::type fma(_A1 __x
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MATH_FMA_H
+#endif // _LIBCPP___CXX03___MATH_FMA_H
diff --git a/libcxx/include/__cxx03/__math/gamma.h b/libcxx/include/__cxx03/__math/gamma.h
index 613ff0104def44..4d104988e2c9ec 100644
--- a/libcxx/include/__cxx03/__math/gamma.h
+++ b/libcxx/include/__cxx03/__math/gamma.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MATH_GAMMA_H
-#define _LIBCPP___MATH_GAMMA_H
+#ifndef _LIBCPP___CXX03___MATH_GAMMA_H
+#define _LIBCPP___CXX03___MATH_GAMMA_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -59,4 +59,4 @@ inline _LIBCPP_HIDE_FROM_ABI double tgamma(_A1 __x) _NOEXCEPT {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MATH_GAMMA_H
+#endif // _LIBCPP___CXX03___MATH_GAMMA_H
diff --git a/libcxx/include/__cxx03/__math/hyperbolic_functions.h b/libcxx/include/__cxx03/__math/hyperbolic_functions.h
index 63070ee4f000d5..2b765ca923cae6 100644
--- a/libcxx/include/__cxx03/__math/hyperbolic_functions.h
+++ b/libcxx/include/__cxx03/__math/hyperbolic_functions.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MATH_HYPERBOLIC_FUNCTIONS_H
-#define _LIBCPP___MATH_HYPERBOLIC_FUNCTIONS_H
+#ifndef _LIBCPP___CXX03___MATH_HYPERBOLIC_FUNCTIONS_H
+#define _LIBCPP___CXX03___MATH_HYPERBOLIC_FUNCTIONS_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -73,4 +73,4 @@ inline _LIBCPP_HIDE_FROM_ABI double tanh(_A1 __x) _NOEXCEPT {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MATH_HYPERBOLIC_FUNCTIONS_H
+#endif // _LIBCPP___CXX03___MATH_HYPERBOLIC_FUNCTIONS_H
diff --git a/libcxx/include/__cxx03/__math/hypot.h b/libcxx/include/__cxx03/__math/hypot.h
index cb032f0fd6991e..bd87fef5f5ed50 100644
--- a/libcxx/include/__cxx03/__math/hypot.h
+++ b/libcxx/include/__cxx03/__math/hypot.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MATH_HYPOT_H
-#define _LIBCPP___MATH_HYPOT_H
+#ifndef _LIBCPP___CXX03___MATH_HYPOT_H
+#define _LIBCPP___CXX03___MATH_HYPOT_H
#include <__cxx03/__algorithm/max.h>
#include <__cxx03/__config>
@@ -106,4 +106,4 @@ _LIBCPP_HIDE_FROM_ABI typename __promote<_A1, _A2, _A3>::type hypot(_A1 __x, _A2
_LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___MATH_HYPOT_H
+#endif // _LIBCPP___CXX03___MATH_HYPOT_H
diff --git a/libcxx/include/__cxx03/__math/inverse_hyperbolic_functions.h b/libcxx/include/__cxx03/__math/inverse_hyperbolic_functions.h
index 0701ead8a32f1a..b48689d159af04 100644
--- a/libcxx/include/__cxx03/__math/inverse_hyperbolic_functions.h
+++ b/libcxx/include/__cxx03/__math/inverse_hyperbolic_functions.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MATH_INVERSE_HYPERBOLIC_FUNCTIONS_H
-#define _LIBCPP___MATH_INVERSE_HYPERBOLIC_FUNCTIONS_H
+#ifndef _LIBCPP___CXX03___MATH_INVERSE_HYPERBOLIC_FUNCTIONS_H
+#define _LIBCPP___CXX03___MATH_INVERSE_HYPERBOLIC_FUNCTIONS_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -73,4 +73,4 @@ inline _LIBCPP_HIDE_FROM_ABI double atanh(_A1 __x) _NOEXCEPT {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MATH_INVERSE_HYPERBOLIC_FUNCTIONS_H
+#endif // _LIBCPP___CXX03___MATH_INVERSE_HYPERBOLIC_FUNCTIONS_H
diff --git a/libcxx/include/__cxx03/__math/inverse_trigonometric_functions.h b/libcxx/include/__cxx03/__math/inverse_trigonometric_functions.h
index 626295321627a5..573c9b1bdc8781 100644
--- a/libcxx/include/__cxx03/__math/inverse_trigonometric_functions.h
+++ b/libcxx/include/__cxx03/__math/inverse_trigonometric_functions.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS_H
-#define _LIBCPP___MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS_H
+#ifndef _LIBCPP___CXX03___MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS_H
+#define _LIBCPP___CXX03___MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -96,4 +96,4 @@ inline _LIBCPP_HIDE_FROM_ABI typename __promote<_A1, _A2>::type atan2(_A1 __y, _
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS_H
+#endif // _LIBCPP___CXX03___MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS_H
diff --git a/libcxx/include/__cxx03/__math/logarithms.h b/libcxx/include/__cxx03/__math/logarithms.h
index ad067abdb38133..25473501435cc4 100644
--- a/libcxx/include/__cxx03/__math/logarithms.h
+++ b/libcxx/include/__cxx03/__math/logarithms.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MATH_LOGARITHMS_H
-#define _LIBCPP___MATH_LOGARITHMS_H
+#ifndef _LIBCPP___CXX03___MATH_LOGARITHMS_H
+#define _LIBCPP___CXX03___MATH_LOGARITHMS_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -121,4 +121,4 @@ inline _LIBCPP_HIDE_FROM_ABI double logb(_A1 __x) _NOEXCEPT {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MATH_LOGARITHMS_H
+#endif // _LIBCPP___CXX03___MATH_LOGARITHMS_H
diff --git a/libcxx/include/__cxx03/__math/min_max.h b/libcxx/include/__cxx03/__math/min_max.h
index 717c8cf57e866e..4df5bc1ee0f77f 100644
--- a/libcxx/include/__cxx03/__math/min_max.h
+++ b/libcxx/include/__cxx03/__math/min_max.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MATH_MIN_MAX_H
-#define _LIBCPP___MATH_MIN_MAX_H
+#ifndef _LIBCPP___CXX03___MATH_MIN_MAX_H
+#define _LIBCPP___CXX03___MATH_MIN_MAX_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -71,4 +71,4 @@ _LIBCPP_NODISCARD inline _LIBCPP_HIDE_FROM_ABI typename __promote<_A1, _A2>::typ
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MATH_MIN_MAX_H
+#endif // _LIBCPP___CXX03___MATH_MIN_MAX_H
diff --git a/libcxx/include/__cxx03/__math/modulo.h b/libcxx/include/__cxx03/__math/modulo.h
index 4fe58b1bf45dd6..5a6124187c5d2e 100644
--- a/libcxx/include/__cxx03/__math/modulo.h
+++ b/libcxx/include/__cxx03/__math/modulo.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MATH_MODULO_H
-#define _LIBCPP___MATH_MODULO_H
+#ifndef _LIBCPP___CXX03___MATH_MODULO_H
+#define _LIBCPP___CXX03___MATH_MODULO_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -60,4 +60,4 @@ inline _LIBCPP_HIDE_FROM_ABI long double modf(long double __x, long double* __y)
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MATH_MODULO_H
+#endif // _LIBCPP___CXX03___MATH_MODULO_H
diff --git a/libcxx/include/__cxx03/__math/remainder.h b/libcxx/include/__cxx03/__math/remainder.h
index e7d825f4c8e387..a9f750b6ddc3fe 100644
--- a/libcxx/include/__cxx03/__math/remainder.h
+++ b/libcxx/include/__cxx03/__math/remainder.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MATH_REMAINDER_H
-#define _LIBCPP___MATH_REMAINDER_H
+#ifndef _LIBCPP___CXX03___MATH_REMAINDER_H
+#define _LIBCPP___CXX03___MATH_REMAINDER_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -70,4 +70,4 @@ inline _LIBCPP_HIDE_FROM_ABI typename __promote<_A1, _A2>::type remquo(_A1 __x,
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MATH_REMAINDER_H
+#endif // _LIBCPP___CXX03___MATH_REMAINDER_H
diff --git a/libcxx/include/__cxx03/__math/roots.h b/libcxx/include/__cxx03/__math/roots.h
index bb78b70dcaacba..77d9eead803c6a 100644
--- a/libcxx/include/__cxx03/__math/roots.h
+++ b/libcxx/include/__cxx03/__math/roots.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MATH_ROOTS_H
-#define _LIBCPP___MATH_ROOTS_H
+#ifndef _LIBCPP___CXX03___MATH_ROOTS_H
+#define _LIBCPP___CXX03___MATH_ROOTS_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -59,4 +59,4 @@ _LIBCPP_NODISCARD inline _LIBCPP_HIDE_FROM_ABI double cbrt(_A1 __x) _NOEXCEPT {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MATH_ROOTS_H
+#endif // _LIBCPP___CXX03___MATH_ROOTS_H
diff --git a/libcxx/include/__cxx03/__math/rounding_functions.h b/libcxx/include/__cxx03/__math/rounding_functions.h
index 69b021729e0acc..e146d743e974aa 100644
--- a/libcxx/include/__cxx03/__math/rounding_functions.h
+++ b/libcxx/include/__cxx03/__math/rounding_functions.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MATH_ROUNDING_FUNCTIONS_H
-#define _LIBCPP___MATH_ROUNDING_FUNCTIONS_H
+#ifndef _LIBCPP___CXX03___MATH_ROUNDING_FUNCTIONS_H
+#define _LIBCPP___CXX03___MATH_ROUNDING_FUNCTIONS_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -242,4 +242,4 @@ _LIBCPP_NODISCARD inline _LIBCPP_HIDE_FROM_ABI double trunc(_A1 __x) _NOEXCEPT {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MATH_ROUNDING_FUNCTIONS_H
+#endif // _LIBCPP___CXX03___MATH_ROUNDING_FUNCTIONS_H
diff --git a/libcxx/include/__cxx03/__math/special_functions.h b/libcxx/include/__cxx03/__math/special_functions.h
index 27fb394e803e37..38832215b89d52 100644
--- a/libcxx/include/__cxx03/__math/special_functions.h
+++ b/libcxx/include/__cxx03/__math/special_functions.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MATH_SPECIAL_FUNCTIONS_H
-#define _LIBCPP___MATH_SPECIAL_FUNCTIONS_H
+#ifndef _LIBCPP___CXX03___MATH_SPECIAL_FUNCTIONS_H
+#define _LIBCPP___CXX03___MATH_SPECIAL_FUNCTIONS_H
#include <__cxx03/__config>
#include <__cxx03/__math/copysign.h>
@@ -81,4 +81,4 @@ _LIBCPP_HIDE_FROM_ABI double hermite(unsigned __n, _Integer __x) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MATH_SPECIAL_FUNCTIONS_H
+#endif // _LIBCPP___CXX03___MATH_SPECIAL_FUNCTIONS_H
diff --git a/libcxx/include/__cxx03/__math/traits.h b/libcxx/include/__cxx03/__math/traits.h
index 60823378a835b9..f62509c32c008e 100644
--- a/libcxx/include/__cxx03/__math/traits.h
+++ b/libcxx/include/__cxx03/__math/traits.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MATH_TRAITS_H
-#define _LIBCPP___MATH_TRAITS_H
+#ifndef _LIBCPP___CXX03___MATH_TRAITS_H
+#define _LIBCPP___CXX03___MATH_TRAITS_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -185,4 +185,4 @@ _LIBCPP_NODISCARD inline _LIBCPP_HIDE_FROM_ABI bool isunordered(_A1 __x, _A2 __y
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MATH_TRAITS_H
+#endif // _LIBCPP___CXX03___MATH_TRAITS_H
diff --git a/libcxx/include/__cxx03/__math/trigonometric_functions.h b/libcxx/include/__cxx03/__math/trigonometric_functions.h
index 9d99f409cb2079..6c23ae6bc854fa 100644
--- a/libcxx/include/__cxx03/__math/trigonometric_functions.h
+++ b/libcxx/include/__cxx03/__math/trigonometric_functions.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MATH_TRIGONOMETRIC_FUNCTIONS_H
-#define _LIBCPP___MATH_TRIGONOMETRIC_FUNCTIONS_H
+#ifndef _LIBCPP___CXX03___MATH_TRIGONOMETRIC_FUNCTIONS_H
+#define _LIBCPP___CXX03___MATH_TRIGONOMETRIC_FUNCTIONS_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -73,4 +73,4 @@ inline _LIBCPP_HIDE_FROM_ABI double tan(_A1 __x) _NOEXCEPT {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MATH_TRIGONOMETRIC_FUNCTIONS_H
+#endif // _LIBCPP___CXX03___MATH_TRIGONOMETRIC_FUNCTIONS_H
diff --git a/libcxx/include/__cxx03/__mbstate_t.h b/libcxx/include/__cxx03/__mbstate_t.h
index 302cc5ddc4db25..6c7cfaaa8fe5b3 100644
--- a/libcxx/include/__cxx03/__mbstate_t.h
+++ b/libcxx/include/__cxx03/__mbstate_t.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MBSTATE_T_H
-#define _LIBCPP___MBSTATE_T_H
+#ifndef _LIBCPP___CXX03___MBSTATE_T_H
+#define _LIBCPP___CXX03___MBSTATE_T_H
#include <__cxx03/__config>
@@ -51,4 +51,4 @@
# error "We don't know how to get the definition of mbstate_t without <wchar.h> on your platform."
#endif
-#endif // _LIBCPP___MBSTATE_T_H
+#endif // _LIBCPP___CXX03___MBSTATE_T_H
diff --git a/libcxx/include/__cxx03/__mdspan/default_accessor.h b/libcxx/include/__cxx03/__mdspan/default_accessor.h
index 1745f077db7011..1f7c3318185664 100644
--- a/libcxx/include/__cxx03/__mdspan/default_accessor.h
+++ b/libcxx/include/__cxx03/__mdspan/default_accessor.h
@@ -14,8 +14,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP___MDSPAN_DEFAULT_ACCESSOR_H
-#define _LIBCPP___MDSPAN_DEFAULT_ACCESSOR_H
+#ifndef _LIBCPP___CXX03___MDSPAN_DEFAULT_ACCESSOR_H
+#define _LIBCPP___CXX03___MDSPAN_DEFAULT_ACCESSOR_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_abstract.h>
@@ -63,4 +63,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___MDSPAN_DEFAULT_ACCESSOR_H
+#endif // _LIBCPP___CXX03___MDSPAN_DEFAULT_ACCESSOR_H
diff --git a/libcxx/include/__cxx03/__mdspan/extents.h b/libcxx/include/__cxx03/__mdspan/extents.h
index b6f2b6abf3f61b..d6fc8b8af75aa2 100644
--- a/libcxx/include/__cxx03/__mdspan/extents.h
+++ b/libcxx/include/__cxx03/__mdspan/extents.h
@@ -14,8 +14,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP___MDSPAN_EXTENTS_H
-#define _LIBCPP___MDSPAN_EXTENTS_H
+#ifndef _LIBCPP___CXX03___MDSPAN_EXTENTS_H
+#define _LIBCPP___CXX03___MDSPAN_EXTENTS_H
#include <__cxx03/__assert>
#include <__cxx03/__config>
@@ -529,4 +529,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___MDSPAN_EXTENTS_H
+#endif // _LIBCPP___CXX03___MDSPAN_EXTENTS_H
diff --git a/libcxx/include/__cxx03/__mdspan/layout_left.h b/libcxx/include/__cxx03/__mdspan/layout_left.h
index 017f278ab6db02..7f667238818b3c 100644
--- a/libcxx/include/__cxx03/__mdspan/layout_left.h
+++ b/libcxx/include/__cxx03/__mdspan/layout_left.h
@@ -14,8 +14,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP___MDSPAN_LAYOUT_LEFT_H
-#define _LIBCPP___MDSPAN_LAYOUT_LEFT_H
+#ifndef _LIBCPP___CXX03___MDSPAN_LAYOUT_LEFT_H
+#define _LIBCPP___CXX03___MDSPAN_LAYOUT_LEFT_H
#include <__cxx03/__assert>
#include <__cxx03/__config>
@@ -201,4 +201,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___MDSPAN_LAYOUT_LEFT_H
+#endif // _LIBCPP___CXX03___MDSPAN_LAYOUT_LEFT_H
diff --git a/libcxx/include/__cxx03/__mdspan/layout_right.h b/libcxx/include/__cxx03/__mdspan/layout_right.h
index 13d430cf6b5e4f..12dc5a1b558d8d 100644
--- a/libcxx/include/__cxx03/__mdspan/layout_right.h
+++ b/libcxx/include/__cxx03/__mdspan/layout_right.h
@@ -14,8 +14,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP___MDSPAN_LAYOUT_RIGHT_H
-#define _LIBCPP___MDSPAN_LAYOUT_RIGHT_H
+#ifndef _LIBCPP___CXX03___MDSPAN_LAYOUT_RIGHT_H
+#define _LIBCPP___CXX03___MDSPAN_LAYOUT_RIGHT_H
#include <__cxx03/__assert>
#include <__cxx03/__config>
@@ -198,4 +198,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___MDSPAN_LAYOUT_RIGHT_H
+#endif // _LIBCPP___CXX03___MDSPAN_LAYOUT_RIGHT_H
diff --git a/libcxx/include/__cxx03/__mdspan/layout_stride.h b/libcxx/include/__cxx03/__mdspan/layout_stride.h
index 9b387ba6b9f607..d97ce1a55610ef 100644
--- a/libcxx/include/__cxx03/__mdspan/layout_stride.h
+++ b/libcxx/include/__cxx03/__mdspan/layout_stride.h
@@ -14,8 +14,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP___MDSPAN_LAYOUT_STRIDE_H
-#define _LIBCPP___MDSPAN_LAYOUT_STRIDE_H
+#ifndef _LIBCPP___CXX03___MDSPAN_LAYOUT_STRIDE_H
+#define _LIBCPP___CXX03___MDSPAN_LAYOUT_STRIDE_H
#include <__cxx03/__assert>
#include <__cxx03/__config>
@@ -363,4 +363,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___MDSPAN_LAYOUT_STRIDE_H
+#endif // _LIBCPP___CXX03___MDSPAN_LAYOUT_STRIDE_H
diff --git a/libcxx/include/__cxx03/__mdspan/mdspan.h b/libcxx/include/__cxx03/__mdspan/mdspan.h
index 253ac1cbb1c42d..a1f6f00d61b71c 100644
--- a/libcxx/include/__cxx03/__mdspan/mdspan.h
+++ b/libcxx/include/__cxx03/__mdspan/mdspan.h
@@ -14,8 +14,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP___MDSPAN_MDSPAN_H
-#define _LIBCPP___MDSPAN_MDSPAN_H
+#ifndef _LIBCPP___CXX03___MDSPAN_MDSPAN_H
+#define _LIBCPP___CXX03___MDSPAN_MDSPAN_H
#include <__cxx03/__assert>
#include <__cxx03/__config>
@@ -316,4 +316,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___MDSPAN_MDSPAN_H
+#endif // _LIBCPP___CXX03___MDSPAN_MDSPAN_H
diff --git a/libcxx/include/__cxx03/__memory/addressof.h b/libcxx/include/__cxx03/__memory/addressof.h
index 0f6b875884448a..6c88ec87be1ac2 100644
--- a/libcxx/include/__cxx03/__memory/addressof.h
+++ b/libcxx/include/__cxx03/__memory/addressof.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_ADDRESSOF_H
-#define _LIBCPP___MEMORY_ADDRESSOF_H
+#ifndef _LIBCPP___CXX03___MEMORY_ADDRESSOF_H
+#define _LIBCPP___CXX03___MEMORY_ADDRESSOF_H
#include <__cxx03/__config>
@@ -58,4 +58,4 @@ _Tp* addressof(const _Tp&&) noexcept = delete;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MEMORY_ADDRESSOF_H
+#endif // _LIBCPP___CXX03___MEMORY_ADDRESSOF_H
diff --git a/libcxx/include/__cxx03/__memory/align.h b/libcxx/include/__cxx03/__memory/align.h
index 3ef7011bdb62fd..2b2085f2173642 100644
--- a/libcxx/include/__cxx03/__memory/align.h
+++ b/libcxx/include/__cxx03/__memory/align.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_ALIGN_H
-#define _LIBCPP___MEMORY_ALIGN_H
+#ifndef _LIBCPP___CXX03___MEMORY_ALIGN_H
+#define _LIBCPP___CXX03___MEMORY_ALIGN_H
#include <__cxx03/__config>
#include <__cxx03/cstddef>
@@ -22,4 +22,4 @@ _LIBCPP_EXPORTED_FROM_ABI void* align(size_t __align, size_t __sz, void*& __ptr,
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MEMORY_ALIGN_H
+#endif // _LIBCPP___CXX03___MEMORY_ALIGN_H
diff --git a/libcxx/include/__cxx03/__memory/aligned_alloc.h b/libcxx/include/__cxx03/__memory/aligned_alloc.h
index 9e864f5a7ab0d1..af90baeabc140c 100644
--- a/libcxx/include/__cxx03/__memory/aligned_alloc.h
+++ b/libcxx/include/__cxx03/__memory/aligned_alloc.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_ALIGNED_ALLOC_H
-#define _LIBCPP___MEMORY_ALIGNED_ALLOC_H
+#ifndef _LIBCPP___CXX03___MEMORY_ALIGNED_ALLOC_H
+#define _LIBCPP___CXX03___MEMORY_ALIGNED_ALLOC_H
#include <__cxx03/__config>
#include <__cxx03/cstddef>
@@ -61,4 +61,4 @@ inline _LIBCPP_HIDE_FROM_ABI void __libcpp_aligned_free(void* __ptr) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MEMORY_ALIGNED_ALLOC_H
+#endif // _LIBCPP___CXX03___MEMORY_ALIGNED_ALLOC_H
diff --git a/libcxx/include/__cxx03/__memory/allocate_at_least.h b/libcxx/include/__cxx03/__memory/allocate_at_least.h
index e8b4cd3a17e5fa..cb1810855a01d1 100644
--- a/libcxx/include/__cxx03/__memory/allocate_at_least.h
+++ b/libcxx/include/__cxx03/__memory/allocate_at_least.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_ALLOCATE_AT_LEAST_H
-#define _LIBCPP___MEMORY_ALLOCATE_AT_LEAST_H
+#ifndef _LIBCPP___CXX03___MEMORY_ALLOCATE_AT_LEAST_H
+#define _LIBCPP___CXX03___MEMORY_ALLOCATE_AT_LEAST_H
#include <__cxx03/__config>
#include <__cxx03/__memory/allocator_traits.h>
@@ -45,4 +45,4 @@ __allocate_at_least(_Alloc& __alloc, size_t __n) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MEMORY_ALLOCATE_AT_LEAST_H
+#endif // _LIBCPP___CXX03___MEMORY_ALLOCATE_AT_LEAST_H
diff --git a/libcxx/include/__cxx03/__memory/allocation_guard.h b/libcxx/include/__cxx03/__memory/allocation_guard.h
index a84ab2de7eb9ea..0a2712d1df99bb 100644
--- a/libcxx/include/__cxx03/__memory/allocation_guard.h
+++ b/libcxx/include/__cxx03/__memory/allocation_guard.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_ALLOCATION_GUARD_H
-#define _LIBCPP___MEMORY_ALLOCATION_GUARD_H
+#ifndef _LIBCPP___CXX03___MEMORY_ALLOCATION_GUARD_H
+#define _LIBCPP___CXX03___MEMORY_ALLOCATION_GUARD_H
#include <__cxx03/__config>
#include <__cxx03/__memory/addressof.h>
@@ -105,4 +105,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___MEMORY_ALLOCATION_GUARD_H
+#endif // _LIBCPP___CXX03___MEMORY_ALLOCATION_GUARD_H
diff --git a/libcxx/include/__cxx03/__memory/allocator.h b/libcxx/include/__cxx03/__memory/allocator.h
index e0066c6e89b9b6..06f270a0c008c0 100644
--- a/libcxx/include/__cxx03/__memory/allocator.h
+++ b/libcxx/include/__cxx03/__memory/allocator.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_ALLOCATOR_H
-#define _LIBCPP___MEMORY_ALLOCATOR_H
+#ifndef _LIBCPP___CXX03___MEMORY_ALLOCATOR_H
+#define _LIBCPP___CXX03___MEMORY_ALLOCATOR_H
#include <__cxx03/__config>
#include <__cxx03/__memory/addressof.h>
@@ -265,4 +265,4 @@ inline _LIBCPP_HIDE_FROM_ABI bool operator!=(const allocator<_Tp>&, const alloca
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MEMORY_ALLOCATOR_H
+#endif // _LIBCPP___CXX03___MEMORY_ALLOCATOR_H
diff --git a/libcxx/include/__cxx03/__memory/allocator_arg_t.h b/libcxx/include/__cxx03/__memory/allocator_arg_t.h
index 5f40454dca7579..3646b71e426550 100644
--- a/libcxx/include/__cxx03/__memory/allocator_arg_t.h
+++ b/libcxx/include/__cxx03/__memory/allocator_arg_t.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FUNCTIONAL_ALLOCATOR_ARG_T_H
-#define _LIBCPP___FUNCTIONAL_ALLOCATOR_ARG_T_H
+#ifndef _LIBCPP___CXX03___FUNCTIONAL_ALLOCATOR_ARG_T_H
+#define _LIBCPP___CXX03___FUNCTIONAL_ALLOCATOR_ARG_T_H
#include <__cxx03/__config>
#include <__cxx03/__memory/uses_allocator.h>
@@ -72,4 +72,4 @@ __user_alloc_construct_impl(integral_constant<int, 2>, _Tp* __storage, const _Al
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___FUNCTIONAL_ALLOCATOR_ARG_T_H
+#endif // _LIBCPP___CXX03___FUNCTIONAL_ALLOCATOR_ARG_T_H
diff --git a/libcxx/include/__cxx03/__memory/allocator_destructor.h b/libcxx/include/__cxx03/__memory/allocator_destructor.h
index e009cd1d04aa10..2c69c91561321e 100644
--- a/libcxx/include/__cxx03/__memory/allocator_destructor.h
+++ b/libcxx/include/__cxx03/__memory/allocator_destructor.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_ALLOCATOR_DESTRUCTOR_H
-#define _LIBCPP___MEMORY_ALLOCATOR_DESTRUCTOR_H
+#ifndef _LIBCPP___CXX03___MEMORY_ALLOCATOR_DESTRUCTOR_H
+#define _LIBCPP___CXX03___MEMORY_ALLOCATOR_DESTRUCTOR_H
#include <__cxx03/__config>
#include <__cxx03/__memory/allocator_traits.h>
@@ -37,4 +37,4 @@ class __allocator_destructor {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MEMORY_ALLOCATOR_DESTRUCTOR_H
+#endif // _LIBCPP___CXX03___MEMORY_ALLOCATOR_DESTRUCTOR_H
diff --git a/libcxx/include/__cxx03/__memory/allocator_traits.h b/libcxx/include/__cxx03/__memory/allocator_traits.h
index 9833df6c50bd6e..e70716c0701587 100644
--- a/libcxx/include/__cxx03/__memory/allocator_traits.h
+++ b/libcxx/include/__cxx03/__memory/allocator_traits.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_ALLOCATOR_TRAITS_H
-#define _LIBCPP___MEMORY_ALLOCATOR_TRAITS_H
+#ifndef _LIBCPP___CXX03___MEMORY_ALLOCATOR_TRAITS_H
+#define _LIBCPP___CXX03___MEMORY_ALLOCATOR_TRAITS_H
#include <__cxx03/__config>
#include <__cxx03/__memory/construct_at.h>
@@ -421,4 +421,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___MEMORY_ALLOCATOR_TRAITS_H
+#endif // _LIBCPP___CXX03___MEMORY_ALLOCATOR_TRAITS_H
diff --git a/libcxx/include/__cxx03/__memory/assume_aligned.h b/libcxx/include/__cxx03/__memory/assume_aligned.h
index 3b345d4c5c5c49..03a495aac580c9 100644
--- a/libcxx/include/__cxx03/__memory/assume_aligned.h
+++ b/libcxx/include/__cxx03/__memory/assume_aligned.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_ASSUME_ALIGNED_H
-#define _LIBCPP___MEMORY_ASSUME_ALIGNED_H
+#ifndef _LIBCPP___CXX03___MEMORY_ASSUME_ALIGNED_H
+#define _LIBCPP___CXX03___MEMORY_ASSUME_ALIGNED_H
#include <__cxx03/__assert>
#include <__cxx03/__config>
@@ -47,4 +47,4 @@ template <size_t _Np, class _Tp>
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MEMORY_ASSUME_ALIGNED_H
+#endif // _LIBCPP___CXX03___MEMORY_ASSUME_ALIGNED_H
diff --git a/libcxx/include/__cxx03/__memory/auto_ptr.h b/libcxx/include/__cxx03/__memory/auto_ptr.h
index f5695745d22ea4..d5d541e1547a5b 100644
--- a/libcxx/include/__cxx03/__memory/auto_ptr.h
+++ b/libcxx/include/__cxx03/__memory/auto_ptr.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_AUTO_PTR_H
-#define _LIBCPP___MEMORY_AUTO_PTR_H
+#ifndef _LIBCPP___CXX03___MEMORY_AUTO_PTR_H
+#define _LIBCPP___CXX03___MEMORY_AUTO_PTR_H
#include <__cxx03/__config>
@@ -89,4 +89,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER <= 14 || defined(_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR)
-#endif // _LIBCPP___MEMORY_AUTO_PTR_H
+#endif // _LIBCPP___CXX03___MEMORY_AUTO_PTR_H
diff --git a/libcxx/include/__cxx03/__memory/builtin_new_allocator.h b/libcxx/include/__cxx03/__memory/builtin_new_allocator.h
index e0284dfcff1ee9..e14a57e8a0611c 100644
--- a/libcxx/include/__cxx03/__memory/builtin_new_allocator.h
+++ b/libcxx/include/__cxx03/__memory/builtin_new_allocator.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_BUILTIN_NEW_ALLOCATOR_H
-#define _LIBCPP___MEMORY_BUILTIN_NEW_ALLOCATOR_H
+#ifndef _LIBCPP___CXX03___MEMORY_BUILTIN_NEW_ALLOCATOR_H
+#define _LIBCPP___CXX03___MEMORY_BUILTIN_NEW_ALLOCATOR_H
#include <__cxx03/__config>
#include <__cxx03/__memory/unique_ptr.h>
@@ -64,4 +64,4 @@ struct __builtin_new_allocator {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MEMORY_BUILTIN_NEW_ALLOCATOR_H
+#endif // _LIBCPP___CXX03___MEMORY_BUILTIN_NEW_ALLOCATOR_H
diff --git a/libcxx/include/__cxx03/__memory/compressed_pair.h b/libcxx/include/__cxx03/__memory/compressed_pair.h
index 2af34f02772e04..086621d355d6db 100644
--- a/libcxx/include/__cxx03/__memory/compressed_pair.h
+++ b/libcxx/include/__cxx03/__memory/compressed_pair.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_COMPRESSED_PAIR_H
-#define _LIBCPP___MEMORY_COMPRESSED_PAIR_H
+#ifndef _LIBCPP___CXX03___MEMORY_COMPRESSED_PAIR_H
+#define _LIBCPP___CXX03___MEMORY_COMPRESSED_PAIR_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/tuple.h>
@@ -168,4 +168,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___MEMORY_COMPRESSED_PAIR_H
+#endif // _LIBCPP___CXX03___MEMORY_COMPRESSED_PAIR_H
diff --git a/libcxx/include/__cxx03/__memory/concepts.h b/libcxx/include/__cxx03/__memory/concepts.h
index 85620202495ebd..ac57609c0b5c14 100644
--- a/libcxx/include/__cxx03/__memory/concepts.h
+++ b/libcxx/include/__cxx03/__memory/concepts.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_CONCEPTS_H
-#define _LIBCPP___MEMORY_CONCEPTS_H
+#ifndef _LIBCPP___CXX03___MEMORY_CONCEPTS_H
+#define _LIBCPP___CXX03___MEMORY_CONCEPTS_H
#include <__cxx03/__concepts/same_as.h>
#include <__cxx03/__config>
@@ -60,4 +60,4 @@ concept __nothrow_forward_range = __nothrow_input_range<_Rp> && __nothrow_forwar
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MEMORY_CONCEPTS_H
+#endif // _LIBCPP___CXX03___MEMORY_CONCEPTS_H
diff --git a/libcxx/include/__cxx03/__memory/construct_at.h b/libcxx/include/__cxx03/__memory/construct_at.h
index 090e132a67ee51..755cdbf9743d10 100644
--- a/libcxx/include/__cxx03/__memory/construct_at.h
+++ b/libcxx/include/__cxx03/__memory/construct_at.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_CONSTRUCT_AT_H
-#define _LIBCPP___MEMORY_CONSTRUCT_AT_H
+#ifndef _LIBCPP___CXX03___MEMORY_CONSTRUCT_AT_H
+#define _LIBCPP___CXX03___MEMORY_CONSTRUCT_AT_H
#include <__cxx03/__assert>
#include <__cxx03/__config>
@@ -125,4 +125,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___MEMORY_CONSTRUCT_AT_H
+#endif // _LIBCPP___CXX03___MEMORY_CONSTRUCT_AT_H
diff --git a/libcxx/include/__cxx03/__memory/destruct_n.h b/libcxx/include/__cxx03/__memory/destruct_n.h
index f5a24a67ca52c8..a7dd2abd55980f 100644
--- a/libcxx/include/__cxx03/__memory/destruct_n.h
+++ b/libcxx/include/__cxx03/__memory/destruct_n.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_DESTRUCT_N_H
-#define _LIBCPP___MEMORY_DESTRUCT_N_H
+#ifndef _LIBCPP___CXX03___MEMORY_DESTRUCT_N_H
+#define _LIBCPP___CXX03___MEMORY_DESTRUCT_N_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -60,4 +60,4 @@ struct __destruct_n {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MEMORY_DESTRUCT_N_H
+#endif // _LIBCPP___CXX03___MEMORY_DESTRUCT_N_H
diff --git a/libcxx/include/__cxx03/__memory/inout_ptr.h b/libcxx/include/__cxx03/__memory/inout_ptr.h
index bb715e3b86c6cf..4fea1538740301 100644
--- a/libcxx/include/__cxx03/__memory/inout_ptr.h
+++ b/libcxx/include/__cxx03/__memory/inout_ptr.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___INOUT_PTR_H
-#define _LIBCPP___INOUT_PTR_H
+#ifndef _LIBCPP___CXX03___INOUT_PTR_H
+#define _LIBCPP___CXX03___INOUT_PTR_H
#include <__cxx03/__config>
#include <__cxx03/__memory/addressof.h>
@@ -106,4 +106,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___INOUT_PTR_H
+#endif // _LIBCPP___CXX03___INOUT_PTR_H
diff --git a/libcxx/include/__cxx03/__memory/out_ptr.h b/libcxx/include/__cxx03/__memory/out_ptr.h
index 9aa9f33e293c0a..053818bc1f51a9 100644
--- a/libcxx/include/__cxx03/__memory/out_ptr.h
+++ b/libcxx/include/__cxx03/__memory/out_ptr.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___OUT_PTR_H
-#define _LIBCPP___OUT_PTR_H
+#ifndef _LIBCPP___CXX03___OUT_PTR_H
+#define _LIBCPP___CXX03___OUT_PTR_H
#include <__cxx03/__config>
#include <__cxx03/__memory/addressof.h>
@@ -98,4 +98,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___OUT_PTR_H
+#endif // _LIBCPP___CXX03___OUT_PTR_H
diff --git a/libcxx/include/__cxx03/__memory/pointer_traits.h b/libcxx/include/__cxx03/__memory/pointer_traits.h
index 9c480af773b705..f1206836676d43 100644
--- a/libcxx/include/__cxx03/__memory/pointer_traits.h
+++ b/libcxx/include/__cxx03/__memory/pointer_traits.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_POINTER_TRAITS_H
-#define _LIBCPP___MEMORY_POINTER_TRAITS_H
+#ifndef _LIBCPP___CXX03___MEMORY_POINTER_TRAITS_H
+#define _LIBCPP___CXX03___MEMORY_POINTER_TRAITS_H
#include <__cxx03/__config>
#include <__cxx03/__memory/addressof.h>
@@ -304,4 +304,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___MEMORY_POINTER_TRAITS_H
+#endif // _LIBCPP___CXX03___MEMORY_POINTER_TRAITS_H
diff --git a/libcxx/include/__cxx03/__memory/ranges_construct_at.h b/libcxx/include/__cxx03/__memory/ranges_construct_at.h
index f8acc9f0c21d92..db271b8572dc67 100644
--- a/libcxx/include/__cxx03/__memory/ranges_construct_at.h
+++ b/libcxx/include/__cxx03/__memory/ranges_construct_at.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_RANGES_CONSTRUCT_AT_H
-#define _LIBCPP___MEMORY_RANGES_CONSTRUCT_AT_H
+#ifndef _LIBCPP___CXX03___MEMORY_RANGES_CONSTRUCT_AT_H
+#define _LIBCPP___CXX03___MEMORY_RANGES_CONSTRUCT_AT_H
#include <__cxx03/__concepts/destructible.h>
#include <__cxx03/__config>
@@ -121,4 +121,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___MEMORY_RANGES_CONSTRUCT_AT_H
+#endif // _LIBCPP___CXX03___MEMORY_RANGES_CONSTRUCT_AT_H
diff --git a/libcxx/include/__cxx03/__memory/ranges_uninitialized_algorithms.h b/libcxx/include/__cxx03/__memory/ranges_uninitialized_algorithms.h
index f7af434847814b..24e3dfa23180a4 100644
--- a/libcxx/include/__cxx03/__memory/ranges_uninitialized_algorithms.h
+++ b/libcxx/include/__cxx03/__memory/ranges_uninitialized_algorithms.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_RANGES_UNINITIALIZED_ALGORITHMS_H
-#define _LIBCPP___MEMORY_RANGES_UNINITIALIZED_ALGORITHMS_H
+#ifndef _LIBCPP___CXX03___MEMORY_RANGES_UNINITIALIZED_ALGORITHMS_H
+#define _LIBCPP___CXX03___MEMORY_RANGES_UNINITIALIZED_ALGORITHMS_H
#include <__cxx03/__algorithm/in_out_result.h>
#include <__cxx03/__concepts/constructible.h>
@@ -322,4 +322,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___MEMORY_RANGES_UNINITIALIZED_ALGORITHMS_H
+#endif // _LIBCPP___CXX03___MEMORY_RANGES_UNINITIALIZED_ALGORITHMS_H
diff --git a/libcxx/include/__cxx03/__memory/raw_storage_iterator.h b/libcxx/include/__cxx03/__memory/raw_storage_iterator.h
index bde1e1e6f0304d..c0f6b9151e5cb3 100644
--- a/libcxx/include/__cxx03/__memory/raw_storage_iterator.h
+++ b/libcxx/include/__cxx03/__memory/raw_storage_iterator.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_RAW_STORAGE_ITERATOR_H
-#define _LIBCPP___MEMORY_RAW_STORAGE_ITERATOR_H
+#ifndef _LIBCPP___CXX03___MEMORY_RAW_STORAGE_ITERATOR_H
+#define _LIBCPP___CXX03___MEMORY_RAW_STORAGE_ITERATOR_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/iterator.h>
@@ -84,4 +84,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___MEMORY_RAW_STORAGE_ITERATOR_H
+#endif // _LIBCPP___CXX03___MEMORY_RAW_STORAGE_ITERATOR_H
diff --git a/libcxx/include/__cxx03/__memory/shared_ptr.h b/libcxx/include/__cxx03/__memory/shared_ptr.h
index f6322d9141e309..5e1f8c1ff7d5e7 100644
--- a/libcxx/include/__cxx03/__memory/shared_ptr.h
+++ b/libcxx/include/__cxx03/__memory/shared_ptr.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_SHARED_PTR_H
-#define _LIBCPP___MEMORY_SHARED_PTR_H
+#ifndef _LIBCPP___CXX03___MEMORY_SHARED_PTR_H
+#define _LIBCPP___CXX03___MEMORY_SHARED_PTR_H
#include <__cxx03/__compare/compare_three_way.h>
#include <__cxx03/__compare/ordering.h>
@@ -1691,4 +1691,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___MEMORY_SHARED_PTR_H
+#endif // _LIBCPP___CXX03___MEMORY_SHARED_PTR_H
diff --git a/libcxx/include/__cxx03/__memory/swap_allocator.h b/libcxx/include/__cxx03/__memory/swap_allocator.h
index 3b463553d3ff50..2986da73657323 100644
--- a/libcxx/include/__cxx03/__memory/swap_allocator.h
+++ b/libcxx/include/__cxx03/__memory/swap_allocator.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_SWAP_ALLOCATOR_H
-#define _LIBCPP___MEMORY_SWAP_ALLOCATOR_H
+#ifndef _LIBCPP___CXX03___MEMORY_SWAP_ALLOCATOR_H
+#define _LIBCPP___CXX03___MEMORY_SWAP_ALLOCATOR_H
#include <__cxx03/__config>
#include <__cxx03/__memory/allocator_traits.h>
@@ -51,4 +51,4 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 void __swap_allocator
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MEMORY_SWAP_ALLOCATOR_H
+#endif // _LIBCPP___CXX03___MEMORY_SWAP_ALLOCATOR_H
diff --git a/libcxx/include/__cxx03/__memory/temp_value.h b/libcxx/include/__cxx03/__memory/temp_value.h
index ddf963da45de49..b777c66187bd08 100644
--- a/libcxx/include/__cxx03/__memory/temp_value.h
+++ b/libcxx/include/__cxx03/__memory/temp_value.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_TEMP_VALUE_H
-#define _LIBCPP___MEMORY_TEMP_VALUE_H
+#ifndef _LIBCPP___CXX03___MEMORY_TEMP_VALUE_H
+#define _LIBCPP___CXX03___MEMORY_TEMP_VALUE_H
#include <__cxx03/__config>
#include <__cxx03/__memory/addressof.h>
@@ -55,4 +55,4 @@ struct __temp_value {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MEMORY_TEMP_VALUE_H
+#endif // _LIBCPP___CXX03___MEMORY_TEMP_VALUE_H
diff --git a/libcxx/include/__cxx03/__memory/temporary_buffer.h b/libcxx/include/__cxx03/__memory/temporary_buffer.h
index 11a22e6db67d93..3f584a7337f061 100644
--- a/libcxx/include/__cxx03/__memory/temporary_buffer.h
+++ b/libcxx/include/__cxx03/__memory/temporary_buffer.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_TEMPORARY_BUFFER_H
-#define _LIBCPP___MEMORY_TEMPORARY_BUFFER_H
+#ifndef _LIBCPP___CXX03___MEMORY_TEMPORARY_BUFFER_H
+#define _LIBCPP___CXX03___MEMORY_TEMPORARY_BUFFER_H
#include <__cxx03/__config>
#include <__cxx03/__utility/pair.h>
@@ -72,4 +72,4 @@ struct __return_temporary_buffer {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MEMORY_TEMPORARY_BUFFER_H
+#endif // _LIBCPP___CXX03___MEMORY_TEMPORARY_BUFFER_H
diff --git a/libcxx/include/__cxx03/__memory/uninitialized_algorithms.h b/libcxx/include/__cxx03/__memory/uninitialized_algorithms.h
index d74304d1d970aa..d595c8c6cf49eb 100644
--- a/libcxx/include/__cxx03/__memory/uninitialized_algorithms.h
+++ b/libcxx/include/__cxx03/__memory/uninitialized_algorithms.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_UNINITIALIZED_ALGORITHMS_H
-#define _LIBCPP___MEMORY_UNINITIALIZED_ALGORITHMS_H
+#ifndef _LIBCPP___CXX03___MEMORY_UNINITIALIZED_ALGORITHMS_H
+#define _LIBCPP___CXX03___MEMORY_UNINITIALIZED_ALGORITHMS_H
#include <__cxx03/__algorithm/copy.h>
#include <__cxx03/__algorithm/move.h>
@@ -650,4 +650,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___MEMORY_UNINITIALIZED_ALGORITHMS_H
+#endif // _LIBCPP___CXX03___MEMORY_UNINITIALIZED_ALGORITHMS_H
diff --git a/libcxx/include/__cxx03/__memory/unique_ptr.h b/libcxx/include/__cxx03/__memory/unique_ptr.h
index 2576b6b37e7cb4..415b0029975917 100644
--- a/libcxx/include/__cxx03/__memory/unique_ptr.h
+++ b/libcxx/include/__cxx03/__memory/unique_ptr.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_UNIQUE_PTR_H
-#define _LIBCPP___MEMORY_UNIQUE_PTR_H
+#ifndef _LIBCPP___CXX03___MEMORY_UNIQUE_PTR_H
+#define _LIBCPP___CXX03___MEMORY_UNIQUE_PTR_H
#include <__cxx03/__compare/compare_three_way.h>
#include <__cxx03/__compare/compare_three_way_result.h>
@@ -690,4 +690,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___MEMORY_UNIQUE_PTR_H
+#endif // _LIBCPP___CXX03___MEMORY_UNIQUE_PTR_H
diff --git a/libcxx/include/__cxx03/__memory/uses_allocator.h b/libcxx/include/__cxx03/__memory/uses_allocator.h
index afdaac2d4b6fc3..4fb6651c68b1de 100644
--- a/libcxx/include/__cxx03/__memory/uses_allocator.h
+++ b/libcxx/include/__cxx03/__memory/uses_allocator.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_USES_ALLOCATOR_H
-#define _LIBCPP___MEMORY_USES_ALLOCATOR_H
+#ifndef _LIBCPP___CXX03___MEMORY_USES_ALLOCATOR_H
+#define _LIBCPP___CXX03___MEMORY_USES_ALLOCATOR_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_convertible.h>
@@ -49,4 +49,4 @@ inline constexpr bool uses_allocator_v = uses_allocator<_Tp, _Alloc>::value;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MEMORY_USES_ALLOCATOR_H
+#endif // _LIBCPP___CXX03___MEMORY_USES_ALLOCATOR_H
diff --git a/libcxx/include/__cxx03/__memory/uses_allocator_construction.h b/libcxx/include/__cxx03/__memory/uses_allocator_construction.h
index fae2609204b132..447d2a4e7cce17 100644
--- a/libcxx/include/__cxx03/__memory/uses_allocator_construction.h
+++ b/libcxx/include/__cxx03/__memory/uses_allocator_construction.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_USES_ALLOCATOR_CONSTRUCTION_H
-#define _LIBCPP___MEMORY_USES_ALLOCATOR_CONSTRUCTION_H
+#ifndef _LIBCPP___CXX03___MEMORY_USES_ALLOCATOR_CONSTRUCTION_H
+#define _LIBCPP___CXX03___MEMORY_USES_ALLOCATOR_CONSTRUCTION_H
#include <__cxx03/__config>
#include <__cxx03/__memory/construct_at.h>
@@ -244,4 +244,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___MEMORY_USES_ALLOCATOR_CONSTRUCTION_H
+#endif // _LIBCPP___CXX03___MEMORY_USES_ALLOCATOR_CONSTRUCTION_H
diff --git a/libcxx/include/__cxx03/__memory/voidify.h b/libcxx/include/__cxx03/__memory/voidify.h
index b509aecc4a18ff..63e03b7d7f8f80 100644
--- a/libcxx/include/__cxx03/__memory/voidify.h
+++ b/libcxx/include/__cxx03/__memory/voidify.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_VOIDIFY_H
-#define _LIBCPP___MEMORY_VOIDIFY_H
+#ifndef _LIBCPP___CXX03___MEMORY_VOIDIFY_H
+#define _LIBCPP___CXX03___MEMORY_VOIDIFY_H
#include <__cxx03/__config>
#include <__cxx03/__memory/addressof.h>
@@ -27,4 +27,4 @@ _LIBCPP_ALWAYS_INLINE _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 void*
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MEMORY_VOIDIFY_H
+#endif // _LIBCPP___CXX03___MEMORY_VOIDIFY_H
diff --git a/libcxx/include/__cxx03/__memory_resource/memory_resource.h b/libcxx/include/__cxx03/__memory_resource/memory_resource.h
index e4af41a9dc0b03..6bcad87edd407a 100644
--- a/libcxx/include/__cxx03/__memory_resource/memory_resource.h
+++ b/libcxx/include/__cxx03/__memory_resource/memory_resource.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_RESOURCE_MEMORY_RESOURCE_H
-#define _LIBCPP___MEMORY_RESOURCE_MEMORY_RESOURCE_H
+#ifndef _LIBCPP___CXX03___MEMORY_RESOURCE_MEMORY_RESOURCE_H
+#define _LIBCPP___CXX03___MEMORY_RESOURCE_MEMORY_RESOURCE_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/memory_resource.h>
@@ -85,4 +85,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 17
-#endif // _LIBCPP___MEMORY_RESOURCE_MEMORY_RESOURCE_H
+#endif // _LIBCPP___CXX03___MEMORY_RESOURCE_MEMORY_RESOURCE_H
diff --git a/libcxx/include/__cxx03/__memory_resource/monotonic_buffer_resource.h b/libcxx/include/__cxx03/__memory_resource/monotonic_buffer_resource.h
index 9d418ea2289aef..f72f56ef05fc67 100644
--- a/libcxx/include/__cxx03/__memory_resource/monotonic_buffer_resource.h
+++ b/libcxx/include/__cxx03/__memory_resource/monotonic_buffer_resource.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_RESOURCE_MONOTONIC_BUFFER_RESOURCE_H
-#define _LIBCPP___MEMORY_RESOURCE_MONOTONIC_BUFFER_RESOURCE_H
+#ifndef _LIBCPP___CXX03___MEMORY_RESOURCE_MONOTONIC_BUFFER_RESOURCE_H
+#define _LIBCPP___CXX03___MEMORY_RESOURCE_MONOTONIC_BUFFER_RESOURCE_H
#include <__cxx03/__config>
#include <__cxx03/__memory/addressof.h>
@@ -119,4 +119,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 17
-#endif // _LIBCPP___MEMORY_RESOURCE_MONOTONIC_BUFFER_RESOURCE_H
+#endif // _LIBCPP___CXX03___MEMORY_RESOURCE_MONOTONIC_BUFFER_RESOURCE_H
diff --git a/libcxx/include/__cxx03/__memory_resource/polymorphic_allocator.h b/libcxx/include/__cxx03/__memory_resource/polymorphic_allocator.h
index f615ac38116715..154f6f0f6973b7 100644
--- a/libcxx/include/__cxx03/__memory_resource/polymorphic_allocator.h
+++ b/libcxx/include/__cxx03/__memory_resource/polymorphic_allocator.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_RESOURCE_POLYMORPHIC_ALLOCATOR_H
-#define _LIBCPP___MEMORY_RESOURCE_POLYMORPHIC_ALLOCATOR_H
+#ifndef _LIBCPP___CXX03___MEMORY_RESOURCE_POLYMORPHIC_ALLOCATOR_H
+#define _LIBCPP___CXX03___MEMORY_RESOURCE_POLYMORPHIC_ALLOCATOR_H
#include <__cxx03/__assert>
#include <__cxx03/__config>
@@ -228,4 +228,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___MEMORY_RESOURCE_POLYMORPHIC_ALLOCATOR_H
+#endif // _LIBCPP___CXX03___MEMORY_RESOURCE_POLYMORPHIC_ALLOCATOR_H
diff --git a/libcxx/include/__cxx03/__memory_resource/pool_options.h b/libcxx/include/__cxx03/__memory_resource/pool_options.h
index 50f3ea5882981a..ac00e22bd7f4ab 100644
--- a/libcxx/include/__cxx03/__memory_resource/pool_options.h
+++ b/libcxx/include/__cxx03/__memory_resource/pool_options.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_RESOURCE_POOL_OPTIONS_H
-#define _LIBCPP___MEMORY_RESOURCE_POOL_OPTIONS_H
+#ifndef _LIBCPP___CXX03___MEMORY_RESOURCE_POOL_OPTIONS_H
+#define _LIBCPP___CXX03___MEMORY_RESOURCE_POOL_OPTIONS_H
#include <__cxx03/__config>
#include <__cxx03/cstddef>
@@ -35,4 +35,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 17
-#endif // _LIBCPP___MEMORY_RESOURCE_POOL_OPTIONS_H
+#endif // _LIBCPP___CXX03___MEMORY_RESOURCE_POOL_OPTIONS_H
diff --git a/libcxx/include/__cxx03/__memory_resource/synchronized_pool_resource.h b/libcxx/include/__cxx03/__memory_resource/synchronized_pool_resource.h
index f139b592eadad2..c8897a3d0818ee 100644
--- a/libcxx/include/__cxx03/__memory_resource/synchronized_pool_resource.h
+++ b/libcxx/include/__cxx03/__memory_resource/synchronized_pool_resource.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_RESOURCE_SYNCHRONIZED_POOL_RESOURCE_H
-#define _LIBCPP___MEMORY_RESOURCE_SYNCHRONIZED_POOL_RESOURCE_H
+#ifndef _LIBCPP___CXX03___MEMORY_RESOURCE_SYNCHRONIZED_POOL_RESOURCE_H
+#define _LIBCPP___CXX03___MEMORY_RESOURCE_SYNCHRONIZED_POOL_RESOURCE_H
#include <__cxx03/__config>
#include <__cxx03/__memory_resource/memory_resource.h>
@@ -89,4 +89,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 17
-#endif // _LIBCPP___MEMORY_RESOURCE_SYNCHRONIZED_POOL_RESOURCE_H
+#endif // _LIBCPP___CXX03___MEMORY_RESOURCE_SYNCHRONIZED_POOL_RESOURCE_H
diff --git a/libcxx/include/__cxx03/__memory_resource/unsynchronized_pool_resource.h b/libcxx/include/__cxx03/__memory_resource/unsynchronized_pool_resource.h
index d3a32da069b7e1..690768546ca6f9 100644
--- a/libcxx/include/__cxx03/__memory_resource/unsynchronized_pool_resource.h
+++ b/libcxx/include/__cxx03/__memory_resource/unsynchronized_pool_resource.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MEMORY_RESOURCE_UNSYNCHRONIZED_POOL_RESOURCE_H
-#define _LIBCPP___MEMORY_RESOURCE_UNSYNCHRONIZED_POOL_RESOURCE_H
+#ifndef _LIBCPP___CXX03___MEMORY_RESOURCE_UNSYNCHRONIZED_POOL_RESOURCE_H
+#define _LIBCPP___CXX03___MEMORY_RESOURCE_UNSYNCHRONIZED_POOL_RESOURCE_H
#include <__cxx03/__config>
#include <__cxx03/__memory_resource/memory_resource.h>
@@ -103,4 +103,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 17
-#endif // _LIBCPP___MEMORY_RESOURCE_UNSYNCHRONIZED_POOL_RESOURCE_H
+#endif // _LIBCPP___CXX03___MEMORY_RESOURCE_UNSYNCHRONIZED_POOL_RESOURCE_H
diff --git a/libcxx/include/__cxx03/__mutex/lock_guard.h b/libcxx/include/__cxx03/__mutex/lock_guard.h
index b20efc33b2a151..6760b1f20fa9e7 100644
--- a/libcxx/include/__cxx03/__mutex/lock_guard.h
+++ b/libcxx/include/__cxx03/__mutex/lock_guard.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MUTEX_LOCK_GUARD_H
-#define _LIBCPP___MUTEX_LOCK_GUARD_H
+#ifndef _LIBCPP___CXX03___MUTEX_LOCK_GUARD_H
+#define _LIBCPP___CXX03___MUTEX_LOCK_GUARD_H
#include <__cxx03/__config>
#include <__cxx03/__mutex/tag_types.h>
@@ -45,4 +45,4 @@ _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(lock_guard);
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MUTEX_LOCK_GUARD_H
+#endif // _LIBCPP___CXX03___MUTEX_LOCK_GUARD_H
diff --git a/libcxx/include/__cxx03/__mutex/mutex.h b/libcxx/include/__cxx03/__mutex/mutex.h
index 58adf2b1b2b0a0..46c7546f77e32d 100644
--- a/libcxx/include/__cxx03/__mutex/mutex.h
+++ b/libcxx/include/__cxx03/__mutex/mutex.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MUTEX_MUTEX_H
-#define _LIBCPP___MUTEX_MUTEX_H
+#ifndef _LIBCPP___CXX03___MUTEX_MUTEX_H
+#define _LIBCPP___CXX03___MUTEX_MUTEX_H
#include <__cxx03/__config>
#include <__cxx03/__thread/support.h>
@@ -50,4 +50,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_HAS_NO_THREADS
-#endif // _LIBCPP___MUTEX_MUTEX_H
+#endif // _LIBCPP___CXX03___MUTEX_MUTEX_H
diff --git a/libcxx/include/__cxx03/__mutex/once_flag.h b/libcxx/include/__cxx03/__mutex/once_flag.h
index 9c467f7b274dd2..73c2017f368541 100644
--- a/libcxx/include/__cxx03/__mutex/once_flag.h
+++ b/libcxx/include/__cxx03/__mutex/once_flag.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MUTEX_ONCE_FLAG_H
-#define _LIBCPP___MUTEX_ONCE_FLAG_H
+#ifndef _LIBCPP___CXX03___MUTEX_ONCE_FLAG_H
+#define _LIBCPP___CXX03___MUTEX_ONCE_FLAG_H
#include <__cxx03/__config>
#include <__cxx03/__functional/invoke.h>
@@ -156,4 +156,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___MUTEX_ONCE_FLAG_H
+#endif // _LIBCPP___CXX03___MUTEX_ONCE_FLAG_H
diff --git a/libcxx/include/__cxx03/__mutex/tag_types.h b/libcxx/include/__cxx03/__mutex/tag_types.h
index c9665f1dd3a7a2..7beb58dabc9131 100644
--- a/libcxx/include/__cxx03/__mutex/tag_types.h
+++ b/libcxx/include/__cxx03/__mutex/tag_types.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MUTEX_TAG_TYPES_H
-#define _LIBCPP___MUTEX_TAG_TYPES_H
+#ifndef _LIBCPP___CXX03___MUTEX_TAG_TYPES_H
+#define _LIBCPP___CXX03___MUTEX_TAG_TYPES_H
#include <__cxx03/__config>
@@ -41,4 +41,4 @@ constexpr adopt_lock_t adopt_lock = adopt_lock_t();
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___MUTEX_TAG_TYPES_H
+#endif // _LIBCPP___CXX03___MUTEX_TAG_TYPES_H
diff --git a/libcxx/include/__cxx03/__mutex/unique_lock.h b/libcxx/include/__cxx03/__mutex/unique_lock.h
index 8dd620d0d5a8d2..1911da38287328 100644
--- a/libcxx/include/__cxx03/__mutex/unique_lock.h
+++ b/libcxx/include/__cxx03/__mutex/unique_lock.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___MUTEX_UNIQUE_LOCK_H
-#define _LIBCPP___MUTEX_UNIQUE_LOCK_H
+#ifndef _LIBCPP___CXX03___MUTEX_UNIQUE_LOCK_H
+#define _LIBCPP___CXX03___MUTEX_UNIQUE_LOCK_H
#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__chrono/time_point.h>
@@ -174,4 +174,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_HAS_NO_THREADS
-#endif // _LIBCPP___MUTEX_UNIQUE_LOCK_H
+#endif // _LIBCPP___CXX03___MUTEX_UNIQUE_LOCK_H
diff --git a/libcxx/include/__cxx03/__node_handle b/libcxx/include/__cxx03/__node_handle
index 6b3af1507c7b44..6b272f9a49fff9 100644
--- a/libcxx/include/__cxx03/__node_handle
+++ b/libcxx/include/__cxx03/__node_handle
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___NODE_HANDLE
-#define _LIBCPP___NODE_HANDLE
+#ifndef _LIBCPP___CXX03___NODE_HANDLE
+#define _LIBCPP___CXX03___NODE_HANDLE
/*
@@ -206,4 +206,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___NODE_HANDLE
+#endif // _LIBCPP___CXX03___NODE_HANDLE
diff --git a/libcxx/include/__cxx03/__numeric/accumulate.h b/libcxx/include/__cxx03/__numeric/accumulate.h
index 243a4b05b97a3d..28309201bb0607 100644
--- a/libcxx/include/__cxx03/__numeric/accumulate.h
+++ b/libcxx/include/__cxx03/__numeric/accumulate.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___NUMERIC_ACCUMULATE_H
-#define _LIBCPP___NUMERIC_ACCUMULATE_H
+#ifndef _LIBCPP___CXX03___NUMERIC_ACCUMULATE_H
+#define _LIBCPP___CXX03___NUMERIC_ACCUMULATE_H
#include <__cxx03/__config>
#include <__cxx03/__utility/move.h>
@@ -50,4 +50,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___NUMERIC_ACCUMULATE_H
+#endif // _LIBCPP___CXX03___NUMERIC_ACCUMULATE_H
diff --git a/libcxx/include/__cxx03/__numeric/adjacent_difference.h b/libcxx/include/__cxx03/__numeric/adjacent_difference.h
index a07d46a3892c19..ec7ba7c27f854e 100644
--- a/libcxx/include/__cxx03/__numeric/adjacent_difference.h
+++ b/libcxx/include/__cxx03/__numeric/adjacent_difference.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___NUMERIC_ADJACENT_DIFFERENCE_H
-#define _LIBCPP___NUMERIC_ADJACENT_DIFFERENCE_H
+#ifndef _LIBCPP___CXX03___NUMERIC_ADJACENT_DIFFERENCE_H
+#define _LIBCPP___CXX03___NUMERIC_ADJACENT_DIFFERENCE_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/iterator_traits.h>
@@ -65,4 +65,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___NUMERIC_ADJACENT_DIFFERENCE_H
+#endif // _LIBCPP___CXX03___NUMERIC_ADJACENT_DIFFERENCE_H
diff --git a/libcxx/include/__cxx03/__numeric/exclusive_scan.h b/libcxx/include/__cxx03/__numeric/exclusive_scan.h
index 70b85783ed22ff..877deb22fc33de 100644
--- a/libcxx/include/__cxx03/__numeric/exclusive_scan.h
+++ b/libcxx/include/__cxx03/__numeric/exclusive_scan.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___NUMERIC_EXCLUSIVE_SCAN_H
-#define _LIBCPP___NUMERIC_EXCLUSIVE_SCAN_H
+#ifndef _LIBCPP___CXX03___NUMERIC_EXCLUSIVE_SCAN_H
+#define _LIBCPP___CXX03___NUMERIC_EXCLUSIVE_SCAN_H
#include <__cxx03/__config>
#include <__cxx03/__functional/operations.h>
@@ -55,4 +55,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___NUMERIC_EXCLUSIVE_SCAN_H
+#endif // _LIBCPP___CXX03___NUMERIC_EXCLUSIVE_SCAN_H
diff --git a/libcxx/include/__cxx03/__numeric/gcd_lcm.h b/libcxx/include/__cxx03/__numeric/gcd_lcm.h
index 4d1a88f23bf465..e6d3b78fdfdd60 100644
--- a/libcxx/include/__cxx03/__numeric/gcd_lcm.h
+++ b/libcxx/include/__cxx03/__numeric/gcd_lcm.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___NUMERIC_GCD_LCM_H
-#define _LIBCPP___NUMERIC_GCD_LCM_H
+#ifndef _LIBCPP___CXX03___NUMERIC_GCD_LCM_H
+#define _LIBCPP___CXX03___NUMERIC_GCD_LCM_H
#include <__cxx03/__algorithm/min.h>
#include <__cxx03/__assert>
@@ -129,4 +129,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___NUMERIC_GCD_LCM_H
+#endif // _LIBCPP___CXX03___NUMERIC_GCD_LCM_H
diff --git a/libcxx/include/__cxx03/__numeric/inclusive_scan.h b/libcxx/include/__cxx03/__numeric/inclusive_scan.h
index 352161cafd4989..5cac37dfc7b0d8 100644
--- a/libcxx/include/__cxx03/__numeric/inclusive_scan.h
+++ b/libcxx/include/__cxx03/__numeric/inclusive_scan.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___NUMERIC_INCLUSIVE_SCAN_H
-#define _LIBCPP___NUMERIC_INCLUSIVE_SCAN_H
+#ifndef _LIBCPP___CXX03___NUMERIC_INCLUSIVE_SCAN_H
+#define _LIBCPP___CXX03___NUMERIC_INCLUSIVE_SCAN_H
#include <__cxx03/__config>
#include <__cxx03/__functional/operations.h>
@@ -56,4 +56,4 @@ inclusive_scan(_InputIterator __first, _InputIterator __last, _OutputIterator __
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___NUMERIC_INCLUSIVE_SCAN_H
+#endif // _LIBCPP___CXX03___NUMERIC_INCLUSIVE_SCAN_H
diff --git a/libcxx/include/__cxx03/__numeric/inner_product.h b/libcxx/include/__cxx03/__numeric/inner_product.h
index a5369438c7e3f1..12615c3e02136e 100644
--- a/libcxx/include/__cxx03/__numeric/inner_product.h
+++ b/libcxx/include/__cxx03/__numeric/inner_product.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___NUMERIC_INNER_PRODUCT_H
-#define _LIBCPP___NUMERIC_INNER_PRODUCT_H
+#ifndef _LIBCPP___CXX03___NUMERIC_INNER_PRODUCT_H
+#define _LIBCPP___CXX03___NUMERIC_INNER_PRODUCT_H
#include <__cxx03/__config>
#include <__cxx03/__utility/move.h>
@@ -55,4 +55,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___NUMERIC_INNER_PRODUCT_H
+#endif // _LIBCPP___CXX03___NUMERIC_INNER_PRODUCT_H
diff --git a/libcxx/include/__cxx03/__numeric/iota.h b/libcxx/include/__cxx03/__numeric/iota.h
index fe9fb9fc37da4f..f97c124700ae83 100644
--- a/libcxx/include/__cxx03/__numeric/iota.h
+++ b/libcxx/include/__cxx03/__numeric/iota.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___NUMERIC_IOTA_H
-#define _LIBCPP___NUMERIC_IOTA_H
+#ifndef _LIBCPP___CXX03___NUMERIC_IOTA_H
+#define _LIBCPP___CXX03___NUMERIC_IOTA_H
#include <__cxx03/__config>
@@ -27,4 +27,4 @@ iota(_ForwardIterator __first, _ForwardIterator __last, _Tp __value) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___NUMERIC_IOTA_H
+#endif // _LIBCPP___CXX03___NUMERIC_IOTA_H
diff --git a/libcxx/include/__cxx03/__numeric/midpoint.h b/libcxx/include/__cxx03/__numeric/midpoint.h
index 2244354c79300e..91771df1f77b44 100644
--- a/libcxx/include/__cxx03/__numeric/midpoint.h
+++ b/libcxx/include/__cxx03/__numeric/midpoint.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___NUMERIC_MIDPOINT_H
-#define _LIBCPP___NUMERIC_MIDPOINT_H
+#ifndef _LIBCPP___CXX03___NUMERIC_MIDPOINT_H
+#define _LIBCPP___CXX03___NUMERIC_MIDPOINT_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -85,4 +85,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___NUMERIC_MIDPOINT_H
+#endif // _LIBCPP___CXX03___NUMERIC_MIDPOINT_H
diff --git a/libcxx/include/__cxx03/__numeric/partial_sum.h b/libcxx/include/__cxx03/__numeric/partial_sum.h
index 1f9aa36233dd04..8dead17f1a5d1b 100644
--- a/libcxx/include/__cxx03/__numeric/partial_sum.h
+++ b/libcxx/include/__cxx03/__numeric/partial_sum.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___NUMERIC_PARTIAL_SUM_H
-#define _LIBCPP___NUMERIC_PARTIAL_SUM_H
+#ifndef _LIBCPP___CXX03___NUMERIC_PARTIAL_SUM_H
+#define _LIBCPP___CXX03___NUMERIC_PARTIAL_SUM_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/iterator_traits.h>
@@ -63,4 +63,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___NUMERIC_PARTIAL_SUM_H
+#endif // _LIBCPP___CXX03___NUMERIC_PARTIAL_SUM_H
diff --git a/libcxx/include/__cxx03/__numeric/pstl.h b/libcxx/include/__cxx03/__numeric/pstl.h
index 365f6fabb14769..3311b406635490 100644
--- a/libcxx/include/__cxx03/__numeric/pstl.h
+++ b/libcxx/include/__cxx03/__numeric/pstl.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___NUMERIC_PSTL_H
-#define _LIBCPP___NUMERIC_PSTL_H
+#ifndef _LIBCPP___CXX03___NUMERIC_PSTL_H
+#define _LIBCPP___CXX03___NUMERIC_PSTL_H
#include <__cxx03/__config>
@@ -171,4 +171,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___NUMERIC_PSTL_H
+#endif // _LIBCPP___CXX03___NUMERIC_PSTL_H
diff --git a/libcxx/include/__cxx03/__numeric/reduce.h b/libcxx/include/__cxx03/__numeric/reduce.h
index 039954498043ab..628951371f9595 100644
--- a/libcxx/include/__cxx03/__numeric/reduce.h
+++ b/libcxx/include/__cxx03/__numeric/reduce.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___NUMERIC_REDUCE_H
-#define _LIBCPP___NUMERIC_REDUCE_H
+#ifndef _LIBCPP___CXX03___NUMERIC_REDUCE_H
+#define _LIBCPP___CXX03___NUMERIC_REDUCE_H
#include <__cxx03/__config>
#include <__cxx03/__functional/operations.h>
@@ -50,4 +50,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___NUMERIC_REDUCE_H
+#endif // _LIBCPP___CXX03___NUMERIC_REDUCE_H
diff --git a/libcxx/include/__cxx03/__numeric/saturation_arithmetic.h b/libcxx/include/__cxx03/__numeric/saturation_arithmetic.h
index 972428e36a7781..d4da500beaa108 100644
--- a/libcxx/include/__cxx03/__numeric/saturation_arithmetic.h
+++ b/libcxx/include/__cxx03/__numeric/saturation_arithmetic.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___NUMERIC_SATURATION_ARITHMETIC_H
-#define _LIBCPP___NUMERIC_SATURATION_ARITHMETIC_H
+#ifndef _LIBCPP___CXX03___NUMERIC_SATURATION_ARITHMETIC_H
+#define _LIBCPP___CXX03___NUMERIC_SATURATION_ARITHMETIC_H
#include <__cxx03/__assert>
#include <__cxx03/__concepts/arithmetic.h>
@@ -142,4 +142,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___NUMERIC_SATURATION_ARITHMETIC_H
+#endif // _LIBCPP___CXX03___NUMERIC_SATURATION_ARITHMETIC_H
diff --git a/libcxx/include/__cxx03/__numeric/transform_exclusive_scan.h b/libcxx/include/__cxx03/__numeric/transform_exclusive_scan.h
index 5857c75eb20945..034c7c929964e8 100644
--- a/libcxx/include/__cxx03/__numeric/transform_exclusive_scan.h
+++ b/libcxx/include/__cxx03/__numeric/transform_exclusive_scan.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___NUMERIC_TRANSFORM_EXCLUSIVE_SCAN_H
-#define _LIBCPP___NUMERIC_TRANSFORM_EXCLUSIVE_SCAN_H
+#ifndef _LIBCPP___CXX03___NUMERIC_TRANSFORM_EXCLUSIVE_SCAN_H
+#define _LIBCPP___CXX03___NUMERIC_TRANSFORM_EXCLUSIVE_SCAN_H
#include <__cxx03/__config>
@@ -39,4 +39,4 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator transform_ex
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___NUMERIC_TRANSFORM_EXCLUSIVE_SCAN_H
+#endif // _LIBCPP___CXX03___NUMERIC_TRANSFORM_EXCLUSIVE_SCAN_H
diff --git a/libcxx/include/__cxx03/__numeric/transform_inclusive_scan.h b/libcxx/include/__cxx03/__numeric/transform_inclusive_scan.h
index 31f7d52b4261f9..00e9b1675b69fc 100644
--- a/libcxx/include/__cxx03/__numeric/transform_inclusive_scan.h
+++ b/libcxx/include/__cxx03/__numeric/transform_inclusive_scan.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___NUMERIC_TRANSFORM_INCLUSIVE_SCAN_H
-#define _LIBCPP___NUMERIC_TRANSFORM_INCLUSIVE_SCAN_H
+#ifndef _LIBCPP___CXX03___NUMERIC_TRANSFORM_INCLUSIVE_SCAN_H
+#define _LIBCPP___CXX03___NUMERIC_TRANSFORM_INCLUSIVE_SCAN_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/iterator_traits.h>
@@ -49,4 +49,4 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _OutputIterator transform_in
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___NUMERIC_TRANSFORM_INCLUSIVE_SCAN_H
+#endif // _LIBCPP___CXX03___NUMERIC_TRANSFORM_INCLUSIVE_SCAN_H
diff --git a/libcxx/include/__cxx03/__numeric/transform_reduce.h b/libcxx/include/__cxx03/__numeric/transform_reduce.h
index 5e494ff5d1b78d..5ec1a59483f07e 100644
--- a/libcxx/include/__cxx03/__numeric/transform_reduce.h
+++ b/libcxx/include/__cxx03/__numeric/transform_reduce.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___NUMERIC_TRANSFORM_REDUCE_H
-#define _LIBCPP___NUMERIC_TRANSFORM_REDUCE_H
+#ifndef _LIBCPP___CXX03___NUMERIC_TRANSFORM_REDUCE_H
+#define _LIBCPP___CXX03___NUMERIC_TRANSFORM_REDUCE_H
#include <__cxx03/__config>
#include <__cxx03/__functional/operations.h>
@@ -56,4 +56,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___NUMERIC_TRANSFORM_REDUCE_H
+#endif // _LIBCPP___CXX03___NUMERIC_TRANSFORM_REDUCE_H
diff --git a/libcxx/include/__cxx03/__ostream/basic_ostream.h b/libcxx/include/__cxx03/__ostream/basic_ostream.h
index 1f0fb9acd3871d..593ddc501c050f 100644
--- a/libcxx/include/__cxx03/__ostream/basic_ostream.h
+++ b/libcxx/include/__cxx03/__ostream/basic_ostream.h
@@ -6,8 +6,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP___OSTREAM_BASIC_OSTREAM_H
-#define _LIBCPP___OSTREAM_BASIC_OSTREAM_H
+#ifndef _LIBCPP___CXX03___OSTREAM_BASIC_OSTREAM_H
+#define _LIBCPP___CXX03___OSTREAM_BASIC_OSTREAM_H
#include <__cxx03/__config>
#include <__cxx03/__exception/operations.h>
@@ -857,4 +857,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___OSTREAM_BASIC_OSTREAM_H
+#endif // _LIBCPP___CXX03___OSTREAM_BASIC_OSTREAM_H
diff --git a/libcxx/include/__cxx03/__ostream/print.h b/libcxx/include/__cxx03/__ostream/print.h
index b1830814051849..d7943efd60f80d 100644
--- a/libcxx/include/__cxx03/__ostream/print.h
+++ b/libcxx/include/__cxx03/__ostream/print.h
@@ -6,8 +6,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP___OSTREAM_PRINT_H
-#define _LIBCPP___OSTREAM_PRINT_H
+#ifndef _LIBCPP___CXX03___OSTREAM_PRINT_H
+#define _LIBCPP___CXX03___OSTREAM_PRINT_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/ostream.h>
@@ -176,4 +176,4 @@ _LIBCPP_HIDE_FROM_ABI inline void println(ostream& __os) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___OSTREAM_PRINT_H
+#endif // _LIBCPP___CXX03___OSTREAM_PRINT_H
diff --git a/libcxx/include/__cxx03/__pstl/backend.h b/libcxx/include/__cxx03/__pstl/backend.h
index 9bc243746df0d1..7e39c6dbc0f8da 100644
--- a/libcxx/include/__cxx03/__pstl/backend.h
+++ b/libcxx/include/__cxx03/__pstl/backend.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___PSTL_BACKEND_H
-#define _LIBCPP___PSTL_BACKEND_H
+#ifndef _LIBCPP___CXX03___PSTL_BACKEND_H
+#define _LIBCPP___CXX03___PSTL_BACKEND_H
#include <__cxx03/__config>
#include <__cxx03/__pstl/backend_fwd.h>
@@ -32,4 +32,4 @@ _LIBCPP_PUSH_MACROS
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___PSTL_BACKEND_H
+#endif // _LIBCPP___CXX03___PSTL_BACKEND_H
diff --git a/libcxx/include/__cxx03/__pstl/backend_fwd.h b/libcxx/include/__cxx03/__pstl/backend_fwd.h
index 56c8c043e4d2c1..e9abd8e99c73c3 100644
--- a/libcxx/include/__cxx03/__pstl/backend_fwd.h
+++ b/libcxx/include/__cxx03/__pstl/backend_fwd.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___PSTL_BACKEND_FWD_H
-#define _LIBCPP___PSTL_BACKEND_FWD_H
+#ifndef _LIBCPP___CXX03___PSTL_BACKEND_FWD_H
+#define _LIBCPP___CXX03___PSTL_BACKEND_FWD_H
#include <__cxx03/__config>
@@ -298,4 +298,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___PSTL_BACKEND_FWD_H
+#endif // _LIBCPP___CXX03___PSTL_BACKEND_FWD_H
diff --git a/libcxx/include/__cxx03/__pstl/backends/default.h b/libcxx/include/__cxx03/__pstl/backends/default.h
index 2ad388ae50d33e..7f7a5325c7d1cc 100644
--- a/libcxx/include/__cxx03/__pstl/backends/default.h
+++ b/libcxx/include/__cxx03/__pstl/backends/default.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___PSTL_BACKENDS_DEFAULT_H
-#define _LIBCPP___PSTL_BACKENDS_DEFAULT_H
+#ifndef _LIBCPP___CXX03___PSTL_BACKENDS_DEFAULT_H
+#define _LIBCPP___CXX03___PSTL_BACKENDS_DEFAULT_H
#include <__cxx03/__algorithm/copy_n.h>
#include <__cxx03/__algorithm/equal.h>
@@ -500,4 +500,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___PSTL_BACKENDS_DEFAULT_H
+#endif // _LIBCPP___CXX03___PSTL_BACKENDS_DEFAULT_H
diff --git a/libcxx/include/__cxx03/__pstl/backends/libdispatch.h b/libcxx/include/__cxx03/__pstl/backends/libdispatch.h
index fb811917025a29..80260ca5b7a5b5 100644
--- a/libcxx/include/__cxx03/__pstl/backends/libdispatch.h
+++ b/libcxx/include/__cxx03/__pstl/backends/libdispatch.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___PSTL_BACKENDS_LIBDISPATCH_H
-#define _LIBCPP___PSTL_BACKENDS_LIBDISPATCH_H
+#ifndef _LIBCPP___CXX03___PSTL_BACKENDS_LIBDISPATCH_H
+#define _LIBCPP___CXX03___PSTL_BACKENDS_LIBDISPATCH_H
#include <__cxx03/__algorithm/inplace_merge.h>
#include <__cxx03/__algorithm/lower_bound.h>
@@ -394,4 +394,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___PSTL_BACKENDS_LIBDISPATCH_H
+#endif // _LIBCPP___CXX03___PSTL_BACKENDS_LIBDISPATCH_H
diff --git a/libcxx/include/__cxx03/__pstl/backends/serial.h b/libcxx/include/__cxx03/__pstl/backends/serial.h
index 699c1035d9113c..d0de7a1177783d 100644
--- a/libcxx/include/__cxx03/__pstl/backends/serial.h
+++ b/libcxx/include/__cxx03/__pstl/backends/serial.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___PSTL_BACKENDS_SERIAL_H
-#define _LIBCPP___PSTL_BACKENDS_SERIAL_H
+#ifndef _LIBCPP___CXX03___PSTL_BACKENDS_SERIAL_H
+#define _LIBCPP___CXX03___PSTL_BACKENDS_SERIAL_H
#include <__cxx03/__algorithm/find_if.h>
#include <__cxx03/__algorithm/for_each.h>
@@ -178,4 +178,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___PSTL_BACKENDS_SERIAL_H
+#endif // _LIBCPP___CXX03___PSTL_BACKENDS_SERIAL_H
diff --git a/libcxx/include/__cxx03/__pstl/backends/std_thread.h b/libcxx/include/__cxx03/__pstl/backends/std_thread.h
index 06cd1a1c03c464..487ddda57aa25a 100644
--- a/libcxx/include/__cxx03/__pstl/backends/std_thread.h
+++ b/libcxx/include/__cxx03/__pstl/backends/std_thread.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___PSTL_BACKENDS_STD_THREAD_H
-#define _LIBCPP___PSTL_BACKENDS_STD_THREAD_H
+#ifndef _LIBCPP___CXX03___PSTL_BACKENDS_STD_THREAD_H
+#define _LIBCPP___CXX03___PSTL_BACKENDS_STD_THREAD_H
#include <__cxx03/__config>
#include <__cxx03/__pstl/backend_fwd.h>
@@ -133,4 +133,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___PSTL_BACKENDS_STD_THREAD_H
+#endif // _LIBCPP___CXX03___PSTL_BACKENDS_STD_THREAD_H
diff --git a/libcxx/include/__cxx03/__pstl/cpu_algos/any_of.h b/libcxx/include/__cxx03/__pstl/cpu_algos/any_of.h
index b1b51d1679bf2c..7828a7026e7d4f 100644
--- a/libcxx/include/__cxx03/__pstl/cpu_algos/any_of.h
+++ b/libcxx/include/__cxx03/__pstl/cpu_algos/any_of.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___PSTL_CPU_ALGOS_ANY_OF_H
-#define _LIBCPP___PSTL_CPU_ALGOS_ANY_OF_H
+#ifndef _LIBCPP___CXX03___PSTL_CPU_ALGOS_ANY_OF_H
+#define _LIBCPP___CXX03___PSTL_CPU_ALGOS_ANY_OF_H
#include <__cxx03/__algorithm/any_of.h>
#include <__cxx03/__assert>
@@ -96,4 +96,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___PSTL_CPU_ALGOS_ANY_OF_H
+#endif // _LIBCPP___CXX03___PSTL_CPU_ALGOS_ANY_OF_H
diff --git a/libcxx/include/__cxx03/__pstl/cpu_algos/cpu_traits.h b/libcxx/include/__cxx03/__pstl/cpu_algos/cpu_traits.h
index 9538b5c94957dc..770f5dd7b45da8 100644
--- a/libcxx/include/__cxx03/__pstl/cpu_algos/cpu_traits.h
+++ b/libcxx/include/__cxx03/__pstl/cpu_algos/cpu_traits.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___PSTL_CPU_ALGOS_CPU_TRAITS_H
-#define _LIBCPP___PSTL_CPU_ALGOS_CPU_TRAITS_H
+#ifndef _LIBCPP___CXX03___PSTL_CPU_ALGOS_CPU_TRAITS_H
+#define _LIBCPP___CXX03___PSTL_CPU_ALGOS_CPU_TRAITS_H
#include <__cxx03/__config>
#include <__cxx03/cstddef>
@@ -83,4 +83,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___PSTL_CPU_ALGOS_CPU_TRAITS_H
+#endif // _LIBCPP___CXX03___PSTL_CPU_ALGOS_CPU_TRAITS_H
diff --git a/libcxx/include/__cxx03/__pstl/cpu_algos/fill.h b/libcxx/include/__cxx03/__pstl/cpu_algos/fill.h
index 19fac90c44010d..a101efb632e6c4 100644
--- a/libcxx/include/__cxx03/__pstl/cpu_algos/fill.h
+++ b/libcxx/include/__cxx03/__pstl/cpu_algos/fill.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___PSTL_CPU_ALGOS_FILL_H
-#define _LIBCPP___PSTL_CPU_ALGOS_FILL_H
+#ifndef _LIBCPP___CXX03___PSTL_CPU_ALGOS_FILL_H
+#define _LIBCPP___CXX03___PSTL_CPU_ALGOS_FILL_H
#include <__cxx03/__algorithm/fill.h>
#include <__cxx03/__assert>
@@ -63,4 +63,4 @@ struct __cpu_parallel_fill {
} // namespace __pstl
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___PSTL_CPU_ALGOS_FILL_H
+#endif // _LIBCPP___CXX03___PSTL_CPU_ALGOS_FILL_H
diff --git a/libcxx/include/__cxx03/__pstl/cpu_algos/find_if.h b/libcxx/include/__cxx03/__pstl/cpu_algos/find_if.h
index 2be1aad7ae6bec..c7393c41c1f459 100644
--- a/libcxx/include/__cxx03/__pstl/cpu_algos/find_if.h
+++ b/libcxx/include/__cxx03/__pstl/cpu_algos/find_if.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___PSTL_CPU_ALGOS_FIND_IF_H
-#define _LIBCPP___PSTL_CPU_ALGOS_FIND_IF_H
+#ifndef _LIBCPP___CXX03___PSTL_CPU_ALGOS_FIND_IF_H
+#define _LIBCPP___CXX03___PSTL_CPU_ALGOS_FIND_IF_H
#include <__cxx03/__algorithm/find_if.h>
#include <__cxx03/__assert>
@@ -134,4 +134,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___PSTL_CPU_ALGOS_FIND_IF_H
+#endif // _LIBCPP___CXX03___PSTL_CPU_ALGOS_FIND_IF_H
diff --git a/libcxx/include/__cxx03/__pstl/cpu_algos/for_each.h b/libcxx/include/__cxx03/__pstl/cpu_algos/for_each.h
index 4f6f2e87342a95..9362f56b323b6b 100644
--- a/libcxx/include/__cxx03/__pstl/cpu_algos/for_each.h
+++ b/libcxx/include/__cxx03/__pstl/cpu_algos/for_each.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___PSTL_CPU_ALGOS_FOR_EACH_H
-#define _LIBCPP___PSTL_CPU_ALGOS_FOR_EACH_H
+#ifndef _LIBCPP___CXX03___PSTL_CPU_ALGOS_FOR_EACH_H
+#define _LIBCPP___CXX03___PSTL_CPU_ALGOS_FOR_EACH_H
#include <__cxx03/__algorithm/for_each.h>
#include <__cxx03/__assert>
@@ -63,4 +63,4 @@ struct __cpu_parallel_for_each {
} // namespace __pstl
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___PSTL_CPU_ALGOS_FOR_EACH_H
+#endif // _LIBCPP___CXX03___PSTL_CPU_ALGOS_FOR_EACH_H
diff --git a/libcxx/include/__cxx03/__pstl/cpu_algos/merge.h b/libcxx/include/__cxx03/__pstl/cpu_algos/merge.h
index 0feb510dc60f7c..9bab8b4838ef22 100644
--- a/libcxx/include/__cxx03/__pstl/cpu_algos/merge.h
+++ b/libcxx/include/__cxx03/__pstl/cpu_algos/merge.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___PSTL_CPU_ALGOS_MERGE_H
-#define _LIBCPP___PSTL_CPU_ALGOS_MERGE_H
+#ifndef _LIBCPP___CXX03___PSTL_CPU_ALGOS_MERGE_H
+#define _LIBCPP___CXX03___PSTL_CPU_ALGOS_MERGE_H
#include <__cxx03/__algorithm/merge.h>
#include <__cxx03/__assert>
@@ -82,4 +82,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___PSTL_CPU_ALGOS_MERGE_H
+#endif // _LIBCPP___CXX03___PSTL_CPU_ALGOS_MERGE_H
diff --git a/libcxx/include/__cxx03/__pstl/cpu_algos/stable_sort.h b/libcxx/include/__cxx03/__pstl/cpu_algos/stable_sort.h
index 63be0c7ac16693..c0ebb2cd0a1c70 100644
--- a/libcxx/include/__cxx03/__pstl/cpu_algos/stable_sort.h
+++ b/libcxx/include/__cxx03/__pstl/cpu_algos/stable_sort.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___PSTL_CPU_ALGOS_STABLE_SORT_H
-#define _LIBCPP___PSTL_CPU_ALGOS_STABLE_SORT_H
+#ifndef _LIBCPP___CXX03___PSTL_CPU_ALGOS_STABLE_SORT_H
+#define _LIBCPP___CXX03___PSTL_CPU_ALGOS_STABLE_SORT_H
#include <__cxx03/__algorithm/stable_sort.h>
#include <__cxx03/__config>
@@ -44,4 +44,4 @@ struct __cpu_parallel_stable_sort {
} // namespace __pstl
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___PSTL_CPU_ALGOS_STABLE_SORT_H
+#endif // _LIBCPP___CXX03___PSTL_CPU_ALGOS_STABLE_SORT_H
diff --git a/libcxx/include/__cxx03/__pstl/cpu_algos/transform.h b/libcxx/include/__cxx03/__pstl/cpu_algos/transform.h
index d82bbb588a9987..500e110ac7e2e7 100644
--- a/libcxx/include/__cxx03/__pstl/cpu_algos/transform.h
+++ b/libcxx/include/__cxx03/__pstl/cpu_algos/transform.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___PSTL_CPU_ALGOS_TRANSFORM_H
-#define _LIBCPP___PSTL_CPU_ALGOS_TRANSFORM_H
+#ifndef _LIBCPP___CXX03___PSTL_CPU_ALGOS_TRANSFORM_H
+#define _LIBCPP___CXX03___PSTL_CPU_ALGOS_TRANSFORM_H
#include <__cxx03/__algorithm/transform.h>
#include <__cxx03/__assert>
@@ -150,4 +150,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___PSTL_CPU_ALGOS_TRANSFORM_H
+#endif // _LIBCPP___CXX03___PSTL_CPU_ALGOS_TRANSFORM_H
diff --git a/libcxx/include/__cxx03/__pstl/cpu_algos/transform_reduce.h b/libcxx/include/__cxx03/__pstl/cpu_algos/transform_reduce.h
index 52f0ea361b3c1f..38764d963fc5ee 100644
--- a/libcxx/include/__cxx03/__pstl/cpu_algos/transform_reduce.h
+++ b/libcxx/include/__cxx03/__pstl/cpu_algos/transform_reduce.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___PSTL_CPU_ALGOS_TRANSFORM_REDUCE_H
-#define _LIBCPP___PSTL_CPU_ALGOS_TRANSFORM_REDUCE_H
+#ifndef _LIBCPP___CXX03___PSTL_CPU_ALGOS_TRANSFORM_REDUCE_H
+#define _LIBCPP___CXX03___PSTL_CPU_ALGOS_TRANSFORM_REDUCE_H
#include <__cxx03/__assert>
#include <__cxx03/__config>
@@ -213,4 +213,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___PSTL_CPU_ALGOS_TRANSFORM_REDUCE_H
+#endif // _LIBCPP___CXX03___PSTL_CPU_ALGOS_TRANSFORM_REDUCE_H
diff --git a/libcxx/include/__cxx03/__pstl/dispatch.h b/libcxx/include/__cxx03/__pstl/dispatch.h
index e223e59bb129ce..39857d0eafd630 100644
--- a/libcxx/include/__cxx03/__pstl/dispatch.h
+++ b/libcxx/include/__cxx03/__pstl/dispatch.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___PSTL_DISPATCH_H
-#define _LIBCPP___PSTL_DISPATCH_H
+#ifndef _LIBCPP___CXX03___PSTL_DISPATCH_H
+#define _LIBCPP___CXX03___PSTL_DISPATCH_H
#include <__cxx03/__config>
#include <__cxx03/__pstl/backend_fwd.h>
@@ -63,4 +63,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___PSTL_DISPATCH_H
+#endif // _LIBCPP___CXX03___PSTL_DISPATCH_H
diff --git a/libcxx/include/__cxx03/__pstl/handle_exception.h b/libcxx/include/__cxx03/__pstl/handle_exception.h
index 562617a1786b31..e21146fa1eacae 100644
--- a/libcxx/include/__cxx03/__pstl/handle_exception.h
+++ b/libcxx/include/__cxx03/__pstl/handle_exception.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___PSTL_HANDLE_EXCEPTION_H
-#define _LIBCPP___PSTL_HANDLE_EXCEPTION_H
+#ifndef _LIBCPP___CXX03___PSTL_HANDLE_EXCEPTION_H
+#define _LIBCPP___CXX03___PSTL_HANDLE_EXCEPTION_H
#include <__cxx03/__config>
#include <__cxx03/__utility/forward.h>
@@ -54,4 +54,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___PSTL_HANDLE_EXCEPTION_H
+#endif // _LIBCPP___CXX03___PSTL_HANDLE_EXCEPTION_H
diff --git a/libcxx/include/__cxx03/__random/bernoulli_distribution.h b/libcxx/include/__cxx03/__random/bernoulli_distribution.h
index 28536442fd1d3d..3c35e8c39e237f 100644
--- a/libcxx/include/__cxx03/__random/bernoulli_distribution.h
+++ b/libcxx/include/__cxx03/__random/bernoulli_distribution.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_BERNOULLI_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_BERNOULLI_DISTRIBUTION_H
+#ifndef _LIBCPP___CXX03___RANDOM_BERNOULLI_DISTRIBUTION_H
+#define _LIBCPP___CXX03___RANDOM_BERNOULLI_DISTRIBUTION_H
#include <__cxx03/__config>
#include <__cxx03/__random/is_valid.h>
@@ -120,4 +120,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_BERNOULLI_DISTRIBUTION_H
+#endif // _LIBCPP___CXX03___RANDOM_BERNOULLI_DISTRIBUTION_H
diff --git a/libcxx/include/__cxx03/__random/binomial_distribution.h b/libcxx/include/__cxx03/__random/binomial_distribution.h
index 3ca98e84082e15..5b703749fc7d14 100644
--- a/libcxx/include/__cxx03/__random/binomial_distribution.h
+++ b/libcxx/include/__cxx03/__random/binomial_distribution.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_BINOMIAL_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_BINOMIAL_DISTRIBUTION_H
+#ifndef _LIBCPP___CXX03___RANDOM_BINOMIAL_DISTRIBUTION_H
+#define _LIBCPP___CXX03___RANDOM_BINOMIAL_DISTRIBUTION_H
#include <__cxx03/__config>
#include <__cxx03/__random/is_valid.h>
@@ -195,4 +195,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_BINOMIAL_DISTRIBUTION_H
+#endif // _LIBCPP___CXX03___RANDOM_BINOMIAL_DISTRIBUTION_H
diff --git a/libcxx/include/__cxx03/__random/cauchy_distribution.h b/libcxx/include/__cxx03/__random/cauchy_distribution.h
index b84ba03703143a..cbec0b6f855548 100644
--- a/libcxx/include/__cxx03/__random/cauchy_distribution.h
+++ b/libcxx/include/__cxx03/__random/cauchy_distribution.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_CAUCHY_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_CAUCHY_DISTRIBUTION_H
+#ifndef _LIBCPP___CXX03___RANDOM_CAUCHY_DISTRIBUTION_H
+#define _LIBCPP___CXX03___RANDOM_CAUCHY_DISTRIBUTION_H
#include <__cxx03/__config>
#include <__cxx03/__random/is_valid.h>
@@ -136,4 +136,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_CAUCHY_DISTRIBUTION_H
+#endif // _LIBCPP___CXX03___RANDOM_CAUCHY_DISTRIBUTION_H
diff --git a/libcxx/include/__cxx03/__random/chi_squared_distribution.h b/libcxx/include/__cxx03/__random/chi_squared_distribution.h
index 94ba5555ce41d0..531c3204130d50 100644
--- a/libcxx/include/__cxx03/__random/chi_squared_distribution.h
+++ b/libcxx/include/__cxx03/__random/chi_squared_distribution.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_CHI_SQUARED_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_CHI_SQUARED_DISTRIBUTION_H
+#ifndef _LIBCPP___CXX03___RANDOM_CHI_SQUARED_DISTRIBUTION_H
+#define _LIBCPP___CXX03___RANDOM_CHI_SQUARED_DISTRIBUTION_H
#include <__cxx03/__config>
#include <__cxx03/__random/gamma_distribution.h>
@@ -122,4 +122,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_CHI_SQUARED_DISTRIBUTION_H
+#endif // _LIBCPP___CXX03___RANDOM_CHI_SQUARED_DISTRIBUTION_H
diff --git a/libcxx/include/__cxx03/__random/clamp_to_integral.h b/libcxx/include/__cxx03/__random/clamp_to_integral.h
index c10783aab2c070..be89db8c6a8078 100644
--- a/libcxx/include/__cxx03/__random/clamp_to_integral.h
+++ b/libcxx/include/__cxx03/__random/clamp_to_integral.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_CLAMP_TO_INTEGRAL_H
-#define _LIBCPP___RANDOM_CLAMP_TO_INTEGRAL_H
+#ifndef _LIBCPP___CXX03___RANDOM_CLAMP_TO_INTEGRAL_H
+#define _LIBCPP___CXX03___RANDOM_CLAMP_TO_INTEGRAL_H
#include <__cxx03/__config>
#include <__cxx03/cmath>
@@ -56,4 +56,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_CLAMP_TO_INTEGRAL_H
+#endif // _LIBCPP___CXX03___RANDOM_CLAMP_TO_INTEGRAL_H
diff --git a/libcxx/include/__cxx03/__random/default_random_engine.h b/libcxx/include/__cxx03/__random/default_random_engine.h
index 10eb00b3594fff..81fbac0b301a24 100644
--- a/libcxx/include/__cxx03/__random/default_random_engine.h
+++ b/libcxx/include/__cxx03/__random/default_random_engine.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_DEFAULT_RANDOM_ENGINE_H
-#define _LIBCPP___RANDOM_DEFAULT_RANDOM_ENGINE_H
+#ifndef _LIBCPP___CXX03___RANDOM_DEFAULT_RANDOM_ENGINE_H
+#define _LIBCPP___CXX03___RANDOM_DEFAULT_RANDOM_ENGINE_H
#include <__cxx03/__config>
#include <__cxx03/__random/linear_congruential_engine.h>
@@ -22,4 +22,4 @@ typedef minstd_rand default_random_engine;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANDOM_DEFAULT_RANDOM_ENGINE_H
+#endif // _LIBCPP___CXX03___RANDOM_DEFAULT_RANDOM_ENGINE_H
diff --git a/libcxx/include/__cxx03/__random/discard_block_engine.h b/libcxx/include/__cxx03/__random/discard_block_engine.h
index 2a5f877b79caa3..43027f103a6359 100644
--- a/libcxx/include/__cxx03/__random/discard_block_engine.h
+++ b/libcxx/include/__cxx03/__random/discard_block_engine.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_DISCARD_BLOCK_ENGINE_H
-#define _LIBCPP___RANDOM_DISCARD_BLOCK_ENGINE_H
+#ifndef _LIBCPP___CXX03___RANDOM_DISCARD_BLOCK_ENGINE_H
+#define _LIBCPP___CXX03___RANDOM_DISCARD_BLOCK_ENGINE_H
#include <__cxx03/__config>
#include <__cxx03/__random/is_seed_sequence.h>
@@ -169,4 +169,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_DISCARD_BLOCK_ENGINE_H
+#endif // _LIBCPP___CXX03___RANDOM_DISCARD_BLOCK_ENGINE_H
diff --git a/libcxx/include/__cxx03/__random/discrete_distribution.h b/libcxx/include/__cxx03/__random/discrete_distribution.h
index 40b8bfb61dccf9..b24948050c65c9 100644
--- a/libcxx/include/__cxx03/__random/discrete_distribution.h
+++ b/libcxx/include/__cxx03/__random/discrete_distribution.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_DISCRETE_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_DISCRETE_DISTRIBUTION_H
+#ifndef _LIBCPP___CXX03___RANDOM_DISCRETE_DISTRIBUTION_H
+#define _LIBCPP___CXX03___RANDOM_DISCRETE_DISTRIBUTION_H
#include <__cxx03/__algorithm/upper_bound.h>
#include <__cxx03/__config>
@@ -209,4 +209,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_DISCRETE_DISTRIBUTION_H
+#endif // _LIBCPP___CXX03___RANDOM_DISCRETE_DISTRIBUTION_H
diff --git a/libcxx/include/__cxx03/__random/exponential_distribution.h b/libcxx/include/__cxx03/__random/exponential_distribution.h
index 6f49c31a1bd102..d11a6672153bdc 100644
--- a/libcxx/include/__cxx03/__random/exponential_distribution.h
+++ b/libcxx/include/__cxx03/__random/exponential_distribution.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_EXPONENTIAL_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_EXPONENTIAL_DISTRIBUTION_H
+#ifndef _LIBCPP___CXX03___RANDOM_EXPONENTIAL_DISTRIBUTION_H
+#define _LIBCPP___CXX03___RANDOM_EXPONENTIAL_DISTRIBUTION_H
#include <__cxx03/__config>
#include <__cxx03/__random/generate_canonical.h>
@@ -129,4 +129,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_EXPONENTIAL_DISTRIBUTION_H
+#endif // _LIBCPP___CXX03___RANDOM_EXPONENTIAL_DISTRIBUTION_H
diff --git a/libcxx/include/__cxx03/__random/extreme_value_distribution.h b/libcxx/include/__cxx03/__random/extreme_value_distribution.h
index 46c466d620d503..4207e79cdd569d 100644
--- a/libcxx/include/__cxx03/__random/extreme_value_distribution.h
+++ b/libcxx/include/__cxx03/__random/extreme_value_distribution.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_EXTREME_VALUE_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_EXTREME_VALUE_DISTRIBUTION_H
+#ifndef _LIBCPP___CXX03___RANDOM_EXTREME_VALUE_DISTRIBUTION_H
+#define _LIBCPP___CXX03___RANDOM_EXTREME_VALUE_DISTRIBUTION_H
#include <__cxx03/__config>
#include <__cxx03/__random/is_valid.h>
@@ -136,4 +136,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_EXTREME_VALUE_DISTRIBUTION_H
+#endif // _LIBCPP___CXX03___RANDOM_EXTREME_VALUE_DISTRIBUTION_H
diff --git a/libcxx/include/__cxx03/__random/fisher_f_distribution.h b/libcxx/include/__cxx03/__random/fisher_f_distribution.h
index 45ab47df4021bf..f0050c73ca18cf 100644
--- a/libcxx/include/__cxx03/__random/fisher_f_distribution.h
+++ b/libcxx/include/__cxx03/__random/fisher_f_distribution.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_FISHER_F_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_FISHER_F_DISTRIBUTION_H
+#ifndef _LIBCPP___CXX03___RANDOM_FISHER_F_DISTRIBUTION_H
+#define _LIBCPP___CXX03___RANDOM_FISHER_F_DISTRIBUTION_H
#include <__cxx03/__config>
#include <__cxx03/__random/gamma_distribution.h>
@@ -135,4 +135,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_FISHER_F_DISTRIBUTION_H
+#endif // _LIBCPP___CXX03___RANDOM_FISHER_F_DISTRIBUTION_H
diff --git a/libcxx/include/__cxx03/__random/gamma_distribution.h b/libcxx/include/__cxx03/__random/gamma_distribution.h
index 694c7219452a88..a5f9917fd8f934 100644
--- a/libcxx/include/__cxx03/__random/gamma_distribution.h
+++ b/libcxx/include/__cxx03/__random/gamma_distribution.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_GAMMA_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_GAMMA_DISTRIBUTION_H
+#ifndef _LIBCPP___CXX03___RANDOM_GAMMA_DISTRIBUTION_H
+#define _LIBCPP___CXX03___RANDOM_GAMMA_DISTRIBUTION_H
#include <__cxx03/__config>
#include <__cxx03/__random/exponential_distribution.h>
@@ -178,4 +178,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_GAMMA_DISTRIBUTION_H
+#endif // _LIBCPP___CXX03___RANDOM_GAMMA_DISTRIBUTION_H
diff --git a/libcxx/include/__cxx03/__random/generate_canonical.h b/libcxx/include/__cxx03/__random/generate_canonical.h
index 363f118c4f7d6a..deea98fd0314bf 100644
--- a/libcxx/include/__cxx03/__random/generate_canonical.h
+++ b/libcxx/include/__cxx03/__random/generate_canonical.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_GENERATE_CANONICAL_H
-#define _LIBCPP___RANDOM_GENERATE_CANONICAL_H
+#ifndef _LIBCPP___CXX03___RANDOM_GENERATE_CANONICAL_H
+#define _LIBCPP___CXX03___RANDOM_GENERATE_CANONICAL_H
#include <__cxx03/__config>
#include <__cxx03/__random/log2.h>
@@ -48,4 +48,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_GENERATE_CANONICAL_H
+#endif // _LIBCPP___CXX03___RANDOM_GENERATE_CANONICAL_H
diff --git a/libcxx/include/__cxx03/__random/geometric_distribution.h b/libcxx/include/__cxx03/__random/geometric_distribution.h
index 3fe06792da8562..85ca5d8ebbed91 100644
--- a/libcxx/include/__cxx03/__random/geometric_distribution.h
+++ b/libcxx/include/__cxx03/__random/geometric_distribution.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_GEOMETRIC_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_GEOMETRIC_DISTRIBUTION_H
+#ifndef _LIBCPP___CXX03___RANDOM_GEOMETRIC_DISTRIBUTION_H
+#define _LIBCPP___CXX03___RANDOM_GEOMETRIC_DISTRIBUTION_H
#include <__cxx03/__config>
#include <__cxx03/__random/is_valid.h>
@@ -117,4 +117,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_GEOMETRIC_DISTRIBUTION_H
+#endif // _LIBCPP___CXX03___RANDOM_GEOMETRIC_DISTRIBUTION_H
diff --git a/libcxx/include/__cxx03/__random/independent_bits_engine.h b/libcxx/include/__cxx03/__random/independent_bits_engine.h
index bf2350e7b0d6fe..15df3f249ef82a 100644
--- a/libcxx/include/__cxx03/__random/independent_bits_engine.h
+++ b/libcxx/include/__cxx03/__random/independent_bits_engine.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_INDEPENDENT_BITS_ENGINE_H
-#define _LIBCPP___RANDOM_INDEPENDENT_BITS_ENGINE_H
+#ifndef _LIBCPP___CXX03___RANDOM_INDEPENDENT_BITS_ENGINE_H
+#define _LIBCPP___CXX03___RANDOM_INDEPENDENT_BITS_ENGINE_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/istream.h>
@@ -202,4 +202,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_INDEPENDENT_BITS_ENGINE_H
+#endif // _LIBCPP___CXX03___RANDOM_INDEPENDENT_BITS_ENGINE_H
diff --git a/libcxx/include/__cxx03/__random/is_seed_sequence.h b/libcxx/include/__cxx03/__random/is_seed_sequence.h
index a924857c7ffa75..ddb9c83bb7081c 100644
--- a/libcxx/include/__cxx03/__random/is_seed_sequence.h
+++ b/libcxx/include/__cxx03/__random/is_seed_sequence.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_IS_SEED_SEQUENCE_H
-#define _LIBCPP___RANDOM_IS_SEED_SEQUENCE_H
+#ifndef _LIBCPP___CXX03___RANDOM_IS_SEED_SEQUENCE_H
+#define _LIBCPP___CXX03___RANDOM_IS_SEED_SEQUENCE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_convertible.h>
@@ -28,4 +28,4 @@ struct __is_seed_sequence {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANDOM_IS_SEED_SEQUENCE_H
+#endif // _LIBCPP___CXX03___RANDOM_IS_SEED_SEQUENCE_H
diff --git a/libcxx/include/__cxx03/__random/is_valid.h b/libcxx/include/__cxx03/__random/is_valid.h
index fc32a22bf608ce..65693ceecf4d0c 100644
--- a/libcxx/include/__cxx03/__random/is_valid.h
+++ b/libcxx/include/__cxx03/__random/is_valid.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_IS_VALID_H
-#define _LIBCPP___RANDOM_IS_VALID_H
+#ifndef _LIBCPP___CXX03___RANDOM_IS_VALID_H
+#define _LIBCPP___CXX03___RANDOM_IS_VALID_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -91,4 +91,4 @@ struct __libcpp_random_is_valid_urng<
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANDOM_IS_VALID_H
+#endif // _LIBCPP___CXX03___RANDOM_IS_VALID_H
diff --git a/libcxx/include/__cxx03/__random/knuth_b.h b/libcxx/include/__cxx03/__random/knuth_b.h
index b8df0078ebb1a0..0ba23d7bbd2a82 100644
--- a/libcxx/include/__cxx03/__random/knuth_b.h
+++ b/libcxx/include/__cxx03/__random/knuth_b.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_KNUTH_B_H
-#define _LIBCPP___RANDOM_KNUTH_B_H
+#ifndef _LIBCPP___CXX03___RANDOM_KNUTH_B_H
+#define _LIBCPP___CXX03___RANDOM_KNUTH_B_H
#include <__cxx03/__config>
#include <__cxx03/__random/linear_congruential_engine.h>
@@ -23,4 +23,4 @@ typedef shuffle_order_engine<minstd_rand0, 256> knuth_b;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANDOM_KNUTH_B_H
+#endif // _LIBCPP___CXX03___RANDOM_KNUTH_B_H
diff --git a/libcxx/include/__cxx03/__random/linear_congruential_engine.h b/libcxx/include/__cxx03/__random/linear_congruential_engine.h
index 94d140ae1a2d0f..e6025571e5cc18 100644
--- a/libcxx/include/__cxx03/__random/linear_congruential_engine.h
+++ b/libcxx/include/__cxx03/__random/linear_congruential_engine.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_LINEAR_CONGRUENTIAL_ENGINE_H
-#define _LIBCPP___RANDOM_LINEAR_CONGRUENTIAL_ENGINE_H
+#ifndef _LIBCPP___CXX03___RANDOM_LINEAR_CONGRUENTIAL_ENGINE_H
+#define _LIBCPP___CXX03___RANDOM_LINEAR_CONGRUENTIAL_ENGINE_H
#include <__cxx03/__config>
#include <__cxx03/__random/is_seed_sequence.h>
@@ -384,4 +384,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_LINEAR_CONGRUENTIAL_ENGINE_H
+#endif // _LIBCPP___CXX03___RANDOM_LINEAR_CONGRUENTIAL_ENGINE_H
diff --git a/libcxx/include/__cxx03/__random/log2.h b/libcxx/include/__cxx03/__random/log2.h
index 5dbaace22d86ed..bea5f3c1ff4ba2 100644
--- a/libcxx/include/__cxx03/__random/log2.h
+++ b/libcxx/include/__cxx03/__random/log2.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_LOG2_H
-#define _LIBCPP___RANDOM_LOG2_H
+#ifndef _LIBCPP___CXX03___RANDOM_LOG2_H
+#define _LIBCPP___CXX03___RANDOM_LOG2_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/conditional.h>
@@ -63,4 +63,4 @@ struct __log2 {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANDOM_LOG2_H
+#endif // _LIBCPP___CXX03___RANDOM_LOG2_H
diff --git a/libcxx/include/__cxx03/__random/lognormal_distribution.h b/libcxx/include/__cxx03/__random/lognormal_distribution.h
index f1e537a21eb652..de046d9b63562c 100644
--- a/libcxx/include/__cxx03/__random/lognormal_distribution.h
+++ b/libcxx/include/__cxx03/__random/lognormal_distribution.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_LOGNORMAL_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_LOGNORMAL_DISTRIBUTION_H
+#ifndef _LIBCPP___CXX03___RANDOM_LOGNORMAL_DISTRIBUTION_H
+#define _LIBCPP___CXX03___RANDOM_LOGNORMAL_DISTRIBUTION_H
#include <__cxx03/__config>
#include <__cxx03/__random/is_valid.h>
@@ -123,4 +123,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_LOGNORMAL_DISTRIBUTION_H
+#endif // _LIBCPP___CXX03___RANDOM_LOGNORMAL_DISTRIBUTION_H
diff --git a/libcxx/include/__cxx03/__random/mersenne_twister_engine.h b/libcxx/include/__cxx03/__random/mersenne_twister_engine.h
index 16deb8189dc461..d715b6ffd8dd42 100644
--- a/libcxx/include/__cxx03/__random/mersenne_twister_engine.h
+++ b/libcxx/include/__cxx03/__random/mersenne_twister_engine.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_MERSENNE_TWISTER_ENGINE_H
-#define _LIBCPP___RANDOM_MERSENNE_TWISTER_ENGINE_H
+#ifndef _LIBCPP___CXX03___RANDOM_MERSENNE_TWISTER_ENGINE_H
+#define _LIBCPP___CXX03___RANDOM_MERSENNE_TWISTER_ENGINE_H
#include <__cxx03/__algorithm/equal.h>
#include <__cxx03/__algorithm/min.h>
@@ -911,4 +911,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_MERSENNE_TWISTER_ENGINE_H
+#endif // _LIBCPP___CXX03___RANDOM_MERSENNE_TWISTER_ENGINE_H
diff --git a/libcxx/include/__cxx03/__random/negative_binomial_distribution.h b/libcxx/include/__cxx03/__random/negative_binomial_distribution.h
index 6a99c87f5296bf..f50b38218710f4 100644
--- a/libcxx/include/__cxx03/__random/negative_binomial_distribution.h
+++ b/libcxx/include/__cxx03/__random/negative_binomial_distribution.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_NEGATIVE_BINOMIAL_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_NEGATIVE_BINOMIAL_DISTRIBUTION_H
+#ifndef _LIBCPP___CXX03___RANDOM_NEGATIVE_BINOMIAL_DISTRIBUTION_H
+#define _LIBCPP___CXX03___RANDOM_NEGATIVE_BINOMIAL_DISTRIBUTION_H
#include <__cxx03/__assert>
#include <__cxx03/__config>
@@ -154,4 +154,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_NEGATIVE_BINOMIAL_DISTRIBUTION_H
+#endif // _LIBCPP___CXX03___RANDOM_NEGATIVE_BINOMIAL_DISTRIBUTION_H
diff --git a/libcxx/include/__cxx03/__random/normal_distribution.h b/libcxx/include/__cxx03/__random/normal_distribution.h
index 95e4f5da49eb46..f9700c48ade05b 100644
--- a/libcxx/include/__cxx03/__random/normal_distribution.h
+++ b/libcxx/include/__cxx03/__random/normal_distribution.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_NORMAL_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_NORMAL_DISTRIBUTION_H
+#ifndef _LIBCPP___CXX03___RANDOM_NORMAL_DISTRIBUTION_H
+#define _LIBCPP___CXX03___RANDOM_NORMAL_DISTRIBUTION_H
#include <__cxx03/__config>
#include <__cxx03/__random/is_valid.h>
@@ -173,4 +173,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_NORMAL_DISTRIBUTION_H
+#endif // _LIBCPP___CXX03___RANDOM_NORMAL_DISTRIBUTION_H
diff --git a/libcxx/include/__cxx03/__random/piecewise_constant_distribution.h b/libcxx/include/__cxx03/__random/piecewise_constant_distribution.h
index 5bd53b81cbfce9..2036bb29ce1a63 100644
--- a/libcxx/include/__cxx03/__random/piecewise_constant_distribution.h
+++ b/libcxx/include/__cxx03/__random/piecewise_constant_distribution.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_PIECEWISE_CONSTANT_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_PIECEWISE_CONSTANT_DISTRIBUTION_H
+#ifndef _LIBCPP___CXX03___RANDOM_PIECEWISE_CONSTANT_DISTRIBUTION_H
+#define _LIBCPP___CXX03___RANDOM_PIECEWISE_CONSTANT_DISTRIBUTION_H
#include <__cxx03/__algorithm/upper_bound.h>
#include <__cxx03/__config>
@@ -299,4 +299,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_PIECEWISE_CONSTANT_DISTRIBUTION_H
+#endif // _LIBCPP___CXX03___RANDOM_PIECEWISE_CONSTANT_DISTRIBUTION_H
diff --git a/libcxx/include/__cxx03/__random/piecewise_linear_distribution.h b/libcxx/include/__cxx03/__random/piecewise_linear_distribution.h
index faf845321fec89..c871d01c37b416 100644
--- a/libcxx/include/__cxx03/__random/piecewise_linear_distribution.h
+++ b/libcxx/include/__cxx03/__random/piecewise_linear_distribution.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_PIECEWISE_LINEAR_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_PIECEWISE_LINEAR_DISTRIBUTION_H
+#ifndef _LIBCPP___CXX03___RANDOM_PIECEWISE_LINEAR_DISTRIBUTION_H
+#define _LIBCPP___CXX03___RANDOM_PIECEWISE_LINEAR_DISTRIBUTION_H
#include <__cxx03/__algorithm/upper_bound.h>
#include <__cxx03/__config>
@@ -312,4 +312,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_PIECEWISE_LINEAR_DISTRIBUTION_H
+#endif // _LIBCPP___CXX03___RANDOM_PIECEWISE_LINEAR_DISTRIBUTION_H
diff --git a/libcxx/include/__cxx03/__random/poisson_distribution.h b/libcxx/include/__cxx03/__random/poisson_distribution.h
index 7fb4b9681d70de..fdb30042e4a3ce 100644
--- a/libcxx/include/__cxx03/__random/poisson_distribution.h
+++ b/libcxx/include/__cxx03/__random/poisson_distribution.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_POISSON_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_POISSON_DISTRIBUTION_H
+#ifndef _LIBCPP___CXX03___RANDOM_POISSON_DISTRIBUTION_H
+#define _LIBCPP___CXX03___RANDOM_POISSON_DISTRIBUTION_H
#include <__cxx03/__config>
#include <__cxx03/__random/clamp_to_integral.h>
@@ -238,4 +238,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_POISSON_DISTRIBUTION_H
+#endif // _LIBCPP___CXX03___RANDOM_POISSON_DISTRIBUTION_H
diff --git a/libcxx/include/__cxx03/__random/random_device.h b/libcxx/include/__cxx03/__random/random_device.h
index 2f95979bf54911..35874bc492a0a3 100644
--- a/libcxx/include/__cxx03/__random/random_device.h
+++ b/libcxx/include/__cxx03/__random/random_device.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_RANDOM_DEVICE_H
-#define _LIBCPP___RANDOM_RANDOM_DEVICE_H
+#ifndef _LIBCPP___CXX03___RANDOM_RANDOM_DEVICE_H
+#define _LIBCPP___CXX03___RANDOM_RANDOM_DEVICE_H
#include <__cxx03/__config>
#include <__cxx03/string>
@@ -78,4 +78,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_RANDOM_DEVICE_H
+#endif // _LIBCPP___CXX03___RANDOM_RANDOM_DEVICE_H
diff --git a/libcxx/include/__cxx03/__random/ranlux.h b/libcxx/include/__cxx03/__random/ranlux.h
index e99773cae392f7..2c808f50e63827 100644
--- a/libcxx/include/__cxx03/__random/ranlux.h
+++ b/libcxx/include/__cxx03/__random/ranlux.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_RANLUX_H
-#define _LIBCPP___RANDOM_RANLUX_H
+#ifndef _LIBCPP___CXX03___RANDOM_RANLUX_H
+#define _LIBCPP___CXX03___RANDOM_RANLUX_H
#include <__cxx03/__config>
#include <__cxx03/__random/discard_block_engine.h>
@@ -28,4 +28,4 @@ typedef discard_block_engine<ranlux48_base, 389, 11> ranlux48;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANDOM_RANLUX_H
+#endif // _LIBCPP___CXX03___RANDOM_RANLUX_H
diff --git a/libcxx/include/__cxx03/__random/seed_seq.h b/libcxx/include/__cxx03/__random/seed_seq.h
index 8ccd656b47e88f..617ee66c819d8f 100644
--- a/libcxx/include/__cxx03/__random/seed_seq.h
+++ b/libcxx/include/__cxx03/__random/seed_seq.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_SEED_SEQ_H
-#define _LIBCPP___RANDOM_SEED_SEQ_H
+#ifndef _LIBCPP___CXX03___RANDOM_SEED_SEQ_H
+#define _LIBCPP___CXX03___RANDOM_SEED_SEQ_H
#include <__cxx03/__algorithm/copy.h>
#include <__cxx03/__algorithm/fill.h>
@@ -163,4 +163,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_SEED_SEQ_H
+#endif // _LIBCPP___CXX03___RANDOM_SEED_SEQ_H
diff --git a/libcxx/include/__cxx03/__random/shuffle_order_engine.h b/libcxx/include/__cxx03/__random/shuffle_order_engine.h
index 8eb57c9ec56db2..77eb0cf1fec87f 100644
--- a/libcxx/include/__cxx03/__random/shuffle_order_engine.h
+++ b/libcxx/include/__cxx03/__random/shuffle_order_engine.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_SHUFFLE_ORDER_ENGINE_H
-#define _LIBCPP___RANDOM_SHUFFLE_ORDER_ENGINE_H
+#ifndef _LIBCPP___CXX03___RANDOM_SHUFFLE_ORDER_ENGINE_H
+#define _LIBCPP___CXX03___RANDOM_SHUFFLE_ORDER_ENGINE_H
#include <__cxx03/__algorithm/equal.h>
#include <__cxx03/__config>
@@ -227,4 +227,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_SHUFFLE_ORDER_ENGINE_H
+#endif // _LIBCPP___CXX03___RANDOM_SHUFFLE_ORDER_ENGINE_H
diff --git a/libcxx/include/__cxx03/__random/student_t_distribution.h b/libcxx/include/__cxx03/__random/student_t_distribution.h
index 32a1c3c7381ff3..6c71d1a1a4fb8c 100644
--- a/libcxx/include/__cxx03/__random/student_t_distribution.h
+++ b/libcxx/include/__cxx03/__random/student_t_distribution.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_STUDENT_T_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_STUDENT_T_DISTRIBUTION_H
+#ifndef _LIBCPP___CXX03___RANDOM_STUDENT_T_DISTRIBUTION_H
+#define _LIBCPP___CXX03___RANDOM_STUDENT_T_DISTRIBUTION_H
#include <__cxx03/__config>
#include <__cxx03/__random/gamma_distribution.h>
@@ -129,4 +129,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_STUDENT_T_DISTRIBUTION_H
+#endif // _LIBCPP___CXX03___RANDOM_STUDENT_T_DISTRIBUTION_H
diff --git a/libcxx/include/__cxx03/__random/subtract_with_carry_engine.h b/libcxx/include/__cxx03/__random/subtract_with_carry_engine.h
index c539994be1c800..3a30e41bbb4606 100644
--- a/libcxx/include/__cxx03/__random/subtract_with_carry_engine.h
+++ b/libcxx/include/__cxx03/__random/subtract_with_carry_engine.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_SUBTRACT_WITH_CARRY_ENGINE_H
-#define _LIBCPP___RANDOM_SUBTRACT_WITH_CARRY_ENGINE_H
+#ifndef _LIBCPP___CXX03___RANDOM_SUBTRACT_WITH_CARRY_ENGINE_H
+#define _LIBCPP___CXX03___RANDOM_SUBTRACT_WITH_CARRY_ENGINE_H
#include <__cxx03/__algorithm/equal.h>
#include <__cxx03/__algorithm/min.h>
@@ -273,4 +273,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_SUBTRACT_WITH_CARRY_ENGINE_H
+#endif // _LIBCPP___CXX03___RANDOM_SUBTRACT_WITH_CARRY_ENGINE_H
diff --git a/libcxx/include/__cxx03/__random/uniform_int_distribution.h b/libcxx/include/__cxx03/__random/uniform_int_distribution.h
index 8e509fad157740..2e4656bd503f67 100644
--- a/libcxx/include/__cxx03/__random/uniform_int_distribution.h
+++ b/libcxx/include/__cxx03/__random/uniform_int_distribution.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_UNIFORM_INT_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_UNIFORM_INT_DISTRIBUTION_H
+#ifndef _LIBCPP___CXX03___RANDOM_UNIFORM_INT_DISTRIBUTION_H
+#define _LIBCPP___CXX03___RANDOM_UNIFORM_INT_DISTRIBUTION_H
#include <__cxx03/__bit/countl.h>
#include <__cxx03/__config>
@@ -261,4 +261,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_UNIFORM_INT_DISTRIBUTION_H
+#endif // _LIBCPP___CXX03___RANDOM_UNIFORM_INT_DISTRIBUTION_H
diff --git a/libcxx/include/__cxx03/__random/uniform_random_bit_generator.h b/libcxx/include/__cxx03/__random/uniform_random_bit_generator.h
index 74bbea38bf2079..37c10a1ddfbd9a 100644
--- a/libcxx/include/__cxx03/__random/uniform_random_bit_generator.h
+++ b/libcxx/include/__cxx03/__random/uniform_random_bit_generator.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_UNIFORM_RANDOM_BIT_GENERATOR_H
-#define _LIBCPP___RANDOM_UNIFORM_RANDOM_BIT_GENERATOR_H
+#ifndef _LIBCPP___CXX03___RANDOM_UNIFORM_RANDOM_BIT_GENERATOR_H
+#define _LIBCPP___CXX03___RANDOM_UNIFORM_RANDOM_BIT_GENERATOR_H
#include <__cxx03/__concepts/arithmetic.h>
#include <__cxx03/__concepts/invocable.h>
@@ -41,4 +41,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_UNIFORM_RANDOM_BIT_GENERATOR_H
+#endif // _LIBCPP___CXX03___RANDOM_UNIFORM_RANDOM_BIT_GENERATOR_H
diff --git a/libcxx/include/__cxx03/__random/uniform_real_distribution.h b/libcxx/include/__cxx03/__random/uniform_real_distribution.h
index 64c978906a4ceb..623344455ee31c 100644
--- a/libcxx/include/__cxx03/__random/uniform_real_distribution.h
+++ b/libcxx/include/__cxx03/__random/uniform_real_distribution.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_UNIFORM_REAL_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_UNIFORM_REAL_DISTRIBUTION_H
+#ifndef _LIBCPP___CXX03___RANDOM_UNIFORM_REAL_DISTRIBUTION_H
+#define _LIBCPP___CXX03___RANDOM_UNIFORM_REAL_DISTRIBUTION_H
#include <__cxx03/__config>
#include <__cxx03/__random/generate_canonical.h>
@@ -135,4 +135,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_UNIFORM_REAL_DISTRIBUTION_H
+#endif // _LIBCPP___CXX03___RANDOM_UNIFORM_REAL_DISTRIBUTION_H
diff --git a/libcxx/include/__cxx03/__random/weibull_distribution.h b/libcxx/include/__cxx03/__random/weibull_distribution.h
index 6c5937aaad9e7b..83bb88d50f626f 100644
--- a/libcxx/include/__cxx03/__random/weibull_distribution.h
+++ b/libcxx/include/__cxx03/__random/weibull_distribution.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANDOM_WEIBULL_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_WEIBULL_DISTRIBUTION_H
+#ifndef _LIBCPP___CXX03___RANDOM_WEIBULL_DISTRIBUTION_H
+#define _LIBCPP___CXX03___RANDOM_WEIBULL_DISTRIBUTION_H
#include <__cxx03/__config>
#include <__cxx03/__random/exponential_distribution.h>
@@ -129,4 +129,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANDOM_WEIBULL_DISTRIBUTION_H
+#endif // _LIBCPP___CXX03___RANDOM_WEIBULL_DISTRIBUTION_H
diff --git a/libcxx/include/__cxx03/__ranges/access.h b/libcxx/include/__cxx03/__ranges/access.h
index a6a0470afeacdd..23b61946a16bb4 100644
--- a/libcxx/include/__cxx03/__ranges/access.h
+++ b/libcxx/include/__cxx03/__ranges/access.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_ACCESS_H
-#define _LIBCPP___RANGES_ACCESS_H
+#ifndef _LIBCPP___CXX03___RANGES_ACCESS_H
+#define _LIBCPP___CXX03___RANGES_ACCESS_H
#include <__cxx03/__concepts/class_or_enum.h>
#include <__cxx03/__config>
@@ -207,4 +207,4 @@ inline constexpr auto cend = __cend::__fn{};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANGES_ACCESS_H
+#endif // _LIBCPP___CXX03___RANGES_ACCESS_H
diff --git a/libcxx/include/__cxx03/__ranges/all.h b/libcxx/include/__cxx03/__ranges/all.h
index 0cb834fc41a356..57497f83478b56 100644
--- a/libcxx/include/__cxx03/__ranges/all.h
+++ b/libcxx/include/__cxx03/__ranges/all.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_ALL_H
-#define _LIBCPP___RANGES_ALL_H
+#ifndef _LIBCPP___CXX03___RANGES_ALL_H
+#define _LIBCPP___CXX03___RANGES_ALL_H
#include <__cxx03/__config>
#include <__cxx03/__functional/compose.h> // TODO(modules): Those should not be required
@@ -75,4 +75,4 @@ using all_t = decltype(views::all(std::declval<_Range>()));
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANGES_ALL_H
+#endif // _LIBCPP___CXX03___RANGES_ALL_H
diff --git a/libcxx/include/__cxx03/__ranges/as_rvalue_view.h b/libcxx/include/__cxx03/__ranges/as_rvalue_view.h
index 011939f19ab0f9..42234dabaf081e 100644
--- a/libcxx/include/__cxx03/__ranges/as_rvalue_view.h
+++ b/libcxx/include/__cxx03/__ranges/as_rvalue_view.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_AS_RVALUE_H
-#define _LIBCPP___RANGES_AS_RVALUE_H
+#ifndef _LIBCPP___CXX03___RANGES_AS_RVALUE_H
+#define _LIBCPP___CXX03___RANGES_AS_RVALUE_H
#include <__cxx03/__concepts/constructible.h>
#include <__cxx03/__concepts/same_as.h>
@@ -139,4 +139,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANGES_AS_RVALUE_H
+#endif // _LIBCPP___CXX03___RANGES_AS_RVALUE_H
diff --git a/libcxx/include/__cxx03/__ranges/chunk_by_view.h b/libcxx/include/__cxx03/__ranges/chunk_by_view.h
index 8f17d56e5e93b9..2b5c4d607c417d 100644
--- a/libcxx/include/__cxx03/__ranges/chunk_by_view.h
+++ b/libcxx/include/__cxx03/__ranges/chunk_by_view.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_CHUNK_BY_VIEW_H
-#define _LIBCPP___RANGES_CHUNK_BY_VIEW_H
+#ifndef _LIBCPP___CXX03___RANGES_CHUNK_BY_VIEW_H
+#define _LIBCPP___CXX03___RANGES_CHUNK_BY_VIEW_H
#include <__cxx03/__algorithm/ranges_adjacent_find.h>
#include <__cxx03/__assert>
@@ -232,4 +232,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANGES_CHUNK_BY_VIEW_H
+#endif // _LIBCPP___CXX03___RANGES_CHUNK_BY_VIEW_H
diff --git a/libcxx/include/__cxx03/__ranges/common_view.h b/libcxx/include/__cxx03/__ranges/common_view.h
index 5af8de542dad98..e7022ff63abba3 100644
--- a/libcxx/include/__cxx03/__ranges/common_view.h
+++ b/libcxx/include/__cxx03/__ranges/common_view.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_COMMON_VIEW_H
-#define _LIBCPP___RANGES_COMMON_VIEW_H
+#ifndef _LIBCPP___CXX03___RANGES_COMMON_VIEW_H
+#define _LIBCPP___CXX03___RANGES_COMMON_VIEW_H
#include <__cxx03/__concepts/constructible.h>
#include <__cxx03/__concepts/copyable.h>
@@ -139,4 +139,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANGES_COMMON_VIEW_H
+#endif // _LIBCPP___CXX03___RANGES_COMMON_VIEW_H
diff --git a/libcxx/include/__cxx03/__ranges/concepts.h b/libcxx/include/__cxx03/__ranges/concepts.h
index 238d02cc2f68f9..958a81c19bfa73 100644
--- a/libcxx/include/__cxx03/__ranges/concepts.h
+++ b/libcxx/include/__cxx03/__ranges/concepts.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_CONCEPTS_H
-#define _LIBCPP___RANGES_CONCEPTS_H
+#ifndef _LIBCPP___CXX03___RANGES_CONCEPTS_H
+#define _LIBCPP___CXX03___RANGES_CONCEPTS_H
#include <__cxx03/__concepts/constructible.h>
#include <__cxx03/__concepts/movable.h>
@@ -139,4 +139,4 @@ concept viewable_range =
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANGES_CONCEPTS_H
+#endif // _LIBCPP___CXX03___RANGES_CONCEPTS_H
diff --git a/libcxx/include/__cxx03/__ranges/container_compatible_range.h b/libcxx/include/__cxx03/__ranges/container_compatible_range.h
index 7bf8218e667d08..9e47449fe50ab9 100644
--- a/libcxx/include/__cxx03/__ranges/container_compatible_range.h
+++ b/libcxx/include/__cxx03/__ranges/container_compatible_range.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_CONTAINER_COMPATIBLE_RANGE_H
-#define _LIBCPP___RANGES_CONTAINER_COMPATIBLE_RANGE_H
+#ifndef _LIBCPP___CXX03___RANGES_CONTAINER_COMPATIBLE_RANGE_H
+#define _LIBCPP___CXX03___RANGES_CONTAINER_COMPATIBLE_RANGE_H
#include <__cxx03/__concepts/convertible_to.h>
#include <__cxx03/__config>
@@ -30,4 +30,4 @@ concept _ContainerCompatibleRange =
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANGES_CONTAINER_COMPATIBLE_RANGE_H
+#endif // _LIBCPP___CXX03___RANGES_CONTAINER_COMPATIBLE_RANGE_H
diff --git a/libcxx/include/__cxx03/__ranges/counted.h b/libcxx/include/__cxx03/__ranges/counted.h
index a20a4824b03cdd..a4a11cd0064b9d 100644
--- a/libcxx/include/__cxx03/__ranges/counted.h
+++ b/libcxx/include/__cxx03/__ranges/counted.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_COUNTED_H
-#define _LIBCPP___RANGES_COUNTED_H
+#ifndef _LIBCPP___CXX03___RANGES_COUNTED_H
+#define _LIBCPP___CXX03___RANGES_COUNTED_H
#include <__cxx03/__concepts/convertible_to.h>
#include <__cxx03/__config>
@@ -86,4 +86,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANGES_COUNTED_H
+#endif // _LIBCPP___CXX03___RANGES_COUNTED_H
diff --git a/libcxx/include/__cxx03/__ranges/dangling.h b/libcxx/include/__cxx03/__ranges/dangling.h
index fee2712ac829be..d57eca19b1c30f 100644
--- a/libcxx/include/__cxx03/__ranges/dangling.h
+++ b/libcxx/include/__cxx03/__ranges/dangling.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_DANGLING_H
-#define _LIBCPP___RANGES_DANGLING_H
+#ifndef _LIBCPP___CXX03___RANGES_DANGLING_H
+#define _LIBCPP___CXX03___RANGES_DANGLING_H
#include <__cxx03/__config>
#include <__cxx03/__ranges/access.h>
@@ -39,4 +39,4 @@ using borrowed_iterator_t = _If<borrowed_range<_Rp>, iterator_t<_Rp>, dangling>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANGES_DANGLING_H
+#endif // _LIBCPP___CXX03___RANGES_DANGLING_H
diff --git a/libcxx/include/__cxx03/__ranges/data.h b/libcxx/include/__cxx03/__ranges/data.h
index 2e38f210804da1..80e473d2186147 100644
--- a/libcxx/include/__cxx03/__ranges/data.h
+++ b/libcxx/include/__cxx03/__ranges/data.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_DATA_H
-#define _LIBCPP___RANGES_DATA_H
+#ifndef _LIBCPP___CXX03___RANGES_DATA_H
+#define _LIBCPP___CXX03___RANGES_DATA_H
#include <__cxx03/__concepts/class_or_enum.h>
#include <__cxx03/__config>
@@ -99,4 +99,4 @@ inline constexpr auto cdata = __cdata::__fn{};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANGES_DATA_H
+#endif // _LIBCPP___CXX03___RANGES_DATA_H
diff --git a/libcxx/include/__cxx03/__ranges/drop_view.h b/libcxx/include/__cxx03/__ranges/drop_view.h
index 9d1336fc877ed9..78e0a26e4c7e94 100644
--- a/libcxx/include/__cxx03/__ranges/drop_view.h
+++ b/libcxx/include/__cxx03/__ranges/drop_view.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_DROP_VIEW_H
-#define _LIBCPP___RANGES_DROP_VIEW_H
+#ifndef _LIBCPP___CXX03___RANGES_DROP_VIEW_H
+#define _LIBCPP___CXX03___RANGES_DROP_VIEW_H
#include <__cxx03/__algorithm/min.h>
#include <__cxx03/__assert>
@@ -326,4 +326,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANGES_DROP_VIEW_H
+#endif // _LIBCPP___CXX03___RANGES_DROP_VIEW_H
diff --git a/libcxx/include/__cxx03/__ranges/drop_while_view.h b/libcxx/include/__cxx03/__ranges/drop_while_view.h
index 0542908a6cb5a2..604dd29742a908 100644
--- a/libcxx/include/__cxx03/__ranges/drop_while_view.h
+++ b/libcxx/include/__cxx03/__ranges/drop_while_view.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_DROP_WHILE_VIEW_H
-#define _LIBCPP___RANGES_DROP_WHILE_VIEW_H
+#ifndef _LIBCPP___CXX03___RANGES_DROP_WHILE_VIEW_H
+#define _LIBCPP___CXX03___RANGES_DROP_WHILE_VIEW_H
#include <__cxx03/__algorithm/ranges_find_if_not.h>
#include <__cxx03/__assert>
@@ -133,4 +133,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANGES_DROP_WHILE_VIEW_H
+#endif // _LIBCPP___CXX03___RANGES_DROP_WHILE_VIEW_H
diff --git a/libcxx/include/__cxx03/__ranges/elements_view.h b/libcxx/include/__cxx03/__ranges/elements_view.h
index 515562719039ba..9db16cde83be5c 100644
--- a/libcxx/include/__cxx03/__ranges/elements_view.h
+++ b/libcxx/include/__cxx03/__ranges/elements_view.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_ELEMENTS_VIEW_H
-#define _LIBCPP___RANGES_ELEMENTS_VIEW_H
+#ifndef _LIBCPP___CXX03___RANGES_ELEMENTS_VIEW_H
+#define _LIBCPP___CXX03___RANGES_ELEMENTS_VIEW_H
#include <__cxx03/__compare/three_way_comparable.h>
#include <__cxx03/__concepts/constructible.h>
@@ -415,4 +415,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANGES_ELEMENTS_VIEW_H
+#endif // _LIBCPP___CXX03___RANGES_ELEMENTS_VIEW_H
diff --git a/libcxx/include/__cxx03/__ranges/empty.h b/libcxx/include/__cxx03/__ranges/empty.h
index 957fed827b4040..c72a17ecaf19d0 100644
--- a/libcxx/include/__cxx03/__ranges/empty.h
+++ b/libcxx/include/__cxx03/__ranges/empty.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_EMPTY_H
-#define _LIBCPP___RANGES_EMPTY_H
+#ifndef _LIBCPP___CXX03___RANGES_EMPTY_H
+#define _LIBCPP___CXX03___RANGES_EMPTY_H
#include <__cxx03/__concepts/class_or_enum.h>
#include <__cxx03/__config>
@@ -68,4 +68,4 @@ inline constexpr auto empty = __empty::__fn{};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANGES_EMPTY_H
+#endif // _LIBCPP___CXX03___RANGES_EMPTY_H
diff --git a/libcxx/include/__cxx03/__ranges/empty_view.h b/libcxx/include/__cxx03/__ranges/empty_view.h
index 265575baf678d9..11a77de6a33920 100644
--- a/libcxx/include/__cxx03/__ranges/empty_view.h
+++ b/libcxx/include/__cxx03/__ranges/empty_view.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_EMPTY_VIEW_H
-#define _LIBCPP___RANGES_EMPTY_VIEW_H
+#ifndef _LIBCPP___CXX03___RANGES_EMPTY_VIEW_H
+#define _LIBCPP___CXX03___RANGES_EMPTY_VIEW_H
#include <__cxx03/__config>
#include <__cxx03/__ranges/enable_borrowed_range.h>
@@ -51,4 +51,4 @@ inline constexpr empty_view<_Tp> empty{};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANGES_EMPTY_VIEW_H
+#endif // _LIBCPP___CXX03___RANGES_EMPTY_VIEW_H
diff --git a/libcxx/include/__cxx03/__ranges/enable_borrowed_range.h b/libcxx/include/__cxx03/__ranges/enable_borrowed_range.h
index 81051f67c003cc..462053e35535d6 100644
--- a/libcxx/include/__cxx03/__ranges/enable_borrowed_range.h
+++ b/libcxx/include/__cxx03/__ranges/enable_borrowed_range.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_ENABLE_BORROWED_RANGE_H
-#define _LIBCPP___RANGES_ENABLE_BORROWED_RANGE_H
+#ifndef _LIBCPP___CXX03___RANGES_ENABLE_BORROWED_RANGE_H
+#define _LIBCPP___CXX03___RANGES_ENABLE_BORROWED_RANGE_H
// These customization variables are used in <span> and <string_view>. The
// separate header is used to avoid including the entire <ranges> header in
@@ -37,4 +37,4 @@ inline constexpr bool enable_borrowed_range = false;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANGES_ENABLE_BORROWED_RANGE_H
+#endif // _LIBCPP___CXX03___RANGES_ENABLE_BORROWED_RANGE_H
diff --git a/libcxx/include/__cxx03/__ranges/enable_view.h b/libcxx/include/__cxx03/__ranges/enable_view.h
index 4697dab872bcfe..b8d78c29064b7a 100644
--- a/libcxx/include/__cxx03/__ranges/enable_view.h
+++ b/libcxx/include/__cxx03/__ranges/enable_view.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_ENABLE_VIEW_H
-#define _LIBCPP___RANGES_ENABLE_VIEW_H
+#ifndef _LIBCPP___CXX03___RANGES_ENABLE_VIEW_H
+#define _LIBCPP___CXX03___RANGES_ENABLE_VIEW_H
#include <__cxx03/__concepts/derived_from.h>
#include <__cxx03/__concepts/same_as.h>
@@ -48,4 +48,4 @@ inline constexpr bool enable_view = derived_from<_Tp, view_base> || requires {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANGES_ENABLE_VIEW_H
+#endif // _LIBCPP___CXX03___RANGES_ENABLE_VIEW_H
diff --git a/libcxx/include/__cxx03/__ranges/filter_view.h b/libcxx/include/__cxx03/__ranges/filter_view.h
index 5015140c39ae79..b9beadb1366529 100644
--- a/libcxx/include/__cxx03/__ranges/filter_view.h
+++ b/libcxx/include/__cxx03/__ranges/filter_view.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_FILTER_VIEW_H
-#define _LIBCPP___RANGES_FILTER_VIEW_H
+#ifndef _LIBCPP___CXX03___RANGES_FILTER_VIEW_H
+#define _LIBCPP___CXX03___RANGES_FILTER_VIEW_H
#include <__cxx03/__algorithm/ranges_find_if.h>
#include <__cxx03/__assert>
@@ -257,4 +257,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANGES_FILTER_VIEW_H
+#endif // _LIBCPP___CXX03___RANGES_FILTER_VIEW_H
diff --git a/libcxx/include/__cxx03/__ranges/from_range.h b/libcxx/include/__cxx03/__ranges/from_range.h
index 55ff79edd513d5..2f0c827f827fe7 100644
--- a/libcxx/include/__cxx03/__ranges/from_range.h
+++ b/libcxx/include/__cxx03/__ranges/from_range.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_FROM_RANGE_H
-#define _LIBCPP___RANGES_FROM_RANGE_H
+#ifndef _LIBCPP___CXX03___RANGES_FROM_RANGE_H
+#define _LIBCPP___CXX03___RANGES_FROM_RANGE_H
#include <__cxx03/__config>
@@ -30,4 +30,4 @@ inline constexpr from_range_t from_range{};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANGES_FROM_RANGE_H
+#endif // _LIBCPP___CXX03___RANGES_FROM_RANGE_H
diff --git a/libcxx/include/__cxx03/__ranges/iota_view.h b/libcxx/include/__cxx03/__ranges/iota_view.h
index 5bc2394dc3dc20..5fa1e8151af201 100644
--- a/libcxx/include/__cxx03/__ranges/iota_view.h
+++ b/libcxx/include/__cxx03/__ranges/iota_view.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_IOTA_VIEW_H
-#define _LIBCPP___RANGES_IOTA_VIEW_H
+#ifndef _LIBCPP___CXX03___RANGES_IOTA_VIEW_H
+#define _LIBCPP___CXX03___RANGES_IOTA_VIEW_H
#include <__cxx03/__assert>
#include <__cxx03/__compare/three_way_comparable.h>
@@ -401,4 +401,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANGES_IOTA_VIEW_H
+#endif // _LIBCPP___CXX03___RANGES_IOTA_VIEW_H
diff --git a/libcxx/include/__cxx03/__ranges/istream_view.h b/libcxx/include/__cxx03/__ranges/istream_view.h
index 8db34132af59c4..b54dc137690a0a 100644
--- a/libcxx/include/__cxx03/__ranges/istream_view.h
+++ b/libcxx/include/__cxx03/__ranges/istream_view.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_ISTREAM_VIEW_H
-#define _LIBCPP___RANGES_ISTREAM_VIEW_H
+#ifndef _LIBCPP___CXX03___RANGES_ISTREAM_VIEW_H
+#define _LIBCPP___CXX03___RANGES_ISTREAM_VIEW_H
#include <__cxx03/__concepts/constructible.h>
#include <__cxx03/__concepts/derived_from.h>
@@ -138,4 +138,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 20
-#endif // _LIBCPP___RANGES_ISTREAM_VIEW_H
+#endif // _LIBCPP___CXX03___RANGES_ISTREAM_VIEW_H
diff --git a/libcxx/include/__cxx03/__ranges/join_view.h b/libcxx/include/__cxx03/__ranges/join_view.h
index ea47eeefcf9514..3496fc98107046 100644
--- a/libcxx/include/__cxx03/__ranges/join_view.h
+++ b/libcxx/include/__cxx03/__ranges/join_view.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_JOIN_VIEW_H
-#define _LIBCPP___RANGES_JOIN_VIEW_H
+#ifndef _LIBCPP___CXX03___RANGES_JOIN_VIEW_H
+#define _LIBCPP___CXX03___RANGES_JOIN_VIEW_H
#include <__cxx03/__concepts/constructible.h>
#include <__cxx03/__concepts/convertible_to.h>
@@ -420,4 +420,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANGES_JOIN_VIEW_H
+#endif // _LIBCPP___CXX03___RANGES_JOIN_VIEW_H
diff --git a/libcxx/include/__cxx03/__ranges/lazy_split_view.h b/libcxx/include/__cxx03/__ranges/lazy_split_view.h
index 9e70c237b4fb20..8dc05e0ec6f950 100644
--- a/libcxx/include/__cxx03/__ranges/lazy_split_view.h
+++ b/libcxx/include/__cxx03/__ranges/lazy_split_view.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_LAZY_SPLIT_VIEW_H
-#define _LIBCPP___RANGES_LAZY_SPLIT_VIEW_H
+#ifndef _LIBCPP___CXX03___RANGES_LAZY_SPLIT_VIEW_H
+#define _LIBCPP___CXX03___RANGES_LAZY_SPLIT_VIEW_H
#include <__cxx03/__algorithm/ranges_find.h>
#include <__cxx03/__algorithm/ranges_mismatch.h>
@@ -438,4 +438,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANGES_LAZY_SPLIT_VIEW_H
+#endif // _LIBCPP___CXX03___RANGES_LAZY_SPLIT_VIEW_H
diff --git a/libcxx/include/__cxx03/__ranges/movable_box.h b/libcxx/include/__cxx03/__ranges/movable_box.h
index ab6f407ed537b1..7dc8b95b28bb48 100644
--- a/libcxx/include/__cxx03/__ranges/movable_box.h
+++ b/libcxx/include/__cxx03/__ranges/movable_box.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_MOVABLE_BOX_H
-#define _LIBCPP___RANGES_MOVABLE_BOX_H
+#ifndef _LIBCPP___CXX03___RANGES_MOVABLE_BOX_H
+#define _LIBCPP___CXX03___RANGES_MOVABLE_BOX_H
#include <__cxx03/__concepts/constructible.h>
#include <__cxx03/__concepts/copyable.h>
@@ -244,4 +244,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANGES_MOVABLE_BOX_H
+#endif // _LIBCPP___CXX03___RANGES_MOVABLE_BOX_H
diff --git a/libcxx/include/__cxx03/__ranges/non_propagating_cache.h b/libcxx/include/__cxx03/__ranges/non_propagating_cache.h
index 6f8c8600bab101..0db1914e592bad 100644
--- a/libcxx/include/__cxx03/__ranges/non_propagating_cache.h
+++ b/libcxx/include/__cxx03/__ranges/non_propagating_cache.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_NON_PROPAGATING_CACHE_H
-#define _LIBCPP___RANGES_NON_PROPAGATING_CACHE_H
+#ifndef _LIBCPP___CXX03___RANGES_NON_PROPAGATING_CACHE_H
+#define _LIBCPP___CXX03___RANGES_NON_PROPAGATING_CACHE_H
#include <__cxx03/__config>
#include <__cxx03/__iterator/concepts.h> // indirectly_readable
@@ -100,4 +100,4 @@ struct __empty_cache {};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANGES_NON_PROPAGATING_CACHE_H
+#endif // _LIBCPP___CXX03___RANGES_NON_PROPAGATING_CACHE_H
diff --git a/libcxx/include/__cxx03/__ranges/owning_view.h b/libcxx/include/__cxx03/__ranges/owning_view.h
index ab7e4e3eeb9745..5519d2c795c856 100644
--- a/libcxx/include/__cxx03/__ranges/owning_view.h
+++ b/libcxx/include/__cxx03/__ranges/owning_view.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_OWNING_VIEW_H
-#define _LIBCPP___RANGES_OWNING_VIEW_H
+#ifndef _LIBCPP___CXX03___RANGES_OWNING_VIEW_H
+#define _LIBCPP___CXX03___RANGES_OWNING_VIEW_H
#include <__cxx03/__concepts/constructible.h>
#include <__cxx03/__concepts/movable.h>
@@ -113,4 +113,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANGES_OWNING_VIEW_H
+#endif // _LIBCPP___CXX03___RANGES_OWNING_VIEW_H
diff --git a/libcxx/include/__cxx03/__ranges/range_adaptor.h b/libcxx/include/__cxx03/__ranges/range_adaptor.h
index ef7301d6958484..ef08464234b579 100644
--- a/libcxx/include/__cxx03/__ranges/range_adaptor.h
+++ b/libcxx/include/__cxx03/__ranges/range_adaptor.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_RANGE_ADAPTOR_H
-#define _LIBCPP___RANGES_RANGE_ADAPTOR_H
+#ifndef _LIBCPP___CXX03___RANGES_RANGE_ADAPTOR_H
+#define _LIBCPP___CXX03___RANGES_RANGE_ADAPTOR_H
#include <__cxx03/__concepts/constructible.h>
#include <__cxx03/__concepts/derived_from.h>
@@ -98,4 +98,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANGES_RANGE_ADAPTOR_H
+#endif // _LIBCPP___CXX03___RANGES_RANGE_ADAPTOR_H
diff --git a/libcxx/include/__cxx03/__ranges/rbegin.h b/libcxx/include/__cxx03/__ranges/rbegin.h
index 3e114605baf372..8f987319cc4fec 100644
--- a/libcxx/include/__cxx03/__ranges/rbegin.h
+++ b/libcxx/include/__cxx03/__ranges/rbegin.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_RBEGIN_H
-#define _LIBCPP___RANGES_RBEGIN_H
+#ifndef _LIBCPP___CXX03___RANGES_RBEGIN_H
+#define _LIBCPP___CXX03___RANGES_RBEGIN_H
#include <__cxx03/__concepts/class_or_enum.h>
#include <__cxx03/__concepts/same_as.h>
@@ -117,4 +117,4 @@ inline constexpr auto crbegin = __crbegin::__fn{};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANGES_RBEGIN_H
+#endif // _LIBCPP___CXX03___RANGES_RBEGIN_H
diff --git a/libcxx/include/__cxx03/__ranges/ref_view.h b/libcxx/include/__cxx03/__ranges/ref_view.h
index 9fd2835cf385ca..43c3bebe34dc3e 100644
--- a/libcxx/include/__cxx03/__ranges/ref_view.h
+++ b/libcxx/include/__cxx03/__ranges/ref_view.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_REF_VIEW_H
-#define _LIBCPP___RANGES_REF_VIEW_H
+#ifndef _LIBCPP___CXX03___RANGES_REF_VIEW_H
+#define _LIBCPP___CXX03___RANGES_REF_VIEW_H
#include <__cxx03/__concepts/convertible_to.h>
#include <__cxx03/__concepts/different_from.h>
@@ -86,4 +86,4 @@ inline constexpr bool enable_borrowed_range<ref_view<_Tp>> = true;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANGES_REF_VIEW_H
+#endif // _LIBCPP___CXX03___RANGES_REF_VIEW_H
diff --git a/libcxx/include/__cxx03/__ranges/rend.h b/libcxx/include/__cxx03/__ranges/rend.h
index 9d663e54f46199..aa7e4a0ba396ad 100644
--- a/libcxx/include/__cxx03/__ranges/rend.h
+++ b/libcxx/include/__cxx03/__ranges/rend.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_REND_H
-#define _LIBCPP___RANGES_REND_H
+#ifndef _LIBCPP___CXX03___RANGES_REND_H
+#define _LIBCPP___CXX03___RANGES_REND_H
#include <__cxx03/__concepts/class_or_enum.h>
#include <__cxx03/__concepts/same_as.h>
@@ -120,4 +120,4 @@ inline constexpr auto crend = __crend::__fn{};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANGES_REND_H
+#endif // _LIBCPP___CXX03___RANGES_REND_H
diff --git a/libcxx/include/__cxx03/__ranges/repeat_view.h b/libcxx/include/__cxx03/__ranges/repeat_view.h
index fae883e01bcfeb..a0cd065b9f2aa7 100644
--- a/libcxx/include/__cxx03/__ranges/repeat_view.h
+++ b/libcxx/include/__cxx03/__ranges/repeat_view.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_REPEAT_VIEW_H
-#define _LIBCPP___RANGES_REPEAT_VIEW_H
+#ifndef _LIBCPP___CXX03___RANGES_REPEAT_VIEW_H
+#define _LIBCPP___CXX03___RANGES_REPEAT_VIEW_H
#include <__cxx03/__assert>
#include <__cxx03/__concepts/constructible.h>
@@ -263,4 +263,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANGES_REPEAT_VIEW_H
+#endif // _LIBCPP___CXX03___RANGES_REPEAT_VIEW_H
diff --git a/libcxx/include/__cxx03/__ranges/reverse_view.h b/libcxx/include/__cxx03/__ranges/reverse_view.h
index 7513114779c5a3..53a0e9d213c5b3 100644
--- a/libcxx/include/__cxx03/__ranges/reverse_view.h
+++ b/libcxx/include/__cxx03/__ranges/reverse_view.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_REVERSE_VIEW_H
-#define _LIBCPP___RANGES_REVERSE_VIEW_H
+#ifndef _LIBCPP___CXX03___RANGES_REVERSE_VIEW_H
+#define _LIBCPP___CXX03___RANGES_REVERSE_VIEW_H
#include <__cxx03/__concepts/constructible.h>
#include <__cxx03/__config>
@@ -200,4 +200,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANGES_REVERSE_VIEW_H
+#endif // _LIBCPP___CXX03___RANGES_REVERSE_VIEW_H
diff --git a/libcxx/include/__cxx03/__ranges/single_view.h b/libcxx/include/__cxx03/__ranges/single_view.h
index 34054fa0f9d428..3e43302f213b16 100644
--- a/libcxx/include/__cxx03/__ranges/single_view.h
+++ b/libcxx/include/__cxx03/__ranges/single_view.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_SINGLE_VIEW_H
-#define _LIBCPP___RANGES_SINGLE_VIEW_H
+#ifndef _LIBCPP___CXX03___RANGES_SINGLE_VIEW_H
+#define _LIBCPP___CXX03___RANGES_SINGLE_VIEW_H
#include <__cxx03/__concepts/constructible.h>
#include <__cxx03/__config>
@@ -108,4 +108,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANGES_SINGLE_VIEW_H
+#endif // _LIBCPP___CXX03___RANGES_SINGLE_VIEW_H
diff --git a/libcxx/include/__cxx03/__ranges/size.h b/libcxx/include/__cxx03/__ranges/size.h
index 84b165551d921c..f311f76df15cc0 100644
--- a/libcxx/include/__cxx03/__ranges/size.h
+++ b/libcxx/include/__cxx03/__ranges/size.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_SIZE_H
-#define _LIBCPP___RANGES_SIZE_H
+#ifndef _LIBCPP___CXX03___RANGES_SIZE_H
+#define _LIBCPP___CXX03___RANGES_SIZE_H
#include <__cxx03/__concepts/arithmetic.h>
#include <__cxx03/__concepts/class_or_enum.h>
@@ -134,4 +134,4 @@ inline constexpr auto ssize = __ssize::__fn{};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANGES_SIZE_H
+#endif // _LIBCPP___CXX03___RANGES_SIZE_H
diff --git a/libcxx/include/__cxx03/__ranges/split_view.h b/libcxx/include/__cxx03/__ranges/split_view.h
index f23e7878e349c0..76ab9f485bd7cd 100644
--- a/libcxx/include/__cxx03/__ranges/split_view.h
+++ b/libcxx/include/__cxx03/__ranges/split_view.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_SPLIT_VIEW_H
-#define _LIBCPP___RANGES_SPLIT_VIEW_H
+#ifndef _LIBCPP___CXX03___RANGES_SPLIT_VIEW_H
+#define _LIBCPP___CXX03___RANGES_SPLIT_VIEW_H
#include <__cxx03/__algorithm/ranges_search.h>
#include <__cxx03/__concepts/constructible.h>
@@ -229,4 +229,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANGES_SPLIT_VIEW_H
+#endif // _LIBCPP___CXX03___RANGES_SPLIT_VIEW_H
diff --git a/libcxx/include/__cxx03/__ranges/subrange.h b/libcxx/include/__cxx03/__ranges/subrange.h
index fa985a5c365af4..e077d221ed202c 100644
--- a/libcxx/include/__cxx03/__ranges/subrange.h
+++ b/libcxx/include/__cxx03/__ranges/subrange.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_SUBRANGE_H
-#define _LIBCPP___RANGES_SUBRANGE_H
+#ifndef _LIBCPP___CXX03___RANGES_SUBRANGE_H
+#define _LIBCPP___CXX03___RANGES_SUBRANGE_H
#include <__cxx03/__assert>
#include <__cxx03/__concepts/constructible.h>
@@ -270,4 +270,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANGES_SUBRANGE_H
+#endif // _LIBCPP___CXX03___RANGES_SUBRANGE_H
diff --git a/libcxx/include/__cxx03/__ranges/take_view.h b/libcxx/include/__cxx03/__ranges/take_view.h
index e909158f5c4174..d3cadd55ae1c18 100644
--- a/libcxx/include/__cxx03/__ranges/take_view.h
+++ b/libcxx/include/__cxx03/__ranges/take_view.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_TAKE_VIEW_H
-#define _LIBCPP___RANGES_TAKE_VIEW_H
+#ifndef _LIBCPP___CXX03___RANGES_TAKE_VIEW_H
+#define _LIBCPP___CXX03___RANGES_TAKE_VIEW_H
#include <__cxx03/__algorithm/min.h>
#include <__cxx03/__algorithm/ranges_min.h>
@@ -366,4 +366,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANGES_TAKE_VIEW_H
+#endif // _LIBCPP___CXX03___RANGES_TAKE_VIEW_H
diff --git a/libcxx/include/__cxx03/__ranges/take_while_view.h b/libcxx/include/__cxx03/__ranges/take_while_view.h
index 3968777240ed28..7dec8490e07549 100644
--- a/libcxx/include/__cxx03/__ranges/take_while_view.h
+++ b/libcxx/include/__cxx03/__ranges/take_while_view.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_TAKE_WHILE_VIEW_H
-#define _LIBCPP___RANGES_TAKE_WHILE_VIEW_H
+#ifndef _LIBCPP___CXX03___RANGES_TAKE_WHILE_VIEW_H
+#define _LIBCPP___CXX03___RANGES_TAKE_WHILE_VIEW_H
#include <__cxx03/__concepts/constructible.h>
#include <__cxx03/__concepts/convertible_to.h>
@@ -167,4 +167,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANGES_TAKE_WHILE_VIEW_H
+#endif // _LIBCPP___CXX03___RANGES_TAKE_WHILE_VIEW_H
diff --git a/libcxx/include/__cxx03/__ranges/to.h b/libcxx/include/__cxx03/__ranges/to.h
index 682b811946a622..f50f43cccc53a1 100644
--- a/libcxx/include/__cxx03/__ranges/to.h
+++ b/libcxx/include/__cxx03/__ranges/to.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_TO_H
-#define _LIBCPP___RANGES_TO_H
+#ifndef _LIBCPP___CXX03___RANGES_TO_H
+#define _LIBCPP___CXX03___RANGES_TO_H
#include <__cxx03/__algorithm/ranges_copy.h>
#include <__cxx03/__concepts/constructible.h>
@@ -242,4 +242,4 @@ template <template <class...> class _Container, class... _Args>
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANGES_TO_H
+#endif // _LIBCPP___CXX03___RANGES_TO_H
diff --git a/libcxx/include/__cxx03/__ranges/transform_view.h b/libcxx/include/__cxx03/__ranges/transform_view.h
index 78012cde38854f..b4e7dde7ee91bd 100644
--- a/libcxx/include/__cxx03/__ranges/transform_view.h
+++ b/libcxx/include/__cxx03/__ranges/transform_view.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_TRANSFORM_VIEW_H
-#define _LIBCPP___RANGES_TRANSFORM_VIEW_H
+#ifndef _LIBCPP___CXX03___RANGES_TRANSFORM_VIEW_H
+#define _LIBCPP___CXX03___RANGES_TRANSFORM_VIEW_H
#include <__cxx03/__compare/three_way_comparable.h>
#include <__cxx03/__concepts/constructible.h>
@@ -414,4 +414,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANGES_TRANSFORM_VIEW_H
+#endif // _LIBCPP___CXX03___RANGES_TRANSFORM_VIEW_H
diff --git a/libcxx/include/__cxx03/__ranges/view_interface.h b/libcxx/include/__cxx03/__ranges/view_interface.h
index 23cdcdaaad43cf..956049eab6d4e8 100644
--- a/libcxx/include/__cxx03/__ranges/view_interface.h
+++ b/libcxx/include/__cxx03/__ranges/view_interface.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_VIEW_INTERFACE_H
-#define _LIBCPP___RANGES_VIEW_INTERFACE_H
+#ifndef _LIBCPP___CXX03___RANGES_VIEW_INTERFACE_H
+#define _LIBCPP___CXX03___RANGES_VIEW_INTERFACE_H
#include <__cxx03/__assert>
#include <__cxx03/__concepts/derived_from.h>
@@ -167,4 +167,4 @@ class view_interface {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANGES_VIEW_INTERFACE_H
+#endif // _LIBCPP___CXX03___RANGES_VIEW_INTERFACE_H
diff --git a/libcxx/include/__cxx03/__ranges/views.h b/libcxx/include/__cxx03/__ranges/views.h
index 2809271f6e1a9c..91fa1a933c22aa 100644
--- a/libcxx/include/__cxx03/__ranges/views.h
+++ b/libcxx/include/__cxx03/__ranges/views.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_VIEWS
-#define _LIBCPP___RANGES_VIEWS
+#ifndef _LIBCPP___CXX03___RANGES_VIEWS
+#define _LIBCPP___CXX03___RANGES_VIEWS
#include <__cxx03/__config>
@@ -32,4 +32,4 @@ namespace views = ranges::views;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___RANGES_VIEWS
+#endif // _LIBCPP___CXX03___RANGES_VIEWS
diff --git a/libcxx/include/__cxx03/__ranges/zip_view.h b/libcxx/include/__cxx03/__ranges/zip_view.h
index 4d9f62647c8f2e..3ba450db921921 100644
--- a/libcxx/include/__cxx03/__ranges/zip_view.h
+++ b/libcxx/include/__cxx03/__ranges/zip_view.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___RANGES_ZIP_VIEW_H
-#define _LIBCPP___RANGES_ZIP_VIEW_H
+#ifndef _LIBCPP___CXX03___RANGES_ZIP_VIEW_H
+#define _LIBCPP___CXX03___RANGES_ZIP_VIEW_H
#include <__cxx03/__config>
@@ -513,4 +513,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___RANGES_ZIP_VIEW_H
+#endif // _LIBCPP___CXX03___RANGES_ZIP_VIEW_H
diff --git a/libcxx/include/__cxx03/__split_buffer b/libcxx/include/__cxx03/__split_buffer
index 133048bfea77b2..c614704ce56b08 100644
--- a/libcxx/include/__cxx03/__split_buffer
+++ b/libcxx/include/__cxx03/__split_buffer
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___SPLIT_BUFFER
-#define _LIBCPP___SPLIT_BUFFER
+#ifndef _LIBCPP___CXX03___SPLIT_BUFFER
+#define _LIBCPP___CXX03___SPLIT_BUFFER
#include <__cxx03/__algorithm/max.h>
#include <__cxx03/__algorithm/move.h>
@@ -582,4 +582,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___SPLIT_BUFFER
+#endif // _LIBCPP___CXX03___SPLIT_BUFFER
diff --git a/libcxx/include/__cxx03/__std_mbstate_t.h b/libcxx/include/__cxx03/__std_mbstate_t.h
index ac28555214188b..7a81d1bd024aeb 100644
--- a/libcxx/include/__cxx03/__std_mbstate_t.h
+++ b/libcxx/include/__cxx03/__std_mbstate_t.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___STD_MBSTATE_T_H
-#define _LIBCPP___STD_MBSTATE_T_H
+#ifndef _LIBCPP___CXX03___STD_MBSTATE_T_H
+#define _LIBCPP___CXX03___STD_MBSTATE_T_H
#include <__cxx03/__config>
#include <__cxx03/__mbstate_t.h>
@@ -26,4 +26,4 @@ using ::mbstate_t _LIBCPP_USING_IF_EXISTS;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___STD_MBSTATE_T_H
+#endif // _LIBCPP___CXX03___STD_MBSTATE_T_H
diff --git a/libcxx/include/__cxx03/__stop_token/atomic_unique_lock.h b/libcxx/include/__cxx03/__stop_token/atomic_unique_lock.h
index a8e4d2a90a53b2..92b17350b3bbb5 100644
--- a/libcxx/include/__cxx03/__stop_token/atomic_unique_lock.h
+++ b/libcxx/include/__cxx03/__stop_token/atomic_unique_lock.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___STOP_TOKEN_ATOMIC_UNIQUE_GUARD_H
-#define _LIBCPP___STOP_TOKEN_ATOMIC_UNIQUE_GUARD_H
+#ifndef _LIBCPP___CXX03___STOP_TOKEN_ATOMIC_UNIQUE_GUARD_H
+#define _LIBCPP___CXX03___STOP_TOKEN_ATOMIC_UNIQUE_GUARD_H
#include <__cxx03/__bit/popcount.h>
#include <__cxx03/__config>
@@ -137,4 +137,4 @@ class _LIBCPP_AVAILABILITY_SYNC __atomic_unique_lock {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___STOP_TOKEN_ATOMIC_UNIQUE_GUARD_H
+#endif // _LIBCPP___CXX03___STOP_TOKEN_ATOMIC_UNIQUE_GUARD_H
diff --git a/libcxx/include/__cxx03/__stop_token/intrusive_list_view.h b/libcxx/include/__cxx03/__stop_token/intrusive_list_view.h
index ab11762802ac46..8c133ad30c609c 100644
--- a/libcxx/include/__cxx03/__stop_token/intrusive_list_view.h
+++ b/libcxx/include/__cxx03/__stop_token/intrusive_list_view.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___STOP_TOKEN_INTRUSIVE_LIST_VIEW_H
-#define _LIBCPP___STOP_TOKEN_INTRUSIVE_LIST_VIEW_H
+#ifndef _LIBCPP___CXX03___STOP_TOKEN_INTRUSIVE_LIST_VIEW_H
+#define _LIBCPP___CXX03___STOP_TOKEN_INTRUSIVE_LIST_VIEW_H
#include <__cxx03/__assert>
#include <__cxx03/__config>
@@ -82,4 +82,4 @@ struct __intrusive_list_view {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___STOP_TOKEN_INTRUSIVE_LIST_VIEW_H
+#endif // _LIBCPP___CXX03___STOP_TOKEN_INTRUSIVE_LIST_VIEW_H
diff --git a/libcxx/include/__cxx03/__stop_token/intrusive_shared_ptr.h b/libcxx/include/__cxx03/__stop_token/intrusive_shared_ptr.h
index 62eb946a5bbed0..002cdad80f0aea 100644
--- a/libcxx/include/__cxx03/__stop_token/intrusive_shared_ptr.h
+++ b/libcxx/include/__cxx03/__stop_token/intrusive_shared_ptr.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___STOP_TOKEN_INTRUSIVE_SHARED_PTR_H
-#define _LIBCPP___STOP_TOKEN_INTRUSIVE_SHARED_PTR_H
+#ifndef _LIBCPP___CXX03___STOP_TOKEN_INTRUSIVE_SHARED_PTR_H
+#define _LIBCPP___CXX03___STOP_TOKEN_INTRUSIVE_SHARED_PTR_H
#include <__cxx03/__atomic/atomic.h>
#include <__cxx03/__atomic/memory_order.h>
@@ -131,4 +131,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___STOP_TOKEN_INTRUSIVE_SHARED_PTR_H
+#endif // _LIBCPP___CXX03___STOP_TOKEN_INTRUSIVE_SHARED_PTR_H
diff --git a/libcxx/include/__cxx03/__stop_token/stop_callback.h b/libcxx/include/__cxx03/__stop_token/stop_callback.h
index afd194cca1d00b..5a92b59e30b01b 100644
--- a/libcxx/include/__cxx03/__stop_token/stop_callback.h
+++ b/libcxx/include/__cxx03/__stop_token/stop_callback.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___STOP_TOKEN_STOP_CALLBACK_H
-#define _LIBCPP___STOP_TOKEN_STOP_CALLBACK_H
+#ifndef _LIBCPP___CXX03___STOP_TOKEN_STOP_CALLBACK_H
+#define _LIBCPP___CXX03___STOP_TOKEN_STOP_CALLBACK_H
#include <__cxx03/__concepts/constructible.h>
#include <__cxx03/__concepts/destructible.h>
@@ -99,4 +99,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_STOP_TOKEN) && !defined(_LIBCPP_HAS_NO_THREADS)
+#endif // _LIBCPP___CXX03___STOP_TOKEN_STOP_CALLBACK_H
diff --git a/libcxx/include/__cxx03/__stop_token/stop_source.h b/libcxx/include/__cxx03/__stop_token/stop_source.h
index 0d8b714bfba4e0..83fcfa548a8593 100644
--- a/libcxx/include/__cxx03/__stop_token/stop_source.h
+++ b/libcxx/include/__cxx03/__stop_token/stop_source.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___STOP_TOKEN_STOP_SOURCE_H
-#define _LIBCPP___STOP_TOKEN_STOP_SOURCE_H
+#ifndef _LIBCPP___CXX03___STOP_TOKEN_STOP_SOURCE_H
+#define _LIBCPP___CXX03___STOP_TOKEN_STOP_SOURCE_H
#include <__cxx03/__config>
#include <__cxx03/__stop_token/intrusive_shared_ptr.h>
@@ -88,4 +88,4 @@ class _LIBCPP_AVAILABILITY_SYNC stop_source {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_STD_VER >= 20 && !defined(_LIBCPP_HAS_NO_EXPERIMENTAL_STOP_TOKEN) && !defined(_LIBCPP_HAS_NO_THREADS)
+#endif // _LIBCPP___CXX03___STOP_TOKEN_STOP_SOURCE_H
diff --git a/libcxx/include/__cxx03/__stop_token/stop_state.h b/libcxx/include/__cxx03/__stop_token/stop_state.h
index 39688917d1d476..2faee49440f8ad 100644
--- a/libcxx/include/__cxx03/__stop_token/stop_state.h
+++ b/libcxx/include/__cxx03/__stop_token/stop_state.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___STOP_TOKEN_STOP_STATE_H
-#define _LIBCPP___STOP_TOKEN_STOP_STATE_H
+#ifndef _LIBCPP___CXX03___STOP_TOKEN_STOP_STATE_H
+#define _LIBCPP___CXX03___STOP_TOKEN_STOP_STATE_H
#include <__cxx03/__assert>
#include <__cxx03/__config>
@@ -233,4 +233,4 @@ struct __intrusive_shared_ptr_traits<__stop_state> {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___STOP_TOKEN_STOP_STATE_H
+#endif // _LIBCPP___CXX03___STOP_TOKEN_STOP_STATE_H
diff --git a/libcxx/include/__cxx03/__stop_token/stop_token.h b/libcxx/include/__cxx03/__stop_token/stop_token.h
index bba5cd1c4796ed..64f3e605c78869 100644
--- a/libcxx/include/__cxx03/__stop_token/stop_token.h
+++ b/libcxx/include/__cxx03/__stop_token/stop_token.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___STOP_TOKEN_STOP_TOKEN_H
-#define _LIBCPP___STOP_TOKEN_STOP_TOKEN_H
+#ifndef _LIBCPP___CXX03___STOP_TOKEN_STOP_TOKEN_H
+#define _LIBCPP___CXX03___STOP_TOKEN_STOP_TOKEN_H
#include <__cxx03/__config>
#include <__cxx03/__stop_token/intrusive_shared_ptr.h>
@@ -60,4 +60,4 @@ class _LIBCPP_AVAILABILITY_SYNC stop_token {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___STOP_TOKEN_STOP_TOKEN_H
+#endif // _LIBCPP___CXX03___STOP_TOKEN_STOP_TOKEN_H
diff --git a/libcxx/include/__cxx03/__string/char_traits.h b/libcxx/include/__cxx03/__string/char_traits.h
index 69078d6615ea49..e962d986b27853 100644
--- a/libcxx/include/__cxx03/__string/char_traits.h
+++ b/libcxx/include/__cxx03/__string/char_traits.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___STRING_CHAR_TRAITS_H
-#define _LIBCPP___STRING_CHAR_TRAITS_H
+#ifndef _LIBCPP___CXX03___STRING_CHAR_TRAITS_H
+#define _LIBCPP___CXX03___STRING_CHAR_TRAITS_H
#include <__cxx03/__algorithm/fill_n.h>
#include <__cxx03/__algorithm/find.h>
@@ -540,4 +540,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___STRING_CHAR_TRAITS_H
+#endif // _LIBCPP___CXX03___STRING_CHAR_TRAITS_H
diff --git a/libcxx/include/__cxx03/__string/constexpr_c_functions.h b/libcxx/include/__cxx03/__string/constexpr_c_functions.h
index b1e269d974087a..5a0b4953de1777 100644
--- a/libcxx/include/__cxx03/__string/constexpr_c_functions.h
+++ b/libcxx/include/__cxx03/__string/constexpr_c_functions.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___STRING_CONSTEXPR_C_FUNCTIONS_H
-#define _LIBCPP___STRING_CONSTEXPR_C_FUNCTIONS_H
+#ifndef _LIBCPP___CXX03___STRING_CONSTEXPR_C_FUNCTIONS_H
+#define _LIBCPP___CXX03___STRING_CONSTEXPR_C_FUNCTIONS_H
#include <__cxx03/__config>
#include <__cxx03/__memory/addressof.h>
@@ -231,4 +231,4 @@ __constexpr_memmove(_Tp* __dest, _Up* __src, __element_count __n) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___STRING_CONSTEXPR_C_FUNCTIONS_H
+#endif // _LIBCPP___CXX03___STRING_CONSTEXPR_C_FUNCTIONS_H
diff --git a/libcxx/include/__cxx03/__string/extern_template_lists.h b/libcxx/include/__cxx03/__string/extern_template_lists.h
index 09b3375aeecf6f..27cfd560988cb4 100644
--- a/libcxx/include/__cxx03/__string/extern_template_lists.h
+++ b/libcxx/include/__cxx03/__string/extern_template_lists.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___STRING_EXTERN_TEMPLATE_LISTS_H
-#define _LIBCPP___STRING_EXTERN_TEMPLATE_LISTS_H
+#ifndef _LIBCPP___CXX03___STRING_EXTERN_TEMPLATE_LISTS_H
+#define _LIBCPP___CXX03___STRING_EXTERN_TEMPLATE_LISTS_H
#include <__cxx03/__config>
@@ -130,4 +130,4 @@
// clang-format on
-#endif // _LIBCPP___STRING_EXTERN_TEMPLATE_LISTS_H
+#endif // _LIBCPP___CXX03___STRING_EXTERN_TEMPLATE_LISTS_H
diff --git a/libcxx/include/__cxx03/__support/ibm/gettod_zos.h b/libcxx/include/__cxx03/__support/ibm/gettod_zos.h
index 18797cc18e614a..3bb9b942a3903f 100644
--- a/libcxx/include/__cxx03/__support/ibm/gettod_zos.h
+++ b/libcxx/include/__cxx03/__support/ibm/gettod_zos.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___SUPPORT_IBM_GETTOD_ZOS_H
-#define _LIBCPP___SUPPORT_IBM_GETTOD_ZOS_H
+#ifndef _LIBCPP___CXX03___SUPPORT_IBM_GETTOD_ZOS_H
+#define _LIBCPP___CXX03___SUPPORT_IBM_GETTOD_ZOS_H
#include <__cxx03/time.h>
@@ -49,4 +49,4 @@ inline _LIBCPP_HIDE_FROM_ABI int gettimeofdayMonotonic(struct timespec64* Output
return 0;
}
-#endif // _LIBCPP___SUPPORT_IBM_GETTOD_ZOS_H
+#endif // _LIBCPP___CXX03___SUPPORT_IBM_GETTOD_ZOS_H
diff --git a/libcxx/include/__cxx03/__support/ibm/locale_mgmt_zos.h b/libcxx/include/__cxx03/__support/ibm/locale_mgmt_zos.h
index ec88704ba8604c..9fa8f8c9088e1f 100644
--- a/libcxx/include/__cxx03/__support/ibm/locale_mgmt_zos.h
+++ b/libcxx/include/__cxx03/__support/ibm/locale_mgmt_zos.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___SUPPORT_IBM_LOCALE_MGMT_ZOS_H
-#define _LIBCPP___SUPPORT_IBM_LOCALE_MGMT_ZOS_H
+#ifndef _LIBCPP___CXX03___SUPPORT_IBM_LOCALE_MGMT_ZOS_H
+#define _LIBCPP___CXX03___SUPPORT_IBM_LOCALE_MGMT_ZOS_H
#if defined(__MVS__)
# include <__cxx03/locale.h>
@@ -50,4 +50,4 @@ locale_t uselocale(locale_t newloc);
}
# endif
#endif // defined(__MVS__)
-#endif // _LIBCPP___SUPPORT_IBM_LOCALE_MGMT_ZOS_H
+#endif // _LIBCPP___CXX03___SUPPORT_IBM_LOCALE_MGMT_ZOS_H
diff --git a/libcxx/include/__cxx03/__support/ibm/nanosleep.h b/libcxx/include/__cxx03/__support/ibm/nanosleep.h
index ecf7187543f36a..1b6883bbcc1118 100644
--- a/libcxx/include/__cxx03/__support/ibm/nanosleep.h
+++ b/libcxx/include/__cxx03/__support/ibm/nanosleep.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___SUPPORT_IBM_NANOSLEEP_H
-#define _LIBCPP___SUPPORT_IBM_NANOSLEEP_H
+#ifndef _LIBCPP___CXX03___SUPPORT_IBM_NANOSLEEP_H
+#define _LIBCPP___CXX03___SUPPORT_IBM_NANOSLEEP_H
#include <__cxx03/unistd.h>
@@ -52,4 +52,4 @@ inline int nanosleep(const struct timespec* __req, struct timespec* __rem) {
return 0;
}
-#endif // _LIBCPP___SUPPORT_IBM_NANOSLEEP_H
+#endif // _LIBCPP___CXX03___SUPPORT_IBM_NANOSLEEP_H
diff --git a/libcxx/include/__cxx03/__support/xlocale/__nop_locale_mgmt.h b/libcxx/include/__cxx03/__support/xlocale/__nop_locale_mgmt.h
index 036bd3b1835060..f948a292c5f091 100644
--- a/libcxx/include/__cxx03/__support/xlocale/__nop_locale_mgmt.h
+++ b/libcxx/include/__cxx03/__support/xlocale/__nop_locale_mgmt.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___SUPPORT_XLOCALE_NOP_LOCALE_MGMT_H
-#define _LIBCPP___SUPPORT_XLOCALE_NOP_LOCALE_MGMT_H
+#ifndef _LIBCPP___CXX03___SUPPORT_XLOCALE_NOP_LOCALE_MGMT_H
+#define _LIBCPP___CXX03___SUPPORT_XLOCALE_NOP_LOCALE_MGMT_H
#include <__cxx03/__config>
@@ -32,4 +32,4 @@ inline _LIBCPP_HIDE_FROM_ABI locale_t uselocale(locale_t) { return NULL; }
#define LC_ALL_MASK \
(LC_COLLATE_MASK | LC_CTYPE_MASK | LC_MONETARY_MASK | LC_NUMERIC_MASK | LC_TIME_MASK | LC_MESSAGES_MASK)
-#endif // _LIBCPP___SUPPORT_XLOCALE_NOP_LOCALE_MGMT_H
+#endif // _LIBCPP___CXX03___SUPPORT_XLOCALE_NOP_LOCALE_MGMT_H
diff --git a/libcxx/include/__cxx03/__support/xlocale/__posix_l_fallback.h b/libcxx/include/__cxx03/__support/xlocale/__posix_l_fallback.h
index 8651c2b7ca958a..03e7f15f31ac99 100644
--- a/libcxx/include/__cxx03/__support/xlocale/__posix_l_fallback.h
+++ b/libcxx/include/__cxx03/__support/xlocale/__posix_l_fallback.h
@@ -12,8 +12,8 @@
// Android's bionic and Newlib).
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___SUPPORT_XLOCALE_POSIX_L_FALLBACK_H
-#define _LIBCPP___SUPPORT_XLOCALE_POSIX_L_FALLBACK_H
+#ifndef _LIBCPP___CXX03___SUPPORT_XLOCALE_POSIX_L_FALLBACK_H
+#define _LIBCPP___CXX03___SUPPORT_XLOCALE_POSIX_L_FALLBACK_H
#include <__cxx03/__config>
#include <__cxx03/ctype.h>
@@ -104,4 +104,4 @@ inline _LIBCPP_HIDE_FROM_ABI size_t wcsxfrm_l(wchar_t* __dest, const wchar_t* __
}
#endif // _LIBCPP_HAS_NO_WIDE_CHARACTERS
-#endif // _LIBCPP___SUPPORT_XLOCALE_POSIX_L_FALLBACK_H
+#endif // _LIBCPP___CXX03___SUPPORT_XLOCALE_POSIX_L_FALLBACK_H
diff --git a/libcxx/include/__cxx03/__support/xlocale/__strtonum_fallback.h b/libcxx/include/__cxx03/__support/xlocale/__strtonum_fallback.h
index 3587e2f1a3219f..9ab49ed036237c 100644
--- a/libcxx/include/__cxx03/__support/xlocale/__strtonum_fallback.h
+++ b/libcxx/include/__cxx03/__support/xlocale/__strtonum_fallback.h
@@ -12,8 +12,8 @@
// convert strings to some numeric type.
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___SUPPORT_XLOCALE_STRTONUM_FALLBACK_H
-#define _LIBCPP___SUPPORT_XLOCALE_STRTONUM_FALLBACK_H
+#ifndef _LIBCPP___CXX03___SUPPORT_XLOCALE_STRTONUM_FALLBACK_H
+#define _LIBCPP___CXX03___SUPPORT_XLOCALE_STRTONUM_FALLBACK_H
#include <__cxx03/__config>
#include <__cxx03/stdlib.h>
@@ -42,4 +42,4 @@ inline _LIBCPP_HIDE_FROM_ABI unsigned long long strtoull_l(const char* __nptr, c
return ::strtoull(__nptr, __endptr, __base);
}
-#endif // _LIBCPP___SUPPORT_XLOCALE_STRTONUM_FALLBACK_H
+#endif // _LIBCPP___CXX03___SUPPORT_XLOCALE_STRTONUM_FALLBACK_H
diff --git a/libcxx/include/__cxx03/__system_error/errc.h b/libcxx/include/__cxx03/__system_error/errc.h
index 33e670ecd3a707..d2f7dc5f50dd31 100644
--- a/libcxx/include/__cxx03/__system_error/errc.h
+++ b/libcxx/include/__cxx03/__system_error/errc.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___ERRC
-#define _LIBCPP___ERRC
+#ifndef _LIBCPP___CXX03___ERRC
+#define _LIBCPP___CXX03___ERRC
/*
system_error synopsis
@@ -263,4 +263,4 @@ _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(errc)
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___ERRC
+#endif // _LIBCPP___CXX03___ERRC
diff --git a/libcxx/include/__cxx03/__system_error/error_category.h b/libcxx/include/__cxx03/__system_error/error_category.h
index cc08cf2801d431..7f9dd7171ea5c3 100644
--- a/libcxx/include/__cxx03/__system_error/error_category.h
+++ b/libcxx/include/__cxx03/__system_error/error_category.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___SYSTEM_ERROR_ERROR_CATEGORY_H
-#define _LIBCPP___SYSTEM_ERROR_ERROR_CATEGORY_H
+#ifndef _LIBCPP___CXX03___SYSTEM_ERROR_ERROR_CATEGORY_H
+#define _LIBCPP___CXX03___SYSTEM_ERROR_ERROR_CATEGORY_H
#include <__cxx03/__compare/ordering.h>
#include <__cxx03/__config>
@@ -72,4 +72,4 @@ __attribute__((__const__)) _LIBCPP_EXPORTED_FROM_ABI const error_category& syste
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___SYSTEM_ERROR_ERROR_CATEGORY_H
+#endif // _LIBCPP___CXX03___SYSTEM_ERROR_ERROR_CATEGORY_H
diff --git a/libcxx/include/__cxx03/__system_error/error_code.h b/libcxx/include/__cxx03/__system_error/error_code.h
index 2fe4d299885fc3..e253f88633d330 100644
--- a/libcxx/include/__cxx03/__system_error/error_code.h
+++ b/libcxx/include/__cxx03/__system_error/error_code.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___SYSTEM_ERROR_ERROR_CODE_H
-#define _LIBCPP___SYSTEM_ERROR_ERROR_CODE_H
+#ifndef _LIBCPP___CXX03___SYSTEM_ERROR_ERROR_CODE_H
+#define _LIBCPP___CXX03___SYSTEM_ERROR_ERROR_CODE_H
#include <__cxx03/__compare/ordering.h>
#include <__cxx03/__config>
@@ -140,4 +140,4 @@ struct _LIBCPP_TEMPLATE_VIS hash<error_code> : public __unary_function<error_cod
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___SYSTEM_ERROR_ERROR_CODE_H
+#endif // _LIBCPP___CXX03___SYSTEM_ERROR_ERROR_CODE_H
diff --git a/libcxx/include/__cxx03/__system_error/error_condition.h b/libcxx/include/__cxx03/__system_error/error_condition.h
index 87bfcd6c6350cf..ba37deaf4fcb61 100644
--- a/libcxx/include/__cxx03/__system_error/error_condition.h
+++ b/libcxx/include/__cxx03/__system_error/error_condition.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___SYSTEM_ERROR_ERROR_CONDITION_H
-#define _LIBCPP___SYSTEM_ERROR_ERROR_CONDITION_H
+#ifndef _LIBCPP___CXX03___SYSTEM_ERROR_ERROR_CONDITION_H
+#define _LIBCPP___CXX03___SYSTEM_ERROR_ERROR_CONDITION_H
#include <__cxx03/__compare/ordering.h>
#include <__cxx03/__config>
@@ -127,4 +127,4 @@ struct _LIBCPP_TEMPLATE_VIS hash<error_condition> : public __unary_function<erro
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___SYSTEM_ERROR_ERROR_CONDITION_H
+#endif // _LIBCPP___CXX03___SYSTEM_ERROR_ERROR_CONDITION_H
diff --git a/libcxx/include/__cxx03/__system_error/system_error.h b/libcxx/include/__cxx03/__system_error/system_error.h
index 2487d3bafa06dd..84fbba1c843649 100644
--- a/libcxx/include/__cxx03/__system_error/system_error.h
+++ b/libcxx/include/__cxx03/__system_error/system_error.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___SYSTEM_ERROR_SYSTEM_ERROR_H
-#define _LIBCPP___SYSTEM_ERROR_SYSTEM_ERROR_H
+#ifndef _LIBCPP___CXX03___SYSTEM_ERROR_SYSTEM_ERROR_H
+#define _LIBCPP___CXX03___SYSTEM_ERROR_SYSTEM_ERROR_H
#include <__cxx03/__config>
#include <__cxx03/__system_error/error_category.h>
@@ -51,4 +51,4 @@ _LIBCPP_NORETURN _LIBCPP_HIDE_FROM_ABI inline void __throw_system_error(error_co
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___SYSTEM_ERROR_SYSTEM_ERROR_H
+#endif // _LIBCPP___CXX03___SYSTEM_ERROR_SYSTEM_ERROR_H
diff --git a/libcxx/include/__cxx03/__thread/formatter.h b/libcxx/include/__cxx03/__thread/formatter.h
index d7ecba57203edd..5d54789ee445c8 100644
--- a/libcxx/include/__cxx03/__thread/formatter.h
+++ b/libcxx/include/__cxx03/__thread/formatter.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___THREAD_FORMATTER_H
-#define _LIBCPP___THREAD_FORMATTER_H
+#ifndef _LIBCPP___CXX03___THREAD_FORMATTER_H
+#define _LIBCPP___CXX03___THREAD_FORMATTER_H
#include <__cxx03/__concepts/arithmetic.h>
#include <__cxx03/__config>
@@ -77,4 +77,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 23
-#endif // _LIBCPP___THREAD_FORMATTER_H
+#endif // _LIBCPP___CXX03___THREAD_FORMATTER_H
diff --git a/libcxx/include/__cxx03/__thread/id.h b/libcxx/include/__cxx03/__thread/id.h
index 09e7bb071c61f3..8dcd68bdf39d7d 100644
--- a/libcxx/include/__cxx03/__thread/id.h
+++ b/libcxx/include/__cxx03/__thread/id.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___THREAD_ID_H
-#define _LIBCPP___THREAD_ID_H
+#ifndef _LIBCPP___CXX03___THREAD_ID_H
+#define _LIBCPP___CXX03___THREAD_ID_H
#include <__cxx03/__compare/ordering.h>
#include <__cxx03/__config>
@@ -118,4 +118,4 @@ inline _LIBCPP_HIDE_FROM_ABI __thread_id get_id() _NOEXCEPT { return __libcpp_th
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___THREAD_ID_H
+#endif // _LIBCPP___CXX03___THREAD_ID_H
diff --git a/libcxx/include/__cxx03/__thread/jthread.h b/libcxx/include/__cxx03/__thread/jthread.h
index 840d0cae9d0a22..6272ccaa6f7cef 100644
--- a/libcxx/include/__cxx03/__thread/jthread.h
+++ b/libcxx/include/__cxx03/__thread/jthread.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___THREAD_JTHREAD_H
-#define _LIBCPP___THREAD_JTHREAD_H
+#ifndef _LIBCPP___CXX03___THREAD_JTHREAD_H
+#define _LIBCPP___CXX03___THREAD_JTHREAD_H
#include <__cxx03/__config>
#include <__cxx03/__functional/invoke.h>
@@ -131,4 +131,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___THREAD_JTHREAD_H
+#endif // _LIBCPP___CXX03___THREAD_JTHREAD_H
diff --git a/libcxx/include/__cxx03/__thread/poll_with_backoff.h b/libcxx/include/__cxx03/__thread/poll_with_backoff.h
index d875c1465dc813..b500629c852174 100644
--- a/libcxx/include/__cxx03/__thread/poll_with_backoff.h
+++ b/libcxx/include/__cxx03/__thread/poll_with_backoff.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___THREAD_POLL_WITH_BACKOFF_H
-#define _LIBCPP___THREAD_POLL_WITH_BACKOFF_H
+#ifndef _LIBCPP___CXX03___THREAD_POLL_WITH_BACKOFF_H
+#define _LIBCPP___CXX03___THREAD_POLL_WITH_BACKOFF_H
#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__chrono/high_resolution_clock.h>
@@ -64,4 +64,4 @@ struct __spinning_backoff_policy {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___THREAD_POLL_WITH_BACKOFF_H
+#endif // _LIBCPP___CXX03___THREAD_POLL_WITH_BACKOFF_H
diff --git a/libcxx/include/__cxx03/__thread/support.h b/libcxx/include/__cxx03/__thread/support.h
index 3ef25c88c1a8a3..c1cdc999a69886 100644
--- a/libcxx/include/__cxx03/__thread/support.h
+++ b/libcxx/include/__cxx03/__thread/support.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___THREAD_SUPPORT_H
-#define _LIBCPP___THREAD_SUPPORT_H
+#ifndef _LIBCPP___CXX03___THREAD_SUPPORT_H
+#define _LIBCPP___CXX03___THREAD_SUPPORT_H
#include <__cxx03/__config>
@@ -120,4 +120,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // !_LIBCPP_HAS_NO_THREADS
-#endif // _LIBCPP___THREAD_SUPPORT_H
+#endif // _LIBCPP___CXX03___THREAD_SUPPORT_H
diff --git a/libcxx/include/__cxx03/__thread/support/c11.h b/libcxx/include/__cxx03/__thread/support/c11.h
index 7b791388029b96..4ae6f841a94306 100644
--- a/libcxx/include/__cxx03/__thread/support/c11.h
+++ b/libcxx/include/__cxx03/__thread/support/c11.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___THREAD_SUPPORT_C11_H
-#define _LIBCPP___THREAD_SUPPORT_C11_H
+#ifndef _LIBCPP___CXX03___THREAD_SUPPORT_C11_H
+#define _LIBCPP___CXX03___THREAD_SUPPORT_C11_H
#include <__cxx03/__chrono/convert_to_timespec.h>
#include <__cxx03/__chrono/duration.h>
@@ -188,4 +188,4 @@ inline _LIBCPP_HIDE_FROM_ABI int __libcpp_tls_set(__libcpp_tls_key __key, void*
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___THREAD_SUPPORT_C11_H
+#endif // _LIBCPP___CXX03___THREAD_SUPPORT_C11_H
diff --git a/libcxx/include/__cxx03/__thread/support/external.h b/libcxx/include/__cxx03/__thread/support/external.h
index d4b476c435049d..39b2ad467fa569 100644
--- a/libcxx/include/__cxx03/__thread/support/external.h
+++ b/libcxx/include/__cxx03/__thread/support/external.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___THREAD_SUPPORT_EXTERNAL_H
-#define _LIBCPP___THREAD_SUPPORT_EXTERNAL_H
+#ifndef _LIBCPP___CXX03___THREAD_SUPPORT_EXTERNAL_H
+#define _LIBCPP___CXX03___THREAD_SUPPORT_EXTERNAL_H
#include <__cxx03/__config>
@@ -18,4 +18,4 @@
#include <__cxx03/__external_threading>
-#endif // _LIBCPP___THREAD_SUPPORT_EXTERNAL_H
+#endif // _LIBCPP___CXX03___THREAD_SUPPORT_EXTERNAL_H
diff --git a/libcxx/include/__cxx03/__thread/support/pthread.h b/libcxx/include/__cxx03/__thread/support/pthread.h
index 9c3646896c1088..a4d7c874e68306 100644
--- a/libcxx/include/__cxx03/__thread/support/pthread.h
+++ b/libcxx/include/__cxx03/__thread/support/pthread.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___THREAD_SUPPORT_PTHREAD_H
-#define _LIBCPP___THREAD_SUPPORT_PTHREAD_H
+#ifndef _LIBCPP___CXX03___THREAD_SUPPORT_PTHREAD_H
+#define _LIBCPP___CXX03___THREAD_SUPPORT_PTHREAD_H
#include <__cxx03/__chrono/convert_to_timespec.h>
#include <__cxx03/__chrono/duration.h>
@@ -218,4 +218,4 @@ inline _LIBCPP_HIDE_FROM_ABI int __libcpp_tls_set(__libcpp_tls_key __key, void*
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___THREAD_SUPPORT_PTHREAD_H
+#endif // _LIBCPP___CXX03___THREAD_SUPPORT_PTHREAD_H
diff --git a/libcxx/include/__cxx03/__thread/support/windows.h b/libcxx/include/__cxx03/__thread/support/windows.h
index b7b859b060efa1..45252a57efaecb 100644
--- a/libcxx/include/__cxx03/__thread/support/windows.h
+++ b/libcxx/include/__cxx03/__thread/support/windows.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___THREAD_SUPPORT_WINDOWS_H
-#define _LIBCPP___THREAD_SUPPORT_WINDOWS_H
+#ifndef _LIBCPP___CXX03___THREAD_SUPPORT_WINDOWS_H
+#define _LIBCPP___CXX03___THREAD_SUPPORT_WINDOWS_H
#include <__cxx03/__chrono/duration.h>
#include <__cxx03/__config>
@@ -130,4 +130,4 @@ _LIBCPP_EXPORTED_FROM_ABI int __libcpp_tls_set(__libcpp_tls_key __key, void* __p
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___THREAD_SUPPORT_WINDOWS_H
+#endif // _LIBCPP___CXX03___THREAD_SUPPORT_WINDOWS_H
diff --git a/libcxx/include/__cxx03/__thread/this_thread.h b/libcxx/include/__cxx03/__thread/this_thread.h
index fe6c19aaf9b450..ae9c37ef02fbb4 100644
--- a/libcxx/include/__cxx03/__thread/this_thread.h
+++ b/libcxx/include/__cxx03/__thread/this_thread.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___THREAD_THIS_THREAD_H
-#define _LIBCPP___THREAD_THIS_THREAD_H
+#ifndef _LIBCPP___CXX03___THREAD_THIS_THREAD_H
+#define _LIBCPP___CXX03___THREAD_THIS_THREAD_H
#include <__cxx03/__chrono/steady_clock.h>
#include <__cxx03/__chrono/time_point.h>
@@ -71,4 +71,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___THREAD_THIS_THREAD_H
+#endif // _LIBCPP___CXX03___THREAD_THIS_THREAD_H
diff --git a/libcxx/include/__cxx03/__thread/thread.h b/libcxx/include/__cxx03/__thread/thread.h
index fdd875e03cc687..b624a7d46fe241 100644
--- a/libcxx/include/__cxx03/__thread/thread.h
+++ b/libcxx/include/__cxx03/__thread/thread.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___THREAD_THREAD_H
-#define _LIBCPP___THREAD_THREAD_H
+#ifndef _LIBCPP___CXX03___THREAD_THREAD_H
+#define _LIBCPP___CXX03___THREAD_THREAD_H
#include <__cxx03/__condition_variable/condition_variable.h>
#include <__cxx03/__config>
@@ -255,4 +255,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___THREAD_THREAD_H
+#endif // _LIBCPP___CXX03___THREAD_THREAD_H
diff --git a/libcxx/include/__cxx03/__thread/timed_backoff_policy.h b/libcxx/include/__cxx03/__thread/timed_backoff_policy.h
index eec6f225d717dc..f21d88629027e3 100644
--- a/libcxx/include/__cxx03/__thread/timed_backoff_policy.h
+++ b/libcxx/include/__cxx03/__thread/timed_backoff_policy.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___THREAD_TIMED_BACKOFF_POLICY_H
-#define _LIBCPP___THREAD_TIMED_BACKOFF_POLICY_H
+#ifndef _LIBCPP___CXX03___THREAD_TIMED_BACKOFF_POLICY_H
+#define _LIBCPP___CXX03___THREAD_TIMED_BACKOFF_POLICY_H
#include <__cxx03/__config>
@@ -41,4 +41,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_HAS_NO_THREADS
-#endif // _LIBCPP___THREAD_TIMED_BACKOFF_POLICY_H
+#endif // _LIBCPP___CXX03___THREAD_TIMED_BACKOFF_POLICY_H
diff --git a/libcxx/include/__cxx03/__tree b/libcxx/include/__cxx03/__tree
index 2b8521a0915363..8982baf18d1a92 100644
--- a/libcxx/include/__cxx03/__tree
+++ b/libcxx/include/__cxx03/__tree
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TREE
-#define _LIBCPP___TREE
+#ifndef _LIBCPP___CXX03___TREE
+#define _LIBCPP___CXX03___TREE
#include <__cxx03/__algorithm/min.h>
#include <__cxx03/__assert>
@@ -2296,4 +2296,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___TREE
+#endif // _LIBCPP___CXX03___TREE
diff --git a/libcxx/include/__cxx03/__tuple/find_index.h b/libcxx/include/__cxx03/__tuple/find_index.h
index 899e7f2d7b41f9..a090dff91e9737 100644
--- a/libcxx/include/__cxx03/__tuple/find_index.h
+++ b/libcxx/include/__cxx03/__tuple/find_index.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TUPLE_FIND_INDEX_H
-#define _LIBCPP___TUPLE_FIND_INDEX_H
+#ifndef _LIBCPP___CXX03___TUPLE_FIND_INDEX_H
+#define _LIBCPP___CXX03___TUPLE_FIND_INDEX_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_same.h>
@@ -59,4 +59,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 14
-#endif // _LIBCPP___TUPLE_FIND_INDEX_H
+#endif // _LIBCPP___CXX03___TUPLE_FIND_INDEX_H
diff --git a/libcxx/include/__cxx03/__tuple/ignore.h b/libcxx/include/__cxx03/__tuple/ignore.h
index 2d1800ae0d708d..9e00de9a8471dc 100644
--- a/libcxx/include/__cxx03/__tuple/ignore.h
+++ b/libcxx/include/__cxx03/__tuple/ignore.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TUPLE_IGNORE_H
-#define _LIBCPP___TUPLE_IGNORE_H
+#ifndef _LIBCPP___CXX03___TUPLE_IGNORE_H
+#define _LIBCPP___CXX03___TUPLE_IGNORE_H
#include <__cxx03/__config>
@@ -36,4 +36,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_CXX03_LANG
-#endif // _LIBCPP___TUPLE_IGNORE_H
+#endif // _LIBCPP___CXX03___TUPLE_IGNORE_H
diff --git a/libcxx/include/__cxx03/__tuple/make_tuple_types.h b/libcxx/include/__cxx03/__tuple/make_tuple_types.h
index b7abfa74f6f116..d8eed10dc51ac2 100644
--- a/libcxx/include/__cxx03/__tuple/make_tuple_types.h
+++ b/libcxx/include/__cxx03/__tuple/make_tuple_types.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TUPLE_MAKE_TUPLE_TYPES_H
-#define _LIBCPP___TUPLE_MAKE_TUPLE_TYPES_H
+#ifndef _LIBCPP___CXX03___TUPLE_MAKE_TUPLE_TYPES_H
+#define _LIBCPP___CXX03___TUPLE_MAKE_TUPLE_TYPES_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/array.h>
@@ -77,4 +77,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_CXX03_LANG
-#endif // _LIBCPP___TUPLE_MAKE_TUPLE_TYPES_H
+#endif // _LIBCPP___CXX03___TUPLE_MAKE_TUPLE_TYPES_H
diff --git a/libcxx/include/__cxx03/__tuple/sfinae_helpers.h b/libcxx/include/__cxx03/__tuple/sfinae_helpers.h
index d6889364a91625..4fbe87d6e9a5b2 100644
--- a/libcxx/include/__cxx03/__tuple/sfinae_helpers.h
+++ b/libcxx/include/__cxx03/__tuple/sfinae_helpers.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TUPLE_SFINAE_HELPERS_H
-#define _LIBCPP___TUPLE_SFINAE_HELPERS_H
+#ifndef _LIBCPP___CXX03___TUPLE_SFINAE_HELPERS_H
+#define _LIBCPP___CXX03___TUPLE_SFINAE_HELPERS_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/tuple.h>
@@ -139,4 +139,4 @@ struct __sfinae_assign_base<false, true> {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TUPLE_SFINAE_HELPERS_H
+#endif // _LIBCPP___CXX03___TUPLE_SFINAE_HELPERS_H
diff --git a/libcxx/include/__cxx03/__tuple/tuple_element.h b/libcxx/include/__cxx03/__tuple/tuple_element.h
index d00879a0694234..56dbdc3beb39b9 100644
--- a/libcxx/include/__cxx03/__tuple/tuple_element.h
+++ b/libcxx/include/__cxx03/__tuple/tuple_element.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TUPLE_TUPLE_ELEMENT_H
-#define _LIBCPP___TUPLE_TUPLE_ELEMENT_H
+#ifndef _LIBCPP___CXX03___TUPLE_TUPLE_ELEMENT_H
+#define _LIBCPP___CXX03___TUPLE_TUPLE_ELEMENT_H
#include <__cxx03/__config>
#include <__cxx03/__tuple/tuple_indices.h>
@@ -55,4 +55,4 @@ using tuple_element_t _LIBCPP_NODEBUG = typename tuple_element<_Ip, _Tp...>::typ
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TUPLE_TUPLE_ELEMENT_H
+#endif // _LIBCPP___CXX03___TUPLE_TUPLE_ELEMENT_H
diff --git a/libcxx/include/__cxx03/__tuple/tuple_indices.h b/libcxx/include/__cxx03/__tuple/tuple_indices.h
index 6e51b69e906b0d..0c423d99ccb638 100644
--- a/libcxx/include/__cxx03/__tuple/tuple_indices.h
+++ b/libcxx/include/__cxx03/__tuple/tuple_indices.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TUPLE_MAKE_TUPLE_INDICES_H
-#define _LIBCPP___TUPLE_MAKE_TUPLE_INDICES_H
+#ifndef _LIBCPP___CXX03___TUPLE_MAKE_TUPLE_INDICES_H
+#define _LIBCPP___CXX03___TUPLE_MAKE_TUPLE_INDICES_H
#include <__cxx03/__config>
#include <__cxx03/__utility/integer_sequence.h>
@@ -34,4 +34,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_CXX03_LANG
-#endif // _LIBCPP___TUPLE_MAKE_TUPLE_INDICES_H
+#endif // _LIBCPP___CXX03___TUPLE_MAKE_TUPLE_INDICES_H
diff --git a/libcxx/include/__cxx03/__tuple/tuple_like.h b/libcxx/include/__cxx03/__tuple/tuple_like.h
index 23f42d58312a6f..ea596c4ba52df1 100644
--- a/libcxx/include/__cxx03/__tuple/tuple_like.h
+++ b/libcxx/include/__cxx03/__tuple/tuple_like.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TUPLE_TUPLE_LIKE_H
-#define _LIBCPP___TUPLE_TUPLE_LIKE_H
+#ifndef _LIBCPP___CXX03___TUPLE_TUPLE_LIKE_H
+#define _LIBCPP___CXX03___TUPLE_TUPLE_LIKE_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/subrange.h>
@@ -39,4 +39,4 @@ concept __tuple_like = __tuple_like_no_subrange<_Tp> || __is_ranges_subrange_v<r
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TUPLE_TUPLE_LIKE_H
+#endif // _LIBCPP___CXX03___TUPLE_TUPLE_LIKE_H
diff --git a/libcxx/include/__cxx03/__tuple/tuple_like_ext.h b/libcxx/include/__cxx03/__tuple/tuple_like_ext.h
index 5bb07cc8b5e74e..94470521cd068a 100644
--- a/libcxx/include/__cxx03/__tuple/tuple_like_ext.h
+++ b/libcxx/include/__cxx03/__tuple/tuple_like_ext.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TUPLE_TUPLE_LIKE_EXT_H
-#define _LIBCPP___TUPLE_TUPLE_LIKE_EXT_H
+#ifndef _LIBCPP___CXX03___TUPLE_TUPLE_LIKE_EXT_H
+#define _LIBCPP___CXX03___TUPLE_TUPLE_LIKE_EXT_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/array.h>
@@ -49,4 +49,4 @@ struct __tuple_like_ext<__tuple_types<_Tp...> > : true_type {};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TUPLE_TUPLE_LIKE_EXT_H
+#endif // _LIBCPP___CXX03___TUPLE_TUPLE_LIKE_EXT_H
diff --git a/libcxx/include/__cxx03/__tuple/tuple_like_no_subrange.h b/libcxx/include/__cxx03/__tuple/tuple_like_no_subrange.h
index af4a14d2d535f2..ff095163363b1a 100644
--- a/libcxx/include/__cxx03/__tuple/tuple_like_no_subrange.h
+++ b/libcxx/include/__cxx03/__tuple/tuple_like_no_subrange.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TUPLE_TUPLE_LIKE_NO_SUBRANGE_H
-#define _LIBCPP___TUPLE_TUPLE_LIKE_NO_SUBRANGE_H
+#ifndef _LIBCPP___CXX03___TUPLE_TUPLE_LIKE_NO_SUBRANGE_H
+#define _LIBCPP___CXX03___TUPLE_TUPLE_LIKE_NO_SUBRANGE_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/array.h>
@@ -58,4 +58,4 @@ concept __pair_like_no_subrange = __tuple_like_no_subrange<_Tp> && tuple_size<re
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TUPLE_TUPLE_LIKE_NO_SUBRANGE_H
+#endif // _LIBCPP___CXX03___TUPLE_TUPLE_LIKE_NO_SUBRANGE_H
diff --git a/libcxx/include/__cxx03/__tuple/tuple_size.h b/libcxx/include/__cxx03/__tuple/tuple_size.h
index ada7a522182e29..1f8fd22e3eaf11 100644
--- a/libcxx/include/__cxx03/__tuple/tuple_size.h
+++ b/libcxx/include/__cxx03/__tuple/tuple_size.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TUPLE_TUPLE_SIZE_H
-#define _LIBCPP___TUPLE_TUPLE_SIZE_H
+#ifndef _LIBCPP___CXX03___TUPLE_TUPLE_SIZE_H
+#define _LIBCPP___CXX03___TUPLE_TUPLE_SIZE_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/tuple.h>
@@ -72,4 +72,4 @@ inline constexpr size_t tuple_size_v = tuple_size<_Tp>::value;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TUPLE_TUPLE_SIZE_H
+#endif // _LIBCPP___CXX03___TUPLE_TUPLE_SIZE_H
diff --git a/libcxx/include/__cxx03/__tuple/tuple_types.h b/libcxx/include/__cxx03/__tuple/tuple_types.h
index 562d199a02ba2a..72ee76f49412d9 100644
--- a/libcxx/include/__cxx03/__tuple/tuple_types.h
+++ b/libcxx/include/__cxx03/__tuple/tuple_types.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TUPLE_TUPLE_TYPES_H
-#define _LIBCPP___TUPLE_TUPLE_TYPES_H
+#ifndef _LIBCPP___CXX03___TUPLE_TUPLE_TYPES_H
+#define _LIBCPP___CXX03___TUPLE_TUPLE_TYPES_H
#include <__cxx03/__config>
@@ -22,4 +22,4 @@ struct __tuple_types {};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TUPLE_TUPLE_TYPES_H
+#endif // _LIBCPP___CXX03___TUPLE_TUPLE_TYPES_H
diff --git a/libcxx/include/__cxx03/__type_traits/add_const.h b/libcxx/include/__cxx03/__type_traits/add_const.h
index ce670824873ee2..004ce05c03996f 100644
--- a/libcxx/include/__cxx03/__type_traits/add_const.h
+++ b/libcxx/include/__cxx03/__type_traits/add_const.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_ADD_CONST_H
-#define _LIBCPP___TYPE_TRAITS_ADD_CONST_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_ADD_CONST_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_ADD_CONST_H
#include <__cxx03/__config>
@@ -29,4 +29,4 @@ using add_const_t = typename add_const<_Tp>::type;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_ADD_CONST_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_ADD_CONST_H
diff --git a/libcxx/include/__cxx03/__type_traits/add_cv.h b/libcxx/include/__cxx03/__type_traits/add_cv.h
index 43eb05fa40487f..8445b863b5c2ef 100644
--- a/libcxx/include/__cxx03/__type_traits/add_cv.h
+++ b/libcxx/include/__cxx03/__type_traits/add_cv.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_ADD_CV_H
-#define _LIBCPP___TYPE_TRAITS_ADD_CV_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_ADD_CV_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_ADD_CV_H
#include <__cxx03/__config>
@@ -29,4 +29,4 @@ using add_cv_t = typename add_cv<_Tp>::type;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_ADD_CV_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_ADD_CV_H
diff --git a/libcxx/include/__cxx03/__type_traits/add_lvalue_reference.h b/libcxx/include/__cxx03/__type_traits/add_lvalue_reference.h
index ca6ee5dc0b2962..c35b366794a7d1 100644
--- a/libcxx/include/__cxx03/__type_traits/add_lvalue_reference.h
+++ b/libcxx/include/__cxx03/__type_traits/add_lvalue_reference.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_ADD_LVALUE_REFERENCE_H
-#define _LIBCPP___TYPE_TRAITS_ADD_LVALUE_REFERENCE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_ADD_LVALUE_REFERENCE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_ADD_LVALUE_REFERENCE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_referenceable.h>
@@ -51,4 +51,4 @@ using add_lvalue_reference_t = __add_lvalue_reference_t<_Tp>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_ADD_LVALUE_REFERENCE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_ADD_LVALUE_REFERENCE_H
diff --git a/libcxx/include/__cxx03/__type_traits/add_pointer.h b/libcxx/include/__cxx03/__type_traits/add_pointer.h
index ec3ba5d8f404f1..c53b5ce7e46ac5 100644
--- a/libcxx/include/__cxx03/__type_traits/add_pointer.h
+++ b/libcxx/include/__cxx03/__type_traits/add_pointer.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_ADD_POINTER_H
-#define _LIBCPP___TYPE_TRAITS_ADD_POINTER_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_ADD_POINTER_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_ADD_POINTER_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_referenceable.h>
@@ -52,4 +52,4 @@ using add_pointer_t = __add_pointer_t<_Tp>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_ADD_POINTER_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_ADD_POINTER_H
diff --git a/libcxx/include/__cxx03/__type_traits/add_rvalue_reference.h b/libcxx/include/__cxx03/__type_traits/add_rvalue_reference.h
index dc3be42ab0171f..812a15e6090e4f 100644
--- a/libcxx/include/__cxx03/__type_traits/add_rvalue_reference.h
+++ b/libcxx/include/__cxx03/__type_traits/add_rvalue_reference.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_ADD_RVALUE_REFERENCE_H
-#define _LIBCPP___TYPE_TRAITS_ADD_RVALUE_REFERENCE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_ADD_RVALUE_REFERENCE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_ADD_RVALUE_REFERENCE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_referenceable.h>
@@ -51,4 +51,4 @@ using add_rvalue_reference_t = __add_rvalue_reference_t<_Tp>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_ADD_RVALUE_REFERENCE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_ADD_RVALUE_REFERENCE_H
diff --git a/libcxx/include/__cxx03/__type_traits/add_volatile.h b/libcxx/include/__cxx03/__type_traits/add_volatile.h
index 35ff8d7435c6d9..9f649e4978d65b 100644
--- a/libcxx/include/__cxx03/__type_traits/add_volatile.h
+++ b/libcxx/include/__cxx03/__type_traits/add_volatile.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_ADD_VOLATILE_H
-#define _LIBCPP___TYPE_TRAITS_ADD_VOLATILE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_ADD_VOLATILE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_ADD_VOLATILE_H
#include <__cxx03/__config>
@@ -29,4 +29,4 @@ using add_volatile_t = typename add_volatile<_Tp>::type;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_ADD_VOLATILE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_ADD_VOLATILE_H
diff --git a/libcxx/include/__cxx03/__type_traits/aligned_storage.h b/libcxx/include/__cxx03/__type_traits/aligned_storage.h
index fc9fe4edd27ae1..8383cc48bb44ec 100644
--- a/libcxx/include/__cxx03/__type_traits/aligned_storage.h
+++ b/libcxx/include/__cxx03/__type_traits/aligned_storage.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_ALIGNED_STORAGE_H
-#define _LIBCPP___TYPE_TRAITS_ALIGNED_STORAGE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_ALIGNED_STORAGE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_ALIGNED_STORAGE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/conditional.h>
@@ -135,4 +135,4 @@ _CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x4000);
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_ALIGNED_STORAGE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_ALIGNED_STORAGE_H
diff --git a/libcxx/include/__cxx03/__type_traits/aligned_union.h b/libcxx/include/__cxx03/__type_traits/aligned_union.h
index d2c695d675381d..0a0deb90e3991e 100644
--- a/libcxx/include/__cxx03/__type_traits/aligned_union.h
+++ b/libcxx/include/__cxx03/__type_traits/aligned_union.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_ALIGNED_UNION_H
-#define _LIBCPP___TYPE_TRAITS_ALIGNED_UNION_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_ALIGNED_UNION_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_ALIGNED_UNION_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/aligned_storage.h>
@@ -48,4 +48,4 @@ using aligned_union_t _LIBCPP_DEPRECATED_IN_CXX23 = typename aligned_union<_Len,
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_ALIGNED_UNION_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_ALIGNED_UNION_H
diff --git a/libcxx/include/__cxx03/__type_traits/alignment_of.h b/libcxx/include/__cxx03/__type_traits/alignment_of.h
index f2d5317d1a1923..d72e0cc43ebf69 100644
--- a/libcxx/include/__cxx03/__type_traits/alignment_of.h
+++ b/libcxx/include/__cxx03/__type_traits/alignment_of.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_ALIGNMENT_OF_H
-#define _LIBCPP___TYPE_TRAITS_ALIGNMENT_OF_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_ALIGNMENT_OF_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_ALIGNMENT_OF_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -29,4 +29,4 @@ inline constexpr size_t alignment_of_v = _LIBCPP_ALIGNOF(_Tp);
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_ALIGNMENT_OF_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_ALIGNMENT_OF_H
diff --git a/libcxx/include/__cxx03/__type_traits/can_extract_key.h b/libcxx/include/__cxx03/__type_traits/can_extract_key.h
index 8069ce25f4a67f..437cee6bcb9aea 100644
--- a/libcxx/include/__cxx03/__type_traits/can_extract_key.h
+++ b/libcxx/include/__cxx03/__type_traits/can_extract_key.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_CAN_EXTRACT_KEY_H
-#define _LIBCPP___TYPE_TRAITS_CAN_EXTRACT_KEY_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_CAN_EXTRACT_KEY_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_CAN_EXTRACT_KEY_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/pair.h>
@@ -50,4 +50,4 @@ struct __can_extract_map_key<_ValTy, _Key, _Key, _RawValTy> : false_type {};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_CAN_EXTRACT_KEY_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_CAN_EXTRACT_KEY_H
diff --git a/libcxx/include/__cxx03/__type_traits/common_reference.h b/libcxx/include/__cxx03/__type_traits/common_reference.h
index ecaf83323f2f16..8e1694e14e6ef7 100644
--- a/libcxx/include/__cxx03/__type_traits/common_reference.h
+++ b/libcxx/include/__cxx03/__type_traits/common_reference.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_COMMON_REFERENCE_H
-#define _LIBCPP___TYPE_TRAITS_COMMON_REFERENCE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_COMMON_REFERENCE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_COMMON_REFERENCE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/common_type.h>
@@ -190,4 +190,4 @@ struct common_reference {};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_COMMON_REFERENCE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_COMMON_REFERENCE_H
diff --git a/libcxx/include/__cxx03/__type_traits/common_type.h b/libcxx/include/__cxx03/__type_traits/common_type.h
index 9f7d0cef37fafb..78c36162ee4acb 100644
--- a/libcxx/include/__cxx03/__type_traits/common_type.h
+++ b/libcxx/include/__cxx03/__type_traits/common_type.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_COMMON_TYPE_H
-#define _LIBCPP___TYPE_TRAITS_COMMON_TYPE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_COMMON_TYPE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_COMMON_TYPE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/conditional.h>
@@ -99,4 +99,4 @@ using common_type_t = typename common_type<_Tp...>::type;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_COMMON_TYPE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_COMMON_TYPE_H
diff --git a/libcxx/include/__cxx03/__type_traits/conditional.h b/libcxx/include/__cxx03/__type_traits/conditional.h
index e03dcf07080168..6f7ca781f0e376 100644
--- a/libcxx/include/__cxx03/__type_traits/conditional.h
+++ b/libcxx/include/__cxx03/__type_traits/conditional.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_CONDITIONAL_H
-#define _LIBCPP___TYPE_TRAITS_CONDITIONAL_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_CONDITIONAL_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_CONDITIONAL_H
#include <__cxx03/__config>
@@ -55,4 +55,4 @@ using __conditional_t _LIBCPP_NODEBUG = typename conditional<_Bp, _If, _Then>::t
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_CONDITIONAL_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_CONDITIONAL_H
diff --git a/libcxx/include/__cxx03/__type_traits/conjunction.h b/libcxx/include/__cxx03/__type_traits/conjunction.h
index 9cb6a87764a955..af67e8d0899fe4 100644
--- a/libcxx/include/__cxx03/__type_traits/conjunction.h
+++ b/libcxx/include/__cxx03/__type_traits/conjunction.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_CONJUNCTION_H
-#define _LIBCPP___TYPE_TRAITS_CONJUNCTION_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_CONJUNCTION_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_CONJUNCTION_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/conditional.h>
@@ -62,4 +62,4 @@ inline constexpr bool conjunction_v = conjunction<_Args...>::value;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_CONJUNCTION_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_CONJUNCTION_H
diff --git a/libcxx/include/__cxx03/__type_traits/copy_cv.h b/libcxx/include/__cxx03/__type_traits/copy_cv.h
index 1ebda47a18bbe8..46913594d6860d 100644
--- a/libcxx/include/__cxx03/__type_traits/copy_cv.h
+++ b/libcxx/include/__cxx03/__type_traits/copy_cv.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_COPY_CV_H
-#define _LIBCPP___TYPE_TRAITS_COPY_CV_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_COPY_CV_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_COPY_CV_H
#include <__cxx03/__config>
@@ -48,4 +48,4 @@ using __copy_cv_t = typename __copy_cv<_From>::template __apply<_To>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_COPY_CV_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_COPY_CV_H
diff --git a/libcxx/include/__cxx03/__type_traits/copy_cvref.h b/libcxx/include/__cxx03/__type_traits/copy_cvref.h
index d852bcd3b99c0a..f2bb2be9c0a33e 100644
--- a/libcxx/include/__cxx03/__type_traits/copy_cvref.h
+++ b/libcxx/include/__cxx03/__type_traits/copy_cvref.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_COPY_CVREF_H
-#define _LIBCPP___TYPE_TRAITS_COPY_CVREF_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_COPY_CVREF_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_COPY_CVREF_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/add_lvalue_reference.h>
@@ -40,4 +40,4 @@ using __copy_cvref_t = typename __copy_cvref<_From, _To>::type;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_COPY_CVREF_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_COPY_CVREF_H
diff --git a/libcxx/include/__cxx03/__type_traits/datasizeof.h b/libcxx/include/__cxx03/__type_traits/datasizeof.h
index 7dd87e162d3414..d428856d13a664 100644
--- a/libcxx/include/__cxx03/__type_traits/datasizeof.h
+++ b/libcxx/include/__cxx03/__type_traits/datasizeof.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_DATASIZEOF_H
-#define _LIBCPP___TYPE_TRAITS_DATASIZEOF_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_DATASIZEOF_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_DATASIZEOF_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_class.h>
@@ -62,4 +62,4 @@ _LIBCPP_DIAGNOSTIC_POP
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_DATASIZEOF_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_DATASIZEOF_H
diff --git a/libcxx/include/__cxx03/__type_traits/decay.h b/libcxx/include/__cxx03/__type_traits/decay.h
index 3563543a309121..bf745a89a1d0f6 100644
--- a/libcxx/include/__cxx03/__type_traits/decay.h
+++ b/libcxx/include/__cxx03/__type_traits/decay.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_DECAY_H
-#define _LIBCPP___TYPE_TRAITS_DECAY_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_DECAY_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_DECAY_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/add_pointer.h>
@@ -70,4 +70,4 @@ using decay_t = __decay_t<_Tp>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_DECAY_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_DECAY_H
diff --git a/libcxx/include/__cxx03/__type_traits/dependent_type.h b/libcxx/include/__cxx03/__type_traits/dependent_type.h
index fed130a8f101a6..60ce814ca6b0d3 100644
--- a/libcxx/include/__cxx03/__type_traits/dependent_type.h
+++ b/libcxx/include/__cxx03/__type_traits/dependent_type.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_DEPENDENT_TYPE_H
-#define _LIBCPP___TYPE_TRAITS_DEPENDENT_TYPE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_DEPENDENT_TYPE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_DEPENDENT_TYPE_H
#include <__cxx03/__config>
@@ -22,4 +22,4 @@ struct _LIBCPP_TEMPLATE_VIS __dependent_type : public _Tp {};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_DEPENDENT_TYPE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_DEPENDENT_TYPE_H
diff --git a/libcxx/include/__cxx03/__type_traits/desugars_to.h b/libcxx/include/__cxx03/__type_traits/desugars_to.h
index e16fb59007fe98..eb2dfefd86e2c0 100644
--- a/libcxx/include/__cxx03/__type_traits/desugars_to.h
+++ b/libcxx/include/__cxx03/__type_traits/desugars_to.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_DESUGARS_TO_H
-#define _LIBCPP___TYPE_TRAITS_DESUGARS_TO_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_DESUGARS_TO_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_DESUGARS_TO_H
#include <__cxx03/__config>
@@ -37,4 +37,4 @@ inline const bool __desugars_to_v = false;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_DESUGARS_TO_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_DESUGARS_TO_H
diff --git a/libcxx/include/__cxx03/__type_traits/disjunction.h b/libcxx/include/__cxx03/__type_traits/disjunction.h
index 717a439669e1d7..0ff8218e74196d 100644
--- a/libcxx/include/__cxx03/__type_traits/disjunction.h
+++ b/libcxx/include/__cxx03/__type_traits/disjunction.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_DISJUNCTION_H
-#define _LIBCPP___TYPE_TRAITS_DISJUNCTION_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_DISJUNCTION_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_DISJUNCTION_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -55,4 +55,4 @@ inline constexpr bool disjunction_v = _Or<_Args...>::value;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_DISJUNCTION_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_DISJUNCTION_H
diff --git a/libcxx/include/__cxx03/__type_traits/enable_if.h b/libcxx/include/__cxx03/__type_traits/enable_if.h
index d21c1301e0a2e7..042ad139725dc9 100644
--- a/libcxx/include/__cxx03/__type_traits/enable_if.h
+++ b/libcxx/include/__cxx03/__type_traits/enable_if.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_ENABLE_IF_H
-#define _LIBCPP___TYPE_TRAITS_ENABLE_IF_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_ENABLE_IF_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_ENABLE_IF_H
#include <__cxx03/__config>
@@ -34,4 +34,4 @@ using enable_if_t = typename enable_if<_Bp, _Tp>::type;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_ENABLE_IF_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_ENABLE_IF_H
diff --git a/libcxx/include/__cxx03/__type_traits/extent.h b/libcxx/include/__cxx03/__type_traits/extent.h
index d29fef59a5a9e6..4d7dd839876832 100644
--- a/libcxx/include/__cxx03/__type_traits/extent.h
+++ b/libcxx/include/__cxx03/__type_traits/extent.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_EXTENT_H
-#define _LIBCPP___TYPE_TRAITS_EXTENT_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_EXTENT_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_EXTENT_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -51,4 +51,4 @@ inline constexpr size_t extent_v = extent<_Tp, _Ip>::value;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_EXTENT_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_EXTENT_H
diff --git a/libcxx/include/__cxx03/__type_traits/has_unique_object_representation.h b/libcxx/include/__cxx03/__type_traits/has_unique_object_representation.h
index 4a507fe7fcac8c..8abd31973d9d24 100644
--- a/libcxx/include/__cxx03/__type_traits/has_unique_object_representation.h
+++ b/libcxx/include/__cxx03/__type_traits/has_unique_object_representation.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_HAS_UNIQUE_OBJECT_REPRESENTATION_H
-#define _LIBCPP___TYPE_TRAITS_HAS_UNIQUE_OBJECT_REPRESENTATION_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_HAS_UNIQUE_OBJECT_REPRESENTATION_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_HAS_UNIQUE_OBJECT_REPRESENTATION_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -37,4 +37,4 @@ inline constexpr bool has_unique_object_representations_v = __has_unique_object_
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_HAS_UNIQUE_OBJECT_REPRESENTATION_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_HAS_UNIQUE_OBJECT_REPRESENTATION_H
diff --git a/libcxx/include/__cxx03/__type_traits/has_virtual_destructor.h b/libcxx/include/__cxx03/__type_traits/has_virtual_destructor.h
index 060bd1bfe58c83..58740ce91ba1f5 100644
--- a/libcxx/include/__cxx03/__type_traits/has_virtual_destructor.h
+++ b/libcxx/include/__cxx03/__type_traits/has_virtual_destructor.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_HAS_VIRTUAL_DESTRUCTOR_H
-#define _LIBCPP___TYPE_TRAITS_HAS_VIRTUAL_DESTRUCTOR_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_HAS_VIRTUAL_DESTRUCTOR_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_HAS_VIRTUAL_DESTRUCTOR_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ inline constexpr bool has_virtual_destructor_v = __has_virtual_destructor(_Tp);
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_HAS_VIRTUAL_DESTRUCTOR_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_HAS_VIRTUAL_DESTRUCTOR_H
diff --git a/libcxx/include/__cxx03/__type_traits/integral_constant.h b/libcxx/include/__cxx03/__type_traits/integral_constant.h
index bfc11c8a451639..197453747e547a 100644
--- a/libcxx/include/__cxx03/__type_traits/integral_constant.h
+++ b/libcxx/include/__cxx03/__type_traits/integral_constant.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_INTEGRAL_CONSTANT_H
-#define _LIBCPP___TYPE_TRAITS_INTEGRAL_CONSTANT_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_INTEGRAL_CONSTANT_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_INTEGRAL_CONSTANT_H
#include <__cxx03/__config>
@@ -44,4 +44,4 @@ using bool_constant = integral_constant<bool, __b>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_INTEGRAL_CONSTANT_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_INTEGRAL_CONSTANT_H
diff --git a/libcxx/include/__cxx03/__type_traits/invoke.h b/libcxx/include/__cxx03/__type_traits/invoke.h
index 9ece1c87496293..47220d6c2e6299 100644
--- a/libcxx/include/__cxx03/__type_traits/invoke.h
+++ b/libcxx/include/__cxx03/__type_traits/invoke.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_INVOKE_H
-#define _LIBCPP___TYPE_TRAITS_INVOKE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_INVOKE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_INVOKE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/conditional.h>
@@ -267,4 +267,4 @@ using invoke_result_t = typename invoke_result<_Fn, _Args...>::type;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_INVOKE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_INVOKE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_abstract.h b/libcxx/include/__cxx03/__type_traits/is_abstract.h
index 785ae6772f710a..a98d2b350ba29e 100644
--- a/libcxx/include/__cxx03/__type_traits/is_abstract.h
+++ b/libcxx/include/__cxx03/__type_traits/is_abstract.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_ABSTRACT_H
-#define _LIBCPP___TYPE_TRAITS_IS_ABSTRACT_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_ABSTRACT_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_ABSTRACT_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ inline constexpr bool is_abstract_v = __is_abstract(_Tp);
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_ABSTRACT_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_ABSTRACT_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_aggregate.h b/libcxx/include/__cxx03/__type_traits/is_aggregate.h
index 3da7efa0ce6403..0d95780859ca8e 100644
--- a/libcxx/include/__cxx03/__type_traits/is_aggregate.h
+++ b/libcxx/include/__cxx03/__type_traits/is_aggregate.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_AGGREGATE_H
-#define _LIBCPP___TYPE_TRAITS_IS_AGGREGATE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_AGGREGATE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_AGGREGATE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -30,4 +30,4 @@ inline constexpr bool is_aggregate_v = __is_aggregate(_Tp);
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_AGGREGATE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_AGGREGATE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_allocator.h b/libcxx/include/__cxx03/__type_traits/is_allocator.h
index 1b063e84e545f1..b2b73ec53fe2be 100644
--- a/libcxx/include/__cxx03/__type_traits/is_allocator.h
+++ b/libcxx/include/__cxx03/__type_traits/is_allocator.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_IS_ALLOCATOR_H
-#define _LIBCPP___TYPE_IS_ALLOCATOR_H
+#ifndef _LIBCPP___CXX03___TYPE_IS_ALLOCATOR_H
+#define _LIBCPP___CXX03___TYPE_IS_ALLOCATOR_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -31,4 +31,4 @@ struct __is_allocator<_Alloc,
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_IS_ALLOCATOR_H
+#endif // _LIBCPP___CXX03___TYPE_IS_ALLOCATOR_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_always_bitcastable.h b/libcxx/include/__cxx03/__type_traits/is_always_bitcastable.h
index 6f5b6631ba40fc..8fb9e519d03ead 100644
--- a/libcxx/include/__cxx03/__type_traits/is_always_bitcastable.h
+++ b/libcxx/include/__cxx03/__type_traits/is_always_bitcastable.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_ALWAYS_BITCASTABLE_H
-#define _LIBCPP___TYPE_TRAITS_IS_ALWAYS_BITCASTABLE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_ALWAYS_BITCASTABLE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_ALWAYS_BITCASTABLE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -82,4 +82,4 @@ struct __is_always_bitcastable {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_ALWAYS_BITCASTABLE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_ALWAYS_BITCASTABLE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_arithmetic.h b/libcxx/include/__cxx03/__type_traits/is_arithmetic.h
index 900a5b5b4176de..8d1e019ce402d8 100644
--- a/libcxx/include/__cxx03/__type_traits/is_arithmetic.h
+++ b/libcxx/include/__cxx03/__type_traits/is_arithmetic.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_ARITHMETIC_H
-#define _LIBCPP___TYPE_TRAITS_IS_ARITHMETIC_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_ARITHMETIC_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_ARITHMETIC_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -31,4 +31,4 @@ inline constexpr bool is_arithmetic_v = is_arithmetic<_Tp>::value;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_ARITHMETIC_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_ARITHMETIC_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_array.h b/libcxx/include/__cxx03/__type_traits/is_array.h
index d4276ed61a4f6b..a8dd572ffedece 100644
--- a/libcxx/include/__cxx03/__type_traits/is_array.h
+++ b/libcxx/include/__cxx03/__type_traits/is_array.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_ARRAY_H
-#define _LIBCPP___TYPE_TRAITS_IS_ARRAY_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_ARRAY_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_ARRAY_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -48,4 +48,4 @@ inline constexpr bool is_array_v = is_array<_Tp>::value;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_ARRAY_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_ARRAY_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_assignable.h b/libcxx/include/__cxx03/__type_traits/is_assignable.h
index ba1d5d1afcdd1d..6a7364ca6eacdf 100644
--- a/libcxx/include/__cxx03/__type_traits/is_assignable.h
+++ b/libcxx/include/__cxx03/__type_traits/is_assignable.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_ASSIGNABLE_H
-#define _LIBCPP___TYPE_TRAITS_IS_ASSIGNABLE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_ASSIGNABLE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_ASSIGNABLE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/add_lvalue_reference.h>
@@ -49,4 +49,4 @@ inline constexpr bool is_move_assignable_v = is_move_assignable<_Tp>::value;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_ASSIGNABLE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_ASSIGNABLE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_base_of.h b/libcxx/include/__cxx03/__type_traits/is_base_of.h
index 0a31bfaa741279..67f72731903c0f 100644
--- a/libcxx/include/__cxx03/__type_traits/is_base_of.h
+++ b/libcxx/include/__cxx03/__type_traits/is_base_of.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_BASE_OF_H
-#define _LIBCPP___TYPE_TRAITS_IS_BASE_OF_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_BASE_OF_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_BASE_OF_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ inline constexpr bool is_base_of_v = __is_base_of(_Bp, _Dp);
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_BASE_OF_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_BASE_OF_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_bounded_array.h b/libcxx/include/__cxx03/__type_traits/is_bounded_array.h
index aeb22355628381..b4b3aabec381bd 100644
--- a/libcxx/include/__cxx03/__type_traits/is_bounded_array.h
+++ b/libcxx/include/__cxx03/__type_traits/is_bounded_array.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_BOUNDED_ARRAY_H
-#define _LIBCPP___TYPE_TRAITS_IS_BOUNDED_ARRAY_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_BOUNDED_ARRAY_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_BOUNDED_ARRAY_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -38,4 +38,4 @@ inline constexpr bool is_bounded_array_v = is_bounded_array<_Tp>::value;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_BOUNDED_ARRAY_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_BOUNDED_ARRAY_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_callable.h b/libcxx/include/__cxx03/__type_traits/is_callable.h
index 4956d26b047fae..f4f20348416ceb 100644
--- a/libcxx/include/__cxx03/__type_traits/is_callable.h
+++ b/libcxx/include/__cxx03/__type_traits/is_callable.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_CALLABLE_H
-#define _LIBCPP___TYPE_TRAITS_IS_CALLABLE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_CALLABLE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_CALLABLE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -29,4 +29,4 @@ struct __is_callable : decltype(std::__is_callable_helper<_Func, _Args...>(0)) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_CALLABLE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_CALLABLE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_char_like_type.h b/libcxx/include/__cxx03/__type_traits/is_char_like_type.h
index 2896a5794301db..e252b6ad188794 100644
--- a/libcxx/include/__cxx03/__type_traits/is_char_like_type.h
+++ b/libcxx/include/__cxx03/__type_traits/is_char_like_type.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_CHAR_LIKE_TYPE_H
-#define _LIBCPP___TYPE_TRAITS_IS_CHAR_LIKE_TYPE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_CHAR_LIKE_TYPE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_CHAR_LIKE_TYPE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/conjunction.h>
@@ -25,4 +25,4 @@ using _IsCharLikeType = _And<is_standard_layout<_CharT>, is_trivial<_CharT> >;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_CHAR_LIKE_TYPE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_CHAR_LIKE_TYPE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_class.h b/libcxx/include/__cxx03/__type_traits/is_class.h
index c56f3679ecb35e..7109198cf65984 100644
--- a/libcxx/include/__cxx03/__type_traits/is_class.h
+++ b/libcxx/include/__cxx03/__type_traits/is_class.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_CLASS_H
-#define _LIBCPP___TYPE_TRAITS_IS_CLASS_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_CLASS_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_CLASS_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ inline constexpr bool is_class_v = __is_class(_Tp);
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_CLASS_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_CLASS_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_compound.h b/libcxx/include/__cxx03/__type_traits/is_compound.h
index c48c88643c8e1b..4a96a71a2f965e 100644
--- a/libcxx/include/__cxx03/__type_traits/is_compound.h
+++ b/libcxx/include/__cxx03/__type_traits/is_compound.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_COMPOUND_H
-#define _LIBCPP___TYPE_TRAITS_IS_COMPOUND_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_COMPOUND_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_COMPOUND_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -43,4 +43,4 @@ inline constexpr bool is_compound_v = is_compound<_Tp>::value;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_COMPOUND_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_COMPOUND_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_const.h b/libcxx/include/__cxx03/__type_traits/is_const.h
index 2b297ad472bd5a..ebd91c5f07c1d4 100644
--- a/libcxx/include/__cxx03/__type_traits/is_const.h
+++ b/libcxx/include/__cxx03/__type_traits/is_const.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_CONST_H
-#define _LIBCPP___TYPE_TRAITS_IS_CONST_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_CONST_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_CONST_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -44,4 +44,4 @@ inline constexpr bool is_const_v = is_const<_Tp>::value;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_CONST_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_CONST_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_constant_evaluated.h b/libcxx/include/__cxx03/__type_traits/is_constant_evaluated.h
index 9abd5ee9ce41a8..99ebef6664ed9d 100644
--- a/libcxx/include/__cxx03/__type_traits/is_constant_evaluated.h
+++ b/libcxx/include/__cxx03/__type_traits/is_constant_evaluated.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_CONSTANT_EVALUATED_H
-#define _LIBCPP___TYPE_TRAITS_IS_CONSTANT_EVALUATED_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_CONSTANT_EVALUATED_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_CONSTANT_EVALUATED_H
#include <__cxx03/__config>
@@ -29,4 +29,4 @@ _LIBCPP_HIDE_FROM_ABI inline _LIBCPP_CONSTEXPR bool __libcpp_is_constant_evaluat
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_CONSTANT_EVALUATED_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_CONSTANT_EVALUATED_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_constructible.h b/libcxx/include/__cxx03/__type_traits/is_constructible.h
index 18c58311ed033f..435b0fcefea8aa 100644
--- a/libcxx/include/__cxx03/__type_traits/is_constructible.h
+++ b/libcxx/include/__cxx03/__type_traits/is_constructible.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_IS_CONSTRUCTIBLE_H
-#define _LIBCPP___TYPE_IS_CONSTRUCTIBLE_H
+#ifndef _LIBCPP___CXX03___TYPE_IS_CONSTRUCTIBLE_H
+#define _LIBCPP___CXX03___TYPE_IS_CONSTRUCTIBLE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/add_lvalue_reference.h>
@@ -56,4 +56,4 @@ inline constexpr bool is_default_constructible_v = __is_constructible(_Tp);
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_IS_CONSTRUCTIBLE_H
+#endif // _LIBCPP___CXX03___TYPE_IS_CONSTRUCTIBLE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_convertible.h b/libcxx/include/__cxx03/__type_traits/is_convertible.h
index a2b2630f109be6..4692b0f4ac5f41 100644
--- a/libcxx/include/__cxx03/__type_traits/is_convertible.h
+++ b/libcxx/include/__cxx03/__type_traits/is_convertible.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_CONVERTIBLE_H
-#define _LIBCPP___TYPE_TRAITS_IS_CONVERTIBLE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_CONVERTIBLE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_CONVERTIBLE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ inline constexpr bool is_convertible_v = __is_convertible(_From, _To);
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_CONVERTIBLE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_CONVERTIBLE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_core_convertible.h b/libcxx/include/__cxx03/__type_traits/is_core_convertible.h
index 8088dfb7d95897..97db84044fe614 100644
--- a/libcxx/include/__cxx03/__type_traits/is_core_convertible.h
+++ b/libcxx/include/__cxx03/__type_traits/is_core_convertible.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_CORE_CONVERTIBLE_H
-#define _LIBCPP___TYPE_TRAITS_IS_CORE_CONVERTIBLE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_CORE_CONVERTIBLE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_CORE_CONVERTIBLE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -32,4 +32,4 @@ struct __is_core_convertible<_Tp, _Up, decltype(static_cast<void (*)(_Up)>(0)(st
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_CORE_CONVERTIBLE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_CORE_CONVERTIBLE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_destructible.h b/libcxx/include/__cxx03/__type_traits/is_destructible.h
index ce94e8c27f1959..c2565050151c42 100644
--- a/libcxx/include/__cxx03/__type_traits/is_destructible.h
+++ b/libcxx/include/__cxx03/__type_traits/is_destructible.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_DESTRUCTIBLE_H
-#define _LIBCPP___TYPE_TRAITS_IS_DESTRUCTIBLE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_DESTRUCTIBLE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_DESTRUCTIBLE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -94,4 +94,4 @@ inline constexpr bool is_destructible_v = is_destructible<_Tp>::value;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_DESTRUCTIBLE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_DESTRUCTIBLE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_empty.h b/libcxx/include/__cxx03/__type_traits/is_empty.h
index 89cb681712d310..767b155aa626b4 100644
--- a/libcxx/include/__cxx03/__type_traits/is_empty.h
+++ b/libcxx/include/__cxx03/__type_traits/is_empty.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_EMPTY_H
-#define _LIBCPP___TYPE_TRAITS_IS_EMPTY_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_EMPTY_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_EMPTY_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ inline constexpr bool is_empty_v = __is_empty(_Tp);
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_EMPTY_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_EMPTY_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_enum.h b/libcxx/include/__cxx03/__type_traits/is_enum.h
index da08f569586d6b..54efb15b0d01eb 100644
--- a/libcxx/include/__cxx03/__type_traits/is_enum.h
+++ b/libcxx/include/__cxx03/__type_traits/is_enum.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_ENUM_H
-#define _LIBCPP___TYPE_TRAITS_IS_ENUM_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_ENUM_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_ENUM_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -38,4 +38,4 @@ inline constexpr bool is_scoped_enum_v = __is_scoped_enum(_Tp);
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_ENUM_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_ENUM_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_equality_comparable.h b/libcxx/include/__cxx03/__type_traits/is_equality_comparable.h
index 79484826941322..da62137eaab5c3 100644
--- a/libcxx/include/__cxx03/__type_traits/is_equality_comparable.h
+++ b/libcxx/include/__cxx03/__type_traits/is_equality_comparable.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_EQUALITY_COMPARABLE_H
-#define _LIBCPP___TYPE_TRAITS_IS_EQUALITY_COMPARABLE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_EQUALITY_COMPARABLE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_EQUALITY_COMPARABLE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -85,4 +85,4 @@ using __libcpp_is_trivially_equality_comparable =
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_EQUALITY_COMPARABLE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_EQUALITY_COMPARABLE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_execution_policy.h b/libcxx/include/__cxx03/__type_traits/is_execution_policy.h
index d0da5bb45a70f6..08bf8b00d97ea9 100644
--- a/libcxx/include/__cxx03/__type_traits/is_execution_policy.h
+++ b/libcxx/include/__cxx03/__type_traits/is_execution_policy.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_EXECUTION_POLICY_H
-#define _LIBCPP___TYPE_TRAITS_IS_EXECUTION_POLICY_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_EXECUTION_POLICY_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_EXECUTION_POLICY_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/remove_cvref.h>
@@ -56,4 +56,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 17
-#endif // _LIBCPP___TYPE_TRAITS_IS_EXECUTION_POLICY_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_EXECUTION_POLICY_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_final.h b/libcxx/include/__cxx03/__type_traits/is_final.h
index b55fadce9efce2..c6e5ad0893a0e7 100644
--- a/libcxx/include/__cxx03/__type_traits/is_final.h
+++ b/libcxx/include/__cxx03/__type_traits/is_final.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_FINAL_H
-#define _LIBCPP___TYPE_TRAITS_IS_FINAL_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_FINAL_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_FINAL_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -33,4 +33,4 @@ inline constexpr bool is_final_v = __is_final(_Tp);
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_FINAL_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_FINAL_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_floating_point.h b/libcxx/include/__cxx03/__type_traits/is_floating_point.h
index 99898272651c4e..6b25659c9ee260 100644
--- a/libcxx/include/__cxx03/__type_traits/is_floating_point.h
+++ b/libcxx/include/__cxx03/__type_traits/is_floating_point.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_FLOATING_POINT_H
-#define _LIBCPP___TYPE_TRAITS_IS_FLOATING_POINT_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_FLOATING_POINT_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_FLOATING_POINT_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -36,4 +36,4 @@ inline constexpr bool is_floating_point_v = is_floating_point<_Tp>::value;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_FLOATING_POINT_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_FLOATING_POINT_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_function.h b/libcxx/include/__cxx03/__type_traits/is_function.h
index 0337dfac18c680..3001c4bef9f546 100644
--- a/libcxx/include/__cxx03/__type_traits/is_function.h
+++ b/libcxx/include/__cxx03/__type_traits/is_function.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_FUNCTIONAL_H
-#define _LIBCPP___TYPE_TRAITS_IS_FUNCTIONAL_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_FUNCTIONAL_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_FUNCTIONAL_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ inline constexpr bool is_function_v = __is_function(_Tp);
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_FUNCTIONAL_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_FUNCTIONAL_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_fundamental.h b/libcxx/include/__cxx03/__type_traits/is_fundamental.h
index cc57ac7b01948c..329325ecca4bd4 100644
--- a/libcxx/include/__cxx03/__type_traits/is_fundamental.h
+++ b/libcxx/include/__cxx03/__type_traits/is_fundamental.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_FUNDAMENTAL_H
-#define _LIBCPP___TYPE_TRAITS_IS_FUNDAMENTAL_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_FUNDAMENTAL_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_FUNDAMENTAL_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -45,4 +45,4 @@ inline constexpr bool is_fundamental_v = is_fundamental<_Tp>::value;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_FUNDAMENTAL_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_FUNDAMENTAL_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_implicitly_default_constructible.h b/libcxx/include/__cxx03/__type_traits/is_implicitly_default_constructible.h
index b9bf0523d937cc..23f1443e408f99 100644
--- a/libcxx/include/__cxx03/__type_traits/is_implicitly_default_constructible.h
+++ b/libcxx/include/__cxx03/__type_traits/is_implicitly_default_constructible.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_IMPLICITLY_DEFAULT_CONSTRUCTIBLE_H
-#define _LIBCPP___TYPE_TRAITS_IS_IMPLICITLY_DEFAULT_CONSTRUCTIBLE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_IMPLICITLY_DEFAULT_CONSTRUCTIBLE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_IMPLICITLY_DEFAULT_CONSTRUCTIBLE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -43,4 +43,4 @@ struct __is_implicitly_default_constructible<_Tp,
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_IMPLICITLY_DEFAULT_CONSTRUCTIBLE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_IMPLICITLY_DEFAULT_CONSTRUCTIBLE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_integral.h b/libcxx/include/__cxx03/__type_traits/is_integral.h
index 680875c0e737da..1adcdcbce63e93 100644
--- a/libcxx/include/__cxx03/__type_traits/is_integral.h
+++ b/libcxx/include/__cxx03/__type_traits/is_integral.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_INTEGRAL_H
-#define _LIBCPP___TYPE_TRAITS_IS_INTEGRAL_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_INTEGRAL_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_INTEGRAL_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -71,4 +71,4 @@ inline constexpr bool is_integral_v = is_integral<_Tp>::value;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_INTEGRAL_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_INTEGRAL_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_literal_type.h b/libcxx/include/__cxx03/__type_traits/is_literal_type.h
index ad7ad3f2eb3cf4..6d0c9a6d6c30a2 100644
--- a/libcxx/include/__cxx03/__type_traits/is_literal_type.h
+++ b/libcxx/include/__cxx03/__type_traits/is_literal_type.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_LITERAL_TYPE
-#define _LIBCPP___TYPE_TRAITS_IS_LITERAL_TYPE
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_LITERAL_TYPE
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_LITERAL_TYPE
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -31,4 +31,4 @@ _LIBCPP_DEPRECATED_IN_CXX17 inline constexpr bool is_literal_type_v = __is_liter
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_LITERAL_TYPE
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_LITERAL_TYPE
diff --git a/libcxx/include/__cxx03/__type_traits/is_member_pointer.h b/libcxx/include/__cxx03/__type_traits/is_member_pointer.h
index 0eba57ddb827c9..334b794f879a14 100644
--- a/libcxx/include/__cxx03/__type_traits/is_member_pointer.h
+++ b/libcxx/include/__cxx03/__type_traits/is_member_pointer.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_MEMBER_POINTER_H
-#define _LIBCPP___TYPE_TRAITS_IS_MEMBER_POINTER_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_MEMBER_POINTER_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_MEMBER_POINTER_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -40,4 +40,4 @@ inline constexpr bool is_member_function_pointer_v = __is_member_function_pointe
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_MEMBER_POINTER_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_MEMBER_POINTER_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_nothrow_assignable.h b/libcxx/include/__cxx03/__type_traits/is_nothrow_assignable.h
index adf9be8e025185..64b525e254e1ff 100644
--- a/libcxx/include/__cxx03/__type_traits/is_nothrow_assignable.h
+++ b/libcxx/include/__cxx03/__type_traits/is_nothrow_assignable.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_NOTHROW_ASSIGNABLE_H
-#define _LIBCPP___TYPE_TRAITS_IS_NOTHROW_ASSIGNABLE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_NOTHROW_ASSIGNABLE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_NOTHROW_ASSIGNABLE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/add_lvalue_reference.h>
@@ -53,4 +53,4 @@ inline constexpr bool is_nothrow_move_assignable_v = is_nothrow_move_assignable<
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_NOTHROW_ASSIGNABLE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_NOTHROW_ASSIGNABLE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_nothrow_constructible.h b/libcxx/include/__cxx03/__type_traits/is_nothrow_constructible.h
index bbf0220c571535..b528cc7b491d78 100644
--- a/libcxx/include/__cxx03/__type_traits/is_nothrow_constructible.h
+++ b/libcxx/include/__cxx03/__type_traits/is_nothrow_constructible.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_NOTHROW_CONSTRUCTIBLE_H
-#define _LIBCPP___TYPE_TRAITS_IS_NOTHROW_CONSTRUCTIBLE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_NOTHROW_CONSTRUCTIBLE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_NOTHROW_CONSTRUCTIBLE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/add_lvalue_reference.h>
@@ -58,4 +58,4 @@ inline constexpr bool is_nothrow_default_constructible_v = __is_nothrow_construc
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_NOTHROW_CONSTRUCTIBLE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_NOTHROW_CONSTRUCTIBLE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_nothrow_convertible.h b/libcxx/include/__cxx03/__type_traits/is_nothrow_convertible.h
index b94727fce49e10..c62e6ccaf9fa1f 100644
--- a/libcxx/include/__cxx03/__type_traits/is_nothrow_convertible.h
+++ b/libcxx/include/__cxx03/__type_traits/is_nothrow_convertible.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_NOTHROW_CONVERTIBLE_H
-#define _LIBCPP___TYPE_TRAITS_IS_NOTHROW_CONVERTIBLE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_NOTHROW_CONVERTIBLE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_NOTHROW_CONVERTIBLE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/conjunction.h>
@@ -59,4 +59,4 @@ inline constexpr bool is_nothrow_convertible_v = is_nothrow_convertible<_Fm, _To
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_NOTHROW_CONVERTIBLE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_NOTHROW_CONVERTIBLE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_nothrow_destructible.h b/libcxx/include/__cxx03/__type_traits/is_nothrow_destructible.h
index b84523f40b430e..23a28c9bb1da0a 100644
--- a/libcxx/include/__cxx03/__type_traits/is_nothrow_destructible.h
+++ b/libcxx/include/__cxx03/__type_traits/is_nothrow_destructible.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_NOTHROW_DESTRUCTIBLE_H
-#define _LIBCPP___TYPE_TRAITS_IS_NOTHROW_DESTRUCTIBLE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_NOTHROW_DESTRUCTIBLE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_NOTHROW_DESTRUCTIBLE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -60,4 +60,4 @@ inline constexpr bool is_nothrow_destructible_v = is_nothrow_destructible<_Tp>::
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_NOTHROW_DESTRUCTIBLE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_NOTHROW_DESTRUCTIBLE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_null_pointer.h b/libcxx/include/__cxx03/__type_traits/is_null_pointer.h
index 9c605450638c36..acbf0c16a96438 100644
--- a/libcxx/include/__cxx03/__type_traits/is_null_pointer.h
+++ b/libcxx/include/__cxx03/__type_traits/is_null_pointer.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_NULL_POINTER_H
-#define _LIBCPP___TYPE_TRAITS_IS_NULL_POINTER_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_NULL_POINTER_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_NULL_POINTER_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -34,4 +34,4 @@ inline constexpr bool is_null_pointer_v = __is_null_pointer_v<_Tp>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_NULL_POINTER_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_NULL_POINTER_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_object.h b/libcxx/include/__cxx03/__type_traits/is_object.h
index c61c67dc512487..09d893d11220cc 100644
--- a/libcxx/include/__cxx03/__type_traits/is_object.h
+++ b/libcxx/include/__cxx03/__type_traits/is_object.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_OBJECT_H
-#define _LIBCPP___TYPE_TRAITS_IS_OBJECT_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_OBJECT_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_OBJECT_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ inline constexpr bool is_object_v = __is_object(_Tp);
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_OBJECT_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_OBJECT_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_pod.h b/libcxx/include/__cxx03/__type_traits/is_pod.h
index 3381a61657841b..4b4e9cc3eb19fe 100644
--- a/libcxx/include/__cxx03/__type_traits/is_pod.h
+++ b/libcxx/include/__cxx03/__type_traits/is_pod.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_POD_H
-#define _LIBCPP___TYPE_TRAITS_IS_POD_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_POD_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_POD_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ inline constexpr bool is_pod_v = __is_pod(_Tp);
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_POD_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_POD_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_pointer.h b/libcxx/include/__cxx03/__type_traits/is_pointer.h
index 7afce1a07f2818..8ce14219214995 100644
--- a/libcxx/include/__cxx03/__type_traits/is_pointer.h
+++ b/libcxx/include/__cxx03/__type_traits/is_pointer.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_POINTER_H
-#define _LIBCPP___TYPE_TRAITS_IS_POINTER_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_POINTER_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_POINTER_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -62,4 +62,4 @@ inline constexpr bool is_pointer_v = is_pointer<_Tp>::value;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_POINTER_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_POINTER_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_polymorphic.h b/libcxx/include/__cxx03/__type_traits/is_polymorphic.h
index 577cfdbbf32c76..206abd871915fb 100644
--- a/libcxx/include/__cxx03/__type_traits/is_polymorphic.h
+++ b/libcxx/include/__cxx03/__type_traits/is_polymorphic.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_POLYMORPHIC_H
-#define _LIBCPP___TYPE_TRAITS_IS_POLYMORPHIC_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_POLYMORPHIC_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_POLYMORPHIC_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ inline constexpr bool is_polymorphic_v = __is_polymorphic(_Tp);
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_POLYMORPHIC_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_POLYMORPHIC_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_primary_template.h b/libcxx/include/__cxx03/__type_traits/is_primary_template.h
index 021cd9744471a5..92cd5596fea3cd 100644
--- a/libcxx/include/__cxx03/__type_traits/is_primary_template.h
+++ b/libcxx/include/__cxx03/__type_traits/is_primary_template.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_PRIMARY_TEMPLATE_H
-#define _LIBCPP___TYPE_TRAITS_IS_PRIMARY_TEMPLATE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_PRIMARY_TEMPLATE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_PRIMARY_TEMPLATE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -28,4 +28,4 @@ using __is_primary_template = _IsValidExpansion<__test_for_primary_template, _Tp
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_PRIMARY_TEMPLATE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_PRIMARY_TEMPLATE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_reference.h b/libcxx/include/__cxx03/__type_traits/is_reference.h
index cca4d1ccdac4bb..72bdf1418f2f37 100644
--- a/libcxx/include/__cxx03/__type_traits/is_reference.h
+++ b/libcxx/include/__cxx03/__type_traits/is_reference.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_REFERENCE_H
-#define _LIBCPP___TYPE_TRAITS_IS_REFERENCE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_REFERENCE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_REFERENCE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -65,4 +65,4 @@ inline constexpr bool is_rvalue_reference_v = is_rvalue_reference<_Tp>::value;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_REFERENCE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_REFERENCE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_reference_wrapper.h b/libcxx/include/__cxx03/__type_traits/is_reference_wrapper.h
index e3f06df8040052..3cbce8faa91108 100644
--- a/libcxx/include/__cxx03/__type_traits/is_reference_wrapper.h
+++ b/libcxx/include/__cxx03/__type_traits/is_reference_wrapper.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_REFERENCE_WRAPPER_H
-#define _LIBCPP___TYPE_TRAITS_IS_REFERENCE_WRAPPER_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_REFERENCE_WRAPPER_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_REFERENCE_WRAPPER_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/functional.h>
@@ -29,4 +29,4 @@ struct __is_reference_wrapper : public __is_reference_wrapper_impl<__remove_cv_t
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_ENABLE_IF_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_ENABLE_IF_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_referenceable.h b/libcxx/include/__cxx03/__type_traits/is_referenceable.h
index 13ef875538488e..7bc98e8858001c 100644
--- a/libcxx/include/__cxx03/__type_traits/is_referenceable.h
+++ b/libcxx/include/__cxx03/__type_traits/is_referenceable.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_REFERENCEABLE_H
-#define _LIBCPP___TYPE_TRAITS_IS_REFERENCEABLE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_REFERENCEABLE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_REFERENCEABLE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -38,4 +38,4 @@ struct __libcpp_is_referenceable
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_REFERENCEABLE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_REFERENCEABLE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_same.h b/libcxx/include/__cxx03/__type_traits/is_same.h
index 29ff5116e8e891..d365e1235e7c6f 100644
--- a/libcxx/include/__cxx03/__type_traits/is_same.h
+++ b/libcxx/include/__cxx03/__type_traits/is_same.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_SAME_H
-#define _LIBCPP___TYPE_TRAITS_IS_SAME_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_SAME_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_SAME_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -41,4 +41,4 @@ using _IsNotSame = _BoolConstant<!__is_same(_Tp, _Up)>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_SAME_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_SAME_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_scalar.h b/libcxx/include/__cxx03/__type_traits/is_scalar.h
index 49d793ad06e71d..b12e045f053a4b 100644
--- a/libcxx/include/__cxx03/__type_traits/is_scalar.h
+++ b/libcxx/include/__cxx03/__type_traits/is_scalar.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_SCALAR_H
-#define _LIBCPP___TYPE_TRAITS_IS_SCALAR_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_SCALAR_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_SCALAR_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -66,4 +66,4 @@ inline constexpr bool is_scalar_v = is_scalar<_Tp>::value;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_SCALAR_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_SCALAR_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_signed.h b/libcxx/include/__cxx03/__type_traits/is_signed.h
index 6f1cc05aaf373b..20613cf63f7d09 100644
--- a/libcxx/include/__cxx03/__type_traits/is_signed.h
+++ b/libcxx/include/__cxx03/__type_traits/is_signed.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_SIGNED_H
-#define _LIBCPP___TYPE_TRAITS_IS_SIGNED_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_SIGNED_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_SIGNED_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -56,4 +56,4 @@ inline constexpr bool is_signed_v = is_signed<_Tp>::value;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_SIGNED_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_SIGNED_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_signed_integer.h b/libcxx/include/__cxx03/__type_traits/is_signed_integer.h
index 24b1aae258352a..6a1198f24cd4cc 100644
--- a/libcxx/include/__cxx03/__type_traits/is_signed_integer.h
+++ b/libcxx/include/__cxx03/__type_traits/is_signed_integer.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_SIGNED_INTEGER_H
-#define _LIBCPP___TYPE_TRAITS_IS_SIGNED_INTEGER_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_SIGNED_INTEGER_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_SIGNED_INTEGER_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -32,4 +32,4 @@ template <> struct __libcpp_is_signed_integer<__int128_t> : publi
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_SIGNED_INTEGER_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_SIGNED_INTEGER_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_specialization.h b/libcxx/include/__cxx03/__type_traits/is_specialization.h
index bccdd77df0e56d..b1946df29587b6 100644
--- a/libcxx/include/__cxx03/__type_traits/is_specialization.h
+++ b/libcxx/include/__cxx03/__type_traits/is_specialization.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_SPECIALIZATION
-#define _LIBCPP___TYPE_TRAITS_IS_SPECIALIZATION
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_SPECIALIZATION
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_SPECIALIZATION
// This contains parts of P2098R1 but is based on MSVC STL's implementation.
//
@@ -42,4 +42,4 @@ inline constexpr bool __is_specialization_v<_Template<_Args...>, _Template> = tr
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_SPECIALIZATION
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_SPECIALIZATION
diff --git a/libcxx/include/__cxx03/__type_traits/is_standard_layout.h b/libcxx/include/__cxx03/__type_traits/is_standard_layout.h
index 1325f72478bdf6..22889d5ff9a380 100644
--- a/libcxx/include/__cxx03/__type_traits/is_standard_layout.h
+++ b/libcxx/include/__cxx03/__type_traits/is_standard_layout.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_STANDARD_LAYOUT_H
-#define _LIBCPP___TYPE_TRAITS_IS_STANDARD_LAYOUT_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_STANDARD_LAYOUT_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_STANDARD_LAYOUT_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ inline constexpr bool is_standard_layout_v = __is_standard_layout(_Tp);
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_STANDARD_LAYOUT_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_STANDARD_LAYOUT_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_swappable.h b/libcxx/include/__cxx03/__type_traits/is_swappable.h
index 9c2e373675d8ca..c3119c3de08953 100644
--- a/libcxx/include/__cxx03/__type_traits/is_swappable.h
+++ b/libcxx/include/__cxx03/__type_traits/is_swappable.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_SWAPPABLE_H
-#define _LIBCPP___TYPE_TRAITS_IS_SWAPPABLE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_SWAPPABLE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_SWAPPABLE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/add_lvalue_reference.h>
@@ -101,4 +101,4 @@ struct _LIBCPP_TEMPLATE_VIS is_nothrow_swappable : bool_constant<is_nothrow_swap
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_SWAPPABLE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_SWAPPABLE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_trivial.h b/libcxx/include/__cxx03/__type_traits/is_trivial.h
index acb7a731ead524..e998255b813c51 100644
--- a/libcxx/include/__cxx03/__type_traits/is_trivial.h
+++ b/libcxx/include/__cxx03/__type_traits/is_trivial.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_TRIVIAL_H
-#define _LIBCPP___TYPE_TRAITS_IS_TRIVIAL_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_TRIVIAL_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_TRIVIAL_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ inline constexpr bool is_trivial_v = __is_trivial(_Tp);
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_TRIVIAL_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_TRIVIAL_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_trivially_assignable.h b/libcxx/include/__cxx03/__type_traits/is_trivially_assignable.h
index 757652572c81e2..180e05de2b4baa 100644
--- a/libcxx/include/__cxx03/__type_traits/is_trivially_assignable.h
+++ b/libcxx/include/__cxx03/__type_traits/is_trivially_assignable.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_ASSIGNABLE_H
-#define _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_ASSIGNABLE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_TRIVIALLY_ASSIGNABLE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_TRIVIALLY_ASSIGNABLE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/add_const.h>
@@ -53,4 +53,4 @@ inline constexpr bool is_trivially_move_assignable_v = is_trivially_move_assigna
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_ASSIGNABLE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_TRIVIALLY_ASSIGNABLE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_trivially_constructible.h b/libcxx/include/__cxx03/__type_traits/is_trivially_constructible.h
index 33110203fb422a..a47e6d9031a537 100644
--- a/libcxx/include/__cxx03/__type_traits/is_trivially_constructible.h
+++ b/libcxx/include/__cxx03/__type_traits/is_trivially_constructible.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_CONSTRUCTIBLE_H
-#define _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_CONSTRUCTIBLE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_TRIVIALLY_CONSTRUCTIBLE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_TRIVIALLY_CONSTRUCTIBLE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/add_lvalue_reference.h>
@@ -58,4 +58,4 @@ inline constexpr bool is_trivially_default_constructible_v = __is_trivially_cons
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_CONSTRUCTIBLE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_TRIVIALLY_CONSTRUCTIBLE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_trivially_copyable.h b/libcxx/include/__cxx03/__type_traits/is_trivially_copyable.h
index c80688b38c43d1..67a55e86e6b00a 100644
--- a/libcxx/include/__cxx03/__type_traits/is_trivially_copyable.h
+++ b/libcxx/include/__cxx03/__type_traits/is_trivially_copyable.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_COPYABLE_H
-#define _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_COPYABLE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_TRIVIALLY_COPYABLE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_TRIVIALLY_COPYABLE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -34,4 +34,4 @@ inline constexpr bool __is_cheap_to_copy = is_trivially_copyable_v<_Tp> && sizeo
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_COPYABLE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_TRIVIALLY_COPYABLE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_trivially_destructible.h b/libcxx/include/__cxx03/__type_traits/is_trivially_destructible.h
index 7c45619ea22c34..1dbd9e86a06918 100644
--- a/libcxx/include/__cxx03/__type_traits/is_trivially_destructible.h
+++ b/libcxx/include/__cxx03/__type_traits/is_trivially_destructible.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_DESTRUCTIBLE_H
-#define _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_DESTRUCTIBLE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_TRIVIALLY_DESTRUCTIBLE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_TRIVIALLY_DESTRUCTIBLE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -44,4 +44,4 @@ inline constexpr bool is_trivially_destructible_v = is_trivially_destructible<_T
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_DESTRUCTIBLE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_TRIVIALLY_DESTRUCTIBLE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_trivially_lexicographically_comparable.h b/libcxx/include/__cxx03/__type_traits/is_trivially_lexicographically_comparable.h
index 45043370a19e13..a5522b4427a9cd 100644
--- a/libcxx/include/__cxx03/__type_traits/is_trivially_lexicographically_comparable.h
+++ b/libcxx/include/__cxx03/__type_traits/is_trivially_lexicographically_comparable.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_LEXICOGRAPHICALLY_COMPARABLE_H
-#define _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_LEXICOGRAPHICALLY_COMPARABLE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_TRIVIALLY_LEXICOGRAPHICALLY_COMPARABLE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_TRIVIALLY_LEXICOGRAPHICALLY_COMPARABLE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -50,4 +50,4 @@ struct __libcpp_is_trivially_lexicographically_comparable
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_LEXICOGRAPHICALLY_COMPARABLE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_TRIVIALLY_LEXICOGRAPHICALLY_COMPARABLE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_trivially_relocatable.h b/libcxx/include/__cxx03/__type_traits/is_trivially_relocatable.h
index d134218cba3ff0..062b289575bc14 100644
--- a/libcxx/include/__cxx03/__type_traits/is_trivially_relocatable.h
+++ b/libcxx/include/__cxx03/__type_traits/is_trivially_relocatable.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_RELOCATABLE_H
-#define _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_RELOCATABLE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_TRIVIALLY_RELOCATABLE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_TRIVIALLY_RELOCATABLE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -39,4 +39,4 @@ struct __libcpp_is_trivially_relocatable<_Tp,
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_RELOCATABLE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_TRIVIALLY_RELOCATABLE_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_unbounded_array.h b/libcxx/include/__cxx03/__type_traits/is_unbounded_array.h
index e7262f56302873..d11a8094e9c134 100644
--- a/libcxx/include/__cxx03/__type_traits/is_unbounded_array.h
+++ b/libcxx/include/__cxx03/__type_traits/is_unbounded_array.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_UNBOUNDED_ARRAY_H
-#define _LIBCPP___TYPE_TRAITS_IS_UNBOUNDED_ARRAY_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_UNBOUNDED_ARRAY_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_UNBOUNDED_ARRAY_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -37,4 +37,4 @@ inline constexpr bool is_unbounded_array_v = is_unbounded_array<_Tp>::value;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_UNBOUNDED_ARRAY_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_UNBOUNDED_ARRAY_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_union.h b/libcxx/include/__cxx03/__type_traits/is_union.h
index 03733e6dac2365..eaa222efde036f 100644
--- a/libcxx/include/__cxx03/__type_traits/is_union.h
+++ b/libcxx/include/__cxx03/__type_traits/is_union.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_UNION_H
-#define _LIBCPP___TYPE_TRAITS_IS_UNION_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_UNION_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_UNION_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ inline constexpr bool is_union_v = __is_union(_Tp);
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_UNION_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_UNION_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_unsigned.h b/libcxx/include/__cxx03/__type_traits/is_unsigned.h
index b302380cd78383..99f888fb45beff 100644
--- a/libcxx/include/__cxx03/__type_traits/is_unsigned.h
+++ b/libcxx/include/__cxx03/__type_traits/is_unsigned.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_UNSIGNED_H
-#define _LIBCPP___TYPE_TRAITS_IS_UNSIGNED_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_UNSIGNED_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_UNSIGNED_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -56,4 +56,4 @@ inline constexpr bool is_unsigned_v = is_unsigned<_Tp>::value;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_UNSIGNED_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_UNSIGNED_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_unsigned_integer.h b/libcxx/include/__cxx03/__type_traits/is_unsigned_integer.h
index 7a0508289ed64e..250427cf8adf9f 100644
--- a/libcxx/include/__cxx03/__type_traits/is_unsigned_integer.h
+++ b/libcxx/include/__cxx03/__type_traits/is_unsigned_integer.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_UNSIGNED_INTEGER_H
-#define _LIBCPP___TYPE_TRAITS_IS_UNSIGNED_INTEGER_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_UNSIGNED_INTEGER_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_UNSIGNED_INTEGER_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -32,4 +32,4 @@ template <> struct __libcpp_is_unsigned_integer<__uint128_t> : p
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_UNSIGNED_INTEGER_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_UNSIGNED_INTEGER_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_valid_expansion.h b/libcxx/include/__cxx03/__type_traits/is_valid_expansion.h
index a2a4b30ff2f4fd..d2b8927d78e249 100644
--- a/libcxx/include/__cxx03/__type_traits/is_valid_expansion.h
+++ b/libcxx/include/__cxx03/__type_traits/is_valid_expansion.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_VALID_EXPANSION_H
-#define _LIBCPP___TYPE_TRAITS_IS_VALID_EXPANSION_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_VALID_EXPANSION_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_VALID_EXPANSION_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ using _IsValidExpansion _LIBCPP_NODEBUG = decltype(std::__sfinae_test_impl<_Temp
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_VALID_EXPANSION_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_VALID_EXPANSION_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_void.h b/libcxx/include/__cxx03/__type_traits/is_void.h
index aa6712e19c33f5..0f5e9cae179cec 100644
--- a/libcxx/include/__cxx03/__type_traits/is_void.h
+++ b/libcxx/include/__cxx03/__type_traits/is_void.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_VOID_H
-#define _LIBCPP___TYPE_TRAITS_IS_VOID_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_VOID_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_VOID_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ inline constexpr bool is_void_v = __is_same(__remove_cv(_Tp), void);
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_VOID_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_VOID_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_volatile.h b/libcxx/include/__cxx03/__type_traits/is_volatile.h
index 43f9d089d2600e..75b6b49122ed8c 100644
--- a/libcxx/include/__cxx03/__type_traits/is_volatile.h
+++ b/libcxx/include/__cxx03/__type_traits/is_volatile.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_IS_VOLATILE_H
-#define _LIBCPP___TYPE_TRAITS_IS_VOLATILE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_IS_VOLATILE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_IS_VOLATILE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -44,4 +44,4 @@ inline constexpr bool is_volatile_v = is_volatile<_Tp>::value;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_IS_VOLATILE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_VOLATILE_H
diff --git a/libcxx/include/__cxx03/__type_traits/lazy.h b/libcxx/include/__cxx03/__type_traits/lazy.h
index 4eb5893671f13e..5362d98929894b 100644
--- a/libcxx/include/__cxx03/__type_traits/lazy.h
+++ b/libcxx/include/__cxx03/__type_traits/lazy.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_LAZY_H
-#define _LIBCPP___TYPE_TRAITS_LAZY_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_LAZY_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_LAZY_H
#include <__cxx03/__config>
@@ -22,4 +22,4 @@ struct _Lazy : _Func<_Args...> {};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_LAZY_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_LAZY_H
diff --git a/libcxx/include/__cxx03/__type_traits/make_32_64_or_128_bit.h b/libcxx/include/__cxx03/__type_traits/make_32_64_or_128_bit.h
index e1be7d2022edb0..918a4c1db69d72 100644
--- a/libcxx/include/__cxx03/__type_traits/make_32_64_or_128_bit.h
+++ b/libcxx/include/__cxx03/__type_traits/make_32_64_or_128_bit.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_MAKE_32_64_OR_128_BIT_H
-#define _LIBCPP___TYPE_TRAITS_MAKE_32_64_OR_128_BIT_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_MAKE_32_64_OR_128_BIT_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_MAKE_32_64_OR_128_BIT_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/conditional.h>
@@ -46,4 +46,4 @@ using __make_32_64_or_128_bit_t =
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_MAKE_32_64_OR_128_BIT_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_MAKE_32_64_OR_128_BIT_H
diff --git a/libcxx/include/__cxx03/__type_traits/make_const_lvalue_ref.h b/libcxx/include/__cxx03/__type_traits/make_const_lvalue_ref.h
index cf9a46262a4b0c..de7fc2a8459674 100644
--- a/libcxx/include/__cxx03/__type_traits/make_const_lvalue_ref.h
+++ b/libcxx/include/__cxx03/__type_traits/make_const_lvalue_ref.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_MAKE_CONST_LVALUE_REF_H
-#define _LIBCPP___TYPE_TRAITS_MAKE_CONST_LVALUE_REF_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_MAKE_CONST_LVALUE_REF_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_MAKE_CONST_LVALUE_REF_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/remove_reference.h>
@@ -23,4 +23,4 @@ using __make_const_lvalue_ref = const __libcpp_remove_reference_t<_Tp>&;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_MAKE_CONST_LVALUE_REF_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_MAKE_CONST_LVALUE_REF_H
diff --git a/libcxx/include/__cxx03/__type_traits/make_signed.h b/libcxx/include/__cxx03/__type_traits/make_signed.h
index 6fc97078d65361..fb359441ee6e57 100644
--- a/libcxx/include/__cxx03/__type_traits/make_signed.h
+++ b/libcxx/include/__cxx03/__type_traits/make_signed.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_MAKE_SIGNED_H
-#define _LIBCPP___TYPE_TRAITS_MAKE_SIGNED_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_MAKE_SIGNED_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_MAKE_SIGNED_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/copy_cv.h>
@@ -86,4 +86,4 @@ using make_signed_t = __make_signed_t<_Tp>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_MAKE_SIGNED_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_MAKE_SIGNED_H
diff --git a/libcxx/include/__cxx03/__type_traits/make_unsigned.h b/libcxx/include/__cxx03/__type_traits/make_unsigned.h
index 1b0312d61f9b44..3e2105242b6657 100644
--- a/libcxx/include/__cxx03/__type_traits/make_unsigned.h
+++ b/libcxx/include/__cxx03/__type_traits/make_unsigned.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_MAKE_UNSIGNED_H
-#define _LIBCPP___TYPE_TRAITS_MAKE_UNSIGNED_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_MAKE_UNSIGNED_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_MAKE_UNSIGNED_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/conditional.h>
@@ -98,4 +98,4 @@ using __copy_unsigned_t = __conditional_t<is_unsigned<_Tp>::value, __make_unsign
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_MAKE_UNSIGNED_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_MAKE_UNSIGNED_H
diff --git a/libcxx/include/__cxx03/__type_traits/maybe_const.h b/libcxx/include/__cxx03/__type_traits/maybe_const.h
index 97928110edf243..88551f8fac1c6a 100644
--- a/libcxx/include/__cxx03/__type_traits/maybe_const.h
+++ b/libcxx/include/__cxx03/__type_traits/maybe_const.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_MAYBE_CONST_H
-#define _LIBCPP___TYPE_TRAITS_MAYBE_CONST_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_MAYBE_CONST_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_MAYBE_CONST_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/conditional.h>
@@ -23,4 +23,4 @@ using __maybe_const = __conditional_t<_Const, const _Tp, _Tp>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_MAYBE_CONST_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_MAYBE_CONST_H
diff --git a/libcxx/include/__cxx03/__type_traits/nat.h b/libcxx/include/__cxx03/__type_traits/nat.h
index e476364c4950ef..f45a7aadb3c791 100644
--- a/libcxx/include/__cxx03/__type_traits/nat.h
+++ b/libcxx/include/__cxx03/__type_traits/nat.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_NAT_H
-#define _LIBCPP___TYPE_TRAITS_NAT_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_NAT_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_NAT_H
#include <__cxx03/__config>
@@ -28,4 +28,4 @@ struct __nat {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_NAT_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_NAT_H
diff --git a/libcxx/include/__cxx03/__type_traits/negation.h b/libcxx/include/__cxx03/__type_traits/negation.h
index 56559071e62f76..d9b290e2e35d61 100644
--- a/libcxx/include/__cxx03/__type_traits/negation.h
+++ b/libcxx/include/__cxx03/__type_traits/negation.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_NEGATION_H
-#define _LIBCPP___TYPE_TRAITS_NEGATION_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_NEGATION_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_NEGATION_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -30,4 +30,4 @@ inline constexpr bool negation_v = !_Tp::value;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_NEGATION_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_NEGATION_H
diff --git a/libcxx/include/__cxx03/__type_traits/noexcept_move_assign_container.h b/libcxx/include/__cxx03/__type_traits/noexcept_move_assign_container.h
index 4684440a5760f8..d275ed585678b7 100644
--- a/libcxx/include/__cxx03/__type_traits/noexcept_move_assign_container.h
+++ b/libcxx/include/__cxx03/__type_traits/noexcept_move_assign_container.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_NOEXCEPT_MOVE_ASSIGN_CONTAINER_H
-#define _LIBCPP___TYPE_TRAITS_NOEXCEPT_MOVE_ASSIGN_CONTAINER_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_NOEXCEPT_MOVE_ASSIGN_CONTAINER_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_NOEXCEPT_MOVE_ASSIGN_CONTAINER_H
#include <__cxx03/__config>
#include <__cxx03/__memory/allocator_traits.h>
@@ -34,4 +34,4 @@ struct __noexcept_move_assign_container
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_NOEXCEPT_MOVE_ASSIGN_CONTAINER_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_NOEXCEPT_MOVE_ASSIGN_CONTAINER_H
diff --git a/libcxx/include/__cxx03/__type_traits/promote.h b/libcxx/include/__cxx03/__type_traits/promote.h
index b890aecdb5eb8c..92671223e3dbd3 100644
--- a/libcxx/include/__cxx03/__type_traits/promote.h
+++ b/libcxx/include/__cxx03/__type_traits/promote.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_PROMOTE_H
-#define _LIBCPP___TYPE_TRAITS_PROMOTE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_PROMOTE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_PROMOTE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -125,4 +125,4 @@ class __promote : public __promote_imp<_A1, _A2, _A3> {};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_PROMOTE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_PROMOTE_H
diff --git a/libcxx/include/__cxx03/__type_traits/rank.h b/libcxx/include/__cxx03/__type_traits/rank.h
index 6f2109b6541f75..a6b2598f6d7ca6 100644
--- a/libcxx/include/__cxx03/__type_traits/rank.h
+++ b/libcxx/include/__cxx03/__type_traits/rank.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_RANK_H
-#define _LIBCPP___TYPE_TRAITS_RANK_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_RANK_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_RANK_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -43,4 +43,4 @@ inline constexpr size_t rank_v = rank<_Tp>::value;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_RANK_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_RANK_H
diff --git a/libcxx/include/__cxx03/__type_traits/remove_all_extents.h b/libcxx/include/__cxx03/__type_traits/remove_all_extents.h
index 3d06a521178893..9a1fd0c7fb5bb1 100644
--- a/libcxx/include/__cxx03/__type_traits/remove_all_extents.h
+++ b/libcxx/include/__cxx03/__type_traits/remove_all_extents.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_REMOVE_ALL_EXTENTS_H
-#define _LIBCPP___TYPE_TRAITS_REMOVE_ALL_EXTENTS_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_ALL_EXTENTS_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_ALL_EXTENTS_H
#include <__cxx03/__config>
#include <__cxx03/cstddef>
@@ -51,4 +51,4 @@ using remove_all_extents_t = __remove_all_extents_t<_Tp>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_REMOVE_ALL_EXTENTS_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_ALL_EXTENTS_H
diff --git a/libcxx/include/__cxx03/__type_traits/remove_const.h b/libcxx/include/__cxx03/__type_traits/remove_const.h
index 06a70a260080c8..885563bfcfbe3d 100644
--- a/libcxx/include/__cxx03/__type_traits/remove_const.h
+++ b/libcxx/include/__cxx03/__type_traits/remove_const.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_REMOVE_CONST_H
-#define _LIBCPP___TYPE_TRAITS_REMOVE_CONST_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_CONST_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_CONST_H
#include <__cxx03/__config>
@@ -46,4 +46,4 @@ using remove_const_t = __remove_const_t<_Tp>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_REMOVE_CONST_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_CONST_H
diff --git a/libcxx/include/__cxx03/__type_traits/remove_const_ref.h b/libcxx/include/__cxx03/__type_traits/remove_const_ref.h
index c7d058dc2a65e2..24f72728806004 100644
--- a/libcxx/include/__cxx03/__type_traits/remove_const_ref.h
+++ b/libcxx/include/__cxx03/__type_traits/remove_const_ref.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_REMOVE_CONST_REF_H
-#define _LIBCPP___TYPE_TRAITS_REMOVE_CONST_REF_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_CONST_REF_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_CONST_REF_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/remove_const.h>
@@ -24,4 +24,4 @@ using __remove_const_ref_t = __remove_const_t<__libcpp_remove_reference_t<_Tp> >
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_REMOVE_CONST_REF_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_CONST_REF_H
diff --git a/libcxx/include/__cxx03/__type_traits/remove_cv.h b/libcxx/include/__cxx03/__type_traits/remove_cv.h
index 34bce7cf45ff1d..1612d24464a8c1 100644
--- a/libcxx/include/__cxx03/__type_traits/remove_cv.h
+++ b/libcxx/include/__cxx03/__type_traits/remove_cv.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_REMOVE_CV_H
-#define _LIBCPP___TYPE_TRAITS_REMOVE_CV_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_CV_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_CV_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/remove_const.h>
@@ -44,4 +44,4 @@ using remove_cv_t = __remove_cv_t<_Tp>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_REMOVE_CV_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_CV_H
diff --git a/libcxx/include/__cxx03/__type_traits/remove_cvref.h b/libcxx/include/__cxx03/__type_traits/remove_cvref.h
index 38a37d730e44a7..907622efe1a675 100644
--- a/libcxx/include/__cxx03/__type_traits/remove_cvref.h
+++ b/libcxx/include/__cxx03/__type_traits/remove_cvref.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_REMOVE_CVREF_H
-#define _LIBCPP___TYPE_TRAITS_REMOVE_CVREF_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_CVREF_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_CVREF_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_same.h>
@@ -43,4 +43,4 @@ using remove_cvref_t = __remove_cvref_t<_Tp>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_REMOVE_CVREF_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_CVREF_H
diff --git a/libcxx/include/__cxx03/__type_traits/remove_extent.h b/libcxx/include/__cxx03/__type_traits/remove_extent.h
index b1ccdc8a075d52..31a2535dca88a2 100644
--- a/libcxx/include/__cxx03/__type_traits/remove_extent.h
+++ b/libcxx/include/__cxx03/__type_traits/remove_extent.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_REMOVE_EXTENT_H
-#define _LIBCPP___TYPE_TRAITS_REMOVE_EXTENT_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_EXTENT_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_EXTENT_H
#include <__cxx03/__config>
#include <__cxx03/cstddef>
@@ -51,4 +51,4 @@ using remove_extent_t = __remove_extent_t<_Tp>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_REMOVE_EXTENT_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_EXTENT_H
diff --git a/libcxx/include/__cxx03/__type_traits/remove_pointer.h b/libcxx/include/__cxx03/__type_traits/remove_pointer.h
index 965ddf01a30f7f..4d689f67d1765b 100644
--- a/libcxx/include/__cxx03/__type_traits/remove_pointer.h
+++ b/libcxx/include/__cxx03/__type_traits/remove_pointer.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_REMOVE_POINTER_H
-#define _LIBCPP___TYPE_TRAITS_REMOVE_POINTER_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_POINTER_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_POINTER_H
#include <__cxx03/__config>
@@ -50,4 +50,4 @@ using remove_pointer_t = __remove_pointer_t<_Tp>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_REMOVE_POINTER_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_POINTER_H
diff --git a/libcxx/include/__cxx03/__type_traits/remove_reference.h b/libcxx/include/__cxx03/__type_traits/remove_reference.h
index 768b9acd2b6879..cd500ff761e285 100644
--- a/libcxx/include/__cxx03/__type_traits/remove_reference.h
+++ b/libcxx/include/__cxx03/__type_traits/remove_reference.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_REMOVE_REFERENCE_H
-#define _LIBCPP___TYPE_TRAITS_REMOVE_REFERENCE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_REFERENCE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_REFERENCE_H
#include <__cxx03/__config>
@@ -44,4 +44,4 @@ using remove_reference_t = __libcpp_remove_reference_t<_Tp>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_REMOVE_REFERENCE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_REFERENCE_H
diff --git a/libcxx/include/__cxx03/__type_traits/remove_volatile.h b/libcxx/include/__cxx03/__type_traits/remove_volatile.h
index 95fc78ee8e41cc..3c7e041398046f 100644
--- a/libcxx/include/__cxx03/__type_traits/remove_volatile.h
+++ b/libcxx/include/__cxx03/__type_traits/remove_volatile.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_REMOVE_VOLATILE_H
-#define _LIBCPP___TYPE_TRAITS_REMOVE_VOLATILE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_VOLATILE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_VOLATILE_H
#include <__cxx03/__config>
@@ -46,4 +46,4 @@ using remove_volatile_t = __remove_volatile_t<_Tp>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_REMOVE_VOLATILE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_VOLATILE_H
diff --git a/libcxx/include/__cxx03/__type_traits/result_of.h b/libcxx/include/__cxx03/__type_traits/result_of.h
index 7398f52f8965dd..36d4180346547e 100644
--- a/libcxx/include/__cxx03/__type_traits/result_of.h
+++ b/libcxx/include/__cxx03/__type_traits/result_of.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_RESULT_OF_H
-#define _LIBCPP___TYPE_TRAITS_RESULT_OF_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_RESULT_OF_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_RESULT_OF_H
#include <__cxx03/__config>
#include <__cxx03/__functional/invoke.h>
@@ -35,4 +35,4 @@ using result_of_t _LIBCPP_DEPRECATED_IN_CXX17 = typename result_of<_Tp>::type;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_RESULT_OF_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_RESULT_OF_H
diff --git a/libcxx/include/__cxx03/__type_traits/strip_signature.h b/libcxx/include/__cxx03/__type_traits/strip_signature.h
index d728604ac2fec3..2e7736609bf174 100644
--- a/libcxx/include/__cxx03/__type_traits/strip_signature.h
+++ b/libcxx/include/__cxx03/__type_traits/strip_signature.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_STRIP_SIGNATURE_H
-#define _LIBCPP___TYPE_TRAITS_STRIP_SIGNATURE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_STRIP_SIGNATURE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_STRIP_SIGNATURE_H
#include <__cxx03/__config>
@@ -78,4 +78,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 17
-#endif // _LIBCPP___TYPE_TRAITS_STRIP_SIGNATURE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_STRIP_SIGNATURE_H
diff --git a/libcxx/include/__cxx03/__type_traits/type_identity.h b/libcxx/include/__cxx03/__type_traits/type_identity.h
index 27bbd7c51d426b..1ff01002509de2 100644
--- a/libcxx/include/__cxx03/__type_traits/type_identity.h
+++ b/libcxx/include/__cxx03/__type_traits/type_identity.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_TYPE_IDENTITY_H
-#define _LIBCPP___TYPE_TRAITS_TYPE_IDENTITY_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_TYPE_IDENTITY_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_TYPE_IDENTITY_H
#include <__cxx03/__config>
@@ -36,4 +36,4 @@ using type_identity_t = typename type_identity<_Tp>::type;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_TYPE_IDENTITY_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_TYPE_IDENTITY_H
diff --git a/libcxx/include/__cxx03/__type_traits/type_list.h b/libcxx/include/__cxx03/__type_traits/type_list.h
index 31717a60b13cf8..40d6f292763472 100644
--- a/libcxx/include/__cxx03/__type_traits/type_list.h
+++ b/libcxx/include/__cxx03/__type_traits/type_list.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_TYPE_LIST_H
-#define _LIBCPP___TYPE_TRAITS_TYPE_LIST_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_TYPE_LIST_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_TYPE_LIST_H
#include <__cxx03/__config>
#include <__cxx03/cstddef>
@@ -39,4 +39,4 @@ struct __find_first<__type_list<_Hp, _Tp>, _Size, false> {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_TYPE_LIST_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_TYPE_LIST_H
diff --git a/libcxx/include/__cxx03/__type_traits/underlying_type.h b/libcxx/include/__cxx03/__type_traits/underlying_type.h
index da9d3df2645260..6e82ff83a6f713 100644
--- a/libcxx/include/__cxx03/__type_traits/underlying_type.h
+++ b/libcxx/include/__cxx03/__type_traits/underlying_type.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_UNDERLYING_TYPE_H
-#define _LIBCPP___TYPE_TRAITS_UNDERLYING_TYPE_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_UNDERLYING_TYPE_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_UNDERLYING_TYPE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_enum.h>
@@ -39,4 +39,4 @@ using underlying_type_t = typename underlying_type<_Tp>::type;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_UNDERLYING_TYPE_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_UNDERLYING_TYPE_H
diff --git a/libcxx/include/__cxx03/__type_traits/unwrap_ref.h b/libcxx/include/__cxx03/__type_traits/unwrap_ref.h
index 034bf337518dea..a5628ece8de31b 100644
--- a/libcxx/include/__cxx03/__type_traits/unwrap_ref.h
+++ b/libcxx/include/__cxx03/__type_traits/unwrap_ref.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_UNWRAP_REF_H
-#define _LIBCPP___TYPE_TRAITS_UNWRAP_REF_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_UNWRAP_REF_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_UNWRAP_REF_H
#include <__cxx03/__config>
#include <__cxx03/__fwd/functional.h>
@@ -55,4 +55,4 @@ struct __unwrap_ref_decay
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_UNWRAP_REF_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_UNWRAP_REF_H
diff --git a/libcxx/include/__cxx03/__type_traits/void_t.h b/libcxx/include/__cxx03/__type_traits/void_t.h
index 2fa557ab381784..a639a5f73d2b4e 100644
--- a/libcxx/include/__cxx03/__type_traits/void_t.h
+++ b/libcxx/include/__cxx03/__type_traits/void_t.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___TYPE_TRAITS_VOID_T_H
-#define _LIBCPP___TYPE_TRAITS_VOID_T_H
+#ifndef _LIBCPP___CXX03___TYPE_TRAITS_VOID_T_H
+#define _LIBCPP___CXX03___TYPE_TRAITS_VOID_T_H
#include <__cxx03/__config>
@@ -27,4 +27,4 @@ using __void_t = void;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___TYPE_TRAITS_VOID_T_H
+#endif // _LIBCPP___CXX03___TYPE_TRAITS_VOID_T_H
diff --git a/libcxx/include/__cxx03/__utility/as_const.h b/libcxx/include/__cxx03/__utility/as_const.h
index 33c4686d663e69..ba1b67216f1cef 100644
--- a/libcxx/include/__cxx03/__utility/as_const.h
+++ b/libcxx/include/__cxx03/__utility/as_const.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_AS_CONST_H
-#define _LIBCPP___UTILITY_AS_CONST_H
+#ifndef _LIBCPP___CXX03___UTILITY_AS_CONST_H
+#define _LIBCPP___CXX03___UTILITY_AS_CONST_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/add_const.h>
@@ -32,4 +32,4 @@ void as_const(const _Tp&&) = delete;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___UTILITY_AS_CONST_H
+#endif // _LIBCPP___CXX03___UTILITY_AS_CONST_H
diff --git a/libcxx/include/__cxx03/__utility/as_lvalue.h b/libcxx/include/__cxx03/__utility/as_lvalue.h
index 95ce9497207d2f..ea5404ad0bd2b6 100644
--- a/libcxx/include/__cxx03/__utility/as_lvalue.h
+++ b/libcxx/include/__cxx03/__utility/as_lvalue.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_AS_LVALUE_H
-#define _LIBCPP___UTILITY_AS_LVALUE_H
+#ifndef _LIBCPP___CXX03___UTILITY_AS_LVALUE_H
+#define _LIBCPP___CXX03___UTILITY_AS_LVALUE_H
#include <__cxx03/__config>
@@ -34,4 +34,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___UTILITY_AS_LVALUE_H
+#endif // _LIBCPP___CXX03___UTILITY_AS_LVALUE_H
diff --git a/libcxx/include/__cxx03/__utility/auto_cast.h b/libcxx/include/__cxx03/__utility/auto_cast.h
index 9932382c63063c..c506e891121e04 100644
--- a/libcxx/include/__cxx03/__utility/auto_cast.h
+++ b/libcxx/include/__cxx03/__utility/auto_cast.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_AUTO_CAST_H
-#define _LIBCPP___UTILITY_AUTO_CAST_H
+#ifndef _LIBCPP___CXX03___UTILITY_AUTO_CAST_H
+#define _LIBCPP___CXX03___UTILITY_AUTO_CAST_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/decay.h>
@@ -19,4 +19,4 @@
#define _LIBCPP_AUTO_CAST(expr) static_cast<::std::__decay_t<decltype((expr))> >(expr)
-#endif // _LIBCPP___UTILITY_AUTO_CAST_H
+#endif // _LIBCPP___CXX03___UTILITY_AUTO_CAST_H
diff --git a/libcxx/include/__cxx03/__utility/cmp.h b/libcxx/include/__cxx03/__utility/cmp.h
index 512a31857642a4..afb4d83a2a295f 100644
--- a/libcxx/include/__cxx03/__utility/cmp.h
+++ b/libcxx/include/__cxx03/__utility/cmp.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_CMP_H
-#define _LIBCPP___UTILITY_CMP_H
+#ifndef _LIBCPP___CXX03___UTILITY_CMP_H
+#define _LIBCPP___CXX03___UTILITY_CMP_H
#include <__cxx03/__concepts/arithmetic.h>
#include <__cxx03/__config>
@@ -78,4 +78,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___UTILITY_CMP_H
+#endif // _LIBCPP___CXX03___UTILITY_CMP_H
diff --git a/libcxx/include/__cxx03/__utility/convert_to_integral.h b/libcxx/include/__cxx03/__utility/convert_to_integral.h
index b350d0fd9d934c..e1cc9195de1658 100644
--- a/libcxx/include/__cxx03/__utility/convert_to_integral.h
+++ b/libcxx/include/__cxx03/__utility/convert_to_integral.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_CONVERT_TO_INTEGRAL_H
-#define _LIBCPP___UTILITY_CONVERT_TO_INTEGRAL_H
+#ifndef _LIBCPP___CXX03___UTILITY_CONVERT_TO_INTEGRAL_H
+#define _LIBCPP___CXX03___UTILITY_CONVERT_TO_INTEGRAL_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/enable_if.h>
@@ -65,4 +65,4 @@ __convert_to_integral(_Tp __val) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___UTILITY_CONVERT_TO_INTEGRAL_H
+#endif // _LIBCPP___CXX03___UTILITY_CONVERT_TO_INTEGRAL_H
diff --git a/libcxx/include/__cxx03/__utility/declval.h b/libcxx/include/__cxx03/__utility/declval.h
index f8c2c2ac4287a0..8992c5a0b6dd35 100644
--- a/libcxx/include/__cxx03/__utility/declval.h
+++ b/libcxx/include/__cxx03/__utility/declval.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_DECLVAL_H
-#define _LIBCPP___UTILITY_DECLVAL_H
+#ifndef _LIBCPP___CXX03___UTILITY_DECLVAL_H
+#define _LIBCPP___CXX03___UTILITY_DECLVAL_H
#include <__cxx03/__config>
@@ -35,4 +35,4 @@ _LIBCPP_HIDE_FROM_ABI decltype(std::__declval<_Tp>(0)) declval() _NOEXCEPT {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___UTILITY_DECLVAL_H
+#endif // _LIBCPP___CXX03___UTILITY_DECLVAL_H
diff --git a/libcxx/include/__cxx03/__utility/empty.h b/libcxx/include/__cxx03/__utility/empty.h
index bd169acabc4897..b6623020fe50c4 100644
--- a/libcxx/include/__cxx03/__utility/empty.h
+++ b/libcxx/include/__cxx03/__utility/empty.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_EMPTY_H
-#define _LIBCPP___UTILITY_EMPTY_H
+#ifndef _LIBCPP___CXX03___UTILITY_EMPTY_H
+#define _LIBCPP___CXX03___UTILITY_EMPTY_H
#include <__cxx03/__config>
@@ -21,4 +21,4 @@ struct __empty {};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___UTILITY_EMPTY_H
+#endif // _LIBCPP___CXX03___UTILITY_EMPTY_H
diff --git a/libcxx/include/__cxx03/__utility/exception_guard.h b/libcxx/include/__cxx03/__utility/exception_guard.h
index ec4c58fca0ff65..2cdb9b41cd0edf 100644
--- a/libcxx/include/__cxx03/__utility/exception_guard.h
+++ b/libcxx/include/__cxx03/__utility/exception_guard.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_TRANSACTION_H
-#define _LIBCPP___UTILITY_TRANSACTION_H
+#ifndef _LIBCPP___CXX03___UTILITY_TRANSACTION_H
+#define _LIBCPP___CXX03___UTILITY_TRANSACTION_H
#include <__cxx03/__assert>
#include <__cxx03/__config>
@@ -141,4 +141,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___UTILITY_TRANSACTION_H
+#endif // _LIBCPP___CXX03___UTILITY_TRANSACTION_H
diff --git a/libcxx/include/__cxx03/__utility/exchange.h b/libcxx/include/__cxx03/__utility/exchange.h
index 258d4c4ce4e9ee..682e7d78e65d21 100644
--- a/libcxx/include/__cxx03/__utility/exchange.h
+++ b/libcxx/include/__cxx03/__utility/exchange.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_EXCHANGE_H
-#define _LIBCPP___UTILITY_EXCHANGE_H
+#ifndef _LIBCPP___CXX03___UTILITY_EXCHANGE_H
+#define _LIBCPP___CXX03___UTILITY_EXCHANGE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_nothrow_assignable.h>
@@ -38,4 +38,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___UTILITY_EXCHANGE_H
+#endif // _LIBCPP___CXX03___UTILITY_EXCHANGE_H
diff --git a/libcxx/include/__cxx03/__utility/forward.h b/libcxx/include/__cxx03/__utility/forward.h
index ac63e2cafd3d87..fc0b45a0ed7cef 100644
--- a/libcxx/include/__cxx03/__utility/forward.h
+++ b/libcxx/include/__cxx03/__utility/forward.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_FORWARD_H
-#define _LIBCPP___UTILITY_FORWARD_H
+#ifndef _LIBCPP___CXX03___UTILITY_FORWARD_H
+#define _LIBCPP___CXX03___UTILITY_FORWARD_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_reference.h>
@@ -35,4 +35,4 @@ forward(_LIBCPP_LIFETIMEBOUND __libcpp_remove_reference_t<_Tp>&& __t) _NOEXCEPT
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___UTILITY_FORWARD_H
+#endif // _LIBCPP___CXX03___UTILITY_FORWARD_H
diff --git a/libcxx/include/__cxx03/__utility/forward_like.h b/libcxx/include/__cxx03/__utility/forward_like.h
index ed5cbee0be0c43..989a76ed5b102f 100644
--- a/libcxx/include/__cxx03/__utility/forward_like.h
+++ b/libcxx/include/__cxx03/__utility/forward_like.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_FORWARD_LIKE_H
-#define _LIBCPP___UTILITY_FORWARD_LIKE_H
+#ifndef _LIBCPP___CXX03___UTILITY_FORWARD_LIKE_H
+#define _LIBCPP___CXX03___UTILITY_FORWARD_LIKE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/conditional.h>
@@ -43,4 +43,4 @@ forward_like(_LIBCPP_LIFETIMEBOUND _Up&& __ux) noexcept -> _ForwardLike<_Tp, _Up
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___UTILITY_FORWARD_LIKE_H
+#endif // _LIBCPP___CXX03___UTILITY_FORWARD_LIKE_H
diff --git a/libcxx/include/__cxx03/__utility/in_place.h b/libcxx/include/__cxx03/__utility/in_place.h
index b0c257dec4652a..2ab0be25579b88 100644
--- a/libcxx/include/__cxx03/__utility/in_place.h
+++ b/libcxx/include/__cxx03/__utility/in_place.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_IN_PLACE_H
-#define _LIBCPP___UTILITY_IN_PLACE_H
+#ifndef _LIBCPP___CXX03___UTILITY_IN_PLACE_H
+#define _LIBCPP___CXX03___UTILITY_IN_PLACE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/remove_cvref.h>
@@ -60,4 +60,4 @@ using __is_inplace_index = __is_inplace_index_imp<__remove_cvref_t<_Tp>>;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___UTILITY_IN_PLACE_H
+#endif // _LIBCPP___CXX03___UTILITY_IN_PLACE_H
diff --git a/libcxx/include/__cxx03/__utility/integer_sequence.h b/libcxx/include/__cxx03/__utility/integer_sequence.h
index 5f3d1a7630018b..f5fdf6325e5b22 100644
--- a/libcxx/include/__cxx03/__utility/integer_sequence.h
+++ b/libcxx/include/__cxx03/__utility/integer_sequence.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_INTEGER_SEQUENCE_H
-#define _LIBCPP___UTILITY_INTEGER_SEQUENCE_H
+#ifndef _LIBCPP___CXX03___UTILITY_INTEGER_SEQUENCE_H
+#define _LIBCPP___CXX03___UTILITY_INTEGER_SEQUENCE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_integral.h>
@@ -87,4 +87,4 @@ _LIBCPP_HIDE_FROM_ABI constexpr void __for_each_index_sequence(index_sequence<_I
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___UTILITY_INTEGER_SEQUENCE_H
+#endif // _LIBCPP___CXX03___UTILITY_INTEGER_SEQUENCE_H
diff --git a/libcxx/include/__cxx03/__utility/is_pointer_in_range.h b/libcxx/include/__cxx03/__utility/is_pointer_in_range.h
index 8773c526a0a3f9..4d7d3c5e039f29 100644
--- a/libcxx/include/__cxx03/__utility/is_pointer_in_range.h
+++ b/libcxx/include/__cxx03/__utility/is_pointer_in_range.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_IS_POINTER_IN_RANGE_H
-#define _LIBCPP___UTILITY_IS_POINTER_IN_RANGE_H
+#ifndef _LIBCPP___CXX03___UTILITY_IS_POINTER_IN_RANGE_H
+#define _LIBCPP___CXX03___UTILITY_IS_POINTER_IN_RANGE_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__assert>
@@ -59,4 +59,4 @@ __is_pointer_in_range(const _Tp* __begin, const _Tp* __end, const _Up* __ptr) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___UTILITY_IS_POINTER_IN_RANGE_H
+#endif // _LIBCPP___CXX03___UTILITY_IS_POINTER_IN_RANGE_H
diff --git a/libcxx/include/__cxx03/__utility/is_valid_range.h b/libcxx/include/__cxx03/__utility/is_valid_range.h
index a7027bd582cb79..b3770c2c428b06 100644
--- a/libcxx/include/__cxx03/__utility/is_valid_range.h
+++ b/libcxx/include/__cxx03/__utility/is_valid_range.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_IS_VALID_RANGE_H
-#define _LIBCPP___UTILITY_IS_VALID_RANGE_H
+#ifndef _LIBCPP___CXX03___UTILITY_IS_VALID_RANGE_H
+#define _LIBCPP___CXX03___UTILITY_IS_VALID_RANGE_H
#include <__cxx03/__algorithm/comp.h>
#include <__cxx03/__config>
@@ -34,4 +34,4 @@ __is_valid_range(const _Tp* __first, const _Tp* __last) {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___UTILITY_IS_VALID_RANGE_H
+#endif // _LIBCPP___CXX03___UTILITY_IS_VALID_RANGE_H
diff --git a/libcxx/include/__cxx03/__utility/move.h b/libcxx/include/__cxx03/__utility/move.h
index 89fa877161e65f..18692ba9ec128f 100644
--- a/libcxx/include/__cxx03/__utility/move.h
+++ b/libcxx/include/__cxx03/__utility/move.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_MOVE_H
-#define _LIBCPP___UTILITY_MOVE_H
+#ifndef _LIBCPP___CXX03___UTILITY_MOVE_H
+#define _LIBCPP___CXX03___UTILITY_MOVE_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/conditional.h>
@@ -46,4 +46,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___UTILITY_MOVE_H
+#endif // _LIBCPP___CXX03___UTILITY_MOVE_H
diff --git a/libcxx/include/__cxx03/__utility/no_destroy.h b/libcxx/include/__cxx03/__utility/no_destroy.h
index 14ac437ecf7133..5c3dfc5d81e65c 100644
--- a/libcxx/include/__cxx03/__utility/no_destroy.h
+++ b/libcxx/include/__cxx03/__utility/no_destroy.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_NO_DESTROY_H
-#define _LIBCPP___UTILITY_NO_DESTROY_H
+#ifndef _LIBCPP___CXX03___UTILITY_NO_DESTROY_H
+#define _LIBCPP___CXX03___UTILITY_NO_DESTROY_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_constant_evaluated.h>
@@ -51,4 +51,4 @@ struct __no_destroy {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___UTILITY_NO_DESTROY_H
+#endif // _LIBCPP___CXX03___UTILITY_NO_DESTROY_H
diff --git a/libcxx/include/__cxx03/__utility/pair.h b/libcxx/include/__cxx03/__utility/pair.h
index 175976a8f627be..496fbbba675a4b 100644
--- a/libcxx/include/__cxx03/__utility/pair.h
+++ b/libcxx/include/__cxx03/__utility/pair.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_PAIR_H
-#define _LIBCPP___UTILITY_PAIR_H
+#ifndef _LIBCPP___CXX03___UTILITY_PAIR_H
+#define _LIBCPP___CXX03___UTILITY_PAIR_H
#include <__cxx03/__compare/common_comparison_category.h>
#include <__cxx03/__compare/synth_three_way.h>
@@ -715,4 +715,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___UTILITY_PAIR_H
+#endif // _LIBCPP___CXX03___UTILITY_PAIR_H
diff --git a/libcxx/include/__cxx03/__utility/piecewise_construct.h b/libcxx/include/__cxx03/__utility/piecewise_construct.h
index 10ad333f81f144..a45d38070f09d3 100644
--- a/libcxx/include/__cxx03/__utility/piecewise_construct.h
+++ b/libcxx/include/__cxx03/__utility/piecewise_construct.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_PIECEWISE_CONSTRUCT_H
-#define _LIBCPP___UTILITY_PIECEWISE_CONSTRUCT_H
+#ifndef _LIBCPP___CXX03___UTILITY_PIECEWISE_CONSTRUCT_H
+#define _LIBCPP___CXX03___UTILITY_PIECEWISE_CONSTRUCT_H
#include <__cxx03/__config>
@@ -29,4 +29,4 @@ constexpr piecewise_construct_t piecewise_construct = piecewise_construct_t();
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___UTILITY_PIECEWISE_CONSTRUCT_H
+#endif // _LIBCPP___CXX03___UTILITY_PIECEWISE_CONSTRUCT_H
diff --git a/libcxx/include/__cxx03/__utility/priority_tag.h b/libcxx/include/__cxx03/__utility/priority_tag.h
index 8d8cf0e70056ff..cefcc927b231b5 100644
--- a/libcxx/include/__cxx03/__utility/priority_tag.h
+++ b/libcxx/include/__cxx03/__utility/priority_tag.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_PRIORITY_TAG_H
-#define _LIBCPP___UTILITY_PRIORITY_TAG_H
+#ifndef _LIBCPP___CXX03___UTILITY_PRIORITY_TAG_H
+#define _LIBCPP___CXX03___UTILITY_PRIORITY_TAG_H
#include <__cxx03/__config>
#include <__cxx03/cstddef>
@@ -25,4 +25,4 @@ struct __priority_tag<0> {};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___UTILITY_PRIORITY_TAG_H
+#endif // _LIBCPP___CXX03___UTILITY_PRIORITY_TAG_H
diff --git a/libcxx/include/__cxx03/__utility/private_constructor_tag.h b/libcxx/include/__cxx03/__utility/private_constructor_tag.h
index c2198dbdd420f4..2db48a6c9c0604 100644
--- a/libcxx/include/__cxx03/__utility/private_constructor_tag.h
+++ b/libcxx/include/__cxx03/__utility/private_constructor_tag.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP__UTILITY_PRIVATE_CONSTRUCTOR_TAG_H
-#define _LIBCPP__UTILITY_PRIVATE_CONSTRUCTOR_TAG_H
+#ifndef _LIBCPP___CXX03__UTILITY_PRIVATE_CONSTRUCTOR_TAG_H
+#define _LIBCPP___CXX03__UTILITY_PRIVATE_CONSTRUCTOR_TAG_H
#include <__cxx03/__config>
@@ -25,4 +25,4 @@ struct __private_constructor_tag {};
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP__UTILITY_PRIVATE_CONSTRUCTOR_TAG_H
+#endif // _LIBCPP___CXX03__UTILITY_PRIVATE_CONSTRUCTOR_TAG_H
diff --git a/libcxx/include/__cxx03/__utility/rel_ops.h b/libcxx/include/__cxx03/__utility/rel_ops.h
index f066a816fcfb9a..b8fadd4d86227e 100644
--- a/libcxx/include/__cxx03/__utility/rel_ops.h
+++ b/libcxx/include/__cxx03/__utility/rel_ops.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_REL_OPS_H
-#define _LIBCPP___UTILITY_REL_OPS_H
+#ifndef _LIBCPP___CXX03___UTILITY_REL_OPS_H
+#define _LIBCPP___CXX03___UTILITY_REL_OPS_H
#include <__cxx03/__config>
@@ -43,4 +43,4 @@ inline _LIBCPP_DEPRECATED_IN_CXX20 _LIBCPP_HIDE_FROM_ABI bool operator>=(const _
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___UTILITY_REL_OPS_H
+#endif // _LIBCPP___CXX03___UTILITY_REL_OPS_H
diff --git a/libcxx/include/__cxx03/__utility/small_buffer.h b/libcxx/include/__cxx03/__utility/small_buffer.h
index 4836a739ed0855..fa5e5b238ab9d0 100644
--- a/libcxx/include/__cxx03/__utility/small_buffer.h
+++ b/libcxx/include/__cxx03/__utility/small_buffer.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_SMALL_BUFFER_H
-#define _LIBCPP___UTILITY_SMALL_BUFFER_H
+#ifndef _LIBCPP___CXX03___UTILITY_SMALL_BUFFER_H
+#define _LIBCPP___CXX03___UTILITY_SMALL_BUFFER_H
#include <__cxx03/__config>
#include <__cxx03/__memory/construct_at.h>
@@ -96,4 +96,4 @@ _LIBCPP_END_NAMESPACE_STD
#endif // _LIBCPP_STD_VER >= 23
-#endif // _LIBCPP___UTILITY_SMALL_BUFFER_H
+#endif // _LIBCPP___CXX03___UTILITY_SMALL_BUFFER_H
diff --git a/libcxx/include/__cxx03/__utility/swap.h b/libcxx/include/__cxx03/__utility/swap.h
index 6ad367509635c3..d74ec818084ca0 100644
--- a/libcxx/include/__cxx03/__utility/swap.h
+++ b/libcxx/include/__cxx03/__utility/swap.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_SWAP_H
-#define _LIBCPP___UTILITY_SWAP_H
+#ifndef _LIBCPP___CXX03___UTILITY_SWAP_H
+#define _LIBCPP___CXX03___UTILITY_SWAP_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/is_assignable.h>
@@ -56,4 +56,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP___UTILITY_SWAP_H
+#endif // _LIBCPP___CXX03___UTILITY_SWAP_H
diff --git a/libcxx/include/__cxx03/__utility/to_underlying.h b/libcxx/include/__cxx03/__utility/to_underlying.h
index 8d33de1714c72e..9006012f5a19e7 100644
--- a/libcxx/include/__cxx03/__utility/to_underlying.h
+++ b/libcxx/include/__cxx03/__utility/to_underlying.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_TO_UNDERLYING_H
-#define _LIBCPP___UTILITY_TO_UNDERLYING_H
+#ifndef _LIBCPP___CXX03___UTILITY_TO_UNDERLYING_H
+#define _LIBCPP___CXX03___UTILITY_TO_UNDERLYING_H
#include <__cxx03/__config>
#include <__cxx03/__type_traits/underlying_type.h>
@@ -35,4 +35,4 @@ template <class _Tp>
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___UTILITY_TO_UNDERLYING_H
+#endif // _LIBCPP___CXX03___UTILITY_TO_UNDERLYING_H
diff --git a/libcxx/include/__cxx03/__utility/unreachable.h b/libcxx/include/__cxx03/__utility/unreachable.h
index fb4a775d024405..373cddc1365cac 100644
--- a/libcxx/include/__cxx03/__utility/unreachable.h
+++ b/libcxx/include/__cxx03/__utility/unreachable.h
@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___UTILITY_UNREACHABLE_H
-#define _LIBCPP___UTILITY_UNREACHABLE_H
+#ifndef _LIBCPP___CXX03___UTILITY_UNREACHABLE_H
+#define _LIBCPP___CXX03___UTILITY_UNREACHABLE_H
#include <__cxx03/__assert>
#include <__cxx03/__config>
@@ -31,4 +31,4 @@ _LIBCPP_NORETURN _LIBCPP_HIDE_FROM_ABI inline void __libcpp_unreachable() {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___UTILITY_UNREACHABLE_H
+#endif // _LIBCPP___CXX03___UTILITY_UNREACHABLE_H
diff --git a/libcxx/include/__cxx03/__variant/monostate.h b/libcxx/include/__cxx03/__variant/monostate.h
index 6a136e75516b64..66b94618a0fe1f 100644
--- a/libcxx/include/__cxx03/__variant/monostate.h
+++ b/libcxx/include/__cxx03/__variant/monostate.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___VARIANT_MONOSTATE_H
-#define _LIBCPP___VARIANT_MONOSTATE_H
+#ifndef _LIBCPP___CXX03___VARIANT_MONOSTATE_H
+#define _LIBCPP___CXX03___VARIANT_MONOSTATE_H
#include <__cxx03/__compare/ordering.h>
#include <__cxx03/__config>
@@ -61,4 +61,4 @@ struct _LIBCPP_TEMPLATE_VIS hash<monostate> {
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___VARIANT_MONOSTATE_H
+#endif // _LIBCPP___CXX03___VARIANT_MONOSTATE_H
diff --git a/libcxx/include/__cxx03/__verbose_abort b/libcxx/include/__cxx03/__verbose_abort
index 4eb994a4f2043a..4fcfffa2b4dfab 100644
--- a/libcxx/include/__cxx03/__verbose_abort
+++ b/libcxx/include/__cxx03/__verbose_abort
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___VERBOSE_ABORT
-#define _LIBCPP___VERBOSE_ABORT
+#ifndef _LIBCPP___CXX03___VERBOSE_ABORT
+#define _LIBCPP___CXX03___VERBOSE_ABORT
#include <__cxx03/__config>
@@ -49,4 +49,4 @@ void __use(const char*, ...);
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP___VERBOSE_ABORT
+#endif // _LIBCPP___CXX03___VERBOSE_ABORT
diff --git a/libcxx/include/__cxx03/algorithm b/libcxx/include/__cxx03/algorithm
index 929e2c5b7422a5..8eff4d152adb23 100644
--- a/libcxx/include/__cxx03/algorithm
+++ b/libcxx/include/__cxx03/algorithm
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_ALGORITHM
-#define _LIBCPP_ALGORITHM
+#ifndef _LIBCPP___CXX03_ALGORITHM
+#define _LIBCPP___CXX03_ALGORITHM
/*
algorithm synopsis
@@ -2046,4 +2046,4 @@ template <class BidirectionalIterator, class Compare>
# include <__cxx03/utility>
#endif
-#endif // _LIBCPP_ALGORITHM
+#endif // _LIBCPP___CXX03_ALGORITHM
diff --git a/libcxx/include/__cxx03/any b/libcxx/include/__cxx03/any
index 06ce9336abbdf6..01289c5c4f0a03 100644
--- a/libcxx/include/__cxx03/any
+++ b/libcxx/include/__cxx03/any
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_ANY
-#define _LIBCPP_ANY
+#ifndef _LIBCPP___CXX03_ANY
+#define _LIBCPP___CXX03_ANY
/*
any synopsis
@@ -611,4 +611,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/variant>
#endif
-#endif // _LIBCPP_ANY
+#endif // _LIBCPP___CXX03_ANY
diff --git a/libcxx/include/__cxx03/array b/libcxx/include/__cxx03/array
index 2686dd85668b66..74dc287aa54d67 100644
--- a/libcxx/include/__cxx03/array
+++ b/libcxx/include/__cxx03/array
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_ARRAY
-#define _LIBCPP_ARRAY
+#ifndef _LIBCPP___CXX03_ARRAY
+#define _LIBCPP___CXX03_ARRAY
/*
array synopsis
@@ -511,4 +511,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/utility>
#endif
-#endif // _LIBCPP_ARRAY
+#endif // _LIBCPP___CXX03_ARRAY
diff --git a/libcxx/include/__cxx03/atomic b/libcxx/include/__cxx03/atomic
index 7a0b5bd38fb944..1b488d99f80fb6 100644
--- a/libcxx/include/__cxx03/atomic
+++ b/libcxx/include/__cxx03/atomic
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_ATOMIC
-#define _LIBCPP_ATOMIC
+#ifndef _LIBCPP___CXX03_ATOMIC
+#define _LIBCPP___CXX03_ATOMIC
/*
atomic synopsis
@@ -589,7 +589,7 @@ template <class T>
#include <__cxx03/__config>
-#if _LIBCPP_STD_VER < 23 && defined(_LIBCPP_STDATOMIC_H)
+#if _LIBCPP_STD_VER < 23 && defined(_LIBCPP___CXX03_STDATOMIC_H)
# error <atomic> is incompatible with <stdatomic.h> before C++23. Please compile with -std=c++23.
#endif
@@ -629,4 +629,4 @@ template <class T>
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_ATOMIC
+#endif // _LIBCPP___CXX03_ATOMIC
diff --git a/libcxx/include/__cxx03/barrier b/libcxx/include/__cxx03/barrier
index 5aee9e7210ec4a..5e11f2439c4022 100644
--- a/libcxx/include/__cxx03/barrier
+++ b/libcxx/include/__cxx03/barrier
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_BARRIER
-#define _LIBCPP_BARRIER
+#ifndef _LIBCPP___CXX03_BARRIER
+#define _LIBCPP___CXX03_BARRIER
/*
barrier synopsis
@@ -305,4 +305,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/variant>
#endif
-#endif //_LIBCPP_BARRIER
+#endif //_LIBCPP___CXX03_BARRIER
diff --git a/libcxx/include/__cxx03/bit b/libcxx/include/__cxx03/bit
index e220eedfeaa92f..29da3a21c8924b 100644
--- a/libcxx/include/__cxx03/bit
+++ b/libcxx/include/__cxx03/bit
@@ -7,8 +7,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP_BIT
-#define _LIBCPP_BIT
+#ifndef _LIBCPP___CXX03_BIT
+#define _LIBCPP___CXX03_BIT
/*
bit synopsis
@@ -98,4 +98,4 @@ namespace std {
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_BIT
+#endif // _LIBCPP___CXX03_BIT
diff --git a/libcxx/include/__cxx03/bitset b/libcxx/include/__cxx03/bitset
index f41d78ce27f085..1507d0cdaf2f08 100644
--- a/libcxx/include/__cxx03/bitset
+++ b/libcxx/include/__cxx03/bitset
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_BITSET
-#define _LIBCPP_BITSET
+#ifndef _LIBCPP___CXX03_BITSET
+#define _LIBCPP___CXX03_BITSET
// clang-format off
@@ -966,4 +966,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_BITSET
+#endif // _LIBCPP___CXX03_BITSET
diff --git a/libcxx/include/__cxx03/ccomplex b/libcxx/include/__cxx03/ccomplex
index fb16b8fbb54afa..a96d7512661c7c 100644
--- a/libcxx/include/__cxx03/ccomplex
+++ b/libcxx/include/__cxx03/ccomplex
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CCOMPLEX
-#define _LIBCPP_CCOMPLEX
+#ifndef _LIBCPP___CXX03_CCOMPLEX
+#define _LIBCPP___CXX03_CCOMPLEX
/*
ccomplex synopsis
@@ -23,4 +23,4 @@
# pragma GCC system_header
#endif
-#endif // _LIBCPP_CCOMPLEX
+#endif // _LIBCPP___CXX03_CCOMPLEX
diff --git a/libcxx/include/__cxx03/cctype b/libcxx/include/__cxx03/cctype
index 1bfb66b704a275..7f1becb46341b3 100644
--- a/libcxx/include/__cxx03/cctype
+++ b/libcxx/include/__cxx03/cctype
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CCTYPE
-#define _LIBCPP_CCTYPE
+#ifndef _LIBCPP___CXX03_CCTYPE
+#define _LIBCPP___CXX03_CCTYPE
/*
cctype synopsis
@@ -38,7 +38,7 @@ int toupper(int c);
#include <__cxx03/ctype.h>
-#ifndef _LIBCPP_CTYPE_H
+#ifndef _LIBCPP___CXX03_CTYPE_H
# error <cctype> tried including <ctype.h> but didn't find libc++'s <ctype.h> header. \
This usually means that your header search paths are not configured properly. \
The header search paths should contain the C++ Standard Library headers before \
@@ -124,4 +124,4 @@ using ::toupper _LIBCPP_USING_IF_EXISTS;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_CCTYPE
+#endif // _LIBCPP___CXX03_CCTYPE
diff --git a/libcxx/include/__cxx03/cerrno b/libcxx/include/__cxx03/cerrno
index 987e7492ce05ad..acb894ea194954 100644
--- a/libcxx/include/__cxx03/cerrno
+++ b/libcxx/include/__cxx03/cerrno
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CERRNO
-#define _LIBCPP_CERRNO
+#ifndef _LIBCPP___CXX03_CERRNO
+#define _LIBCPP___CXX03_CERRNO
/*
cerrno synopsis
@@ -26,7 +26,7 @@ Macros:
#include <__cxx03/errno.h>
-#ifndef _LIBCPP_ERRNO_H
+#ifndef _LIBCPP___CXX03_ERRNO_H
# error <cerrno> tried including <errno.h> but didn't find libc++'s <errno.h> header. \
This usually means that your header search paths are not configured properly. \
The header search paths should contain the C++ Standard Library headers before \
@@ -45,4 +45,4 @@ Macros:
// Based on the post commit feedback the macro are no longer deprecated.
// Instead libc++ leaves the deprecation to the provider of errno.h.
-#endif // _LIBCPP_CERRNO
+#endif // _LIBCPP___CXX03_CERRNO
diff --git a/libcxx/include/__cxx03/cfenv b/libcxx/include/__cxx03/cfenv
index 59c56d29a7c4a1..d707f5a65b9bc6 100644
--- a/libcxx/include/__cxx03/cfenv
+++ b/libcxx/include/__cxx03/cfenv
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CFENV
-#define _LIBCPP_CFENV
+#ifndef _LIBCPP___CXX03_CFENV
+#define _LIBCPP___CXX03_CFENV
/*
cfenv synopsis
@@ -56,7 +56,7 @@ int feupdateenv(const fenv_t* envp);
#include <__cxx03/fenv.h>
-#ifndef _LIBCPP_FENV_H
+#ifndef _LIBCPP___CXX03_FENV_H
# error <cfenv> tried including <fenv.h> but didn't find libc++'s <fenv.h> header. \
This usually means that your header search paths are not configured properly. \
The header search paths should contain the C++ Standard Library headers before \
@@ -87,4 +87,4 @@ using ::feupdateenv _LIBCPP_USING_IF_EXISTS;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_CFENV
+#endif // _LIBCPP___CXX03_CFENV
diff --git a/libcxx/include/__cxx03/cfloat b/libcxx/include/__cxx03/cfloat
index 5f65b014ca1211..5d10db6a454a6d 100644
--- a/libcxx/include/__cxx03/cfloat
+++ b/libcxx/include/__cxx03/cfloat
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CFLOAT
-#define _LIBCPP_CFLOAT
+#ifndef _LIBCPP___CXX03_CFLOAT
+#define _LIBCPP___CXX03_CFLOAT
/*
cfloat synopsis
@@ -73,7 +73,7 @@ Macros:
#include <__cxx03/float.h>
-#ifndef _LIBCPP_FLOAT_H
+#ifndef _LIBCPP___CXX03_FLOAT_H
# error <cfloat> tried including <float.h> but didn't find libc++'s <float.h> header. \
This usually means that your header search paths are not configured properly. \
The header search paths should contain the C++ Standard Library headers before \
@@ -85,4 +85,4 @@ Macros:
# pragma GCC system_header
#endif
-#endif // _LIBCPP_CFLOAT
+#endif // _LIBCPP___CXX03_CFLOAT
diff --git a/libcxx/include/__cxx03/charconv b/libcxx/include/__cxx03/charconv
index 0135a74fba8a53..352189aa340873 100644
--- a/libcxx/include/__cxx03/charconv
+++ b/libcxx/include/__cxx03/charconv
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CHARCONV
-#define _LIBCPP_CHARCONV
+#ifndef _LIBCPP___CXX03_CHARCONV
+#define _LIBCPP___CXX03_CHARCONV
/*
charconv synopsis
@@ -112,4 +112,4 @@ _LIBCPP_END_NAMESPACE_STD
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_CHARCONV
+#endif // _LIBCPP___CXX03_CHARCONV
diff --git a/libcxx/include/__cxx03/chrono b/libcxx/include/__cxx03/chrono
index f39abf1897df90..167e85203ced6e 100644
--- a/libcxx/include/__cxx03/chrono
+++ b/libcxx/include/__cxx03/chrono
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CHRONO
-#define _LIBCPP_CHRONO
+#ifndef _LIBCPP___CXX03_CHRONO
+#define _LIBCPP___CXX03_CHRONO
// clang-format off
@@ -1019,4 +1019,4 @@ constexpr chrono::year operator ""y(unsigned lo
# endif
#endif
-#endif // _LIBCPP_CHRONO
+#endif // _LIBCPP___CXX03_CHRONO
diff --git a/libcxx/include/__cxx03/cinttypes b/libcxx/include/__cxx03/cinttypes
index 146f5b8fce0c91..a14c1a57e66f9d 100644
--- a/libcxx/include/__cxx03/cinttypes
+++ b/libcxx/include/__cxx03/cinttypes
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CINTTYPES
-#define _LIBCPP_CINTTYPES
+#ifndef _LIBCPP___CXX03_CINTTYPES
+#define _LIBCPP___CXX03_CINTTYPES
/*
cinttypes synopsis
@@ -243,7 +243,7 @@ uintmax_t wcstoumax(const wchar_t* restrict nptr, wchar_t** restrict endptr, int
#include <__cxx03/inttypes.h>
-#ifndef _LIBCPP_INTTYPES_H
+#ifndef _LIBCPP___CXX03_INTTYPES_H
# error <cinttypes> tried including <inttypes.h> but didn't find libc++'s <inttypes.h> header. \
This usually means that your header search paths are not configured properly. \
The header search paths should contain the C++ Standard Library headers before \
@@ -267,4 +267,4 @@ using ::wcstoumax _LIBCPP_USING_IF_EXISTS;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_CINTTYPES
+#endif // _LIBCPP___CXX03_CINTTYPES
diff --git a/libcxx/include/__cxx03/ciso646 b/libcxx/include/__cxx03/ciso646
index 7109a31b52f242..5323d0b3393b28 100644
--- a/libcxx/include/__cxx03/ciso646
+++ b/libcxx/include/__cxx03/ciso646
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CISO646
-#define _LIBCPP_CISO646
+#ifndef _LIBCPP___CXX03_CISO646
+#define _LIBCPP___CXX03_CISO646
/*
ciso646 synopsis
@@ -21,4 +21,4 @@
# pragma GCC system_header
#endif
-#endif // _LIBCPP_CISO646
+#endif // _LIBCPP___CXX03_CISO646
diff --git a/libcxx/include/__cxx03/climits b/libcxx/include/__cxx03/climits
index aff33b687bdefd..37d8c41a0c6de7 100644
--- a/libcxx/include/__cxx03/climits
+++ b/libcxx/include/__cxx03/climits
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CLIMITS
-#define _LIBCPP_CLIMITS
+#ifndef _LIBCPP___CXX03_CLIMITS
+#define _LIBCPP___CXX03_CLIMITS
/*
climits synopsis
@@ -45,4 +45,4 @@ Macros:
# pragma GCC system_header
#endif
-#endif // _LIBCPP_CLIMITS
+#endif // _LIBCPP___CXX03_CLIMITS
diff --git a/libcxx/include/__cxx03/clocale b/libcxx/include/__cxx03/clocale
index d8fc91465ef748..497aed24869189 100644
--- a/libcxx/include/__cxx03/clocale
+++ b/libcxx/include/__cxx03/clocale
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CLOCALE
-#define _LIBCPP_CLOCALE
+#ifndef _LIBCPP___CXX03_CLOCALE
+#define _LIBCPP___CXX03_CLOCALE
/*
clocale synopsis
@@ -38,7 +38,7 @@ lconv* localeconv();
#include <__cxx03/locale.h>
-#ifndef _LIBCPP_LOCALE_H
+#ifndef _LIBCPP___CXX03_LOCALE_H
# error <clocale> tried including <locale.h> but didn't find libc++'s <locale.h> header. \
This usually means that your header search paths are not configured properly. \
The header search paths should contain the C++ Standard Library headers before \
@@ -58,4 +58,4 @@ using ::localeconv _LIBCPP_USING_IF_EXISTS;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_CLOCALE
+#endif // _LIBCPP___CXX03_CLOCALE
diff --git a/libcxx/include/__cxx03/cmath b/libcxx/include/__cxx03/cmath
index 659b5c965d6e97..6aa9ad9c7c4d53 100644
--- a/libcxx/include/__cxx03/cmath
+++ b/libcxx/include/__cxx03/cmath
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CMATH
-#define _LIBCPP_CMATH
+#ifndef _LIBCPP___CXX03_CMATH
+#define _LIBCPP___CXX03_CMATH
/*
cmath synopsis
@@ -327,7 +327,7 @@ constexpr long double lerp(long double a, long double b, long double t) noexcept
#include <__cxx03/__math/special_functions.h>
#include <__cxx03/math.h>
-#ifndef _LIBCPP_MATH_H
+#ifndef _LIBCPP___CXX03_MATH_H
# error <cmath> tried including <math.h> but didn't find libc++'s <math.h> header. \
This usually means that your header search paths are not configured properly. \
The header search paths should contain the C++ Standard Library headers before \
@@ -643,4 +643,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_CMATH
+#endif // _LIBCPP___CXX03_CMATH
diff --git a/libcxx/include/__cxx03/codecvt b/libcxx/include/__cxx03/codecvt
index 827822bf12466a..22a4de3790d182 100644
--- a/libcxx/include/__cxx03/codecvt
+++ b/libcxx/include/__cxx03/codecvt
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CODECVT
-#define _LIBCPP_CODECVT
+#ifndef _LIBCPP___CXX03_CODECVT
+#define _LIBCPP___CXX03_CODECVT
/*
codecvt synopsis
@@ -594,4 +594,4 @@ _LIBCPP_END_NAMESPACE_STD
# include <__cxx03/typeinfo>
#endif
-#endif // _LIBCPP_CODECVT
+#endif // _LIBCPP___CXX03_CODECVT
diff --git a/libcxx/include/__cxx03/compare b/libcxx/include/__cxx03/compare
index 03b87ea1d10719..1199cc45c622b1 100644
--- a/libcxx/include/__cxx03/compare
+++ b/libcxx/include/__cxx03/compare
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_COMPARE
-#define _LIBCPP_COMPARE
+#ifndef _LIBCPP___CXX03_COMPARE
+#define _LIBCPP___CXX03_COMPARE
/*
compare synopsis
@@ -175,4 +175,4 @@ namespace std {
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_COMPARE
+#endif // _LIBCPP___CXX03_COMPARE
diff --git a/libcxx/include/__cxx03/complex b/libcxx/include/__cxx03/complex
index 0bad3de200084f..c68bce75bb9bef 100644
--- a/libcxx/include/__cxx03/complex
+++ b/libcxx/include/__cxx03/complex
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_COMPLEX
-#define _LIBCPP_COMPLEX
+#ifndef _LIBCPP___CXX03_COMPLEX
+#define _LIBCPP___CXX03_COMPLEX
/*
complex synopsis
@@ -1477,4 +1477,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_COMPLEX
+#endif // _LIBCPP___CXX03_COMPLEX
diff --git a/libcxx/include/__cxx03/complex.h b/libcxx/include/__cxx03/complex.h
index a20ab88802060b..373017ff3f440b 100644
--- a/libcxx/include/__cxx03/complex.h
+++ b/libcxx/include/__cxx03/complex.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_COMPLEX_H
-#define _LIBCPP_COMPLEX_H
+#ifndef _LIBCPP___CXX03_COMPLEX_H
+#define _LIBCPP___CXX03_COMPLEX_H
/*
complex.h synopsis
@@ -29,4 +29,4 @@
# include_next <complex.h>
#endif
-#endif // _LIBCPP_COMPLEX_H
+#endif // _LIBCPP___CXX03_COMPLEX_H
diff --git a/libcxx/include/__cxx03/concepts b/libcxx/include/__cxx03/concepts
index aa6e62e4d39c85..4e129022e55a00 100644
--- a/libcxx/include/__cxx03/concepts
+++ b/libcxx/include/__cxx03/concepts
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CONCEPTS
-#define _LIBCPP_CONCEPTS
+#ifndef _LIBCPP___CXX03_CONCEPTS
+#define _LIBCPP___CXX03_CONCEPTS
/*
concepts synopsis
@@ -170,4 +170,4 @@ namespace std {
# pragma GCC system_header
#endif
-#endif // _LIBCPP_CONCEPTS
+#endif // _LIBCPP___CXX03_CONCEPTS
diff --git a/libcxx/include/__cxx03/condition_variable b/libcxx/include/__cxx03/condition_variable
index db862c44f9d3fe..5ad540c4626c09 100644
--- a/libcxx/include/__cxx03/condition_variable
+++ b/libcxx/include/__cxx03/condition_variable
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CONDITION_VARIABLE
-#define _LIBCPP_CONDITION_VARIABLE
+#ifndef _LIBCPP___CXX03_CONDITION_VARIABLE
+#define _LIBCPP___CXX03_CONDITION_VARIABLE
/*
condition_variable synopsis
@@ -366,4 +366,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/typeinfo>
#endif
-#endif // _LIBCPP_CONDITION_VARIABLE
+#endif // _LIBCPP___CXX03_CONDITION_VARIABLE
diff --git a/libcxx/include/__cxx03/coroutine b/libcxx/include/__cxx03/coroutine
index 2a8a06e63cc281..6f2af35cc4d765 100644
--- a/libcxx/include/__cxx03/coroutine
+++ b/libcxx/include/__cxx03/coroutine
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_COROUTINE
-#define _LIBCPP_COROUTINE
+#ifndef _LIBCPP___CXX03_COROUTINE
+#define _LIBCPP___CXX03_COROUTINE
/**
coroutine synopsis
@@ -64,4 +64,4 @@ struct suspend_always;
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_COROUTINE
+#endif // _LIBCPP___CXX03_COROUTINE
diff --git a/libcxx/include/__cxx03/csetjmp b/libcxx/include/__cxx03/csetjmp
index be9391506d0f4b..5eeda2dda4ba62 100644
--- a/libcxx/include/__cxx03/csetjmp
+++ b/libcxx/include/__cxx03/csetjmp
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CSETJMP
-#define _LIBCPP_CSETJMP
+#ifndef _LIBCPP___CXX03_CSETJMP
+#define _LIBCPP___CXX03_CSETJMP
/*
csetjmp synopsis
@@ -35,7 +35,7 @@ void longjmp(jmp_buf env, int val);
// <setjmp.h> is not provided by libc++
#if __has_include(<setjmp.h>)
# include <setjmp.h>
-# ifdef _LIBCPP_SETJMP_H
+# ifdef _LIBCPP___CXX03_SETJMP_H
# error "If libc++ starts defining <setjmp.h>, the __has_include check should move to libc++'s <setjmp.h>"
# endif
#endif
@@ -51,4 +51,4 @@ using ::longjmp _LIBCPP_USING_IF_EXISTS;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_CSETJMP
+#endif // _LIBCPP___CXX03_CSETJMP
diff --git a/libcxx/include/__cxx03/csignal b/libcxx/include/__cxx03/csignal
index f8f511fbca432e..945278d6f2dfc8 100644
--- a/libcxx/include/__cxx03/csignal
+++ b/libcxx/include/__cxx03/csignal
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CSIGNAL
-#define _LIBCPP_CSIGNAL
+#ifndef _LIBCPP___CXX03_CSIGNAL
+#define _LIBCPP___CXX03_CSIGNAL
/*
csignal synopsis
@@ -44,7 +44,7 @@ int raise(int sig);
// <signal.h> is not provided by libc++
#if __has_include(<signal.h>)
# include <signal.h>
-# ifdef _LIBCPP_SIGNAL_H
+# ifdef _LIBCPP___CXX03_SIGNAL_H
# error "If libc++ starts defining <signal.h>, the __has_include check should move to libc++'s <signal.h>"
# endif
#endif
@@ -61,4 +61,4 @@ using ::raise _LIBCPP_USING_IF_EXISTS;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_CSIGNAL
+#endif // _LIBCPP___CXX03_CSIGNAL
diff --git a/libcxx/include/__cxx03/cstdarg b/libcxx/include/__cxx03/cstdarg
index ae04819a679ab8..91a452a154f664 100644
--- a/libcxx/include/__cxx03/cstdarg
+++ b/libcxx/include/__cxx03/cstdarg
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CSTDARG
-#define _LIBCPP_CSTDARG
+#ifndef _LIBCPP___CXX03_CSTDARG
+#define _LIBCPP___CXX03_CSTDARG
/*
cstdarg synopsis
@@ -36,7 +36,7 @@ Types:
// <stdarg.h> is not provided by libc++
#if __has_include(<stdarg.h>)
# include <stdarg.h>
-# ifdef _LIBCPP_STDARG_H
+# ifdef _LIBCPP___CXX03_STDARG_H
# error "If libc++ starts defining <stdarg.h>, the __has_include check should move to libc++'s <stdarg.h>"
# endif
#endif
@@ -51,4 +51,4 @@ using ::va_list _LIBCPP_USING_IF_EXISTS;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_CSTDARG
+#endif // _LIBCPP___CXX03_CSTDARG
diff --git a/libcxx/include/__cxx03/cstdbool b/libcxx/include/__cxx03/cstdbool
index 7449c407801033..16053e239c935b 100644
--- a/libcxx/include/__cxx03/cstdbool
+++ b/libcxx/include/__cxx03/cstdbool
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CSTDBOOL
-#define _LIBCPP_CSTDBOOL
+#ifndef _LIBCPP___CXX03_CSTDBOOL
+#define _LIBCPP___CXX03_CSTDBOOL
/*
cstdbool synopsis
@@ -28,4 +28,4 @@ Macros:
#undef __bool_true_false_are_defined
#define __bool_true_false_are_defined 1
-#endif // _LIBCPP_CSTDBOOL
+#endif // _LIBCPP___CXX03_CSTDBOOL
diff --git a/libcxx/include/__cxx03/cstddef b/libcxx/include/__cxx03/cstddef
index 284f2fb465617a..38f89a77d1ce7e 100644
--- a/libcxx/include/__cxx03/cstddef
+++ b/libcxx/include/__cxx03/cstddef
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CSTDDEF
-#define _LIBCPP_CSTDDEF
+#ifndef _LIBCPP___CXX03_CSTDDEF
+#define _LIBCPP___CXX03_CSTDDEF
/*
cstddef synopsis
@@ -41,7 +41,7 @@ Types:
#include <__cxx03/stddef.h>
-#ifndef _LIBCPP_STDDEF_H
+#ifndef _LIBCPP___CXX03_STDDEF_H
# error <cstddef> tried including <stddef.h> but didn't find libc++'s <stddef.h> header. \
This usually means that your header search paths are not configured properly. \
The header search paths should contain the C++ Standard Library headers before \
@@ -130,4 +130,4 @@ template <class _Integer, __enable_if_t<is_integral<_Integer>::value, int> = 0>
#endif
-#endif // _LIBCPP_CSTDDEF
+#endif // _LIBCPP___CXX03_CSTDDEF
diff --git a/libcxx/include/__cxx03/cstdint b/libcxx/include/__cxx03/cstdint
index 8dd7e8510130d5..876abb7480bc12 100644
--- a/libcxx/include/__cxx03/cstdint
+++ b/libcxx/include/__cxx03/cstdint
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CSTDINT
-#define _LIBCPP_CSTDINT
+#ifndef _LIBCPP___CXX03_CSTDINT
+#define _LIBCPP___CXX03_CSTDINT
/*
cstdint synopsis
@@ -144,7 +144,7 @@ Types:
#include <__cxx03/stdint.h>
-#ifndef _LIBCPP_STDINT_H
+#ifndef _LIBCPP___CXX03_STDINT_H
# error <cstdint> tried including <stdint.h> but didn't find libc++'s <stdint.h> header. \
This usually means that your header search paths are not configured properly. \
The header search paths should contain the C++ Standard Library headers before \
@@ -196,4 +196,4 @@ using ::uintmax_t _LIBCPP_USING_IF_EXISTS;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_CSTDINT
+#endif // _LIBCPP___CXX03_CSTDINT
diff --git a/libcxx/include/__cxx03/cstdio b/libcxx/include/__cxx03/cstdio
index 3085e6d3733ace..801a58625c4cae 100644
--- a/libcxx/include/__cxx03/cstdio
+++ b/libcxx/include/__cxx03/cstdio
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CSTDIO
-#define _LIBCPP_CSTDIO
+#ifndef _LIBCPP___CXX03_CSTDIO
+#define _LIBCPP___CXX03_CSTDIO
/*
cstdio synopsis
@@ -99,7 +99,7 @@ void perror(const char* s);
#include <__cxx03/stdio.h>
-#ifndef _LIBCPP_STDIO_H
+#ifndef _LIBCPP___CXX03_STDIO_H
# error <cstdio> tried including <stdio.h> but didn't find libc++'s <stdio.h> header. \
This usually means that your header search paths are not configured properly. \
The header search paths should contain the C++ Standard Library headers before \
@@ -171,4 +171,4 @@ using ::vprintf _LIBCPP_USING_IF_EXISTS;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_CSTDIO
+#endif // _LIBCPP___CXX03_CSTDIO
diff --git a/libcxx/include/__cxx03/cstdlib b/libcxx/include/__cxx03/cstdlib
index 078db2b1a9115d..ec4757dc3d35d7 100644
--- a/libcxx/include/__cxx03/cstdlib
+++ b/libcxx/include/__cxx03/cstdlib
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CSTDLIB
-#define _LIBCPP_CSTDLIB
+#ifndef _LIBCPP___CXX03_CSTDLIB
+#define _LIBCPP___CXX03_CSTDLIB
/*
cstdlib synopsis
@@ -85,7 +85,7 @@ void *aligned_alloc(size_t alignment, size_t size); // C11
#include <__cxx03/stdlib.h>
-#ifndef _LIBCPP_STDLIB_H
+#ifndef _LIBCPP___CXX03_STDLIB_H
# error <cstdlib> tried including <stdlib.h> but didn't find libc++'s <stdlib.h> header. \
This usually means that your header search paths are not configured properly. \
The header search paths should contain the C++ Standard Library headers before \
@@ -151,4 +151,4 @@ using ::aligned_alloc _LIBCPP_USING_IF_EXISTS;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_CSTDLIB
+#endif // _LIBCPP___CXX03_CSTDLIB
diff --git a/libcxx/include/__cxx03/cstring b/libcxx/include/__cxx03/cstring
index 693777c0f0bdff..4d57420f54f54d 100644
--- a/libcxx/include/__cxx03/cstring
+++ b/libcxx/include/__cxx03/cstring
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CSTRING
-#define _LIBCPP_CSTRING
+#ifndef _LIBCPP___CXX03_CSTRING
+#define _LIBCPP___CXX03_CSTRING
/*
cstring synopsis
@@ -61,7 +61,7 @@ size_t strlen(const char* s);
#include <__cxx03/string.h>
-#ifndef _LIBCPP_STRING_H
+#ifndef _LIBCPP___CXX03_STRING_H
# error <cstring> tried including <string.h> but didn't find libc++'s <string.h> header. \
This usually means that your header search paths are not configured properly. \
The header search paths should contain the C++ Standard Library headers before \
@@ -101,4 +101,4 @@ using ::strlen _LIBCPP_USING_IF_EXISTS;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_CSTRING
+#endif // _LIBCPP___CXX03_CSTRING
diff --git a/libcxx/include/__cxx03/ctgmath b/libcxx/include/__cxx03/ctgmath
index 5da5f6dfb66d6d..e3fa00fd68ab2d 100644
--- a/libcxx/include/__cxx03/ctgmath
+++ b/libcxx/include/__cxx03/ctgmath
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CTGMATH
-#define _LIBCPP_CTGMATH
+#ifndef _LIBCPP___CXX03_CTGMATH
+#define _LIBCPP___CXX03_CTGMATH
/*
ctgmath synopsis
@@ -25,4 +25,4 @@
# pragma GCC system_header
#endif
-#endif // _LIBCPP_CTGMATH
+#endif // _LIBCPP___CXX03_CTGMATH
diff --git a/libcxx/include/__cxx03/ctime b/libcxx/include/__cxx03/ctime
index 84080a9c5e953b..07432e6e9a43d7 100644
--- a/libcxx/include/__cxx03/ctime
+++ b/libcxx/include/__cxx03/ctime
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CTIME
-#define _LIBCPP_CTIME
+#ifndef _LIBCPP___CXX03_CTIME
+#define _LIBCPP___CXX03_CTIME
/*
ctime synopsis
@@ -50,7 +50,7 @@ int timespec_get( struct timespec *ts, int base); // C++17
// <time.h> is not provided by libc++
#if __has_include(<time.h>)
# include <time.h>
-# ifdef _LIBCPP_TIME_H
+# ifdef _LIBCPP___CXX03_TIME_H
# error "If libc++ starts defining <time.h>, the __has_include check should move to libc++'s <time.h>"
# endif
#endif
@@ -83,4 +83,4 @@ using ::timespec_get _LIBCPP_USING_IF_EXISTS;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_CTIME
+#endif // _LIBCPP___CXX03_CTIME
diff --git a/libcxx/include/__cxx03/ctype.h b/libcxx/include/__cxx03/ctype.h
index e169040376d4d1..cd4097ab012ffe 100644
--- a/libcxx/include/__cxx03/ctype.h
+++ b/libcxx/include/__cxx03/ctype.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CTYPE_H
-#define _LIBCPP_CTYPE_H
+#ifndef _LIBCPP___CXX03_CTYPE_H
+#define _LIBCPP___CXX03_CTYPE_H
/*
ctype.h synopsis
@@ -58,4 +58,4 @@ int toupper(int c);
#endif
-#endif // _LIBCPP_CTYPE_H
+#endif // _LIBCPP___CXX03_CTYPE_H
diff --git a/libcxx/include/__cxx03/cuchar b/libcxx/include/__cxx03/cuchar
index 1029f7376756b9..c9da0e7e55f0b1 100644
--- a/libcxx/include/__cxx03/cuchar
+++ b/libcxx/include/__cxx03/cuchar
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CUCHAR
-#define _LIBCPP_CUCHAR
+#ifndef _LIBCPP___CXX03_CUCHAR
+#define _LIBCPP___CXX03_CUCHAR
/*
cuchar synopsis // since C++11
@@ -40,7 +40,7 @@ size_t c32rtomb(char* s, char32_t c32, mbstate_t* ps);
#include <__cxx03/uchar.h>
-#ifndef _LIBCPP_UCHAR_H
+#ifndef _LIBCPP___CXX03_UCHAR_H
# error <cuchar> tried including <uchar.h> but didn't find libc++'s <uchar.h> header. \
This usually means that your header search paths are not configured properly. \
The header search paths should contain the C++ Standard Library headers before \
@@ -72,4 +72,4 @@ using ::c32rtomb _LIBCPP_USING_IF_EXISTS;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_CUCHAR
+#endif // _LIBCPP___CXX03_CUCHAR
diff --git a/libcxx/include/__cxx03/cwchar b/libcxx/include/__cxx03/cwchar
index 50fa5607fc4a1b..2da11571df1f10 100644
--- a/libcxx/include/__cxx03/cwchar
+++ b/libcxx/include/__cxx03/cwchar
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CWCHAR
-#define _LIBCPP_CWCHAR
+#ifndef _LIBCPP___CXX03_CWCHAR
+#define _LIBCPP___CXX03_CWCHAR
/*
cwchar synopsis
@@ -112,7 +112,7 @@ size_t wcsrtombs(char* restrict dst, const wchar_t** restrict src, size_t len,
#include <__cxx03/wchar.h>
-#ifndef _LIBCPP_WCHAR_H
+#ifndef _LIBCPP___CXX03_WCHAR_H
# error <cwchar> tried including <wchar.h> but didn't find libc++'s <wchar.h> header. \
This usually means that your header search paths are not configured properly. \
The header search paths should contain the C++ Standard Library headers before \
@@ -258,4 +258,4 @@ _LIBCPP_END_NAMESPACE_STD
# include <__cxx03/cstddef>
#endif
-#endif // _LIBCPP_CWCHAR
+#endif // _LIBCPP___CXX03_CWCHAR
diff --git a/libcxx/include/__cxx03/cwctype b/libcxx/include/__cxx03/cwctype
index 791277f9c10323..5228124936c6cf 100644
--- a/libcxx/include/__cxx03/cwctype
+++ b/libcxx/include/__cxx03/cwctype
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_CWCTYPE
-#define _LIBCPP_CWCTYPE
+#ifndef _LIBCPP___CXX03_CWCTYPE
+#define _LIBCPP___CXX03_CWCTYPE
/*
cwctype synopsis
@@ -54,7 +54,7 @@ wctrans_t wctrans(const char* property);
#include <__cxx03/wctype.h>
-#ifndef _LIBCPP_WCTYPE_H
+#ifndef _LIBCPP___CXX03_WCTYPE_H
# error <cwctype> tried including <wctype.h> but didn't find libc++'s <wctype.h> header. \
This usually means that your header search paths are not configured properly. \
The header search paths should contain the C++ Standard Library headers before \
@@ -94,4 +94,4 @@ using ::wctrans _LIBCPP_USING_IF_EXISTS;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_CWCTYPE
+#endif // _LIBCPP___CXX03_CWCTYPE
diff --git a/libcxx/include/__cxx03/deque b/libcxx/include/__cxx03/deque
index 7525a5b59a9bd1..8e40befbb71ea7 100644
--- a/libcxx/include/__cxx03/deque
+++ b/libcxx/include/__cxx03/deque
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_DEQUE
-#define _LIBCPP_DEQUE
+#ifndef _LIBCPP___CXX03_DEQUE
+#define _LIBCPP___CXX03_DEQUE
/*
deque synopsis
@@ -2618,4 +2618,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/typeinfo>
#endif
-#endif // _LIBCPP_DEQUE
+#endif // _LIBCPP___CXX03_DEQUE
diff --git a/libcxx/include/__cxx03/errno.h b/libcxx/include/__cxx03/errno.h
index 0ebd03c0b6a625..440235bef8545f 100644
--- a/libcxx/include/__cxx03/errno.h
+++ b/libcxx/include/__cxx03/errno.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_ERRNO_H
-#define _LIBCPP_ERRNO_H
+#ifndef _LIBCPP___CXX03_ERRNO_H
+#define _LIBCPP___CXX03_ERRNO_H
/*
errno.h synopsis
@@ -396,4 +396,4 @@ static const int __elast2 = 105;
#endif // __cplusplus
-#endif // _LIBCPP_ERRNO_H
+#endif // _LIBCPP___CXX03_ERRNO_H
diff --git a/libcxx/include/__cxx03/exception b/libcxx/include/__cxx03/exception
index a6cb38526ff367..17a8aefd29bff1 100644
--- a/libcxx/include/__cxx03/exception
+++ b/libcxx/include/__cxx03/exception
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_EXCEPTION
-#define _LIBCPP_EXCEPTION
+#ifndef _LIBCPP___CXX03_EXCEPTION
+#define _LIBCPP___CXX03_EXCEPTION
/*
exception synopsis
@@ -93,4 +93,4 @@ template <class E> void rethrow_if_nested(const E& e);
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_EXCEPTION
+#endif // _LIBCPP___CXX03_EXCEPTION
diff --git a/libcxx/include/__cxx03/execution b/libcxx/include/__cxx03/execution
index c04c665e6908bf..b056c9c226e188 100644
--- a/libcxx/include/__cxx03/execution
+++ b/libcxx/include/__cxx03/execution
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_EXECUTION
-#define _LIBCPP_EXECUTION
+#ifndef _LIBCPP___CXX03_EXECUTION
+#define _LIBCPP___CXX03_EXECUTION
/*
namespace std::execution {
@@ -146,4 +146,4 @@ _LIBCPP_END_NAMESPACE_STD
# include <__cxx03/cstddef>
#endif
-#endif // _LIBCPP_EXECUTION
+#endif // _LIBCPP___CXX03_EXECUTION
diff --git a/libcxx/include/__cxx03/expected b/libcxx/include/__cxx03/expected
index c3bd4af17414db..6c5ebf190a8982 100644
--- a/libcxx/include/__cxx03/expected
+++ b/libcxx/include/__cxx03/expected
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_EXPECTED
-#define _LIBCPP_EXPECTED
+#ifndef _LIBCPP___CXX03_EXPECTED
+#define _LIBCPP___CXX03_EXPECTED
/*
Header <expected> synopsis
@@ -59,4 +59,4 @@ namespace std {
# include <__cxx03/new>
#endif
-#endif // _LIBCPP_EXPECTED
+#endif // _LIBCPP___CXX03_EXPECTED
diff --git a/libcxx/include/__cxx03/experimental/__config b/libcxx/include/__cxx03/experimental/__config
index 8f6065f919c7c4..027522ed357716 100644
--- a/libcxx/include/__cxx03/experimental/__config
+++ b/libcxx/include/__cxx03/experimental/__config
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_EXPERIMENTAL_CONFIG
-#define _LIBCPP_EXPERIMENTAL_CONFIG
+#ifndef _LIBCPP___CXX03_EXPERIMENTAL_CONFIG
+#define _LIBCPP___CXX03_EXPERIMENTAL_CONFIG
#include <__cxx03/__config>
diff --git a/libcxx/include/__cxx03/experimental/__simd/aligned_tag.h b/libcxx/include/__cxx03/experimental/__simd/aligned_tag.h
index bbe6ee04d7c5ec..ea0ddd94e46870 100644
--- a/libcxx/include/__cxx03/experimental/__simd/aligned_tag.h
+++ b/libcxx/include/__cxx03/experimental/__simd/aligned_tag.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_EXPERIMENTAL___SIMD_ALIGNED_TAG_H
-#define _LIBCPP_EXPERIMENTAL___SIMD_ALIGNED_TAG_H
+#ifndef _LIBCPP___CXX03_EXPERIMENTAL___SIMD_ALIGNED_TAG_H
+#define _LIBCPP___CXX03_EXPERIMENTAL___SIMD_ALIGNED_TAG_H
#include <__cxx03/__memory/assume_aligned.h>
#include <__cxx03/__type_traits/remove_const.h>
@@ -72,4 +72,4 @@ inline constexpr overaligned_tag<_Np> overaligned{};
_LIBCPP_END_NAMESPACE_EXPERIMENTAL
#endif // _LIBCPP_STD_VER >= 17 && defined(_LIBCPP_ENABLE_EXPERIMENTAL)
-#endif // _LIBCPP_EXPERIMENTAL___SIMD_ALIGNED_TAG_H
+#endif // _LIBCPP___CXX03_EXPERIMENTAL___SIMD_ALIGNED_TAG_H
diff --git a/libcxx/include/__cxx03/experimental/__simd/declaration.h b/libcxx/include/__cxx03/experimental/__simd/declaration.h
index 7a57e3b8889169..94f068ee8b2af6 100644
--- a/libcxx/include/__cxx03/experimental/__simd/declaration.h
+++ b/libcxx/include/__cxx03/experimental/__simd/declaration.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_EXPERIMENTAL___SIMD_DECLARATION_H
-#define _LIBCPP_EXPERIMENTAL___SIMD_DECLARATION_H
+#ifndef _LIBCPP___CXX03_EXPERIMENTAL___SIMD_DECLARATION_H
+#define _LIBCPP___CXX03_EXPERIMENTAL___SIMD_DECLARATION_H
#include <__cxx03/cstddef>
#include <__cxx03/experimental/__config>
@@ -78,4 +78,4 @@ class simd_mask;
_LIBCPP_END_NAMESPACE_EXPERIMENTAL
#endif // _LIBCPP_STD_VER >= 17 && defined(_LIBCPP_ENABLE_EXPERIMENTAL)
-#endif // _LIBCPP_EXPERIMENTAL___SIMD_DECLARATION_H
+#endif // _LIBCPP___CXX03_EXPERIMENTAL___SIMD_DECLARATION_H
diff --git a/libcxx/include/__cxx03/experimental/__simd/reference.h b/libcxx/include/__cxx03/experimental/__simd/reference.h
index b9e0289c0ee9b2..b7330d4b175cb0 100644
--- a/libcxx/include/__cxx03/experimental/__simd/reference.h
+++ b/libcxx/include/__cxx03/experimental/__simd/reference.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_EXPERIMENTAL___SIMD_REFERENCE_H
-#define _LIBCPP_EXPERIMENTAL___SIMD_REFERENCE_H
+#ifndef _LIBCPP___CXX03_EXPERIMENTAL___SIMD_REFERENCE_H
+#define _LIBCPP___CXX03_EXPERIMENTAL___SIMD_REFERENCE_H
#include <__cxx03/__type_traits/is_assignable.h>
#include <__cxx03/__type_traits/is_same.h>
@@ -102,4 +102,4 @@ _LIBCPP_END_NAMESPACE_EXPERIMENTAL
_LIBCPP_POP_MACROS
-#endif // _LIBCPP_EXPERIMENTAL___SIMD_REFERENCE_H
+#endif // _LIBCPP___CXX03_EXPERIMENTAL___SIMD_REFERENCE_H
diff --git a/libcxx/include/__cxx03/experimental/__simd/scalar.h b/libcxx/include/__cxx03/experimental/__simd/scalar.h
index 938fee89fa47ad..5f582c6dd8ea70 100644
--- a/libcxx/include/__cxx03/experimental/__simd/scalar.h
+++ b/libcxx/include/__cxx03/experimental/__simd/scalar.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_EXPERIMENTAL___SIMD_SCALAR_H
-#define _LIBCPP_EXPERIMENTAL___SIMD_SCALAR_H
+#ifndef _LIBCPP___CXX03_EXPERIMENTAL___SIMD_SCALAR_H
+#define _LIBCPP___CXX03_EXPERIMENTAL___SIMD_SCALAR_H
#include <__cxx03/__assert>
#include <__cxx03/cstddef>
@@ -84,4 +84,4 @@ struct __mask_operations<_Tp, simd_abi::__scalar> {
_LIBCPP_END_NAMESPACE_EXPERIMENTAL
#endif // _LIBCPP_STD_VER >= 17 && defined(_LIBCPP_ENABLE_EXPERIMENTAL)
-#endif // _LIBCPP_EXPERIMENTAL___SIMD_SCALAR_H
+#endif // _LIBCPP___CXX03_EXPERIMENTAL___SIMD_SCALAR_H
diff --git a/libcxx/include/__cxx03/experimental/__simd/simd.h b/libcxx/include/__cxx03/experimental/__simd/simd.h
index 4e170997fbada8..8f9d94d9ae5359 100644
--- a/libcxx/include/__cxx03/experimental/__simd/simd.h
+++ b/libcxx/include/__cxx03/experimental/__simd/simd.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_EXPERIMENTAL___SIMD_SIMD_H
-#define _LIBCPP_EXPERIMENTAL___SIMD_SIMD_H
+#ifndef _LIBCPP___CXX03_EXPERIMENTAL___SIMD_SIMD_H
+#define _LIBCPP___CXX03_EXPERIMENTAL___SIMD_SIMD_H
#include <__cxx03/__type_traits/is_same.h>
#include <__cxx03/__type_traits/remove_cvref.h>
@@ -99,4 +99,4 @@ using fixed_size_simd = simd<_Tp, simd_abi::fixed_size<_Np>>;
_LIBCPP_END_NAMESPACE_EXPERIMENTAL
#endif // _LIBCPP_STD_VER >= 17 && defined(_LIBCPP_ENABLE_EXPERIMENTAL)
-#endif // _LIBCPP_EXPERIMENTAL___SIMD_SIMD_H
+#endif // _LIBCPP___CXX03_EXPERIMENTAL___SIMD_SIMD_H
diff --git a/libcxx/include/__cxx03/experimental/__simd/simd_mask.h b/libcxx/include/__cxx03/experimental/__simd/simd_mask.h
index fa2f134ea7a3f8..34658d0e2eeaed 100644
--- a/libcxx/include/__cxx03/experimental/__simd/simd_mask.h
+++ b/libcxx/include/__cxx03/experimental/__simd/simd_mask.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_EXPERIMENTAL___SIMD_SIMD_MASK_H
-#define _LIBCPP_EXPERIMENTAL___SIMD_SIMD_MASK_H
+#ifndef _LIBCPP___CXX03_EXPERIMENTAL___SIMD_SIMD_MASK_H
+#define _LIBCPP___CXX03_EXPERIMENTAL___SIMD_SIMD_MASK_H
#include <__cxx03/__type_traits/is_same.h>
#include <__cxx03/cstddef>
@@ -87,4 +87,4 @@ using fixed_size_simd_mask = simd_mask<_Tp, simd_abi::fixed_size<_Np>>;
_LIBCPP_END_NAMESPACE_EXPERIMENTAL
#endif // _LIBCPP_STD_VER >= 17 && defined(_LIBCPP_ENABLE_EXPERIMENTAL)
-#endif // _LIBCPP_EXPERIMENTAL___SIMD_SIMD_MASK_H
+#endif // _LIBCPP___CXX03_EXPERIMENTAL___SIMD_SIMD_MASK_H
diff --git a/libcxx/include/__cxx03/experimental/__simd/traits.h b/libcxx/include/__cxx03/experimental/__simd/traits.h
index 3a0480b512e2e1..fbaca2660e4331 100644
--- a/libcxx/include/__cxx03/experimental/__simd/traits.h
+++ b/libcxx/include/__cxx03/experimental/__simd/traits.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_EXPERIMENTAL___SIMD_TRAITS_H
-#define _LIBCPP_EXPERIMENTAL___SIMD_TRAITS_H
+#ifndef _LIBCPP___CXX03_EXPERIMENTAL___SIMD_TRAITS_H
+#define _LIBCPP___CXX03_EXPERIMENTAL___SIMD_TRAITS_H
#include <__cxx03/__bit/bit_ceil.h>
#include <__cxx03/__type_traits/integral_constant.h>
@@ -72,4 +72,4 @@ inline constexpr size_t memory_alignment_v = memory_alignment<_Tp, _Up>::value;
_LIBCPP_END_NAMESPACE_EXPERIMENTAL
#endif // _LIBCPP_STD_VER >= 17 && defined(_LIBCPP_ENABLE_EXPERIMENTAL)
-#endif // _LIBCPP_EXPERIMENTAL___SIMD_TRAITS_H
+#endif // _LIBCPP___CXX03_EXPERIMENTAL___SIMD_TRAITS_H
diff --git a/libcxx/include/__cxx03/experimental/__simd/utility.h b/libcxx/include/__cxx03/experimental/__simd/utility.h
index 803378ddcdd3d7..c047059abf04a5 100644
--- a/libcxx/include/__cxx03/experimental/__simd/utility.h
+++ b/libcxx/include/__cxx03/experimental/__simd/utility.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_EXPERIMENTAL___SIMD_UTILITY_H
-#define _LIBCPP_EXPERIMENTAL___SIMD_UTILITY_H
+#ifndef _LIBCPP___CXX03_EXPERIMENTAL___SIMD_UTILITY_H
+#define _LIBCPP___CXX03_EXPERIMENTAL___SIMD_UTILITY_H
#include <__cxx03/__type_traits/is_arithmetic.h>
#include <__cxx03/__type_traits/is_const.h>
@@ -100,4 +100,4 @@ _LIBCPP_END_NAMESPACE_EXPERIMENTAL
_LIBCPP_POP_MACROS
-#endif // _LIBCPP_EXPERIMENTAL___SIMD_UTILITY_H
+#endif // _LIBCPP___CXX03_EXPERIMENTAL___SIMD_UTILITY_H
diff --git a/libcxx/include/__cxx03/experimental/__simd/vec_ext.h b/libcxx/include/__cxx03/experimental/__simd/vec_ext.h
index 99917e51a2217a..a77fbc31fe836a 100644
--- a/libcxx/include/__cxx03/experimental/__simd/vec_ext.h
+++ b/libcxx/include/__cxx03/experimental/__simd/vec_ext.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_EXPERIMENTAL___SIMD_VEC_EXT_H
-#define _LIBCPP_EXPERIMENTAL___SIMD_VEC_EXT_H
+#ifndef _LIBCPP___CXX03_EXPERIMENTAL___SIMD_VEC_EXT_H
+#define _LIBCPP___CXX03_EXPERIMENTAL___SIMD_VEC_EXT_H
#include <__cxx03/__assert>
#include <__cxx03/__bit/bit_ceil.h>
@@ -116,4 +116,4 @@ struct __mask_operations<_Tp, simd_abi::__vec_ext<_Np>> {
_LIBCPP_END_NAMESPACE_EXPERIMENTAL
#endif // _LIBCPP_STD_VER >= 17 && defined(_LIBCPP_ENABLE_EXPERIMENTAL)
-#endif // _LIBCPP_EXPERIMENTAL___SIMD_VEC_EXT_H
+#endif // _LIBCPP___CXX03_EXPERIMENTAL___SIMD_VEC_EXT_H
diff --git a/libcxx/include/__cxx03/experimental/iterator b/libcxx/include/__cxx03/experimental/iterator
index d579927c548cfa..b639c5900832db 100644
--- a/libcxx/include/__cxx03/experimental/iterator
+++ b/libcxx/include/__cxx03/experimental/iterator
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_EXPERIMENTAL_ITERATOR
-#define _LIBCPP_EXPERIMENTAL_ITERATOR
+#ifndef _LIBCPP___CXX03_EXPERIMENTAL_ITERATOR
+#define _LIBCPP___CXX03_EXPERIMENTAL_ITERATOR
/*
namespace std {
@@ -124,4 +124,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_EXPERIMENTAL_ITERATOR
+#endif // _LIBCPP___CXX03_EXPERIMENTAL_ITERATOR
diff --git a/libcxx/include/__cxx03/experimental/memory b/libcxx/include/__cxx03/experimental/memory
index 6e70a6d2f87c28..37b271087275cf 100644
--- a/libcxx/include/__cxx03/experimental/memory
+++ b/libcxx/include/__cxx03/experimental/memory
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_EXPERIMENTAL_MEMORY
-#define _LIBCPP_EXPERIMENTAL_MEMORY
+#ifndef _LIBCPP___CXX03_EXPERIMENTAL_MEMORY
+#define _LIBCPP___CXX03_EXPERIMENTAL_MEMORY
/*
experimental/memory synopsis
@@ -195,4 +195,4 @@ _LIBCPP_END_NAMESPACE_STD
# include <__cxx03/limits>
#endif
-#endif /* _LIBCPP_EXPERIMENTAL_MEMORY */
+#endif /* _LIBCPP___CXX03_EXPERIMENTAL_MEMORY */
diff --git a/libcxx/include/__cxx03/experimental/propagate_const b/libcxx/include/__cxx03/experimental/propagate_const
index d439f7c52c0a60..7fc9d35ba8f3d0 100644
--- a/libcxx/include/__cxx03/experimental/propagate_const
+++ b/libcxx/include/__cxx03/experimental/propagate_const
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_EXPERIMENTAL_PROPAGATE_CONST
-#define _LIBCPP_EXPERIMENTAL_PROPAGATE_CONST
+#ifndef _LIBCPP___CXX03_EXPERIMENTAL_PROPAGATE_CONST
+#define _LIBCPP___CXX03_EXPERIMENTAL_PROPAGATE_CONST
/*
propagate_const synopsis
@@ -487,4 +487,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_EXPERIMENTAL_PROPAGATE_CONST
+#endif // _LIBCPP___CXX03_EXPERIMENTAL_PROPAGATE_CONST
diff --git a/libcxx/include/__cxx03/experimental/simd b/libcxx/include/__cxx03/experimental/simd
index 4b0461cf4ef367..553f97594c5ce3 100644
--- a/libcxx/include/__cxx03/experimental/simd
+++ b/libcxx/include/__cxx03/experimental/simd
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_EXPERIMENTAL_SIMD
-#define _LIBCPP_EXPERIMENTAL_SIMD
+#ifndef _LIBCPP___CXX03_EXPERIMENTAL_SIMD
+#define _LIBCPP___CXX03_EXPERIMENTAL_SIMD
/*
experimental/simd synopsis
@@ -85,4 +85,4 @@ inline namespace parallelism_v2 {
#include <__cxx03/experimental/__simd/traits.h>
#include <__cxx03/experimental/__simd/vec_ext.h>
-#endif /* _LIBCPP_EXPERIMENTAL_SIMD */
+#endif /* _LIBCPP___CXX03_EXPERIMENTAL_SIMD */
diff --git a/libcxx/include/__cxx03/experimental/type_traits b/libcxx/include/__cxx03/experimental/type_traits
index 47f29d83b0e6d0..c7cfef14a3c068 100644
--- a/libcxx/include/__cxx03/experimental/type_traits
+++ b/libcxx/include/__cxx03/experimental/type_traits
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_EXPERIMENTAL_TYPE_TRAITS
-#define _LIBCPP_EXPERIMENTAL_TYPE_TRAITS
+#ifndef _LIBCPP___CXX03_EXPERIMENTAL_TYPE_TRAITS
+#define _LIBCPP___CXX03_EXPERIMENTAL_TYPE_TRAITS
/**
experimental/type_traits synopsis
@@ -150,4 +150,4 @@ _LIBCPP_END_NAMESPACE_LFTS
#endif /* _LIBCPP_STD_VER >= 14 */
-#endif /* _LIBCPP_EXPERIMENTAL_TYPE_TRAITS */
+#endif /* _LIBCPP___CXX03_EXPERIMENTAL_TYPE_TRAITS */
diff --git a/libcxx/include/__cxx03/experimental/utility b/libcxx/include/__cxx03/experimental/utility
index 73239e7a4856ac..4e8156ae8728f0 100644
--- a/libcxx/include/__cxx03/experimental/utility
+++ b/libcxx/include/__cxx03/experimental/utility
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_EXPERIMENTAL_UTILITY
-#define _LIBCPP_EXPERIMENTAL_UTILITY
+#ifndef _LIBCPP___CXX03_EXPERIMENTAL_UTILITY
+#define _LIBCPP___CXX03_EXPERIMENTAL_UTILITY
/*
experimental/utility synopsis
@@ -43,4 +43,4 @@ struct _LIBCPP_TEMPLATE_VIS erased_type {};
_LIBCPP_END_NAMESPACE_LFTS
-#endif /* _LIBCPP_EXPERIMENTAL_UTILITY */
+#endif /* _LIBCPP___CXX03_EXPERIMENTAL_UTILITY */
diff --git a/libcxx/include/__cxx03/ext/__hash b/libcxx/include/__cxx03/ext/__hash
index 3b363257b1a0b1..8f27c7ea105c55 100644
--- a/libcxx/include/__cxx03/ext/__hash
+++ b/libcxx/include/__cxx03/ext/__hash
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_EXT_HASH
-#define _LIBCPP_EXT_HASH
+#ifndef _LIBCPP___CXX03_EXT_HASH
+#define _LIBCPP___CXX03_EXT_HASH
#pragma GCC system_header
@@ -82,4 +82,4 @@ struct _LIBCPP_TEMPLATE_VIS hash<unsigned long> : public std::__unary_function<u
};
} // namespace __gnu_cxx
-#endif // _LIBCPP_EXT_HASH
+#endif // _LIBCPP___CXX03_EXT_HASH
diff --git a/libcxx/include/__cxx03/ext/hash_map b/libcxx/include/__cxx03/ext/hash_map
index bffb68672e4384..f075ed19ea40fa 100644
--- a/libcxx/include/__cxx03/ext/hash_map
+++ b/libcxx/include/__cxx03/ext/hash_map
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_HASH_MAP
-#define _LIBCPP_HASH_MAP
+#ifndef _LIBCPP___CXX03_HASH_MAP
+#define _LIBCPP___CXX03_HASH_MAP
/*
@@ -869,4 +869,4 @@ inline _LIBCPP_HIDE_FROM_ABI bool operator!=(const hash_multimap<_Key, _Tp, _Has
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_HASH_MAP
+#endif // _LIBCPP___CXX03_HASH_MAP
diff --git a/libcxx/include/__cxx03/ext/hash_set b/libcxx/include/__cxx03/ext/hash_set
index 3886e578ec4aa5..fefad7c5833b11 100644
--- a/libcxx/include/__cxx03/ext/hash_set
+++ b/libcxx/include/__cxx03/ext/hash_set
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_HASH_SET
-#define _LIBCPP_HASH_SET
+#ifndef _LIBCPP___CXX03_HASH_SET
+#define _LIBCPP___CXX03_HASH_SET
/*
@@ -581,4 +581,4 @@ inline _LIBCPP_HIDE_FROM_ABI bool operator!=(const hash_multiset<_Value, _Hash,
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_HASH_SET
+#endif // _LIBCPP___CXX03_HASH_SET
diff --git a/libcxx/include/__cxx03/fenv.h b/libcxx/include/__cxx03/fenv.h
index dd9f381892b547..87fe9d18b2b774 100644
--- a/libcxx/include/__cxx03/fenv.h
+++ b/libcxx/include/__cxx03/fenv.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_FENV_H
-#define _LIBCPP_FENV_H
+#ifndef _LIBCPP___CXX03_FENV_H
+#define _LIBCPP___CXX03_FENV_H
/*
fenv.h synopsis
@@ -111,4 +111,4 @@ extern "C++" {
#endif // defined(__cplusplus)
-#endif // _LIBCPP_FENV_H
+#endif // _LIBCPP___CXX03_FENV_H
diff --git a/libcxx/include/__cxx03/filesystem b/libcxx/include/__cxx03/filesystem
index 2f1393bcbcf614..c991e15b923a9c 100644
--- a/libcxx/include/__cxx03/filesystem
+++ b/libcxx/include/__cxx03/filesystem
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_FILESYSTEM
-#define _LIBCPP_FILESYSTEM
+#ifndef _LIBCPP___CXX03_FILESYSTEM
+#define _LIBCPP___CXX03_FILESYSTEM
/*
filesystem synopsis
@@ -574,4 +574,4 @@ inline constexpr bool std::ranges::enable_view<std::filesystem::recursive_direct
# include <__cxx03/system_error>
#endif
-#endif // _LIBCPP_FILESYSTEM
+#endif // _LIBCPP___CXX03_FILESYSTEM
diff --git a/libcxx/include/__cxx03/float.h b/libcxx/include/__cxx03/float.h
index 535e73e461519e..38f199067f4117 100644
--- a/libcxx/include/__cxx03/float.h
+++ b/libcxx/include/__cxx03/float.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_FLOAT_H
-#define _LIBCPP_FLOAT_H
+#ifndef _LIBCPP___CXX03_FLOAT_H
+#define _LIBCPP___CXX03_FLOAT_H
/*
float.h synopsis
@@ -92,4 +92,4 @@
#endif // __cplusplus
-#endif // _LIBCPP_FLOAT_H
+#endif // _LIBCPP___CXX03_FLOAT_H
diff --git a/libcxx/include/__cxx03/format b/libcxx/include/__cxx03/format
index c8adb186f1024f..0183f8374efd17 100644
--- a/libcxx/include/__cxx03/format
+++ b/libcxx/include/__cxx03/format
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_FORMAT
-#define _LIBCPP_FORMAT
+#ifndef _LIBCPP___CXX03_FORMAT
+#define _LIBCPP___CXX03_FORMAT
/*
@@ -254,4 +254,4 @@ namespace std {
# endif
#endif
-#endif // _LIBCPP_FORMAT
+#endif // _LIBCPP___CXX03_FORMAT
diff --git a/libcxx/include/__cxx03/forward_list b/libcxx/include/__cxx03/forward_list
index c83ab2582372d6..ecffb9c8f3a102 100644
--- a/libcxx/include/__cxx03/forward_list
+++ b/libcxx/include/__cxx03/forward_list
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_FORWARD_LIST
-#define _LIBCPP_FORWARD_LIST
+#ifndef _LIBCPP___CXX03_FORWARD_LIST
+#define _LIBCPP___CXX03_FORWARD_LIST
/*
forward_list synopsis
@@ -1571,4 +1571,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/typeinfo>
#endif
-#endif // _LIBCPP_FORWARD_LIST
+#endif // _LIBCPP___CXX03_FORWARD_LIST
diff --git a/libcxx/include/__cxx03/fstream b/libcxx/include/__cxx03/fstream
index 6fbced3caec3e0..7e43a533fd794a 100644
--- a/libcxx/include/__cxx03/fstream
+++ b/libcxx/include/__cxx03/fstream
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_FSTREAM
-#define _LIBCPP_FSTREAM
+#ifndef _LIBCPP___CXX03_FSTREAM
+#define _LIBCPP___CXX03_FSTREAM
/*
fstream synopsis
@@ -1569,4 +1569,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_FSTREAM
+#endif // _LIBCPP___CXX03_FSTREAM
diff --git a/libcxx/include/__cxx03/functional b/libcxx/include/__cxx03/functional
index 406c2ce2972597..985fcfa9532049 100644
--- a/libcxx/include/__cxx03/functional
+++ b/libcxx/include/__cxx03/functional
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_FUNCTIONAL
-#define _LIBCPP_FUNCTIONAL
+#ifndef _LIBCPP___CXX03_FUNCTIONAL
+#define _LIBCPP___CXX03_FUNCTIONAL
/*
functional synopsis
@@ -595,4 +595,4 @@ POLICY: For non-variadic implementations, the number of arguments is limited
# include <__cxx03/utility>
#endif
-#endif // _LIBCPP_FUNCTIONAL
+#endif // _LIBCPP___CXX03_FUNCTIONAL
diff --git a/libcxx/include/__cxx03/future b/libcxx/include/__cxx03/future
index d40749d7375ea7..f92bc1266939ef 100644
--- a/libcxx/include/__cxx03/future
+++ b/libcxx/include/__cxx03/future
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_FUTURE
-#define _LIBCPP_FUTURE
+#ifndef _LIBCPP___CXX03_FUTURE
+#define _LIBCPP___CXX03_FUTURE
/*
future synopsis
@@ -2059,4 +2059,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/system_error>
#endif
-#endif // _LIBCPP_FUTURE
+#endif // _LIBCPP___CXX03_FUTURE
diff --git a/libcxx/include/__cxx03/initializer_list b/libcxx/include/__cxx03/initializer_list
index b891c5e51b7a1a..4bb2deb01ae6df 100644
--- a/libcxx/include/__cxx03/initializer_list
+++ b/libcxx/include/__cxx03/initializer_list
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_INITIALIZER_LIST
-#define _LIBCPP_INITIALIZER_LIST
+#ifndef _LIBCPP___CXX03_INITIALIZER_LIST
+#define _LIBCPP___CXX03_INITIALIZER_LIST
/*
initializer_list synopsis
@@ -95,4 +95,4 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 const _Ep* end(initia
} // namespace std
-#endif // _LIBCPP_INITIALIZER_LIST
+#endif // _LIBCPP___CXX03_INITIALIZER_LIST
diff --git a/libcxx/include/__cxx03/inttypes.h b/libcxx/include/__cxx03/inttypes.h
index 9101fab9ab080b..82acd87f5e8eb2 100644
--- a/libcxx/include/__cxx03/inttypes.h
+++ b/libcxx/include/__cxx03/inttypes.h
@@ -7,12 +7,12 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_INTTYPES_H
+#ifndef _LIBCPP___CXX03_INTTYPES_H
// AIX system headers need inttypes.h to be re-enterable while _STD_TYPES_T
// is defined until an inclusion of it without _STD_TYPES_T occurs, in which
// case the header guard macro is defined.
#if !defined(_AIX) || !defined(_STD_TYPES_T)
-# define _LIBCPP_INTTYPES_H
+# define _LIBCPP___CXX03_INTTYPES_H
#endif // _STD_TYPES_T
/*
@@ -261,4 +261,4 @@ uintmax_t wcstoumax(const wchar_t* restrict nptr, wchar_t** restrict endptr, int
#endif // __cplusplus
-#endif // _LIBCPP_INTTYPES_H
+#endif // _LIBCPP___CXX03_INTTYPES_H
diff --git a/libcxx/include/__cxx03/iomanip b/libcxx/include/__cxx03/iomanip
index 768bee9f22664b..8f75e23f67ac7f 100644
--- a/libcxx/include/__cxx03/iomanip
+++ b/libcxx/include/__cxx03/iomanip
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_IOMANIP
-#define _LIBCPP_IOMANIP
+#ifndef _LIBCPP___CXX03_IOMANIP
+#define _LIBCPP___CXX03_IOMANIP
/*
iomanip synopsis
@@ -539,4 +539,4 @@ quoted(basic_string_view<_CharT, _Traits> __sv, _CharT __delim = _CharT('"'), _C
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_IOMANIP
+#endif // _LIBCPP___CXX03_IOMANIP
diff --git a/libcxx/include/__cxx03/ios b/libcxx/include/__cxx03/ios
index a9eeefc0883d4f..ace6d666d6b58d 100644
--- a/libcxx/include/__cxx03/ios
+++ b/libcxx/include/__cxx03/ios
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_IOS
-#define _LIBCPP_IOS
+#ifndef _LIBCPP___CXX03_IOS
+#define _LIBCPP___CXX03_IOS
/*
ios synopsis
@@ -886,4 +886,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/typeinfo>
#endif
-#endif // _LIBCPP_IOS
+#endif // _LIBCPP___CXX03_IOS
diff --git a/libcxx/include/__cxx03/iosfwd b/libcxx/include/__cxx03/iosfwd
index 9c4c86bc2fa274..624bd157d4962b 100644
--- a/libcxx/include/__cxx03/iosfwd
+++ b/libcxx/include/__cxx03/iosfwd
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_IOSFWD
-#define _LIBCPP_IOSFWD
+#ifndef _LIBCPP___CXX03_IOSFWD
+#define _LIBCPP___CXX03_IOSFWD
/*
iosfwd synopsis
@@ -183,4 +183,4 @@ public:
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_IOSFWD
+#endif // _LIBCPP___CXX03_IOSFWD
diff --git a/libcxx/include/__cxx03/iostream b/libcxx/include/__cxx03/iostream
index c4923117822c7b..d302ad2dfc1501 100644
--- a/libcxx/include/__cxx03/iostream
+++ b/libcxx/include/__cxx03/iostream
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_IOSTREAM
-#define _LIBCPP_IOSTREAM
+#ifndef _LIBCPP___CXX03_IOSTREAM
+#define _LIBCPP___CXX03_IOSTREAM
/*
iostream synopsis
@@ -64,4 +64,4 @@ extern _LIBCPP_EXPORTED_FROM_ABI wostream wclog;
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_IOSTREAM
+#endif // _LIBCPP___CXX03_IOSTREAM
diff --git a/libcxx/include/__cxx03/istream b/libcxx/include/__cxx03/istream
index c2fc00298bd58f..b1f7b0888d71b7 100644
--- a/libcxx/include/__cxx03/istream
+++ b/libcxx/include/__cxx03/istream
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_ISTREAM
-#define _LIBCPP_ISTREAM
+#ifndef _LIBCPP___CXX03_ISTREAM
+#define _LIBCPP___CXX03_ISTREAM
/*
istream synopsis
@@ -1370,4 +1370,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP_ISTREAM
+#endif // _LIBCPP___CXX03_ISTREAM
diff --git a/libcxx/include/__cxx03/iterator b/libcxx/include/__cxx03/iterator
index f415443f8dc1dc..5ac8a4274b3ddd 100644
--- a/libcxx/include/__cxx03/iterator
+++ b/libcxx/include/__cxx03/iterator
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_ITERATOR
-#define _LIBCPP_ITERATOR
+#ifndef _LIBCPP___CXX03_ITERATOR
+#define _LIBCPP___CXX03_ITERATOR
/*
iterator synopsis
@@ -751,4 +751,4 @@ template <class E> constexpr const E* data(initializer_list<E> il) noexcept;
# include <__cxx03/utility>
#endif
-#endif // _LIBCPP_ITERATOR
+#endif // _LIBCPP___CXX03_ITERATOR
diff --git a/libcxx/include/__cxx03/latch b/libcxx/include/__cxx03/latch
index bcfb6a51243dba..cca88c594039bc 100644
--- a/libcxx/include/__cxx03/latch
+++ b/libcxx/include/__cxx03/latch
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_LATCH
-#define _LIBCPP_LATCH
+#ifndef _LIBCPP___CXX03_LATCH
+#define _LIBCPP___CXX03_LATCH
/*
latch synopsis
@@ -126,4 +126,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/atomic>
#endif
-#endif //_LIBCPP_LATCH
+#endif //_LIBCPP___CXX03_LATCH
diff --git a/libcxx/include/__cxx03/limits b/libcxx/include/__cxx03/limits
index d028d8256f59d0..bfc3cb8e1bb194 100644
--- a/libcxx/include/__cxx03/limits
+++ b/libcxx/include/__cxx03/limits
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_LIMITS
-#define _LIBCPP_LIMITS
+#ifndef _LIBCPP___CXX03_LIMITS
+#define _LIBCPP___CXX03_LIMITS
/*
limits synopsis
@@ -581,4 +581,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_LIMITS
+#endif // _LIBCPP___CXX03_LIMITS
diff --git a/libcxx/include/__cxx03/list b/libcxx/include/__cxx03/list
index 742df50767e15d..647bb770646ca9 100644
--- a/libcxx/include/__cxx03/list
+++ b/libcxx/include/__cxx03/list
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_LIST
-#define _LIBCPP_LIST
+#ifndef _LIBCPP___CXX03_LIST
+#define _LIBCPP___CXX03_LIST
/*
list synopsis
@@ -1739,4 +1739,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/typeinfo>
#endif
-#endif // _LIBCPP_LIST
+#endif // _LIBCPP___CXX03_LIST
diff --git a/libcxx/include/__cxx03/locale b/libcxx/include/__cxx03/locale
index 48ae270e0949be..78c0fd7763af24 100644
--- a/libcxx/include/__cxx03/locale
+++ b/libcxx/include/__cxx03/locale
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_LOCALE
-#define _LIBCPP_LOCALE
+#ifndef _LIBCPP___CXX03_LOCALE
+#define _LIBCPP___CXX03_LOCALE
/*
locale synopsis
@@ -3764,4 +3764,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/typeinfo>
#endif
-#endif // _LIBCPP_LOCALE
+#endif // _LIBCPP___CXX03_LOCALE
diff --git a/libcxx/include/__cxx03/locale.h b/libcxx/include/__cxx03/locale.h
index b33059d7965d61..6a6773674ad936 100644
--- a/libcxx/include/__cxx03/locale.h
+++ b/libcxx/include/__cxx03/locale.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_LOCALE_H
-#define _LIBCPP_LOCALE_H
+#ifndef _LIBCPP___CXX03_LOCALE_H
+#define _LIBCPP___CXX03_LOCALE_H
/*
locale.h synopsis
@@ -43,4 +43,4 @@
# include_next <locale.h>
#endif
-#endif // _LIBCPP_LOCALE_H
+#endif // _LIBCPP___CXX03_LOCALE_H
diff --git a/libcxx/include/__cxx03/map b/libcxx/include/__cxx03/map
index 53dcbaf4eae1d0..bd03d8b741a710 100644
--- a/libcxx/include/__cxx03/map
+++ b/libcxx/include/__cxx03/map
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_MAP
-#define _LIBCPP_MAP
+#ifndef _LIBCPP___CXX03_MAP
+#define _LIBCPP___CXX03_MAP
/*
@@ -2178,4 +2178,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/utility>
#endif
-#endif // _LIBCPP_MAP
+#endif // _LIBCPP___CXX03_MAP
diff --git a/libcxx/include/__cxx03/math.h b/libcxx/include/__cxx03/math.h
index 9a2509e93d01af..ca4062072e01b3 100644
--- a/libcxx/include/__cxx03/math.h
+++ b/libcxx/include/__cxx03/math.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_MATH_H
-# define _LIBCPP_MATH_H
+#ifndef _LIBCPP___CXX03_MATH_H
+# define _LIBCPP___CXX03_MATH_H
/*
math.h synopsis
@@ -503,7 +503,7 @@ using std::__math::trunc;
# endif // __cplusplus
-#else // _LIBCPP_MATH_H
+#else // _LIBCPP___CXX03_MATH_H
// This include lives outside the header guard in order to support an MSVC
// extension which allows users to do:
@@ -517,4 +517,4 @@ using std::__math::trunc;
# include_next <math.h>
# endif
-#endif // _LIBCPP_MATH_H
+#endif // _LIBCPP___CXX03_MATH_H
diff --git a/libcxx/include/__cxx03/mdspan b/libcxx/include/__cxx03/mdspan
index 950145b34b098f..c47a63794955b9 100644
--- a/libcxx/include/__cxx03/mdspan
+++ b/libcxx/include/__cxx03/mdspan
@@ -405,8 +405,8 @@ namespace std {
}
*/
-#ifndef _LIBCPP_MDSPAN
-#define _LIBCPP_MDSPAN
+#ifndef _LIBCPP___CXX03_MDSPAN
+#define _LIBCPP___CXX03_MDSPAN
#include <__cxx03/__config>
@@ -435,4 +435,4 @@ namespace std {
# include <__cxx03/span>
#endif
-#endif // _LIBCPP_MDSPAN
+#endif // _LIBCPP___CXX03_MDSPAN
diff --git a/libcxx/include/__cxx03/memory b/libcxx/include/__cxx03/memory
index 5bbcd8513e73d5..ea417bb827c78b 100644
--- a/libcxx/include/__cxx03/memory
+++ b/libcxx/include/__cxx03/memory
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_MEMORY
-#define _LIBCPP_MEMORY
+#ifndef _LIBCPP___CXX03_MEMORY
+#define _LIBCPP___CXX03_MEMORY
// clang-format off
@@ -995,4 +995,4 @@ template<class Pointer = void, class Smart, class... Args>
# include <__cxx03/utility>
#endif
-#endif // _LIBCPP_MEMORY
+#endif // _LIBCPP___CXX03_MEMORY
diff --git a/libcxx/include/__cxx03/memory_resource b/libcxx/include/__cxx03/memory_resource
index fb217e40f6301a..1b56153dc843b1 100644
--- a/libcxx/include/__cxx03/memory_resource
+++ b/libcxx/include/__cxx03/memory_resource
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_MEMORY_RESOURCE
-#define _LIBCPP_MEMORY_RESOURCE
+#ifndef _LIBCPP___CXX03_MEMORY_RESOURCE
+#define _LIBCPP___CXX03_MEMORY_RESOURCE
/**
memory_resource synopsis
@@ -80,4 +80,4 @@ namespace std::pmr {
# include <__cxx03/stdexcept>
#endif
-#endif /* _LIBCPP_MEMORY_RESOURCE */
+#endif /* _LIBCPP___CXX03_MEMORY_RESOURCE */
diff --git a/libcxx/include/__cxx03/mutex b/libcxx/include/__cxx03/mutex
index 550d0f887dc49b..a799a0b774ad79 100644
--- a/libcxx/include/__cxx03/mutex
+++ b/libcxx/include/__cxx03/mutex
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_MUTEX
-#define _LIBCPP_MUTEX
+#ifndef _LIBCPP___CXX03_MUTEX
+#define _LIBCPP___CXX03_MUTEX
/*
mutex synopsis
@@ -513,4 +513,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/typeinfo>
#endif
-#endif // _LIBCPP_MUTEX
+#endif // _LIBCPP___CXX03_MUTEX
diff --git a/libcxx/include/__cxx03/new b/libcxx/include/__cxx03/new
index 7458fb08381505..9a893e727b44bb 100644
--- a/libcxx/include/__cxx03/new
+++ b/libcxx/include/__cxx03/new
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_NEW
-#define _LIBCPP_NEW
+#ifndef _LIBCPP___CXX03_NEW
+#define _LIBCPP___CXX03_NEW
/*
new synopsis
@@ -359,4 +359,4 @@ _LIBCPP_END_NAMESPACE_STD
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_NEW
+#endif // _LIBCPP___CXX03_NEW
diff --git a/libcxx/include/__cxx03/numbers b/libcxx/include/__cxx03/numbers
index d8ca33295d5516..3ef8aa23244948 100644
--- a/libcxx/include/__cxx03/numbers
+++ b/libcxx/include/__cxx03/numbers
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_NUMBERS
-#define _LIBCPP_NUMBERS
+#ifndef _LIBCPP___CXX03_NUMBERS
+#define _LIBCPP___CXX03_NUMBERS
/*
numbers synopsis
@@ -161,4 +161,4 @@ _LIBCPP_END_NAMESPACE_STD
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_NUMBERS
+#endif // _LIBCPP___CXX03_NUMBERS
diff --git a/libcxx/include/__cxx03/numeric b/libcxx/include/__cxx03/numeric
index 85c756b0216186..992641b8c210b7 100644
--- a/libcxx/include/__cxx03/numeric
+++ b/libcxx/include/__cxx03/numeric
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_NUMERIC
-#define _LIBCPP_NUMERIC
+#ifndef _LIBCPP___CXX03_NUMERIC
+#define _LIBCPP___CXX03_NUMERIC
/*
numeric synopsis
@@ -204,4 +204,4 @@ constexpr T saturate_cast(U x) noexcept; // freestanding, Sin
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_NUMERIC
+#endif // _LIBCPP___CXX03_NUMERIC
diff --git a/libcxx/include/__cxx03/optional b/libcxx/include/__cxx03/optional
index 32be4b0cd4db81..e2c6fd0950c344 100644
--- a/libcxx/include/__cxx03/optional
+++ b/libcxx/include/__cxx03/optional
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_OPTIONAL
-#define _LIBCPP_OPTIONAL
+#ifndef _LIBCPP___CXX03_OPTIONAL
+#define _LIBCPP___CXX03_OPTIONAL
/*
optional synopsis
@@ -1301,4 +1301,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/variant>
#endif
-#endif // _LIBCPP_OPTIONAL
+#endif // _LIBCPP___CXX03_OPTIONAL
diff --git a/libcxx/include/__cxx03/ostream b/libcxx/include/__cxx03/ostream
index 708434803542d2..4400fa60ba7e7a 100644
--- a/libcxx/include/__cxx03/ostream
+++ b/libcxx/include/__cxx03/ostream
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_OSTREAM
-#define _LIBCPP_OSTREAM
+#ifndef _LIBCPP___CXX03_OSTREAM
+#define _LIBCPP___CXX03_OSTREAM
/*
ostream synopsis
@@ -199,4 +199,4 @@ void vprint_nonunicode(ostream& os, string_view fmt, format_args args);
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_OSTREAM
+#endif // _LIBCPP___CXX03_OSTREAM
diff --git a/libcxx/include/__cxx03/print b/libcxx/include/__cxx03/print
index bb7731abe49369..02f1a6127a21a7 100644
--- a/libcxx/include/__cxx03/print
+++ b/libcxx/include/__cxx03/print
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_PRINT
-#define _LIBCPP_PRINT
+#ifndef _LIBCPP___CXX03_PRINT
+#define _LIBCPP___CXX03_PRINT
/*
namespace std {
@@ -399,4 +399,4 @@ _LIBCPP_HIDE_FROM_ABI inline void vprint_nonunicode(string_view __fmt, format_ar
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_PRINT
+#endif // _LIBCPP___CXX03_PRINT
diff --git a/libcxx/include/__cxx03/queue b/libcxx/include/__cxx03/queue
index 7031e4264f40a1..5f0189e61ee45f 100644
--- a/libcxx/include/__cxx03/queue
+++ b/libcxx/include/__cxx03/queue
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_QUEUE
-#define _LIBCPP_QUEUE
+#ifndef _LIBCPP___CXX03_QUEUE
+#define _LIBCPP___CXX03_QUEUE
/*
queue synopsis
@@ -953,4 +953,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_QUEUE
+#endif // _LIBCPP___CXX03_QUEUE
diff --git a/libcxx/include/__cxx03/random b/libcxx/include/__cxx03/random
index 6c6f730fbac7e2..71c59edecfec01 100644
--- a/libcxx/include/__cxx03/random
+++ b/libcxx/include/__cxx03/random
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_RANDOM
-#define _LIBCPP_RANDOM
+#ifndef _LIBCPP___CXX03_RANDOM
+#define _LIBCPP___CXX03_RANDOM
/*
random synopsis
@@ -1739,4 +1739,4 @@ class piecewise_linear_distribution
# include <__cxx03/vector>
#endif
-#endif // _LIBCPP_RANDOM
+#endif // _LIBCPP___CXX03_RANDOM
diff --git a/libcxx/include/__cxx03/ranges b/libcxx/include/__cxx03/ranges
index 3c3021e30d4a5e..a762a0c2ae7586 100644
--- a/libcxx/include/__cxx03/ranges
+++ b/libcxx/include/__cxx03/ranges
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_RANGES
-#define _LIBCPP_RANGES
+#ifndef _LIBCPP___CXX03_RANGES
+#define _LIBCPP___CXX03_RANGES
/*
@@ -460,4 +460,4 @@ namespace std {
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_RANGES
+#endif // _LIBCPP___CXX03_RANGES
diff --git a/libcxx/include/__cxx03/ratio b/libcxx/include/__cxx03/ratio
index e167b36b7dd173..57b5dcbf2ddce0 100644
--- a/libcxx/include/__cxx03/ratio
+++ b/libcxx/include/__cxx03/ratio
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_RATIO
-#define _LIBCPP_RATIO
+#ifndef _LIBCPP___CXX03_RATIO
+#define _LIBCPP___CXX03_RATIO
/*
ratio synopsis
@@ -514,4 +514,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_RATIO
+#endif // _LIBCPP___CXX03_RATIO
diff --git a/libcxx/include/__cxx03/regex b/libcxx/include/__cxx03/regex
index 9d95db45d419df..c05c8768a89a19 100644
--- a/libcxx/include/__cxx03/regex
+++ b/libcxx/include/__cxx03/regex
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_REGEX
-#define _LIBCPP_REGEX
+#ifndef _LIBCPP___CXX03_REGEX
+#define _LIBCPP___CXX03_REGEX
/*
regex synopsis
@@ -5833,4 +5833,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/utility>
#endif
-#endif // _LIBCPP_REGEX
+#endif // _LIBCPP___CXX03_REGEX
diff --git a/libcxx/include/__cxx03/scoped_allocator b/libcxx/include/__cxx03/scoped_allocator
index 6c62741ca2c8de..faaca57302a607 100644
--- a/libcxx/include/__cxx03/scoped_allocator
+++ b/libcxx/include/__cxx03/scoped_allocator
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_SCOPED_ALLOCATOR
-#define _LIBCPP_SCOPED_ALLOCATOR
+#ifndef _LIBCPP___CXX03_SCOPED_ALLOCATOR
+#define _LIBCPP___CXX03_SCOPED_ALLOCATOR
/*
scoped_allocator synopsis
@@ -570,4 +570,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/variant>
#endif
-#endif // _LIBCPP_SCOPED_ALLOCATOR
+#endif // _LIBCPP___CXX03_SCOPED_ALLOCATOR
diff --git a/libcxx/include/__cxx03/semaphore b/libcxx/include/__cxx03/semaphore
index e8f9f072bb662f..8e07f1a910d0c4 100644
--- a/libcxx/include/__cxx03/semaphore
+++ b/libcxx/include/__cxx03/semaphore
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_SEMAPHORE
-#define _LIBCPP_SEMAPHORE
+#ifndef _LIBCPP___CXX03_SEMAPHORE
+#define _LIBCPP___CXX03_SEMAPHORE
/*
semaphore synopsis
@@ -185,4 +185,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/atomic>
#endif
-#endif //_LIBCPP_SEMAPHORE
+#endif //_LIBCPP___CXX03_SEMAPHORE
diff --git a/libcxx/include/__cxx03/set b/libcxx/include/__cxx03/set
index b7312fff21395e..2b14ef8b39a9f0 100644
--- a/libcxx/include/__cxx03/set
+++ b/libcxx/include/__cxx03/set
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_SET
-#define _LIBCPP_SET
+#ifndef _LIBCPP___CXX03_SET
+#define _LIBCPP___CXX03_SET
/*
@@ -1497,4 +1497,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_SET
+#endif // _LIBCPP___CXX03_SET
diff --git a/libcxx/include/__cxx03/shared_mutex b/libcxx/include/__cxx03/shared_mutex
index 99f77a89210057..7acecdafc36a95 100644
--- a/libcxx/include/__cxx03/shared_mutex
+++ b/libcxx/include/__cxx03/shared_mutex
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_SHARED_MUTEX
-#define _LIBCPP_SHARED_MUTEX
+#ifndef _LIBCPP___CXX03_SHARED_MUTEX
+#define _LIBCPP___CXX03_SHARED_MUTEX
/*
shared_mutex synopsis
@@ -461,4 +461,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/system_error>
#endif
-#endif // _LIBCPP_SHARED_MUTEX
+#endif // _LIBCPP___CXX03_SHARED_MUTEX
diff --git a/libcxx/include/__cxx03/source_location b/libcxx/include/__cxx03/source_location
index 509a547808821d..3cd36babe3bf32 100644
--- a/libcxx/include/__cxx03/source_location
+++ b/libcxx/include/__cxx03/source_location
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_SOURCE_LOCATION
-#define _LIBCPP_SOURCE_LOCATION
+#ifndef _LIBCPP___CXX03_SOURCE_LOCATION
+#define _LIBCPP___CXX03_SOURCE_LOCATION
/* source_location synopsis
@@ -82,4 +82,4 @@ public:
_LIBCPP_END_NAMESPACE_STD
-#endif // _LIBCPP_SOURCE_LOCATION
+#endif // _LIBCPP___CXX03_SOURCE_LOCATION
diff --git a/libcxx/include/__cxx03/span b/libcxx/include/__cxx03/span
index d09f96468064b2..7d1ef460e59949 100644
--- a/libcxx/include/__cxx03/span
+++ b/libcxx/include/__cxx03/span
@@ -7,8 +7,8 @@
//
//===---------------------------------------------------------------------===//
-#ifndef _LIBCPP_SPAN
-#define _LIBCPP_SPAN
+#ifndef _LIBCPP___CXX03_SPAN
+#define _LIBCPP___CXX03_SPAN
/*
span synopsis
@@ -633,4 +633,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_SPAN
+#endif // _LIBCPP___CXX03_SPAN
diff --git a/libcxx/include/__cxx03/sstream b/libcxx/include/__cxx03/sstream
index 2667ae9cb18e16..744c6365cebf03 100644
--- a/libcxx/include/__cxx03/sstream
+++ b/libcxx/include/__cxx03/sstream
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_SSTREAM
-#define _LIBCPP_SSTREAM
+#ifndef _LIBCPP___CXX03_SSTREAM
+#define _LIBCPP___CXX03_SSTREAM
// clang-format off
@@ -1273,4 +1273,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_SSTREAM
+#endif // _LIBCPP___CXX03_SSTREAM
diff --git a/libcxx/include/__cxx03/stack b/libcxx/include/__cxx03/stack
index a8688786535984..e4988362b80102 100644
--- a/libcxx/include/__cxx03/stack
+++ b/libcxx/include/__cxx03/stack
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_STACK
-#define _LIBCPP_STACK
+#ifndef _LIBCPP___CXX03_STACK
+#define _LIBCPP___CXX03_STACK
/*
stack synopsis
@@ -376,4 +376,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_STACK
+#endif // _LIBCPP___CXX03_STACK
diff --git a/libcxx/include/__cxx03/stdatomic.h b/libcxx/include/__cxx03/stdatomic.h
index 15f68b93a414fe..44e693aefb4abb 100644
--- a/libcxx/include/__cxx03/stdatomic.h
+++ b/libcxx/include/__cxx03/stdatomic.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_STDATOMIC_H
-#define _LIBCPP_STDATOMIC_H
+#ifndef _LIBCPP___CXX03_STDATOMIC_H
+#define _LIBCPP___CXX03_STDATOMIC_H
/*
stdatomic.h synopsis
@@ -232,4 +232,4 @@ using std::atomic_thread_fence _LIBCPP_USING_IF_EXISTS;
#endif // defined(__cplusplus) && _LIBCPP_STD_VER >= 23
-#endif // _LIBCPP_STDATOMIC_H
+#endif // _LIBCPP___CXX03_STDATOMIC_H
diff --git a/libcxx/include/__cxx03/stdbool.h b/libcxx/include/__cxx03/stdbool.h
index 0444340e24412d..e6c2eae2cfd122 100644
--- a/libcxx/include/__cxx03/stdbool.h
+++ b/libcxx/include/__cxx03/stdbool.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_STDBOOL_H
-#define _LIBCPP_STDBOOL_H
+#ifndef _LIBCPP___CXX03_STDBOOL_H
+#define _LIBCPP___CXX03_STDBOOL_H
/*
stdbool.h synopsis
@@ -37,4 +37,4 @@
# define __bool_true_false_are_defined 1
#endif
-#endif // _LIBCPP_STDBOOL_H
+#endif // _LIBCPP___CXX03_STDBOOL_H
diff --git a/libcxx/include/__cxx03/stddef.h b/libcxx/include/__cxx03/stddef.h
index 38c15a3f2f2475..5d46cf27c39f5a 100644
--- a/libcxx/include/__cxx03/stddef.h
+++ b/libcxx/include/__cxx03/stddef.h
@@ -34,11 +34,11 @@
// with different defines and the underlying <stddef.h> will know how to deal with that.
#include_next <stddef.h>
-#ifndef _LIBCPP_STDDEF_H
-# define _LIBCPP_STDDEF_H
+#ifndef _LIBCPP___CXX03_STDDEF_H
+# define _LIBCPP___CXX03_STDDEF_H
# ifdef __cplusplus
typedef decltype(nullptr) nullptr_t;
# endif
-#endif // _LIBCPP_STDDEF_H
+#endif // _LIBCPP___CXX03_STDDEF_H
diff --git a/libcxx/include/__cxx03/stdexcept b/libcxx/include/__cxx03/stdexcept
index cd035f6df86db5..772f8b543b172d 100644
--- a/libcxx/include/__cxx03/stdexcept
+++ b/libcxx/include/__cxx03/stdexcept
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_STDEXCEPT
-#define _LIBCPP_STDEXCEPT
+#ifndef _LIBCPP___CXX03_STDEXCEPT
+#define _LIBCPP___CXX03_STDEXCEPT
/*
stdexcept synopsis
@@ -283,4 +283,4 @@ _LIBCPP_END_NAMESPACE_STD
# include <__cxx03/iosfwd>
#endif
-#endif // _LIBCPP_STDEXCEPT
+#endif // _LIBCPP___CXX03_STDEXCEPT
diff --git a/libcxx/include/__cxx03/stdint.h b/libcxx/include/__cxx03/stdint.h
index 5e845a7a517a6d..0510da42dd8cf5 100644
--- a/libcxx/include/__cxx03/stdint.h
+++ b/libcxx/include/__cxx03/stdint.h
@@ -7,12 +7,12 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_STDINT_H
+#ifndef _LIBCPP___CXX03_STDINT_H
// AIX system headers need stdint.h to be re-enterable while _STD_TYPES_T
// is defined until an inclusion of it without _STD_TYPES_T occurs, in which
// case the header guard macro is defined.
#if !defined(_AIX) || !defined(_STD_TYPES_T)
-# define _LIBCPP_STDINT_H
+# define _LIBCPP___CXX03_STDINT_H
#endif // _STD_TYPES_T
/*
@@ -124,4 +124,4 @@
# include_next <stdint.h>
#endif
-#endif // _LIBCPP_STDINT_H
+#endif // _LIBCPP___CXX03_STDINT_H
diff --git a/libcxx/include/__cxx03/stdio.h b/libcxx/include/__cxx03/stdio.h
index 214d9481bf4c68..6c6671e90c9a8f 100644
--- a/libcxx/include/__cxx03/stdio.h
+++ b/libcxx/include/__cxx03/stdio.h
@@ -15,8 +15,8 @@
# include_next <stdio.h>
-#elif !defined(_LIBCPP_STDIO_H)
-# define _LIBCPP_STDIO_H
+#elif !defined(_LIBCPP___CXX03_STDIO_H)
+# define _LIBCPP___CXX03_STDIO_H
/*
stdio.h synopsis
@@ -120,4 +120,4 @@ void perror(const char* s);
# endif
-#endif // _LIBCPP_STDIO_H
+#endif // _LIBCPP___CXX03_STDIO_H
diff --git a/libcxx/include/__cxx03/stdlib.h b/libcxx/include/__cxx03/stdlib.h
index 77c85705e19112..5e7da5d90dc029 100644
--- a/libcxx/include/__cxx03/stdlib.h
+++ b/libcxx/include/__cxx03/stdlib.h
@@ -15,8 +15,8 @@
# include_next <stdlib.h>
-#elif !defined(_LIBCPP_STDLIB_H)
-# define _LIBCPP_STDLIB_H
+#elif !defined(_LIBCPP___CXX03_STDLIB_H)
+# define _LIBCPP___CXX03_STDLIB_H
/*
stdlib.h synopsis
@@ -148,4 +148,4 @@ inline _LIBCPP_HIDE_FROM_ABI lldiv_t div(long long __x, long long __y) _NOEXCEPT
} // extern "C++"
# endif // __cplusplus
-#endif // _LIBCPP_STDLIB_H
+#endif // _LIBCPP___CXX03_STDLIB_H
diff --git a/libcxx/include/__cxx03/stop_token b/libcxx/include/__cxx03/stop_token
index 7173162cf66afb..369934d7ec6ea6 100644
--- a/libcxx/include/__cxx03/stop_token
+++ b/libcxx/include/__cxx03/stop_token
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_STOP_TOKEN
-#define _LIBCPP_STOP_TOKEN
+#ifndef _LIBCPP___CXX03_STOP_TOKEN
+#define _LIBCPP___CXX03_STOP_TOKEN
/*
@@ -53,4 +53,4 @@ namespace std {
# include <__cxx03/iosfwd>
#endif
-#endif // _LIBCPP_STOP_TOKEN
+#endif // _LIBCPP___CXX03_STOP_TOKEN
diff --git a/libcxx/include/__cxx03/streambuf b/libcxx/include/__cxx03/streambuf
index 9f60d38b4731fa..8920fce1f78cce 100644
--- a/libcxx/include/__cxx03/streambuf
+++ b/libcxx/include/__cxx03/streambuf
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_STREAMBUF
-#define _LIBCPP_STREAMBUF
+#ifndef _LIBCPP___CXX03_STREAMBUF
+#define _LIBCPP___CXX03_STREAMBUF
/*
streambuf synopsis
@@ -442,4 +442,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/cstdint>
#endif
-#endif // _LIBCPP_STREAMBUF
+#endif // _LIBCPP___CXX03_STREAMBUF
diff --git a/libcxx/include/__cxx03/string b/libcxx/include/__cxx03/string
index 2f2f6234408708..c4431dcb04d41e 100644
--- a/libcxx/include/__cxx03/string
+++ b/libcxx/include/__cxx03/string
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_STRING
-#define _LIBCPP_STRING
+#ifndef _LIBCPP___CXX03_STRING
+#define _LIBCPP___CXX03_STRING
// clang-format off
@@ -4349,4 +4349,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/utility>
#endif
-#endif // _LIBCPP_STRING
+#endif // _LIBCPP___CXX03_STRING
diff --git a/libcxx/include/__cxx03/string.h b/libcxx/include/__cxx03/string.h
index e1dc4cbd8f29e6..49595fecc591d3 100644
--- a/libcxx/include/__cxx03/string.h
+++ b/libcxx/include/__cxx03/string.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_STRING_H
-#define _LIBCPP_STRING_H
+#ifndef _LIBCPP___CXX03_STRING_H
+#define _LIBCPP___CXX03_STRING_H
/*
string.h synopsis
@@ -107,4 +107,4 @@ inline _LIBCPP_HIDE_FROM_ABI _LIBCPP_PREFERRED_OVERLOAD char* strstr(char* __s1,
} // extern "C++"
#endif
-#endif // _LIBCPP_STRING_H
+#endif // _LIBCPP___CXX03_STRING_H
diff --git a/libcxx/include/__cxx03/string_view b/libcxx/include/__cxx03/string_view
index 8b21ecb3d9a8be..c6876ab5f44461 100644
--- a/libcxx/include/__cxx03/string_view
+++ b/libcxx/include/__cxx03/string_view
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_STRING_VIEW
-#define _LIBCPP_STRING_VIEW
+#ifndef _LIBCPP___CXX03_STRING_VIEW
+#define _LIBCPP___CXX03_STRING_VIEW
// clang-format off
@@ -945,4 +945,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_STRING_VIEW
+#endif // _LIBCPP___CXX03_STRING_VIEW
diff --git a/libcxx/include/__cxx03/strstream b/libcxx/include/__cxx03/strstream
index 80e166acb7515a..be241a9484f600 100644
--- a/libcxx/include/__cxx03/strstream
+++ b/libcxx/include/__cxx03/strstream
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_STRSTREAM
-#define _LIBCPP_STRSTREAM
+#ifndef _LIBCPP___CXX03_STRSTREAM
+#define _LIBCPP___CXX03_STRSTREAM
/*
strstream synopsis
@@ -348,4 +348,4 @@ _LIBCPP_POP_MACROS
#endif // _LIBCPP_STD_VER < 26 || defined(_LIBCPP_ENABLE_CXX26_REMOVED_STRSTREAM) || defined(_LIBCPP_BUILDING_LIBRARY)
-#endif // _LIBCPP_STRSTREAM
+#endif // _LIBCPP___CXX03_STRSTREAM
diff --git a/libcxx/include/__cxx03/syncstream b/libcxx/include/__cxx03/syncstream
index 4e67b43f3ccb9e..7aacdc6c05fd44 100644
--- a/libcxx/include/__cxx03/syncstream
+++ b/libcxx/include/__cxx03/syncstream
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_SYNCSTREAM
-#define _LIBCPP_SYNCSTREAM
+#ifndef _LIBCPP___CXX03_SYNCSTREAM
+#define _LIBCPP___CXX03_SYNCSTREAM
/*
syncstream synopsis
@@ -509,4 +509,4 @@ _LIBCPP_END_NAMESPACE_STD
_LIBCPP_POP_MACROS
-#endif // _LIBCPP_SYNCSTREAM
+#endif // _LIBCPP___CXX03_SYNCSTREAM
diff --git a/libcxx/include/__cxx03/system_error b/libcxx/include/__cxx03/system_error
index eb5a2dc4532e52..8d0d55c7e567b5 100644
--- a/libcxx/include/__cxx03/system_error
+++ b/libcxx/include/__cxx03/system_error
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_SYSTEM_ERROR
-#define _LIBCPP_SYSTEM_ERROR
+#ifndef _LIBCPP___CXX03_SYSTEM_ERROR
+#define _LIBCPP___CXX03_SYSTEM_ERROR
/*
system_error synopsis
@@ -168,4 +168,4 @@ template <> struct hash<std::error_condition>;
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_SYSTEM_ERROR
+#endif // _LIBCPP___CXX03_SYSTEM_ERROR
diff --git a/libcxx/include/__cxx03/tgmath.h b/libcxx/include/__cxx03/tgmath.h
index 52637d1eaa0488..7d81a110ed6104 100644
--- a/libcxx/include/__cxx03/tgmath.h
+++ b/libcxx/include/__cxx03/tgmath.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_TGMATH_H
-#define _LIBCPP_TGMATH_H
+#ifndef _LIBCPP___CXX03_TGMATH_H
+#define _LIBCPP___CXX03_TGMATH_H
/*
tgmath.h synopsis
@@ -31,4 +31,4 @@
# endif
#endif
-#endif // _LIBCPP_TGMATH_H
+#endif // _LIBCPP___CXX03_TGMATH_H
diff --git a/libcxx/include/__cxx03/thread b/libcxx/include/__cxx03/thread
index f6d9cc8096a74f..8034854a738296 100644
--- a/libcxx/include/__cxx03/thread
+++ b/libcxx/include/__cxx03/thread
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_THREAD
-#define _LIBCPP_THREAD
+#ifndef _LIBCPP___CXX03_THREAD
+#define _LIBCPP___CXX03_THREAD
/*
@@ -127,4 +127,4 @@ void sleep_for(const chrono::duration<Rep, Period>& rel_time);
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_THREAD
+#endif // _LIBCPP___CXX03_THREAD
diff --git a/libcxx/include/__cxx03/tuple b/libcxx/include/__cxx03/tuple
index 72375ad6c0abc4..3579fd7981f00e 100644
--- a/libcxx/include/__cxx03/tuple
+++ b/libcxx/include/__cxx03/tuple
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_TUPLE
-#define _LIBCPP_TUPLE
+#ifndef _LIBCPP___CXX03_TUPLE
+#define _LIBCPP___CXX03_TUPLE
// clang-format off
@@ -1416,4 +1416,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/utility>
#endif
-#endif // _LIBCPP_TUPLE
+#endif // _LIBCPP___CXX03_TUPLE
diff --git a/libcxx/include/__cxx03/type_traits b/libcxx/include/__cxx03/type_traits
index 484441cbb67003..287f6f0d32b186 100644
--- a/libcxx/include/__cxx03/type_traits
+++ b/libcxx/include/__cxx03/type_traits
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_TYPE_TRAITS
-#define _LIBCPP_TYPE_TRAITS
+#ifndef _LIBCPP___CXX03_TYPE_TRAITS
+#define _LIBCPP___CXX03_TYPE_TRAITS
/*
type_traits synopsis
@@ -520,4 +520,4 @@ namespace std
# pragma GCC system_header
#endif
-#endif // _LIBCPP_TYPE_TRAITS
+#endif // _LIBCPP___CXX03_TYPE_TRAITS
diff --git a/libcxx/include/__cxx03/typeindex b/libcxx/include/__cxx03/typeindex
index e1d6097ebfa611..c7587e4e230577 100644
--- a/libcxx/include/__cxx03/typeindex
+++ b/libcxx/include/__cxx03/typeindex
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_TYPEINDEX
-#define _LIBCPP_TYPEINDEX
+#ifndef _LIBCPP___CXX03_TYPEINDEX
+#define _LIBCPP___CXX03_TYPEINDEX
/*
@@ -103,4 +103,4 @@ _LIBCPP_END_NAMESPACE_STD
# include <__cxx03/utility>
#endif
-#endif // _LIBCPP_TYPEINDEX
+#endif // _LIBCPP___CXX03_TYPEINDEX
diff --git a/libcxx/include/__cxx03/typeinfo b/libcxx/include/__cxx03/typeinfo
index 823c3cbae1cfb8..f01761bf485e36 100644
--- a/libcxx/include/__cxx03/typeinfo
+++ b/libcxx/include/__cxx03/typeinfo
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_TYPEINFO
-#define _LIBCPP_TYPEINFO
+#ifndef _LIBCPP___CXX03_TYPEINFO
+#define _LIBCPP___CXX03_TYPEINFO
/*
@@ -386,4 +386,4 @@ _LIBCPP_END_NAMESPACE_STD
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_TYPEINFO
+#endif // _LIBCPP___CXX03_TYPEINFO
diff --git a/libcxx/include/__cxx03/uchar.h b/libcxx/include/__cxx03/uchar.h
index 29a10211ad36e5..a19faea5814cfc 100644
--- a/libcxx/include/__cxx03/uchar.h
+++ b/libcxx/include/__cxx03/uchar.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_UCHAR_H
-#define _LIBCPP_UCHAR_H
+#ifndef _LIBCPP___CXX03_UCHAR_H
+#define _LIBCPP___CXX03_UCHAR_H
/*
uchar.h synopsis // since C++11
@@ -53,4 +53,4 @@ size_t c32rtomb(char* s, char32_t c32, mbstate_t* ps);
#endif // _LIBCPP_CXX03_LANG
-#endif // _LIBCPP_UCHAR_H
+#endif // _LIBCPP___CXX03_UCHAR_H
diff --git a/libcxx/include/__cxx03/unordered_map b/libcxx/include/__cxx03/unordered_map
index cccfc4900895a1..612ad02f77164e 100644
--- a/libcxx/include/__cxx03/unordered_map
+++ b/libcxx/include/__cxx03/unordered_map
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_UNORDERED_MAP
-#define _LIBCPP_UNORDERED_MAP
+#ifndef _LIBCPP___CXX03_UNORDERED_MAP
+#define _LIBCPP___CXX03_UNORDERED_MAP
/*
@@ -2538,4 +2538,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_UNORDERED_MAP
+#endif // _LIBCPP___CXX03_UNORDERED_MAP
diff --git a/libcxx/include/__cxx03/unordered_set b/libcxx/include/__cxx03/unordered_set
index b64d334c129de7..25e9e1f82ad322 100644
--- a/libcxx/include/__cxx03/unordered_set
+++ b/libcxx/include/__cxx03/unordered_set
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_UNORDERED_SET
-#define _LIBCPP_UNORDERED_SET
+#ifndef _LIBCPP___CXX03_UNORDERED_SET
+#define _LIBCPP___CXX03_UNORDERED_SET
// clang-format off
@@ -1808,4 +1808,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_UNORDERED_SET
+#endif // _LIBCPP___CXX03_UNORDERED_SET
diff --git a/libcxx/include/__cxx03/utility b/libcxx/include/__cxx03/utility
index c0734df8db6361..ac0637f6b41ee1 100644
--- a/libcxx/include/__cxx03/utility
+++ b/libcxx/include/__cxx03/utility
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_UTILITY
-#define _LIBCPP_UTILITY
+#ifndef _LIBCPP___CXX03_UTILITY
+#define _LIBCPP___CXX03_UTILITY
/*
utility synopsis
@@ -306,4 +306,4 @@ template <class T>
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_UTILITY
+#endif // _LIBCPP___CXX03_UTILITY
diff --git a/libcxx/include/__cxx03/valarray b/libcxx/include/__cxx03/valarray
index 890e0a2723c7a8..1070add36abc4a 100644
--- a/libcxx/include/__cxx03/valarray
+++ b/libcxx/include/__cxx03/valarray
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_VALARRAY
-#define _LIBCPP_VALARRAY
+#ifndef _LIBCPP___CXX03_VALARRAY
+#define _LIBCPP___CXX03_VALARRAY
/*
valarray synopsis
@@ -3361,4 +3361,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/type_traits>
#endif
-#endif // _LIBCPP_VALARRAY
+#endif // _LIBCPP___CXX03_VALARRAY
diff --git a/libcxx/include/__cxx03/variant b/libcxx/include/__cxx03/variant
index 97e012bf81c95f..cedc733e9b391b 100644
--- a/libcxx/include/__cxx03/variant
+++ b/libcxx/include/__cxx03/variant
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_VARIANT
-#define _LIBCPP_VARIANT
+#ifndef _LIBCPP___CXX03_VARIANT
+#define _LIBCPP___CXX03_VARIANT
/*
variant synopsis
@@ -1647,4 +1647,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/utility>
#endif
-#endif // _LIBCPP_VARIANT
+#endif // _LIBCPP___CXX03_VARIANT
diff --git a/libcxx/include/__cxx03/vector b/libcxx/include/__cxx03/vector
index 6e01ece06ab97a..6ee35b4e36258f 100644
--- a/libcxx/include/__cxx03/vector
+++ b/libcxx/include/__cxx03/vector
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_VECTOR
-#define _LIBCPP_VECTOR
+#ifndef _LIBCPP___CXX03_VECTOR
+#define _LIBCPP___CXX03_VECTOR
// clang-format off
@@ -3027,4 +3027,4 @@ _LIBCPP_POP_MACROS
# include <__cxx03/utility>
#endif
-#endif // _LIBCPP_VECTOR
+#endif // _LIBCPP___CXX03_VECTOR
diff --git a/libcxx/include/__cxx03/wchar.h b/libcxx/include/__cxx03/wchar.h
index 131948eb471d01..91975f7df49bd5 100644
--- a/libcxx/include/__cxx03/wchar.h
+++ b/libcxx/include/__cxx03/wchar.h
@@ -15,8 +15,8 @@
# include_next <wchar.h>
-#elif !defined(_LIBCPP_WCHAR_H)
-# define _LIBCPP_WCHAR_H
+#elif !defined(_LIBCPP___CXX03_WCHAR_H)
+# define _LIBCPP___CXX03_WCHAR_H
/*
wchar.h synopsis
@@ -208,4 +208,4 @@ size_t wcsnrtombs(
} // extern "C"
# endif // __cplusplus && (_LIBCPP_MSVCRT || __MVS__)
-#endif // _LIBCPP_WCHAR_H
+#endif // _LIBCPP___CXX03_WCHAR_H
diff --git a/libcxx/include/__cxx03/wctype.h b/libcxx/include/__cxx03/wctype.h
index def009c58f0153..131d8b51ea1caf 100644
--- a/libcxx/include/__cxx03/wctype.h
+++ b/libcxx/include/__cxx03/wctype.h
@@ -7,8 +7,8 @@
//
//===----------------------------------------------------------------------===//
-#ifndef _LIBCPP_WCTYPE_H
-#define _LIBCPP_WCTYPE_H
+#ifndef _LIBCPP___CXX03_WCTYPE_H
+#define _LIBCPP___CXX03_WCTYPE_H
/*
wctype.h synopsis
@@ -92,4 +92,4 @@ wctrans_t wctrans(const char* property);
#endif // __cplusplus
-#endif // _LIBCPP_WCTYPE_H
+#endif // _LIBCPP___CXX03_WCTYPE_H
More information about the libcxx-commits
mailing list