diff --git a/libcxx/include/__algorithm/adjacent_find.h b/libcxx/include/__algorithm/adjacent_find.h
index 2508250d8796c..f68746f13c23d 100644
--- a/libcxx/include/__algorithm/adjacent_find.h
+++ b/libcxx/include/__algorithm/adjacent_find.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_ADJACENT_FIND_H
-#define _LIBCPP___ALGORITHM_ADJACENT_FIND_H
+#ifndef _LIBCPP_ALGORITHM_ADJACENT_FIND_H
+#define _LIBCPP_ALGORITHM_ADJACENT_FIND_H
 
 #include <__algorithm/comp.h>
 #include <__config>
@@ -57,4 +57,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_ADJACENT_FIND_H
+#endif // _LIBCPP_ALGORITHM_ADJACENT_FIND_H
diff --git a/libcxx/include/__algorithm/all_of.h b/libcxx/include/__algorithm/all_of.h
index 6acc117fc47bc..afcbdf9013fff 100644
--- a/libcxx/include/__algorithm/all_of.h
+++ b/libcxx/include/__algorithm/all_of.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_ALL_OF_H
-#define _LIBCPP___ALGORITHM_ALL_OF_H
+#ifndef _LIBCPP_ALGORITHM_ALL_OF_H
+#define _LIBCPP_ALGORITHM_ALL_OF_H
 
 #include <__config>
 #include <__functional/identity.h>
@@ -39,4 +39,4 @@ all_of(_InputIterator __first, _InputIterator __last, _Predicate __pred) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_ALL_OF_H
+#endif // _LIBCPP_ALGORITHM_ALL_OF_H
diff --git a/libcxx/include/__algorithm/any_of.h b/libcxx/include/__algorithm/any_of.h
index 4b6eb94517286..fd5aa630595da 100644
--- a/libcxx/include/__algorithm/any_of.h
+++ b/libcxx/include/__algorithm/any_of.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_ANY_OF_H
-#define _LIBCPP___ALGORITHM_ANY_OF_H
+#ifndef _LIBCPP_ALGORITHM_ANY_OF_H
+#define _LIBCPP_ALGORITHM_ANY_OF_H
 
 #include <__config>
 #include <__functional/identity.h>
@@ -39,4 +39,4 @@ any_of(_InputIterator __first, _InputIterator __last, _Predicate __pred) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_ANY_OF_H
+#endif // _LIBCPP_ALGORITHM_ANY_OF_H
diff --git a/libcxx/include/__algorithm/binary_search.h b/libcxx/include/__algorithm/binary_search.h
index 4940059f285cd..9a1524e488376 100644
--- a/libcxx/include/__algorithm/binary_search.h
+++ b/libcxx/include/__algorithm/binary_search.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_BINARY_SEARCH_H
-#define _LIBCPP___ALGORITHM_BINARY_SEARCH_H
+#ifndef _LIBCPP_ALGORITHM_BINARY_SEARCH_H
+#define _LIBCPP_ALGORITHM_BINARY_SEARCH_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -35,4 +35,4 @@ binary_search(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __va
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_BINARY_SEARCH_H
+#endif // _LIBCPP_ALGORITHM_BINARY_SEARCH_H
diff --git a/libcxx/include/__algorithm/clamp.h b/libcxx/include/__algorithm/clamp.h
index 1a5a3d0744be9..1ac0392bf5dff 100644
--- a/libcxx/include/__algorithm/clamp.h
+++ b/libcxx/include/__algorithm/clamp.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_CLAMP_H
-#define _LIBCPP___ALGORITHM_CLAMP_H
+#ifndef _LIBCPP_ALGORITHM_CLAMP_H
+#define _LIBCPP_ALGORITHM_CLAMP_H
 
 #include <__algorithm/comp.h>
 #include <__assert>
@@ -41,4 +41,4 @@ clamp(_LIBCPP_LIFETIMEBOUND const _Tp& __v,
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_CLAMP_H
+#endif // _LIBCPP_ALGORITHM_CLAMP_H
diff --git a/libcxx/include/__algorithm/comp.h b/libcxx/include/__algorithm/comp.h
index 38e2fb9f5e744..945a329a83770 100644
--- a/libcxx/include/__algorithm/comp.h
+++ b/libcxx/include/__algorithm/comp.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_COMP_H
-#define _LIBCPP___ALGORITHM_COMP_H
+#ifndef _LIBCPP_ALGORITHM_COMP_H
+#define _LIBCPP_ALGORITHM_COMP_H
 
 #include <__config>
 #include <__type_traits/desugars_to.h>
@@ -54,4 +54,4 @@ inline const bool __is_generic_transparent_comparator_v<__less<> > = true;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_COMP_H
+#endif // _LIBCPP_ALGORITHM_COMP_H
diff --git a/libcxx/include/__algorithm/comp_ref_type.h b/libcxx/include/__algorithm/comp_ref_type.h
index 6a9d5cef26719..049660533acea 100644
--- a/libcxx/include/__algorithm/comp_ref_type.h
+++ b/libcxx/include/__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_ALGORITHM_COMP_REF_TYPE_H
+#define _LIBCPP_ALGORITHM_COMP_REF_TYPE_H
 
 #include <__assert>
 #include <__config>
@@ -64,4 +64,4 @@ using __comp_ref_type _LIBCPP_NODEBUG = _Comp&;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_COMP_REF_TYPE_H
+#endif // _LIBCPP_ALGORITHM_COMP_REF_TYPE_H
diff --git a/libcxx/include/__algorithm/copy.h b/libcxx/include/__algorithm/copy.h
index 21fd25ce6fcdc..6a95b1a7726fb 100644
--- a/libcxx/include/__algorithm/copy.h
+++ b/libcxx/include/__algorithm/copy.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_COPY_H
-#define _LIBCPP___ALGORITHM_COPY_H
+#ifndef _LIBCPP_ALGORITHM_COPY_H
+#define _LIBCPP_ALGORITHM_COPY_H
 
 #include <__algorithm/copy_move_common.h>
 #include <__algorithm/for_each_segment.h>
@@ -252,4 +252,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_COPY_H
+#endif // _LIBCPP_ALGORITHM_COPY_H
diff --git a/libcxx/include/__algorithm/copy_backward.h b/libcxx/include/__algorithm/copy_backward.h
index 6c9eba672e154..8c062416d027e 100644
--- a/libcxx/include/__algorithm/copy_backward.h
+++ b/libcxx/include/__algorithm/copy_backward.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_COPY_BACKWARD_H
-#define _LIBCPP___ALGORITHM_COPY_BACKWARD_H
+#ifndef _LIBCPP_ALGORITHM_COPY_BACKWARD_H
+#define _LIBCPP_ALGORITHM_COPY_BACKWARD_H
 
 #include <__algorithm/copy_move_common.h>
 #include <__algorithm/copy_n.h>
@@ -268,4 +268,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_COPY_BACKWARD_H
+#endif // _LIBCPP_ALGORITHM_COPY_BACKWARD_H
diff --git a/libcxx/include/__algorithm/copy_if.h b/libcxx/include/__algorithm/copy_if.h
index ffea621fc0618..d1f9a08b18265 100644
--- a/libcxx/include/__algorithm/copy_if.h
+++ b/libcxx/include/__algorithm/copy_if.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_COPY_IF_H
-#define _LIBCPP___ALGORITHM_COPY_IF_H
+#ifndef _LIBCPP_ALGORITHM_COPY_IF_H
+#define _LIBCPP_ALGORITHM_COPY_IF_H
 
 #include <__config>
 #include <__functional/identity.h>
@@ -47,4 +47,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_COPY_IF_H
+#endif // _LIBCPP_ALGORITHM_COPY_IF_H
diff --git a/libcxx/include/__algorithm/copy_move_common.h b/libcxx/include/__algorithm/copy_move_common.h
index 7471012c01d96..5ed9ef9b04d2d 100644
--- a/libcxx/include/__algorithm/copy_move_common.h
+++ b/libcxx/include/__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_ALGORITHM_COPY_MOVE_COMMON_H
+#define _LIBCPP_ALGORITHM_COPY_MOVE_COMMON_H
 
 #include <__algorithm/unwrap_iter.h>
 #include <__algorithm/unwrap_range.h>
@@ -110,4 +110,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_COPY_MOVE_COMMON_H
+#endif // _LIBCPP_ALGORITHM_COPY_MOVE_COMMON_H
diff --git a/libcxx/include/__algorithm/copy_n.h b/libcxx/include/__algorithm/copy_n.h
index f93f39203a7e3..d6fece6c15273 100644
--- a/libcxx/include/__algorithm/copy_n.h
+++ b/libcxx/include/__algorithm/copy_n.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_COPY_N_H
-#define _LIBCPP___ALGORITHM_COPY_N_H
+#ifndef _LIBCPP_ALGORITHM_COPY_N_H
+#define _LIBCPP_ALGORITHM_COPY_N_H
 
 #include <__algorithm/copy.h>
 #include <__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_ALGORITHM_COPY_N_H
diff --git a/libcxx/include/__algorithm/count.h b/libcxx/include/__algorithm/count.h
index 8529d110a30aa..834d97cea7207 100644
--- a/libcxx/include/__algorithm/count.h
+++ b/libcxx/include/__algorithm/count.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_COUNT_H
-#define _LIBCPP___ALGORITHM_COUNT_H
+#ifndef _LIBCPP_ALGORITHM_COUNT_H
+#define _LIBCPP_ALGORITHM_COUNT_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/min.h>
@@ -92,4 +92,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_COUNT_H
+#endif // _LIBCPP_ALGORITHM_COUNT_H
diff --git a/libcxx/include/__algorithm/count_if.h b/libcxx/include/__algorithm/count_if.h
index 26f945e6bd98c..e44e14487ef11 100644
--- a/libcxx/include/__algorithm/count_if.h
+++ b/libcxx/include/__algorithm/count_if.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_COUNT_IF_H
-#define _LIBCPP___ALGORITHM_COUNT_IF_H
+#ifndef _LIBCPP_ALGORITHM_COUNT_IF_H
+#define _LIBCPP_ALGORITHM_COUNT_IF_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__config>
@@ -43,4 +43,4 @@ count_if(_InputIterator __first, _InputIterator __last, _Predicate __pred) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_COUNT_IF_H
+#endif // _LIBCPP_ALGORITHM_COUNT_IF_H
diff --git a/libcxx/include/__algorithm/equal.h b/libcxx/include/__algorithm/equal.h
index 5a8c9504ede1d..acfca32d5ec62 100644
--- a/libcxx/include/__algorithm/equal.h
+++ b/libcxx/include/__algorithm/equal.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_EQUAL_H
-#define _LIBCPP___ALGORITHM_EQUAL_H
+#ifndef _LIBCPP_ALGORITHM_EQUAL_H
+#define _LIBCPP_ALGORITHM_EQUAL_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/min.h>
@@ -289,4 +289,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_EQUAL_H
+#endif // _LIBCPP_ALGORITHM_EQUAL_H
diff --git a/libcxx/include/__algorithm/equal_range.h b/libcxx/include/__algorithm/equal_range.h
index ff6f4f2225c7a..45a1794fd62e9 100644
--- a/libcxx/include/__algorithm/equal_range.h
+++ b/libcxx/include/__algorithm/equal_range.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_EQUAL_RANGE_H
-#define _LIBCPP___ALGORITHM_EQUAL_RANGE_H
+#ifndef _LIBCPP_ALGORITHM_EQUAL_RANGE_H
+#define _LIBCPP_ALGORITHM_EQUAL_RANGE_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -78,4 +78,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_EQUAL_RANGE_H
+#endif // _LIBCPP_ALGORITHM_EQUAL_RANGE_H
diff --git a/libcxx/include/__algorithm/fill.h b/libcxx/include/__algorithm/fill.h
index 37732cc22afd2..7255047c5e572 100644
--- a/libcxx/include/__algorithm/fill.h
+++ b/libcxx/include/__algorithm/fill.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_FILL_H
-#define _LIBCPP___ALGORITHM_FILL_H
+#ifndef _LIBCPP_ALGORITHM_FILL_H
+#define _LIBCPP_ALGORITHM_FILL_H
 
 #include <__algorithm/fill_n.h>
 #include <__algorithm/for_each_segment.h>
@@ -60,4 +60,4 @@ fill(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __value) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_FILL_H
+#endif // _LIBCPP_ALGORITHM_FILL_H
diff --git a/libcxx/include/__algorithm/fill_n.h b/libcxx/include/__algorithm/fill_n.h
index 426fe228bdabb..6e38b630d336a 100644
--- a/libcxx/include/__algorithm/fill_n.h
+++ b/libcxx/include/__algorithm/fill_n.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_FILL_N_H
-#define _LIBCPP___ALGORITHM_FILL_N_H
+#ifndef _LIBCPP_ALGORITHM_FILL_N_H
+#define _LIBCPP_ALGORITHM_FILL_N_H
 
 #include <__algorithm/for_each_n_segment.h>
 #include <__algorithm/min.h>
@@ -95,4 +95,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_FILL_N_H
+#endif // _LIBCPP_ALGORITHM_FILL_N_H
diff --git a/libcxx/include/__algorithm/find.h b/libcxx/include/__algorithm/find.h
index 10379d7074c3a..6323fdcdd72a1 100644
--- a/libcxx/include/__algorithm/find.h
+++ b/libcxx/include/__algorithm/find.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_FIND_H
-#define _LIBCPP___ALGORITHM_FIND_H
+#ifndef _LIBCPP_ALGORITHM_FIND_H
+#define _LIBCPP_ALGORITHM_FIND_H
 
 #include <__algorithm/find_segment_if.h>
 #include <__algorithm/min.h>
@@ -247,4 +247,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_FIND_H
+#endif // _LIBCPP_ALGORITHM_FIND_H
diff --git a/libcxx/include/__algorithm/find_end.h b/libcxx/include/__algorithm/find_end.h
index 86b4a3e2e3689..28374158da82a 100644
--- a/libcxx/include/__algorithm/find_end.h
+++ b/libcxx/include/__algorithm/find_end.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_FIND_END_OF_H
-#define _LIBCPP___ALGORITHM_FIND_END_OF_H
+#ifndef _LIBCPP_ALGORITHM_FIND_END_OF_H
+#define _LIBCPP_ALGORITHM_FIND_END_OF_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/iterator_operations.h>
@@ -115,4 +115,4 @@ find_end(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_FIND_END_OF_H
+#endif // _LIBCPP_ALGORITHM_FIND_END_OF_H
diff --git a/libcxx/include/__algorithm/find_first_of.h b/libcxx/include/__algorithm/find_first_of.h
index 45ec133154371..7b9f7155c08af 100644
--- a/libcxx/include/__algorithm/find_first_of.h
+++ b/libcxx/include/__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_ALGORITHM_FIND_FIRST_OF_H
+#define _LIBCPP_ALGORITHM_FIND_FIRST_OF_H
 
 #include <__algorithm/comp.h>
 #include <__config>
@@ -51,4 +51,4 @@ template <class _ForwardIterator1, class _ForwardIterator2>
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_FIND_FIRST_OF_H
+#endif // _LIBCPP_ALGORITHM_FIND_FIRST_OF_H
diff --git a/libcxx/include/__algorithm/find_if.h b/libcxx/include/__algorithm/find_if.h
index fd63bcc3a50dd..78c5c137ac426 100644
--- a/libcxx/include/__algorithm/find_if.h
+++ b/libcxx/include/__algorithm/find_if.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_FIND_IF_H
-#define _LIBCPP___ALGORITHM_FIND_IF_H
+#ifndef _LIBCPP_ALGORITHM_FIND_IF_H
+#define _LIBCPP_ALGORITHM_FIND_IF_H
 
 #include <__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_ALGORITHM_FIND_IF_H
diff --git a/libcxx/include/__algorithm/find_if_not.h b/libcxx/include/__algorithm/find_if_not.h
index b4441b297c4bf..6c74076c35347 100644
--- a/libcxx/include/__algorithm/find_if_not.h
+++ b/libcxx/include/__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_ALGORITHM_FIND_IF_NOT_H
+#define _LIBCPP_ALGORITHM_FIND_IF_NOT_H
 
 #include <__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_ALGORITHM_FIND_IF_NOT_H
diff --git a/libcxx/include/__algorithm/find_segment_if.h b/libcxx/include/__algorithm/find_segment_if.h
index 9d6064f3e283a..85ed2b01131ba 100644
--- a/libcxx/include/__algorithm/find_segment_if.h
+++ b/libcxx/include/__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_ALGORITHM_FIND_SEGMENT_IF_H
+#define _LIBCPP_ALGORITHM_FIND_SEGMENT_IF_H
 
 #include <__config>
 #include <__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_ALGORITHM_FIND_SEGMENT_IF_H
diff --git a/libcxx/include/__algorithm/for_each.h b/libcxx/include/__algorithm/for_each.h
index cb26aa4d2656a..e40f2ef0ad3df 100644
--- a/libcxx/include/__algorithm/for_each.h
+++ b/libcxx/include/__algorithm/for_each.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_FOR_EACH_H
-#define _LIBCPP___ALGORITHM_FOR_EACH_H
+#ifndef _LIBCPP_ALGORITHM_FOR_EACH_H
+#define _LIBCPP_ALGORITHM_FOR_EACH_H
 
 #include <__algorithm/for_each_segment.h>
 #include <__config>
@@ -50,4 +50,4 @@ for_each(_InputIterator __first, _InputIterator __last, _Func __f) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_FOR_EACH_H
+#endif // _LIBCPP_ALGORITHM_FOR_EACH_H
diff --git a/libcxx/include/__algorithm/for_each_n.h b/libcxx/include/__algorithm/for_each_n.h
index 72c7adb093f95..e9af349e6362b 100644
--- a/libcxx/include/__algorithm/for_each_n.h
+++ b/libcxx/include/__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_ALGORITHM_FOR_EACH_N_H
+#define _LIBCPP_ALGORITHM_FOR_EACH_N_H
 
 #include <__algorithm/for_each.h>
 #include <__algorithm/for_each_n_segment.h>
@@ -72,4 +72,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_FOR_EACH_N_H
+#endif // _LIBCPP_ALGORITHM_FOR_EACH_N_H
diff --git a/libcxx/include/__algorithm/for_each_n_segment.h b/libcxx/include/__algorithm/for_each_n_segment.h
index a433df5d098ae..b876f373d7bfb 100644
--- a/libcxx/include/__algorithm/for_each_n_segment.h
+++ b/libcxx/include/__algorithm/for_each_n_segment.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_FOR_EACH_N_SEGMENT_H
-#define _LIBCPP___ALGORITHM_FOR_EACH_N_SEGMENT_H
+#ifndef _LIBCPP_ALGORITHM_FOR_EACH_N_SEGMENT_H
+#define _LIBCPP_ALGORITHM_FOR_EACH_N_SEGMENT_H
 
 #include <__config>
 #include <__iterator/iterator_traits.h>
@@ -60,4 +60,4 @@ __for_each_n_segment(_SegmentedIterator __first, _Size __orig_n, _Functor __func
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_FOR_EACH_N_SEGMENT_H
+#endif // _LIBCPP_ALGORITHM_FOR_EACH_N_SEGMENT_H
diff --git a/libcxx/include/__algorithm/for_each_segment.h b/libcxx/include/__algorithm/for_each_segment.h
index 93aa8259b2f7f..6f3d171b13193 100644
--- a/libcxx/include/__algorithm/for_each_segment.h
+++ b/libcxx/include/__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_ALGORITHM_FOR_EACH_SEGMENT_H
+#define _LIBCPP_ALGORITHM_FOR_EACH_SEGMENT_H
 
 #include <__config>
 #include <__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_ALGORITHM_FOR_EACH_SEGMENT_H
diff --git a/libcxx/include/__algorithm/generate.h b/libcxx/include/__algorithm/generate.h
index c4cd75cd0a4d6..7c91b6b4e5d31 100644
--- a/libcxx/include/__algorithm/generate.h
+++ b/libcxx/include/__algorithm/generate.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_GENERATE_H
-#define _LIBCPP___ALGORITHM_GENERATE_H
+#ifndef _LIBCPP_ALGORITHM_GENERATE_H
+#define _LIBCPP_ALGORITHM_GENERATE_H
 
 #include <__algorithm/for_each.h>
 #include <__config>
@@ -28,4 +28,4 @@ generate(_ForwardIterator __first, _ForwardIterator __last, _Generator __gen) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_GENERATE_H
+#endif // _LIBCPP_ALGORITHM_GENERATE_H
diff --git a/libcxx/include/__algorithm/generate_n.h b/libcxx/include/__algorithm/generate_n.h
index 23899e49e0b65..bc448b65d0eb6 100644
--- a/libcxx/include/__algorithm/generate_n.h
+++ b/libcxx/include/__algorithm/generate_n.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_GENERATE_N_H
-#define _LIBCPP___ALGORITHM_GENERATE_N_H
+#ifndef _LIBCPP_ALGORITHM_GENERATE_N_H
+#define _LIBCPP_ALGORITHM_GENERATE_N_H
 
 #include <__algorithm/for_each_n.h>
 #include <__config>
@@ -43,4 +43,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_GENERATE_N_H
+#endif // _LIBCPP_ALGORITHM_GENERATE_N_H
diff --git a/libcxx/include/__algorithm/half_positive.h b/libcxx/include/__algorithm/half_positive.h
index ebda0da372369..3bb8b2d1dab3a 100644
--- a/libcxx/include/__algorithm/half_positive.h
+++ b/libcxx/include/__algorithm/half_positive.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_HALF_POSITIVE_H
-#define _LIBCPP___ALGORITHM_HALF_POSITIVE_H
+#ifndef _LIBCPP_ALGORITHM_HALF_POSITIVE_H
+#define _LIBCPP_ALGORITHM_HALF_POSITIVE_H
 
 #include <__config>
 #include <__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_ALGORITHM_HALF_POSITIVE_H
diff --git a/libcxx/include/__algorithm/in_found_result.h b/libcxx/include/__algorithm/in_found_result.h
index a67ae387974c0..4acf3da75bf4c 100644
--- a/libcxx/include/__algorithm/in_found_result.h
+++ b/libcxx/include/__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_ALGORITHM_IN_FOUND_RESULT_H
+#define _LIBCPP_ALGORITHM_IN_FOUND_RESULT_H
 
 #include <__concepts/convertible_to.h>
 #include <__config>
@@ -51,4 +51,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_IN_FOUND_RESULT_H
+#endif // _LIBCPP_ALGORITHM_IN_FOUND_RESULT_H
diff --git a/libcxx/include/__algorithm/in_fun_result.h b/libcxx/include/__algorithm/in_fun_result.h
index a22069a9a8dda..89eccccaa156b 100644
--- a/libcxx/include/__algorithm/in_fun_result.h
+++ b/libcxx/include/__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_ALGORITHM_IN_FUN_RESULT_H
+#define _LIBCPP_ALGORITHM_IN_FUN_RESULT_H
 
 #include <__concepts/convertible_to.h>
 #include <__config>
@@ -51,4 +51,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_IN_FUN_RESULT_H
+#endif // _LIBCPP_ALGORITHM_IN_FUN_RESULT_H
diff --git a/libcxx/include/__algorithm/in_in_out_result.h b/libcxx/include/__algorithm/in_in_out_result.h
index ba0380b5c6814..dc3bbcb1db2ee 100644
--- a/libcxx/include/__algorithm/in_in_out_result.h
+++ b/libcxx/include/__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_ALGORITHM_IN_IN_OUT_RESULT_H
+#define _LIBCPP_ALGORITHM_IN_IN_OUT_RESULT_H
 
 #include <__concepts/convertible_to.h>
 #include <__config>
@@ -56,4 +56,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_IN_IN_OUT_RESULT_H
+#endif // _LIBCPP_ALGORITHM_IN_IN_OUT_RESULT_H
diff --git a/libcxx/include/__algorithm/in_in_result.h b/libcxx/include/__algorithm/in_in_result.h
index 994573fc70fd8..29bbaa40d9061 100644
--- a/libcxx/include/__algorithm/in_in_result.h
+++ b/libcxx/include/__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_ALGORITHM_IN_IN_RESULT_H
+#define _LIBCPP_ALGORITHM_IN_IN_RESULT_H
 
 #include <__concepts/convertible_to.h>
 #include <__config>
@@ -53,4 +53,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_IN_IN_RESULT_H
+#endif // _LIBCPP_ALGORITHM_IN_IN_RESULT_H
diff --git a/libcxx/include/__algorithm/in_out_out_result.h b/libcxx/include/__algorithm/in_out_out_result.h
index 8ceb452841a41..a35d8fc013ce5 100644
--- a/libcxx/include/__algorithm/in_out_out_result.h
+++ b/libcxx/include/__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_ALGORITHM_IN_OUT_OUT_RESULT_H
+#define _LIBCPP_ALGORITHM_IN_OUT_OUT_RESULT_H
 
 #include <__concepts/convertible_to.h>
 #include <__config>
@@ -54,4 +54,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_IN_OUT_OUT_RESULT_H
+#endif // _LIBCPP_ALGORITHM_IN_OUT_OUT_RESULT_H
diff --git a/libcxx/include/__algorithm/in_out_result.h b/libcxx/include/__algorithm/in_out_result.h
index a7a986cf8e6c0..bd1eea2f8ae5a 100644
--- a/libcxx/include/__algorithm/in_out_result.h
+++ b/libcxx/include/__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_ALGORITHM_IN_OUT_RESULT_H
+#define _LIBCPP_ALGORITHM_IN_OUT_RESULT_H
 
 #include <__concepts/convertible_to.h>
 #include <__config>
@@ -53,4 +53,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_IN_OUT_RESULT_H
+#endif // _LIBCPP_ALGORITHM_IN_OUT_RESULT_H
diff --git a/libcxx/include/__algorithm/includes.h b/libcxx/include/__algorithm/includes.h
index bc6c6579693b1..15cc6dcc166da 100644
--- a/libcxx/include/__algorithm/includes.h
+++ b/libcxx/include/__algorithm/includes.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_INCLUDES_H
-#define _LIBCPP___ALGORITHM_INCLUDES_H
+#ifndef _LIBCPP_ALGORITHM_INCLUDES_H
+#define _LIBCPP_ALGORITHM_INCLUDES_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -75,4 +75,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_INCLUDES_H
+#endif // _LIBCPP_ALGORITHM_INCLUDES_H
diff --git a/libcxx/include/__algorithm/inplace_merge.h b/libcxx/include/__algorithm/inplace_merge.h
index fbfe89936d554..487705c256646 100644
--- a/libcxx/include/__algorithm/inplace_merge.h
+++ b/libcxx/include/__algorithm/inplace_merge.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_INPLACE_MERGE_H
-#define _LIBCPP___ALGORITHM_INPLACE_MERGE_H
+#ifndef _LIBCPP_ALGORITHM_INPLACE_MERGE_H
+#define _LIBCPP_ALGORITHM_INPLACE_MERGE_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -240,4 +240,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_INPLACE_MERGE_H
+#endif // _LIBCPP_ALGORITHM_INPLACE_MERGE_H
diff --git a/libcxx/include/__algorithm/is_heap.h b/libcxx/include/__algorithm/is_heap.h
index dfe06200cedcb..c7440faa17d38 100644
--- a/libcxx/include/__algorithm/is_heap.h
+++ b/libcxx/include/__algorithm/is_heap.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_IS_HEAP_H
-#define _LIBCPP___ALGORITHM_IS_HEAP_H
+#ifndef _LIBCPP_ALGORITHM_IS_HEAP_H
+#define _LIBCPP_ALGORITHM_IS_HEAP_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -34,4 +34,4 @@ is_heap(_RandomAccessIterator __first, _RandomAccessIterator __last) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_IS_HEAP_H
+#endif // _LIBCPP_ALGORITHM_IS_HEAP_H
diff --git a/libcxx/include/__algorithm/is_heap_until.h b/libcxx/include/__algorithm/is_heap_until.h
index 7444d978e37f5..54517ecc72625 100644
--- a/libcxx/include/__algorithm/is_heap_until.h
+++ b/libcxx/include/__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_ALGORITHM_IS_HEAP_UNTIL_H
+#define _LIBCPP_ALGORITHM_IS_HEAP_UNTIL_H
 
 #include <__algorithm/comp.h>
 #include <__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_ALGORITHM_IS_HEAP_UNTIL_H
diff --git a/libcxx/include/__algorithm/is_partitioned.h b/libcxx/include/__algorithm/is_partitioned.h
index 700e452bbfa63..57fc406b443ba 100644
--- a/libcxx/include/__algorithm/is_partitioned.h
+++ b/libcxx/include/__algorithm/is_partitioned.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_IS_PARTITIONED_H
-#define _LIBCPP___ALGORITHM_IS_PARTITIONED_H
+#ifndef _LIBCPP_ALGORITHM_IS_PARTITIONED_H
+#define _LIBCPP_ALGORITHM_IS_PARTITIONED_H
 
 #include <__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_ALGORITHM_IS_PARTITIONED_H
diff --git a/libcxx/include/__algorithm/is_permutation.h b/libcxx/include/__algorithm/is_permutation.h
index 86f469c2799c5..a389c42b0e0aa 100644
--- a/libcxx/include/__algorithm/is_permutation.h
+++ b/libcxx/include/__algorithm/is_permutation.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_IS_PERMUTATION_H
-#define _LIBCPP___ALGORITHM_IS_PERMUTATION_H
+#ifndef _LIBCPP_ALGORITHM_IS_PERMUTATION_H
+#define _LIBCPP_ALGORITHM_IS_PERMUTATION_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/iterator_operations.h>
@@ -306,4 +306,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_IS_PERMUTATION_H
+#endif // _LIBCPP_ALGORITHM_IS_PERMUTATION_H
diff --git a/libcxx/include/__algorithm/is_sorted.h b/libcxx/include/__algorithm/is_sorted.h
index 196ae0beec014..0988a8f348ec5 100644
--- a/libcxx/include/__algorithm/is_sorted.h
+++ b/libcxx/include/__algorithm/is_sorted.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_IS_SORTED_H
-#define _LIBCPP___ALGORITHM_IS_SORTED_H
+#ifndef _LIBCPP_ALGORITHM_IS_SORTED_H
+#define _LIBCPP_ALGORITHM_IS_SORTED_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -34,4 +34,4 @@ is_sorted(_ForwardIterator __first, _ForwardIterator __last) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_IS_SORTED_H
+#endif // _LIBCPP_ALGORITHM_IS_SORTED_H
diff --git a/libcxx/include/__algorithm/is_sorted_until.h b/libcxx/include/__algorithm/is_sorted_until.h
index 606641949db98..4e7ac7b295268 100644
--- a/libcxx/include/__algorithm/is_sorted_until.h
+++ b/libcxx/include/__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_ALGORITHM_IS_SORTED_UNTIL_H
+#define _LIBCPP_ALGORITHM_IS_SORTED_UNTIL_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -47,4 +47,4 @@ is_sorted_until(_ForwardIterator __first, _ForwardIterator __last) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_IS_SORTED_UNTIL_H
+#endif // _LIBCPP_ALGORITHM_IS_SORTED_UNTIL_H
diff --git a/libcxx/include/__algorithm/iter_swap.h b/libcxx/include/__algorithm/iter_swap.h
index a1412e5d8720b..9bc4f7a64c004 100644
--- a/libcxx/include/__algorithm/iter_swap.h
+++ b/libcxx/include/__algorithm/iter_swap.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_ITER_SWAP_H
-#define _LIBCPP___ALGORITHM_ITER_SWAP_H
+#ifndef _LIBCPP_ALGORITHM_ITER_SWAP_H
+#define _LIBCPP_ALGORITHM_ITER_SWAP_H
 
 #include <__config>
 #include <__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_ALGORITHM_ITER_SWAP_H
diff --git a/libcxx/include/__algorithm/iterator_operations.h b/libcxx/include/__algorithm/iterator_operations.h
index e5c89c1e67e3a..60995cae53bc7 100644
--- a/libcxx/include/__algorithm/iterator_operations.h
+++ b/libcxx/include/__algorithm/iterator_operations.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_ITERATOR_OPERATIONS_H
-#define _LIBCPP___ALGORITHM_ITERATOR_OPERATIONS_H
+#ifndef _LIBCPP_ALGORITHM_ITERATOR_OPERATIONS_H
+#define _LIBCPP_ALGORITHM_ITERATOR_OPERATIONS_H
 
 #include <__algorithm/iter_swap.h>
 #include <__algorithm/ranges_iterator_concept.h>
@@ -223,4 +223,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_ITERATOR_OPERATIONS_H
+#endif // _LIBCPP_ALGORITHM_ITERATOR_OPERATIONS_H
diff --git a/libcxx/include/__algorithm/lexicographical_compare.h b/libcxx/include/__algorithm/lexicographical_compare.h
index ebe7e3b56a292..ce8b5d90dbfd8 100644
--- a/libcxx/include/__algorithm/lexicographical_compare.h
+++ b/libcxx/include/__algorithm/lexicographical_compare.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_LEXICOGRAPHICAL_COMPARE_H
-#define _LIBCPP___ALGORITHM_LEXICOGRAPHICAL_COMPARE_H
+#ifndef _LIBCPP_ALGORITHM_LEXICOGRAPHICAL_COMPARE_H
+#define _LIBCPP_ALGORITHM_LEXICOGRAPHICAL_COMPARE_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/min.h>
@@ -126,4 +126,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_LEXICOGRAPHICAL_COMPARE_H
+#endif // _LIBCPP_ALGORITHM_LEXICOGRAPHICAL_COMPARE_H
diff --git a/libcxx/include/__algorithm/lexicographical_compare_three_way.h b/libcxx/include/__algorithm/lexicographical_compare_three_way.h
index 442223e79e4ec..0e5cc03fa291c 100644
--- a/libcxx/include/__algorithm/lexicographical_compare_three_way.h
+++ b/libcxx/include/__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_ALGORITHM_LEXICOGRAPHICAL_COMPARE_THREE_WAY_H
+#define _LIBCPP_ALGORITHM_LEXICOGRAPHICAL_COMPARE_THREE_WAY_H
 
 #include <__algorithm/min.h>
 #include <__algorithm/three_way_comp_ref_type.h>
@@ -122,4 +122,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_LEXICOGRAPHICAL_COMPARE_THREE_WAY_H
+#endif // _LIBCPP_ALGORITHM_LEXICOGRAPHICAL_COMPARE_THREE_WAY_H
diff --git a/libcxx/include/__algorithm/lower_bound.h b/libcxx/include/__algorithm/lower_bound.h
index 4fba6748e6d71..bdca052f0f996 100644
--- a/libcxx/include/__algorithm/lower_bound.h
+++ b/libcxx/include/__algorithm/lower_bound.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_LOWER_BOUND_H
-#define _LIBCPP___ALGORITHM_LOWER_BOUND_H
+#ifndef _LIBCPP_ALGORITHM_LOWER_BOUND_H
+#define _LIBCPP_ALGORITHM_LOWER_BOUND_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/half_positive.h>
@@ -105,4 +105,4 @@ lower_bound(_ForwardIterator __first, _ForwardIterator __last, const _Tp& __valu
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_LOWER_BOUND_H
+#endif // _LIBCPP_ALGORITHM_LOWER_BOUND_H
diff --git a/libcxx/include/__algorithm/make_heap.h b/libcxx/include/__algorithm/make_heap.h
index f98a0d2f89c85..0e0228b789faf 100644
--- a/libcxx/include/__algorithm/make_heap.h
+++ b/libcxx/include/__algorithm/make_heap.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_MAKE_HEAP_H
-#define _LIBCPP___ALGORITHM_MAKE_HEAP_H
+#ifndef _LIBCPP_ALGORITHM_MAKE_HEAP_H
+#define _LIBCPP_ALGORITHM_MAKE_HEAP_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -69,4 +69,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_MAKE_HEAP_H
+#endif // _LIBCPP_ALGORITHM_MAKE_HEAP_H
diff --git a/libcxx/include/__algorithm/make_projected.h b/libcxx/include/__algorithm/make_projected.h
index 4a25822938751..b5b660f02770c 100644
--- a/libcxx/include/__algorithm/make_projected.h
+++ b/libcxx/include/__algorithm/make_projected.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_MAKE_PROJECTED_H
-#define _LIBCPP___ALGORITHM_MAKE_PROJECTED_H
+#ifndef _LIBCPP_ALGORITHM_MAKE_PROJECTED_H
+#define _LIBCPP_ALGORITHM_MAKE_PROJECTED_H
 
 #include <__config>
 #include <__functional/identity.h>
@@ -101,4 +101,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
 
-#endif // _LIBCPP___ALGORITHM_MAKE_PROJECTED_H
+#endif // _LIBCPP_ALGORITHM_MAKE_PROJECTED_H
diff --git a/libcxx/include/__algorithm/max.h b/libcxx/include/__algorithm/max.h
index 1673e6be91238..b5fa4e4eb0177 100644
--- a/libcxx/include/__algorithm/max.h
+++ b/libcxx/include/__algorithm/max.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_MAX_H
-#define _LIBCPP___ALGORITHM_MAX_H
+#ifndef _LIBCPP_ALGORITHM_MAX_H
+#define _LIBCPP_ALGORITHM_MAX_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -55,4 +55,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_MAX_H
+#endif // _LIBCPP_ALGORITHM_MAX_H
diff --git a/libcxx/include/__algorithm/max_element.h b/libcxx/include/__algorithm/max_element.h
index 929f337fc10ad..1d3a458c6c774 100644
--- a/libcxx/include/__algorithm/max_element.h
+++ b/libcxx/include/__algorithm/max_element.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_MAX_ELEMENT_H
-#define _LIBCPP___ALGORITHM_MAX_ELEMENT_H
+#ifndef _LIBCPP_ALGORITHM_MAX_ELEMENT_H
+#define _LIBCPP_ALGORITHM_MAX_ELEMENT_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -51,4 +51,4 @@ max_element(_ForwardIterator __first, _ForwardIterator __last) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_MAX_ELEMENT_H
+#endif // _LIBCPP_ALGORITHM_MAX_ELEMENT_H
diff --git a/libcxx/include/__algorithm/merge.h b/libcxx/include/__algorithm/merge.h
index ae859b7b63ff6..523cb85d568ba 100644
--- a/libcxx/include/__algorithm/merge.h
+++ b/libcxx/include/__algorithm/merge.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_MERGE_H
-#define _LIBCPP___ALGORITHM_MERGE_H
+#ifndef _LIBCPP_ALGORITHM_MERGE_H
+#define _LIBCPP_ALGORITHM_MERGE_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -65,4 +65,4 @@ merge(_InputIterator1 __first1,
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_MERGE_H
+#endif // _LIBCPP_ALGORITHM_MERGE_H
diff --git a/libcxx/include/__algorithm/min.h b/libcxx/include/__algorithm/min.h
index 660e0b204e19a..4b3a7647dac76 100644
--- a/libcxx/include/__algorithm/min.h
+++ b/libcxx/include/__algorithm/min.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_MIN_H
-#define _LIBCPP___ALGORITHM_MIN_H
+#ifndef _LIBCPP_ALGORITHM_MIN_H
+#define _LIBCPP_ALGORITHM_MIN_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -55,4 +55,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_MIN_H
+#endif // _LIBCPP_ALGORITHM_MIN_H
diff --git a/libcxx/include/__algorithm/min_element.h b/libcxx/include/__algorithm/min_element.h
index fdab63aefec7e..0ca04314246b4 100644
--- a/libcxx/include/__algorithm/min_element.h
+++ b/libcxx/include/__algorithm/min_element.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_MIN_ELEMENT_H
-#define _LIBCPP___ALGORITHM_MIN_ELEMENT_H
+#ifndef _LIBCPP_ALGORITHM_MIN_ELEMENT_H
+#define _LIBCPP_ALGORITHM_MIN_ELEMENT_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -68,4 +68,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_MIN_ELEMENT_H
+#endif // _LIBCPP_ALGORITHM_MIN_ELEMENT_H
diff --git a/libcxx/include/__algorithm/min_max_result.h b/libcxx/include/__algorithm/min_max_result.h
index e988df7c114ee..eaf63ef96e652 100644
--- a/libcxx/include/__algorithm/min_max_result.h
+++ b/libcxx/include/__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_ALGORITHM_MIN_MAX_RESULT_H
+#define _LIBCPP_ALGORITHM_MIN_MAX_RESULT_H
 
 #include <__concepts/convertible_to.h>
 #include <__config>
@@ -53,4 +53,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_MIN_MAX_RESULT_H
+#endif // _LIBCPP_ALGORITHM_MIN_MAX_RESULT_H
diff --git a/libcxx/include/__algorithm/minmax.h b/libcxx/include/__algorithm/minmax.h
index de0bec0ef72fc..0a6ca93a95a96 100644
--- a/libcxx/include/__algorithm/minmax.h
+++ b/libcxx/include/__algorithm/minmax.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_MINMAX_H
-#define _LIBCPP___ALGORITHM_MINMAX_H
+#ifndef _LIBCPP_ALGORITHM_MINMAX_H
+#define _LIBCPP_ALGORITHM_MINMAX_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/minmax_element.h>
@@ -56,4 +56,4 @@ minmax(initializer_list<_Tp> __t) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_MINMAX_H
+#endif // _LIBCPP_ALGORITHM_MINMAX_H
diff --git a/libcxx/include/__algorithm/minmax_element.h b/libcxx/include/__algorithm/minmax_element.h
index dc0c3a818cd57..1115d8c26c9fd 100644
--- a/libcxx/include/__algorithm/minmax_element.h
+++ b/libcxx/include/__algorithm/minmax_element.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_MINMAX_ELEMENT_H
-#define _LIBCPP___ALGORITHM_MINMAX_ELEMENT_H
+#ifndef _LIBCPP_ALGORITHM_MINMAX_ELEMENT_H
+#define _LIBCPP_ALGORITHM_MINMAX_ELEMENT_H
 
 #include <__algorithm/comp.h>
 #include <__config>
@@ -97,4 +97,4 @@ minmax_element(_ForwardIterator __first, _ForwardIterator __last) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_MINMAX_ELEMENT_H
+#endif // _LIBCPP_ALGORITHM_MINMAX_ELEMENT_H
diff --git a/libcxx/include/__algorithm/mismatch.h b/libcxx/include/__algorithm/mismatch.h
index 749c701974f07..0f2db40352502 100644
--- a/libcxx/include/__algorithm/mismatch.h
+++ b/libcxx/include/__algorithm/mismatch.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_MISMATCH_H
-#define _LIBCPP___ALGORITHM_MISMATCH_H
+#ifndef _LIBCPP_ALGORITHM_MISMATCH_H
+#define _LIBCPP_ALGORITHM_MISMATCH_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/min.h>
@@ -215,4 +215,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_MISMATCH_H
+#endif // _LIBCPP_ALGORITHM_MISMATCH_H
diff --git a/libcxx/include/__algorithm/move.h b/libcxx/include/__algorithm/move.h
index 52bd5fb5253db..13a5ef49098d7 100644
--- a/libcxx/include/__algorithm/move.h
+++ b/libcxx/include/__algorithm/move.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_MOVE_H
-#define _LIBCPP___ALGORITHM_MOVE_H
+#ifndef _LIBCPP_ALGORITHM_MOVE_H
+#define _LIBCPP_ALGORITHM_MOVE_H
 
 #include <__algorithm/copy.h>
 #include <__algorithm/copy_move_common.h>
@@ -137,4 +137,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_MOVE_H
+#endif // _LIBCPP_ALGORITHM_MOVE_H
diff --git a/libcxx/include/__algorithm/move_backward.h b/libcxx/include/__algorithm/move_backward.h
index a4698327b474d..f6cca57773c57 100644
--- a/libcxx/include/__algorithm/move_backward.h
+++ b/libcxx/include/__algorithm/move_backward.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_MOVE_BACKWARD_H
-#define _LIBCPP___ALGORITHM_MOVE_BACKWARD_H
+#ifndef _LIBCPP_ALGORITHM_MOVE_BACKWARD_H
+#define _LIBCPP_ALGORITHM_MOVE_BACKWARD_H
 
 #include <__algorithm/copy_backward.h>
 #include <__algorithm/copy_move_common.h>
@@ -147,4 +147,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_MOVE_BACKWARD_H
+#endif // _LIBCPP_ALGORITHM_MOVE_BACKWARD_H
diff --git a/libcxx/include/__algorithm/next_permutation.h b/libcxx/include/__algorithm/next_permutation.h
index 011ee028cc2f5..dad9321cadd43 100644
--- a/libcxx/include/__algorithm/next_permutation.h
+++ b/libcxx/include/__algorithm/next_permutation.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_NEXT_PERMUTATION_H
-#define _LIBCPP___ALGORITHM_NEXT_PERMUTATION_H
+#ifndef _LIBCPP_ALGORITHM_NEXT_PERMUTATION_H
+#define _LIBCPP_ALGORITHM_NEXT_PERMUTATION_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -72,4 +72,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_NEXT_PERMUTATION_H
+#endif // _LIBCPP_ALGORITHM_NEXT_PERMUTATION_H
diff --git a/libcxx/include/__algorithm/none_of.h b/libcxx/include/__algorithm/none_of.h
index e6bd197622292..e4c380afb7f67 100644
--- a/libcxx/include/__algorithm/none_of.h
+++ b/libcxx/include/__algorithm/none_of.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_NONE_OF_H
-#define _LIBCPP___ALGORITHM_NONE_OF_H
+#ifndef _LIBCPP_ALGORITHM_NONE_OF_H
+#define _LIBCPP_ALGORITHM_NONE_OF_H
 
 #include <__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_ALGORITHM_NONE_OF_H
diff --git a/libcxx/include/__algorithm/nth_element.h b/libcxx/include/__algorithm/nth_element.h
index da748d7255aba..bbd6fa0a55ec4 100644
--- a/libcxx/include/__algorithm/nth_element.h
+++ b/libcxx/include/__algorithm/nth_element.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_NTH_ELEMENT_H
-#define _LIBCPP___ALGORITHM_NTH_ELEMENT_H
+#ifndef _LIBCPP_ALGORITHM_NTH_ELEMENT_H
+#define _LIBCPP_ALGORITHM_NTH_ELEMENT_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -258,4 +258,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_NTH_ELEMENT_H
+#endif // _LIBCPP_ALGORITHM_NTH_ELEMENT_H
diff --git a/libcxx/include/__algorithm/out_value_result.h b/libcxx/include/__algorithm/out_value_result.h
index 9e1e0e07286d4..c3a04fed873f4 100644
--- a/libcxx/include/__algorithm/out_value_result.h
+++ b/libcxx/include/__algorithm/out_value_result.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_OUT_VALUE_RESULT_H
-#define _LIBCPP___ALGORITHM_OUT_VALUE_RESULT_H
+#ifndef _LIBCPP_ALGORITHM_OUT_VALUE_RESULT_H
+#define _LIBCPP_ALGORITHM_OUT_VALUE_RESULT_H
 
 #include <__concepts/convertible_to.h>
 #include <__config>
@@ -53,4 +53,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_OUT_VALUE_RESULT_H
+#endif // _LIBCPP_ALGORITHM_OUT_VALUE_RESULT_H
diff --git a/libcxx/include/__algorithm/partial_sort.h b/libcxx/include/__algorithm/partial_sort.h
index 4b39ae0cf2dfc..5bbcaf3eb9368 100644
--- a/libcxx/include/__algorithm/partial_sort.h
+++ b/libcxx/include/__algorithm/partial_sort.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_PARTIAL_SORT_H
-#define _LIBCPP___ALGORITHM_PARTIAL_SORT_H
+#ifndef _LIBCPP_ALGORITHM_PARTIAL_SORT_H
+#define _LIBCPP_ALGORITHM_PARTIAL_SORT_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -88,4 +88,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_PARTIAL_SORT_H
+#endif // _LIBCPP_ALGORITHM_PARTIAL_SORT_H
diff --git a/libcxx/include/__algorithm/partial_sort_copy.h b/libcxx/include/__algorithm/partial_sort_copy.h
index 2230dfc9cc4ad..07f49adbcb0fa 100644
--- a/libcxx/include/__algorithm/partial_sort_copy.h
+++ b/libcxx/include/__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_ALGORITHM_PARTIAL_SORT_COPY_H
+#define _LIBCPP_ALGORITHM_PARTIAL_SORT_COPY_H
 
 #include <__algorithm/comp.h>
 #include <__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_ALGORITHM_PARTIAL_SORT_COPY_H
diff --git a/libcxx/include/__algorithm/partition.h b/libcxx/include/__algorithm/partition.h
index 669aac3b27555..c676ac7560428 100644
--- a/libcxx/include/__algorithm/partition.h
+++ b/libcxx/include/__algorithm/partition.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_PARTITION_H
-#define _LIBCPP___ALGORITHM_PARTITION_H
+#ifndef _LIBCPP_ALGORITHM_PARTITION_H
+#define _LIBCPP_ALGORITHM_PARTITION_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__config>
@@ -88,4 +88,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_PARTITION_H
+#endif // _LIBCPP_ALGORITHM_PARTITION_H
diff --git a/libcxx/include/__algorithm/partition_copy.h b/libcxx/include/__algorithm/partition_copy.h
index 147b45c7882a5..4492dd6adf977 100644
--- a/libcxx/include/__algorithm/partition_copy.h
+++ b/libcxx/include/__algorithm/partition_copy.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_PARTITION_COPY_H
-#define _LIBCPP___ALGORITHM_PARTITION_COPY_H
+#ifndef _LIBCPP_ALGORITHM_PARTITION_COPY_H
+#define _LIBCPP_ALGORITHM_PARTITION_COPY_H
 
 #include <__config>
 #include <__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_ALGORITHM_PARTITION_COPY_H
diff --git a/libcxx/include/__algorithm/partition_point.h b/libcxx/include/__algorithm/partition_point.h
index 504dbf1d1a055..df4d3251eba92 100644
--- a/libcxx/include/__algorithm/partition_point.h
+++ b/libcxx/include/__algorithm/partition_point.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_PARTITION_POINT_H
-#define _LIBCPP___ALGORITHM_PARTITION_POINT_H
+#ifndef _LIBCPP_ALGORITHM_PARTITION_POINT_H
+#define _LIBCPP_ALGORITHM_PARTITION_POINT_H
 
 #include <__algorithm/half_positive.h>
 #include <__config>
@@ -41,4 +41,4 @@ partition_point(_ForwardIterator __first, _ForwardIterator __last, _Predicate __
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_PARTITION_POINT_H
+#endif // _LIBCPP_ALGORITHM_PARTITION_POINT_H
diff --git a/libcxx/include/__algorithm/pop_heap.h b/libcxx/include/__algorithm/pop_heap.h
index 6d23830097ff9..36746aa14b325 100644
--- a/libcxx/include/__algorithm/pop_heap.h
+++ b/libcxx/include/__algorithm/pop_heap.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_POP_HEAP_H
-#define _LIBCPP___ALGORITHM_POP_HEAP_H
+#ifndef _LIBCPP_ALGORITHM_POP_HEAP_H
+#define _LIBCPP_ALGORITHM_POP_HEAP_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -78,4 +78,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_POP_HEAP_H
+#endif // _LIBCPP_ALGORITHM_POP_HEAP_H
diff --git a/libcxx/include/__algorithm/prev_permutation.h b/libcxx/include/__algorithm/prev_permutation.h
index 8d15b6806401d..b8c8d760498bd 100644
--- a/libcxx/include/__algorithm/prev_permutation.h
+++ b/libcxx/include/__algorithm/prev_permutation.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_PREV_PERMUTATION_H
-#define _LIBCPP___ALGORITHM_PREV_PERMUTATION_H
+#ifndef _LIBCPP_ALGORITHM_PREV_PERMUTATION_H
+#define _LIBCPP_ALGORITHM_PREV_PERMUTATION_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -72,4 +72,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_PREV_PERMUTATION_H
+#endif // _LIBCPP_ALGORITHM_PREV_PERMUTATION_H
diff --git a/libcxx/include/__algorithm/pstl.h b/libcxx/include/__algorithm/pstl.h
index eea07e2b96b64..c69da08a2dd2c 100644
--- a/libcxx/include/__algorithm/pstl.h
+++ b/libcxx/include/__algorithm/pstl.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_PSTL_H
-#define _LIBCPP___ALGORITHM_PSTL_H
+#ifndef _LIBCPP_ALGORITHM_PSTL_H
+#define _LIBCPP_ALGORITHM_PSTL_H
 
 #include <__config>
 
@@ -660,4 +660,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_PSTL_H
+#endif // _LIBCPP_ALGORITHM_PSTL_H
diff --git a/libcxx/include/__algorithm/push_heap.h b/libcxx/include/__algorithm/push_heap.h
index ec0b445f2b70f..bb7eeb485e490 100644
--- a/libcxx/include/__algorithm/push_heap.h
+++ b/libcxx/include/__algorithm/push_heap.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_PUSH_HEAP_H
-#define _LIBCPP___ALGORITHM_PUSH_HEAP_H
+#ifndef _LIBCPP_ALGORITHM_PUSH_HEAP_H
+#define _LIBCPP_ALGORITHM_PUSH_HEAP_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -81,4 +81,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_PUSH_HEAP_H
+#endif // _LIBCPP_ALGORITHM_PUSH_HEAP_H
diff --git a/libcxx/include/__algorithm/radix_sort.h b/libcxx/include/__algorithm/radix_sort.h
index 5549a69f5e220..0b3802c8cfc80 100644
--- a/libcxx/include/__algorithm/radix_sort.h
+++ b/libcxx/include/__algorithm/radix_sort.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RADIX_SORT_H
-#define _LIBCPP___ALGORITHM_RADIX_SORT_H
+#ifndef _LIBCPP_ALGORITHM_RADIX_SORT_H
+#define _LIBCPP_ALGORITHM_RADIX_SORT_H
 
 // This is an implementation of classic LSD radix sort algorithm, running in linear time and using `O(max(N, M))`
 // additional memory, where `N` is size of an input range, `M` - maximum value of
@@ -428,4 +428,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RADIX_SORT_H
+#endif // _LIBCPP_ALGORITHM_RADIX_SORT_H
diff --git a/libcxx/include/__algorithm/ranges_adjacent_find.h b/libcxx/include/__algorithm/ranges_adjacent_find.h
index 731142b29e6c0..b3cbed1daf6c6 100644
--- a/libcxx/include/__algorithm/ranges_adjacent_find.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_ADJACENT_FIND_H
+#define _LIBCPP_ALGORITHM_RANGES_ADJACENT_FIND_H
 
 #include <__algorithm/adjacent_find.h>
 #include <__config>
@@ -63,4 +63,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_ADJACENT_FIND_H
+#endif // _LIBCPP_ALGORITHM_RANGES_ADJACENT_FIND_H
diff --git a/libcxx/include/__algorithm/ranges_all_of.h b/libcxx/include/__algorithm/ranges_all_of.h
index c3d6dc08d3c5f..26a7c051aed62 100644
--- a/libcxx/include/__algorithm/ranges_all_of.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_ALL_OF_H
+#define _LIBCPP_ALGORITHM_RANGES_ALL_OF_H
 
 #include <__algorithm/all_of.h>
 #include <__config>
@@ -61,4 +61,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_ALL_OF_H
+#endif // _LIBCPP_ALGORITHM_RANGES_ALL_OF_H
diff --git a/libcxx/include/__algorithm/ranges_any_of.h b/libcxx/include/__algorithm/ranges_any_of.h
index 7f0fd290f87d5..d9b250f3ba050 100644
--- a/libcxx/include/__algorithm/ranges_any_of.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_ANY_OF_H
+#define _LIBCPP_ALGORITHM_RANGES_ANY_OF_H
 
 #include <__algorithm/any_of.h>
 #include <__config>
@@ -60,4 +60,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_ANY_OF_H
+#endif // _LIBCPP_ALGORITHM_RANGES_ANY_OF_H
diff --git a/libcxx/include/__algorithm/ranges_binary_search.h b/libcxx/include/__algorithm/ranges_binary_search.h
index 47bd0997334e8..f5d3519c850ce 100644
--- a/libcxx/include/__algorithm/ranges_binary_search.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_BINARY_SEARCH_H
+#define _LIBCPP_ALGORITHM_RANGES_BINARY_SEARCH_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/lower_bound.h>
@@ -68,4 +68,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_BINARY_SEARCH_H
+#endif // _LIBCPP_ALGORITHM_RANGES_BINARY_SEARCH_H
diff --git a/libcxx/include/__algorithm/ranges_clamp.h b/libcxx/include/__algorithm/ranges_clamp.h
index 4bb3e46e73bd6..ef0e84d63bcee 100644
--- a/libcxx/include/__algorithm/ranges_clamp.h
+++ b/libcxx/include/__algorithm/ranges_clamp.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_CLAMP_H
-#define _LIBCPP___ALGORITHM_RANGES_CLAMP_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_CLAMP_H
+#define _LIBCPP_ALGORITHM_RANGES_CLAMP_H
 
 #include <__assert>
 #include <__config>
@@ -61,4 +61,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_CLAMP_H
+#endif // _LIBCPP_ALGORITHM_RANGES_CLAMP_H
diff --git a/libcxx/include/__algorithm/ranges_contains.h b/libcxx/include/__algorithm/ranges_contains.h
index 88de215297e5b..13166044d2c24 100644
--- a/libcxx/include/__algorithm/ranges_contains.h
+++ b/libcxx/include/__algorithm/ranges_contains.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_CONTAINS_H
-#define _LIBCPP___ALGORITHM_RANGES_CONTAINS_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_CONTAINS_H
+#define _LIBCPP_ALGORITHM_RANGES_CONTAINS_H
 
 #include <__algorithm/ranges_find.h>
 #include <__config>
@@ -61,4 +61,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_CONTAINS_H
+#endif // _LIBCPP_ALGORITHM_RANGES_CONTAINS_H
diff --git a/libcxx/include/__algorithm/ranges_contains_subrange.h b/libcxx/include/__algorithm/ranges_contains_subrange.h
index e8740d69dbef2..429bf0bc980cf 100644
--- a/libcxx/include/__algorithm/ranges_contains_subrange.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_CONTAINS_SUBRANGE_H
+#define _LIBCPP_ALGORITHM_RANGES_CONTAINS_SUBRANGE_H
 
 #include <__algorithm/ranges_search.h>
 #include <__config>
@@ -92,4 +92,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_CONTAINS_SUBRANGE_H
+#endif // _LIBCPP_ALGORITHM_RANGES_CONTAINS_SUBRANGE_H
diff --git a/libcxx/include/__algorithm/ranges_copy.h b/libcxx/include/__algorithm/ranges_copy.h
index a69af9b2bffc3..f42802b5957b7 100644
--- a/libcxx/include/__algorithm/ranges_copy.h
+++ b/libcxx/include/__algorithm/ranges_copy.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_COPY_H
-#define _LIBCPP___ALGORITHM_RANGES_COPY_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_COPY_H
+#define _LIBCPP_ALGORITHM_RANGES_COPY_H
 
 #include <__algorithm/copy.h>
 #include <__algorithm/in_out_result.h>
@@ -65,4 +65,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_COPY_H
+#endif // _LIBCPP_ALGORITHM_RANGES_COPY_H
diff --git a/libcxx/include/__algorithm/ranges_copy_backward.h b/libcxx/include/__algorithm/ranges_copy_backward.h
index 81d14e465f7f2..fc6f95beaa896 100644
--- a/libcxx/include/__algorithm/ranges_copy_backward.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_COPY_BACKWARD_H
+#define _LIBCPP_ALGORITHM_RANGES_COPY_BACKWARD_H
 
 #include <__algorithm/copy_backward.h>
 #include <__algorithm/in_out_result.h>
@@ -64,4 +64,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_COPY_BACKWARD_H
+#endif // _LIBCPP_ALGORITHM_RANGES_COPY_BACKWARD_H
diff --git a/libcxx/include/__algorithm/ranges_copy_if.h b/libcxx/include/__algorithm/ranges_copy_if.h
index acf74b669d481..f95e0e8a6f57c 100644
--- a/libcxx/include/__algorithm/ranges_copy_if.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_COPY_IF_H
+#define _LIBCPP_ALGORITHM_RANGES_COPY_IF_H
 
 #include <__algorithm/copy_if.h>
 #include <__algorithm/in_out_result.h>
@@ -73,4 +73,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_COPY_IF_H
+#endif // _LIBCPP_ALGORITHM_RANGES_COPY_IF_H
diff --git a/libcxx/include/__algorithm/ranges_copy_n.h b/libcxx/include/__algorithm/ranges_copy_n.h
index 1fbc61674e2dd..31178a0f1282c 100644
--- a/libcxx/include/__algorithm/ranges_copy_n.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_COPY_N_H
+#define _LIBCPP_ALGORITHM_RANGES_COPY_N_H
 
 #include <__algorithm/copy.h>
 #include <__algorithm/in_out_result.h>
@@ -77,4 +77,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_COPY_N_H
+#endif // _LIBCPP_ALGORITHM_RANGES_COPY_N_H
diff --git a/libcxx/include/__algorithm/ranges_count.h b/libcxx/include/__algorithm/ranges_count.h
index 2b3969e763079..3ab570be57d96 100644
--- a/libcxx/include/__algorithm/ranges_count.h
+++ b/libcxx/include/__algorithm/ranges_count.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_COUNT_H
-#define _LIBCPP___ALGORITHM_RANGES_COUNT_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_COUNT_H
+#define _LIBCPP_ALGORITHM_RANGES_COUNT_H
 
 #include <__algorithm/count.h>
 #include <__algorithm/iterator_operations.h>
@@ -61,4 +61,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_COUNT_H
+#endif // _LIBCPP_ALGORITHM_RANGES_COUNT_H
diff --git a/libcxx/include/__algorithm/ranges_count_if.h b/libcxx/include/__algorithm/ranges_count_if.h
index 6adeb78582bf3..2225f12d558ee 100644
--- a/libcxx/include/__algorithm/ranges_count_if.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_COUNT_IF_H
+#define _LIBCPP_ALGORITHM_RANGES_COUNT_IF_H
 
 #include <__algorithm/count_if.h>
 #include <__algorithm/iterator_operations.h>
@@ -64,4 +64,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_COUNT_IF_H
+#endif // _LIBCPP_ALGORITHM_RANGES_COUNT_IF_H
diff --git a/libcxx/include/__algorithm/ranges_ends_with.h b/libcxx/include/__algorithm/ranges_ends_with.h
index 3621bda389123..a3878a9f2dd6c 100644
--- a/libcxx/include/__algorithm/ranges_ends_with.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_ENDS_WITH_H
+#define _LIBCPP_ALGORITHM_RANGES_ENDS_WITH_H
 
 #include <__algorithm/ranges_equal.h>
 #include <__algorithm/ranges_starts_with.h>
@@ -197,4 +197,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_ENDS_WITH_H
+#endif // _LIBCPP_ALGORITHM_RANGES_ENDS_WITH_H
diff --git a/libcxx/include/__algorithm/ranges_equal.h b/libcxx/include/__algorithm/ranges_equal.h
index c26d13f002201..f1bc35c86b081 100644
--- a/libcxx/include/__algorithm/ranges_equal.h
+++ b/libcxx/include/__algorithm/ranges_equal.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_EQUAL_H
-#define _LIBCPP___ALGORITHM_RANGES_EQUAL_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_EQUAL_H
+#define _LIBCPP_ALGORITHM_RANGES_EQUAL_H
 
 #include <__algorithm/equal.h>
 #include <__algorithm/unwrap_range.h>
@@ -104,4 +104,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_EQUAL_H
+#endif // _LIBCPP_ALGORITHM_RANGES_EQUAL_H
diff --git a/libcxx/include/__algorithm/ranges_equal_range.h b/libcxx/include/__algorithm/ranges_equal_range.h
index cc765f196648e..a59e285090340 100644
--- a/libcxx/include/__algorithm/ranges_equal_range.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_EQUAL_RANGE_H
+#define _LIBCPP_ALGORITHM_RANGES_EQUAL_RANGE_H
 
 #include <__algorithm/equal_range.h>
 #include <__algorithm/iterator_operations.h>
@@ -73,4 +73,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_EQUAL_RANGE_H
+#endif // _LIBCPP_ALGORITHM_RANGES_EQUAL_RANGE_H
diff --git a/libcxx/include/__algorithm/ranges_fill.h b/libcxx/include/__algorithm/ranges_fill.h
index 814ae6363fcf0..4cfb55f68c8da 100644
--- a/libcxx/include/__algorithm/ranges_fill.h
+++ b/libcxx/include/__algorithm/ranges_fill.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_FILL_H
-#define _LIBCPP___ALGORITHM_RANGES_FILL_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_FILL_H
+#define _LIBCPP_ALGORITHM_RANGES_FILL_H
 
 #include <__algorithm/fill.h>
 #include <__algorithm/fill_n.h>
@@ -58,4 +58,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_FILL_H
+#endif // _LIBCPP_ALGORITHM_RANGES_FILL_H
diff --git a/libcxx/include/__algorithm/ranges_fill_n.h b/libcxx/include/__algorithm/ranges_fill_n.h
index 1276f13680a9f..4d924e27387a3 100644
--- a/libcxx/include/__algorithm/ranges_fill_n.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_FILL_N_H
+#define _LIBCPP_ALGORITHM_RANGES_FILL_N_H
 
 #include <__algorithm/fill_n.h>
 #include <__config>
@@ -46,4 +46,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_FILL_N_H
+#endif // _LIBCPP_ALGORITHM_RANGES_FILL_N_H
diff --git a/libcxx/include/__algorithm/ranges_find.h b/libcxx/include/__algorithm/ranges_find.h
index 1eac4cfa02a4a..f8f03864947ec 100644
--- a/libcxx/include/__algorithm/ranges_find.h
+++ b/libcxx/include/__algorithm/ranges_find.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_FIND_H
-#define _LIBCPP___ALGORITHM_RANGES_FIND_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_FIND_H
+#define _LIBCPP_ALGORITHM_RANGES_FIND_H
 
 #include <__algorithm/find.h>
 #include <__algorithm/ranges_find_if.h>
@@ -75,4 +75,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_FIND_H
+#endif // _LIBCPP_ALGORITHM_RANGES_FIND_H
diff --git a/libcxx/include/__algorithm/ranges_find_end.h b/libcxx/include/__algorithm/ranges_find_end.h
index 682724a48cd5a..91d131ded0ca0 100644
--- a/libcxx/include/__algorithm/ranges_find_end.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_FIND_END_H
+#define _LIBCPP_ALGORITHM_RANGES_FIND_END_H
 
 #include <__algorithm/find_end.h>
 #include <__algorithm/iterator_operations.h>
@@ -98,4 +98,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_FIND_END_H
+#endif // _LIBCPP_ALGORITHM_RANGES_FIND_END_H
diff --git a/libcxx/include/__algorithm/ranges_find_first_of.h b/libcxx/include/__algorithm/ranges_find_first_of.h
index 102e16dd7a55b..33afd6aa1b6fe 100644
--- a/libcxx/include/__algorithm/ranges_find_first_of.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_FIND_FIRST_OF_H
+#define _LIBCPP_ALGORITHM_RANGES_FIND_FIRST_OF_H
 
 #include <__config>
 #include <__functional/identity.h>
@@ -101,4 +101,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_FIND_FIRST_OF_H
+#endif // _LIBCPP_ALGORITHM_RANGES_FIND_FIRST_OF_H
diff --git a/libcxx/include/__algorithm/ranges_find_if.h b/libcxx/include/__algorithm/ranges_find_if.h
index ed6406e6186a3..26280c1e4ebcd 100644
--- a/libcxx/include/__algorithm/ranges_find_if.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_FIND_IF_H
+#define _LIBCPP_ALGORITHM_RANGES_FIND_IF_H
 
 #include <__config>
 #include <__functional/identity.h>
@@ -70,4 +70,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_FIND_IF_H
+#endif // _LIBCPP_ALGORITHM_RANGES_FIND_IF_H
diff --git a/libcxx/include/__algorithm/ranges_find_if_not.h b/libcxx/include/__algorithm/ranges_find_if_not.h
index 9a359b2afdab1..c30224a5102e3 100644
--- a/libcxx/include/__algorithm/ranges_find_if_not.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_FIND_IF_NOT_H
+#define _LIBCPP_ALGORITHM_RANGES_FIND_IF_NOT_H
 
 #include <__algorithm/ranges_find_if.h>
 #include <__config>
@@ -64,4 +64,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_FIND_IF_NOT_H
+#endif // _LIBCPP_ALGORITHM_RANGES_FIND_IF_NOT_H
diff --git a/libcxx/include/__algorithm/ranges_find_last.h b/libcxx/include/__algorithm/ranges_find_last.h
index e7dae1704c2ea..368041c7ce4bf 100644
--- a/libcxx/include/__algorithm/ranges_find_last.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_FIND_LAST_H
+#define _LIBCPP_ALGORITHM_RANGES_FIND_LAST_H
 
 #include <__config>
 #include <__functional/identity.h>
@@ -167,4 +167,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_FIND_LAST_H
+#endif // _LIBCPP_ALGORITHM_RANGES_FIND_LAST_H
diff --git a/libcxx/include/__algorithm/ranges_fold.h b/libcxx/include/__algorithm/ranges_fold.h
index d2c3921398504..382e1a85ea987 100644
--- a/libcxx/include/__algorithm/ranges_fold.h
+++ b/libcxx/include/__algorithm/ranges_fold.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_FOLD_H
-#define _LIBCPP___ALGORITHM_RANGES_FOLD_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_FOLD_H
+#define _LIBCPP_ALGORITHM_RANGES_FOLD_H
 
 #include <__concepts/assignable.h>
 #include <__concepts/constructible.h>
@@ -126,4 +126,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_FOLD_H
+#endif // _LIBCPP_ALGORITHM_RANGES_FOLD_H
diff --git a/libcxx/include/__algorithm/ranges_for_each.h b/libcxx/include/__algorithm/ranges_for_each.h
index e9c84e8583f87..27741244931c8 100644
--- a/libcxx/include/__algorithm/ranges_for_each.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_FOR_EACH_H
+#define _LIBCPP_ALGORITHM_RANGES_FOR_EACH_H
 
 #include <__algorithm/for_each.h>
 #include <__algorithm/for_each_n.h>
@@ -86,4 +86,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_FOR_EACH_H
+#endif // _LIBCPP_ALGORITHM_RANGES_FOR_EACH_H
diff --git a/libcxx/include/__algorithm/ranges_for_each_n.h b/libcxx/include/__algorithm/ranges_for_each_n.h
index 3aab1b79c10a1..7f5b38929396a 100644
--- a/libcxx/include/__algorithm/ranges_for_each_n.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_FOR_EACH_N_H
+#define _LIBCPP_ALGORITHM_RANGES_FOR_EACH_N_H
 
 #include <__algorithm/for_each_n.h>
 #include <__algorithm/in_fun_result.h>
@@ -56,4 +56,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_FOR_EACH_N_H
+#endif // _LIBCPP_ALGORITHM_RANGES_FOR_EACH_N_H
diff --git a/libcxx/include/__algorithm/ranges_generate.h b/libcxx/include/__algorithm/ranges_generate.h
index 04333b358eed2..2e0de97425703 100644
--- a/libcxx/include/__algorithm/ranges_generate.h
+++ b/libcxx/include/__algorithm/ranges_generate.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_GENERATE_H
-#define _LIBCPP___ALGORITHM_RANGES_GENERATE_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_GENERATE_H
+#define _LIBCPP_ALGORITHM_RANGES_GENERATE_H
 
 #include <__concepts/constructible.h>
 #include <__concepts/invocable.h>
@@ -66,4 +66,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_GENERATE_H
+#endif // _LIBCPP_ALGORITHM_RANGES_GENERATE_H
diff --git a/libcxx/include/__algorithm/ranges_generate_n.h b/libcxx/include/__algorithm/ranges_generate_n.h
index 0cc9ce7b1193b..c48945ce93613 100644
--- a/libcxx/include/__algorithm/ranges_generate_n.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_GENERATE_N_H
+#define _LIBCPP_ALGORITHM_RANGES_GENERATE_N_H
 
 #include <__algorithm/generate_n.h>
 #include <__concepts/constructible.h>
@@ -54,4 +54,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_GENERATE_N_H
+#endif // _LIBCPP_ALGORITHM_RANGES_GENERATE_N_H
diff --git a/libcxx/include/__algorithm/ranges_includes.h b/libcxx/include/__algorithm/ranges_includes.h
index 9145f3b5564ff..a0898dfb36088 100644
--- a/libcxx/include/__algorithm/ranges_includes.h
+++ b/libcxx/include/__algorithm/ranges_includes.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_INCLUDES_H
-#define _LIBCPP___ALGORITHM_RANGES_INCLUDES_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_INCLUDES_H
+#define _LIBCPP_ALGORITHM_RANGES_INCLUDES_H
 
 #include <__algorithm/includes.h>
 #include <__algorithm/make_projected.h>
@@ -91,4 +91,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_INCLUDES_H
+#endif // _LIBCPP_ALGORITHM_RANGES_INCLUDES_H
diff --git a/libcxx/include/__algorithm/ranges_inplace_merge.h b/libcxx/include/__algorithm/ranges_inplace_merge.h
index 54581aff396ea..0200194a9cbe7 100644
--- a/libcxx/include/__algorithm/ranges_inplace_merge.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_INPLACE_MERGE_H
+#define _LIBCPP_ALGORITHM_RANGES_INPLACE_MERGE_H
 
 #include <__algorithm/inplace_merge.h>
 #include <__algorithm/iterator_operations.h>
@@ -77,4 +77,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_INPLACE_MERGE_H
+#endif // _LIBCPP_ALGORITHM_RANGES_INPLACE_MERGE_H
diff --git a/libcxx/include/__algorithm/ranges_is_heap.h b/libcxx/include/__algorithm/ranges_is_heap.h
index b4724abfb62a5..44b7753baca07 100644
--- a/libcxx/include/__algorithm/ranges_is_heap.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_IS_HEAP_H
+#define _LIBCPP_ALGORITHM_RANGES_IS_HEAP_H
 
 #include <__algorithm/is_heap_until.h>
 #include <__algorithm/make_projected.h>
@@ -74,4 +74,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_IS_HEAP_H
+#endif // _LIBCPP_ALGORITHM_RANGES_IS_HEAP_H
diff --git a/libcxx/include/__algorithm/ranges_is_heap_until.h b/libcxx/include/__algorithm/ranges_is_heap_until.h
index 25f3b484faa66..3d22bd8344a32 100644
--- a/libcxx/include/__algorithm/ranges_is_heap_until.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_IS_HEAP_UNTIL_H
+#define _LIBCPP_ALGORITHM_RANGES_IS_HEAP_UNTIL_H
 
 #include <__algorithm/is_heap_until.h>
 #include <__algorithm/make_projected.h>
@@ -74,4 +74,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_IS_HEAP_UNTIL_H
+#endif // _LIBCPP_ALGORITHM_RANGES_IS_HEAP_UNTIL_H
diff --git a/libcxx/include/__algorithm/ranges_is_partitioned.h b/libcxx/include/__algorithm/ranges_is_partitioned.h
index 8092abfcd1de3..a97e2b162193b 100644
--- a/libcxx/include/__algorithm/ranges_is_partitioned.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_IS_PARTITIONED_H
+#define _LIBCPP_ALGORITHM_RANGES_IS_PARTITIONED_H
 
 #include <__config>
 #include <__functional/identity.h>
@@ -81,4 +81,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_IS_PARTITIONED_H
+#endif // _LIBCPP_ALGORITHM_RANGES_IS_PARTITIONED_H
diff --git a/libcxx/include/__algorithm/ranges_is_permutation.h b/libcxx/include/__algorithm/ranges_is_permutation.h
index 53a431d2ba425..f3089c07a4a5f 100644
--- a/libcxx/include/__algorithm/ranges_is_permutation.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_IS_PERMUTATION_H
+#define _LIBCPP_ALGORITHM_RANGES_IS_PERMUTATION_H
 
 #include <__algorithm/is_permutation.h>
 #include <__algorithm/iterator_operations.h>
@@ -102,4 +102,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_IS_PERMUTATION_H
+#endif // _LIBCPP_ALGORITHM_RANGES_IS_PERMUTATION_H
diff --git a/libcxx/include/__algorithm/ranges_iterator_concept.h b/libcxx/include/__algorithm/ranges_iterator_concept.h
index 947dfa4811294..358b0ed43c0a6 100644
--- a/libcxx/include/__algorithm/ranges_iterator_concept.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_ITERATOR_CONCEPT_H
+#define _LIBCPP_ALGORITHM_RANGES_ITERATOR_CONCEPT_H
 
 #include <__config>
 #include <__iterator/concepts.h>
@@ -53,4 +53,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_ITERATOR_CONCEPT_H
+#endif // _LIBCPP_ALGORITHM_RANGES_ITERATOR_CONCEPT_H
diff --git a/libcxx/include/__algorithm/ranges_lexicographical_compare.h b/libcxx/include/__algorithm/ranges_lexicographical_compare.h
index ec12b0cc29ace..6f930848e706d 100644
--- a/libcxx/include/__algorithm/ranges_lexicographical_compare.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_LEXICOGRAPHICAL_COMPARE_H
+#define _LIBCPP_ALGORITHM_RANGES_LEXICOGRAPHICAL_COMPARE_H
 
 #include <__algorithm/lexicographical_compare.h>
 #include <__algorithm/unwrap_range.h>
@@ -104,4 +104,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_LEXICOGRAPHICAL_COMPARE_H
+#endif // _LIBCPP_ALGORITHM_RANGES_LEXICOGRAPHICAL_COMPARE_H
diff --git a/libcxx/include/__algorithm/ranges_lower_bound.h b/libcxx/include/__algorithm/ranges_lower_bound.h
index d1b332849b8b6..fe74a146c13d0 100644
--- a/libcxx/include/__algorithm/ranges_lower_bound.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_LOWER_BOUND_H
+#define _LIBCPP_ALGORITHM_RANGES_LOWER_BOUND_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/lower_bound.h>
@@ -68,4 +68,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_LOWER_BOUND_H
+#endif // _LIBCPP_ALGORITHM_RANGES_LOWER_BOUND_H
diff --git a/libcxx/include/__algorithm/ranges_make_heap.h b/libcxx/include/__algorithm/ranges_make_heap.h
index 97148f77b4181..5bab4fa8be60a 100644
--- a/libcxx/include/__algorithm/ranges_make_heap.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_MAKE_HEAP_H
+#define _LIBCPP_ALGORITHM_RANGES_MAKE_HEAP_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/make_heap.h>
@@ -78,4 +78,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_MAKE_HEAP_H
+#endif // _LIBCPP_ALGORITHM_RANGES_MAKE_HEAP_H
diff --git a/libcxx/include/__algorithm/ranges_max.h b/libcxx/include/__algorithm/ranges_max.h
index a8fe13a734f5b..89b25fb9eea47 100644
--- a/libcxx/include/__algorithm/ranges_max.h
+++ b/libcxx/include/__algorithm/ranges_max.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_MAX_H
-#define _LIBCPP___ALGORITHM_RANGES_MAX_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_MAX_H
+#define _LIBCPP_ALGORITHM_RANGES_MAX_H
 
 #include <__algorithm/min_element.h>
 #include <__assert>
@@ -98,4 +98,4 @@ _LIBCPP_POP_MACROS
 
 #endif // _LIBCPP_STD_VER >= 20
 
-#endif // _LIBCPP___ALGORITHM_RANGES_MAX_H
+#endif // _LIBCPP_ALGORITHM_RANGES_MAX_H
diff --git a/libcxx/include/__algorithm/ranges_max_element.h b/libcxx/include/__algorithm/ranges_max_element.h
index db6d5f6b9c276..18437e57465d2 100644
--- a/libcxx/include/__algorithm/ranges_max_element.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_MAX_ELEMENT_H
+#define _LIBCPP_ALGORITHM_RANGES_MAX_ELEMENT_H
 
 #include <__algorithm/min_element.h>
 #include <__config>
@@ -64,4 +64,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_MAX_ELEMENT_H
+#endif // _LIBCPP_ALGORITHM_RANGES_MAX_ELEMENT_H
diff --git a/libcxx/include/__algorithm/ranges_merge.h b/libcxx/include/__algorithm/ranges_merge.h
index f3e0486fe488e..75f7276c29805 100644
--- a/libcxx/include/__algorithm/ranges_merge.h
+++ b/libcxx/include/__algorithm/ranges_merge.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_MERGE_H
-#define _LIBCPP___ALGORITHM_RANGES_MERGE_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_MERGE_H
+#define _LIBCPP_ALGORITHM_RANGES_MERGE_H
 
 #include <__algorithm/in_in_out_result.h>
 #include <__algorithm/ranges_copy.h>
@@ -131,4 +131,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_MERGE_H
+#endif // _LIBCPP_ALGORITHM_RANGES_MERGE_H
diff --git a/libcxx/include/__algorithm/ranges_min.h b/libcxx/include/__algorithm/ranges_min.h
index 9f1c78eaa9e25..f2373fa5fc6c3 100644
--- a/libcxx/include/__algorithm/ranges_min.h
+++ b/libcxx/include/__algorithm/ranges_min.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_MIN_H
-#define _LIBCPP___ALGORITHM_RANGES_MIN_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_MIN_H
+#define _LIBCPP_ALGORITHM_RANGES_MIN_H
 
 #include <__algorithm/min_element.h>
 #include <__assert>
@@ -90,4 +90,4 @@ _LIBCPP_POP_MACROS
 
 #endif // _LIBCPP_STD_VER >= 20
 
-#endif // _LIBCPP___ALGORITHM_RANGES_MIN_H
+#endif // _LIBCPP_ALGORITHM_RANGES_MIN_H
diff --git a/libcxx/include/__algorithm/ranges_min_element.h b/libcxx/include/__algorithm/ranges_min_element.h
index 5deb409ccd85e..74060309ce4c7 100644
--- a/libcxx/include/__algorithm/ranges_min_element.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_MIN_ELEMENT_H
+#define _LIBCPP_ALGORITHM_RANGES_MIN_ELEMENT_H
 
 #include <__algorithm/min_element.h>
 #include <__config>
@@ -63,4 +63,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_MIN_ELEMENT_H
+#endif // _LIBCPP_ALGORITHM_RANGES_MIN_ELEMENT_H
diff --git a/libcxx/include/__algorithm/ranges_minmax.h b/libcxx/include/__algorithm/ranges_minmax.h
index 5f2e5cb2a1eea..ec273277fb8c1 100644
--- a/libcxx/include/__algorithm/ranges_minmax.h
+++ b/libcxx/include/__algorithm/ranges_minmax.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_MINMAX_H
-#define _LIBCPP___ALGORITHM_RANGES_MINMAX_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_MINMAX_H
+#define _LIBCPP_ALGORITHM_RANGES_MINMAX_H
 
 #include <__algorithm/min_max_result.h>
 #include <__algorithm/minmax_element.h>
@@ -171,4 +171,4 @@ _LIBCPP_POP_MACROS
 
 #endif // _LIBCPP_STD_VER >= 20
 
-#endif // _LIBCPP___ALGORITHM_RANGES_MINMAX_H
+#endif // _LIBCPP_ALGORITHM_RANGES_MINMAX_H
diff --git a/libcxx/include/__algorithm/ranges_minmax_element.h b/libcxx/include/__algorithm/ranges_minmax_element.h
index e1a22dde0955f..5552f6c56c487 100644
--- a/libcxx/include/__algorithm/ranges_minmax_element.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_MINMAX_ELEMENT_H
+#define _LIBCPP_ALGORITHM_RANGES_MINMAX_ELEMENT_H
 
 #include <__algorithm/min_max_result.h>
 #include <__algorithm/minmax_element.h>
@@ -73,4 +73,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_MINMAX_H
+#endif // _LIBCPP_ALGORITHM_RANGES_MINMAX_H
diff --git a/libcxx/include/__algorithm/ranges_mismatch.h b/libcxx/include/__algorithm/ranges_mismatch.h
index b35747dfa43a2..260ee27f1ecc8 100644
--- a/libcxx/include/__algorithm/ranges_mismatch.h
+++ b/libcxx/include/__algorithm/ranges_mismatch.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_MISMATCH_H
-#define _LIBCPP___ALGORITHM_RANGES_MISMATCH_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_MISMATCH_H
+#define _LIBCPP_ALGORITHM_RANGES_MISMATCH_H
 
 #include <__algorithm/in_in_result.h>
 #include <__algorithm/mismatch.h>
@@ -95,4 +95,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_MISMATCH_H
+#endif // _LIBCPP_ALGORITHM_RANGES_MISMATCH_H
diff --git a/libcxx/include/__algorithm/ranges_move.h b/libcxx/include/__algorithm/ranges_move.h
index 02bf7fd006190..1f97a6d9aae0b 100644
--- a/libcxx/include/__algorithm/ranges_move.h
+++ b/libcxx/include/__algorithm/ranges_move.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_MOVE_H
-#define _LIBCPP___ALGORITHM_RANGES_MOVE_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_MOVE_H
+#define _LIBCPP_ALGORITHM_RANGES_MOVE_H
 
 #include <__algorithm/in_out_result.h>
 #include <__algorithm/iterator_operations.h>
@@ -69,4 +69,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_MOVE_H
+#endif // _LIBCPP_ALGORITHM_RANGES_MOVE_H
diff --git a/libcxx/include/__algorithm/ranges_move_backward.h b/libcxx/include/__algorithm/ranges_move_backward.h
index 4737e6c9756de..9038c93a80a0b 100644
--- a/libcxx/include/__algorithm/ranges_move_backward.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_MOVE_BACKWARD_H
+#define _LIBCPP_ALGORITHM_RANGES_MOVE_BACKWARD_H
 
 #include <__algorithm/in_out_result.h>
 #include <__algorithm/iterator_operations.h>
@@ -71,4 +71,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_MOVE_BACKWARD_H
+#endif // _LIBCPP_ALGORITHM_RANGES_MOVE_BACKWARD_H
diff --git a/libcxx/include/__algorithm/ranges_next_permutation.h b/libcxx/include/__algorithm/ranges_next_permutation.h
index 1b485423e892f..3ce774808a998 100644
--- a/libcxx/include/__algorithm/ranges_next_permutation.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_NEXT_PERMUTATION_H
+#define _LIBCPP_ALGORITHM_RANGES_NEXT_PERMUTATION_H
 
 #include <__algorithm/in_found_result.h>
 #include <__algorithm/iterator_operations.h>
@@ -71,4 +71,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_NEXT_PERMUTATION_H
+#endif // _LIBCPP_ALGORITHM_RANGES_NEXT_PERMUTATION_H
diff --git a/libcxx/include/__algorithm/ranges_none_of.h b/libcxx/include/__algorithm/ranges_none_of.h
index a1612826220d9..fd83ddd2bd3ef 100644
--- a/libcxx/include/__algorithm/ranges_none_of.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_NONE_OF_H
+#define _LIBCPP_ALGORITHM_RANGES_NONE_OF_H
 
 #include <__config>
 #include <__functional/identity.h>
@@ -70,4 +70,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_NONE_OF_H
+#endif // _LIBCPP_ALGORITHM_RANGES_NONE_OF_H
diff --git a/libcxx/include/__algorithm/ranges_nth_element.h b/libcxx/include/__algorithm/ranges_nth_element.h
index e92c51e713cb4..e2ec7000b8831 100644
--- a/libcxx/include/__algorithm/ranges_nth_element.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_NTH_ELEMENT_H
+#define _LIBCPP_ALGORITHM_RANGES_NTH_ELEMENT_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/make_projected.h>
@@ -77,4 +77,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_NTH_ELEMENT_H
+#endif // _LIBCPP_ALGORITHM_RANGES_NTH_ELEMENT_H
diff --git a/libcxx/include/__algorithm/ranges_partial_sort.h b/libcxx/include/__algorithm/ranges_partial_sort.h
index fc8a1f7d93065..8daaac19fef32 100644
--- a/libcxx/include/__algorithm/ranges_partial_sort.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_PARTIAL_SORT_H
+#define _LIBCPP_ALGORITHM_RANGES_PARTIAL_SORT_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/make_projected.h>
@@ -75,4 +75,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_PARTIAL_SORT_H
+#endif // _LIBCPP_ALGORITHM_RANGES_PARTIAL_SORT_H
diff --git a/libcxx/include/__algorithm/ranges_partial_sort_copy.h b/libcxx/include/__algorithm/ranges_partial_sort_copy.h
index f221504a8cae0..bef35549dd75d 100644
--- a/libcxx/include/__algorithm/ranges_partial_sort_copy.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_PARTIAL_SORT_COPY_H
+#define _LIBCPP_ALGORITHM_RANGES_PARTIAL_SORT_COPY_H
 
 #include <__algorithm/in_out_result.h>
 #include <__algorithm/iterator_operations.h>
@@ -107,4 +107,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_PARTIAL_SORT_COPY_H
+#endif // _LIBCPP_ALGORITHM_RANGES_PARTIAL_SORT_COPY_H
diff --git a/libcxx/include/__algorithm/ranges_partition.h b/libcxx/include/__algorithm/ranges_partition.h
index b9cc3c1893709..ae3416da9832e 100644
--- a/libcxx/include/__algorithm/ranges_partition.h
+++ b/libcxx/include/__algorithm/ranges_partition.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_PARTITION_H
-#define _LIBCPP___ALGORITHM_RANGES_PARTITION_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_PARTITION_H
+#define _LIBCPP_ALGORITHM_RANGES_PARTITION_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/make_projected.h>
@@ -82,4 +82,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_PARTITION_H
+#endif // _LIBCPP_ALGORITHM_RANGES_PARTITION_H
diff --git a/libcxx/include/__algorithm/ranges_partition_copy.h b/libcxx/include/__algorithm/ranges_partition_copy.h
index 47878a4017233..f4b79be162a5c 100644
--- a/libcxx/include/__algorithm/ranges_partition_copy.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_PARTITION_COPY_H
+#define _LIBCPP_ALGORITHM_RANGES_PARTITION_COPY_H
 
 #include <__algorithm/in_out_out_result.h>
 #include <__config>
@@ -103,4 +103,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_PARTITION_COPY_H
+#endif // _LIBCPP_ALGORITHM_RANGES_PARTITION_COPY_H
diff --git a/libcxx/include/__algorithm/ranges_partition_point.h b/libcxx/include/__algorithm/ranges_partition_point.h
index 324efbb86d64c..1b3eab25d00a6 100644
--- a/libcxx/include/__algorithm/ranges_partition_point.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_PARTITION_POINT_H
+#define _LIBCPP_ALGORITHM_RANGES_PARTITION_POINT_H
 
 #include <__algorithm/half_positive.h>
 #include <__config>
@@ -86,4 +86,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_PARTITION_POINT_H
+#endif // _LIBCPP_ALGORITHM_RANGES_PARTITION_POINT_H
diff --git a/libcxx/include/__algorithm/ranges_pop_heap.h b/libcxx/include/__algorithm/ranges_pop_heap.h
index eccf54c094e3d..f545d71951f84 100644
--- a/libcxx/include/__algorithm/ranges_pop_heap.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_POP_HEAP_H
+#define _LIBCPP_ALGORITHM_RANGES_POP_HEAP_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/make_projected.h>
@@ -79,4 +79,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_POP_HEAP_H
+#endif // _LIBCPP_ALGORITHM_RANGES_POP_HEAP_H
diff --git a/libcxx/include/__algorithm/ranges_prev_permutation.h b/libcxx/include/__algorithm/ranges_prev_permutation.h
index f2294b1cb00ba..89408bb0b9aad 100644
--- a/libcxx/include/__algorithm/ranges_prev_permutation.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_PREV_PERMUTATION_H
+#define _LIBCPP_ALGORITHM_RANGES_PREV_PERMUTATION_H
 
 #include <__algorithm/in_found_result.h>
 #include <__algorithm/iterator_operations.h>
@@ -71,4 +71,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_PREV_PERMUTATION_H
+#endif // _LIBCPP_ALGORITHM_RANGES_PREV_PERMUTATION_H
diff --git a/libcxx/include/__algorithm/ranges_push_heap.h b/libcxx/include/__algorithm/ranges_push_heap.h
index c5e0465bdcfe1..9fa40c14608e1 100644
--- a/libcxx/include/__algorithm/ranges_push_heap.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_PUSH_HEAP_H
+#define _LIBCPP_ALGORITHM_RANGES_PUSH_HEAP_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/make_projected.h>
@@ -78,4 +78,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_PUSH_HEAP_H
+#endif // _LIBCPP_ALGORITHM_RANGES_PUSH_HEAP_H
diff --git a/libcxx/include/__algorithm/ranges_remove.h b/libcxx/include/__algorithm/ranges_remove.h
index 6fbc49eba8a72..937d49cdd478b 100644
--- a/libcxx/include/__algorithm/ranges_remove.h
+++ b/libcxx/include/__algorithm/ranges_remove.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_REMOVE_H
-#define _LIBCPP___ALGORITHM_RANGES_REMOVE_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_REMOVE_H
+#define _LIBCPP_ALGORITHM_RANGES_REMOVE_H
 #include <__config>
 
 #include <__algorithm/ranges_remove_if.h>
@@ -63,4 +63,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_REMOVE_H
+#endif // _LIBCPP_ALGORITHM_RANGES_REMOVE_H
diff --git a/libcxx/include/__algorithm/ranges_remove_copy.h b/libcxx/include/__algorithm/ranges_remove_copy.h
index 764c52ee16b27..c0830790d691f 100644
--- a/libcxx/include/__algorithm/ranges_remove_copy.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_REMOVE_COPY_H
+#define _LIBCPP_ALGORITHM_RANGES_REMOVE_COPY_H
 
 #include <__algorithm/in_out_result.h>
 #include <__algorithm/ranges_remove_copy_if.h>
@@ -74,4 +74,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_REMOVE_COPY_H
+#endif // _LIBCPP_ALGORITHM_RANGES_REMOVE_COPY_H
diff --git a/libcxx/include/__algorithm/ranges_remove_copy_if.h b/libcxx/include/__algorithm/ranges_remove_copy_if.h
index 87136ae8258d6..bace3b0b6ae88 100644
--- a/libcxx/include/__algorithm/ranges_remove_copy_if.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_REMOVE_COPY_IF_H
+#define _LIBCPP_ALGORITHM_RANGES_REMOVE_COPY_IF_H
 
 #include <__algorithm/in_out_result.h>
 #include <__algorithm/make_projected.h>
@@ -88,4 +88,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_REMOVE_COPY_IF_H
+#endif // _LIBCPP_ALGORITHM_RANGES_REMOVE_COPY_IF_H
diff --git a/libcxx/include/__algorithm/ranges_remove_if.h b/libcxx/include/__algorithm/ranges_remove_if.h
index 384b3d41d0801..1dfebffaa5761 100644
--- a/libcxx/include/__algorithm/ranges_remove_if.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_REMOVE_IF_H
+#define _LIBCPP_ALGORITHM_RANGES_REMOVE_IF_H
 #include <__config>
 
 #include <__algorithm/ranges_find_if.h>
@@ -84,4 +84,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_REMOVE_IF_H
+#endif // _LIBCPP_ALGORITHM_RANGES_REMOVE_IF_H
diff --git a/libcxx/include/__algorithm/ranges_replace.h b/libcxx/include/__algorithm/ranges_replace.h
index 15b1f38554a8c..595363a1155f0 100644
--- a/libcxx/include/__algorithm/ranges_replace.h
+++ b/libcxx/include/__algorithm/ranges_replace.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_REPLACE_H
-#define _LIBCPP___ALGORITHM_RANGES_REPLACE_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_REPLACE_H
+#define _LIBCPP_ALGORITHM_RANGES_REPLACE_H
 
 #include <__algorithm/ranges_replace_if.h>
 #include <__config>
@@ -63,4 +63,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_REPLACE_H
+#endif // _LIBCPP_ALGORITHM_RANGES_REPLACE_H
diff --git a/libcxx/include/__algorithm/ranges_replace_copy.h b/libcxx/include/__algorithm/ranges_replace_copy.h
index 7ab1c71543e2a..0c8a04601e0d3 100644
--- a/libcxx/include/__algorithm/ranges_replace_copy.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_REPLACE_COPY_H
+#define _LIBCPP_ALGORITHM_RANGES_REPLACE_COPY_H
 
 #include <__algorithm/in_out_result.h>
 #include <__algorithm/ranges_replace_copy_if.h>
@@ -86,4 +86,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_REPLACE_COPY_H
+#endif // _LIBCPP_ALGORITHM_RANGES_REPLACE_COPY_H
diff --git a/libcxx/include/__algorithm/ranges_replace_copy_if.h b/libcxx/include/__algorithm/ranges_replace_copy_if.h
index 852ec45edaefe..973c42ef5d457 100644
--- a/libcxx/include/__algorithm/ranges_replace_copy_if.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_REPLACE_COPY_IF_H
+#define _LIBCPP_ALGORITHM_RANGES_REPLACE_COPY_IF_H
 
 #include <__algorithm/in_out_result.h>
 #include <__config>
@@ -91,4 +91,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_REPLACE_COPY_IF_H
+#endif // _LIBCPP_ALGORITHM_RANGES_REPLACE_COPY_IF_H
diff --git a/libcxx/include/__algorithm/ranges_replace_if.h b/libcxx/include/__algorithm/ranges_replace_if.h
index baa566810b5d0..32e4fd996be77 100644
--- a/libcxx/include/__algorithm/ranges_replace_if.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_REPLACE_IF_H
+#define _LIBCPP_ALGORITHM_RANGES_REPLACE_IF_H
 
 #include <__config>
 #include <__functional/identity.h>
@@ -76,4 +76,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_REPLACE_IF_H
+#endif // _LIBCPP_ALGORITHM_RANGES_REPLACE_IF_H
diff --git a/libcxx/include/__algorithm/ranges_reverse.h b/libcxx/include/__algorithm/ranges_reverse.h
index 4e82118719772..1045bf17f6f10 100644
--- a/libcxx/include/__algorithm/ranges_reverse.h
+++ b/libcxx/include/__algorithm/ranges_reverse.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_REVERSE_H
-#define _LIBCPP___ALGORITHM_RANGES_REVERSE_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_REVERSE_H
+#define _LIBCPP_ALGORITHM_RANGES_REVERSE_H
 
 #include <__config>
 #include <__iterator/concepts.h>
@@ -74,4 +74,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
 
-#endif // _LIBCPP___ALGORITHM_RANGES_REVERSE_H
+#endif // _LIBCPP_ALGORITHM_RANGES_REVERSE_H
diff --git a/libcxx/include/__algorithm/ranges_reverse_copy.h b/libcxx/include/__algorithm/ranges_reverse_copy.h
index e5ca5cf652dc4..b817607b2f091 100644
--- a/libcxx/include/__algorithm/ranges_reverse_copy.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_REVERSE_COPY_H
+#define _LIBCPP_ALGORITHM_RANGES_REVERSE_COPY_H
 
 #include <__algorithm/in_out_result.h>
 #include <__algorithm/ranges_copy.h>
@@ -65,4 +65,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_REVERSE_COPY_H
+#endif // _LIBCPP_ALGORITHM_RANGES_REVERSE_COPY_H
diff --git a/libcxx/include/__algorithm/ranges_rotate.h b/libcxx/include/__algorithm/ranges_rotate.h
index c1affc684ae4f..542ae4f501582 100644
--- a/libcxx/include/__algorithm/ranges_rotate.h
+++ b/libcxx/include/__algorithm/ranges_rotate.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_ROTATE_H
-#define _LIBCPP___ALGORITHM_RANGES_ROTATE_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_ROTATE_H
+#define _LIBCPP_ALGORITHM_RANGES_ROTATE_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/ranges_iterator_concept.h>
@@ -64,4 +64,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_ROTATE_H
+#endif // _LIBCPP_ALGORITHM_RANGES_ROTATE_H
diff --git a/libcxx/include/__algorithm/ranges_rotate_copy.h b/libcxx/include/__algorithm/ranges_rotate_copy.h
index c0b4264a1b253..48defa3b37019 100644
--- a/libcxx/include/__algorithm/ranges_rotate_copy.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_ROTATE_COPY_H
+#define _LIBCPP_ALGORITHM_RANGES_ROTATE_COPY_H
 
 #include <__algorithm/in_out_result.h>
 #include <__algorithm/ranges_copy.h>
@@ -63,4 +63,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_ROTATE_COPY_H
+#endif // _LIBCPP_ALGORITHM_RANGES_ROTATE_COPY_H
diff --git a/libcxx/include/__algorithm/ranges_sample.h b/libcxx/include/__algorithm/ranges_sample.h
index a3b29608150d2..0deee7c2764bf 100644
--- a/libcxx/include/__algorithm/ranges_sample.h
+++ b/libcxx/include/__algorithm/ranges_sample.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_SAMPLE_H
-#define _LIBCPP___ALGORITHM_RANGES_SAMPLE_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_SAMPLE_H
+#define _LIBCPP_ALGORITHM_RANGES_SAMPLE_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/sample.h>
@@ -67,4 +67,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_SAMPLE_H
+#endif // _LIBCPP_ALGORITHM_RANGES_SAMPLE_H
diff --git a/libcxx/include/__algorithm/ranges_search.h b/libcxx/include/__algorithm/ranges_search.h
index b711512039635..37021fca50ec0 100644
--- a/libcxx/include/__algorithm/ranges_search.h
+++ b/libcxx/include/__algorithm/ranges_search.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_SEARCH_H
-#define _LIBCPP___ALGORITHM_RANGES_SEARCH_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_SEARCH_H
+#define _LIBCPP_ALGORITHM_RANGES_SEARCH_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/search.h>
@@ -129,4 +129,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
 
-#endif // _LIBCPP___ALGORITHM_RANGES_SEARCH_H
+#endif // _LIBCPP_ALGORITHM_RANGES_SEARCH_H
diff --git a/libcxx/include/__algorithm/ranges_search_n.h b/libcxx/include/__algorithm/ranges_search_n.h
index 81b568c0965fd..ec51ffe0072d1 100644
--- a/libcxx/include/__algorithm/ranges_search_n.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_SEARCH_N_H
+#define _LIBCPP_ALGORITHM_RANGES_SEARCH_N_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/search_n.h>
@@ -111,4 +111,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_SEARCH_N_H
+#endif // _LIBCPP_ALGORITHM_RANGES_SEARCH_N_H
diff --git a/libcxx/include/__algorithm/ranges_set_difference.h b/libcxx/include/__algorithm/ranges_set_difference.h
index 1c83c7bdd5a33..9c32a586191b6 100644
--- a/libcxx/include/__algorithm/ranges_set_difference.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_SET_DIFFERENCE_H
+#define _LIBCPP_ALGORITHM_RANGES_SET_DIFFERENCE_H
 
 #include <__algorithm/in_out_result.h>
 #include <__algorithm/make_projected.h>
@@ -101,4 +101,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_SET_DIFFERENCE_H
+#endif // _LIBCPP_ALGORITHM_RANGES_SET_DIFFERENCE_H
diff --git a/libcxx/include/__algorithm/ranges_set_intersection.h b/libcxx/include/__algorithm/ranges_set_intersection.h
index 068794cf1b14f..eb39ef0f22925 100644
--- a/libcxx/include/__algorithm/ranges_set_intersection.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_SET_INTERSECTION_H
+#define _LIBCPP_ALGORITHM_RANGES_SET_INTERSECTION_H
 
 #include <__algorithm/in_in_out_result.h>
 #include <__algorithm/iterator_operations.h>
@@ -107,4 +107,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_SET_INTERSECTION_H
+#endif // _LIBCPP_ALGORITHM_RANGES_SET_INTERSECTION_H
diff --git a/libcxx/include/__algorithm/ranges_set_symmetric_difference.h b/libcxx/include/__algorithm/ranges_set_symmetric_difference.h
index c0a814043192c..2d76feefd2115 100644
--- a/libcxx/include/__algorithm/ranges_set_symmetric_difference.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_SET_SYMMETRIC_DIFFERENCE_H
+#define _LIBCPP_ALGORITHM_RANGES_SET_SYMMETRIC_DIFFERENCE_H
 
 #include <__algorithm/in_in_out_result.h>
 #include <__algorithm/make_projected.h>
@@ -106,4 +106,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_SET_SYMMETRIC_DIFFERENCE_H
+#endif // _LIBCPP_ALGORITHM_RANGES_SET_SYMMETRIC_DIFFERENCE_H
diff --git a/libcxx/include/__algorithm/ranges_set_union.h b/libcxx/include/__algorithm/ranges_set_union.h
index 039ffb5932f3a..9370f5b23b320 100644
--- a/libcxx/include/__algorithm/ranges_set_union.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_SET_UNION_H
+#define _LIBCPP_ALGORITHM_RANGES_SET_UNION_H
 
 #include <__algorithm/in_in_out_result.h>
 #include <__algorithm/make_projected.h>
@@ -107,4 +107,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_SET_UNION_H
+#endif // _LIBCPP_ALGORITHM_RANGES_SET_UNION_H
diff --git a/libcxx/include/__algorithm/ranges_shuffle.h b/libcxx/include/__algorithm/ranges_shuffle.h
index 87cb3685bb95f..f5cfc2e0bd2f8 100644
--- a/libcxx/include/__algorithm/ranges_shuffle.h
+++ b/libcxx/include/__algorithm/ranges_shuffle.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_SHUFFLE_H
-#define _LIBCPP___ALGORITHM_RANGES_SHUFFLE_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_SHUFFLE_H
+#define _LIBCPP_ALGORITHM_RANGES_SHUFFLE_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/shuffle.h>
@@ -65,4 +65,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_SHUFFLE_H
+#endif // _LIBCPP_ALGORITHM_RANGES_SHUFFLE_H
diff --git a/libcxx/include/__algorithm/ranges_sort.h b/libcxx/include/__algorithm/ranges_sort.h
index 2afad4c41301e..267d3d3099f62 100644
--- a/libcxx/include/__algorithm/ranges_sort.h
+++ b/libcxx/include/__algorithm/ranges_sort.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_SORT_H
-#define _LIBCPP___ALGORITHM_RANGES_SORT_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_SORT_H
+#define _LIBCPP_ALGORITHM_RANGES_SORT_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/make_projected.h>
@@ -77,4 +77,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_SORT_H
+#endif // _LIBCPP_ALGORITHM_RANGES_SORT_H
diff --git a/libcxx/include/__algorithm/ranges_sort_heap.h b/libcxx/include/__algorithm/ranges_sort_heap.h
index d3e20874fac50..d5d3211af671a 100644
--- a/libcxx/include/__algorithm/ranges_sort_heap.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_SORT_HEAP_H
+#define _LIBCPP_ALGORITHM_RANGES_SORT_HEAP_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/make_projected.h>
@@ -78,4 +78,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_SORT_HEAP_H
+#endif // _LIBCPP_ALGORITHM_RANGES_SORT_HEAP_H
diff --git a/libcxx/include/__algorithm/ranges_stable_partition.h b/libcxx/include/__algorithm/ranges_stable_partition.h
index d8cfc8d941450..20a0718277069 100644
--- a/libcxx/include/__algorithm/ranges_stable_partition.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_STABLE_PARTITION_H
+#define _LIBCPP_ALGORITHM_RANGES_STABLE_PARTITION_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/make_projected.h>
@@ -86,4 +86,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_STABLE_PARTITION_H
+#endif // _LIBCPP_ALGORITHM_RANGES_STABLE_PARTITION_H
diff --git a/libcxx/include/__algorithm/ranges_stable_sort.h b/libcxx/include/__algorithm/ranges_stable_sort.h
index 6e17d0d0c7ec4..479733e040fb7 100644
--- a/libcxx/include/__algorithm/ranges_stable_sort.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_STABLE_SORT_H
+#define _LIBCPP_ALGORITHM_RANGES_STABLE_SORT_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/make_projected.h>
@@ -77,4 +77,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_STABLE_SORT_H
+#endif // _LIBCPP_ALGORITHM_RANGES_STABLE_SORT_H
diff --git a/libcxx/include/__algorithm/ranges_starts_with.h b/libcxx/include/__algorithm/ranges_starts_with.h
index ae145d59010ae..dd656dabb7750 100644
--- a/libcxx/include/__algorithm/ranges_starts_with.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_STARTS_WITH_H
+#define _LIBCPP_ALGORITHM_RANGES_STARTS_WITH_H
 
 #include <__algorithm/in_in_result.h>
 #include <__algorithm/ranges_mismatch.h>
@@ -90,4 +90,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_STARTS_WITH_H
+#endif // _LIBCPP_ALGORITHM_RANGES_STARTS_WITH_H
diff --git a/libcxx/include/__algorithm/ranges_swap_ranges.h b/libcxx/include/__algorithm/ranges_swap_ranges.h
index ab6db50d8a13e..d43a6847d7f43 100644
--- a/libcxx/include/__algorithm/ranges_swap_ranges.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_SWAP_RANGES_H
+#define _LIBCPP_ALGORITHM_RANGES_SWAP_RANGES_H
 
 #include <__algorithm/in_in_result.h>
 #include <__algorithm/iterator_operations.h>
@@ -65,4 +65,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_SWAP_RANGES_H
+#endif // _LIBCPP_ALGORITHM_RANGES_SWAP_RANGES_H
diff --git a/libcxx/include/__algorithm/ranges_transform.h b/libcxx/include/__algorithm/ranges_transform.h
index 091311821968c..870b4efe320a0 100644
--- a/libcxx/include/__algorithm/ranges_transform.h
+++ b/libcxx/include/__algorithm/ranges_transform.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_TRANSFORM_H
-#define _LIBCPP___ALGORITHM_RANGES_TRANSFORM_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_TRANSFORM_H
+#define _LIBCPP_ALGORITHM_RANGES_TRANSFORM_H
 
 #include <__algorithm/in_in_out_result.h>
 #include <__algorithm/in_out_result.h>
@@ -172,4 +172,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_TRANSFORM_H
+#endif // _LIBCPP_ALGORITHM_RANGES_TRANSFORM_H
diff --git a/libcxx/include/__algorithm/ranges_unique.h b/libcxx/include/__algorithm/ranges_unique.h
index a817359abd889..491050b79ceec 100644
--- a/libcxx/include/__algorithm/ranges_unique.h
+++ b/libcxx/include/__algorithm/ranges_unique.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_RANGES_UNIQUE_H
-#define _LIBCPP___ALGORITHM_RANGES_UNIQUE_H
+#ifndef _LIBCPP_ALGORITHM_RANGES_UNIQUE_H
+#define _LIBCPP_ALGORITHM_RANGES_UNIQUE_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/make_projected.h>
@@ -75,4 +75,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_UNIQUE_H
+#endif // _LIBCPP_ALGORITHM_RANGES_UNIQUE_H
diff --git a/libcxx/include/__algorithm/ranges_unique_copy.h b/libcxx/include/__algorithm/ranges_unique_copy.h
index ee7f0a0187b73..539d928cf4e8a 100644
--- a/libcxx/include/__algorithm/ranges_unique_copy.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_UNIQUE_COPY_H
+#define _LIBCPP_ALGORITHM_RANGES_UNIQUE_COPY_H
 
 #include <__algorithm/in_out_result.h>
 #include <__algorithm/iterator_operations.h>
@@ -113,4 +113,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_RANGES_UNIQUE_COPY_H
+#endif // _LIBCPP_ALGORITHM_RANGES_UNIQUE_COPY_H
diff --git a/libcxx/include/__algorithm/ranges_upper_bound.h b/libcxx/include/__algorithm/ranges_upper_bound.h
index 4b2835d4d58de..7846be65fef32 100644
--- a/libcxx/include/__algorithm/ranges_upper_bound.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_UPPER_BOUND_H
+#define _LIBCPP_ALGORITHM_RANGES_UPPER_BOUND_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/lower_bound.h>
@@ -69,4 +69,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
 
-#endif // _LIBCPP___ALGORITHM_RANGES_UPPER_BOUND_H
+#endif // _LIBCPP_ALGORITHM_RANGES_UPPER_BOUND_H
diff --git a/libcxx/include/__algorithm/remove.h b/libcxx/include/__algorithm/remove.h
index b2d7023c5b072..297c9f807f7f3 100644
--- a/libcxx/include/__algorithm/remove.h
+++ b/libcxx/include/__algorithm/remove.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_REMOVE_H
-#define _LIBCPP___ALGORITHM_REMOVE_H
+#ifndef _LIBCPP_ALGORITHM_REMOVE_H
+#define _LIBCPP_ALGORITHM_REMOVE_H
 
 #include <__algorithm/find.h>
 #include <__algorithm/find_if.h>
@@ -43,4 +43,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_REMOVE_H
+#endif // _LIBCPP_ALGORITHM_REMOVE_H
diff --git a/libcxx/include/__algorithm/remove_copy.h b/libcxx/include/__algorithm/remove_copy.h
index 7be4c166ce3d7..e502c77d7fac1 100644
--- a/libcxx/include/__algorithm/remove_copy.h
+++ b/libcxx/include/__algorithm/remove_copy.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_REMOVE_COPY_H
-#define _LIBCPP___ALGORITHM_REMOVE_COPY_H
+#ifndef _LIBCPP_ALGORITHM_REMOVE_COPY_H
+#define _LIBCPP_ALGORITHM_REMOVE_COPY_H
 
 #include <__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_ALGORITHM_REMOVE_COPY_H
diff --git a/libcxx/include/__algorithm/remove_copy_if.h b/libcxx/include/__algorithm/remove_copy_if.h
index dcafed169157d..671b06223fe58 100644
--- a/libcxx/include/__algorithm/remove_copy_if.h
+++ b/libcxx/include/__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_ALGORITHM_REMOVE_COPY_IF_H
+#define _LIBCPP_ALGORITHM_REMOVE_COPY_IF_H
 
 #include <__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_ALGORITHM_REMOVE_COPY_IF_H
diff --git a/libcxx/include/__algorithm/remove_if.h b/libcxx/include/__algorithm/remove_if.h
index 56fd745569eeb..1cf5b979dc2b7 100644
--- a/libcxx/include/__algorithm/remove_if.h
+++ b/libcxx/include/__algorithm/remove_if.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_REMOVE_IF_H
-#define _LIBCPP___ALGORITHM_REMOVE_IF_H
+#ifndef _LIBCPP_ALGORITHM_REMOVE_IF_H
+#define _LIBCPP_ALGORITHM_REMOVE_IF_H
 
 #include <__algorithm/find_if.h>
 #include <__config>
@@ -42,4 +42,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_REMOVE_IF_H
+#endif // _LIBCPP_ALGORITHM_REMOVE_IF_H
diff --git a/libcxx/include/__algorithm/replace.h b/libcxx/include/__algorithm/replace.h
index 8057c78686e11..6d34b4a90e249 100644
--- a/libcxx/include/__algorithm/replace.h
+++ b/libcxx/include/__algorithm/replace.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_REPLACE_H
-#define _LIBCPP___ALGORITHM_REPLACE_H
+#ifndef _LIBCPP_ALGORITHM_REPLACE_H
+#define _LIBCPP_ALGORITHM_REPLACE_H
 
 #include <__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_ALGORITHM_REPLACE_H
diff --git a/libcxx/include/__algorithm/replace_copy.h b/libcxx/include/__algorithm/replace_copy.h
index 9a2258d9f58ed..74024f6238999 100644
--- a/libcxx/include/__algorithm/replace_copy.h
+++ b/libcxx/include/__algorithm/replace_copy.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_REPLACE_COPY_H
-#define _LIBCPP___ALGORITHM_REPLACE_COPY_H
+#ifndef _LIBCPP_ALGORITHM_REPLACE_COPY_H
+#define _LIBCPP_ALGORITHM_REPLACE_COPY_H
 
 #include <__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_ALGORITHM_REPLACE_COPY_H
diff --git a/libcxx/include/__algorithm/replace_copy_if.h b/libcxx/include/__algorithm/replace_copy_if.h
index c2ed30f08d598..eaddfc2ee8e73 100644
--- a/libcxx/include/__algorithm/replace_copy_if.h
+++ b/libcxx/include/__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_ALGORITHM_REPLACE_COPY_IF_H
+#define _LIBCPP_ALGORITHM_REPLACE_COPY_IF_H
 
 #include <__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_ALGORITHM_REPLACE_COPY_IF_H
diff --git a/libcxx/include/__algorithm/replace_if.h b/libcxx/include/__algorithm/replace_if.h
index 78487e3deed70..1476680dcb796 100644
--- a/libcxx/include/__algorithm/replace_if.h
+++ b/libcxx/include/__algorithm/replace_if.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_REPLACE_IF_H
-#define _LIBCPP___ALGORITHM_REPLACE_IF_H
+#ifndef _LIBCPP_ALGORITHM_REPLACE_IF_H
+#define _LIBCPP_ALGORITHM_REPLACE_IF_H
 
 #include <__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_ALGORITHM_REPLACE_IF_H
diff --git a/libcxx/include/__algorithm/reverse.h b/libcxx/include/__algorithm/reverse.h
index 4167c9116d96e..d3c17c75cb6f7 100644
--- a/libcxx/include/__algorithm/reverse.h
+++ b/libcxx/include/__algorithm/reverse.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_REVERSE_H
-#define _LIBCPP___ALGORITHM_REVERSE_H
+#ifndef _LIBCPP_ALGORITHM_REVERSE_H
+#define _LIBCPP_ALGORITHM_REVERSE_H
 
 #include <__algorithm/iter_swap.h>
 #include <__algorithm/iterator_operations.h>
@@ -59,4 +59,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_REVERSE_H
+#endif // _LIBCPP_ALGORITHM_REVERSE_H
diff --git a/libcxx/include/__algorithm/reverse_copy.h b/libcxx/include/__algorithm/reverse_copy.h
index 0fcecc3923268..3e371f11726ff 100644
--- a/libcxx/include/__algorithm/reverse_copy.h
+++ b/libcxx/include/__algorithm/reverse_copy.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_REVERSE_COPY_H
-#define _LIBCPP___ALGORITHM_REVERSE_COPY_H
+#ifndef _LIBCPP_ALGORITHM_REVERSE_COPY_H
+#define _LIBCPP_ALGORITHM_REVERSE_COPY_H
 
 #include <__config>
 
@@ -27,4 +27,4 @@ reverse_copy(_BidirectionalIterator __first, _BidirectionalIterator __last, _Out
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_REVERSE_COPY_H
+#endif // _LIBCPP_ALGORITHM_REVERSE_COPY_H
diff --git a/libcxx/include/__algorithm/rotate.h b/libcxx/include/__algorithm/rotate.h
index c676980f0c1ca..c1714ede52f6c 100644
--- a/libcxx/include/__algorithm/rotate.h
+++ b/libcxx/include/__algorithm/rotate.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_ROTATE_H
-#define _LIBCPP___ALGORITHM_ROTATE_H
+#ifndef _LIBCPP_ALGORITHM_ROTATE_H
+#define _LIBCPP_ALGORITHM_ROTATE_H
 
 #include <__algorithm/copy.h>
 #include <__algorithm/copy_backward.h>
@@ -240,4 +240,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_ROTATE_H
+#endif // _LIBCPP_ALGORITHM_ROTATE_H
diff --git a/libcxx/include/__algorithm/rotate_copy.h b/libcxx/include/__algorithm/rotate_copy.h
index cddcadd237d90..f82ed66803753 100644
--- a/libcxx/include/__algorithm/rotate_copy.h
+++ b/libcxx/include/__algorithm/rotate_copy.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_ROTATE_COPY_H
-#define _LIBCPP___ALGORITHM_ROTATE_COPY_H
+#ifndef _LIBCPP_ALGORITHM_ROTATE_COPY_H
+#define _LIBCPP_ALGORITHM_ROTATE_COPY_H
 
 #include <__algorithm/copy.h>
 #include <__config>
@@ -26,4 +26,4 @@ rotate_copy(_ForwardIterator __first, _ForwardIterator __middle, _ForwardIterato
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_ROTATE_COPY_H
+#endif // _LIBCPP_ALGORITHM_ROTATE_COPY_H
diff --git a/libcxx/include/__algorithm/sample.h b/libcxx/include/__algorithm/sample.h
index ebe5180b7eeca..e43163ed722a6 100644
--- a/libcxx/include/__algorithm/sample.h
+++ b/libcxx/include/__algorithm/sample.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_SAMPLE_H
-#define _LIBCPP___ALGORITHM_SAMPLE_H
+#ifndef _LIBCPP_ALGORITHM_SAMPLE_H
+#define _LIBCPP_ALGORITHM_SAMPLE_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/min.h>
@@ -120,4 +120,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_SAMPLE_H
+#endif // _LIBCPP_ALGORITHM_SAMPLE_H
diff --git a/libcxx/include/__algorithm/search.h b/libcxx/include/__algorithm/search.h
index 161fd39d861a6..4ac67eda15fd9 100644
--- a/libcxx/include/__algorithm/search.h
+++ b/libcxx/include/__algorithm/search.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_SEARCH_H
-#define _LIBCPP___ALGORITHM_SEARCH_H
+#ifndef _LIBCPP_ALGORITHM_SEARCH_H
+#define _LIBCPP_ALGORITHM_SEARCH_H
 
 #include <__algorithm/comp.h>
 #include <__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_ALGORITHM_SEARCH_H
diff --git a/libcxx/include/__algorithm/search_n.h b/libcxx/include/__algorithm/search_n.h
index 38474e1b2379d..a395b3d3abdaa 100644
--- a/libcxx/include/__algorithm/search_n.h
+++ b/libcxx/include/__algorithm/search_n.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_SEARCH_N_H
-#define _LIBCPP___ALGORITHM_SEARCH_N_H
+#ifndef _LIBCPP_ALGORITHM_SEARCH_N_H
+#define _LIBCPP_ALGORITHM_SEARCH_N_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/iterator_operations.h>
@@ -153,4 +153,4 @@ search_n(_ForwardIterator __first, _ForwardIterator __last, _Size __count, const
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_SEARCH_N_H
+#endif // _LIBCPP_ALGORITHM_SEARCH_N_H
diff --git a/libcxx/include/__algorithm/set_difference.h b/libcxx/include/__algorithm/set_difference.h
index 0cd1bc45d64f7..1cb982e10a07c 100644
--- a/libcxx/include/__algorithm/set_difference.h
+++ b/libcxx/include/__algorithm/set_difference.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_SET_DIFFERENCE_H
-#define _LIBCPP___ALGORITHM_SET_DIFFERENCE_H
+#ifndef _LIBCPP_ALGORITHM_SET_DIFFERENCE_H
+#define _LIBCPP_ALGORITHM_SET_DIFFERENCE_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -73,4 +73,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_SET_DIFFERENCE_H
+#endif // _LIBCPP_ALGORITHM_SET_DIFFERENCE_H
diff --git a/libcxx/include/__algorithm/set_intersection.h b/libcxx/include/__algorithm/set_intersection.h
index 6246e24b9ca4e..aeae55832ac9c 100644
--- a/libcxx/include/__algorithm/set_intersection.h
+++ b/libcxx/include/__algorithm/set_intersection.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_SET_INTERSECTION_H
-#define _LIBCPP___ALGORITHM_SET_INTERSECTION_H
+#ifndef _LIBCPP_ALGORITHM_SET_INTERSECTION_H
+#define _LIBCPP_ALGORITHM_SET_INTERSECTION_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -215,4 +215,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_SET_INTERSECTION_H
+#endif // _LIBCPP_ALGORITHM_SET_INTERSECTION_H
diff --git a/libcxx/include/__algorithm/set_symmetric_difference.h b/libcxx/include/__algorithm/set_symmetric_difference.h
index 91ea4067c0d0f..57da83ef771b4 100644
--- a/libcxx/include/__algorithm/set_symmetric_difference.h
+++ b/libcxx/include/__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_ALGORITHM_SET_SYMMETRIC_DIFFERENCE_H
+#define _LIBCPP_ALGORITHM_SET_SYMMETRIC_DIFFERENCE_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -105,4 +105,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_SET_SYMMETRIC_DIFFERENCE_H
+#endif // _LIBCPP_ALGORITHM_SET_SYMMETRIC_DIFFERENCE_H
diff --git a/libcxx/include/__algorithm/set_union.h b/libcxx/include/__algorithm/set_union.h
index 393dddce4302a..104523d7aa759 100644
--- a/libcxx/include/__algorithm/set_union.h
+++ b/libcxx/include/__algorithm/set_union.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_SET_UNION_H
-#define _LIBCPP___ALGORITHM_SET_UNION_H
+#ifndef _LIBCPP_ALGORITHM_SET_UNION_H
+#define _LIBCPP_ALGORITHM_SET_UNION_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -101,4 +101,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_SET_UNION_H
+#endif // _LIBCPP_ALGORITHM_SET_UNION_H
diff --git a/libcxx/include/__algorithm/shift_left.h b/libcxx/include/__algorithm/shift_left.h
index 06cd7c5f87644..71b242824992b 100644
--- a/libcxx/include/__algorithm/shift_left.h
+++ b/libcxx/include/__algorithm/shift_left.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_SHIFT_LEFT_H
-#define _LIBCPP___ALGORITHM_SHIFT_LEFT_H
+#ifndef _LIBCPP_ALGORITHM_SHIFT_LEFT_H
+#define _LIBCPP_ALGORITHM_SHIFT_LEFT_H
 
 #include <__algorithm/move.h>
 #include <__config>
@@ -56,4 +56,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_SHIFT_LEFT_H
+#endif // _LIBCPP_ALGORITHM_SHIFT_LEFT_H
diff --git a/libcxx/include/__algorithm/shift_right.h b/libcxx/include/__algorithm/shift_right.h
index 01853057fc478..0bb39d8da8473 100644
--- a/libcxx/include/__algorithm/shift_right.h
+++ b/libcxx/include/__algorithm/shift_right.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_SHIFT_RIGHT_H
-#define _LIBCPP___ALGORITHM_SHIFT_RIGHT_H
+#ifndef _LIBCPP_ALGORITHM_SHIFT_RIGHT_H
+#define _LIBCPP_ALGORITHM_SHIFT_RIGHT_H
 
 #include <__algorithm/move.h>
 #include <__algorithm/move_backward.h>
@@ -102,4 +102,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_SHIFT_RIGHT_H
+#endif // _LIBCPP_ALGORITHM_SHIFT_RIGHT_H
diff --git a/libcxx/include/__algorithm/shuffle.h b/libcxx/include/__algorithm/shuffle.h
index 7177fbb469ba7..945bae4f1a06e 100644
--- a/libcxx/include/__algorithm/shuffle.h
+++ b/libcxx/include/__algorithm/shuffle.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_SHUFFLE_H
-#define _LIBCPP___ALGORITHM_SHUFFLE_H
+#ifndef _LIBCPP_ALGORITHM_SHUFFLE_H
+#define _LIBCPP_ALGORITHM_SHUFFLE_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__config>
@@ -164,4 +164,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_SHUFFLE_H
+#endif // _LIBCPP_ALGORITHM_SHUFFLE_H
diff --git a/libcxx/include/__algorithm/sift_down.h b/libcxx/include/__algorithm/sift_down.h
index f82775457540a..1e77c8a44a75f 100644
--- a/libcxx/include/__algorithm/sift_down.h
+++ b/libcxx/include/__algorithm/sift_down.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_SIFT_DOWN_H
-#define _LIBCPP___ALGORITHM_SIFT_DOWN_H
+#ifndef _LIBCPP_ALGORITHM_SIFT_DOWN_H
+#define _LIBCPP_ALGORITHM_SIFT_DOWN_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__assert>
@@ -116,4 +116,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_SIFT_DOWN_H
+#endif // _LIBCPP_ALGORITHM_SIFT_DOWN_H
diff --git a/libcxx/include/__algorithm/simd_utils.h b/libcxx/include/__algorithm/simd_utils.h
index aaeb8a881df18..2fe65be98aada 100644
--- a/libcxx/include/__algorithm/simd_utils.h
+++ b/libcxx/include/__algorithm/simd_utils.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_SIMD_UTILS_H
-#define _LIBCPP___ALGORITHM_SIMD_UTILS_H
+#ifndef _LIBCPP_ALGORITHM_SIMD_UTILS_H
+#define _LIBCPP_ALGORITHM_SIMD_UTILS_H
 
 #include <__algorithm/min.h>
 #include <__bit/bit_cast.h>
@@ -164,4 +164,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_SIMD_UTILS_H
+#endif // _LIBCPP_ALGORITHM_SIMD_UTILS_H
diff --git a/libcxx/include/__algorithm/sort.h b/libcxx/include/__algorithm/sort.h
index 8aa894e9228c6..2cb2a42c7132c 100644
--- a/libcxx/include/__algorithm/sort.h
+++ b/libcxx/include/__algorithm/sort.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_SORT_H
-#define _LIBCPP___ALGORITHM_SORT_H
+#ifndef _LIBCPP_ALGORITHM_SORT_H
+#define _LIBCPP_ALGORITHM_SORT_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -955,4 +955,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_SORT_H
+#endif // _LIBCPP_ALGORITHM_SORT_H
diff --git a/libcxx/include/__algorithm/sort_heap.h b/libcxx/include/__algorithm/sort_heap.h
index f20b110c7fd12..2b4dc8ac7d554 100644
--- a/libcxx/include/__algorithm/sort_heap.h
+++ b/libcxx/include/__algorithm/sort_heap.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_SORT_HEAP_H
-#define _LIBCPP___ALGORITHM_SORT_HEAP_H
+#ifndef _LIBCPP_ALGORITHM_SORT_HEAP_H
+#define _LIBCPP_ALGORITHM_SORT_HEAP_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -60,4 +60,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_SORT_HEAP_H
+#endif // _LIBCPP_ALGORITHM_SORT_HEAP_H
diff --git a/libcxx/include/__algorithm/stable_partition.h b/libcxx/include/__algorithm/stable_partition.h
index b389ae2508c6e..4eebe449058df 100644
--- a/libcxx/include/__algorithm/stable_partition.h
+++ b/libcxx/include/__algorithm/stable_partition.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_STABLE_PARTITION_H
-#define _LIBCPP___ALGORITHM_STABLE_PARTITION_H
+#ifndef _LIBCPP_ALGORITHM_STABLE_PARTITION_H
+#define _LIBCPP_ALGORITHM_STABLE_PARTITION_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/rotate.h>
@@ -302,4 +302,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_STABLE_PARTITION_H
+#endif // _LIBCPP_ALGORITHM_STABLE_PARTITION_H
diff --git a/libcxx/include/__algorithm/stable_sort.h b/libcxx/include/__algorithm/stable_sort.h
index 64c808083491e..fda805efbf4b7 100644
--- a/libcxx/include/__algorithm/stable_sort.h
+++ b/libcxx/include/__algorithm/stable_sort.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_STABLE_SORT_H
-#define _LIBCPP___ALGORITHM_STABLE_SORT_H
+#ifndef _LIBCPP_ALGORITHM_STABLE_SORT_H
+#define _LIBCPP_ALGORITHM_STABLE_SORT_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/comp_ref_type.h>
@@ -320,4 +320,4 @@ stable_sort(_RandomAccessIterator __first, _RandomAccessIterator __last) {
 _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_STABLE_SORT_H
+#endif // _LIBCPP_ALGORITHM_STABLE_SORT_H
diff --git a/libcxx/include/__algorithm/swap_ranges.h b/libcxx/include/__algorithm/swap_ranges.h
index 2731d4feaa63d..06bd0dc016716 100644
--- a/libcxx/include/__algorithm/swap_ranges.h
+++ b/libcxx/include/__algorithm/swap_ranges.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_SWAP_RANGES_H
-#define _LIBCPP___ALGORITHM_SWAP_RANGES_H
+#ifndef _LIBCPP_ALGORITHM_SWAP_RANGES_H
+#define _LIBCPP_ALGORITHM_SWAP_RANGES_H
 
 #include <__algorithm/iterator_operations.h>
 #include <__algorithm/min.h>
@@ -221,4 +221,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_SWAP_RANGES_H
+#endif // _LIBCPP_ALGORITHM_SWAP_RANGES_H
diff --git a/libcxx/include/__algorithm/three_way_comp_ref_type.h b/libcxx/include/__algorithm/three_way_comp_ref_type.h
index f6f76455e4664..ad04b552f8a45 100644
--- a/libcxx/include/__algorithm/three_way_comp_ref_type.h
+++ b/libcxx/include/__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_ALGORITHM_THREE_WAY_COMP_REF_TYPE_H
+#define _LIBCPP_ALGORITHM_THREE_WAY_COMP_REF_TYPE_H
 
 #include <__assert>
 #include <__compare/ordering.h>
@@ -71,4 +71,4 @@ using __three_way_comp_ref_type _LIBCPP_NODEBUG = _Comp&;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ALGORITHM_THREE_WAY_COMP_REF_TYPE_H
+#endif // _LIBCPP_ALGORITHM_THREE_WAY_COMP_REF_TYPE_H
diff --git a/libcxx/include/__algorithm/transform.h b/libcxx/include/__algorithm/transform.h
index 1b424409591ce..7fea233120cd6 100644
--- a/libcxx/include/__algorithm/transform.h
+++ b/libcxx/include/__algorithm/transform.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_TRANSFORM_H
-#define _LIBCPP___ALGORITHM_TRANSFORM_H
+#ifndef _LIBCPP_ALGORITHM_TRANSFORM_H
+#define _LIBCPP_ALGORITHM_TRANSFORM_H
 
 #include <__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_ALGORITHM_TRANSFORM_H
diff --git a/libcxx/include/__algorithm/uniform_random_bit_generator_adaptor.h b/libcxx/include/__algorithm/uniform_random_bit_generator_adaptor.h
index bc7a8925e1287..e9f19dec1df78 100644
--- a/libcxx/include/__algorithm/uniform_random_bit_generator_adaptor.h
+++ b/libcxx/include/__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_ALGORITHM_RANGES_UNIFORM_RANDOM_BIT_GENERATOR_ADAPTOR_H
+#define _LIBCPP_ALGORITHM_RANGES_UNIFORM_RANDOM_BIT_GENERATOR_ADAPTOR_H
 
 #include <__config>
 #include <__type_traits/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_ALGORITHM_RANGES_UNIFORM_RANDOM_BIT_GENERATOR_ADAPTOR_H
diff --git a/libcxx/include/__algorithm/unique.h b/libcxx/include/__algorithm/unique.h
index 307c424a7c2fb..3db3d2184bb74 100644
--- a/libcxx/include/__algorithm/unique.h
+++ b/libcxx/include/__algorithm/unique.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_UNIQUE_H
-#define _LIBCPP___ALGORITHM_UNIQUE_H
+#ifndef _LIBCPP_ALGORITHM_UNIQUE_H
+#define _LIBCPP_ALGORITHM_UNIQUE_H
 
 #include <__algorithm/adjacent_find.h>
 #include <__algorithm/comp.h>
@@ -63,4 +63,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_UNIQUE_H
+#endif // _LIBCPP_ALGORITHM_UNIQUE_H
diff --git a/libcxx/include/__algorithm/unique_copy.h b/libcxx/include/__algorithm/unique_copy.h
index 16ce80cab32f0..c666ad92d510f 100644
--- a/libcxx/include/__algorithm/unique_copy.h
+++ b/libcxx/include/__algorithm/unique_copy.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_UNIQUE_COPY_H
-#define _LIBCPP___ALGORITHM_UNIQUE_COPY_H
+#ifndef _LIBCPP_ALGORITHM_UNIQUE_COPY_H
+#define _LIBCPP_ALGORITHM_UNIQUE_COPY_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/iterator_operations.h>
@@ -124,4 +124,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_UNIQUE_COPY_H
+#endif // _LIBCPP_ALGORITHM_UNIQUE_COPY_H
diff --git a/libcxx/include/__algorithm/unwrap_iter.h b/libcxx/include/__algorithm/unwrap_iter.h
index b66a682e765fa..3289c50d22aa8 100644
--- a/libcxx/include/__algorithm/unwrap_iter.h
+++ b/libcxx/include/__algorithm/unwrap_iter.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_UNWRAP_ITER_H
-#define _LIBCPP___ALGORITHM_UNWRAP_ITER_H
+#ifndef _LIBCPP_ALGORITHM_UNWRAP_ITER_H
+#define _LIBCPP_ALGORITHM_UNWRAP_ITER_H
 
 #include <__config>
 #include <__iterator/iterator_traits.h>
@@ -82,4 +82,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_UNWRAP_ITER_H
+#endif // _LIBCPP_ALGORITHM_UNWRAP_ITER_H
diff --git a/libcxx/include/__algorithm/unwrap_range.h b/libcxx/include/__algorithm/unwrap_range.h
index 2d4b9bb5545ad..a07fbc3380f6f 100644
--- a/libcxx/include/__algorithm/unwrap_range.h
+++ b/libcxx/include/__algorithm/unwrap_range.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_UNWRAP_RANGE_H
-#define _LIBCPP___ALGORITHM_UNWRAP_RANGE_H
+#ifndef _LIBCPP_ALGORITHM_UNWRAP_RANGE_H
+#define _LIBCPP_ALGORITHM_UNWRAP_RANGE_H
 
 #include <__algorithm/unwrap_iter.h>
 #include <__concepts/constructible.h>
@@ -96,4 +96,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_UNWRAP_RANGE_H
+#endif // _LIBCPP_ALGORITHM_UNWRAP_RANGE_H
diff --git a/libcxx/include/__algorithm/upper_bound.h b/libcxx/include/__algorithm/upper_bound.h
index d77286c9e5af5..e00dc24eaa8dc 100644
--- a/libcxx/include/__algorithm/upper_bound.h
+++ b/libcxx/include/__algorithm/upper_bound.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ALGORITHM_UPPER_BOUND_H
-#define _LIBCPP___ALGORITHM_UPPER_BOUND_H
+#ifndef _LIBCPP_ALGORITHM_UPPER_BOUND_H
+#define _LIBCPP_ALGORITHM_UPPER_BOUND_H
 
 #include <__algorithm/comp.h>
 #include <__algorithm/half_positive.h>
@@ -68,4 +68,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ALGORITHM_UPPER_BOUND_H
+#endif // _LIBCPP_ALGORITHM_UPPER_BOUND_H
diff --git a/libcxx/include/__assert b/libcxx/include/__assert
index a9451daf47f2f..f800bfd24ae77 100644
--- a/libcxx/include/__assert
+++ b/libcxx/include/__assert
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ASSERT
-#define _LIBCPP___ASSERT
+#ifndef _LIBCPP_ASSERT
+#define _LIBCPP_ASSERT
 
 #include <__assertion_handler> // Note: this include is generated by CMake and is potentially vendor-provided.
 #include <__config>
@@ -115,4 +115,4 @@
 #endif // _LIBCPP_HARDENING_MODE == _LIBCPP_HARDENING_MODE_FAST
 // clang-format on
 
-#endif // _LIBCPP___ASSERT
+#endif // _LIBCPP_ASSERT
diff --git a/libcxx/include/__atomic/aliases.h b/libcxx/include/__atomic/aliases.h
index 4fccebab25636..189b27972e786 100644
--- a/libcxx/include/__atomic/aliases.h
+++ b/libcxx/include/__atomic/aliases.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ATOMIC_ALIASES_H
-#define _LIBCPP___ATOMIC_ALIASES_H
+#ifndef _LIBCPP_ATOMIC_ALIASES_H
+#define _LIBCPP_ATOMIC_ALIASES_H
 
 #include <__atomic/atomic.h>
 #include <__atomic/atomic_lock_free.h>
@@ -108,4 +108,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_ATOMIC_ALIASES_H
diff --git a/libcxx/include/__atomic/atomic.h b/libcxx/include/__atomic/atomic.h
index 44835820bb06c..a61e1c2e52af7 100644
--- a/libcxx/include/__atomic/atomic.h
+++ b/libcxx/include/__atomic/atomic.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ATOMIC_ATOMIC_H
-#define _LIBCPP___ATOMIC_ATOMIC_H
+#ifndef _LIBCPP_ATOMIC_ATOMIC_H
+#define _LIBCPP_ATOMIC_ATOMIC_H
 
 #include <__atomic/atomic_sync.h>
 #include <__atomic/check_memory_order.h>
@@ -797,4 +797,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_ATOMIC_ATOMIC_H
diff --git a/libcxx/include/__atomic/atomic_flag.h b/libcxx/include/__atomic/atomic_flag.h
index 28ed2d53b77da..0ffea04558c7d 100644
--- a/libcxx/include/__atomic/atomic_flag.h
+++ b/libcxx/include/__atomic/atomic_flag.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ATOMIC_ATOMIC_FLAG_H
-#define _LIBCPP___ATOMIC_ATOMIC_FLAG_H
+#ifndef _LIBCPP_ATOMIC_ATOMIC_FLAG_H
+#define _LIBCPP_ATOMIC_ATOMIC_FLAG_H
 
 #include <__atomic/atomic_sync.h>
 #include <__atomic/contention_t.h>
@@ -161,4 +161,4 @@ inline _LIBCPP_HIDE_FROM_ABI void atomic_flag_notify_all(atomic_flag* __o) _NOEX
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ATOMIC_ATOMIC_FLAG_H
+#endif // _LIBCPP_ATOMIC_ATOMIC_FLAG_H
diff --git a/libcxx/include/__atomic/atomic_init.h b/libcxx/include/__atomic/atomic_init.h
index 8e86ba31b4ac3..9263737e7efd3 100644
--- a/libcxx/include/__atomic/atomic_init.h
+++ b/libcxx/include/__atomic/atomic_init.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ATOMIC_ATOMIC_INIT_H
-#define _LIBCPP___ATOMIC_ATOMIC_INIT_H
+#ifndef _LIBCPP_ATOMIC_ATOMIC_INIT_H
+#define _LIBCPP_ATOMIC_ATOMIC_INIT_H
 
 #include <__config>
 
@@ -22,4 +22,4 @@
 #  pragma clang deprecated(ATOMIC_VAR_INIT)
 #endif
 
-#endif // _LIBCPP___ATOMIC_ATOMIC_INIT_H
+#endif // _LIBCPP_ATOMIC_ATOMIC_INIT_H
diff --git a/libcxx/include/__atomic/atomic_lock_free.h b/libcxx/include/__atomic/atomic_lock_free.h
index 3ae9b8856e810..bb2db1d3b9855 100644
--- a/libcxx/include/__atomic/atomic_lock_free.h
+++ b/libcxx/include/__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_ATOMIC_ATOMIC_LOCK_FREE_H
+#define _LIBCPP_ATOMIC_ATOMIC_LOCK_FREE_H
 
 #include <__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_ATOMIC_ATOMIC_LOCK_FREE_H
diff --git a/libcxx/include/__atomic/atomic_ref.h b/libcxx/include/__atomic/atomic_ref.h
index ec5ae2c28c310..b1947578d9722 100644
--- a/libcxx/include/__atomic/atomic_ref.h
+++ b/libcxx/include/__atomic/atomic_ref.h
@@ -14,8 +14,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ATOMIC_ATOMIC_REF_H
-#define _LIBCPP___ATOMIC_ATOMIC_REF_H
+#ifndef _LIBCPP_ATOMIC_ATOMIC_REF_H
+#define _LIBCPP_ATOMIC_ATOMIC_REF_H
 
 #include <__assert>
 #include <__atomic/atomic_sync.h>
diff --git a/libcxx/include/__atomic/atomic_sync.h b/libcxx/include/__atomic/atomic_sync.h
index 93953dfbc9b8a..f190aac9bd413 100644
--- a/libcxx/include/__atomic/atomic_sync.h
+++ b/libcxx/include/__atomic/atomic_sync.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ATOMIC_ATOMIC_SYNC_H
-#define _LIBCPP___ATOMIC_ATOMIC_SYNC_H
+#ifndef _LIBCPP_ATOMIC_ATOMIC_SYNC_H
+#define _LIBCPP_ATOMIC_ATOMIC_SYNC_H
 
 #include <__atomic/contention_t.h>
 #include <__atomic/memory_order.h>
@@ -183,4 +183,4 @@ _LIBCPP_HIDE_FROM_ABI void __atomic_wait(_AtomicWaitable& __a, _Tp __val, memory
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ATOMIC_ATOMIC_SYNC_H
+#endif // _LIBCPP_ATOMIC_ATOMIC_SYNC_H
diff --git a/libcxx/include/__atomic/check_memory_order.h b/libcxx/include/__atomic/check_memory_order.h
index 536f764a61902..2f5b37548930a 100644
--- a/libcxx/include/__atomic/check_memory_order.h
+++ b/libcxx/include/__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_ATOMIC_CHECK_MEMORY_ORDER_H
+#define _LIBCPP_ATOMIC_CHECK_MEMORY_ORDER_H
 
 #include <__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_ATOMIC_CHECK_MEMORY_ORDER_H
diff --git a/libcxx/include/__atomic/contention_t.h b/libcxx/include/__atomic/contention_t.h
index 5b42a0125f875..c83240f518e9e 100644
--- a/libcxx/include/__atomic/contention_t.h
+++ b/libcxx/include/__atomic/contention_t.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ATOMIC_CONTENTION_T_H
-#define _LIBCPP___ATOMIC_CONTENTION_T_H
+#ifndef _LIBCPP_ATOMIC_CONTENTION_T_H
+#define _LIBCPP_ATOMIC_CONTENTION_T_H
 
 #include <__atomic/support.h>
 #include <__config>
@@ -29,4 +29,4 @@ using __cxx_atomic_contention_t _LIBCPP_NODEBUG = __cxx_atomic_impl<__cxx_conten
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ATOMIC_CONTENTION_T_H
+#endif // _LIBCPP_ATOMIC_CONTENTION_T_H
diff --git a/libcxx/include/__atomic/fence.h b/libcxx/include/__atomic/fence.h
index 0a63cedddb3f9..96eee29779706 100644
--- a/libcxx/include/__atomic/fence.h
+++ b/libcxx/include/__atomic/fence.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ATOMIC_FENCE_H
-#define _LIBCPP___ATOMIC_FENCE_H
+#ifndef _LIBCPP_ATOMIC_FENCE_H
+#define _LIBCPP_ATOMIC_FENCE_H
 
 #include <__atomic/memory_order.h>
 #include <__atomic/support.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_ATOMIC_FENCE_H
diff --git a/libcxx/include/__atomic/floating_point_helper.h b/libcxx/include/__atomic/floating_point_helper.h
index 8762ec234b189..f0402d16b1597 100644
--- a/libcxx/include/__atomic/floating_point_helper.h
+++ b/libcxx/include/__atomic/floating_point_helper.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ATOMIC_FLOATING_POINT_HELPER_H
-#define _LIBCPP___ATOMIC_FLOATING_POINT_HELPER_H
+#ifndef _LIBCPP_ATOMIC_FLOATING_POINT_HELPER_H
+#define _LIBCPP_ATOMIC_FLOATING_POINT_HELPER_H
 
 #include <__config>
 #include <__type_traits/is_floating_point.h>
@@ -52,4 +52,4 @@ _LIBCPP_HIDE_FROM_ABI constexpr bool __has_rmw_builtin() {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ATOMIC_FLOATING_POINT_HELPER_H
+#endif // _LIBCPP_ATOMIC_FLOATING_POINT_HELPER_H
diff --git a/libcxx/include/__atomic/is_always_lock_free.h b/libcxx/include/__atomic/is_always_lock_free.h
index f928e79f70cea..00938c54bf1fc 100644
--- a/libcxx/include/__atomic/is_always_lock_free.h
+++ b/libcxx/include/__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_ATOMIC_IS_ALWAYS_LOCK_FREE_H
+#define _LIBCPP_ATOMIC_IS_ALWAYS_LOCK_FREE_H
 
 #include <__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_ATOMIC_IS_ALWAYS_LOCK_FREE_H
diff --git a/libcxx/include/__atomic/kill_dependency.h b/libcxx/include/__atomic/kill_dependency.h
index 103d52d35787f..ebe1d42482420 100644
--- a/libcxx/include/__atomic/kill_dependency.h
+++ b/libcxx/include/__atomic/kill_dependency.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ATOMIC_KILL_DEPENDENCY_H
-#define _LIBCPP___ATOMIC_KILL_DEPENDENCY_H
+#ifndef _LIBCPP_ATOMIC_KILL_DEPENDENCY_H
+#define _LIBCPP_ATOMIC_KILL_DEPENDENCY_H
 
 #include <__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_ATOMIC_KILL_DEPENDENCY_H
diff --git a/libcxx/include/__atomic/memory_order.h b/libcxx/include/__atomic/memory_order.h
index 355804312b2ec..923765cfa7963 100644
--- a/libcxx/include/__atomic/memory_order.h
+++ b/libcxx/include/__atomic/memory_order.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ATOMIC_MEMORY_ORDER_H
-#define _LIBCPP___ATOMIC_MEMORY_ORDER_H
+#ifndef _LIBCPP_ATOMIC_MEMORY_ORDER_H
+#define _LIBCPP_ATOMIC_MEMORY_ORDER_H
 
 #include <__config>
 #include <__type_traits/is_same.h>
@@ -62,4 +62,4 @@ enum memory_order {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ATOMIC_MEMORY_ORDER_H
+#endif // _LIBCPP_ATOMIC_MEMORY_ORDER_H
diff --git a/libcxx/include/__atomic/support.h b/libcxx/include/__atomic/support.h
index 99d0f6aa543ca..a7c3de806af1a 100644
--- a/libcxx/include/__atomic/support.h
+++ b/libcxx/include/__atomic/support.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ATOMIC_SUPPORT_H
-#define _LIBCPP___ATOMIC_SUPPORT_H
+#ifndef _LIBCPP_ATOMIC_SUPPORT_H
+#define _LIBCPP_ATOMIC_SUPPORT_H
 
 #include <__config>
 
@@ -118,4 +118,4 @@ struct __cxx_atomic_impl : public _Base {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ATOMIC_SUPPORT_H
+#endif // _LIBCPP_ATOMIC_SUPPORT_H
diff --git a/libcxx/include/__atomic/support/c11.h b/libcxx/include/__atomic/support/c11.h
index 1ad299882a12a..a10cde298f588 100644
--- a/libcxx/include/__atomic/support/c11.h
+++ b/libcxx/include/__atomic/support/c11.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ATOMIC_SUPPORT_C11_H
-#define _LIBCPP___ATOMIC_SUPPORT_C11_H
+#ifndef _LIBCPP_ATOMIC_SUPPORT_C11_H
+#define _LIBCPP_ATOMIC_SUPPORT_C11_H
 
 #include <__atomic/memory_order.h>
 #include <__config>
@@ -261,4 +261,4 @@ __cxx_atomic_fetch_xor(__cxx_atomic_base_impl<_Tp>* __a, _Tp __pattern, memory_o
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ATOMIC_SUPPORT_C11_H
+#endif // _LIBCPP_ATOMIC_SUPPORT_C11_H
diff --git a/libcxx/include/__atomic/support/gcc.h b/libcxx/include/__atomic/support/gcc.h
index 73c1b1c8070a4..06cc521f72006 100644
--- a/libcxx/include/__atomic/support/gcc.h
+++ b/libcxx/include/__atomic/support/gcc.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ATOMIC_SUPPORT_GCC_H
-#define _LIBCPP___ATOMIC_SUPPORT_GCC_H
+#ifndef _LIBCPP_ATOMIC_SUPPORT_GCC_H
+#define _LIBCPP_ATOMIC_SUPPORT_GCC_H
 
 #include <__atomic/memory_order.h>
 #include <__atomic/to_gcc_order.h>
@@ -262,4 +262,4 @@ __cxx_atomic_fetch_xor(__cxx_atomic_base_impl<_Tp>* __a, _Tp __pattern, memory_o
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ATOMIC_SUPPORT_GCC_H
+#endif // _LIBCPP_ATOMIC_SUPPORT_GCC_H
diff --git a/libcxx/include/__atomic/to_gcc_order.h b/libcxx/include/__atomic/to_gcc_order.h
index d04c111addd31..ddaf7e2f3050b 100644
--- a/libcxx/include/__atomic/to_gcc_order.h
+++ b/libcxx/include/__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_ATOMIC_TO_GCC_ORDER_H
+#define _LIBCPP_ATOMIC_TO_GCC_ORDER_H
 
 #include <__atomic/memory_order.h>
 #include <__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_ATOMIC_TO_GCC_ORDER_H
diff --git a/libcxx/include/__bit/bit_cast.h b/libcxx/include/__bit/bit_cast.h
index 735025065a729..13cd902791265 100644
--- a/libcxx/include/__bit/bit_cast.h
+++ b/libcxx/include/__bit/bit_cast.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___BIT_BIT_CAST_H
-#define _LIBCPP___BIT_BIT_CAST_H
+#ifndef _LIBCPP_BIT_BIT_CAST_H
+#define _LIBCPP_BIT_BIT_CAST_H
 
 #include <__config>
 #include <__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_BIT_BIT_CAST_H
diff --git a/libcxx/include/__bit/bit_ceil.h b/libcxx/include/__bit/bit_ceil.h
index 99881a8538290..40b4797f2161f 100644
--- a/libcxx/include/__bit/bit_ceil.h
+++ b/libcxx/include/__bit/bit_ceil.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___BIT_BIT_CEIL_H
-#define _LIBCPP___BIT_BIT_CEIL_H
+#ifndef _LIBCPP_BIT_BIT_CEIL_H
+#define _LIBCPP_BIT_BIT_CEIL_H
 
 #include <__assert>
 #include <__bit/countl.h>
@@ -51,4 +51,4 @@ template <__unsigned_integer _Tp>
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___BIT_BIT_CEIL_H
+#endif // _LIBCPP_BIT_BIT_CEIL_H
diff --git a/libcxx/include/__bit/bit_floor.h b/libcxx/include/__bit/bit_floor.h
index 799a064130b4b..bff00ad71a8a0 100644
--- a/libcxx/include/__bit/bit_floor.h
+++ b/libcxx/include/__bit/bit_floor.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___BIT_BIT_FLOOR_H
-#define _LIBCPP___BIT_BIT_FLOOR_H
+#ifndef _LIBCPP_BIT_BIT_FLOOR_H
+#define _LIBCPP_BIT_BIT_FLOOR_H
 
 #include <__bit/bit_log2.h>
 #include <__config>
@@ -30,4 +30,4 @@ template <__unsigned_integer _Tp>
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___BIT_BIT_FLOOR_H
+#endif // _LIBCPP_BIT_BIT_FLOOR_H
diff --git a/libcxx/include/__bit/bit_log2.h b/libcxx/include/__bit/bit_log2.h
index 9ceeec1b2bc94..2817874107e01 100644
--- a/libcxx/include/__bit/bit_log2.h
+++ b/libcxx/include/__bit/bit_log2.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___BIT_BIT_LOG2_H
-#define _LIBCPP___BIT_BIT_LOG2_H
+#ifndef _LIBCPP_BIT_BIT_LOG2_H
+#define _LIBCPP_BIT_BIT_LOG2_H
 
 #include <__assert>
 #include <__bit/countl.h>
@@ -30,4 +30,4 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX14 _Tp __bit_log2(_Tp __t) _NOE
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___BIT_BIT_LOG2_H
+#endif // _LIBCPP_BIT_BIT_LOG2_H
diff --git a/libcxx/include/__bit/bit_width.h b/libcxx/include/__bit/bit_width.h
index 75050acabbe88..f7c620d9ee74a 100644
--- a/libcxx/include/__bit/bit_width.h
+++ b/libcxx/include/__bit/bit_width.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___BIT_BIT_WIDTH_H
-#define _LIBCPP___BIT_BIT_WIDTH_H
+#ifndef _LIBCPP_BIT_BIT_WIDTH_H
+#define _LIBCPP_BIT_BIT_WIDTH_H
 
 #include <__bit/bit_log2.h>
 #include <__config>
@@ -30,4 +30,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
 
-#endif // _LIBCPP___BIT_BIT_WIDTH_H
+#endif // _LIBCPP_BIT_BIT_WIDTH_H
diff --git a/libcxx/include/__bit/blsr.h b/libcxx/include/__bit/blsr.h
index 76bd521f5c307..0509f8529c968 100644
--- a/libcxx/include/__bit/blsr.h
+++ b/libcxx/include/__bit/blsr.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___BIT_BLSR_H
-#define _LIBCPP___BIT_BLSR_H
+#ifndef _LIBCPP_BIT_BLSR_H
+#define _LIBCPP_BIT_BLSR_H
 
 #include <__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_BIT_BLSR_H
diff --git a/libcxx/include/__bit/byteswap.h b/libcxx/include/__bit/byteswap.h
index d761e6a6fdb46..9345d63df4110 100644
--- a/libcxx/include/__bit/byteswap.h
+++ b/libcxx/include/__bit/byteswap.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___BIT_BYTESWAP_H
-#define _LIBCPP___BIT_BYTESWAP_H
+#ifndef _LIBCPP_BIT_BYTESWAP_H
+#define _LIBCPP_BIT_BYTESWAP_H
 
 #include <__concepts/arithmetic.h>
 #include <__config>
@@ -50,4 +50,4 @@ template <integral _Tp>
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___BIT_BYTESWAP_H
+#endif // _LIBCPP_BIT_BYTESWAP_H
diff --git a/libcxx/include/__bit/countl.h b/libcxx/include/__bit/countl.h
index c95828f58d61a..460e344f74fa3 100644
--- a/libcxx/include/__bit/countl.h
+++ b/libcxx/include/__bit/countl.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___BIT_COUNTL_H
-#define _LIBCPP___BIT_COUNTL_H
+#ifndef _LIBCPP_BIT_COUNTL_H
+#define _LIBCPP_BIT_COUNTL_H
 
 #include <__config>
 #include <__type_traits/integer_traits.h>
@@ -45,4 +45,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___BIT_COUNTL_H
+#endif // _LIBCPP_BIT_COUNTL_H
diff --git a/libcxx/include/__bit/countr.h b/libcxx/include/__bit/countr.h
index 16f689d6da383..6c067b6df37ad 100644
--- a/libcxx/include/__bit/countr.h
+++ b/libcxx/include/__bit/countr.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___BIT_COUNTR_H
-#define _LIBCPP___BIT_COUNTR_H
+#ifndef _LIBCPP_BIT_COUNTR_H
+#define _LIBCPP_BIT_COUNTR_H
 
 #include <__config>
 #include <__type_traits/integer_traits.h>
@@ -45,4 +45,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___BIT_COUNTR_H
+#endif // _LIBCPP_BIT_COUNTR_H
diff --git a/libcxx/include/__bit/endian.h b/libcxx/include/__bit/endian.h
index 2d31e5ddff4f1..d5e33dd6ab90b 100644
--- a/libcxx/include/__bit/endian.h
+++ b/libcxx/include/__bit/endian.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___BIT_ENDIAN_H
-#define _LIBCPP___BIT_ENDIAN_H
+#ifndef _LIBCPP_BIT_ENDIAN_H
+#define _LIBCPP_BIT_ENDIAN_H
 
 #include <__config>
 
@@ -35,4 +35,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
 
-#endif // _LIBCPP___BIT_ENDIAN_H
+#endif // _LIBCPP_BIT_ENDIAN_H
diff --git a/libcxx/include/__bit/has_single_bit.h b/libcxx/include/__bit/has_single_bit.h
index d10ab7d6c1791..a4418c23c91ca 100644
--- a/libcxx/include/__bit/has_single_bit.h
+++ b/libcxx/include/__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_BIT_HAS_SINGLE_BIT_H
+#define _LIBCPP_BIT_HAS_SINGLE_BIT_H
 
 #include <__config>
 #include <__type_traits/integer_traits.h>
@@ -34,4 +34,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___BIT_HAS_SINGLE_BIT_H
+#endif // _LIBCPP_BIT_HAS_SINGLE_BIT_H
diff --git a/libcxx/include/__bit/invert_if.h b/libcxx/include/__bit/invert_if.h
index f7606ede26da0..63b5c83c70e5b 100644
--- a/libcxx/include/__bit/invert_if.h
+++ b/libcxx/include/__bit/invert_if.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___BIT_INVERT_IF_H
-#define _LIBCPP___BIT_INVERT_IF_H
+#ifndef _LIBCPP_BIT_INVERT_IF_H
+#define _LIBCPP_BIT_INVERT_IF_H
 
 #include <__concepts/arithmetic.h>
 #include <__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_BIT_INVERT_IF_H
diff --git a/libcxx/include/__bit/popcount.h b/libcxx/include/__bit/popcount.h
index d104c8e8f0a98..0b5625ab175b6 100644
--- a/libcxx/include/__bit/popcount.h
+++ b/libcxx/include/__bit/popcount.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___BIT_POPCOUNT_H
-#define _LIBCPP___BIT_POPCOUNT_H
+#ifndef _LIBCPP_BIT_POPCOUNT_H
+#define _LIBCPP_BIT_POPCOUNT_H
 
 #include <__config>
 #include <__type_traits/integer_traits.h>
@@ -39,4 +39,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___BIT_POPCOUNT_H
+#endif // _LIBCPP_BIT_POPCOUNT_H
diff --git a/libcxx/include/__bit/rotate.h b/libcxx/include/__bit/rotate.h
index fde9058887779..b75361df9708f 100644
--- a/libcxx/include/__bit/rotate.h
+++ b/libcxx/include/__bit/rotate.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___BIT_ROTATE_H
-#define _LIBCPP___BIT_ROTATE_H
+#ifndef _LIBCPP_BIT_ROTATE_H
+#define _LIBCPP_BIT_ROTATE_H
 
 #include <__config>
 #include <__type_traits/integer_traits.h>
@@ -57,4 +57,4 @@ template <__unsigned_integer _Tp>
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___BIT_ROTATE_H
+#endif // _LIBCPP_BIT_ROTATE_H
diff --git a/libcxx/include/__bit_reference b/libcxx/include/__bit_reference
index a3e6defd405f8..4da8afa09c917 100644
--- a/libcxx/include/__bit_reference
+++ b/libcxx/include/__bit_reference
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___BIT_REFERENCE
-#define _LIBCPP___BIT_REFERENCE
+#ifndef _LIBCPP_BIT_REFERENCE
+#define _LIBCPP_BIT_REFERENCE
 
 #include <__algorithm/comp.h>
 #include <__algorithm/copy.h>
@@ -543,4 +543,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___BIT_REFERENCE
+#endif // _LIBCPP_BIT_REFERENCE
diff --git a/libcxx/include/__charconv/chars_format.h b/libcxx/include/__charconv/chars_format.h
index c76cebd5d1847..f7e8c5baa7fcf 100644
--- a/libcxx/include/__charconv/chars_format.h
+++ b/libcxx/include/__charconv/chars_format.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHARCONV_CHARS_FORMAT_H
-#define _LIBCPP___CHARCONV_CHARS_FORMAT_H
+#ifndef _LIBCPP_CHARCONV_CHARS_FORMAT_H
+#define _LIBCPP_CHARCONV_CHARS_FORMAT_H
 
 #include <__config>
 #include <__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_CHARCONV_CHARS_FORMAT_H
diff --git a/libcxx/include/__charconv/from_chars_floating_point.h b/libcxx/include/__charconv/from_chars_floating_point.h
index 811e518a81db7..4d813780981e3 100644
--- a/libcxx/include/__charconv/from_chars_floating_point.h
+++ b/libcxx/include/__charconv/from_chars_floating_point.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHARCONV_FROM_CHARS_FLOATING_POINT_H
-#define _LIBCPP___CHARCONV_FROM_CHARS_FLOATING_POINT_H
+#ifndef _LIBCPP_CHARCONV_FROM_CHARS_FLOATING_POINT_H
+#define _LIBCPP_CHARCONV_FROM_CHARS_FLOATING_POINT_H
 
 #include <__assert>
 #include <__charconv/chars_format.h>
@@ -70,4 +70,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CHARCONV_FROM_CHARS_FLOATING_POINT_H
+#endif // _LIBCPP_CHARCONV_FROM_CHARS_FLOATING_POINT_H
diff --git a/libcxx/include/__charconv/from_chars_integral.h b/libcxx/include/__charconv/from_chars_integral.h
index c1f033b37b913..95b265891fd08 100644
--- a/libcxx/include/__charconv/from_chars_integral.h
+++ b/libcxx/include/__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_CHARCONV_FROM_CHARS_INTEGRAL_H
+#define _LIBCPP_CHARCONV_FROM_CHARS_INTEGRAL_H
 
 #include <__algorithm/copy_n.h>
 #include <__assert>
@@ -237,4 +237,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CHARCONV_FROM_CHARS_INTEGRAL_H
+#endif // _LIBCPP_CHARCONV_FROM_CHARS_INTEGRAL_H
diff --git a/libcxx/include/__charconv/from_chars_result.h b/libcxx/include/__charconv/from_chars_result.h
index b4ecea3d11451..4a07cbf4e25cc 100644
--- a/libcxx/include/__charconv/from_chars_result.h
+++ b/libcxx/include/__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_CHARCONV_FROM_CHARS_RESULT_H
+#define _LIBCPP_CHARCONV_FROM_CHARS_RESULT_H
 
 #include <__config>
 #include <__system_error/errc.h>
@@ -36,4 +36,4 @@ struct from_chars_result {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CHARCONV_FROM_CHARS_RESULT_H
+#endif // _LIBCPP_CHARCONV_FROM_CHARS_RESULT_H
diff --git a/libcxx/include/__charconv/tables.h b/libcxx/include/__charconv/tables.h
index b8c6fd8af0a0f..8fab0b745c487 100644
--- a/libcxx/include/__charconv/tables.h
+++ b/libcxx/include/__charconv/tables.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHARCONV_TABLES
-#define _LIBCPP___CHARCONV_TABLES
+#ifndef _LIBCPP_CHARCONV_TABLES
+#define _LIBCPP_CHARCONV_TABLES
 
 #include <__config>
 #include <cstdint>
@@ -156,4 +156,4 @@ inline _LIBCPP_CONSTEXPR const char __digits_base_10[200] = {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CHARCONV_TABLES
+#endif // _LIBCPP_CHARCONV_TABLES
diff --git a/libcxx/include/__charconv/to_chars.h b/libcxx/include/__charconv/to_chars.h
index 8ef09af737559..9e175999fc606 100644
--- a/libcxx/include/__charconv/to_chars.h
+++ b/libcxx/include/__charconv/to_chars.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHARCONV_TO_CHARS
-#define _LIBCPP___CHARCONV_TO_CHARS
+#ifndef _LIBCPP_CHARCONV_TO_CHARS
+#define _LIBCPP_CHARCONV_TO_CHARS
 
 #include <__charconv/to_chars_floating_point.h>
 #include <__charconv/to_chars_integral.h>
@@ -22,4 +22,4 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CHARCONV_TO_CHARS
+#endif // _LIBCPP_CHARCONV_TO_CHARS
diff --git a/libcxx/include/__charconv/to_chars_base_10.h b/libcxx/include/__charconv/to_chars_base_10.h
index d90952ea71f35..d4c0df1793adf 100644
--- a/libcxx/include/__charconv/to_chars_base_10.h
+++ b/libcxx/include/__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_CHARCONV_TO_CHARS_BASE_10_H
+#define _LIBCPP_CHARCONV_TO_CHARS_BASE_10_H
 
 #include <__algorithm/copy_n.h>
 #include <__assert>
@@ -181,4 +181,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CHARCONV_TO_CHARS_BASE_10_H
+#endif // _LIBCPP_CHARCONV_TO_CHARS_BASE_10_H
diff --git a/libcxx/include/__charconv/to_chars_floating_point.h b/libcxx/include/__charconv/to_chars_floating_point.h
index 118f316b21a10..41d33192663ac 100644
--- a/libcxx/include/__charconv/to_chars_floating_point.h
+++ b/libcxx/include/__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_CHARCONV_TO_CHARS_FLOATING_POINT_H
+#define _LIBCPP_CHARCONV_TO_CHARS_FLOATING_POINT_H
 
 #include <__charconv/chars_format.h>
 #include <__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_CHARCONV_TO_CHARS_FLOATING_POINT_H
diff --git a/libcxx/include/__charconv/to_chars_integral.h b/libcxx/include/__charconv/to_chars_integral.h
index f10cc3566875a..8a538b3130af5 100644
--- a/libcxx/include/__charconv/to_chars_integral.h
+++ b/libcxx/include/__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_CHARCONV_TO_CHARS_INTEGRAL_H
+#define _LIBCPP_CHARCONV_TO_CHARS_INTEGRAL_H
 
 #include <__algorithm/copy_n.h>
 #include <__assert>
@@ -340,4 +340,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CHARCONV_TO_CHARS_INTEGRAL_H
+#endif // _LIBCPP_CHARCONV_TO_CHARS_INTEGRAL_H
diff --git a/libcxx/include/__charconv/to_chars_result.h b/libcxx/include/__charconv/to_chars_result.h
index a3cd4e28d0175..24602b1032d35 100644
--- a/libcxx/include/__charconv/to_chars_result.h
+++ b/libcxx/include/__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_CHARCONV_TO_CHARS_RESULT_H
+#define _LIBCPP_CHARCONV_TO_CHARS_RESULT_H
 
 #include <__config>
 #include <__system_error/errc.h>
@@ -45,4 +45,4 @@ struct __to_chars_result {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CHARCONV_TO_CHARS_RESULT_H
+#endif // _LIBCPP_CHARCONV_TO_CHARS_RESULT_H
diff --git a/libcxx/include/__charconv/traits.h b/libcxx/include/__charconv/traits.h
index 9fd0092ca79c3..9c537ef216516 100644
--- a/libcxx/include/__charconv/traits.h
+++ b/libcxx/include/__charconv/traits.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHARCONV_TRAITS
-#define _LIBCPP___CHARCONV_TRAITS
+#ifndef _LIBCPP_CHARCONV_TRAITS
+#define _LIBCPP_CHARCONV_TRAITS
 
 #include <__assert>
 #include <__bit/countl.h>
@@ -185,4 +185,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CHARCONV_TRAITS
+#endif // _LIBCPP_CHARCONV_TRAITS
diff --git a/libcxx/include/__chrono/calendar.h b/libcxx/include/__chrono/calendar.h
index bb1c5e7ebc8d0..1dc504b03a41a 100644
--- a/libcxx/include/__chrono/calendar.h
+++ b/libcxx/include/__chrono/calendar.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHRONO_CALENDAR_H
-#define _LIBCPP___CHRONO_CALENDAR_H
+#ifndef _LIBCPP_CHRONO_CALENDAR_H
+#define _LIBCPP_CHRONO_CALENDAR_H
 
 #include <__chrono/duration.h>
 #include <__chrono/time_point.h>
@@ -41,4 +41,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
 
-#endif // _LIBCPP___CHRONO_CALENDAR_H
+#endif // _LIBCPP_CHRONO_CALENDAR_H
diff --git a/libcxx/include/__chrono/concepts.h b/libcxx/include/__chrono/concepts.h
index 61ec256b23abb..c15abdbea2f75 100644
--- a/libcxx/include/__chrono/concepts.h
+++ b/libcxx/include/__chrono/concepts.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHRONO_CONCEPTS_H
-#define _LIBCPP___CHRONO_CONCEPTS_H
+#ifndef _LIBCPP_CHRONO_CONCEPTS_H
+#define _LIBCPP_CHRONO_CONCEPTS_H
 
 #include <__chrono/hh_mm_ss.h>
 #include <__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_CHRONO_CONCEPTS_H
diff --git a/libcxx/include/__chrono/convert_to_timespec.h b/libcxx/include/__chrono/convert_to_timespec.h
index 11e0b826d05b4..d075718ea8d53 100644
--- a/libcxx/include/__chrono/convert_to_timespec.h
+++ b/libcxx/include/__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_CHRONO_CONVERT_TO_TIMESPEC_H
+#define _LIBCPP_CHRONO_CONVERT_TO_TIMESPEC_H
 
 #include <__chrono/duration.h>
 #include <__config>
@@ -48,4 +48,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CHRONO_CONVERT_TO_TIMESPEC_H
+#endif // _LIBCPP_CHRONO_CONVERT_TO_TIMESPEC_H
diff --git a/libcxx/include/__chrono/convert_to_tm.h b/libcxx/include/__chrono/convert_to_tm.h
index 817e6747a789f..6121f26331fee 100644
--- a/libcxx/include/__chrono/convert_to_tm.h
+++ b/libcxx/include/__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_CHRONO_CONVERT_TO_TM_H
+#define _LIBCPP_CHRONO_CONVERT_TO_TM_H
 
 #include <__chrono/calendar.h>
 #include <__chrono/concepts.h>
@@ -235,4 +235,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CHRONO_CONVERT_TO_TM_H
+#endif // _LIBCPP_CHRONO_CONVERT_TO_TM_H
diff --git a/libcxx/include/__chrono/day.h b/libcxx/include/__chrono/day.h
index f5b14689a78ac..dfd85304a6912 100644
--- a/libcxx/include/__chrono/day.h
+++ b/libcxx/include/__chrono/day.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHRONO_DAY_H
-#define _LIBCPP___CHRONO_DAY_H
+#ifndef _LIBCPP_CHRONO_DAY_H
+#define _LIBCPP_CHRONO_DAY_H
 
 #include <__chrono/duration.h>
 #include <__compare/ordering.h>
@@ -96,4 +96,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
 
-#endif // _LIBCPP___CHRONO_DAY_H
+#endif // _LIBCPP_CHRONO_DAY_H
diff --git a/libcxx/include/__chrono/duration.h b/libcxx/include/__chrono/duration.h
index 57fa64d650068..7735ac8e7f195 100644
--- a/libcxx/include/__chrono/duration.h
+++ b/libcxx/include/__chrono/duration.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHRONO_DURATION_H
-#define _LIBCPP___CHRONO_DURATION_H
+#ifndef _LIBCPP_CHRONO_DURATION_H
+#define _LIBCPP_CHRONO_DURATION_H
 
 #include <__compare/ordering.h>
 #include <__compare/three_way_comparable.h>
@@ -542,4 +542,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CHRONO_DURATION_H
+#endif // _LIBCPP_CHRONO_DURATION_H
diff --git a/libcxx/include/__chrono/exception.h b/libcxx/include/__chrono/exception.h
index 1eb5b1b62d92c..26d6ca06e5110 100644
--- a/libcxx/include/__chrono/exception.h
+++ b/libcxx/include/__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_CHRONO_EXCEPTION_H
+#define _LIBCPP_CHRONO_EXCEPTION_H
 
 #include <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 // _LIBCPP_HAS_EXPERIMENTAL_TZDB
 
-#endif // _LIBCPP___CHRONO_EXCEPTION_H
+#endif // _LIBCPP_CHRONO_EXCEPTION_H
diff --git a/libcxx/include/__chrono/file_clock.h b/libcxx/include/__chrono/file_clock.h
index 1885f0facce15..04613765e8a90 100644
--- a/libcxx/include/__chrono/file_clock.h
+++ b/libcxx/include/__chrono/file_clock.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHRONO_FILE_CLOCK_H
-#define _LIBCPP___CHRONO_FILE_CLOCK_H
+#ifndef _LIBCPP_CHRONO_FILE_CLOCK_H
+#define _LIBCPP_CHRONO_FILE_CLOCK_H
 
 #include <__chrono/duration.h>
 #include <__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_CHRONO_FILE_CLOCK_H
diff --git a/libcxx/include/__chrono/formatter.h b/libcxx/include/__chrono/formatter.h
index 49758397f6185..4630a0ada5b2b 100644
--- a/libcxx/include/__chrono/formatter.h
+++ b/libcxx/include/__chrono/formatter.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHRONO_FORMATTER_H
-#define _LIBCPP___CHRONO_FORMATTER_H
+#ifndef _LIBCPP_CHRONO_FORMATTER_H
+#define _LIBCPP_CHRONO_FORMATTER_H
 
 #include <__config>
 
@@ -1032,4 +1032,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_HAS_LOCALIZATION
 
-#endif //  _LIBCPP___CHRONO_FORMATTER_H
+#endif //  _LIBCPP_CHRONO_FORMATTER_H
diff --git a/libcxx/include/__chrono/gps_clock.h b/libcxx/include/__chrono/gps_clock.h
index 2e220cab946e3..b0e726aaf45a5 100644
--- a/libcxx/include/__chrono/gps_clock.h
+++ b/libcxx/include/__chrono/gps_clock.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHRONO_GPS_CLOCK_H
-#define _LIBCPP___CHRONO_GPS_CLOCK_H
+#ifndef _LIBCPP_CHRONO_GPS_CLOCK_H
+#define _LIBCPP_CHRONO_GPS_CLOCK_H
 
 #include <version>
 // Enable the contents of the header only when libc++ was built with experimental features enabled.
@@ -87,4 +87,4 @@ _LIBCPP_POP_MACROS
 
 #endif // _LIBCPP_HAS_EXPERIMENTAL_TZDB
 
-#endif // _LIBCPP___CHRONO_GPS_CLOCK_H
+#endif // _LIBCPP_CHRONO_GPS_CLOCK_H
diff --git a/libcxx/include/__chrono/hh_mm_ss.h b/libcxx/include/__chrono/hh_mm_ss.h
index 6ea8a28ee0938..708658a735b7d 100644
--- a/libcxx/include/__chrono/hh_mm_ss.h
+++ b/libcxx/include/__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_CHRONO_HH_MM_SS_H
+#define _LIBCPP_CHRONO_HH_MM_SS_H
 
 #include <__chrono/duration.h>
 #include <__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_CHRONO_HH_MM_SS_H
diff --git a/libcxx/include/__chrono/high_resolution_clock.h b/libcxx/include/__chrono/high_resolution_clock.h
index d324c7f0283bf..037d637a6c2f2 100644
--- a/libcxx/include/__chrono/high_resolution_clock.h
+++ b/libcxx/include/__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_CHRONO_HIGH_RESOLUTION_CLOCK_H
+#define _LIBCPP_CHRONO_HIGH_RESOLUTION_CLOCK_H
 
 #include <__chrono/steady_clock.h>
 #include <__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_CHRONO_HIGH_RESOLUTION_CLOCK_H
diff --git a/libcxx/include/__chrono/leap_second.h b/libcxx/include/__chrono/leap_second.h
index 1857bef80376e..4782815ba4f7e 100644
--- a/libcxx/include/__chrono/leap_second.h
+++ b/libcxx/include/__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_CHRONO_LEAP_SECOND_H
+#define _LIBCPP_CHRONO_LEAP_SECOND_H
 
 #include <version>
 // Enable the contents of the header only when libc++ was built with experimental features enabled.
@@ -128,4 +128,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_HAS_EXPERIMENTAL_TZDB
 
-#endif // _LIBCPP___CHRONO_LEAP_SECOND_H
+#endif // _LIBCPP_CHRONO_LEAP_SECOND_H
diff --git a/libcxx/include/__chrono/literals.h b/libcxx/include/__chrono/literals.h
index 89800440edf43..c49caab706a53 100644
--- a/libcxx/include/__chrono/literals.h
+++ b/libcxx/include/__chrono/literals.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHRONO_LITERALS_H
-#define _LIBCPP___CHRONO_LITERALS_H
+#ifndef _LIBCPP_CHRONO_LITERALS_H
+#define _LIBCPP_CHRONO_LITERALS_H
 
 #include <__chrono/day.h>
 #include <__chrono/year.h>
@@ -42,4 +42,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
 
-#endif // _LIBCPP___CHRONO_LITERALS_H
+#endif // _LIBCPP_CHRONO_LITERALS_H
diff --git a/libcxx/include/__chrono/local_info.h b/libcxx/include/__chrono/local_info.h
index 31cf77761d6ae..ee39dc776d3ba 100644
--- a/libcxx/include/__chrono/local_info.h
+++ b/libcxx/include/__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_CHRONO_LOCAL_INFO_H
+#define _LIBCPP_CHRONO_LOCAL_INFO_H
 
 #include <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 // _LIBCPP_HAS_EXPERIMENTAL_TZDB
 
-#endif // _LIBCPP___CHRONO_LOCAL_INFO_H
+#endif // _LIBCPP_CHRONO_LOCAL_INFO_H
diff --git a/libcxx/include/__chrono/month.h b/libcxx/include/__chrono/month.h
index 77c67d0954efa..243ce8c71f1c7 100644
--- a/libcxx/include/__chrono/month.h
+++ b/libcxx/include/__chrono/month.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHRONO_MONTH_H
-#define _LIBCPP___CHRONO_MONTH_H
+#ifndef _LIBCPP_CHRONO_MONTH_H
+#define _LIBCPP_CHRONO_MONTH_H
 
 #include <__chrono/duration.h>
 #include <__compare/ordering.h>
@@ -112,4 +112,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
 
-#endif // _LIBCPP___CHRONO_MONTH_H
+#endif // _LIBCPP_CHRONO_MONTH_H
diff --git a/libcxx/include/__chrono/month_weekday.h b/libcxx/include/__chrono/month_weekday.h
index 7919879655214..f42e6d612f18b 100644
--- a/libcxx/include/__chrono/month_weekday.h
+++ b/libcxx/include/__chrono/month_weekday.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHRONO_MONTH_WEEKDAY_H
-#define _LIBCPP___CHRONO_MONTH_WEEKDAY_H
+#ifndef _LIBCPP_CHRONO_MONTH_WEEKDAY_H
+#define _LIBCPP_CHRONO_MONTH_WEEKDAY_H
 
 #include <__chrono/month.h>
 #include <__chrono/weekday.h>
@@ -102,4 +102,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
 
-#endif // _LIBCPP___CHRONO_MONTH_WEEKDAY_H
+#endif // _LIBCPP_CHRONO_MONTH_WEEKDAY_H
diff --git a/libcxx/include/__chrono/monthday.h b/libcxx/include/__chrono/monthday.h
index 57712cf0b65a8..4e54b153fb88e 100644
--- a/libcxx/include/__chrono/monthday.h
+++ b/libcxx/include/__chrono/monthday.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHRONO_MONTHDAY_H
-#define _LIBCPP___CHRONO_MONTHDAY_H
+#ifndef _LIBCPP_CHRONO_MONTHDAY_H
+#define _LIBCPP_CHRONO_MONTHDAY_H
 
 #include <__chrono/calendar.h>
 #include <__chrono/day.h>
@@ -130,4 +130,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
 
-#endif // _LIBCPP___CHRONO_MONTHDAY_H
+#endif // _LIBCPP_CHRONO_MONTHDAY_H
diff --git a/libcxx/include/__chrono/ostream.h b/libcxx/include/__chrono/ostream.h
index 7a01b186780cb..1a473da565fd2 100644
--- a/libcxx/include/__chrono/ostream.h
+++ b/libcxx/include/__chrono/ostream.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHRONO_OSTREAM_H
-#define _LIBCPP___CHRONO_OSTREAM_H
+#ifndef _LIBCPP_CHRONO_OSTREAM_H
+#define _LIBCPP_CHRONO_OSTREAM_H
 
 #include <__config>
 
@@ -351,4 +351,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_HAS_LOCALIZATION
 
-#endif // _LIBCPP___CHRONO_OSTREAM_H
+#endif // _LIBCPP_CHRONO_OSTREAM_H
diff --git a/libcxx/include/__chrono/parser_std_format_spec.h b/libcxx/include/__chrono/parser_std_format_spec.h
index 8ecc19f3c7821..63333b835147f 100644
--- a/libcxx/include/__chrono/parser_std_format_spec.h
+++ b/libcxx/include/__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_CHRONO_PARSER_STD_FORMAT_SPEC_H
+#define _LIBCPP_CHRONO_PARSER_STD_FORMAT_SPEC_H
 
 #include <__config>
 
@@ -418,4 +418,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_HAS_LOCALIZATION
 
-#endif // _LIBCPP___CHRONO_PARSER_STD_FORMAT_SPEC_H
+#endif // _LIBCPP_CHRONO_PARSER_STD_FORMAT_SPEC_H
diff --git a/libcxx/include/__chrono/statically_widen.h b/libcxx/include/__chrono/statically_widen.h
index 40e085633b8c1..8f728b132e531 100644
--- a/libcxx/include/__chrono/statically_widen.h
+++ b/libcxx/include/__chrono/statically_widen.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHRONO_STATICALLY_WIDEN_H
-#define _LIBCPP___CHRONO_STATICALLY_WIDEN_H
+#ifndef _LIBCPP_CHRONO_STATICALLY_WIDEN_H
+#define _LIBCPP_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_CHRONO_STATICALLY_WIDEN_H
diff --git a/libcxx/include/__chrono/steady_clock.h b/libcxx/include/__chrono/steady_clock.h
index 1b247b2c28609..52bd9dc0a5a61 100644
--- a/libcxx/include/__chrono/steady_clock.h
+++ b/libcxx/include/__chrono/steady_clock.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHRONO_STEADY_CLOCK_H
-#define _LIBCPP___CHRONO_STEADY_CLOCK_H
+#ifndef _LIBCPP_CHRONO_STEADY_CLOCK_H
+#define _LIBCPP_CHRONO_STEADY_CLOCK_H
 
 #include <__chrono/duration.h>
 #include <__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_CHRONO_STEADY_CLOCK_H
diff --git a/libcxx/include/__chrono/sys_info.h b/libcxx/include/__chrono/sys_info.h
index 81e37f2b803f2..035a1844fd117 100644
--- a/libcxx/include/__chrono/sys_info.h
+++ b/libcxx/include/__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_CHRONO_SYS_INFO_H
+#define _LIBCPP_CHRONO_SYS_INFO_H
 
 #include <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 // _LIBCPP_HAS_EXPERIMENTAL_TZDB
 
-#endif // _LIBCPP___CHRONO_SYS_INFO_H
+#endif // _LIBCPP_CHRONO_SYS_INFO_H
diff --git a/libcxx/include/__chrono/system_clock.h b/libcxx/include/__chrono/system_clock.h
index 5a9eb65bdae7a..a54b91255ec9e 100644
--- a/libcxx/include/__chrono/system_clock.h
+++ b/libcxx/include/__chrono/system_clock.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHRONO_SYSTEM_CLOCK_H
-#define _LIBCPP___CHRONO_SYSTEM_CLOCK_H
+#ifndef _LIBCPP_CHRONO_SYSTEM_CLOCK_H
+#define _LIBCPP_CHRONO_SYSTEM_CLOCK_H
 
 #include <__chrono/duration.h>
 #include <__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_CHRONO_SYSTEM_CLOCK_H
diff --git a/libcxx/include/__chrono/tai_clock.h b/libcxx/include/__chrono/tai_clock.h
index 14c8b70a94af5..0d8d127e05af9 100644
--- a/libcxx/include/__chrono/tai_clock.h
+++ b/libcxx/include/__chrono/tai_clock.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHRONO_TAI_CLOCK_H
-#define _LIBCPP___CHRONO_TAI_CLOCK_H
+#ifndef _LIBCPP_CHRONO_TAI_CLOCK_H
+#define _LIBCPP_CHRONO_TAI_CLOCK_H
 
 #include <version>
 // Enable the contents of the header only when libc++ was built with experimental features enabled.
@@ -105,4 +105,4 @@ _LIBCPP_POP_MACROS
 
 #endif // _LIBCPP_HAS_EXPERIMENTAL_TZDB
 
-#endif // _LIBCPP___CHRONO_TAI_CLOCK_H
+#endif // _LIBCPP_CHRONO_TAI_CLOCK_H
diff --git a/libcxx/include/__chrono/time_point.h b/libcxx/include/__chrono/time_point.h
index bc2c7798a630b..e73f1af94f1fe 100644
--- a/libcxx/include/__chrono/time_point.h
+++ b/libcxx/include/__chrono/time_point.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHRONO_TIME_POINT_H
-#define _LIBCPP___CHRONO_TIME_POINT_H
+#ifndef _LIBCPP_CHRONO_TIME_POINT_H
+#define _LIBCPP_CHRONO_TIME_POINT_H
 
 #include <__chrono/duration.h>
 #include <__compare/ordering.h>
@@ -228,4 +228,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CHRONO_TIME_POINT_H
+#endif // _LIBCPP_CHRONO_TIME_POINT_H
diff --git a/libcxx/include/__chrono/time_zone.h b/libcxx/include/__chrono/time_zone.h
index d18d59d2736bf..002a9e161d864 100644
--- a/libcxx/include/__chrono/time_zone.h
+++ b/libcxx/include/__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_CHRONO_TIME_ZONE_H
+#define _LIBCPP_CHRONO_TIME_ZONE_H
 
 #include <version>
 // Enable the contents of the header only when libc++ was built with experimental features enabled.
@@ -182,4 +182,4 @@ _LIBCPP_POP_MACROS
 
 #endif // _LIBCPP_HAS_EXPERIMENTAL_TZDB
 
-#endif // _LIBCPP___CHRONO_TIME_ZONE_H
+#endif // _LIBCPP_CHRONO_TIME_ZONE_H
diff --git a/libcxx/include/__chrono/time_zone_link.h b/libcxx/include/__chrono/time_zone_link.h
index cae40b07c2ca6..9a6298cc00a01 100644
--- a/libcxx/include/__chrono/time_zone_link.h
+++ b/libcxx/include/__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_CHRONO_TIME_ZONE_LINK_H
+#define _LIBCPP_CHRONO_TIME_ZONE_LINK_H
 
 #include <version>
 // Enable the contents of the header only when libc++ was built with experimental features enabled.
@@ -76,4 +76,4 @@ _LIBCPP_POP_MACROS
 
 #endif // _LIBCPP_HAS_EXPERIMENTAL_TZDB
 
-#endif // _LIBCPP___CHRONO_TIME_ZONE_LINK_H
+#endif // _LIBCPP_CHRONO_TIME_ZONE_LINK_H
diff --git a/libcxx/include/__chrono/tzdb.h b/libcxx/include/__chrono/tzdb.h
index fb85f66b01968..db3f3cc151e16 100644
--- a/libcxx/include/__chrono/tzdb.h
+++ b/libcxx/include/__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_CHRONO_TZDB_H
+#define _LIBCPP_CHRONO_TZDB_H
 
 #include <version>
 // Enable the contents of the header only when libc++ was built with experimental features enabled.
@@ -93,4 +93,4 @@ _LIBCPP_POP_MACROS
 
 #endif // _LIBCPP_HAS_EXPERIMENTAL_TZDB
 
-#endif // _LIBCPP___CHRONO_TZDB_H
+#endif // _LIBCPP_CHRONO_TZDB_H
diff --git a/libcxx/include/__chrono/tzdb_list.h b/libcxx/include/__chrono/tzdb_list.h
index 2b83a6df1daf8..8687c0125ebff 100644
--- a/libcxx/include/__chrono/tzdb_list.h
+++ b/libcxx/include/__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_CHRONO_TZDB_LIST_H
+#define _LIBCPP_CHRONO_TZDB_LIST_H
 
 #include <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 // _LIBCPP_HAS_EXPERIMENTAL_TZDB
 
-#endif // _LIBCPP___CHRONO_TZDB_LIST_H
+#endif // _LIBCPP_CHRONO_TZDB_LIST_H
diff --git a/libcxx/include/__chrono/utc_clock.h b/libcxx/include/__chrono/utc_clock.h
index 2207b89c92c59..515a882695087 100644
--- a/libcxx/include/__chrono/utc_clock.h
+++ b/libcxx/include/__chrono/utc_clock.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHRONO_UTC_CLOCK_H
-#define _LIBCPP___CHRONO_UTC_CLOCK_H
+#ifndef _LIBCPP_CHRONO_UTC_CLOCK_H
+#define _LIBCPP_CHRONO_UTC_CLOCK_H
 
 #include <version>
 // Enable the contents of the header only when libc++ was built with experimental features enabled.
@@ -160,4 +160,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_HAS_EXPERIMENTAL_TZDB
 
-#endif // _LIBCPP___CHRONO_UTC_CLOCK_H
+#endif // _LIBCPP_CHRONO_UTC_CLOCK_H
diff --git a/libcxx/include/__chrono/weekday.h b/libcxx/include/__chrono/weekday.h
index 728cbb844633f..60dfa067a126d 100644
--- a/libcxx/include/__chrono/weekday.h
+++ b/libcxx/include/__chrono/weekday.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHRONO_WEEKDAY_H
-#define _LIBCPP___CHRONO_WEEKDAY_H
+#ifndef _LIBCPP_CHRONO_WEEKDAY_H
+#define _LIBCPP_CHRONO_WEEKDAY_H
 
 #include <__chrono/calendar.h>
 #include <__chrono/duration.h>
@@ -164,4 +164,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
 
-#endif // _LIBCPP___CHRONO_WEEKDAY_H
+#endif // _LIBCPP_CHRONO_WEEKDAY_H
diff --git a/libcxx/include/__chrono/year.h b/libcxx/include/__chrono/year.h
index 2ae5180cb8fc9..45c16a343c319 100644
--- a/libcxx/include/__chrono/year.h
+++ b/libcxx/include/__chrono/year.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHRONO_YEAR_H
-#define _LIBCPP___CHRONO_YEAR_H
+#ifndef _LIBCPP_CHRONO_YEAR_H
+#define _LIBCPP_CHRONO_YEAR_H
 
 #include <__chrono/duration.h>
 #include <__compare/ordering.h>
@@ -115,4 +115,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CHRONO_YEAR_H
+#endif // _LIBCPP_CHRONO_YEAR_H
diff --git a/libcxx/include/__chrono/year_month.h b/libcxx/include/__chrono/year_month.h
index cf9234bdb4625..ec2cc34a99f33 100644
--- a/libcxx/include/__chrono/year_month.h
+++ b/libcxx/include/__chrono/year_month.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CHRONO_YEAR_MONTH_H
-#define _LIBCPP___CHRONO_YEAR_MONTH_H
+#ifndef _LIBCPP_CHRONO_YEAR_MONTH_H
+#define _LIBCPP_CHRONO_YEAR_MONTH_H
 
 #include <__chrono/duration.h>
 #include <__chrono/month.h>
@@ -120,4 +120,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
 
-#endif // _LIBCPP___CHRONO_YEAR_MONTH_H
+#endif // _LIBCPP_CHRONO_YEAR_MONTH_H
diff --git a/libcxx/include/__chrono/year_month_day.h b/libcxx/include/__chrono/year_month_day.h
index a0510a14f4ede..cdbae59afb9b3 100644
--- a/libcxx/include/__chrono/year_month_day.h
+++ b/libcxx/include/__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_CHRONO_YEAR_MONTH_DAY_H
+#define _LIBCPP_CHRONO_YEAR_MONTH_DAY_H
 
 #include <__chrono/calendar.h>
 #include <__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_CHRONO_YEAR_MONTH_DAY_H
diff --git a/libcxx/include/__chrono/year_month_weekday.h b/libcxx/include/__chrono/year_month_weekday.h
index 0c3dd494c8787..d9b88791bf625 100644
--- a/libcxx/include/__chrono/year_month_weekday.h
+++ b/libcxx/include/__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_CHRONO_YEAR_MONTH_WEEKDAY_H
+#define _LIBCPP_CHRONO_YEAR_MONTH_WEEKDAY_H
 
 #include <__chrono/calendar.h>
 #include <__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_CHRONO_YEAR_MONTH_WEEKDAY_H
diff --git a/libcxx/include/__chrono/zoned_time.h b/libcxx/include/__chrono/zoned_time.h
index 8db687a422ab1..0883c3ce81fa6 100644
--- a/libcxx/include/__chrono/zoned_time.h
+++ b/libcxx/include/__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_CHRONO_ZONED_TIME_H
+#define _LIBCPP_CHRONO_ZONED_TIME_H
 
 #include <version>
 // Enable the contents of the header only when libc++ was built with experimental features enabled.
@@ -225,4 +225,4 @@ _LIBCPP_POP_MACROS
 
 #endif // _LIBCPP_HAS_EXPERIMENTAL_TZDB
 
-#endif // _LIBCPP___CHRONO_ZONED_TIME_H
+#endif // _LIBCPP_CHRONO_ZONED_TIME_H
diff --git a/libcxx/include/__compare/common_comparison_category.h b/libcxx/include/__compare/common_comparison_category.h
index eae2ef00624be..b8a831a576c8f 100644
--- a/libcxx/include/__compare/common_comparison_category.h
+++ b/libcxx/include/__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_COMPARE_COMMON_COMPARISON_CATEGORY_H
+#define _LIBCPP_COMPARE_COMMON_COMPARISON_CATEGORY_H
 
 #include <__compare/ordering.h>
 #include <__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_COMPARE_COMMON_COMPARISON_CATEGORY_H
diff --git a/libcxx/include/__compare/compare_partial_order_fallback.h b/libcxx/include/__compare/compare_partial_order_fallback.h
index 80f2aca661faa..cfbbc2310f8a0 100644
--- a/libcxx/include/__compare/compare_partial_order_fallback.h
+++ b/libcxx/include/__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_COMPARE_COMPARE_PARTIAL_ORDER_FALLBACK
+#define _LIBCPP_COMPARE_COMPARE_PARTIAL_ORDER_FALLBACK
 
 #include <__compare/ordering.h>
 #include <__compare/partial_order.h>
@@ -72,4 +72,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_COMPARE_COMPARE_PARTIAL_ORDER_FALLBACK
diff --git a/libcxx/include/__compare/compare_strong_order_fallback.h b/libcxx/include/__compare/compare_strong_order_fallback.h
index c41a90c5afa82..ec72af2acde67 100644
--- a/libcxx/include/__compare/compare_strong_order_fallback.h
+++ b/libcxx/include/__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_COMPARE_COMPARE_STRONG_ORDER_FALLBACK
+#define _LIBCPP_COMPARE_COMPARE_STRONG_ORDER_FALLBACK
 
 #include <__compare/ordering.h>
 #include <__compare/strong_order.h>
@@ -69,4 +69,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_COMPARE_COMPARE_STRONG_ORDER_FALLBACK
diff --git a/libcxx/include/__compare/compare_three_way.h b/libcxx/include/__compare/compare_three_way.h
index 852c5874c61ca..fb96d03e68d32 100644
--- a/libcxx/include/__compare/compare_three_way.h
+++ b/libcxx/include/__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_COMPARE_COMPARE_THREE_WAY_H
+#define _LIBCPP_COMPARE_COMPARE_THREE_WAY_H
 
 #include <__compare/three_way_comparable.h>
 #include <__config>
@@ -37,4 +37,4 @@ struct compare_three_way {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___COMPARE_COMPARE_THREE_WAY_H
+#endif // _LIBCPP_COMPARE_COMPARE_THREE_WAY_H
diff --git a/libcxx/include/__compare/compare_three_way_result.h b/libcxx/include/__compare/compare_three_way_result.h
index 264a4d603ca44..90daeada8c982 100644
--- a/libcxx/include/__compare/compare_three_way_result.h
+++ b/libcxx/include/__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_COMPARE_COMPARE_THREE_WAY_RESULT_H
+#define _LIBCPP_COMPARE_COMPARE_THREE_WAY_RESULT_H
 
 #include <__config>
 #include <__type_traits/make_const_lvalue_ref.h>
@@ -43,4 +43,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_COMPARE_COMPARE_THREE_WAY_RESULT_H
diff --git a/libcxx/include/__compare/compare_weak_order_fallback.h b/libcxx/include/__compare/compare_weak_order_fallback.h
index 26689fbd9f445..2ae23128b1e9f 100644
--- a/libcxx/include/__compare/compare_weak_order_fallback.h
+++ b/libcxx/include/__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_COMPARE_COMPARE_WEAK_ORDER_FALLBACK
+#define _LIBCPP_COMPARE_COMPARE_WEAK_ORDER_FALLBACK
 
 #include <__compare/ordering.h>
 #include <__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_COMPARE_COMPARE_WEAK_ORDER_FALLBACK
diff --git a/libcxx/include/__compare/is_eq.h b/libcxx/include/__compare/is_eq.h
index 9a82df1ebe88b..4367c6e87c230 100644
--- a/libcxx/include/__compare/is_eq.h
+++ b/libcxx/include/__compare/is_eq.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___COMPARE_IS_EQ_H
-#define _LIBCPP___COMPARE_IS_EQ_H
+#ifndef _LIBCPP_COMPARE_IS_EQ_H
+#define _LIBCPP_COMPARE_IS_EQ_H
 
 #include <__compare/ordering.h>
 #include <__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_COMPARE_IS_EQ_H
diff --git a/libcxx/include/__compare/ordering.h b/libcxx/include/__compare/ordering.h
index 902ef5329dd43..d2d098bba9b29 100644
--- a/libcxx/include/__compare/ordering.h
+++ b/libcxx/include/__compare/ordering.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___COMPARE_ORDERING_H
-#define _LIBCPP___COMPARE_ORDERING_H
+#ifndef _LIBCPP_COMPARE_ORDERING_H
+#define _LIBCPP_COMPARE_ORDERING_H
 
 #include <__config>
 #include <__type_traits/enable_if.h>
@@ -279,4 +279,4 @@ concept __comparison_category =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___COMPARE_ORDERING_H
+#endif // _LIBCPP_COMPARE_ORDERING_H
diff --git a/libcxx/include/__compare/partial_order.h b/libcxx/include/__compare/partial_order.h
index 1d2fae63e5f24..6e98cb0df231d 100644
--- a/libcxx/include/__compare/partial_order.h
+++ b/libcxx/include/__compare/partial_order.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___COMPARE_PARTIAL_ORDER
-#define _LIBCPP___COMPARE_PARTIAL_ORDER
+#ifndef _LIBCPP_COMPARE_PARTIAL_ORDER
+#define _LIBCPP_COMPARE_PARTIAL_ORDER
 
 #include <__compare/compare_three_way.h>
 #include <__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_COMPARE_PARTIAL_ORDER
diff --git a/libcxx/include/__compare/strong_order.h b/libcxx/include/__compare/strong_order.h
index ba6de446433ad..adad44bb2e127 100644
--- a/libcxx/include/__compare/strong_order.h
+++ b/libcxx/include/__compare/strong_order.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___COMPARE_STRONG_ORDER
-#define _LIBCPP___COMPARE_STRONG_ORDER
+#ifndef _LIBCPP_COMPARE_STRONG_ORDER
+#define _LIBCPP_COMPARE_STRONG_ORDER
 
 #include <__bit/bit_cast.h>
 #include <__compare/compare_three_way.h>
@@ -122,4 +122,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___COMPARE_STRONG_ORDER
+#endif // _LIBCPP_COMPARE_STRONG_ORDER
diff --git a/libcxx/include/__compare/synth_three_way.h b/libcxx/include/__compare/synth_three_way.h
index 63bf56d0cf42b..3058b860890c9 100644
--- a/libcxx/include/__compare/synth_three_way.h
+++ b/libcxx/include/__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_COMPARE_SYNTH_THREE_WAY_H
+#define _LIBCPP_COMPARE_SYNTH_THREE_WAY_H
 
 #include <__compare/ordering.h>
 #include <__compare/three_way_comparable.h>
@@ -50,4 +50,4 @@ using __synth_three_way_result _LIBCPP_NODEBUG =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___COMPARE_SYNTH_THREE_WAY_H
+#endif // _LIBCPP_COMPARE_SYNTH_THREE_WAY_H
diff --git a/libcxx/include/__compare/three_way_comparable.h b/libcxx/include/__compare/three_way_comparable.h
index 7a44ea9158a6f..5e2b489fbc0ef 100644
--- a/libcxx/include/__compare/three_way_comparable.h
+++ b/libcxx/include/__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_COMPARE_THREE_WAY_COMPARABLE_H
+#define _LIBCPP_COMPARE_THREE_WAY_COMPARABLE_H
 
 #include <__compare/common_comparison_category.h>
 #include <__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_COMPARE_THREE_WAY_COMPARABLE_H
diff --git a/libcxx/include/__compare/weak_order.h b/libcxx/include/__compare/weak_order.h
index 1a3e85feb233b..3790312da626e 100644
--- a/libcxx/include/__compare/weak_order.h
+++ b/libcxx/include/__compare/weak_order.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___COMPARE_WEAK_ORDER
-#define _LIBCPP___COMPARE_WEAK_ORDER
+#ifndef _LIBCPP_COMPARE_WEAK_ORDER
+#define _LIBCPP_COMPARE_WEAK_ORDER
 
 #include <__compare/compare_three_way.h>
 #include <__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_COMPARE_WEAK_ORDER
diff --git a/libcxx/include/__concepts/arithmetic.h b/libcxx/include/__concepts/arithmetic.h
index 64c0200783df7..afa10879916ec 100644
--- a/libcxx/include/__concepts/arithmetic.h
+++ b/libcxx/include/__concepts/arithmetic.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONCEPTS_ARITHMETIC_H
-#define _LIBCPP___CONCEPTS_ARITHMETIC_H
+#ifndef _LIBCPP_CONCEPTS_ARITHMETIC_H
+#define _LIBCPP_CONCEPTS_ARITHMETIC_H
 
 #include <__config>
 #include <__type_traits/is_floating_point.h>
@@ -40,4 +40,4 @@ concept floating_point = is_floating_point_v<_Tp>;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CONCEPTS_ARITHMETIC_H
+#endif // _LIBCPP_CONCEPTS_ARITHMETIC_H
diff --git a/libcxx/include/__concepts/assignable.h b/libcxx/include/__concepts/assignable.h
index 7423daabba780..4fce7da58846a 100644
--- a/libcxx/include/__concepts/assignable.h
+++ b/libcxx/include/__concepts/assignable.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONCEPTS_ASSIGNABLE_H
-#define _LIBCPP___CONCEPTS_ASSIGNABLE_H
+#ifndef _LIBCPP_CONCEPTS_ASSIGNABLE_H
+#define _LIBCPP_CONCEPTS_ASSIGNABLE_H
 
 #include <__concepts/common_reference_with.h>
 #include <__concepts/same_as.h>
@@ -38,4 +38,4 @@ concept assignable_from =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CONCEPTS_ASSIGNABLE_H
+#endif // _LIBCPP_CONCEPTS_ASSIGNABLE_H
diff --git a/libcxx/include/__concepts/boolean_testable.h b/libcxx/include/__concepts/boolean_testable.h
index b379fe9c5a880..518df64927397 100644
--- a/libcxx/include/__concepts/boolean_testable.h
+++ b/libcxx/include/__concepts/boolean_testable.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONCEPTS_BOOLEAN_TESTABLE_H
-#define _LIBCPP___CONCEPTS_BOOLEAN_TESTABLE_H
+#ifndef _LIBCPP_CONCEPTS_BOOLEAN_TESTABLE_H
+#define _LIBCPP_CONCEPTS_BOOLEAN_TESTABLE_H
 
 #include <__concepts/convertible_to.h>
 #include <__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_CONCEPTS_BOOLEAN_TESTABLE_H
diff --git a/libcxx/include/__concepts/class_or_enum.h b/libcxx/include/__concepts/class_or_enum.h
index 9fceed034c468..9c16951dcb507 100644
--- a/libcxx/include/__concepts/class_or_enum.h
+++ b/libcxx/include/__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_CONCEPTS_CLASS_OR_ENUM_H
+#define _LIBCPP_CONCEPTS_CLASS_OR_ENUM_H
 
 #include <__config>
 #include <__type_traits/is_class.h>
@@ -31,4 +31,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_CONCEPTS_CLASS_OR_ENUM_H
diff --git a/libcxx/include/__concepts/common_reference_with.h b/libcxx/include/__concepts/common_reference_with.h
index 4eb687e071bc5..72859502a0ffb 100644
--- a/libcxx/include/__concepts/common_reference_with.h
+++ b/libcxx/include/__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_CONCEPTS_COMMON_REFERENCE_WITH_H
+#define _LIBCPP_CONCEPTS_COMMON_REFERENCE_WITH_H
 
 #include <__concepts/convertible_to.h>
 #include <__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_CONCEPTS_COMMON_REFERENCE_WITH_H
diff --git a/libcxx/include/__concepts/common_with.h b/libcxx/include/__concepts/common_with.h
index 09082b2295def..37606dff67f33 100644
--- a/libcxx/include/__concepts/common_with.h
+++ b/libcxx/include/__concepts/common_with.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONCEPTS_COMMON_WITH_H
-#define _LIBCPP___CONCEPTS_COMMON_WITH_H
+#ifndef _LIBCPP_CONCEPTS_COMMON_WITH_H
+#define _LIBCPP_CONCEPTS_COMMON_WITH_H
 
 #include <__concepts/common_reference_with.h>
 #include <__concepts/same_as.h>
@@ -49,4 +49,4 @@ concept common_with =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CONCEPTS_COMMON_WITH_H
+#endif // _LIBCPP_CONCEPTS_COMMON_WITH_H
diff --git a/libcxx/include/__concepts/constructible.h b/libcxx/include/__concepts/constructible.h
index 835a44429c092..33e998fdec173 100644
--- a/libcxx/include/__concepts/constructible.h
+++ b/libcxx/include/__concepts/constructible.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONCEPTS_CONSTRUCTIBLE_H
-#define _LIBCPP___CONCEPTS_CONSTRUCTIBLE_H
+#ifndef _LIBCPP_CONCEPTS_CONSTRUCTIBLE_H
+#define _LIBCPP_CONCEPTS_CONSTRUCTIBLE_H
 
 #include <__concepts/convertible_to.h>
 #include <__concepts/destructible.h>
@@ -52,4 +52,4 @@ concept copy_constructible =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CONCEPTS_CONSTRUCTIBLE_H
+#endif // _LIBCPP_CONCEPTS_CONSTRUCTIBLE_H
diff --git a/libcxx/include/__concepts/convertible_to.h b/libcxx/include/__concepts/convertible_to.h
index 6d5b6c1268d5d..acfea9468040a 100644
--- a/libcxx/include/__concepts/convertible_to.h
+++ b/libcxx/include/__concepts/convertible_to.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONCEPTS_CONVERTIBLE_TO_H
-#define _LIBCPP___CONCEPTS_CONVERTIBLE_TO_H
+#ifndef _LIBCPP_CONCEPTS_CONVERTIBLE_TO_H
+#define _LIBCPP_CONCEPTS_CONVERTIBLE_TO_H
 
 #include <__config>
 #include <__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_CONCEPTS_CONVERTIBLE_TO_H
diff --git a/libcxx/include/__concepts/copyable.h b/libcxx/include/__concepts/copyable.h
index 2bf0ad42fc1a8..21570b5efb443 100644
--- a/libcxx/include/__concepts/copyable.h
+++ b/libcxx/include/__concepts/copyable.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONCEPTS_COPYABLE_H
-#define _LIBCPP___CONCEPTS_COPYABLE_H
+#ifndef _LIBCPP_CONCEPTS_COPYABLE_H
+#define _LIBCPP_CONCEPTS_COPYABLE_H
 
 #include <__concepts/assignable.h>
 #include <__concepts/constructible.h>
@@ -38,4 +38,4 @@ concept copyable =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CONCEPTS_COPYABLE_H
+#endif // _LIBCPP_CONCEPTS_COPYABLE_H
diff --git a/libcxx/include/__concepts/derived_from.h b/libcxx/include/__concepts/derived_from.h
index 9875faee81b90..27c6d2d1918e3 100644
--- a/libcxx/include/__concepts/derived_from.h
+++ b/libcxx/include/__concepts/derived_from.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONCEPTS_DERIVED_FROM_H
-#define _LIBCPP___CONCEPTS_DERIVED_FROM_H
+#ifndef _LIBCPP_CONCEPTS_DERIVED_FROM_H
+#define _LIBCPP_CONCEPTS_DERIVED_FROM_H
 
 #include <__config>
 #include <__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_CONCEPTS_DERIVED_FROM_H
diff --git a/libcxx/include/__concepts/destructible.h b/libcxx/include/__concepts/destructible.h
index 28b4b1bc24ec9..b93617b9c34b7 100644
--- a/libcxx/include/__concepts/destructible.h
+++ b/libcxx/include/__concepts/destructible.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONCEPTS_DESTRUCTIBLE_H
-#define _LIBCPP___CONCEPTS_DESTRUCTIBLE_H
+#ifndef _LIBCPP_CONCEPTS_DESTRUCTIBLE_H
+#define _LIBCPP_CONCEPTS_DESTRUCTIBLE_H
 
 #include <__config>
 #include <__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_CONCEPTS_DESTRUCTIBLE_H
diff --git a/libcxx/include/__concepts/different_from.h b/libcxx/include/__concepts/different_from.h
index fd31f6e25805d..a9452cb8794ff 100644
--- a/libcxx/include/__concepts/different_from.h
+++ b/libcxx/include/__concepts/different_from.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONCEPTS_DIFFERENT_FROM_H
-#define _LIBCPP___CONCEPTS_DIFFERENT_FROM_H
+#ifndef _LIBCPP_CONCEPTS_DIFFERENT_FROM_H
+#define _LIBCPP_CONCEPTS_DIFFERENT_FROM_H
 
 #include <__concepts/same_as.h>
 #include <__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_CONCEPTS_DIFFERENT_FROM_H
diff --git a/libcxx/include/__concepts/equality_comparable.h b/libcxx/include/__concepts/equality_comparable.h
index 278fc76409289..9f86ee883b30b 100644
--- a/libcxx/include/__concepts/equality_comparable.h
+++ b/libcxx/include/__concepts/equality_comparable.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONCEPTS_EQUALITY_COMPARABLE_H
-#define _LIBCPP___CONCEPTS_EQUALITY_COMPARABLE_H
+#ifndef _LIBCPP_CONCEPTS_EQUALITY_COMPARABLE_H
+#define _LIBCPP_CONCEPTS_EQUALITY_COMPARABLE_H
 
 #include <__concepts/boolean_testable.h>
 #include <__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_CONCEPTS_EQUALITY_COMPARABLE_H
diff --git a/libcxx/include/__concepts/invocable.h b/libcxx/include/__concepts/invocable.h
index 8a29398b3a29f..9b742b68b6c0b 100644
--- a/libcxx/include/__concepts/invocable.h
+++ b/libcxx/include/__concepts/invocable.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONCEPTS_INVOCABLE_H
-#define _LIBCPP___CONCEPTS_INVOCABLE_H
+#ifndef _LIBCPP_CONCEPTS_INVOCABLE_H
+#define _LIBCPP_CONCEPTS_INVOCABLE_H
 
 #include <__config>
 #include <__functional/invoke.h>
@@ -37,4 +37,4 @@ concept regular_invocable = invocable<_Fn, _Args...>;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CONCEPTS_INVOCABLE_H
+#endif // _LIBCPP_CONCEPTS_INVOCABLE_H
diff --git a/libcxx/include/__concepts/movable.h b/libcxx/include/__concepts/movable.h
index bc5b9d767c6a5..82aee2d796e9c 100644
--- a/libcxx/include/__concepts/movable.h
+++ b/libcxx/include/__concepts/movable.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONCEPTS_MOVABLE_H
-#define _LIBCPP___CONCEPTS_MOVABLE_H
+#ifndef _LIBCPP_CONCEPTS_MOVABLE_H
+#define _LIBCPP_CONCEPTS_MOVABLE_H
 
 #include <__concepts/assignable.h>
 #include <__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_CONCEPTS_MOVABLE_H
diff --git a/libcxx/include/__concepts/predicate.h b/libcxx/include/__concepts/predicate.h
index e0263a878b065..2df8ca3e749ab 100644
--- a/libcxx/include/__concepts/predicate.h
+++ b/libcxx/include/__concepts/predicate.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONCEPTS_PREDICATE_H
-#define _LIBCPP___CONCEPTS_PREDICATE_H
+#ifndef _LIBCPP_CONCEPTS_PREDICATE_H
+#define _LIBCPP_CONCEPTS_PREDICATE_H
 
 #include <__concepts/boolean_testable.h>
 #include <__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_CONCEPTS_PREDICATE_H
diff --git a/libcxx/include/__concepts/regular.h b/libcxx/include/__concepts/regular.h
index 9f3d8bf30be3e..ba4a8589dc27f 100644
--- a/libcxx/include/__concepts/regular.h
+++ b/libcxx/include/__concepts/regular.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONCEPTS_REGULAR_H
-#define _LIBCPP___CONCEPTS_REGULAR_H
+#ifndef _LIBCPP_CONCEPTS_REGULAR_H
+#define _LIBCPP_CONCEPTS_REGULAR_H
 
 #include <__concepts/equality_comparable.h>
 #include <__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_CONCEPTS_REGULAR_H
diff --git a/libcxx/include/__concepts/relation.h b/libcxx/include/__concepts/relation.h
index 7545a7db93da7..9013ec44cc06e 100644
--- a/libcxx/include/__concepts/relation.h
+++ b/libcxx/include/__concepts/relation.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONCEPTS_RELATION_H
-#define _LIBCPP___CONCEPTS_RELATION_H
+#ifndef _LIBCPP_CONCEPTS_RELATION_H
+#define _LIBCPP_CONCEPTS_RELATION_H
 
 #include <__concepts/predicate.h>
 #include <__config>
@@ -40,4 +40,4 @@ concept strict_weak_order = relation<_Rp, _Tp, _Up>;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CONCEPTS_RELATION_H
+#endif // _LIBCPP_CONCEPTS_RELATION_H
diff --git a/libcxx/include/__concepts/same_as.h b/libcxx/include/__concepts/same_as.h
index 4241131c70c1f..d1e8b4cfb817d 100644
--- a/libcxx/include/__concepts/same_as.h
+++ b/libcxx/include/__concepts/same_as.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONCEPTS_SAME_AS_H
-#define _LIBCPP___CONCEPTS_SAME_AS_H
+#ifndef _LIBCPP_CONCEPTS_SAME_AS_H
+#define _LIBCPP_CONCEPTS_SAME_AS_H
 
 #include <__config>
 #include <__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_CONCEPTS_SAME_AS_H
diff --git a/libcxx/include/__concepts/semiregular.h b/libcxx/include/__concepts/semiregular.h
index 7a159d17dfc10..964e2beb36e36 100644
--- a/libcxx/include/__concepts/semiregular.h
+++ b/libcxx/include/__concepts/semiregular.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONCEPTS_SEMIREGULAR_H
-#define _LIBCPP___CONCEPTS_SEMIREGULAR_H
+#ifndef _LIBCPP_CONCEPTS_SEMIREGULAR_H
+#define _LIBCPP_CONCEPTS_SEMIREGULAR_H
 
 #include <__concepts/constructible.h>
 #include <__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_CONCEPTS_SEMIREGULAR_H
diff --git a/libcxx/include/__concepts/swappable.h b/libcxx/include/__concepts/swappable.h
index c691d3ab1e12b..5c22516324ac9 100644
--- a/libcxx/include/__concepts/swappable.h
+++ b/libcxx/include/__concepts/swappable.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONCEPTS_SWAPPABLE_H
-#define _LIBCPP___CONCEPTS_SWAPPABLE_H
+#ifndef _LIBCPP_CONCEPTS_SWAPPABLE_H
+#define _LIBCPP_CONCEPTS_SWAPPABLE_H
 
 #include <__concepts/assignable.h>
 #include <__concepts/class_or_enum.h>
@@ -119,4 +119,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CONCEPTS_SWAPPABLE_H
+#endif // _LIBCPP_CONCEPTS_SWAPPABLE_H
diff --git a/libcxx/include/__concepts/totally_ordered.h b/libcxx/include/__concepts/totally_ordered.h
index 186c3b430dd54..14ee6b7628f84 100644
--- a/libcxx/include/__concepts/totally_ordered.h
+++ b/libcxx/include/__concepts/totally_ordered.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONCEPTS_TOTALLY_ORDERED_H
-#define _LIBCPP___CONCEPTS_TOTALLY_ORDERED_H
+#ifndef _LIBCPP_CONCEPTS_TOTALLY_ORDERED_H
+#define _LIBCPP_CONCEPTS_TOTALLY_ORDERED_H
 
 #include <__concepts/boolean_testable.h>
 #include <__concepts/equality_comparable.h>
@@ -56,4 +56,4 @@ concept totally_ordered_with =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CONCEPTS_TOTALLY_ORDERED_H
+#endif // _LIBCPP_CONCEPTS_TOTALLY_ORDERED_H
diff --git a/libcxx/include/__condition_variable/condition_variable.h b/libcxx/include/__condition_variable/condition_variable.h
index 1e8edd5dcb009..dc02a403f070b 100644
--- a/libcxx/include/__condition_variable/condition_variable.h
+++ b/libcxx/include/__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_CONDITION_VARIABLE_CONDITION_VARIABLE_H
+#define _LIBCPP_CONDITION_VARIABLE_CONDITION_VARIABLE_H
 
 #include <__chrono/duration.h>
 #include <__chrono/steady_clock.h>
@@ -229,4 +229,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CONDITION_VARIABLE_CONDITION_VARIABLE_H
+#endif // _LIBCPP_CONDITION_VARIABLE_CONDITION_VARIABLE_H
diff --git a/libcxx/include/__config b/libcxx/include/__config
index 357f77b7d27d6..976760a5b64e6 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONFIG
-#define _LIBCPP___CONFIG
+#ifndef _LIBCPP_CONFIG
+#define _LIBCPP_CONFIG
 
 #include <__config_site>
 #include <__configuration/abi.h>
@@ -1256,4 +1256,4 @@ typedef __char32_t char32_t;
 
 #endif // __cplusplus
 
-#endif // _LIBCPP___CONFIG
+#endif // _LIBCPP_CONFIG
diff --git a/libcxx/include/__config_site.in b/libcxx/include/__config_site.in
index b68c0c8258366..2c7e1224eaac5 100644
--- a/libcxx/include/__config_site.in
+++ b/libcxx/include/__config_site.in
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONFIG_SITE
-#define _LIBCPP___CONFIG_SITE
+#ifndef _LIBCPP_CONFIG_SITE
+#define _LIBCPP_CONFIG_SITE
 
 #cmakedefine _LIBCPP_ABI_VERSION @_LIBCPP_ABI_VERSION@
 #cmakedefine _LIBCPP_ABI_NAMESPACE @_LIBCPP_ABI_NAMESPACE@
@@ -54,4 +54,4 @@
 #  pragma clang diagnostic pop
 #endif
 
-#endif // _LIBCPP___CONFIG_SITE
+#endif // _LIBCPP_CONFIG_SITE
diff --git a/libcxx/include/__configuration/abi.h b/libcxx/include/__configuration/abi.h
index 38b85c6ac70de..9398e1790291e 100644
--- a/libcxx/include/__configuration/abi.h
+++ b/libcxx/include/__configuration/abi.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONFIGURATION_ABI_H
-#define _LIBCPP___CONFIGURATION_ABI_H
+#ifndef _LIBCPP_CONFIGURATION_ABI_H
+#define _LIBCPP_CONFIGURATION_ABI_H
 
 #include <__config_site>
 #include <__configuration/compiler.h>
@@ -151,4 +151,4 @@
 #  endif
 #endif
 
-#endif // _LIBCPP___CONFIGURATION_ABI_H
+#endif // _LIBCPP_CONFIGURATION_ABI_H
diff --git a/libcxx/include/__configuration/availability.h b/libcxx/include/__configuration/availability.h
index 5433df872fa39..84b77dab3d472 100644
--- a/libcxx/include/__configuration/availability.h
+++ b/libcxx/include/__configuration/availability.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONFIGURATION_AVAILABILITY_H
-#define _LIBCPP___CONFIGURATION_AVAILABILITY_H
+#ifndef _LIBCPP_CONFIGURATION_AVAILABILITY_H
+#define _LIBCPP_CONFIGURATION_AVAILABILITY_H
 
 #include <__configuration/compiler.h>
 #include <__configuration/language.h>
@@ -326,4 +326,4 @@
 #  define _LIBCPP_AVAILABILITY_INIT_PRIMARY_EXCEPTION
 #endif
 
-#endif // _LIBCPP___CONFIGURATION_AVAILABILITY_H
+#endif // _LIBCPP_CONFIGURATION_AVAILABILITY_H
diff --git a/libcxx/include/__configuration/compiler.h b/libcxx/include/__configuration/compiler.h
index 7cd81e03b05ba..7a5ee0e8e2161 100644
--- a/libcxx/include/__configuration/compiler.h
+++ b/libcxx/include/__configuration/compiler.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONFIGURATION_COMPILER_H
-#define _LIBCPP___CONFIGURATION_COMPILER_H
+#ifndef _LIBCPP_CONFIGURATION_COMPILER_H
+#define _LIBCPP_CONFIGURATION_COMPILER_H
 
 #include <__config_site>
 
@@ -48,4 +48,4 @@
 
 #endif
 
-#endif // _LIBCPP___CONFIGURATION_COMPILER_H
+#endif // _LIBCPP_CONFIGURATION_COMPILER_H
diff --git a/libcxx/include/__configuration/language.h b/libcxx/include/__configuration/language.h
index 9c224dfa76e40..4eb117fd42c2a 100644
--- a/libcxx/include/__configuration/language.h
+++ b/libcxx/include/__configuration/language.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONFIGURATION_LANGUAGE_H
-#define _LIBCPP___CONFIGURATION_LANGUAGE_H
+#ifndef _LIBCPP_CONFIGURATION_LANGUAGE_H
+#define _LIBCPP_CONFIGURATION_LANGUAGE_H
 
 #include <__config_site>
 
@@ -47,4 +47,4 @@
 #  define _LIBCPP_HAS_EXCEPTIONS 0
 #endif
 
-#endif // _LIBCPP___CONFIGURATION_LANGUAGE_H
+#endif // _LIBCPP_CONFIGURATION_LANGUAGE_H
diff --git a/libcxx/include/__configuration/platform.h b/libcxx/include/__configuration/platform.h
index f3c199dee172b..2373e341eda57 100644
--- a/libcxx/include/__configuration/platform.h
+++ b/libcxx/include/__configuration/platform.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CONFIGURATION_PLATFORM_H
-#define _LIBCPP___CONFIGURATION_PLATFORM_H
+#ifndef _LIBCPP_CONFIGURATION_PLATFORM_H
+#define _LIBCPP_CONFIGURATION_PLATFORM_H
 
 #include <__config_site>
 
@@ -60,4 +60,4 @@
 #  define _LIBCPP_BIG_ENDIAN
 #endif // __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 
-#endif // _LIBCPP___CONFIGURATION_PLATFORM_H
+#endif // _LIBCPP_CONFIGURATION_PLATFORM_H
diff --git a/libcxx/include/__coroutine/coroutine_handle.h b/libcxx/include/__coroutine/coroutine_handle.h
index b7add258510eb..ec352acdbf1ce 100644
--- a/libcxx/include/__coroutine/coroutine_handle.h
+++ b/libcxx/include/__coroutine/coroutine_handle.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___COROUTINE_COROUTINE_HANDLE_H
-#define _LIBCPP___COROUTINE_COROUTINE_HANDLE_H
+#ifndef _LIBCPP_COROUTINE_COROUTINE_HANDLE_H
+#define _LIBCPP_COROUTINE_COROUTINE_HANDLE_H
 
 #include <__assert>
 #include <__config>
@@ -174,4 +174,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
 
-#endif // _LIBCPP___COROUTINE_COROUTINE_HANDLE_H
+#endif // _LIBCPP_COROUTINE_COROUTINE_HANDLE_H
diff --git a/libcxx/include/__coroutine/coroutine_traits.h b/libcxx/include/__coroutine/coroutine_traits.h
index 60f7ca2311c6b..9960f4c5e4f27 100644
--- a/libcxx/include/__coroutine/coroutine_traits.h
+++ b/libcxx/include/__coroutine/coroutine_traits.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___COROUTINE_COROUTINE_TRAITS_H
-#define _LIBCPP___COROUTINE_COROUTINE_TRAITS_H
+#ifndef _LIBCPP_COROUTINE_COROUTINE_TRAITS_H
+#define _LIBCPP_COROUTINE_COROUTINE_TRAITS_H
 
 #include <__config>
 #include <__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_COROUTINE_COROUTINE_TRAITS_H
diff --git a/libcxx/include/__coroutine/noop_coroutine_handle.h b/libcxx/include/__coroutine/noop_coroutine_handle.h
index 692398a8a8431..3b685adc61dfc 100644
--- a/libcxx/include/__coroutine/noop_coroutine_handle.h
+++ b/libcxx/include/__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_COROUTINE_NOOP_COROUTINE_HANDLE_H
+#define _LIBCPP_COROUTINE_NOOP_COROUTINE_HANDLE_H
 
 #include <__config>
 #include <__coroutine/coroutine_handle.h>
@@ -92,4 +92,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
 
-#endif // _LIBCPP___COROUTINE_NOOP_COROUTINE_HANDLE_H
+#endif // _LIBCPP_COROUTINE_NOOP_COROUTINE_HANDLE_H
diff --git a/libcxx/include/__coroutine/trivial_awaitables.h b/libcxx/include/__coroutine/trivial_awaitables.h
index 7cb7f4dfeb78c..348b8e240fad1 100644
--- a/libcxx/include/__coroutine/trivial_awaitables.h
+++ b/libcxx/include/__coroutine/trivial_awaitables.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef __LIBCPP___COROUTINE_TRIVIAL_AWAITABLES_H
-#define __LIBCPP___COROUTINE_TRIVIAL_AWAITABLES_H
+#ifndef __LIBCPP_COROUTINE_TRIVIAL_AWAITABLES_H
+#define __LIBCPP_COROUTINE_TRIVIAL_AWAITABLES_H
 
 #include <__config>
 #include <__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_COROUTINE_TRIVIAL_AWAITABLES_H
diff --git a/libcxx/include/__cstddef/byte.h b/libcxx/include/__cstddef/byte.h
index 3d97db1bea293..fe0d5e26980e8 100644
--- a/libcxx/include/__cstddef/byte.h
+++ b/libcxx/include/__cstddef/byte.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CSTDDEF_BYTE_H
-#define _LIBCPP___CSTDDEF_BYTE_H
+#ifndef _LIBCPP_CSTDDEF_BYTE_H
+#define _LIBCPP_CSTDDEF_BYTE_H
 
 #include <__config>
 #include <__fwd/byte.h>
@@ -82,4 +82,4 @@ template <class _Integer, __enable_if_t<is_integral<_Integer>::value, int> = 0>
 _LIBCPP_END_UNVERSIONED_NAMESPACE_STD
 #endif // _LIBCPP_STD_VER >= 17
 
-#endif // _LIBCPP___CSTDDEF_BYTE_H
+#endif // _LIBCPP_CSTDDEF_BYTE_H
diff --git a/libcxx/include/__cstddef/max_align_t.h b/libcxx/include/__cstddef/max_align_t.h
index 7c09c7e7f3017..27b38d99e74ea 100644
--- a/libcxx/include/__cstddef/max_align_t.h
+++ b/libcxx/include/__cstddef/max_align_t.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CSTDDEF_MAX_ALIGN_T_H
-#define _LIBCPP___CSTDDEF_MAX_ALIGN_T_H
+#ifndef _LIBCPP_CSTDDEF_MAX_ALIGN_T_H
+#define _LIBCPP_CSTDDEF_MAX_ALIGN_T_H
 
 #include <__config>
 #include <stddef.h>
@@ -24,4 +24,4 @@ using ::max_align_t _LIBCPP_USING_IF_EXISTS;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CSTDDEF_MAX_ALIGN_T_H
+#endif // _LIBCPP_CSTDDEF_MAX_ALIGN_T_H
diff --git a/libcxx/include/__cstddef/nullptr_t.h b/libcxx/include/__cstddef/nullptr_t.h
index 7eaae01753965..d8f81e0867524 100644
--- a/libcxx/include/__cstddef/nullptr_t.h
+++ b/libcxx/include/__cstddef/nullptr_t.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CSTDDEF_NULLPTR_T_H
-#define _LIBCPP___CSTDDEF_NULLPTR_T_H
+#ifndef _LIBCPP_CSTDDEF_NULLPTR_T_H
+#define _LIBCPP_CSTDDEF_NULLPTR_T_H
 
 #include <__config>
 
@@ -21,4 +21,4 @@ using nullptr_t = decltype(nullptr);
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CSTDDEF_NULLPTR_T_H
+#endif // _LIBCPP_CSTDDEF_NULLPTR_T_H
diff --git a/libcxx/include/__cstddef/ptrdiff_t.h b/libcxx/include/__cstddef/ptrdiff_t.h
index 146f345a2c30c..91edc9d70d009 100644
--- a/libcxx/include/__cstddef/ptrdiff_t.h
+++ b/libcxx/include/__cstddef/ptrdiff_t.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CSTDDEF_PTRDIFF_T_H
-#define _LIBCPP___CSTDDEF_PTRDIFF_T_H
+#ifndef _LIBCPP_CSTDDEF_PTRDIFF_T_H
+#define _LIBCPP_CSTDDEF_PTRDIFF_T_H
 
 #include <__config>
 
@@ -21,4 +21,4 @@ using ptrdiff_t = decltype(static_cast<int*>(nullptr) - static_cast<int*>(nullpt
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CSTDDEF_PTRDIFF_T_H
+#endif // _LIBCPP_CSTDDEF_PTRDIFF_T_H
diff --git a/libcxx/include/__cstddef/size_t.h b/libcxx/include/__cstddef/size_t.h
index 59bad93671983..c21a065aa3320 100644
--- a/libcxx/include/__cstddef/size_t.h
+++ b/libcxx/include/__cstddef/size_t.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CSTDDEF_SIZE_T_H
-#define _LIBCPP___CSTDDEF_SIZE_T_H
+#ifndef _LIBCPP_CSTDDEF_SIZE_T_H
+#define _LIBCPP_CSTDDEF_SIZE_T_H
 
 #include <__config>
 
@@ -21,4 +21,4 @@ using size_t = decltype(sizeof(int));
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CSTDDEF_SIZE_T_H
+#endif // _LIBCPP_CSTDDEF_SIZE_T_H
diff --git a/libcxx/include/__cxx03/__algorithm/adjacent_find.h b/libcxx/include/__cxx03/__algorithm/adjacent_find.h
index ac233233bbc74..1cfb0df8494e3 100644
--- a/libcxx/include/__cxx03/__algorithm/adjacent_find.h
+++ b/libcxx/include/__cxx03/__algorithm/adjacent_find.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_ADJACENT_FIND_H
-#define _LIBCPP___CXX03___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>
@@ -54,4 +54,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 8bc39b027e40b..4b51485185d63 100644
--- a/libcxx/include/__cxx03/__algorithm/all_of.h
+++ b/libcxx/include/__cxx03/__algorithm/all_of.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_ALL_OF_H
-#define _LIBCPP___CXX03___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___CXX03___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 6b3462a91a9f4..893ba4051f6d6 100644
--- a/libcxx/include/__cxx03/__algorithm/any_of.h
+++ b/libcxx/include/__cxx03/__algorithm/any_of.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_ANY_OF_H
-#define _LIBCPP___CXX03___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___CXX03___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 37e273944554c..b23a2294aaa5a 100644
--- a/libcxx/include/__cxx03/__algorithm/binary_search.h
+++ b/libcxx/include/__cxx03/__algorithm/binary_search.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_BINARY_SEARCH_H
-#define _LIBCPP___CXX03___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___CXX03___ALGORITHM_BINARY_SEARCH_H
+#endif // _LIBCPP_CXX03_ALGORITHM_BINARY_SEARCH_H
diff --git a/libcxx/include/__cxx03/__algorithm/comp.h b/libcxx/include/__cxx03/__algorithm/comp.h
index 420c4344e0af7..165e19f412ea2 100644
--- a/libcxx/include/__cxx03/__algorithm/comp.h
+++ b/libcxx/include/__cxx03/__algorithm/comp.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_COMP_H
-#define _LIBCPP___CXX03___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___CXX03___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 bf4d07c89d123..3de8c06a73539 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___CXX03___ALGORITHM_COMP_REF_TYPE_H
-#define _LIBCPP___CXX03___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>
@@ -63,4 +63,4 @@ using __comp_ref_type = _Comp&;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 ab164a8f9af51..9a381d8b81aa5 100644
--- a/libcxx/include/__cxx03/__algorithm/copy.h
+++ b/libcxx/include/__cxx03/__algorithm/copy.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_COPY_H
-#define _LIBCPP___CXX03___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>
@@ -114,4 +114,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 0a84b6ed27a98..1b236d1e3c08c 100644
--- a/libcxx/include/__cxx03/__algorithm/copy_backward.h
+++ b/libcxx/include/__cxx03/__algorithm/copy_backward.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_COPY_BACKWARD_H
-#define _LIBCPP___CXX03___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>
@@ -129,4 +129,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 53a85bc51d8ec..578aa6b14d3d9 100644
--- a/libcxx/include/__cxx03/__algorithm/copy_if.h
+++ b/libcxx/include/__cxx03/__algorithm/copy_if.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_COPY_IF_H
-#define _LIBCPP___CXX03___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___CXX03___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 8d1ba8e39b8bc..c9e33113d338e 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___CXX03___ALGORITHM_COPY_MOVE_COMMON_H
-#define _LIBCPP___CXX03___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>
@@ -109,4 +109,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 b32b908d89585..744f68ae66c66 100644
--- a/libcxx/include/__cxx03/__algorithm/copy_n.h
+++ b/libcxx/include/__cxx03/__algorithm/copy_n.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_COPY_N_H
-#define _LIBCPP___CXX03___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>
@@ -55,4 +55,4 @@ inline _LIBCPP_HIDE_FROM_ABI _OutputIterator copy_n(_InputIterator __first, _Siz
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 5b05b4b71f519..396a397401607 100644
--- a/libcxx/include/__cxx03/__algorithm/count.h
+++ b/libcxx/include/__cxx03/__algorithm/count.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_COUNT_H
-#define _LIBCPP___CXX03___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___CXX03___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 8a31989cf8a33..8552af7e36f0c 100644
--- a/libcxx/include/__cxx03/__algorithm/count_if.h
+++ b/libcxx/include/__cxx03/__algorithm/count_if.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_COUNT_IF_H
-#define _LIBCPP___CXX03___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>
@@ -31,4 +31,4 @@ count_if(_InputIterator __first, _InputIterator __last, _Predicate __pred) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 5dbc75720e2a0..4b82b48a6412c 100644
--- a/libcxx/include/__cxx03/__algorithm/equal.h
+++ b/libcxx/include/__cxx03/__algorithm/equal.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_EQUAL_H
-#define _LIBCPP___CXX03___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>
@@ -70,4 +70,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 e84b536415c20..e6900b64aa5b6 100644
--- a/libcxx/include/__cxx03/__algorithm/equal_range.h
+++ b/libcxx/include/__cxx03/__algorithm/equal_range.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_EQUAL_RANGE_H
-#define _LIBCPP___CXX03___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___CXX03___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 c1b92ddf293cf..14aed6f86e412 100644
--- a/libcxx/include/__cxx03/__algorithm/fill.h
+++ b/libcxx/include/__cxx03/__algorithm/fill.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_FILL_H
-#define _LIBCPP___CXX03___ALGORITHM_FILL_H
+#ifndef _LIBCPP_CXX03_ALGORITHM_FILL_H
+#define _LIBCPP_CXX03_ALGORITHM_FILL_H
 
 #include <__cxx03/__algorithm/fill_n.h>
 #include <__cxx03/__config>
@@ -41,4 +41,4 @@ inline _LIBCPP_HIDE_FROM_ABI void fill(_ForwardIterator __first, _ForwardIterato
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 b52f650241176..40850e04f0696 100644
--- a/libcxx/include/__cxx03/__algorithm/fill_n.h
+++ b/libcxx/include/__cxx03/__algorithm/fill_n.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_FILL_N_H
-#define _LIBCPP___CXX03___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>
@@ -91,4 +91,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 baa8e4ccd052f..af498604d2719 100644
--- a/libcxx/include/__cxx03/__algorithm/find.h
+++ b/libcxx/include/__cxx03/__algorithm/find.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_FIND_H
-#define _LIBCPP___CXX03___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>
@@ -174,4 +174,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 8045021d5a526..574bfa2f94419 100644
--- a/libcxx/include/__cxx03/__algorithm/find_end.h
+++ b/libcxx/include/__cxx03/__algorithm/find_end.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_FIND_END_OF_H
-#define _LIBCPP___CXX03___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___CXX03___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 dd61fb4868f6c..15513eaaf9573 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___CXX03___ALGORITHM_FIND_FIRST_OF_H
-#define _LIBCPP___CXX03___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 _ForwardIterator1 find_first_of(
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 e7cb971f1518f..30f358cd1234f 100644
--- a/libcxx/include/__cxx03/__algorithm/find_if.h
+++ b/libcxx/include/__cxx03/__algorithm/find_if.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_FIND_IF_H
-#define _LIBCPP___CXX03___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___CXX03___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 d3a6d7b44f967..80aa77b92c716 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___CXX03___ALGORITHM_FIND_IF_NOT_H
-#define _LIBCPP___CXX03___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___CXX03___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 9fdf8ae53d517..e23215bf1bb17 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___CXX03___ALGORITHM_FIND_SEGMENT_IF_H
-#define _LIBCPP___CXX03___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___CXX03___ALGORITHM_FIND_SEGMENT_IF_H
+#endif // _LIBCPP_CXX03_ALGORITHM_FIND_SEGMENT_IF_H
diff --git a/libcxx/include/__cxx03/__algorithm/for_each.h b/libcxx/include/__cxx03/__algorithm/for_each.h
index 1ffb0137c0af7..d4fc49e38a69c 100644
--- a/libcxx/include/__cxx03/__algorithm/for_each.h
+++ b/libcxx/include/__cxx03/__algorithm/for_each.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_FOR_EACH_H
-#define _LIBCPP___CXX03___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>
@@ -30,4 +30,4 @@ _LIBCPP_HIDE_FROM_ABI _Function for_each(_InputIterator __first, _InputIterator
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___ALGORITHM_FOR_EACH_H
+#endif // _LIBCPP_CXX03_ALGORITHM_FOR_EACH_H
diff --git a/libcxx/include/__cxx03/__algorithm/for_each_segment.h b/libcxx/include/__cxx03/__algorithm/for_each_segment.h
index b1d54ad427659..815e12d7d2969 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___CXX03___ALGORITHM_FOR_EACH_SEGMENT_H
-#define _LIBCPP___CXX03___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>
@@ -49,4 +49,4 @@ _LIBCPP_HIDE_FROM_ABI void __for_each_segment(_SegmentedIterator __first, _Segme
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 2d98820a8c738..909323bdb8687 100644
--- a/libcxx/include/__cxx03/__algorithm/generate.h
+++ b/libcxx/include/__cxx03/__algorithm/generate.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_GENERATE_H
-#define _LIBCPP___CXX03___ALGORITHM_GENERATE_H
+#ifndef _LIBCPP_CXX03_ALGORITHM_GENERATE_H
+#define _LIBCPP_CXX03_ALGORITHM_GENERATE_H
 
 #include <__cxx03/__config>
 
@@ -25,4 +25,4 @@ inline _LIBCPP_HIDE_FROM_ABI void generate(_ForwardIterator __first, _ForwardIte
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 f1ea183ba7d68..be4ea73c3a6d0 100644
--- a/libcxx/include/__cxx03/__algorithm/generate_n.h
+++ b/libcxx/include/__cxx03/__algorithm/generate_n.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_GENERATE_N_H
-#define _LIBCPP___CXX03___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>
@@ -29,4 +29,4 @@ inline _LIBCPP_HIDE_FROM_ABI _OutputIterator generate_n(_OutputIterator __first,
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 6e01fce6fa240..8107df9f3d00b 100644
--- a/libcxx/include/__cxx03/__algorithm/half_positive.h
+++ b/libcxx/include/__cxx03/__algorithm/half_positive.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_HALF_POSITIVE_H
-#define _LIBCPP___CXX03___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 _Tp __half_positive(_Tp __value) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___ALGORITHM_HALF_POSITIVE_H
+#endif // _LIBCPP_CXX03_ALGORITHM_HALF_POSITIVE_H
diff --git a/libcxx/include/__cxx03/__algorithm/includes.h b/libcxx/include/__cxx03/__algorithm/includes.h
index 194f508932272..75943829cb3ac 100644
--- a/libcxx/include/__cxx03/__algorithm/includes.h
+++ b/libcxx/include/__cxx03/__algorithm/includes.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_INCLUDES_H
-#define _LIBCPP___CXX03___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___CXX03___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 187969dcc4029..79d2de4e4512e 100644
--- a/libcxx/include/__cxx03/__algorithm/inplace_merge.h
+++ b/libcxx/include/__cxx03/__algorithm/inplace_merge.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_INPLACE_MERGE_H
-#define _LIBCPP___CXX03___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___CXX03___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 a29cefe376409..c8ce238dc1375 100644
--- a/libcxx/include/__cxx03/__algorithm/is_heap.h
+++ b/libcxx/include/__cxx03/__algorithm/is_heap.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_IS_HEAP_H
-#define _LIBCPP___CXX03___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___CXX03___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 6625af701c5c3..6344d426bcfd9 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___CXX03___ALGORITHM_IS_HEAP_UNTIL_H
-#define _LIBCPP___CXX03___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___CXX03___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 c4547d3aa2ffa..57b5dc314c701 100644
--- a/libcxx/include/__cxx03/__algorithm/is_partitioned.h
+++ b/libcxx/include/__cxx03/__algorithm/is_partitioned.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_IS_PARTITIONED_H
-#define _LIBCPP___CXX03___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___CXX03___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 9402fdf5ce1c3..132224b1bc3eb 100644
--- a/libcxx/include/__cxx03/__algorithm/is_permutation.h
+++ b/libcxx/include/__cxx03/__algorithm/is_permutation.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_IS_PERMUTATION_H
-#define _LIBCPP___CXX03___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>
@@ -251,4 +251,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 262b963f58f6b..4c6372c77bf3d 100644
--- a/libcxx/include/__cxx03/__algorithm/is_sorted.h
+++ b/libcxx/include/__cxx03/__algorithm/is_sorted.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_IS_SORTED_H
-#define _LIBCPP___CXX03___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>
@@ -34,4 +34,4 @@ _LIBCPP_NODISCARD inline _LIBCPP_HIDE_FROM_ABI bool is_sorted(_ForwardIterator _
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 9bd3998e1ed78..e97755da0f875 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___CXX03___ALGORITHM_IS_SORTED_UNTIL_H
-#define _LIBCPP___CXX03___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___CXX03___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 896a277c6af27..449fe94d6ed92 100644
--- a/libcxx/include/__cxx03/__algorithm/iter_swap.h
+++ b/libcxx/include/__cxx03/__algorithm/iter_swap.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_ITER_SWAP_H
-#define _LIBCPP___CXX03___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>
@@ -26,4 +26,4 @@ inline _LIBCPP_HIDE_FROM_ABI void iter_swap(_ForwardIterator1 __a, _ForwardItera
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 b824928ee8fd8..810ae911ad7c8 100644
--- a/libcxx/include/__cxx03/__algorithm/iterator_operations.h
+++ b/libcxx/include/__cxx03/__algorithm/iterator_operations.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_ITERATOR_OPERATIONS_H
-#define _LIBCPP___CXX03___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/__assert>
@@ -189,4 +189,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 0d991c99a3317..bee246db1b382 100644
--- a/libcxx/include/__cxx03/__algorithm/lexicographical_compare.h
+++ b/libcxx/include/__cxx03/__algorithm/lexicographical_compare.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_LEXICOGRAPHICAL_COMPARE_H
-#define _LIBCPP___CXX03___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 bool lexicographical_compare(
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___ALGORITHM_LEXICOGRAPHICAL_COMPARE_H
+#endif // _LIBCPP_CXX03_ALGORITHM_LEXICOGRAPHICAL_COMPARE_H
diff --git a/libcxx/include/__cxx03/__algorithm/lower_bound.h b/libcxx/include/__cxx03/__algorithm/lower_bound.h
index 47ae2550a6bbd..357bc68dc75aa 100644
--- a/libcxx/include/__cxx03/__algorithm/lower_bound.h
+++ b/libcxx/include/__cxx03/__algorithm/lower_bound.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_LOWER_BOUND_H
-#define _LIBCPP___CXX03___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___CXX03___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 faa7e9e185a5e..bf3ca258dc428 100644
--- a/libcxx/include/__cxx03/__algorithm/make_heap.h
+++ b/libcxx/include/__cxx03/__algorithm/make_heap.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_MAKE_HEAP_H
-#define _LIBCPP___CXX03___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>
@@ -56,4 +56,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 592f6d6a5d7e1..d43e7153d1bf8 100644
--- a/libcxx/include/__cxx03/__algorithm/make_projected.h
+++ b/libcxx/include/__cxx03/__algorithm/make_projected.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_MAKE_PROJECTED_H
-#define _LIBCPP___CXX03___ALGORITHM_MAKE_PROJECTED_H
+#ifndef _LIBCPP_CXX03_ALGORITHM_MAKE_PROJECTED_H
+#define _LIBCPP_CXX03_ALGORITHM_MAKE_PROJECTED_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__functional/identity.h>
@@ -71,4 +71,4 @@ _LIBCPP_HIDE_FROM_ABI _Pred& __make_projected(_Pred& __pred, _Proj&) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 0a2e435b6cdc1..3774880c8f25f 100644
--- a/libcxx/include/__cxx03/__algorithm/max.h
+++ b/libcxx/include/__cxx03/__algorithm/max.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_MAX_H
-#define _LIBCPP___CXX03___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>
@@ -39,4 +39,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 710df45d3a14d..f3f2c780267f5 100644
--- a/libcxx/include/__cxx03/__algorithm/max_element.h
+++ b/libcxx/include/__cxx03/__algorithm/max_element.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_MAX_ELEMENT_H
-#define _LIBCPP___CXX03___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___CXX03___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 b5a19a836554a..5da0112ab3f8b 100644
--- a/libcxx/include/__cxx03/__algorithm/merge.h
+++ b/libcxx/include/__cxx03/__algorithm/merge.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_MERGE_H
-#define _LIBCPP___CXX03___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___CXX03___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 f42e47b644c9a..6b052c9f41c66 100644
--- a/libcxx/include/__cxx03/__algorithm/min.h
+++ b/libcxx/include/__cxx03/__algorithm/min.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_MIN_H
-#define _LIBCPP___CXX03___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>
@@ -39,4 +39,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 41c04162a61f3..d5b633a7cb6b9 100644
--- a/libcxx/include/__cxx03/__algorithm/min_element.h
+++ b/libcxx/include/__cxx03/__algorithm/min_element.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_MIN_ELEMENT_H
-#define _LIBCPP___CXX03___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>
@@ -67,4 +67,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___ALGORITHM_MIN_ELEMENT_H
+#endif // _LIBCPP_CXX03_ALGORITHM_MIN_ELEMENT_H
diff --git a/libcxx/include/__cxx03/__algorithm/minmax.h b/libcxx/include/__cxx03/__algorithm/minmax.h
index ce19486ff58a7..d0e983e18e0bc 100644
--- a/libcxx/include/__cxx03/__algorithm/minmax.h
+++ b/libcxx/include/__cxx03/__algorithm/minmax.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_MINMAX_H
-#define _LIBCPP___CXX03___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>
@@ -36,4 +36,4 @@ minmax(_LIBCPP_LIFETIMEBOUND const _Tp& __a, _LIBCPP_LIFETIMEBOUND const _Tp& __
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 8451725769e49..002bf10cbeadd 100644
--- a/libcxx/include/__cxx03/__algorithm/minmax_element.h
+++ b/libcxx/include/__cxx03/__algorithm/minmax_element.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_MINMAX_ELEMENT_H
-#define _LIBCPP___CXX03___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>
@@ -96,4 +96,4 @@ minmax_element(_ForwardIterator __first, _ForwardIterator __last) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 3c57c1bab1d61..90a9f3e3389b9 100644
--- a/libcxx/include/__cxx03/__algorithm/mismatch.h
+++ b/libcxx/include/__cxx03/__algorithm/mismatch.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_MISMATCH_H
-#define _LIBCPP___CXX03___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>
@@ -168,4 +168,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 0c744bc0e91a4..ffc3c5e077dea 100644
--- a/libcxx/include/__cxx03/__algorithm/move.h
+++ b/libcxx/include/__cxx03/__algorithm/move.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_MOVE_H
-#define _LIBCPP___CXX03___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>
@@ -117,4 +117,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 61e29c5c396f1..98b804ee6ae57 100644
--- a/libcxx/include/__cxx03/__algorithm/move_backward.h
+++ b/libcxx/include/__cxx03/__algorithm/move_backward.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_MOVE_BACKWARD_H
-#define _LIBCPP___CXX03___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>
@@ -130,4 +130,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 12c6c51cb4dcb..7a21a69770669 100644
--- a/libcxx/include/__cxx03/__algorithm/next_permutation.h
+++ b/libcxx/include/__cxx03/__algorithm/next_permutation.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_NEXT_PERMUTATION_H
-#define _LIBCPP___CXX03___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>
@@ -71,4 +71,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 6672d5c0b2b11..a50506a5acd7c 100644
--- a/libcxx/include/__cxx03/__algorithm/none_of.h
+++ b/libcxx/include/__cxx03/__algorithm/none_of.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_NONE_OF_H
-#define _LIBCPP___CXX03___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___CXX03___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 e39540fc985f7..7d5c8dfb4682e 100644
--- a/libcxx/include/__cxx03/__algorithm/nth_element.h
+++ b/libcxx/include/__cxx03/__algorithm/nth_element.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_NTH_ELEMENT_H
-#define _LIBCPP___CXX03___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___CXX03___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 56cb9e0132be0..1a0109201450d 100644
--- a/libcxx/include/__cxx03/__algorithm/partial_sort.h
+++ b/libcxx/include/__cxx03/__algorithm/partial_sort.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_PARTIAL_SORT_H
-#define _LIBCPP___CXX03___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___CXX03___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 e0846dcaac10f..9a0d17e042791 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___CXX03___ALGORITHM_PARTIAL_SORT_COPY_H
-#define _LIBCPP___CXX03___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___CXX03___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 47fe62f9732a4..e7ce78f981132 100644
--- a/libcxx/include/__cxx03/__algorithm/partition.h
+++ b/libcxx/include/__cxx03/__algorithm/partition.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_PARTITION_H
-#define _LIBCPP___CXX03___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___CXX03___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 3781233493346..f6876a47c42ff 100644
--- a/libcxx/include/__cxx03/__algorithm/partition_copy.h
+++ b/libcxx/include/__cxx03/__algorithm/partition_copy.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_PARTITION_COPY_H
-#define _LIBCPP___CXX03___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 pair<_OutputIterator1, _OutputIterator2> partition_copy(
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 8dc6aea65b3c6..890e9fdef100b 100644
--- a/libcxx/include/__cxx03/__algorithm/partition_point.h
+++ b/libcxx/include/__cxx03/__algorithm/partition_point.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_PARTITION_POINT_H
-#define _LIBCPP___CXX03___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___CXX03___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 ed0d1f1cc56b4..c6e987e711ed5 100644
--- a/libcxx/include/__cxx03/__algorithm/pop_heap.h
+++ b/libcxx/include/__cxx03/__algorithm/pop_heap.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_POP_HEAP_H
-#define _LIBCPP___CXX03___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>
@@ -77,4 +77,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 a617377a7630e..6c127084eefe9 100644
--- a/libcxx/include/__cxx03/__algorithm/prev_permutation.h
+++ b/libcxx/include/__cxx03/__algorithm/prev_permutation.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_PREV_PERMUTATION_H
-#define _LIBCPP___CXX03___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>
@@ -71,4 +71,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___ALGORITHM_PREV_PERMUTATION_H
+#endif // _LIBCPP_CXX03_ALGORITHM_PREV_PERMUTATION_H
diff --git a/libcxx/include/__cxx03/__algorithm/push_heap.h b/libcxx/include/__cxx03/__algorithm/push_heap.h
index eb4dc36ba7691..b6a0f4145633a 100644
--- a/libcxx/include/__cxx03/__algorithm/push_heap.h
+++ b/libcxx/include/__cxx03/__algorithm/push_heap.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_PUSH_HEAP_H
-#define _LIBCPP___CXX03___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>
@@ -80,4 +80,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___ALGORITHM_PUSH_HEAP_H
+#endif // _LIBCPP_CXX03_ALGORITHM_PUSH_HEAP_H
diff --git a/libcxx/include/__cxx03/__algorithm/remove.h b/libcxx/include/__cxx03/__algorithm/remove.h
index c5dc7aaf8e433..bf41204af3521 100644
--- a/libcxx/include/__cxx03/__algorithm/remove.h
+++ b/libcxx/include/__cxx03/__algorithm/remove.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_REMOVE_H
-#define _LIBCPP___CXX03___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___CXX03___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 7360f53ff1c61..1c38e4dc6e2ff 100644
--- a/libcxx/include/__cxx03/__algorithm/remove_copy.h
+++ b/libcxx/include/__cxx03/__algorithm/remove_copy.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_REMOVE_COPY_H
-#define _LIBCPP___CXX03___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___CXX03___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 5993738414373..f1cfb9bfc1d48 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___CXX03___ALGORITHM_REMOVE_COPY_IF_H
-#define _LIBCPP___CXX03___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___CXX03___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 c740f4527ae65..71f56a9555d6c 100644
--- a/libcxx/include/__cxx03/__algorithm/remove_if.h
+++ b/libcxx/include/__cxx03/__algorithm/remove_if.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_REMOVE_IF_H
-#define _LIBCPP___CXX03___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___CXX03___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 975bc5f51c3c3..9e2e0dca79074 100644
--- a/libcxx/include/__cxx03/__algorithm/replace.h
+++ b/libcxx/include/__cxx03/__algorithm/replace.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_REPLACE_H
-#define _LIBCPP___CXX03___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___CXX03___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 6e786c3126b8e..5143b8773c580 100644
--- a/libcxx/include/__cxx03/__algorithm/replace_copy.h
+++ b/libcxx/include/__cxx03/__algorithm/replace_copy.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_REPLACE_COPY_H
-#define _LIBCPP___CXX03___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 _OutputIterator replace_copy(
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 43bbcc01fa49b..38b6e4ad443cb 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___CXX03___ALGORITHM_REPLACE_COPY_IF_H
-#define _LIBCPP___CXX03___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 _OutputIterator replace_copy_if(
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 5816b247f187e..b14e15e1b2f1e 100644
--- a/libcxx/include/__cxx03/__algorithm/replace_if.h
+++ b/libcxx/include/__cxx03/__algorithm/replace_if.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_REPLACE_IF_H
-#define _LIBCPP___CXX03___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___CXX03___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 d5298fcc9b1dd..00c0a9d4d537f 100644
--- a/libcxx/include/__cxx03/__algorithm/reverse.h
+++ b/libcxx/include/__cxx03/__algorithm/reverse.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_REVERSE_H
-#define _LIBCPP___CXX03___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>
@@ -58,4 +58,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 a667e8a8068e3..e854ba5944641 100644
--- a/libcxx/include/__cxx03/__algorithm/reverse_copy.h
+++ b/libcxx/include/__cxx03/__algorithm/reverse_copy.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_REVERSE_COPY_H
-#define _LIBCPP___CXX03___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___CXX03___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 8e5c10acf42e5..c84a93491b1ba 100644
--- a/libcxx/include/__cxx03/__algorithm/rotate.h
+++ b/libcxx/include/__cxx03/__algorithm/rotate.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_ROTATE_H
-#define _LIBCPP___CXX03___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>
@@ -193,4 +193,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 06e1fb44bc6d1..0a66d68921611 100644
--- a/libcxx/include/__cxx03/__algorithm/rotate_copy.h
+++ b/libcxx/include/__cxx03/__algorithm/rotate_copy.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_ROTATE_COPY_H
-#define _LIBCPP___CXX03___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___CXX03___ALGORITHM_ROTATE_COPY_H
+#endif // _LIBCPP_CXX03_ALGORITHM_ROTATE_COPY_H
diff --git a/libcxx/include/__cxx03/__algorithm/search.h b/libcxx/include/__cxx03/__algorithm/search.h
index f3691de5de68b..012140f8736ca 100644
--- a/libcxx/include/__cxx03/__algorithm/search.h
+++ b/libcxx/include/__cxx03/__algorithm/search.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_SEARCH_H
-#define _LIBCPP___CXX03___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>
@@ -179,4 +179,4 @@ search(_ForwardIterator1 __first1, _ForwardIterator1 __last1, _ForwardIterator2
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 98328c69d3a70..6ecec45fdfa75 100644
--- a/libcxx/include/__cxx03/__algorithm/search_n.h
+++ b/libcxx/include/__cxx03/__algorithm/search_n.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_SEARCH_N_H
-#define _LIBCPP___CXX03___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>
@@ -150,4 +150,4 @@ search_n(_ForwardIterator __first, _ForwardIterator __last, _Size __count, const
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 943b458de68c3..037c7b72eeb55 100644
--- a/libcxx/include/__cxx03/__algorithm/set_difference.h
+++ b/libcxx/include/__cxx03/__algorithm/set_difference.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_SET_DIFFERENCE_H
-#define _LIBCPP___CXX03___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>
@@ -74,4 +74,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 d892dadd2567a..c789c3dc65d98 100644
--- a/libcxx/include/__cxx03/__algorithm/set_intersection.h
+++ b/libcxx/include/__cxx03/__algorithm/set_intersection.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_SET_INTERSECTION_H
-#define _LIBCPP___CXX03___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>
@@ -208,4 +208,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 82a1c46d70f0d..acad0a6462433 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___CXX03___ALGORITHM_SET_SYMMETRIC_DIFFERENCE_H
-#define _LIBCPP___CXX03___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>
@@ -105,4 +105,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 3effd78aafd01..49a8a916a1f62 100644
--- a/libcxx/include/__cxx03/__algorithm/set_union.h
+++ b/libcxx/include/__cxx03/__algorithm/set_union.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_SET_UNION_H
-#define _LIBCPP___CXX03___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>
@@ -101,4 +101,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___ALGORITHM_SET_UNION_H
+#endif // _LIBCPP_CXX03_ALGORITHM_SET_UNION_H
diff --git a/libcxx/include/__cxx03/__algorithm/shuffle.h b/libcxx/include/__cxx03/__algorithm/shuffle.h
index fee7028ae22ac..75d8c17881752 100644
--- a/libcxx/include/__cxx03/__algorithm/shuffle.h
+++ b/libcxx/include/__cxx03/__algorithm/shuffle.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_SHUFFLE_H
-#define _LIBCPP___CXX03___ALGORITHM_SHUFFLE_H
+#ifndef _LIBCPP_CXX03_ALGORITHM_SHUFFLE_H
+#define _LIBCPP_CXX03_ALGORITHM_SHUFFLE_H
 
 #include <__cxx03/__algorithm/iterator_operations.h>
 #include <__cxx03/__config>
@@ -154,4 +154,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 d299b718944d3..1fc3be508efe0 100644
--- a/libcxx/include/__cxx03/__algorithm/sift_down.h
+++ b/libcxx/include/__cxx03/__algorithm/sift_down.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_SIFT_DOWN_H
-#define _LIBCPP___CXX03___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___CXX03___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 7b0e825afaa1f..14493c3c1755f 100644
--- a/libcxx/include/__cxx03/__algorithm/simd_utils.h
+++ b/libcxx/include/__cxx03/__algorithm/simd_utils.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_SIMD_UTILS_H
-#define _LIBCPP___CXX03___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/countl.h>
@@ -156,4 +156,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 41df4d9ff3830..aa2e7dd3aff3e 100644
--- a/libcxx/include/__cxx03/__algorithm/sort.h
+++ b/libcxx/include/__cxx03/__algorithm/sort.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_SORT_H
-#define _LIBCPP___CXX03___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>
@@ -986,4 +986,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 1a7cad158cd0d..bf828ccb283b6 100644
--- a/libcxx/include/__cxx03/__algorithm/sort_heap.h
+++ b/libcxx/include/__cxx03/__algorithm/sort_heap.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_SORT_HEAP_H
-#define _LIBCPP___CXX03___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>
@@ -59,4 +59,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 c8044987e247a..f2fe7159de998 100644
--- a/libcxx/include/__cxx03/__algorithm/stable_partition.h
+++ b/libcxx/include/__cxx03/__algorithm/stable_partition.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_STABLE_PARTITION_H
-#define _LIBCPP___CXX03___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___CXX03___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 e1f89f6341b9f..a05addb7528a3 100644
--- a/libcxx/include/__cxx03/__algorithm/stable_sort.h
+++ b/libcxx/include/__cxx03/__algorithm/stable_sort.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_STABLE_SORT_H
-#define _LIBCPP___CXX03___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___CXX03___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 d1f50c135231a..3d9df8b017b41 100644
--- a/libcxx/include/__cxx03/__algorithm/swap_ranges.h
+++ b/libcxx/include/__cxx03/__algorithm/swap_ranges.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_SWAP_RANGES_H
-#define _LIBCPP___CXX03___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___CXX03___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 7e978b8df3fae..2b06393859cb5 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___CXX03___ALGORITHM_THREE_WAY_COMP_REF_TYPE_H
-#define _LIBCPP___CXX03___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>
@@ -23,4 +23,4 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 abdf2cc72fecf..6cd189b05dda6 100644
--- a/libcxx/include/__cxx03/__algorithm/transform.h
+++ b/libcxx/include/__cxx03/__algorithm/transform.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_TRANSFORM_H
-#define _LIBCPP___CXX03___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 _OutputIterator transform(
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 ef789bf138f62..dd804a9a83623 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___CXX03___ALGORITHM_RANGES_UNIFORM_RANDOM_BIT_GENERATOR_ADAPTOR_H
-#define _LIBCPP___CXX03___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>
@@ -17,4 +17,4 @@
 #  pragma GCC system_header
 #endif
 
-#endif // _LIBCPP___CXX03___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 15980b93b4be3..4a191ee518af6 100644
--- a/libcxx/include/__cxx03/__algorithm/unique.h
+++ b/libcxx/include/__cxx03/__algorithm/unique.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_UNIQUE_H
-#define _LIBCPP___CXX03___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___CXX03___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 5bed5b5d09f54..26a56e7e9f40b 100644
--- a/libcxx/include/__cxx03/__algorithm/unique_copy.h
+++ b/libcxx/include/__cxx03/__algorithm/unique_copy.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_UNIQUE_COPY_H
-#define _LIBCPP___CXX03___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___CXX03___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 d8daa54710840..151bcc78a52b1 100644
--- a/libcxx/include/__cxx03/__algorithm/unwrap_iter.h
+++ b/libcxx/include/__cxx03/__algorithm/unwrap_iter.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_UNWRAP_ITER_H
-#define _LIBCPP___CXX03___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>
@@ -71,4 +71,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 1926676dd1708..cfcfd6aecc3ea 100644
--- a/libcxx/include/__cxx03/__algorithm/unwrap_range.h
+++ b/libcxx/include/__cxx03/__algorithm/unwrap_range.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_UNWRAP_RANGE_H
-#define _LIBCPP___CXX03___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/__config>
@@ -43,4 +43,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 6c7cc37934d91..26de23416d3a0 100644
--- a/libcxx/include/__cxx03/__algorithm/upper_bound.h
+++ b/libcxx/include/__cxx03/__algorithm/upper_bound.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ALGORITHM_UPPER_BOUND_H
-#define _LIBCPP___CXX03___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___CXX03___ALGORITHM_UPPER_BOUND_H
+#endif // _LIBCPP_CXX03_ALGORITHM_UPPER_BOUND_H
diff --git a/libcxx/include/__cxx03/__assert b/libcxx/include/__cxx03/__assert
index f6c4d8e4a5d09..92730c2fd1895 100644
--- a/libcxx/include/__cxx03/__assert
+++ b/libcxx/include/__cxx03/__assert
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ASSERT
-#define _LIBCPP___CXX03___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___CXX03___ASSERT
+#endif // _LIBCPP_CXX03_ASSERT
diff --git a/libcxx/include/__cxx03/__atomic/aliases.h b/libcxx/include/__cxx03/__atomic/aliases.h
index 4cb75ee8712fd..592957f075748 100644
--- a/libcxx/include/__cxx03/__atomic/aliases.h
+++ b/libcxx/include/__cxx03/__atomic/aliases.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ATOMIC_ALIASES_H
-#define _LIBCPP___CXX03___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>
@@ -82,4 +82,4 @@ using atomic_uintmax_t = atomic<uintmax_t>;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 f2e849318dce2..2558aa0422518 100644
--- a/libcxx/include/__cxx03/__atomic/atomic.h
+++ b/libcxx/include/__cxx03/__atomic/atomic.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ATOMIC_ATOMIC_H
-#define _LIBCPP___CXX03___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>
@@ -481,4 +481,4 @@ atomic_fetch_xor_explicit(atomic<_Tp>* __o, typename atomic<_Tp>::value_type __o
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 d79ef7d78c343..59e555e5c9dfa 100644
--- a/libcxx/include/__cxx03/__atomic/atomic_base.h
+++ b/libcxx/include/__cxx03/__atomic/atomic_base.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ATOMIC_ATOMIC_BASE_H
-#define _LIBCPP___CXX03___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>
@@ -214,4 +214,4 @@ struct __atomic_waitable_traits<__atomic_base<_Tp, _IsIntegral> > {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 316e014163da4..1ee13f618ac05 100644
--- a/libcxx/include/__cxx03/__atomic/atomic_flag.h
+++ b/libcxx/include/__cxx03/__atomic/atomic_flag.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ATOMIC_ATOMIC_FLAG_H
-#define _LIBCPP___CXX03___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>
@@ -181,4 +181,4 @@ atomic_flag_notify_all(atomic_flag* __o) _NOEXCEPT {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 16b275243aa6c..0e5738e61b66d 100644
--- a/libcxx/include/__cxx03/__atomic/atomic_init.h
+++ b/libcxx/include/__cxx03/__atomic/atomic_init.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ATOMIC_ATOMIC_INIT_H
-#define _LIBCPP___CXX03___ATOMIC_ATOMIC_INIT_H
+#ifndef _LIBCPP_CXX03_ATOMIC_ATOMIC_INIT_H
+#define _LIBCPP_CXX03_ATOMIC_ATOMIC_INIT_H
 
 #include <__cxx03/__config>
 
@@ -18,4 +18,4 @@
 #define ATOMIC_FLAG_INIT {false}
 #define ATOMIC_VAR_INIT(__v) {__v}
 
-#endif // _LIBCPP___CXX03___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 297d148babc83..e38ff8b70ea68 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___CXX03___ATOMIC_ATOMIC_LOCK_FREE_H
-#define _LIBCPP___CXX03___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___CXX03___ATOMIC_ATOMIC_LOCK_FREE_H
+#endif // _LIBCPP_CXX03_ATOMIC_ATOMIC_LOCK_FREE_H
diff --git a/libcxx/include/__cxx03/__atomic/atomic_sync.h b/libcxx/include/__cxx03/__atomic/atomic_sync.h
index ca029f0384058..ad120cbeaf49b 100644
--- a/libcxx/include/__cxx03/__atomic/atomic_sync.h
+++ b/libcxx/include/__cxx03/__atomic/atomic_sync.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ATOMIC_ATOMIC_SYNC_H
-#define _LIBCPP___CXX03___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___CXX03___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 5661efd4bad27..3bd0a57798828 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___CXX03___ATOMIC_CHECK_MEMORY_ORDER_H
-#define _LIBCPP___CXX03___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___CXX03___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 a97f0668da2fe..8acc7f102fa91 100644
--- a/libcxx/include/__cxx03/__atomic/contention_t.h
+++ b/libcxx/include/__cxx03/__atomic/contention_t.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ATOMIC_CONTENTION_T_H
-#define _LIBCPP___CXX03___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___CXX03___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 4ec516b4e8b7e..0c70decaef4a4 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___CXX03___ATOMIC_CXX_ATOMIC_IMPL_H
-#define _LIBCPP___CXX03___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>
@@ -495,4 +495,4 @@ struct __cxx_atomic_impl : public _Base {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 05eaa83f36406..c4c8777001e0f 100644
--- a/libcxx/include/__cxx03/__atomic/fence.h
+++ b/libcxx/include/__cxx03/__atomic/fence.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ATOMIC_FENCE_H
-#define _LIBCPP___CXX03___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___CXX03___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 45628ae53214b..c689f5cec742e 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___CXX03___ATOMIC_IS_ALWAYS_LOCK_FREE_H
-#define _LIBCPP___CXX03___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___CXX03___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 1e0dfc81e3c5c..d4d18fe6019b4 100644
--- a/libcxx/include/__cxx03/__atomic/kill_dependency.h
+++ b/libcxx/include/__cxx03/__atomic/kill_dependency.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ATOMIC_KILL_DEPENDENCY_H
-#define _LIBCPP___CXX03___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___CXX03___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 d610c8609e8a3..9e2ac0c9c9fac 100644
--- a/libcxx/include/__cxx03/__atomic/memory_order.h
+++ b/libcxx/include/__cxx03/__atomic/memory_order.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ATOMIC_MEMORY_ORDER_H
-#define _LIBCPP___CXX03___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>
@@ -37,4 +37,4 @@ enum memory_order {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 aa510c16691cb..7c0ec48ebf02a 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___CXX03___ATOMIC_TO_GCC_ORDER_H
-#define _LIBCPP___CXX03___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 int __to_gcc_failure_order(memory_order __order) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___ATOMIC_TO_GCC_ORDER_H
+#endif // _LIBCPP_CXX03_ATOMIC_TO_GCC_ORDER_H
diff --git a/libcxx/include/__cxx03/__bit/blsr.h b/libcxx/include/__cxx03/__bit/blsr.h
index b8027d9137190..7b2cbc4a086c1 100644
--- a/libcxx/include/__cxx03/__bit/blsr.h
+++ b/libcxx/include/__cxx03/__bit/blsr.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___BIT_BLSR_H
-#define _LIBCPP___CXX03___BIT_BLSR_H
+#ifndef _LIBCPP_CXX03_BIT_BLSR_H
+#define _LIBCPP_CXX03_BIT_BLSR_H
 
 #include <__cxx03/__config>
 
@@ -27,4 +27,4 @@ inline _LIBCPP_HIDE_FROM_ABI unsigned long long __libcpp_blsr(unsigned long long
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___BIT_BLSR_H
+#endif // _LIBCPP_CXX03_BIT_BLSR_H
diff --git a/libcxx/include/__cxx03/__bit/countl.h b/libcxx/include/__cxx03/__bit/countl.h
index 3f0161aef6a32..d643d560ede84 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___CXX03___BIT_COUNTL_H
-#define _LIBCPP___CXX03___BIT_COUNTL_H
+#ifndef _LIBCPP_CXX03_BIT_COUNTL_H
+#define _LIBCPP_CXX03_BIT_COUNTL_H
 
 #include <__cxx03/__bit/rotate.h>
 #include <__cxx03/__config>
@@ -93,4 +93,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 2f5b5591dc3f5..72597ded2f0a8 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___CXX03___BIT_COUNTR_H
-#define _LIBCPP___CXX03___BIT_COUNTR_H
+#ifndef _LIBCPP_CXX03_BIT_COUNTR_H
+#define _LIBCPP_CXX03_BIT_COUNTR_H
 
 #include <__cxx03/__bit/rotate.h>
 #include <__cxx03/__config>
@@ -64,4 +64,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___BIT_COUNTR_H
+#endif // _LIBCPP_CXX03_BIT_COUNTR_H
diff --git a/libcxx/include/__cxx03/__bit/invert_if.h b/libcxx/include/__cxx03/__bit/invert_if.h
index cc2815e5bbee7..2d44989b0109d 100644
--- a/libcxx/include/__cxx03/__bit/invert_if.h
+++ b/libcxx/include/__cxx03/__bit/invert_if.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___BIT_INVERT_IF_H
-#define _LIBCPP___CXX03___BIT_INVERT_IF_H
+#ifndef _LIBCPP_CXX03_BIT_INVERT_IF_H
+#define _LIBCPP_CXX03_BIT_INVERT_IF_H
 
 #include <__cxx03/__config>
 
@@ -26,4 +26,4 @@ _LIBCPP_HIDE_FROM_ABI _Tp __invert_if(_Tp __v) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 a61a92177c5b7..da87ca41800a4 100644
--- a/libcxx/include/__cxx03/__bit/popcount.h
+++ b/libcxx/include/__cxx03/__bit/popcount.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___BIT_POPCOUNT_H
-#define _LIBCPP___CXX03___BIT_POPCOUNT_H
+#ifndef _LIBCPP_CXX03_BIT_POPCOUNT_H
+#define _LIBCPP_CXX03_BIT_POPCOUNT_H
 
 #include <__cxx03/__bit/rotate.h>
 #include <__cxx03/__config>
@@ -31,4 +31,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 fbe121fe54a67..a473a830015d6 100644
--- a/libcxx/include/__cxx03/__bit/rotate.h
+++ b/libcxx/include/__cxx03/__bit/rotate.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___BIT_ROTATE_H
-#define _LIBCPP___CXX03___BIT_ROTATE_H
+#ifndef _LIBCPP_CXX03_BIT_ROTATE_H
+#define _LIBCPP_CXX03_BIT_ROTATE_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__type_traits/is_unsigned_integer.h>
@@ -54,4 +54,4 @@ _LIBCPP_HIDE_FROM_ABI _Tp __rotr(_Tp __x, int __s) _NOEXCEPT {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___BIT_ROTATE_H
+#endif // _LIBCPP_CXX03_BIT_ROTATE_H
diff --git a/libcxx/include/__cxx03/__bit_reference b/libcxx/include/__cxx03/__bit_reference
index ac0005ff00f13..c7668a3d45503 100644
--- a/libcxx/include/__cxx03/__bit_reference
+++ b/libcxx/include/__cxx03/__bit_reference
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___BIT_REFERENCE
-#define _LIBCPP___CXX03___BIT_REFERENCE
+#ifndef _LIBCPP_CXX03_BIT_REFERENCE
+#define _LIBCPP_CXX03_BIT_REFERENCE
 
 #include <__cxx03/__algorithm/copy_n.h>
 #include <__cxx03/__algorithm/fill_n.h>
@@ -962,4 +962,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___BIT_REFERENCE
+#endif // _LIBCPP_CXX03_BIT_REFERENCE
diff --git a/libcxx/include/__cxx03/__chrono/convert_to_timespec.h b/libcxx/include/__cxx03/__chrono/convert_to_timespec.h
index 24d77c21807eb..e1d57d4a3367d 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___CXX03___CHRONO_CONVERT_TO_TIMESPEC_H
-#define _LIBCPP___CXX03___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___CXX03___CHRONO_CONVERT_TO_TIMESPEC_H
+#endif // _LIBCPP_CXX03_CHRONO_CONVERT_TO_TIMESPEC_H
diff --git a/libcxx/include/__cxx03/__chrono/duration.h b/libcxx/include/__cxx03/__chrono/duration.h
index 3a96df7ee99f0..0bb3f760144a8 100644
--- a/libcxx/include/__cxx03/__chrono/duration.h
+++ b/libcxx/include/__cxx03/__chrono/duration.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___CHRONO_DURATION_H
-#define _LIBCPP___CXX03___CHRONO_DURATION_H
+#ifndef _LIBCPP_CXX03_CHRONO_DURATION_H
+#define _LIBCPP_CXX03_CHRONO_DURATION_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__type_traits/common_type.h>
@@ -415,4 +415,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03___CHRONO_DURATION_H
+#endif // _LIBCPP_CXX03_CHRONO_DURATION_H
diff --git a/libcxx/include/__cxx03/__chrono/high_resolution_clock.h b/libcxx/include/__cxx03/__chrono/high_resolution_clock.h
index 3371d16112f97..4c8ed760ff88c 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___CXX03___CHRONO_HIGH_RESOLUTION_CLOCK_H
-#define _LIBCPP___CXX03___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___CXX03___CHRONO_HIGH_RESOLUTION_CLOCK_H
+#endif // _LIBCPP_CXX03_CHRONO_HIGH_RESOLUTION_CLOCK_H
diff --git a/libcxx/include/__cxx03/__chrono/steady_clock.h b/libcxx/include/__cxx03/__chrono/steady_clock.h
index 5a8fa4f84ad48..d27fac348c9bc 100644
--- a/libcxx/include/__cxx03/__chrono/steady_clock.h
+++ b/libcxx/include/__cxx03/__chrono/steady_clock.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___CHRONO_STEADY_CLOCK_H
-#define _LIBCPP___CXX03___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___CXX03___CHRONO_STEADY_CLOCK_H
+#endif // _LIBCPP_CXX03_CHRONO_STEADY_CLOCK_H
diff --git a/libcxx/include/__cxx03/__chrono/system_clock.h b/libcxx/include/__cxx03/__chrono/system_clock.h
index 09d2d698ad9f2..f3f1e6d85e1b9 100644
--- a/libcxx/include/__cxx03/__chrono/system_clock.h
+++ b/libcxx/include/__cxx03/__chrono/system_clock.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___CHRONO_SYSTEM_CLOCK_H
-#define _LIBCPP___CXX03___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>
@@ -40,4 +40,4 @@ class _LIBCPP_EXPORTED_FROM_ABI system_clock {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 7f2a73af839ca..1f9d1b30b48d2 100644
--- a/libcxx/include/__cxx03/__chrono/time_point.h
+++ b/libcxx/include/__cxx03/__chrono/time_point.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___CHRONO_TIME_POINT_H
-#define _LIBCPP___CXX03___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/__config>
@@ -174,4 +174,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___CHRONO_TIME_POINT_H
+#endif // _LIBCPP_CXX03_CHRONO_TIME_POINT_H
diff --git a/libcxx/include/__cxx03/__condition_variable/condition_variable.h b/libcxx/include/__cxx03/__condition_variable/condition_variable.h
index af0325095fc9f..70d9f9e149588 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___CXX03___CONDITION_VARIABLE_CONDITION_VARIABLE_H
-#define _LIBCPP___CXX03___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___CXX03___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 d574eab8a12b1..433511b8dca4d 100644
--- a/libcxx/include/__cxx03/__config
+++ b/libcxx/include/__cxx03/__config
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___CONFIG
-#define _LIBCPP___CXX03___CONFIG
+#ifndef _LIBCPP_CXX03_CONFIG
+#define _LIBCPP_CXX03_CONFIG
 
 #include <__cxx03/__configuration/abi.h>
 #include <__cxx03/__configuration/availability.h>
@@ -1078,4 +1078,4 @@ typedef __char32_t char32_t;
 
 #endif // __cplusplus
 
-#endif // _LIBCPP___CXX03___CONFIG
+#endif // _LIBCPP_CXX03_CONFIG
diff --git a/libcxx/include/__cxx03/__config_site.in b/libcxx/include/__cxx03/__config_site.in
index 174af4be5c4e5..cb81b48bdc4fd 100644
--- a/libcxx/include/__cxx03/__config_site.in
+++ b/libcxx/include/__cxx03/__config_site.in
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___CONFIG_SITE
-#define _LIBCPP___CXX03___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___CXX03___CONFIG_SITE
+#endif // _LIBCPP_CXX03_CONFIG_SITE
diff --git a/libcxx/include/__cxx03/__configuration/abi.h b/libcxx/include/__cxx03/__configuration/abi.h
index 81dd5b1c59610..066320c0be0f9 100644
--- a/libcxx/include/__cxx03/__configuration/abi.h
+++ b/libcxx/include/__cxx03/__configuration/abi.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___CONFIGURATION_ABI_H
-#define _LIBCPP___CXX03___CONFIGURATION_ABI_H
+#ifndef _LIBCPP_CXX03_CONFIGURATION_ABI_H
+#define _LIBCPP_CXX03_CONFIGURATION_ABI_H
 
 #include <__cxx03/__configuration/compiler.h>
 #include <__cxx03/__configuration/config_site_shim.h>
@@ -169,4 +169,4 @@
 #  endif
 #endif
 
-#endif // _LIBCPP___CXX03___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 ad45ce01d0a7e..80fb8669cf1f2 100644
--- a/libcxx/include/__cxx03/__configuration/availability.h
+++ b/libcxx/include/__cxx03/__configuration/availability.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___CONFIGURATION_AVAILABILITY_H
-#define _LIBCPP___CXX03___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___CXX03___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 4d53a2144a501..6f3f35e6637e4 100644
--- a/libcxx/include/__cxx03/__configuration/compiler.h
+++ b/libcxx/include/__cxx03/__configuration/compiler.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___CONFIGURATION_COMPILER_H
-#define _LIBCPP___CXX03___CONFIGURATION_COMPILER_H
+#ifndef _LIBCPP_CXX03_CONFIGURATION_COMPILER_H
+#define _LIBCPP_CXX03_CONFIGURATION_COMPILER_H
 
 #include <__cxx03/__configuration/config_site_shim.h>
 
@@ -48,4 +48,4 @@
 
 #endif
 
-#endif // _LIBCPP___CXX03___CONFIGURATION_COMPILER_H
+#endif // _LIBCPP_CXX03_CONFIGURATION_COMPILER_H
diff --git a/libcxx/include/__cxx03/__configuration/config_site_shim.h b/libcxx/include/__cxx03/__configuration/config_site_shim.h
index 974a17af495cd..c8e3c2a61eb13 100644
--- a/libcxx/include/__cxx03/__configuration/config_site_shim.h
+++ b/libcxx/include/__cxx03/__configuration/config_site_shim.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___CONFIGURATION_CONFIG_SITE_SHIM_H
-#define _LIBCPP___CXX03___CONFIGURATION_CONFIG_SITE_SHIM_H
+#ifndef _LIBCPP_CXX03_CONFIGURATION_CONFIG_SITE_SHIM_H
+#define _LIBCPP_CXX03_CONFIGURATION_CONFIG_SITE_SHIM_H
 
 #include <__config_site>
 
@@ -77,4 +77,4 @@
 #  undef _LIBCPP_INSTRUMENTED_WITH_ASAN
 #endif
 
-#endif // _LIBCPP___CXX03___CONFIGURATION_CONFIG_SITE_SHIM_H
+#endif // _LIBCPP_CXX03_CONFIGURATION_CONFIG_SITE_SHIM_H
diff --git a/libcxx/include/__cxx03/__configuration/language.h b/libcxx/include/__cxx03/__configuration/language.h
index adc98a8dc9a1a..38e9e8667728c 100644
--- a/libcxx/include/__cxx03/__configuration/language.h
+++ b/libcxx/include/__cxx03/__configuration/language.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___CONFIGURATION_LANGUAGE_H
-#define _LIBCPP___CXX03___CONFIGURATION_LANGUAGE_H
+#ifndef _LIBCPP_CXX03_CONFIGURATION_LANGUAGE_H
+#define _LIBCPP_CXX03_CONFIGURATION_LANGUAGE_H
 
 #include <__cxx03/__configuration/config_site_shim.h>
 
@@ -24,4 +24,4 @@
 #  define _LIBCPP_HAS_NO_EXCEPTIONS
 #endif
 
-#endif // _LIBCPP___CXX03___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 24590503693ae..f6e8ae4fb47fe 100644
--- a/libcxx/include/__cxx03/__configuration/platform.h
+++ b/libcxx/include/__cxx03/__configuration/platform.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___CONFIGURATION_PLATFORM_H
-#define _LIBCPP___CXX03___CONFIGURATION_PLATFORM_H
+#ifndef _LIBCPP_CXX03_CONFIGURATION_PLATFORM_H
+#define _LIBCPP_CXX03_CONFIGURATION_PLATFORM_H
 
 #include <__cxx03/__configuration/config_site_shim.h>
 
@@ -51,4 +51,4 @@
 #  define _LIBCPP_BIG_ENDIAN
 #endif // __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
 
-#endif // _LIBCPP___CXX03___CONFIGURATION_PLATFORM_H
+#endif // _LIBCPP_CXX03_CONFIGURATION_PLATFORM_H
diff --git a/libcxx/include/__cxx03/__debug_utils/randomize_range.h b/libcxx/include/__cxx03/__debug_utils/randomize_range.h
index 577a6be495e88..01e56218aaaef 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___CXX03___LIBCXX_DEBUG_RANDOMIZE_RANGE_H
-#define _LIBCPP___CXX03___LIBCXX_DEBUG_RANDOMIZE_RANGE_H
+#ifndef _LIBCPP_CXX03_LIBCXX_DEBUG_RANDOMIZE_RANGE_H
+#define _LIBCPP_CXX03_LIBCXX_DEBUG_RANDOMIZE_RANGE_H
 
 #include <__cxx03/__config>
 
@@ -37,4 +37,4 @@ _LIBCPP_HIDE_FROM_ABI void __debug_randomize_range(_Iterator __first, _Sentinel
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 32c4399eb9b67..d01a34b51bd2f 100644
--- a/libcxx/include/__cxx03/__debug_utils/sanitizers.h
+++ b/libcxx/include/__cxx03/__debug_utils/sanitizers.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___LIBCXX_DEBUG_UTILS_SANITIZERS_H
-#define _LIBCPP___CXX03___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 void __annotate_contiguous_container(
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 98976524a8c01..1b4be570313cb 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___CXX03___LIBCXX_DEBUG_STRICT_WEAK_ORDERING_CHECK
-#define _LIBCPP___CXX03___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___CXX03___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 27b1e4353ec46..6d948f61650ba 100644
--- a/libcxx/include/__cxx03/__exception/exception.h
+++ b/libcxx/include/__cxx03/__exception/exception.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___EXCEPTION_EXCEPTION_H
-#define _LIBCPP___CXX03___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___CXX03___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 33dbd40bef42c..d9fea8c352313 100644
--- a/libcxx/include/__cxx03/__exception/exception_ptr.h
+++ b/libcxx/include/__cxx03/__exception/exception_ptr.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___EXCEPTION_EXCEPTION_PTR_H
-#define _LIBCPP___CXX03___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___CXX03___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 60799942fb136..37a7d4b55e8f3 100644
--- a/libcxx/include/__cxx03/__exception/nested_exception.h
+++ b/libcxx/include/__cxx03/__exception/nested_exception.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___EXCEPTION_NESTED_EXCEPTION_H
-#define _LIBCPP___CXX03___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___CXX03___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 da8abba56198e..78098a9fae545 100644
--- a/libcxx/include/__cxx03/__exception/operations.h
+++ b/libcxx/include/__cxx03/__exception/operations.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___EXCEPTION_OPERATIONS_H
-#define _LIBCPP___CXX03___EXCEPTION_OPERATIONS_H
+#ifndef _LIBCPP_CXX03_EXCEPTION_OPERATIONS_H
+#define _LIBCPP_CXX03_EXCEPTION_OPERATIONS_H
 
 #include <__cxx03/__config>
 #include <__cxx03/cstddef>
@@ -35,4 +35,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___CXX03___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 5f0cfa930f9af..d6cdf575cd5d1 100644
--- a/libcxx/include/__cxx03/__exception/terminate.h
+++ b/libcxx/include/__cxx03/__exception/terminate.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___EXCEPTION_TERMINATE_H
-#define _LIBCPP___CXX03___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___CXX03___EXCEPTION_TERMINATE_H
+#endif // _LIBCPP_CXX03_EXCEPTION_TERMINATE_H
diff --git a/libcxx/include/__cxx03/__functional/binary_function.h b/libcxx/include/__cxx03/__functional/binary_function.h
index 06613bdc1e907..d97b600d195be 100644
--- a/libcxx/include/__cxx03/__functional/binary_function.h
+++ b/libcxx/include/__cxx03/__functional/binary_function.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FUNCTIONAL_BINARY_FUNCTION_H
-#define _LIBCPP___CXX03___FUNCTIONAL_BINARY_FUNCTION_H
+#ifndef _LIBCPP_CXX03_FUNCTIONAL_BINARY_FUNCTION_H
+#define _LIBCPP_CXX03_FUNCTIONAL_BINARY_FUNCTION_H
 
 #include <__cxx03/__config>
 
@@ -40,4 +40,4 @@ _LIBCPP_DIAGNOSTIC_POP
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 f59506cf1fc32..42f8e6d78d90b 100644
--- a/libcxx/include/__cxx03/__functional/binary_negate.h
+++ b/libcxx/include/__cxx03/__functional/binary_negate.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FUNCTIONAL_BINARY_NEGATE_H
-#define _LIBCPP___CXX03___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>
@@ -42,4 +42,4 @@ inline _LIBCPP_HIDE_FROM_ABI binary_negate<_Predicate> not2(const _Predicate& __
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 17228448c6efb..76c97b37bd21b 100644
--- a/libcxx/include/__cxx03/__functional/bind.h
+++ b/libcxx/include/__cxx03/__functional/bind.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FUNCTIONAL_BIND_H
-#define _LIBCPP___CXX03___FUNCTIONAL_BIND_H
+#ifndef _LIBCPP_CXX03_FUNCTIONAL_BIND_H
+#define _LIBCPP_CXX03_FUNCTIONAL_BIND_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__functional/weak_result_type.h>
@@ -67,4 +67,4 @@ struct is_placeholder<placeholders::__ph<_Np> > : public integral_constant<int,
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___FUNCTIONAL_BIND_H
+#endif // _LIBCPP_CXX03_FUNCTIONAL_BIND_H
diff --git a/libcxx/include/__cxx03/__functional/binder1st.h b/libcxx/include/__cxx03/__functional/binder1st.h
index aacb02471c301..e4ae75fa4650f 100644
--- a/libcxx/include/__cxx03/__functional/binder1st.h
+++ b/libcxx/include/__cxx03/__functional/binder1st.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FUNCTIONAL_BINDER1ST_H
-#define _LIBCPP___CXX03___FUNCTIONAL_BINDER1ST_H
+#ifndef _LIBCPP_CXX03_FUNCTIONAL_BINDER1ST_H
+#define _LIBCPP_CXX03_FUNCTIONAL_BINDER1ST_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__functional/unary_function.h>
@@ -46,4 +46,4 @@ inline _LIBCPP_HIDE_FROM_ABI binder1st<_Operation> bind1st(const _Operation& __o
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 b45a1fe3cb288..b4e272d7f9b4f 100644
--- a/libcxx/include/__cxx03/__functional/binder2nd.h
+++ b/libcxx/include/__cxx03/__functional/binder2nd.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FUNCTIONAL_BINDER2ND_H
-#define _LIBCPP___CXX03___FUNCTIONAL_BINDER2ND_H
+#ifndef _LIBCPP_CXX03_FUNCTIONAL_BINDER2ND_H
+#define _LIBCPP_CXX03_FUNCTIONAL_BINDER2ND_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__functional/unary_function.h>
@@ -46,4 +46,4 @@ inline _LIBCPP_HIDE_FROM_ABI binder2nd<_Operation> bind2nd(const _Operation& __o
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___FUNCTIONAL_BINDER2ND_H
+#endif // _LIBCPP_CXX03_FUNCTIONAL_BINDER2ND_H
diff --git a/libcxx/include/__cxx03/__functional/hash.h b/libcxx/include/__cxx03/__functional/hash.h
index b2c3bee1c75bf..96f6590d25bd6 100644
--- a/libcxx/include/__cxx03/__functional/hash.h
+++ b/libcxx/include/__cxx03/__functional/hash.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FUNCTIONAL_HASH_H
-#define _LIBCPP___CXX03___FUNCTIONAL_HASH_H
+#ifndef _LIBCPP_CXX03_FUNCTIONAL_HASH_H
+#define _LIBCPP_CXX03_FUNCTIONAL_HASH_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__functional/unary_function.h>
@@ -506,4 +506,4 @@ struct _LIBCPP_TEMPLATE_VIS hash : public __enum_hash<_Tp> {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 b5b86830f54ac..571fafb969756 100644
--- a/libcxx/include/__cxx03/__functional/identity.h
+++ b/libcxx/include/__cxx03/__functional/identity.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FUNCTIONAL_IDENTITY_H
-#define _LIBCPP___CXX03___FUNCTIONAL_IDENTITY_H
+#ifndef _LIBCPP_CXX03_FUNCTIONAL_IDENTITY_H
+#define _LIBCPP_CXX03_FUNCTIONAL_IDENTITY_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__fwd/functional.h>
@@ -42,4 +42,4 @@ struct __is_identity<reference_wrapper<const __identity> > : true_type {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___FUNCTIONAL_IDENTITY_H
+#endif // _LIBCPP_CXX03_FUNCTIONAL_IDENTITY_H
diff --git a/libcxx/include/__cxx03/__functional/mem_fn.h b/libcxx/include/__cxx03/__functional/mem_fn.h
index fb9ffcf55c58d..0bb0ee23fa5c6 100644
--- a/libcxx/include/__cxx03/__functional/mem_fn.h
+++ b/libcxx/include/__cxx03/__functional/mem_fn.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FUNCTIONAL_MEM_FN_H
-#define _LIBCPP___CXX03___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>
@@ -48,4 +48,4 @@ inline _LIBCPP_HIDE_FROM_ABI __mem_fn<_Rp _Tp::*> mem_fn(_Rp _Tp::* __pm) _NOEXC
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 81497e96afde4..2b04410fb37c6 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___CXX03___FUNCTIONAL_MEM_FUN_REF_H
-#define _LIBCPP___CXX03___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>
@@ -134,4 +134,4 @@ inline _LIBCPP_HIDE_FROM_ABI const_mem_fun1_ref_t<_Sp, _Tp, _Ap> mem_fun_ref(_Sp
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___FUNCTIONAL_MEM_FUN_REF_H
+#endif // _LIBCPP_CXX03_FUNCTIONAL_MEM_FUN_REF_H
diff --git a/libcxx/include/__cxx03/__functional/operations.h b/libcxx/include/__cxx03/__functional/operations.h
index 43bfbddc41cce..294f0f7c2c709 100644
--- a/libcxx/include/__cxx03/__functional/operations.h
+++ b/libcxx/include/__cxx03/__functional/operations.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FUNCTIONAL_OPERATIONS_H
-#define _LIBCPP___CXX03___FUNCTIONAL_OPERATIONS_H
+#ifndef _LIBCPP_CXX03_FUNCTIONAL_OPERATIONS_H
+#define _LIBCPP_CXX03_FUNCTIONAL_OPERATIONS_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__functional/binary_function.h>
@@ -178,4 +178,4 @@ _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(logical_or);
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___FUNCTIONAL_OPERATIONS_H
+#endif // _LIBCPP_CXX03_FUNCTIONAL_OPERATIONS_H
diff --git a/libcxx/include/__cxx03/__functional/pointer_to_binary_function.h b/libcxx/include/__cxx03/__functional/pointer_to_binary_function.h
index 3fe2f4cbc62da..3ad3a6b88179a 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___CXX03___FUNCTIONAL_POINTER_TO_BINARY_FUNCTION_H
-#define _LIBCPP___CXX03___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>
@@ -35,4 +35,4 @@ inline _LIBCPP_HIDE_FROM_ABI pointer_to_binary_function<_Arg1, _Arg2, _Result> p
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 cf429b922cc94..5bda35662d02f 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___CXX03___FUNCTIONAL_POINTER_TO_UNARY_FUNCTION_H
-#define _LIBCPP___CXX03___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>
@@ -35,4 +35,4 @@ inline _LIBCPP_HIDE_FROM_ABI pointer_to_unary_function<_Arg, _Result> ptr_fun(_R
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___FUNCTIONAL_POINTER_TO_UNARY_FUNCTION_H
+#endif // _LIBCPP_CXX03_FUNCTIONAL_POINTER_TO_UNARY_FUNCTION_H
diff --git a/libcxx/include/__cxx03/__functional/reference_wrapper.h b/libcxx/include/__cxx03/__functional/reference_wrapper.h
index bbe8544531a8d..f40ffbafd4ed5 100644
--- a/libcxx/include/__cxx03/__functional/reference_wrapper.h
+++ b/libcxx/include/__cxx03/__functional/reference_wrapper.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FUNCTIONAL_REFERENCE_WRAPPER_H
-#define _LIBCPP___CXX03___FUNCTIONAL_REFERENCE_WRAPPER_H
+#ifndef _LIBCPP_CXX03_FUNCTIONAL_REFERENCE_WRAPPER_H
+#define _LIBCPP_CXX03_FUNCTIONAL_REFERENCE_WRAPPER_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__functional/weak_result_type.h>
@@ -86,4 +86,4 @@ void cref(const _Tp&&) = delete;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 72193c865b589..dd51179450f0a 100644
--- a/libcxx/include/__cxx03/__functional/unary_function.h
+++ b/libcxx/include/__cxx03/__functional/unary_function.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FUNCTIONAL_UNARY_FUNCTION_H
-#define _LIBCPP___CXX03___FUNCTIONAL_UNARY_FUNCTION_H
+#ifndef _LIBCPP_CXX03_FUNCTIONAL_UNARY_FUNCTION_H
+#define _LIBCPP_CXX03_FUNCTIONAL_UNARY_FUNCTION_H
 
 #include <__cxx03/__config>
 
@@ -37,4 +37,4 @@ _LIBCPP_DIAGNOSTIC_POP
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 3591b8ee0d5a3..e6d1647606450 100644
--- a/libcxx/include/__cxx03/__functional/unary_negate.h
+++ b/libcxx/include/__cxx03/__functional/unary_negate.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FUNCTIONAL_UNARY_NEGATE_H
-#define _LIBCPP___CXX03___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>
@@ -35,4 +35,4 @@ inline _LIBCPP_HIDE_FROM_ABI unary_negate<_Predicate> not1(const _Predicate& __p
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 e8c2c4de9900a..9e3046eebe542 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___CXX03___FUNCTIONAL_WEAK_RESULT_TYPE_H
-#define _LIBCPP___CXX03___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>
@@ -206,4 +206,4 @@ struct __invoke_return {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 101faf876333e..e794af21e43a9 100644
--- a/libcxx/include/__cxx03/__fwd/array.h
+++ b/libcxx/include/__cxx03/__fwd/array.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FWD_ARRAY_H
-#define _LIBCPP___CXX03___FWD_ARRAY_H
+#ifndef _LIBCPP_CXX03_FWD_ARRAY_H
+#define _LIBCPP_CXX03_FWD_ARRAY_H
 
 #include <__cxx03/__config>
 #include <__cxx03/cstddef>
@@ -35,4 +35,4 @@ struct __is_std_array<array<_Tp, _Size> > : true_type {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 e04a47ff97a61..f00569f93d307 100644
--- a/libcxx/include/__cxx03/__fwd/bit_reference.h
+++ b/libcxx/include/__cxx03/__fwd/bit_reference.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FWD_BIT_REFERENCE_H
-#define _LIBCPP___CXX03___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___CXX03___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 0959f941affb7..a1cba5ffa9c7b 100644
--- a/libcxx/include/__cxx03/__fwd/complex.h
+++ b/libcxx/include/__cxx03/__fwd/complex.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FWD_COMPLEX_H
-#define _LIBCPP___CXX03___FWD_COMPLEX_H
+#ifndef _LIBCPP_CXX03_FWD_COMPLEX_H
+#define _LIBCPP_CXX03_FWD_COMPLEX_H
 
 #include <__cxx03/__config>
 #include <__cxx03/cstddef>
@@ -23,4 +23,4 @@ class _LIBCPP_TEMPLATE_VIS complex;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 7d1c6f79d0d77..f69f8e5876629 100644
--- a/libcxx/include/__cxx03/__fwd/deque.h
+++ b/libcxx/include/__cxx03/__fwd/deque.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FWD_DEQUE_H
-#define _LIBCPP___CXX03___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___CXX03___FWD_DEQUE_H
+#endif // _LIBCPP_CXX03_FWD_DEQUE_H
diff --git a/libcxx/include/__cxx03/__fwd/fstream.h b/libcxx/include/__cxx03/__fwd/fstream.h
index 8cc5d2b9efd4e..cf583e1df8105 100644
--- a/libcxx/include/__cxx03/__fwd/fstream.h
+++ b/libcxx/include/__cxx03/__fwd/fstream.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FWD_FSTREAM_H
-#define _LIBCPP___CXX03___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___CXX03___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 924874ca70050..ed5302e8e81a2 100644
--- a/libcxx/include/__cxx03/__fwd/functional.h
+++ b/libcxx/include/__cxx03/__fwd/functional.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FWD_FUNCTIONAL_H
-#define _LIBCPP___CXX03___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___CXX03___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 dc03e8c6bab2f..6cc4f790fd9cc 100644
--- a/libcxx/include/__cxx03/__fwd/ios.h
+++ b/libcxx/include/__cxx03/__fwd/ios.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FWD_IOS_H
-#define _LIBCPP___CXX03___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___CXX03___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 f3edc7859c642..c24d00b09f7b0 100644
--- a/libcxx/include/__cxx03/__fwd/istream.h
+++ b/libcxx/include/__cxx03/__fwd/istream.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FWD_ISTREAM_H
-#define _LIBCPP___CXX03___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___CXX03___FWD_ISTREAM_H
+#endif // _LIBCPP_CXX03_FWD_ISTREAM_H
diff --git a/libcxx/include/__cxx03/__fwd/memory.h b/libcxx/include/__cxx03/__fwd/memory.h
index df76b1747c20a..42faabf5c1a7e 100644
--- a/libcxx/include/__cxx03/__fwd/memory.h
+++ b/libcxx/include/__cxx03/__fwd/memory.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FWD_MEMORY_H
-#define _LIBCPP___CXX03___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___CXX03___FWD_MEMORY_H
+#endif // _LIBCPP_CXX03_FWD_MEMORY_H
diff --git a/libcxx/include/__cxx03/__fwd/ostream.h b/libcxx/include/__cxx03/__fwd/ostream.h
index b5061e6d3bc6d..1172296ff3114 100644
--- a/libcxx/include/__cxx03/__fwd/ostream.h
+++ b/libcxx/include/__cxx03/__fwd/ostream.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FWD_OSTREAM_H
-#define _LIBCPP___CXX03___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___CXX03___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 be2c8623f89e5..cba204d7c7ad5 100644
--- a/libcxx/include/__cxx03/__fwd/pair.h
+++ b/libcxx/include/__cxx03/__fwd/pair.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FWD_PAIR_H
-#define _LIBCPP___CXX03___FWD_PAIR_H
+#ifndef _LIBCPP_CXX03_FWD_PAIR_H
+#define _LIBCPP_CXX03_FWD_PAIR_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__fwd/tuple.h>
@@ -30,4 +30,4 @@ _LIBCPP_HIDE_FROM_ABI const typename tuple_element<_Ip, pair<_T1, _T2> >::type&
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 c2f68089d0e33..1eb6f5999d932 100644
--- a/libcxx/include/__cxx03/__fwd/queue.h
+++ b/libcxx/include/__cxx03/__fwd/queue.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FWD_QUEUE_H
-#define _LIBCPP___CXX03___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___CXX03___FWD_QUEUE_H
+#endif // _LIBCPP_CXX03_FWD_QUEUE_H
diff --git a/libcxx/include/__cxx03/__fwd/sstream.h b/libcxx/include/__cxx03/__fwd/sstream.h
index 32ae42cd7b020..8c3e67b071a9a 100644
--- a/libcxx/include/__cxx03/__fwd/sstream.h
+++ b/libcxx/include/__cxx03/__fwd/sstream.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FWD_SSTREAM_H
-#define _LIBCPP___CXX03___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___CXX03___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 715356e91b411..115fe34cf3999 100644
--- a/libcxx/include/__cxx03/__fwd/stack.h
+++ b/libcxx/include/__cxx03/__fwd/stack.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FWD_STACK_H
-#define _LIBCPP___CXX03___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___CXX03___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 d22be50ce8ad1..fb4bcb684dbc2 100644
--- a/libcxx/include/__cxx03/__fwd/streambuf.h
+++ b/libcxx/include/__cxx03/__fwd/streambuf.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FWD_STREAMBUF_H
-#define _LIBCPP___CXX03___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___CXX03___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 c0da201f2cc38..6d43041fd68e5 100644
--- a/libcxx/include/__cxx03/__fwd/string.h
+++ b/libcxx/include/__cxx03/__fwd/string.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FWD_STRING_H
-#define _LIBCPP___CXX03___FWD_STRING_H
+#ifndef _LIBCPP_CXX03_FWD_STRING_H
+#define _LIBCPP_CXX03_FWD_STRING_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__fwd/memory.h>
@@ -70,4 +70,4 @@ class _LIBCPP_PREFERRED_NAME(string)
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 76c608b46b1c6..05d0bc8393149 100644
--- a/libcxx/include/__cxx03/__fwd/string_view.h
+++ b/libcxx/include/__cxx03/__fwd/string_view.h
@@ -7,8 +7,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FWD_STRING_VIEW_H
-#define _LIBCPP___CXX03___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___CXX03___FWD_STRING_VIEW_H
+#endif // _LIBCPP_CXX03_FWD_STRING_VIEW_H
diff --git a/libcxx/include/__cxx03/__fwd/tuple.h b/libcxx/include/__cxx03/__fwd/tuple.h
index 55b46eeb18930..ca0c5be350cd8 100644
--- a/libcxx/include/__cxx03/__fwd/tuple.h
+++ b/libcxx/include/__cxx03/__fwd/tuple.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FWD_TUPLE_H
-#define _LIBCPP___CXX03___FWD_TUPLE_H
+#ifndef _LIBCPP_CXX03_FWD_TUPLE_H
+#define _LIBCPP_CXX03_FWD_TUPLE_H
 
 #include <__cxx03/__config>
 #include <__cxx03/cstddef>
@@ -23,4 +23,4 @@ struct _LIBCPP_TEMPLATE_VIS tuple_element;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 4133173d765c4..2356401324b7e 100644
--- a/libcxx/include/__cxx03/__fwd/vector.h
+++ b/libcxx/include/__cxx03/__fwd/vector.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___FWD_VECTOR_H
-#define _LIBCPP___CXX03___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___CXX03___FWD_VECTOR_H
+#endif // _LIBCPP_CXX03_FWD_VECTOR_H
diff --git a/libcxx/include/__cxx03/__hash_table b/libcxx/include/__cxx03/__hash_table
index 30c0fbf4049da..41b3c0ddfa0fb 100644
--- a/libcxx/include/__cxx03/__hash_table
+++ b/libcxx/include/__cxx03/__hash_table
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___HASH_TABLE
-#define _LIBCPP___CXX03___HASH_TABLE
+#ifndef _LIBCPP_CXX03_HASH_TABLE
+#define _LIBCPP_CXX03_HASH_TABLE
 
 #include <__cxx03/__algorithm/max.h>
 #include <__cxx03/__algorithm/min.h>
@@ -1839,4 +1839,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___HASH_TABLE
+#endif // _LIBCPP_CXX03_HASH_TABLE
diff --git a/libcxx/include/__cxx03/__ios/fpos.h b/libcxx/include/__cxx03/__ios/fpos.h
index 5f16bfd4caec9..73e572669c1df 100644
--- a/libcxx/include/__cxx03/__ios/fpos.h
+++ b/libcxx/include/__cxx03/__ios/fpos.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___IOS_FPOS_H
-#define _LIBCPP___CXX03___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___CXX03___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 52220a1f04121..16a45ccaa652c 100644
--- a/libcxx/include/__cxx03/__iterator/access.h
+++ b/libcxx/include/__cxx03/__iterator/access.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ITERATOR_ACCESS_H
-#define _LIBCPP___CXX03___ITERATOR_ACCESS_H
+#ifndef _LIBCPP_CXX03_ITERATOR_ACCESS_H
+#define _LIBCPP_CXX03_ITERATOR_ACCESS_H
 
 #include <__cxx03/__config>
 #include <__cxx03/cstddef>
@@ -51,4 +51,4 @@ _LIBCPP_HIDE_FROM_ABI typename _Cp::const_iterator end(const _Cp& __c) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 d49556a17cc34..550103245ec74 100644
--- a/libcxx/include/__cxx03/__iterator/advance.h
+++ b/libcxx/include/__cxx03/__iterator/advance.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ITERATOR_ADVANCE_H
-#define _LIBCPP___CXX03___ITERATOR_ADVANCE_H
+#ifndef _LIBCPP_CXX03_ITERATOR_ADVANCE_H
+#define _LIBCPP_CXX03_ITERATOR_ADVANCE_H
 
 #include <__cxx03/__assert>
 #include <__cxx03/__config>
@@ -71,4 +71,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 93da1d28ef094..bf9295fa34e1e 100644
--- a/libcxx/include/__cxx03/__iterator/aliasing_iterator.h
+++ b/libcxx/include/__cxx03/__iterator/aliasing_iterator.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ITERATOR_ALIASING_ITERATOR_H
-#define _LIBCPP___CXX03___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___CXX03___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 e9390a6aa2598..91414a34ee764 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___CXX03___ITERATOR_BACK_INSERT_ITERATOR_H
-#define _LIBCPP___CXX03___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>
@@ -64,4 +64,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 83296a4cf20b4..d4703e286df6a 100644
--- a/libcxx/include/__cxx03/__iterator/bounded_iter.h
+++ b/libcxx/include/__cxx03/__iterator/bounded_iter.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ITERATOR_BOUNDED_ITER_H
-#define _LIBCPP___CXX03___ITERATOR_BOUNDED_ITER_H
+#ifndef _LIBCPP_CXX03_ITERATOR_BOUNDED_ITER_H
+#define _LIBCPP_CXX03_ITERATOR_BOUNDED_ITER_H
 
 #include <__cxx03/__assert>
 #include <__cxx03/__config>
@@ -244,4 +244,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___ITERATOR_BOUNDED_ITER_H
+#endif // _LIBCPP_CXX03_ITERATOR_BOUNDED_ITER_H
diff --git a/libcxx/include/__cxx03/__iterator/cpp17_iterator_concepts.h b/libcxx/include/__cxx03/__iterator/cpp17_iterator_concepts.h
index ff6c76a359032..b654283dc9e44 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___CXX03___ITERATOR_CPP17_ITERATOR_CONCEPTS_H
-#define _LIBCPP___CXX03___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>
@@ -38,4 +38,4 @@ _LIBCPP_PUSH_MACROS
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___ITERATOR_CPP17_ITERATOR_CONCEPTS_H
+#endif // _LIBCPP_CXX03_ITERATOR_CPP17_ITERATOR_CONCEPTS_H
diff --git a/libcxx/include/__cxx03/__iterator/distance.h b/libcxx/include/__cxx03/__iterator/distance.h
index 656b9606a84dc..c1866348f1038 100644
--- a/libcxx/include/__cxx03/__iterator/distance.h
+++ b/libcxx/include/__cxx03/__iterator/distance.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ITERATOR_DISTANCE_H
-#define _LIBCPP___CXX03___ITERATOR_DISTANCE_H
+#ifndef _LIBCPP_CXX03_ITERATOR_DISTANCE_H
+#define _LIBCPP_CXX03_ITERATOR_DISTANCE_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__iterator/iterator_traits.h>
@@ -44,4 +44,4 @@ distance(_InputIter __first, _InputIter __last) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___ITERATOR_DISTANCE_H
+#endif // _LIBCPP_CXX03_ITERATOR_DISTANCE_H
diff --git a/libcxx/include/__cxx03/__iterator/erase_if_container.h b/libcxx/include/__cxx03/__iterator/erase_if_container.h
index c83eccd133d1f..dfe30d8c3440d 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___CXX03___ITERATOR_ERASE_IF_CONTAINER_H
-#define _LIBCPP___CXX03___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___CXX03___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 347858f062060..e844f17910962 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___CXX03___ITERATOR_FRONT_INSERT_ITERATOR_H
-#define _LIBCPP___CXX03___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>
@@ -62,4 +62,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___ITERATOR_FRONT_INSERT_ITERATOR_H
+#endif // _LIBCPP_CXX03_ITERATOR_FRONT_INSERT_ITERATOR_H
diff --git a/libcxx/include/__cxx03/__iterator/insert_iterator.h b/libcxx/include/__cxx03/__iterator/insert_iterator.h
index afb1f98b7be1a..2968cd407def4 100644
--- a/libcxx/include/__cxx03/__iterator/insert_iterator.h
+++ b/libcxx/include/__cxx03/__iterator/insert_iterator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ITERATOR_INSERT_ITERATOR_H
-#define _LIBCPP___CXX03___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>
@@ -68,4 +68,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 fb77c6718009f..2bdb3247cdd7f 100644
--- a/libcxx/include/__cxx03/__iterator/istream_iterator.h
+++ b/libcxx/include/__cxx03/__iterator/istream_iterator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ITERATOR_ISTREAM_ITERATOR_H
-#define _LIBCPP___CXX03___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>
@@ -83,4 +83,4 @@ inline _LIBCPP_HIDE_FROM_ABI bool operator!=(const istream_iterator<_Tp, _CharT,
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 37c81bbc5c091..1cd3e8f040620 100644
--- a/libcxx/include/__cxx03/__iterator/istreambuf_iterator.h
+++ b/libcxx/include/__cxx03/__iterator/istreambuf_iterator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ITERATOR_ISTREAMBUF_ITERATOR_H
-#define _LIBCPP___CXX03___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>
@@ -91,4 +91,4 @@ operator!=(const istreambuf_iterator<_CharT, _Traits>& __a, const istreambuf_ite
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___ITERATOR_ISTREAMBUF_ITERATOR_H
+#endif // _LIBCPP_CXX03_ITERATOR_ISTREAMBUF_ITERATOR_H
diff --git a/libcxx/include/__cxx03/__iterator/iterator.h b/libcxx/include/__cxx03/__iterator/iterator.h
index 8fbe9739c61ea..3e4e5320682a2 100644
--- a/libcxx/include/__cxx03/__iterator/iterator.h
+++ b/libcxx/include/__cxx03/__iterator/iterator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ITERATOR_ITERATOR_H
-#define _LIBCPP___CXX03___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 iterator {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 9b279115e3468..2ec599e6b8863 100644
--- a/libcxx/include/__cxx03/__iterator/iterator_traits.h
+++ b/libcxx/include/__cxx03/__iterator/iterator_traits.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ITERATOR_ITERATOR_TRAITS_H
-#define _LIBCPP___CXX03___ITERATOR_ITERATOR_TRAITS_H
+#ifndef _LIBCPP_CXX03_ITERATOR_ITERATOR_TRAITS_H
+#define _LIBCPP_CXX03_ITERATOR_ITERATOR_TRAITS_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__fwd/pair.h>
@@ -243,4 +243,4 @@ using __iter_reference = typename iterator_traits<_Iter>::reference;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___ITERATOR_ITERATOR_TRAITS_H
+#endif // _LIBCPP_CXX03_ITERATOR_ITERATOR_TRAITS_H
diff --git a/libcxx/include/__cxx03/__iterator/move_iterator.h b/libcxx/include/__cxx03/__iterator/move_iterator.h
index c778bb3bb9e17..4c22dfc2ac7d4 100644
--- a/libcxx/include/__cxx03/__iterator/move_iterator.h
+++ b/libcxx/include/__cxx03/__iterator/move_iterator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ITERATOR_MOVE_ITERATOR_H
-#define _LIBCPP___CXX03___ITERATOR_MOVE_ITERATOR_H
+#ifndef _LIBCPP_CXX03_ITERATOR_MOVE_ITERATOR_H
+#define _LIBCPP_CXX03_ITERATOR_MOVE_ITERATOR_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__iterator/iterator_traits.h>
@@ -163,4 +163,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___ITERATOR_MOVE_ITERATOR_H
+#endif // _LIBCPP_CXX03_ITERATOR_MOVE_ITERATOR_H
diff --git a/libcxx/include/__cxx03/__iterator/next.h b/libcxx/include/__cxx03/__iterator/next.h
index 16ebaed172d11..9af6838b46470 100644
--- a/libcxx/include/__cxx03/__iterator/next.h
+++ b/libcxx/include/__cxx03/__iterator/next.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ITERATOR_NEXT_H
-#define _LIBCPP___CXX03___ITERATOR_NEXT_H
+#ifndef _LIBCPP_CXX03_ITERATOR_NEXT_H
+#define _LIBCPP_CXX03_ITERATOR_NEXT_H
 
 #include <__cxx03/__assert>
 #include <__cxx03/__config>
@@ -36,4 +36,4 @@ next(_InputIter __x, typename iterator_traits<_InputIter>::difference_type __n =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 3e00ce2e69f26..f662056acf7ce 100644
--- a/libcxx/include/__cxx03/__iterator/ostream_iterator.h
+++ b/libcxx/include/__cxx03/__iterator/ostream_iterator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ITERATOR_OSTREAM_ITERATOR_H
-#define _LIBCPP___CXX03___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>
@@ -64,4 +64,4 @@ class _LIBCPP_TEMPLATE_VIS ostream_iterator : public iterator<output_iterator_ta
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 27c8152a5400d..c299078728b8e 100644
--- a/libcxx/include/__cxx03/__iterator/ostreambuf_iterator.h
+++ b/libcxx/include/__cxx03/__iterator/ostreambuf_iterator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ITERATOR_OSTREAMBUF_ITERATOR_H
-#define _LIBCPP___CXX03___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>
@@ -61,4 +61,4 @@ class _LIBCPP_TEMPLATE_VIS ostreambuf_iterator : public iterator<output_iterator
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___ITERATOR_OSTREAMBUF_ITERATOR_H
+#endif // _LIBCPP_CXX03_ITERATOR_OSTREAMBUF_ITERATOR_H
diff --git a/libcxx/include/__cxx03/__iterator/prev.h b/libcxx/include/__cxx03/__iterator/prev.h
index 32f6e66dac9a5..7c4271cc549cc 100644
--- a/libcxx/include/__cxx03/__iterator/prev.h
+++ b/libcxx/include/__cxx03/__iterator/prev.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ITERATOR_PREV_H
-#define _LIBCPP___CXX03___ITERATOR_PREV_H
+#ifndef _LIBCPP_CXX03_ITERATOR_PREV_H
+#define _LIBCPP_CXX03_ITERATOR_PREV_H
 
 #include <__cxx03/__assert>
 #include <__cxx03/__config>
@@ -51,4 +51,4 @@ _LIBCPP_POP_MACROS
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___ITERATOR_PREV_H
+#endif // _LIBCPP_CXX03_ITERATOR_PREV_H
diff --git a/libcxx/include/__cxx03/__iterator/reverse_iterator.h b/libcxx/include/__cxx03/__iterator/reverse_iterator.h
index b06dad13ea789..217ec3da4ba34 100644
--- a/libcxx/include/__cxx03/__iterator/reverse_iterator.h
+++ b/libcxx/include/__cxx03/__iterator/reverse_iterator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ITERATOR_REVERSE_ITERATOR_H
-#define _LIBCPP___CXX03___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/__config>
@@ -200,4 +200,4 @@ struct __unwrap_iter_impl<reverse_iterator<reverse_iterator<_Iter> >, __b> {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 7e353d620dc83..08c1c5e008b05 100644
--- a/libcxx/include/__cxx03/__iterator/segmented_iterator.h
+++ b/libcxx/include/__cxx03/__iterator/segmented_iterator.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___SEGMENTED_ITERATOR_H
-#define _LIBCPP___CXX03___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___CXX03___SEGMENTED_ITERATOR_H
+#endif // _LIBCPP_CXX03_SEGMENTED_ITERATOR_H
diff --git a/libcxx/include/__cxx03/__iterator/wrap_iter.h b/libcxx/include/__cxx03/__iterator/wrap_iter.h
index 22c9e2dfb5f5a..6bb53f3161c4e 100644
--- a/libcxx/include/__cxx03/__iterator/wrap_iter.h
+++ b/libcxx/include/__cxx03/__iterator/wrap_iter.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ITERATOR_WRAP_ITER_H
-#define _LIBCPP___CXX03___ITERATOR_WRAP_ITER_H
+#ifndef _LIBCPP_CXX03_ITERATOR_WRAP_ITER_H
+#define _LIBCPP_CXX03_ITERATOR_WRAP_ITER_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__iterator/iterator_traits.h>
@@ -185,4 +185,4 @@ struct _LIBCPP_TEMPLATE_VIS pointer_traits<__wrap_iter<_It> > {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___ITERATOR_WRAP_ITER_H
+#endif // _LIBCPP_CXX03_ITERATOR_WRAP_ITER_H
diff --git a/libcxx/include/__cxx03/__locale b/libcxx/include/__cxx03/__locale
index 70dd1e65cfba9..b42a7334cc3ed 100644
--- a/libcxx/include/__cxx03/__locale
+++ b/libcxx/include/__cxx03/__locale
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___LOCALE
-#define _LIBCPP___CXX03___LOCALE
+#ifndef _LIBCPP_CXX03_LOCALE
+#define _LIBCPP_CXX03_LOCALE
 
 #include <__cxx03/__config>
 #include <__cxx03/__locale_dir/locale_base_api.h>
@@ -1492,4 +1492,4 @@ private:
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 a20f0952f52c3..e98610954d771 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___CXX03___LOCALE_DIR_LOCALE_BASE_API_H
-#define _LIBCPP___CXX03___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___CXX03___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 e96e64d981647..462260bc847d3 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___CXX03___LOCALE_LOCALE_BASE_API_ANDROID_H
-#define _LIBCPP___CXX03___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>
 
@@ -42,4 +42,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___CXX03___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 35bf30c07fde1..93bcb06a78b2c 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___CXX03___LOCALE_LOCALE_BASE_API_BSD_LOCALE_DEFAULTS_H
-#define _LIBCPP___CXX03___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___CXX03___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 a73b724df6c19..0d3fb65e9752c 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___CXX03___LOCALE_LOCALE_BASE_API_BSD_LOCALE_FALLBACKS_H
-#define _LIBCPP___CXX03___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___CXX03___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 6ee6a3a1c8755..95eba83879f4f 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___CXX03___LOCALE_LOCALE_BASE_API_FUCHSIA_H
-#define _LIBCPP___CXX03___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___CXX03___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 a24d994e8ea21..4942d9d6fd8dc 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___CXX03___LOCALE_LOCALE_BASE_API_IBM_H
-#define _LIBCPP___CXX03___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___CXX03___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 e3583634e4322..99332dfae78fc 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___CXX03___LOCALE_LOCALE_BASE_API_LOCALE_GUARD_H
-#define _LIBCPP___CXX03___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___CXX03___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 e2d23d49c9e45..102cc6ae4ca11 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___CXX03___LOCALE_LOCALE_BASE_API_MUSL_H
-#define _LIBCPP___CXX03___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___CXX03___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 e52d90794556a..22ce7b8b4855e 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___CXX03___LOCALE_LOCALE_BASE_API_NEWLIB_H
-#define _LIBCPP___CXX03___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___CXX03___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 6b64607d484d3..7228c2a040703 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___CXX03___LOCALE_LOCALE_BASE_API_OPENBSD_H
-#define _LIBCPP___CXX03___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___CXX03___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 5f85acf88e6f0..2b62b36decbf0 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___CXX03___LOCALE_LOCALE_BASE_API_WIN32_H
-#define _LIBCPP___CXX03___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___CXX03___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 61fc58ac22692..4bdfff8f06bfb 100644
--- a/libcxx/include/__cxx03/__math/abs.h
+++ b/libcxx/include/__cxx03/__math/abs.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MATH_ABS_H
-#define _LIBCPP___CXX03___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___CXX03___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 d20940604c6f9..9c64fc18c7f3b 100644
--- a/libcxx/include/__cxx03/__math/copysign.h
+++ b/libcxx/include/__cxx03/__math/copysign.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MATH_COPYSIGN_H
-#define _LIBCPP___CXX03___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___CXX03___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 25cf059989862..5781ce56406f8 100644
--- a/libcxx/include/__cxx03/__math/error_functions.h
+++ b/libcxx/include/__cxx03/__math/error_functions.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MATH_ERROR_FUNCTIONS_H
-#define _LIBCPP___CXX03___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___CXX03___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 452d5d238f910..1bd56961512be 100644
--- a/libcxx/include/__cxx03/__math/exponential_functions.h
+++ b/libcxx/include/__cxx03/__math/exponential_functions.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MATH_EXPONENTIAL_FUNCTIONS_H
-#define _LIBCPP___CXX03___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___CXX03___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 ac6fec44efcb4..aa068fe215ec1 100644
--- a/libcxx/include/__cxx03/__math/fdim.h
+++ b/libcxx/include/__cxx03/__math/fdim.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MATH_FDIM_H
-#define _LIBCPP___CXX03___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___CXX03___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 ce7e92a330376..33a41c6700cdd 100644
--- a/libcxx/include/__cxx03/__math/fma.h
+++ b/libcxx/include/__cxx03/__math/fma.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MATH_FMA_H
-#define _LIBCPP___CXX03___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___CXX03___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 4d104988e2c9e..042541a93e939 100644
--- a/libcxx/include/__cxx03/__math/gamma.h
+++ b/libcxx/include/__cxx03/__math/gamma.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MATH_GAMMA_H
-#define _LIBCPP___CXX03___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___CXX03___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 2b765ca923cae..a48971f8b1c4a 100644
--- a/libcxx/include/__cxx03/__math/hyperbolic_functions.h
+++ b/libcxx/include/__cxx03/__math/hyperbolic_functions.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MATH_HYPERBOLIC_FUNCTIONS_H
-#define _LIBCPP___CXX03___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___CXX03___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 20b00f38d1e64..9c8603e318316 100644
--- a/libcxx/include/__cxx03/__math/hypot.h
+++ b/libcxx/include/__cxx03/__math/hypot.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MATH_HYPOT_H
-#define _LIBCPP___CXX03___MATH_HYPOT_H
+#ifndef _LIBCPP_CXX03_MATH_HYPOT_H
+#define _LIBCPP_CXX03_MATH_HYPOT_H
 
 #include <__cxx03/__algorithm/max.h>
 #include <__cxx03/__config>
@@ -55,4 +55,4 @@ inline _LIBCPP_HIDE_FROM_ABI typename __promote<_A1, _A2>::type hypot(_A1 __x, _
 _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 b48689d159af0..4a78359adf644 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___CXX03___MATH_INVERSE_HYPERBOLIC_FUNCTIONS_H
-#define _LIBCPP___CXX03___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___CXX03___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 573c9b1bdc878..ac8e7c9d97b82 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___CXX03___MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS_H
-#define _LIBCPP___CXX03___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___CXX03___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 9b9e59a5a7baf..704063fa881d7 100644
--- a/libcxx/include/__cxx03/__math/logarithms.h
+++ b/libcxx/include/__cxx03/__math/logarithms.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MATH_LOGARITHMS_H
-#define _LIBCPP___CXX03___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___CXX03___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 4df5bc1ee0f77..9d73bae2b8d8b 100644
--- a/libcxx/include/__cxx03/__math/min_max.h
+++ b/libcxx/include/__cxx03/__math/min_max.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MATH_MIN_MAX_H
-#define _LIBCPP___CXX03___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___CXX03___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 5a6124187c5d2..04ac4cf92efcf 100644
--- a/libcxx/include/__cxx03/__math/modulo.h
+++ b/libcxx/include/__cxx03/__math/modulo.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MATH_MODULO_H
-#define _LIBCPP___CXX03___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___CXX03___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 a9f750b6ddc3f..4a2d79f8e88a3 100644
--- a/libcxx/include/__cxx03/__math/remainder.h
+++ b/libcxx/include/__cxx03/__math/remainder.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MATH_REMAINDER_H
-#define _LIBCPP___CXX03___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___CXX03___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 77d9eead803c6..00d53c06f8de3 100644
--- a/libcxx/include/__cxx03/__math/roots.h
+++ b/libcxx/include/__cxx03/__math/roots.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MATH_ROOTS_H
-#define _LIBCPP___CXX03___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___CXX03___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 e146d743e974a..d7807465f77f4 100644
--- a/libcxx/include/__cxx03/__math/rounding_functions.h
+++ b/libcxx/include/__cxx03/__math/rounding_functions.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MATH_ROUNDING_FUNCTIONS_H
-#define _LIBCPP___CXX03___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___CXX03___MATH_ROUNDING_FUNCTIONS_H
+#endif // _LIBCPP_CXX03_MATH_ROUNDING_FUNCTIONS_H
diff --git a/libcxx/include/__cxx03/__math/traits.h b/libcxx/include/__cxx03/__math/traits.h
index 250e88beb7d70..d89056b22d37a 100644
--- a/libcxx/include/__cxx03/__math/traits.h
+++ b/libcxx/include/__cxx03/__math/traits.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MATH_TRAITS_H
-#define _LIBCPP___CXX03___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>
@@ -186,4 +186,4 @@ _LIBCPP_NODISCARD inline _LIBCPP_HIDE_FROM_ABI bool isunordered(_A1 __x, _A2 __y
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 6c23ae6bc854f..5c23ef00a3e0d 100644
--- a/libcxx/include/__cxx03/__math/trigonometric_functions.h
+++ b/libcxx/include/__cxx03/__math/trigonometric_functions.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MATH_TRIGONOMETRIC_FUNCTIONS_H
-#define _LIBCPP___CXX03___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___CXX03___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 6c7cfaaa8fe5b..bd86297f66b23 100644
--- a/libcxx/include/__cxx03/__mbstate_t.h
+++ b/libcxx/include/__cxx03/__mbstate_t.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MBSTATE_T_H
-#define _LIBCPP___CXX03___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___CXX03___MBSTATE_T_H
+#endif // _LIBCPP_CXX03_MBSTATE_T_H
diff --git a/libcxx/include/__cxx03/__memory/addressof.h b/libcxx/include/__cxx03/__memory/addressof.h
index 9bb49baef21f6..78e1d4c0419a4 100644
--- a/libcxx/include/__cxx03/__memory/addressof.h
+++ b/libcxx/include/__cxx03/__memory/addressof.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MEMORY_ADDRESSOF_H
-#define _LIBCPP___CXX03___MEMORY_ADDRESSOF_H
+#ifndef _LIBCPP_CXX03_MEMORY_ADDRESSOF_H
+#define _LIBCPP_CXX03_MEMORY_ADDRESSOF_H
 
 #include <__cxx03/__config>
 
@@ -53,4 +53,4 @@ inline _LIBCPP_HIDE_FROM_ABI __unsafe_unretained _Tp* addressof(__unsafe_unretai
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 2b2085f217364..ffd256676b81a 100644
--- a/libcxx/include/__cxx03/__memory/align.h
+++ b/libcxx/include/__cxx03/__memory/align.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MEMORY_ALIGN_H
-#define _LIBCPP___CXX03___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___CXX03___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 1efffccffb084..31ee022db8b0f 100644
--- a/libcxx/include/__cxx03/__memory/aligned_alloc.h
+++ b/libcxx/include/__cxx03/__memory/aligned_alloc.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MEMORY_ALIGNED_ALLOC_H
-#define _LIBCPP___CXX03___MEMORY_ALIGNED_ALLOC_H
+#ifndef _LIBCPP_CXX03_MEMORY_ALIGNED_ALLOC_H
+#define _LIBCPP_CXX03_MEMORY_ALIGNED_ALLOC_H
 
 #include <__cxx03/__config>
 #include <__cxx03/cstddef>
@@ -50,4 +50,4 @@ inline _LIBCPP_HIDE_FROM_ABI void __libcpp_aligned_free(void* __ptr) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 3a906c7145b75..5c1d21bc1c031 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___CXX03___MEMORY_ALLOCATE_AT_LEAST_H
-#define _LIBCPP___CXX03___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>
@@ -33,4 +33,4 @@ __allocate_at_least(_Alloc& __alloc, size_t __n) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 0a2712d1df99b..c3ee2fcb2b4ca 100644
--- a/libcxx/include/__cxx03/__memory/allocation_guard.h
+++ b/libcxx/include/__cxx03/__memory/allocation_guard.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MEMORY_ALLOCATION_GUARD_H
-#define _LIBCPP___CXX03___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___CXX03___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 cd6f7d9ad4476..7a2fdfe7f2b31 100644
--- a/libcxx/include/__cxx03/__memory/allocator.h
+++ b/libcxx/include/__cxx03/__memory/allocator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MEMORY_ALLOCATOR_H
-#define _LIBCPP___CXX03___MEMORY_ALLOCATOR_H
+#ifndef _LIBCPP_CXX03_MEMORY_ALLOCATOR_H
+#define _LIBCPP_CXX03_MEMORY_ALLOCATOR_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__memory/addressof.h>
@@ -159,4 +159,4 @@ inline _LIBCPP_HIDE_FROM_ABI bool operator!=(const allocator<_Tp>&, const alloca
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 1dbea06785b6b..ddcc5133409df 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___CXX03___FUNCTIONAL_ALLOCATOR_ARG_T_H
-#define _LIBCPP___CXX03___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>
@@ -29,4 +29,4 @@ struct _LIBCPP_TEMPLATE_VIS allocator_arg_t {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 2c69c91561321..33103a128c5ad 100644
--- a/libcxx/include/__cxx03/__memory/allocator_destructor.h
+++ b/libcxx/include/__cxx03/__memory/allocator_destructor.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MEMORY_ALLOCATOR_DESTRUCTOR_H
-#define _LIBCPP___CXX03___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___CXX03___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 6e7b8ca51f881..372ab59e32022 100644
--- a/libcxx/include/__cxx03/__memory/allocator_traits.h
+++ b/libcxx/include/__cxx03/__memory/allocator_traits.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MEMORY_ALLOCATOR_TRAITS_H
-#define _LIBCPP___CXX03___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>
@@ -368,4 +368,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 e0e2b690b513d..1a038fd18436f 100644
--- a/libcxx/include/__cxx03/__memory/assume_aligned.h
+++ b/libcxx/include/__cxx03/__memory/assume_aligned.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MEMORY_ASSUME_ALIGNED_H
-#define _LIBCPP___CXX03___MEMORY_ASSUME_ALIGNED_H
+#ifndef _LIBCPP_CXX03_MEMORY_ASSUME_ALIGNED_H
+#define _LIBCPP_CXX03_MEMORY_ASSUME_ALIGNED_H
 
 #include <__cxx03/__assert>
 #include <__cxx03/__config>
@@ -38,4 +38,4 @@ _LIBCPP_NODISCARD _LIBCPP_HIDE_FROM_ABI _Tp* __assume_aligned(_Tp* __ptr) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 3c3a8881cb2b8..f60b816eff8e0 100644
--- a/libcxx/include/__cxx03/__memory/auto_ptr.h
+++ b/libcxx/include/__cxx03/__memory/auto_ptr.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MEMORY_AUTO_PTR_H
-#define _LIBCPP___CXX03___MEMORY_AUTO_PTR_H
+#ifndef _LIBCPP_CXX03_MEMORY_AUTO_PTR_H
+#define _LIBCPP_CXX03_MEMORY_AUTO_PTR_H
 
 #include <__cxx03/__config>
 
@@ -85,4 +85,4 @@ class _LIBCPP_TEMPLATE_VIS auto_ptr<void> {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 f939d08f61dd7..bd581513fcecd 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___CXX03___MEMORY_BUILTIN_NEW_ALLOCATOR_H
-#define _LIBCPP___CXX03___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___CXX03___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 601736a40cd8a..e097ce11585da 100644
--- a/libcxx/include/__cxx03/__memory/compressed_pair.h
+++ b/libcxx/include/__cxx03/__memory/compressed_pair.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MEMORY_COMPRESSED_PAIR_H
-#define _LIBCPP___CXX03___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>
@@ -136,4 +136,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___MEMORY_COMPRESSED_PAIR_H
+#endif // _LIBCPP_CXX03_MEMORY_COMPRESSED_PAIR_H
diff --git a/libcxx/include/__cxx03/__memory/construct_at.h b/libcxx/include/__cxx03/__memory/construct_at.h
index 8d1089335de90..a11b67af33a9b 100644
--- a/libcxx/include/__cxx03/__memory/construct_at.h
+++ b/libcxx/include/__cxx03/__memory/construct_at.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MEMORY_CONSTRUCT_AT_H
-#define _LIBCPP___CXX03___MEMORY_CONSTRUCT_AT_H
+#ifndef _LIBCPP_CXX03_MEMORY_CONSTRUCT_AT_H
+#define _LIBCPP_CXX03_MEMORY_CONSTRUCT_AT_H
 
 #include <__cxx03/__assert>
 #include <__cxx03/__config>
@@ -74,4 +74,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 a7dd2abd55980..95cc4a23410d3 100644
--- a/libcxx/include/__cxx03/__memory/destruct_n.h
+++ b/libcxx/include/__cxx03/__memory/destruct_n.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MEMORY_DESTRUCT_N_H
-#define _LIBCPP___CXX03___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___CXX03___MEMORY_DESTRUCT_N_H
+#endif // _LIBCPP_CXX03_MEMORY_DESTRUCT_N_H
diff --git a/libcxx/include/__cxx03/__memory/pointer_traits.h b/libcxx/include/__cxx03/__memory/pointer_traits.h
index d38004aca9dc4..edff3a1e025ab 100644
--- a/libcxx/include/__cxx03/__memory/pointer_traits.h
+++ b/libcxx/include/__cxx03/__memory/pointer_traits.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MEMORY_POINTER_TRAITS_H
-#define _LIBCPP___CXX03___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>
@@ -214,4 +214,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___MEMORY_POINTER_TRAITS_H
+#endif // _LIBCPP_CXX03_MEMORY_POINTER_TRAITS_H
diff --git a/libcxx/include/__cxx03/__memory/raw_storage_iterator.h b/libcxx/include/__cxx03/__memory/raw_storage_iterator.h
index 0157b663c975e..bce609c24a19a 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___CXX03___MEMORY_RAW_STORAGE_ITERATOR_H
-#define _LIBCPP___CXX03___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>
@@ -63,4 +63,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 fb94d9d55596f..05e3c4da42e34 100644
--- a/libcxx/include/__cxx03/__memory/shared_ptr.h
+++ b/libcxx/include/__cxx03/__memory/shared_ptr.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MEMORY_SHARED_PTR_H
-#define _LIBCPP___CXX03___MEMORY_SHARED_PTR_H
+#ifndef _LIBCPP_CXX03_MEMORY_SHARED_PTR_H
+#define _LIBCPP_CXX03_MEMORY_SHARED_PTR_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__exception/exception.h>
@@ -1214,4 +1214,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 8659145ece024..66e65a9addde5 100644
--- a/libcxx/include/__cxx03/__memory/swap_allocator.h
+++ b/libcxx/include/__cxx03/__memory/swap_allocator.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MEMORY_SWAP_ALLOCATOR_H
-#define _LIBCPP___CXX03___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>
@@ -38,4 +38,4 @@ inline _LIBCPP_HIDE_FROM_ABI void __swap_allocator(_Alloc& __a1, _Alloc& __a2) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 b79c0a740d643..ed9e91cee8f40 100644
--- a/libcxx/include/__cxx03/__memory/temp_value.h
+++ b/libcxx/include/__cxx03/__memory/temp_value.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MEMORY_TEMP_VALUE_H
-#define _LIBCPP___CXX03___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>
@@ -42,4 +42,4 @@ struct __temp_value {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 60c12379905c8..ff7a714503ec1 100644
--- a/libcxx/include/__cxx03/__memory/temporary_buffer.h
+++ b/libcxx/include/__cxx03/__memory/temporary_buffer.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MEMORY_TEMPORARY_BUFFER_H
-#define _LIBCPP___CXX03___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___CXX03___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 17c30b4fbdd72..562b16df8ac5a 100644
--- a/libcxx/include/__cxx03/__memory/uninitialized_algorithms.h
+++ b/libcxx/include/__cxx03/__memory/uninitialized_algorithms.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MEMORY_UNINITIALIZED_ALGORITHMS_H
-#define _LIBCPP___CXX03___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>
@@ -307,4 +307,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 2a9b330ec0d39..d50b966a6a820 100644
--- a/libcxx/include/__cxx03/__memory/unique_ptr.h
+++ b/libcxx/include/__cxx03/__memory/unique_ptr.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MEMORY_UNIQUE_PTR_H
-#define _LIBCPP___CXX03___MEMORY_UNIQUE_PTR_H
+#ifndef _LIBCPP_CXX03_MEMORY_UNIQUE_PTR_H
+#define _LIBCPP_CXX03_MEMORY_UNIQUE_PTR_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__functional/hash.h>
@@ -550,4 +550,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 fbeb675acd510..3b349203112f9 100644
--- a/libcxx/include/__cxx03/__memory/uses_allocator.h
+++ b/libcxx/include/__cxx03/__memory/uses_allocator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MEMORY_USES_ALLOCATOR_H
-#define _LIBCPP___CXX03___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>
@@ -44,4 +44,4 @@ struct _LIBCPP_TEMPLATE_VIS uses_allocator : public __uses_allocator<_Tp, _Alloc
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___MEMORY_USES_ALLOCATOR_H
+#endif // _LIBCPP_CXX03_MEMORY_USES_ALLOCATOR_H
diff --git a/libcxx/include/__cxx03/__memory/voidify.h b/libcxx/include/__cxx03/__memory/voidify.h
index 842fb8d4e7a0f..b51225680179d 100644
--- a/libcxx/include/__cxx03/__memory/voidify.h
+++ b/libcxx/include/__cxx03/__memory/voidify.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MEMORY_VOIDIFY_H
-#define _LIBCPP___CXX03___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 void* __voidify(_Tp& __from) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___MEMORY_VOIDIFY_H
+#endif // _LIBCPP_CXX03_MEMORY_VOIDIFY_H
diff --git a/libcxx/include/__cxx03/__mutex/lock_guard.h b/libcxx/include/__cxx03/__mutex/lock_guard.h
index 6760b1f20fa9e..ba752b82c92a4 100644
--- a/libcxx/include/__cxx03/__mutex/lock_guard.h
+++ b/libcxx/include/__cxx03/__mutex/lock_guard.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MUTEX_LOCK_GUARD_H
-#define _LIBCPP___CXX03___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___CXX03___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 644131a047fa1..dde7c3bd995f6 100644
--- a/libcxx/include/__cxx03/__mutex/mutex.h
+++ b/libcxx/include/__cxx03/__mutex/mutex.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MUTEX_MUTEX_H
-#define _LIBCPP___CXX03___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___CXX03___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 529aa77071776..aa90b595e4762 100644
--- a/libcxx/include/__cxx03/__mutex/once_flag.h
+++ b/libcxx/include/__cxx03/__mutex/once_flag.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MUTEX_ONCE_FLAG_H
-#define _LIBCPP___CXX03___MUTEX_ONCE_FLAG_H
+#ifndef _LIBCPP_CXX03_MUTEX_ONCE_FLAG_H
+#define _LIBCPP_CXX03_MUTEX_ONCE_FLAG_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__memory/addressof.h>
@@ -99,4 +99,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 5962e1208d73e..8a87372510eee 100644
--- a/libcxx/include/__cxx03/__mutex/tag_types.h
+++ b/libcxx/include/__cxx03/__mutex/tag_types.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MUTEX_TAG_TYPES_H
-#define _LIBCPP___CXX03___MUTEX_TAG_TYPES_H
+#ifndef _LIBCPP_CXX03_MUTEX_TAG_TYPES_H
+#define _LIBCPP_CXX03_MUTEX_TAG_TYPES_H
 
 #include <__cxx03/__config>
 
@@ -31,4 +31,4 @@ struct _LIBCPP_EXPORTED_FROM_ABI adopt_lock_t {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 1911da3828732..bccfd7cb16bab 100644
--- a/libcxx/include/__cxx03/__mutex/unique_lock.h
+++ b/libcxx/include/__cxx03/__mutex/unique_lock.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___MUTEX_UNIQUE_LOCK_H
-#define _LIBCPP___CXX03___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___CXX03___MUTEX_UNIQUE_LOCK_H
+#endif // _LIBCPP_CXX03_MUTEX_UNIQUE_LOCK_H
diff --git a/libcxx/include/__cxx03/__numeric/accumulate.h b/libcxx/include/__cxx03/__numeric/accumulate.h
index 0b1a0a9bf9d15..8775c06d96b04 100644
--- a/libcxx/include/__cxx03/__numeric/accumulate.h
+++ b/libcxx/include/__cxx03/__numeric/accumulate.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___NUMERIC_ACCUMULATE_H
-#define _LIBCPP___CXX03___NUMERIC_ACCUMULATE_H
+#ifndef _LIBCPP_CXX03_NUMERIC_ACCUMULATE_H
+#define _LIBCPP_CXX03_NUMERIC_ACCUMULATE_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__utility/move.h>
@@ -41,4 +41,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 90ef7af1543f8..5b503d60c61c6 100644
--- a/libcxx/include/__cxx03/__numeric/adjacent_difference.h
+++ b/libcxx/include/__cxx03/__numeric/adjacent_difference.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___NUMERIC_ADJACENT_DIFFERENCE_H
-#define _LIBCPP___CXX03___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>
@@ -57,4 +57,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___NUMERIC_ADJACENT_DIFFERENCE_H
+#endif // _LIBCPP_CXX03_NUMERIC_ADJACENT_DIFFERENCE_H
diff --git a/libcxx/include/__cxx03/__numeric/inner_product.h b/libcxx/include/__cxx03/__numeric/inner_product.h
index 39e09ba005e40..1bfbb6382ea0a 100644
--- a/libcxx/include/__cxx03/__numeric/inner_product.h
+++ b/libcxx/include/__cxx03/__numeric/inner_product.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___NUMERIC_INNER_PRODUCT_H
-#define _LIBCPP___CXX03___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>
@@ -47,4 +47,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 3b1f70eef33da..d5a92b0189b53 100644
--- a/libcxx/include/__cxx03/__numeric/iota.h
+++ b/libcxx/include/__cxx03/__numeric/iota.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___NUMERIC_IOTA_H
-#define _LIBCPP___CXX03___NUMERIC_IOTA_H
+#ifndef _LIBCPP_CXX03_NUMERIC_IOTA_H
+#define _LIBCPP_CXX03_NUMERIC_IOTA_H
 
 #include <__cxx03/__config>
 
@@ -26,4 +26,4 @@ _LIBCPP_HIDE_FROM_ABI void iota(_ForwardIterator __first, _ForwardIterator __las
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___NUMERIC_IOTA_H
+#endif // _LIBCPP_CXX03_NUMERIC_IOTA_H
diff --git a/libcxx/include/__cxx03/__numeric/partial_sum.h b/libcxx/include/__cxx03/__numeric/partial_sum.h
index e60f85069e542..7feff6e274170 100644
--- a/libcxx/include/__cxx03/__numeric/partial_sum.h
+++ b/libcxx/include/__cxx03/__numeric/partial_sum.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___NUMERIC_PARTIAL_SUM_H
-#define _LIBCPP___CXX03___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>
@@ -55,4 +55,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___NUMERIC_PARTIAL_SUM_H
+#endif // _LIBCPP_CXX03_NUMERIC_PARTIAL_SUM_H
diff --git a/libcxx/include/__cxx03/__ostream/basic_ostream.h b/libcxx/include/__cxx03/__ostream/basic_ostream.h
index 0d364d449058d..3062b0b250d57 100644
--- a/libcxx/include/__cxx03/__ostream/basic_ostream.h
+++ b/libcxx/include/__cxx03/__ostream/basic_ostream.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___OSTREAM_BASIC_OSTREAM_H
-#define _LIBCPP___CXX03___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>
@@ -794,4 +794,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___OSTREAM_BASIC_OSTREAM_H
+#endif // _LIBCPP_CXX03_OSTREAM_BASIC_OSTREAM_H
diff --git a/libcxx/include/__cxx03/__random/bernoulli_distribution.h b/libcxx/include/__cxx03/__random/bernoulli_distribution.h
index 618bda9e09656..00ee7e19e68f3 100644
--- a/libcxx/include/__cxx03/__random/bernoulli_distribution.h
+++ b/libcxx/include/__cxx03/__random/bernoulli_distribution.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___RANDOM_BERNOULLI_DISTRIBUTION_H
-#define _LIBCPP___CXX03___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>
@@ -115,4 +115,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 7680f0ef2cfaa..a50172795ab34 100644
--- a/libcxx/include/__cxx03/__random/binomial_distribution.h
+++ b/libcxx/include/__cxx03/__random/binomial_distribution.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___RANDOM_BINOMIAL_DISTRIBUTION_H
-#define _LIBCPP___CXX03___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>
@@ -189,4 +189,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 0c6f652b1a4d9..5a280744cf6b2 100644
--- a/libcxx/include/__cxx03/__random/cauchy_distribution.h
+++ b/libcxx/include/__cxx03/__random/cauchy_distribution.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___RANDOM_CAUCHY_DISTRIBUTION_H
-#define _LIBCPP___CXX03___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>
@@ -130,4 +130,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 3e502b601f641..6235583512093 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___CXX03___RANDOM_CHI_SQUARED_DISTRIBUTION_H
-#define _LIBCPP___CXX03___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>
@@ -117,4 +117,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 baa1ca636a2b3..46cad93f53269 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___CXX03___RANDOM_CLAMP_TO_INTEGRAL_H
-#define _LIBCPP___CXX03___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___CXX03___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 81fbac0b301a2..a915d79e51040 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___CXX03___RANDOM_DEFAULT_RANDOM_ENGINE_H
-#define _LIBCPP___CXX03___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___CXX03___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 c7e8d902262d6..e087f7c272c68 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___CXX03___RANDOM_DISCARD_BLOCK_ENGINE_H
-#define _LIBCPP___CXX03___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>
@@ -158,4 +158,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 8a0ea91be0fe7..4d4d32cd78d34 100644
--- a/libcxx/include/__cxx03/__random/discrete_distribution.h
+++ b/libcxx/include/__cxx03/__random/discrete_distribution.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___RANDOM_DISCRETE_DISTRIBUTION_H
-#define _LIBCPP___CXX03___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>
@@ -203,4 +203,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 83ef15580c0ef..692274a24d8a9 100644
--- a/libcxx/include/__cxx03/__random/exponential_distribution.h
+++ b/libcxx/include/__cxx03/__random/exponential_distribution.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___RANDOM_EXPONENTIAL_DISTRIBUTION_H
-#define _LIBCPP___CXX03___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>
@@ -124,4 +124,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 40ca57b6f313e..b8ee598f4d88d 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___CXX03___RANDOM_EXTREME_VALUE_DISTRIBUTION_H
-#define _LIBCPP___CXX03___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>
@@ -130,4 +130,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 7b8bf2d8f82be..a62426bb8126a 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___CXX03___RANDOM_FISHER_F_DISTRIBUTION_H
-#define _LIBCPP___CXX03___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>
@@ -129,4 +129,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 6a906a2ea04cb..c572f9ee48f92 100644
--- a/libcxx/include/__cxx03/__random/gamma_distribution.h
+++ b/libcxx/include/__cxx03/__random/gamma_distribution.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___RANDOM_GAMMA_DISTRIBUTION_H
-#define _LIBCPP___CXX03___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>
@@ -172,4 +172,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 c9381a1c58d5d..5827190e3330d 100644
--- a/libcxx/include/__cxx03/__random/generate_canonical.h
+++ b/libcxx/include/__cxx03/__random/generate_canonical.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___RANDOM_GENERATE_CANONICAL_H
-#define _LIBCPP___CXX03___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>
@@ -43,4 +43,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 ab462a31dd3b6..df23e28860ecb 100644
--- a/libcxx/include/__cxx03/__random/geometric_distribution.h
+++ b/libcxx/include/__cxx03/__random/geometric_distribution.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___RANDOM_GEOMETRIC_DISTRIBUTION_H
-#define _LIBCPP___CXX03___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>
@@ -112,4 +112,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 ba7c2c7f67c1c..9814b91d86a40 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___CXX03___RANDOM_INDEPENDENT_BITS_ENGINE_H
-#define _LIBCPP___CXX03___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>
@@ -194,4 +194,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 da73fb478af60..252e3bea97576 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___CXX03___RANDOM_IS_SEED_SEQUENCE_H
-#define _LIBCPP___CXX03___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___CXX03___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 65693ceecf4d0..03f73fcf97777 100644
--- a/libcxx/include/__cxx03/__random/is_valid.h
+++ b/libcxx/include/__cxx03/__random/is_valid.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___RANDOM_IS_VALID_H
-#define _LIBCPP___CXX03___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___CXX03___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 0ba23d7bbd2a8..d2188a57e1c47 100644
--- a/libcxx/include/__cxx03/__random/knuth_b.h
+++ b/libcxx/include/__cxx03/__random/knuth_b.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___RANDOM_KNUTH_B_H
-#define _LIBCPP___CXX03___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___CXX03___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 7e62a2a27497b..7513214c8b506 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___CXX03___RANDOM_LINEAR_CONGRUENTIAL_ENGINE_H
-#define _LIBCPP___CXX03___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>
@@ -375,4 +375,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 bea5f3c1ff4ba..79a1edde35faf 100644
--- a/libcxx/include/__cxx03/__random/log2.h
+++ b/libcxx/include/__cxx03/__random/log2.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___RANDOM_LOG2_H
-#define _LIBCPP___CXX03___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___CXX03___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 f024ac67b033c..529df48d7cac6 100644
--- a/libcxx/include/__cxx03/__random/lognormal_distribution.h
+++ b/libcxx/include/__cxx03/__random/lognormal_distribution.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___RANDOM_LOGNORMAL_DISTRIBUTION_H
-#define _LIBCPP___CXX03___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>
@@ -118,4 +118,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 2392568b89bdf..da301ee1b5167 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___CXX03___RANDOM_MERSENNE_TWISTER_ENGINE_H
-#define _LIBCPP___CXX03___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>
@@ -826,4 +826,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 cd22234e0c842..85dead7116a77 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___CXX03___RANDOM_NEGATIVE_BINOMIAL_DISTRIBUTION_H
-#define _LIBCPP___CXX03___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>
@@ -149,4 +149,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 c44ecbf9e2add..c5c6d7bcc6add 100644
--- a/libcxx/include/__cxx03/__random/normal_distribution.h
+++ b/libcxx/include/__cxx03/__random/normal_distribution.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___RANDOM_NORMAL_DISTRIBUTION_H
-#define _LIBCPP___CXX03___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>
@@ -167,4 +167,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 ad28da6f1b581..d80099d74ef02 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___CXX03___RANDOM_PIECEWISE_CONSTANT_DISTRIBUTION_H
-#define _LIBCPP___CXX03___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>
@@ -266,4 +266,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 302ea2b7fa7ab..dd3544d160269 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___CXX03___RANDOM_PIECEWISE_LINEAR_DISTRIBUTION_H
-#define _LIBCPP___CXX03___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>
@@ -279,4 +279,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 5ae01195accdd..cd7ff91d68540 100644
--- a/libcxx/include/__cxx03/__random/poisson_distribution.h
+++ b/libcxx/include/__cxx03/__random/poisson_distribution.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___RANDOM_POISSON_DISTRIBUTION_H
-#define _LIBCPP___CXX03___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>
@@ -233,4 +233,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 f898c072b023e..1081680431c80 100644
--- a/libcxx/include/__cxx03/__random/random_device.h
+++ b/libcxx/include/__cxx03/__random/random_device.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___RANDOM_RANDOM_DEVICE_H
-#define _LIBCPP___CXX03___RANDOM_RANDOM_DEVICE_H
+#ifndef _LIBCPP_CXX03_RANDOM_RANDOM_DEVICE_H
+#define _LIBCPP_CXX03_RANDOM_RANDOM_DEVICE_H
 
 #include <__cxx03/__config>
 #include <__cxx03/string>
@@ -73,4 +73,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 2c808f50e6382..f64cc2f6faa38 100644
--- a/libcxx/include/__cxx03/__random/ranlux.h
+++ b/libcxx/include/__cxx03/__random/ranlux.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___RANDOM_RANLUX_H
-#define _LIBCPP___CXX03___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___CXX03___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 954f87673eed5..08decf1980d8a 100644
--- a/libcxx/include/__cxx03/__random/seed_seq.h
+++ b/libcxx/include/__cxx03/__random/seed_seq.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___RANDOM_SEED_SEQ_H
-#define _LIBCPP___CXX03___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>
@@ -156,4 +156,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 3d2a14f26d379..e67d82e741212 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___CXX03___RANDOM_SHUFFLE_ORDER_ENGINE_H
-#define _LIBCPP___CXX03___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>
@@ -219,4 +219,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 6cddcd6ce86d4..a47b99e3162b6 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___CXX03___RANDOM_STUDENT_T_DISTRIBUTION_H
-#define _LIBCPP___CXX03___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>
@@ -124,4 +124,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 1e38f30643b97..7defda64b4116 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___CXX03___RANDOM_SUBTRACT_WITH_CARRY_ENGINE_H
-#define _LIBCPP___CXX03___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>
@@ -267,4 +267,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 94e3899f6a5a5..02f2258a7c8cf 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___CXX03___RANDOM_UNIFORM_INT_DISTRIBUTION_H
-#define _LIBCPP___CXX03___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>
@@ -250,4 +250,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___RANDOM_UNIFORM_INT_DISTRIBUTION_H
+#endif // _LIBCPP_CXX03_RANDOM_UNIFORM_INT_DISTRIBUTION_H
diff --git a/libcxx/include/__cxx03/__random/uniform_real_distribution.h b/libcxx/include/__cxx03/__random/uniform_real_distribution.h
index 9cf9437df2207..c96f9192bc113 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___CXX03___RANDOM_UNIFORM_REAL_DISTRIBUTION_H
-#define _LIBCPP___CXX03___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>
@@ -129,4 +129,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 e441cf059b317..09f70bfc837f1 100644
--- a/libcxx/include/__cxx03/__random/weibull_distribution.h
+++ b/libcxx/include/__cxx03/__random/weibull_distribution.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___RANDOM_WEIBULL_DISTRIBUTION_H
-#define _LIBCPP___CXX03___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>
@@ -123,4 +123,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___RANDOM_WEIBULL_DISTRIBUTION_H
+#endif // _LIBCPP_CXX03_RANDOM_WEIBULL_DISTRIBUTION_H
diff --git a/libcxx/include/__cxx03/__split_buffer b/libcxx/include/__cxx03/__split_buffer
index 1e67cc935e35b..6784f19bc0b98 100644
--- a/libcxx/include/__cxx03/__split_buffer
+++ b/libcxx/include/__cxx03/__split_buffer
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___SPLIT_BUFFER
-#define _LIBCPP___CXX03___SPLIT_BUFFER
+#ifndef _LIBCPP_CXX03_SPLIT_BUFFER
+#define _LIBCPP_CXX03_SPLIT_BUFFER
 
 #include <__cxx03/__algorithm/max.h>
 #include <__cxx03/__algorithm/move.h>
@@ -541,4 +541,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 7a81d1bd024ae..26e4fb42e11be 100644
--- a/libcxx/include/__cxx03/__std_mbstate_t.h
+++ b/libcxx/include/__cxx03/__std_mbstate_t.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___STD_MBSTATE_T_H
-#define _LIBCPP___CXX03___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___CXX03___STD_MBSTATE_T_H
+#endif // _LIBCPP_CXX03_STD_MBSTATE_T_H
diff --git a/libcxx/include/__cxx03/__string/char_traits.h b/libcxx/include/__cxx03/__string/char_traits.h
index 28366905c716a..e3feda0a35be5 100644
--- a/libcxx/include/__cxx03/__string/char_traits.h
+++ b/libcxx/include/__cxx03/__string/char_traits.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___STRING_CHAR_TRAITS_H
-#define _LIBCPP___CXX03___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>
@@ -493,4 +493,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 315058dcc06e5..7f139604680a1 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___CXX03___STRING_CONSTEXPR_C_FUNCTIONS_H
-#define _LIBCPP___CXX03___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>
@@ -220,4 +220,4 @@ _LIBCPP_HIDE_FROM_ABI _Tp* __constexpr_memmove(_Tp* __dest, _Up* __src, __elemen
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 27cfd560988cb..e6821282bb964 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___CXX03___STRING_EXTERN_TEMPLATE_LISTS_H
-#define _LIBCPP___CXX03___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___CXX03___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 3bb9b942a3903..56e24f10ed63a 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___CXX03___SUPPORT_IBM_GETTOD_ZOS_H
-#define _LIBCPP___CXX03___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___CXX03___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 9fa8f8c9088e1..b78ef930a9850 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___CXX03___SUPPORT_IBM_LOCALE_MGMT_ZOS_H
-#define _LIBCPP___CXX03___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___CXX03___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 1b6883bbcc111..b3d2f309d9b7e 100644
--- a/libcxx/include/__cxx03/__support/ibm/nanosleep.h
+++ b/libcxx/include/__cxx03/__support/ibm/nanosleep.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___SUPPORT_IBM_NANOSLEEP_H
-#define _LIBCPP___CXX03___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___CXX03___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 f948a292c5f09..9c6d9b7397b08 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___CXX03___SUPPORT_XLOCALE_NOP_LOCALE_MGMT_H
-#define _LIBCPP___CXX03___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___CXX03___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 03e7f15f31ac9..c2a07bc4cbe44 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___CXX03___SUPPORT_XLOCALE_POSIX_L_FALLBACK_H
-#define _LIBCPP___CXX03___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___CXX03___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 9ab49ed036237..538019d31b674 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___CXX03___SUPPORT_XLOCALE_STRTONUM_FALLBACK_H
-#define _LIBCPP___CXX03___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___CXX03___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 d2f7dc5f50dd3..a68b7678bf689 100644
--- a/libcxx/include/__cxx03/__system_error/errc.h
+++ b/libcxx/include/__cxx03/__system_error/errc.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___ERRC
-#define _LIBCPP___CXX03___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___CXX03___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 8f04158ffc010..50971a500bb35 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___CXX03___SYSTEM_ERROR_ERROR_CATEGORY_H
-#define _LIBCPP___CXX03___SYSTEM_ERROR_ERROR_CATEGORY_H
+#ifndef _LIBCPP_CXX03_SYSTEM_ERROR_ERROR_CATEGORY_H
+#define _LIBCPP_CXX03_SYSTEM_ERROR_ERROR_CATEGORY_H
 
 #include <__cxx03/__config>
 #include <__cxx03/string>
@@ -61,4 +61,4 @@ __attribute__((__const__)) _LIBCPP_EXPORTED_FROM_ABI const error_category& syste
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 567f4c6749fa9..27e3be14511a8 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___CXX03___SYSTEM_ERROR_ERROR_CODE_H
-#define _LIBCPP___CXX03___SYSTEM_ERROR_ERROR_CODE_H
+#ifndef _LIBCPP_CXX03_SYSTEM_ERROR_ERROR_CODE_H
+#define _LIBCPP_CXX03_SYSTEM_ERROR_ERROR_CODE_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__functional/hash.h>
@@ -120,4 +120,4 @@ struct _LIBCPP_TEMPLATE_VIS hash<error_code> : public __unary_function<error_cod
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 9c7a216ce9acc..add126e377dc7 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___CXX03___SYSTEM_ERROR_ERROR_CONDITION_H
-#define _LIBCPP___CXX03___SYSTEM_ERROR_ERROR_CONDITION_H
+#ifndef _LIBCPP_CXX03_SYSTEM_ERROR_ERROR_CONDITION_H
+#define _LIBCPP_CXX03_SYSTEM_ERROR_ERROR_CONDITION_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__functional/hash.h>
@@ -106,4 +106,4 @@ struct _LIBCPP_TEMPLATE_VIS hash<error_condition> : public __unary_function<erro
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 84fbba1c84364..d7ad6610ac2b1 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___CXX03___SYSTEM_ERROR_SYSTEM_ERROR_H
-#define _LIBCPP___CXX03___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___CXX03___SYSTEM_ERROR_SYSTEM_ERROR_H
+#endif // _LIBCPP_CXX03_SYSTEM_ERROR_SYSTEM_ERROR_H
diff --git a/libcxx/include/__cxx03/__thread/id.h b/libcxx/include/__cxx03/__thread/id.h
index 66b54c55d3146..900c0636fe2ff 100644
--- a/libcxx/include/__cxx03/__thread/id.h
+++ b/libcxx/include/__cxx03/__thread/id.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___THREAD_ID_H
-#define _LIBCPP___CXX03___THREAD_ID_H
+#ifndef _LIBCPP_CXX03_THREAD_ID_H
+#define _LIBCPP_CXX03_THREAD_ID_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__fwd/functional.h>
@@ -99,4 +99,4 @@ inline _LIBCPP_HIDE_FROM_ABI __thread_id get_id() _NOEXCEPT { return __libcpp_th
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___THREAD_ID_H
+#endif // _LIBCPP_CXX03_THREAD_ID_H
diff --git a/libcxx/include/__cxx03/__thread/poll_with_backoff.h b/libcxx/include/__cxx03/__thread/poll_with_backoff.h
index 1d2db7728cc70..537f8cc9cd9cc 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___CXX03___THREAD_POLL_WITH_BACKOFF_H
-#define _LIBCPP___CXX03___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___CXX03___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 c1cdc999a6988..4a3b71514c727 100644
--- a/libcxx/include/__cxx03/__thread/support.h
+++ b/libcxx/include/__cxx03/__thread/support.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___THREAD_SUPPORT_H
-#define _LIBCPP___CXX03___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___CXX03___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 4ae6f841a9430..1c71d1708c725 100644
--- a/libcxx/include/__cxx03/__thread/support/c11.h
+++ b/libcxx/include/__cxx03/__thread/support/c11.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___THREAD_SUPPORT_C11_H
-#define _LIBCPP___CXX03___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___CXX03___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 39b2ad467fa56..0b4c47b369c55 100644
--- a/libcxx/include/__cxx03/__thread/support/external.h
+++ b/libcxx/include/__cxx03/__thread/support/external.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___THREAD_SUPPORT_EXTERNAL_H
-#define _LIBCPP___CXX03___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___CXX03___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 4ec5531003e02..3c47cbb5c6ec4 100644
--- a/libcxx/include/__cxx03/__thread/support/pthread.h
+++ b/libcxx/include/__cxx03/__thread/support/pthread.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___THREAD_SUPPORT_PTHREAD_H
-#define _LIBCPP___CXX03___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___CXX03___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 f9facbeefe4be..d8c8c3e28e1ba 100644
--- a/libcxx/include/__cxx03/__thread/support/windows.h
+++ b/libcxx/include/__cxx03/__thread/support/windows.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___THREAD_SUPPORT_WINDOWS_H
-#define _LIBCPP___CXX03___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>
@@ -128,4 +128,4 @@ _LIBCPP_EXPORTED_FROM_ABI int __libcpp_tls_set(__libcpp_tls_key __key, void* __p
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 4584d2d00ea9f..46059a975c0ba 100644
--- a/libcxx/include/__cxx03/__thread/this_thread.h
+++ b/libcxx/include/__cxx03/__thread/this_thread.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___THREAD_THIS_THREAD_H
-#define _LIBCPP___CXX03___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___CXX03___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 f9a5ed45aea99..59eb50d1bc996 100644
--- a/libcxx/include/__cxx03/__thread/thread.h
+++ b/libcxx/include/__cxx03/__thread/thread.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___THREAD_THREAD_H
-#define _LIBCPP___CXX03___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>
@@ -215,4 +215,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 f21d88629027e..cab1291536eae 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___CXX03___THREAD_TIMED_BACKOFF_POLICY_H
-#define _LIBCPP___CXX03___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___CXX03___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 3773fb485f488..2ba50d2eb0102 100644
--- a/libcxx/include/__cxx03/__tree
+++ b/libcxx/include/__cxx03/__tree
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___TREE
-#define _LIBCPP___CXX03___TREE
+#ifndef _LIBCPP_CXX03_TREE
+#define _LIBCPP_CXX03_TREE
 
 #include <__cxx03/__algorithm/min.h>
 #include <__cxx03/__assert>
@@ -2103,4 +2103,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___TREE
+#endif // _LIBCPP_CXX03_TREE
diff --git a/libcxx/include/__cxx03/__tuple/find_index.h b/libcxx/include/__cxx03/__tuple/find_index.h
index 253004ecba0ab..732e2892e97f0 100644
--- a/libcxx/include/__cxx03/__tuple/find_index.h
+++ b/libcxx/include/__cxx03/__tuple/find_index.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___TUPLE_FIND_INDEX_H
-#define _LIBCPP___CXX03___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>
@@ -17,4 +17,4 @@
 #  pragma GCC system_header
 #endif
 
-#endif // _LIBCPP___CXX03___TUPLE_FIND_INDEX_H
+#endif // _LIBCPP_CXX03_TUPLE_FIND_INDEX_H
diff --git a/libcxx/include/__cxx03/__tuple/make_tuple_types.h b/libcxx/include/__cxx03/__tuple/make_tuple_types.h
index 522d22a3eaa4b..ae842077a16f2 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___CXX03___TUPLE_MAKE_TUPLE_TYPES_H
-#define _LIBCPP___CXX03___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>
@@ -25,4 +25,4 @@
 #  pragma GCC system_header
 #endif
 
-#endif // _LIBCPP___CXX03___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 dbcbf76d38a42..73b0923bd9785 100644
--- a/libcxx/include/__cxx03/__tuple/sfinae_helpers.h
+++ b/libcxx/include/__cxx03/__tuple/sfinae_helpers.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___TUPLE_SFINAE_HELPERS_H
-#define _LIBCPP___CXX03___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>
@@ -33,4 +33,4 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 3061cbbab8e34..f1074fa1f229a 100644
--- a/libcxx/include/__cxx03/__tuple/tuple_element.h
+++ b/libcxx/include/__cxx03/__tuple/tuple_element.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___TUPLE_TUPLE_ELEMENT_H
-#define _LIBCPP___CXX03___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>
@@ -40,4 +40,4 @@ struct _LIBCPP_TEMPLATE_VIS tuple_element<_Ip, const volatile _Tp> {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 546b04d9298d7..1944a4d1cd8ad 100644
--- a/libcxx/include/__cxx03/__tuple/tuple_indices.h
+++ b/libcxx/include/__cxx03/__tuple/tuple_indices.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___TUPLE_MAKE_TUPLE_INDICES_H
-#define _LIBCPP___CXX03___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>
@@ -17,4 +17,4 @@
 #  pragma GCC system_header
 #endif
 
-#endif // _LIBCPP___CXX03___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 358c681648348..1dbacb528cf46 100644
--- a/libcxx/include/__cxx03/__tuple/tuple_like.h
+++ b/libcxx/include/__cxx03/__tuple/tuple_like.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___TUPLE_TUPLE_LIKE_H
-#define _LIBCPP___CXX03___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>
@@ -23,4 +23,4 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 2b91e60587899..3879dabbc32d2 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___CXX03___TUPLE_TUPLE_LIKE_EXT_H
-#define _LIBCPP___CXX03___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>
@@ -44,4 +44,4 @@ struct __tuple_like_ext<__tuple_types<_Tp...> > : true_type {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 11080c3162117..92fa2be8b0783 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___CXX03___TUPLE_TUPLE_LIKE_NO_SUBRANGE_H
-#define _LIBCPP___CXX03___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>
@@ -26,4 +26,4 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 a63df3a2cf90e..06c1526aa3db2 100644
--- a/libcxx/include/__cxx03/__tuple/tuple_size.h
+++ b/libcxx/include/__cxx03/__tuple/tuple_size.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___TUPLE_TUPLE_SIZE_H
-#define _LIBCPP___CXX03___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>
@@ -34,4 +34,4 @@ struct _LIBCPP_TEMPLATE_VIS tuple_size<const volatile _Tp> : public tuple_size<_
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 72ee76f49412d..c2f9a845a8ffd 100644
--- a/libcxx/include/__cxx03/__tuple/tuple_types.h
+++ b/libcxx/include/__cxx03/__tuple/tuple_types.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___TUPLE_TUPLE_TYPES_H
-#define _LIBCPP___CXX03___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___CXX03___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 1130d4cb48636..b8a9a96a015f2 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___CXX03___TYPE_TRAITS_ADD_CONST_H
-#define _LIBCPP___CXX03___TYPE_TRAITS_ADD_CONST_H
+#ifndef _LIBCPP_CXX03_TYPE_TRAITS_ADD_CONST_H
+#define _LIBCPP_CXX03_TYPE_TRAITS_ADD_CONST_H
 
 #include <__cxx03/__config>
 
@@ -24,4 +24,4 @@ struct _LIBCPP_TEMPLATE_VIS add_const {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 2b9e4f86cd673..218a0f0cd59e1 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___CXX03___TYPE_TRAITS_ADD_CV_H
-#define _LIBCPP___CXX03___TYPE_TRAITS_ADD_CV_H
+#ifndef _LIBCPP_CXX03_TYPE_TRAITS_ADD_CV_H
+#define _LIBCPP_CXX03_TYPE_TRAITS_ADD_CV_H
 
 #include <__cxx03/__config>
 
@@ -24,4 +24,4 @@ struct _LIBCPP_TEMPLATE_VIS add_cv {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 862224e526a55..df4689029a9f6 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___CXX03___TYPE_TRAITS_ADD_LVALUE_REFERENCE_H
-#define _LIBCPP___CXX03___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>
@@ -46,4 +46,4 @@ struct add_lvalue_reference {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 e5cf094d05fdc..bc38975be0f86 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___CXX03___TYPE_TRAITS_ADD_POINTER_H
-#define _LIBCPP___CXX03___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>
@@ -47,4 +47,4 @@ struct add_pointer {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 bc0adbf66b351..9d27d47d66ad5 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___CXX03___TYPE_TRAITS_ADD_RVALUE_REFERENCE_H
-#define _LIBCPP___CXX03___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>
@@ -46,4 +46,4 @@ struct add_rvalue_reference {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 6a952b2d18d4c..f670be94c1e38 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___CXX03___TYPE_TRAITS_ADD_VOLATILE_H
-#define _LIBCPP___CXX03___TYPE_TRAITS_ADD_VOLATILE_H
+#ifndef _LIBCPP_CXX03_TYPE_TRAITS_ADD_VOLATILE_H
+#define _LIBCPP_CXX03_TYPE_TRAITS_ADD_VOLATILE_H
 
 #include <__cxx03/__config>
 
@@ -24,4 +24,4 @@ struct _LIBCPP_TEMPLATE_VIS add_volatile {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 216b8b410cc25..94db47d0ff3f9 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___CXX03___TYPE_TRAITS_ALIGNED_STORAGE_H
-#define _LIBCPP___CXX03___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>
@@ -126,4 +126,4 @@ _CREATE_ALIGNED_STORAGE_SPECIALIZATION(0x4000);
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 22543833bb452..957cea6105401 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___CXX03___TYPE_TRAITS_ALIGNED_UNION_H
-#define _LIBCPP___CXX03___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>
@@ -43,4 +43,4 @@ struct aligned_union {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 ead52b2f7816b..ad34e792edd26 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___CXX03___TYPE_TRAITS_ALIGNMENT_OF_H
-#define _LIBCPP___CXX03___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>
@@ -24,4 +24,4 @@ struct _LIBCPP_TEMPLATE_VIS alignment_of : public integral_constant<size_t, _LIB
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 437cee6bcb9ae..85e7fd0d7f563 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___CXX03___TYPE_TRAITS_CAN_EXTRACT_KEY_H
-#define _LIBCPP___CXX03___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___CXX03___TYPE_TRAITS_CAN_EXTRACT_KEY_H
+#endif // _LIBCPP_CXX03_TYPE_TRAITS_CAN_EXTRACT_KEY_H
diff --git a/libcxx/include/__cxx03/__type_traits/common_type.h b/libcxx/include/__cxx03/__type_traits/common_type.h
index 756da08dcc366..fe9cacb533188 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___CXX03___TYPE_TRAITS_COMMON_TYPE_H
-#define _LIBCPP___CXX03___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>
@@ -76,4 +76,4 @@ struct _LIBCPP_TEMPLATE_VIS common_type<_Tp, _Up, _Vp, _Rest...>
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 2f76c52766c47..6d9d064f58437 100644
--- a/libcxx/include/__cxx03/__type_traits/conditional.h
+++ b/libcxx/include/__cxx03/__type_traits/conditional.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___TYPE_TRAITS_CONDITIONAL_H
-#define _LIBCPP___CXX03___TYPE_TRAITS_CONDITIONAL_H
+#ifndef _LIBCPP_CXX03_TYPE_TRAITS_CONDITIONAL_H
+#define _LIBCPP_CXX03_TYPE_TRAITS_CONDITIONAL_H
 
 #include <__cxx03/__config>
 
@@ -50,4 +50,4 @@ using __conditional_t _LIBCPP_NODEBUG = typename conditional<_Bp, _If, _Then>::t
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 17f4108866651..ca113689a548b 100644
--- a/libcxx/include/__cxx03/__type_traits/conjunction.h
+++ b/libcxx/include/__cxx03/__type_traits/conjunction.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___TYPE_TRAITS_CONJUNCTION_H
-#define _LIBCPP___CXX03___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>
@@ -46,4 +46,4 @@ struct __all : _IsSame<__all_dummy<_Pred...>, __all_dummy<((void)_Pred, true)...
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 46913594d6860..82fa2d9c880d8 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___CXX03___TYPE_TRAITS_COPY_CV_H
-#define _LIBCPP___CXX03___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___CXX03___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 f2bb2be9c0a33..c5a5de5e0409f 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___CXX03___TYPE_TRAITS_COPY_CVREF_H
-#define _LIBCPP___CXX03___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___CXX03___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 d428856d13a66..b43659a643361 100644
--- a/libcxx/include/__cxx03/__type_traits/datasizeof.h
+++ b/libcxx/include/__cxx03/__type_traits/datasizeof.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___TYPE_TRAITS_DATASIZEOF_H
-#define _LIBCPP___CXX03___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___CXX03___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 cf9c30342c5f0..259cb45ccc6c8 100644
--- a/libcxx/include/__cxx03/__type_traits/decay.h
+++ b/libcxx/include/__cxx03/__type_traits/decay.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___TYPE_TRAITS_DECAY_H
-#define _LIBCPP___CXX03___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>
@@ -65,4 +65,4 @@ using __decay_t = typename decay<_Tp>::type;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 60ce814ca6b0d..48ca3d831ddfd 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___CXX03___TYPE_TRAITS_DEPENDENT_TYPE_H
-#define _LIBCPP___CXX03___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___CXX03___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 eb2dfefd86e2c..257c337180b45 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___CXX03___TYPE_TRAITS_DESUGARS_TO_H
-#define _LIBCPP___CXX03___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___CXX03___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 18880ea686c53..a49217a87e6d2 100644
--- a/libcxx/include/__cxx03/__type_traits/disjunction.h
+++ b/libcxx/include/__cxx03/__type_traits/disjunction.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___TYPE_TRAITS_DISJUNCTION_H
-#define _LIBCPP___CXX03___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>
@@ -45,4 +45,4 @@ using _Or _LIBCPP_NODEBUG = typename _OrImpl<sizeof...(_Args) != 0>::template _R
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 f43ac34292ee5..61b86bcdd62f5 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___CXX03___TYPE_TRAITS_ENABLE_IF_H
-#define _LIBCPP___CXX03___TYPE_TRAITS_ENABLE_IF_H
+#ifndef _LIBCPP_CXX03_TYPE_TRAITS_ENABLE_IF_H
+#define _LIBCPP_CXX03_TYPE_TRAITS_ENABLE_IF_H
 
 #include <__cxx03/__config>
 
@@ -29,4 +29,4 @@ using __enable_if_t _LIBCPP_NODEBUG = typename enable_if<_Bp, _Tp>::type;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 b78f5cf68d50a..c5719c7aecc16 100644
--- a/libcxx/include/__cxx03/__type_traits/extent.h
+++ b/libcxx/include/__cxx03/__type_traits/extent.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___TYPE_TRAITS_EXTENT_H
-#define _LIBCPP___CXX03___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>
@@ -41,4 +41,4 @@ struct _LIBCPP_TEMPLATE_VIS extent<_Tp[_Np], _Ip> : public integral_constant<siz
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___TYPE_TRAITS_EXTENT_H
+#endif // _LIBCPP_CXX03_TYPE_TRAITS_EXTENT_H
diff --git a/libcxx/include/__cxx03/__type_traits/has_virtual_destructor.h b/libcxx/include/__cxx03/__type_traits/has_virtual_destructor.h
index 833e58e4c576f..e2750fb48c1e7 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___CXX03___TYPE_TRAITS_HAS_VIRTUAL_DESTRUCTOR_H
-#define _LIBCPP___CXX03___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>
@@ -23,4 +23,4 @@ struct _LIBCPP_TEMPLATE_VIS has_virtual_destructor : public integral_constant<bo
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 3e67e010b4da8..657bf3aff54e3 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___CXX03___TYPE_TRAITS_INTEGRAL_CONSTANT_H
-#define _LIBCPP___CXX03___TYPE_TRAITS_INTEGRAL_CONSTANT_H
+#ifndef _LIBCPP_CXX03_TYPE_TRAITS_INTEGRAL_CONSTANT_H
+#define _LIBCPP_CXX03_TYPE_TRAITS_INTEGRAL_CONSTANT_H
 
 #include <__cxx03/__config>
 
@@ -36,4 +36,4 @@ using _BoolConstant _LIBCPP_NODEBUG = integral_constant<bool, _Val>;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 1ae236d9676b0..c46560c869fae 100644
--- a/libcxx/include/__cxx03/__type_traits/invoke.h
+++ b/libcxx/include/__cxx03/__type_traits/invoke.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___TYPE_TRAITS_INVOKE_H
-#define _LIBCPP___CXX03___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>
@@ -211,4 +211,4 @@ struct __invoke_void_return_wrapper<_Ret, true> {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 528c3727d2337..5fc82fdeedf2c 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___CXX03___TYPE_TRAITS_IS_ABSTRACT_H
-#define _LIBCPP___CXX03___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>
@@ -23,4 +23,4 @@ struct _LIBCPP_TEMPLATE_VIS is_abstract : public integral_constant<bool, __is_ab
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___TYPE_TRAITS_IS_ABSTRACT_H
+#endif // _LIBCPP_CXX03_TYPE_TRAITS_IS_ABSTRACT_H
diff --git a/libcxx/include/__cxx03/__type_traits/is_allocator.h b/libcxx/include/__cxx03/__type_traits/is_allocator.h
index b2b73ec53fe2b..cae48768cbe6e 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___CXX03___TYPE_IS_ALLOCATOR_H
-#define _LIBCPP___CXX03___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___CXX03___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 8fb9e519d03ea..86931c78a3de0 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___CXX03___TYPE_TRAITS_IS_ALWAYS_BITCASTABLE_H
-#define _LIBCPP___CXX03___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___CXX03___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 493b025359ffb..c67a30979ac7f 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___CXX03___TYPE_TRAITS_IS_ARITHMETIC_H
-#define _LIBCPP___CXX03___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>
@@ -26,4 +26,4 @@ struct _LIBCPP_TEMPLATE_VIS is_arithmetic
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 2f3752f67d98e..35741022f7e6f 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___CXX03___TYPE_TRAITS_IS_ARRAY_H
-#define _LIBCPP___CXX03___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>
@@ -38,4 +38,4 @@ struct _LIBCPP_TEMPLATE_VIS is_array<_Tp[_Np]> : public true_type {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 5b740d2046064..fff13fa26be1c 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___CXX03___TYPE_TRAITS_IS_ASSIGNABLE_H
-#define _LIBCPP___CXX03___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>
@@ -34,4 +34,4 @@ struct _LIBCPP_TEMPLATE_VIS is_move_assignable
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 25fe555a49e35..fc8f70172ab38 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___CXX03___TYPE_TRAITS_IS_BASE_OF_H
-#define _LIBCPP___CXX03___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>
@@ -23,4 +23,4 @@ struct _LIBCPP_TEMPLATE_VIS is_base_of : public integral_constant<bool, __is_bas
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 c1e464c1c7241..661cd65d4630b 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___CXX03___TYPE_TRAITS_IS_BOUNDED_ARRAY_H
-#define _LIBCPP___CXX03___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>
@@ -26,4 +26,4 @@ struct _LIBCPP_TEMPLATE_VIS __libcpp_is_bounded_array<_Tp[_Np]> : true_type {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 f4f20348416ce..a91660c2103ae 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___CXX03___TYPE_TRAITS_IS_CALLABLE_H
-#define _LIBCPP___CXX03___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___CXX03___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 e252b6ad18879..82fb038e8ac78 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___CXX03___TYPE_TRAITS_IS_CHAR_LIKE_TYPE_H
-#define _LIBCPP___CXX03___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___CXX03___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 3bcadd6b7531b..ef50b0a34d52d 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___CXX03___TYPE_TRAITS_IS_CLASS_H
-#define _LIBCPP___CXX03___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>
@@ -23,4 +23,4 @@ struct _LIBCPP_TEMPLATE_VIS is_class : public integral_constant<bool, __is_class
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 ac87b1d461dbb..d2e3a0db6badb 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___CXX03___TYPE_TRAITS_IS_COMPOUND_H
-#define _LIBCPP___CXX03___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>
@@ -33,4 +33,4 @@ struct _LIBCPP_TEMPLATE_VIS is_compound : public integral_constant<bool, !is_fun
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 a6d852ac7e223..8c046b52a1a8b 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___CXX03___TYPE_TRAITS_IS_CONST_H
-#define _LIBCPP___CXX03___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>
@@ -34,4 +34,4 @@ struct _LIBCPP_TEMPLATE_VIS is_const<_Tp const> : public true_type {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 9034a3499cbf7..b39863b798340 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___CXX03___TYPE_TRAITS_IS_CONSTANT_EVALUATED_H
-#define _LIBCPP___CXX03___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>
 
@@ -23,4 +23,4 @@ _LIBCPP_HIDE_FROM_ABI inline bool __libcpp_is_constant_evaluated() _NOEXCEPT {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 c8c0eaa4e8989..90997d2eb5ff1 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___CXX03___TYPE_IS_CONSTRUCTIBLE_H
-#define _LIBCPP___CXX03___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>
@@ -36,4 +36,4 @@ struct _LIBCPP_TEMPLATE_VIS is_default_constructible : public integral_constant<
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 c805c82467a18..67c67ac5758fe 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___CXX03___TYPE_TRAITS_IS_CONVERTIBLE_H
-#define _LIBCPP___CXX03___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>
@@ -23,4 +23,4 @@ struct _LIBCPP_TEMPLATE_VIS is_convertible : public integral_constant<bool, __is
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 97db84044fe61..72fbfe810ebdd 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___CXX03___TYPE_TRAITS_IS_CORE_CONVERTIBLE_H
-#define _LIBCPP___CXX03___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___CXX03___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 35b4cb824b3d1..08f157e3d5fd4 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___CXX03___TYPE_TRAITS_IS_DESTRUCTIBLE_H
-#define _LIBCPP___CXX03___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>
@@ -84,4 +84,4 @@ struct is_destructible<void> : public false_type {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 841684f7d008b..f2416decc5bd8 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___CXX03___TYPE_TRAITS_IS_EMPTY_H
-#define _LIBCPP___CXX03___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>
@@ -23,4 +23,4 @@ struct _LIBCPP_TEMPLATE_VIS is_empty : public integral_constant<bool, __is_empty
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 85e975454ae68..f16ec87c7c45e 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___CXX03___TYPE_TRAITS_IS_ENUM_H
-#define _LIBCPP___CXX03___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>
@@ -23,4 +23,4 @@ struct _LIBCPP_TEMPLATE_VIS is_enum : public integral_constant<bool, __is_enum(_
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 da62137eaab5c..c9eb7552c0c80 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___CXX03___TYPE_TRAITS_IS_EQUALITY_COMPARABLE_H
-#define _LIBCPP___CXX03___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___CXX03___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 f7aba04c2fbd7..8a4016940b5e5 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___CXX03___TYPE_TRAITS_IS_EXECUTION_POLICY_H
-#define _LIBCPP___CXX03___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>
@@ -16,4 +16,4 @@
 #  pragma GCC system_header
 #endif
 
-#endif // _LIBCPP___CXX03___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 9a063808f2b7c..f237fd030f98a 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___CXX03___TYPE_TRAITS_IS_FINAL_H
-#define _LIBCPP___CXX03___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>
@@ -23,4 +23,4 @@ struct _LIBCPP_TEMPLATE_VIS __libcpp_is_final : public integral_constant<bool, _
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 ea3578af05dd3..2f59de83113ef 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___CXX03___TYPE_TRAITS_IS_FLOATING_POINT_H
-#define _LIBCPP___CXX03___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>
@@ -31,4 +31,4 @@ struct _LIBCPP_TEMPLATE_VIS is_floating_point : public __libcpp_is_floating_poin
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 ee54173f5bd43..f19773a8fead5 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___CXX03___TYPE_TRAITS_IS_FUNCTIONAL_H
-#define _LIBCPP___CXX03___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>
@@ -23,4 +23,4 @@ struct _LIBCPP_TEMPLATE_VIS is_function : integral_constant<bool, __is_function(
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 4578952f2ad62..23218eadecc1e 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___CXX03___TYPE_TRAITS_IS_FUNDAMENTAL_H
-#define _LIBCPP___CXX03___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>
@@ -35,4 +35,4 @@ struct _LIBCPP_TEMPLATE_VIS is_fundamental
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 e0f86c2377604..647400a50b329 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___CXX03___TYPE_TRAITS_IS_IMPLICITLY_DEFAULT_CONSTRUCTIBLE_H
-#define _LIBCPP___CXX03___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>
@@ -21,4 +21,4 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 36c4aa58a3744..2558fa058ee04 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___CXX03___TYPE_TRAITS_IS_INTEGRAL_H
-#define _LIBCPP___CXX03___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>
@@ -61,4 +61,4 @@ struct _LIBCPP_TEMPLATE_VIS is_integral : public _BoolConstant<__libcpp_is_integ
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 6c5df6ef71d81..4a9335b572407 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___CXX03___TYPE_TRAITS_IS_LITERAL_TYPE
-#define _LIBCPP___CXX03___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>
@@ -23,4 +23,4 @@ struct _LIBCPP_TEMPLATE_VIS is_literal_type : public integral_constant<bool, __i
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 25100a47e6ac1..2a7de29f2fa9a 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___CXX03___TYPE_TRAITS_IS_MEMBER_POINTER_H
-#define _LIBCPP___CXX03___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>
@@ -29,4 +29,4 @@ struct _LIBCPP_TEMPLATE_VIS is_member_function_pointer : _BoolConstant<__is_memb
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 d62325626e8c2..484227150ba06 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___CXX03___TYPE_TRAITS_IS_NOTHROW_ASSIGNABLE_H
-#define _LIBCPP___CXX03___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>
@@ -38,4 +38,4 @@ struct _LIBCPP_TEMPLATE_VIS is_nothrow_move_assignable
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 cbcf355398db1..c1b497c0313f9 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___CXX03___TYPE_TRAITS_IS_NOTHROW_CONSTRUCTIBLE_H
-#define _LIBCPP___CXX03___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>
@@ -38,4 +38,4 @@ struct _LIBCPP_TEMPLATE_VIS is_nothrow_default_constructible
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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_destructible.h b/libcxx/include/__cxx03/__type_traits/is_nothrow_destructible.h
index 317aceec2d60e..a16288029409a 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___CXX03___TYPE_TRAITS_IS_NOTHROW_DESTRUCTIBLE_H
-#define _LIBCPP___CXX03___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>
@@ -55,4 +55,4 @@ struct _LIBCPP_TEMPLATE_VIS is_nothrow_destructible<_Tp&&> : public true_type {}
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 4a2bcf678a7cd..9b9a77f907156 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___CXX03___TYPE_TRAITS_IS_NULL_POINTER_H
-#define _LIBCPP___CXX03___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>
@@ -24,4 +24,4 @@ inline const bool __is_null_pointer_v = __is_same(__remove_cv(_Tp), nullptr_t);
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 c2f95d71d7ef5..0cf482d3d8a3f 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___CXX03___TYPE_TRAITS_IS_OBJECT_H
-#define _LIBCPP___CXX03___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>
@@ -23,4 +23,4 @@ struct _LIBCPP_TEMPLATE_VIS is_object : _BoolConstant<__is_object(_Tp)> {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 8956fc76a2a92..858dcabd935ed 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___CXX03___TYPE_TRAITS_IS_POD_H
-#define _LIBCPP___CXX03___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>
@@ -23,4 +23,4 @@ struct _LIBCPP_TEMPLATE_VIS is_pod : public integral_constant<bool, __is_pod(_Tp
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 bc4d47f641b4a..911ced7803555 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___CXX03___TYPE_TRAITS_IS_POINTER_H
-#define _LIBCPP___CXX03___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>
@@ -52,4 +52,4 @@ struct _LIBCPP_TEMPLATE_VIS is_pointer
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 d3c9f40e0170a..461ee31135403 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___CXX03___TYPE_TRAITS_IS_POLYMORPHIC_H
-#define _LIBCPP___CXX03___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>
@@ -23,4 +23,4 @@ struct _LIBCPP_TEMPLATE_VIS is_polymorphic : public integral_constant<bool, __is
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 92cd5596fea3c..e2007bef2d192 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___CXX03___TYPE_TRAITS_IS_PRIMARY_TEMPLATE_H
-#define _LIBCPP___CXX03___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___CXX03___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 cef696530ffdd..eff66979a1ed1 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___CXX03___TYPE_TRAITS_IS_REFERENCE_H
-#define _LIBCPP___CXX03___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>
@@ -45,4 +45,4 @@ struct _LIBCPP_TEMPLATE_VIS is_rvalue_reference<_Tp&&> : public true_type {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 3cbce8faa9110..bb7f4aeaf7fcf 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___CXX03___TYPE_TRAITS_IS_REFERENCE_WRAPPER_H
-#define _LIBCPP___CXX03___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___CXX03___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 7bc98e8858001..c348b133240f0 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___CXX03___TYPE_TRAITS_IS_REFERENCEABLE_H
-#define _LIBCPP___CXX03___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___CXX03___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 e1e5c7c964f6e..f57ef340ff70d 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___CXX03___TYPE_TRAITS_IS_SAME_H
-#define _LIBCPP___CXX03___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>
@@ -36,4 +36,4 @@ using _IsNotSame = _BoolConstant<!__is_same(_Tp, _Up)>;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 3a32a6bd982e1..5feb551cec327 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___CXX03___TYPE_TRAITS_IS_SCALAR_H
-#define _LIBCPP___CXX03___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>
@@ -56,4 +56,4 @@ struct _LIBCPP_TEMPLATE_VIS is_scalar<nullptr_t> : public true_type {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 3242e8b2ebb14..317b0dc4e06b1 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___CXX03___TYPE_TRAITS_IS_SIGNED_H
-#define _LIBCPP___CXX03___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>
@@ -46,4 +46,4 @@ struct _LIBCPP_TEMPLATE_VIS is_signed : public __libcpp_is_signed<_Tp> {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 6a1198f24cd4c..a2a7e8de06caf 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___CXX03___TYPE_TRAITS_IS_SIGNED_INTEGER_H
-#define _LIBCPP___CXX03___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___CXX03___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 4c46ccae7f681..526f5bfd98c0c 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___CXX03___TYPE_TRAITS_IS_SPECIALIZATION
-#define _LIBCPP___CXX03___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.
 //
@@ -32,4 +32,4 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 48d45070cc3be..1723b40650e96 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___CXX03___TYPE_TRAITS_IS_STANDARD_LAYOUT_H
-#define _LIBCPP___CXX03___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>
@@ -23,4 +23,4 @@ struct _LIBCPP_TEMPLATE_VIS is_standard_layout : public integral_constant<bool,
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 592c6f247c1ff..ccfd2357b73c0 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___CXX03___TYPE_TRAITS_IS_SWAPPABLE_H
-#define _LIBCPP___CXX03___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>
@@ -57,4 +57,4 @@ inline const bool __is_swappable_with_v<_Tp,
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 2c6ab41b96e3d..8ac62b3758a63 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___CXX03___TYPE_TRAITS_IS_TRIVIAL_H
-#define _LIBCPP___CXX03___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>
@@ -23,4 +23,4 @@ struct _LIBCPP_TEMPLATE_VIS is_trivial : public integral_constant<bool, __is_tri
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 bfa67e5abdbe9..e03238c77bb47 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___CXX03___TYPE_TRAITS_IS_TRIVIALLY_ASSIGNABLE_H
-#define _LIBCPP___CXX03___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>
@@ -38,4 +38,4 @@ struct _LIBCPP_TEMPLATE_VIS is_trivially_move_assignable
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 b30582e2b3775..bb3478743603f 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___CXX03___TYPE_TRAITS_IS_TRIVIALLY_CONSTRUCTIBLE_H
-#define _LIBCPP___CXX03___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>
@@ -38,4 +38,4 @@ struct _LIBCPP_TEMPLATE_VIS is_trivially_default_constructible
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 bec189c37ecd7..bc04dc5e8c481 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___CXX03___TYPE_TRAITS_IS_TRIVIALLY_COPYABLE_H
-#define _LIBCPP___CXX03___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>
@@ -24,4 +24,4 @@ struct _LIBCPP_TEMPLATE_VIS is_trivially_copyable : public integral_constant<boo
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 20b2df3d3b581..9fc2bd7ac7cf5 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___CXX03___TYPE_TRAITS_IS_TRIVIALLY_DESTRUCTIBLE_H
-#define _LIBCPP___CXX03___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>
@@ -39,4 +39,4 @@ struct _LIBCPP_TEMPLATE_VIS is_trivially_destructible
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 a5522b4427a9c..4ea535517a808 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___CXX03___TYPE_TRAITS_IS_TRIVIALLY_LEXICOGRAPHICALLY_COMPARABLE_H
-#define _LIBCPP___CXX03___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___CXX03___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 f860d487dba0e..10b35742e0b24 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___CXX03___TYPE_TRAITS_IS_TRIVIALLY_RELOCATABLE_H
-#define _LIBCPP___CXX03___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___CXX03___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 77c051b1d436a..c244ec251bcf0 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___CXX03___TYPE_TRAITS_IS_UNBOUNDED_ARRAY_H
-#define _LIBCPP___CXX03___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>
@@ -25,4 +25,4 @@ struct _LIBCPP_TEMPLATE_VIS __libcpp_is_unbounded_array<_Tp[]> : true_type {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 6e69fc01952a3..2e574de5cbe32 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___CXX03___TYPE_TRAITS_IS_UNION_H
-#define _LIBCPP___CXX03___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>
@@ -23,4 +23,4 @@ struct _LIBCPP_TEMPLATE_VIS is_union : public integral_constant<bool, __is_union
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 38bd6d86f6258..8db650917ebec 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___CXX03___TYPE_TRAITS_IS_UNSIGNED_H
-#define _LIBCPP___CXX03___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>
@@ -46,4 +46,4 @@ struct _LIBCPP_TEMPLATE_VIS is_unsigned : public __libcpp_is_unsigned<_Tp> {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 250427cf8adf9..a7a51ff75b602 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___CXX03___TYPE_TRAITS_IS_UNSIGNED_INTEGER_H
-#define _LIBCPP___CXX03___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___CXX03___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 d2b8927d78e24..6b0e62e35671c 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___CXX03___TYPE_TRAITS_IS_VALID_EXPANSION_H
-#define _LIBCPP___CXX03___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___CXX03___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 25dbcd82d976d..f648513b8cd39 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___CXX03___TYPE_TRAITS_IS_VOID_H
-#define _LIBCPP___CXX03___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>
@@ -23,4 +23,4 @@ struct _LIBCPP_TEMPLATE_VIS is_void : _BoolConstant<__is_same(__remove_cv(_Tp),
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 b06598200ab86..a2de6bec6c73c 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___CXX03___TYPE_TRAITS_IS_VOLATILE_H
-#define _LIBCPP___CXX03___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>
@@ -34,4 +34,4 @@ struct _LIBCPP_TEMPLATE_VIS is_volatile<_Tp volatile> : public true_type {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 5362d98929894..4a6b50525bf8e 100644
--- a/libcxx/include/__cxx03/__type_traits/lazy.h
+++ b/libcxx/include/__cxx03/__type_traits/lazy.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___TYPE_TRAITS_LAZY_H
-#define _LIBCPP___CXX03___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___CXX03___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 3f4bfc04087d3..6e53de5e3f506 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___CXX03___TYPE_TRAITS_MAKE_32_64_OR_128_BIT_H
-#define _LIBCPP___CXX03___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>
@@ -43,4 +43,4 @@ using __make_32_64_or_128_bit_t =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 de7fc2a845967..e97e8d67c5c4e 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___CXX03___TYPE_TRAITS_MAKE_CONST_LVALUE_REF_H
-#define _LIBCPP___CXX03___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___CXX03___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 a701233093824..9156d5fb309df 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___CXX03___TYPE_TRAITS_MAKE_SIGNED_H
-#define _LIBCPP___CXX03___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>
@@ -81,4 +81,4 @@ struct make_signed {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 fe355a460d7c2..84ffe701d4ba5 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___CXX03___TYPE_TRAITS_MAKE_UNSIGNED_H
-#define _LIBCPP___CXX03___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>
@@ -86,4 +86,4 @@ using __copy_unsigned_t = __conditional_t<is_unsigned<_Tp>::value, __make_unsign
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 88551f8fac1c6..6e75901d14955 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___CXX03___TYPE_TRAITS_MAYBE_CONST_H
-#define _LIBCPP___CXX03___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___CXX03___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 9dee997e0d3d6..f4a58da3629f2 100644
--- a/libcxx/include/__cxx03/__type_traits/nat.h
+++ b/libcxx/include/__cxx03/__type_traits/nat.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___TYPE_TRAITS_NAT_H
-#define _LIBCPP___CXX03___TYPE_TRAITS_NAT_H
+#ifndef _LIBCPP_CXX03_TYPE_TRAITS_NAT_H
+#define _LIBCPP_CXX03_TYPE_TRAITS_NAT_H
 
 #include <__cxx03/__config>
 
@@ -21,4 +21,4 @@ struct __nat {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 247db7c92ec92..86e618e82b7fc 100644
--- a/libcxx/include/__cxx03/__type_traits/negation.h
+++ b/libcxx/include/__cxx03/__type_traits/negation.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___TYPE_TRAITS_NEGATION_H
-#define _LIBCPP___CXX03___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>
@@ -23,4 +23,4 @@ struct _Not : _BoolConstant<!_Pred::value> {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 607acd4df1f39..ef9a1b37d858d 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___CXX03___TYPE_TRAITS_NOEXCEPT_MOVE_ASSIGN_CONTAINER_H
-#define _LIBCPP___CXX03___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>
@@ -28,4 +28,4 @@ struct __noexcept_move_assign_container
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 92671223e3dbd..2f57af729e1b3 100644
--- a/libcxx/include/__cxx03/__type_traits/promote.h
+++ b/libcxx/include/__cxx03/__type_traits/promote.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___TYPE_TRAITS_PROMOTE_H
-#define _LIBCPP___CXX03___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___CXX03___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 d8a98d7e57068..d83998c77bf41 100644
--- a/libcxx/include/__cxx03/__type_traits/rank.h
+++ b/libcxx/include/__cxx03/__type_traits/rank.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___TYPE_TRAITS_RANK_H
-#define _LIBCPP___CXX03___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>
@@ -38,4 +38,4 @@ struct _LIBCPP_TEMPLATE_VIS rank<_Tp[_Np]> : public integral_constant<size_t, ra
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 b10fb56a0ab40..65db03c46a30e 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___CXX03___TYPE_TRAITS_REMOVE_ALL_EXTENTS_H
-#define _LIBCPP___CXX03___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>
@@ -46,4 +46,4 @@ using __remove_all_extents_t = typename remove_all_extents<_Tp>::type;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 19dad1eb63a86..512948ad173da 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___CXX03___TYPE_TRAITS_REMOVE_CONST_H
-#define _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_CONST_H
+#ifndef _LIBCPP_CXX03_TYPE_TRAITS_REMOVE_CONST_H
+#define _LIBCPP_CXX03_TYPE_TRAITS_REMOVE_CONST_H
 
 #include <__cxx03/__config>
 
@@ -41,4 +41,4 @@ using __remove_const_t = typename remove_const<_Tp>::type;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 24f7272880600..894c442a0b11e 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___CXX03___TYPE_TRAITS_REMOVE_CONST_REF_H
-#define _LIBCPP___CXX03___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___CXX03___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 74b17a69fc84d..0485b77fdf2b0 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___CXX03___TYPE_TRAITS_REMOVE_CV_H
-#define _LIBCPP___CXX03___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>
@@ -39,4 +39,4 @@ using __remove_cv_t = __remove_volatile_t<__remove_const_t<_Tp> >;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 488ee091948f5..271cf3b180e76 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___CXX03___TYPE_TRAITS_REMOVE_CVREF_H
-#define _LIBCPP___CXX03___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>
@@ -33,4 +33,4 @@ struct __is_same_uncvref : _IsSame<__remove_cvref_t<_Tp>, __remove_cvref_t<_Up>
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 af1f499195be1..807e4480648bc 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___CXX03___TYPE_TRAITS_REMOVE_EXTENT_H
-#define _LIBCPP___CXX03___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>
@@ -46,4 +46,4 @@ using __remove_extent_t = typename remove_extent<_Tp>::type;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 4e8562697f9a6..9a5ce9eab3b6d 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___CXX03___TYPE_TRAITS_REMOVE_POINTER_H
-#define _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_POINTER_H
+#ifndef _LIBCPP_CXX03_TYPE_TRAITS_REMOVE_POINTER_H
+#define _LIBCPP_CXX03_TYPE_TRAITS_REMOVE_POINTER_H
 
 #include <__cxx03/__config>
 
@@ -45,4 +45,4 @@ using __remove_pointer_t = typename remove_pointer<_Tp>::type;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 215756bc22262..fc01661bb5aab 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___CXX03___TYPE_TRAITS_REMOVE_REFERENCE_H
-#define _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_REFERENCE_H
+#ifndef _LIBCPP_CXX03_TYPE_TRAITS_REMOVE_REFERENCE_H
+#define _LIBCPP_CXX03_TYPE_TRAITS_REMOVE_REFERENCE_H
 
 #include <__cxx03/__config>
 
@@ -39,4 +39,4 @@ using __libcpp_remove_reference_t = typename remove_reference<_Tp>::type;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 4efb35f763be2..f5825e7bdb54b 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___CXX03___TYPE_TRAITS_REMOVE_VOLATILE_H
-#define _LIBCPP___CXX03___TYPE_TRAITS_REMOVE_VOLATILE_H
+#ifndef _LIBCPP_CXX03_TYPE_TRAITS_REMOVE_VOLATILE_H
+#define _LIBCPP_CXX03_TYPE_TRAITS_REMOVE_VOLATILE_H
 
 #include <__cxx03/__config>
 
@@ -41,4 +41,4 @@ using __remove_volatile_t = typename remove_volatile<_Tp>::type;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 da1552cdebc0e..61c67c1fad17b 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___CXX03___TYPE_TRAITS_RESULT_OF_H
-#define _LIBCPP___CXX03___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/__type_traits/invoke.h>
@@ -28,4 +28,4 @@ class _LIBCPP_TEMPLATE_VIS result_of<_Fp(_Args...)> : public __invoke_of<_Fp, _A
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 003bd20245637..7b9377f0568a0 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___CXX03___TYPE_TRAITS_STRIP_SIGNATURE_H
-#define _LIBCPP___CXX03___TYPE_TRAITS_STRIP_SIGNATURE_H
+#ifndef _LIBCPP_CXX03_TYPE_TRAITS_STRIP_SIGNATURE_H
+#define _LIBCPP_CXX03_TYPE_TRAITS_STRIP_SIGNATURE_H
 
 #include <__cxx03/__config>
 
@@ -15,4 +15,4 @@
 #  pragma GCC system_header
 #endif
 
-#endif // _LIBCPP___CXX03___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 64c7b0960ae62..e772b3a5a9b8f 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___CXX03___TYPE_TRAITS_TYPE_IDENTITY_H
-#define _LIBCPP___CXX03___TYPE_TRAITS_TYPE_IDENTITY_H
+#ifndef _LIBCPP_CXX03_TYPE_TRAITS_TYPE_IDENTITY_H
+#define _LIBCPP_CXX03_TYPE_TRAITS_TYPE_IDENTITY_H
 
 #include <__cxx03/__config>
 
@@ -27,4 +27,4 @@ using __type_identity_t _LIBCPP_NODEBUG = typename __type_identity<_Tp>::type;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 40d6f29276347..fbd7da297a57c 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___CXX03___TYPE_TRAITS_TYPE_LIST_H
-#define _LIBCPP___CXX03___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___CXX03___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 a79a7161cddca..2a670629d9c9d 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___CXX03___TYPE_TRAITS_UNDERLYING_TYPE_H
-#define _LIBCPP___CXX03___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>
@@ -34,4 +34,4 @@ struct underlying_type : __underlying_type_impl<_Tp, is_enum<_Tp>::value> {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 836fce1381ed9..88f64738e9d5d 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___CXX03___TYPE_TRAITS_UNWRAP_REF_H
-#define _LIBCPP___CXX03___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>
@@ -34,4 +34,4 @@ struct __unwrap_ref_decay : __unwrap_reference<__decay_t<_Tp> > {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 60cabbc821a16..d8e7067fe8500 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___CXX03___TYPE_TRAITS_VOID_T_H
-#define _LIBCPP___CXX03___TYPE_TRAITS_VOID_T_H
+#ifndef _LIBCPP_CXX03_TYPE_TRAITS_VOID_T_H
+#define _LIBCPP_CXX03_TYPE_TRAITS_VOID_T_H
 
 #include <__cxx03/__config>
 
@@ -22,4 +22,4 @@ using __void_t = void;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___TYPE_TRAITS_VOID_T_H
+#endif // _LIBCPP_CXX03_TYPE_TRAITS_VOID_T_H
diff --git a/libcxx/include/__cxx03/__utility/as_lvalue.h b/libcxx/include/__cxx03/__utility/as_lvalue.h
index beda0188fcccf..3331f1ebc69a9 100644
--- a/libcxx/include/__cxx03/__utility/as_lvalue.h
+++ b/libcxx/include/__cxx03/__utility/as_lvalue.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___UTILITY_AS_LVALUE_H
-#define _LIBCPP___CXX03___UTILITY_AS_LVALUE_H
+#ifndef _LIBCPP_CXX03_UTILITY_AS_LVALUE_H
+#define _LIBCPP_CXX03_UTILITY_AS_LVALUE_H
 
 #include <__cxx03/__config>
 
@@ -25,4 +25,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 c506e891121e0..d90057cb85579 100644
--- a/libcxx/include/__cxx03/__utility/auto_cast.h
+++ b/libcxx/include/__cxx03/__utility/auto_cast.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___UTILITY_AUTO_CAST_H
-#define _LIBCPP___CXX03___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___CXX03___UTILITY_AUTO_CAST_H
+#endif // _LIBCPP_CXX03_UTILITY_AUTO_CAST_H
diff --git a/libcxx/include/__cxx03/__utility/convert_to_integral.h b/libcxx/include/__cxx03/__utility/convert_to_integral.h
index dc91147298c94..53316aaaa74ff 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___CXX03___UTILITY_CONVERT_TO_INTEGRAL_H
-#define _LIBCPP___CXX03___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>
@@ -60,4 +60,4 @@ inline _LIBCPP_HIDE_FROM_ABI typename __sfinae_underlying_type<_Tp>::__promoted_
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 8992c5a0b6dd3..5370b73f6d3ad 100644
--- a/libcxx/include/__cxx03/__utility/declval.h
+++ b/libcxx/include/__cxx03/__utility/declval.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___UTILITY_DECLVAL_H
-#define _LIBCPP___CXX03___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___CXX03___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 b6623020fe50c..a7fd7d6839f34 100644
--- a/libcxx/include/__cxx03/__utility/empty.h
+++ b/libcxx/include/__cxx03/__utility/empty.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___UTILITY_EMPTY_H
-#define _LIBCPP___CXX03___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___CXX03___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 3ced26c67b1c3..002cc6d3b8ef2 100644
--- a/libcxx/include/__cxx03/__utility/exception_guard.h
+++ b/libcxx/include/__cxx03/__utility/exception_guard.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___UTILITY_TRANSACTION_H
-#define _LIBCPP___CXX03___UTILITY_TRANSACTION_H
+#ifndef _LIBCPP_CXX03_UTILITY_TRANSACTION_H
+#define _LIBCPP_CXX03_UTILITY_TRANSACTION_H
 
 #include <__cxx03/__assert>
 #include <__cxx03/__config>
@@ -133,4 +133,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___UTILITY_TRANSACTION_H
+#endif // _LIBCPP_CXX03_UTILITY_TRANSACTION_H
diff --git a/libcxx/include/__cxx03/__utility/forward.h b/libcxx/include/__cxx03/__utility/forward.h
index 091ce5b9dbd02..ad15cdeafc31b 100644
--- a/libcxx/include/__cxx03/__utility/forward.h
+++ b/libcxx/include/__cxx03/__utility/forward.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___UTILITY_FORWARD_H
-#define _LIBCPP___CXX03___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___CXX03___UTILITY_FORWARD_H
+#endif // _LIBCPP_CXX03_UTILITY_FORWARD_H
diff --git a/libcxx/include/__cxx03/__utility/integer_sequence.h b/libcxx/include/__cxx03/__utility/integer_sequence.h
index 5955e3e504bf9..4041e20f562e5 100644
--- a/libcxx/include/__cxx03/__utility/integer_sequence.h
+++ b/libcxx/include/__cxx03/__utility/integer_sequence.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___UTILITY_INTEGER_SEQUENCE_H
-#define _LIBCPP___CXX03___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>
@@ -45,4 +45,4 @@ using __make_indices_imp =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 2da13106adb02..22ff6bb07b053 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___CXX03___UTILITY_IS_POINTER_IN_RANGE_H
-#define _LIBCPP___CXX03___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___CXX03___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 0d601c75f6017..c6a41b6230820 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___CXX03___UTILITY_IS_VALID_RANGE_H
-#define _LIBCPP___CXX03___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>
@@ -33,4 +33,4 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_NO_SANITIZE("address") bool __is_valid_range(const
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 99b158b18adf2..e00a59ffcc56e 100644
--- a/libcxx/include/__cxx03/__utility/move.h
+++ b/libcxx/include/__cxx03/__utility/move.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___UTILITY_MOVE_H
-#define _LIBCPP___CXX03___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___CXX03___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 3512fe101880f..bd7fcf9da696a 100644
--- a/libcxx/include/__cxx03/__utility/no_destroy.h
+++ b/libcxx/include/__cxx03/__utility/no_destroy.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___UTILITY_NO_DESTROY_H
-#define _LIBCPP___CXX03___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___CXX03___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 fcd0dccf9b5fb..8116cedac2cf3 100644
--- a/libcxx/include/__cxx03/__utility/pair.h
+++ b/libcxx/include/__cxx03/__utility/pair.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___UTILITY_PAIR_H
-#define _LIBCPP___CXX03___UTILITY_PAIR_H
+#ifndef _LIBCPP_CXX03_UTILITY_PAIR_H
+#define _LIBCPP_CXX03_UTILITY_PAIR_H
 
 #include <__cxx03/__config>
 #include <__cxx03/__fwd/array.h>
@@ -271,4 +271,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___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 f45af5d79acbd..1136f7a8d441c 100644
--- a/libcxx/include/__cxx03/__utility/piecewise_construct.h
+++ b/libcxx/include/__cxx03/__utility/piecewise_construct.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___UTILITY_PIECEWISE_CONSTRUCT_H
-#define _LIBCPP___CXX03___UTILITY_PIECEWISE_CONSTRUCT_H
+#ifndef _LIBCPP_CXX03_UTILITY_PIECEWISE_CONSTRUCT_H
+#define _LIBCPP_CXX03_UTILITY_PIECEWISE_CONSTRUCT_H
 
 #include <__cxx03/__config>
 
@@ -23,4 +23,4 @@ struct _LIBCPP_TEMPLATE_VIS piecewise_construct_t {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 cefcc927b231b..cde91227e6825 100644
--- a/libcxx/include/__cxx03/__utility/priority_tag.h
+++ b/libcxx/include/__cxx03/__utility/priority_tag.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___UTILITY_PRIORITY_TAG_H
-#define _LIBCPP___CXX03___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___CXX03___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 2db48a6c9c060..cc0fae34cdafd 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___CXX03__UTILITY_PRIVATE_CONSTRUCTOR_TAG_H
-#define _LIBCPP___CXX03__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___CXX03__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 803aaaa7b45e6..c65050e51e6a9 100644
--- a/libcxx/include/__cxx03/__utility/rel_ops.h
+++ b/libcxx/include/__cxx03/__utility/rel_ops.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___UTILITY_REL_OPS_H
-#define _LIBCPP___CXX03___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_HIDE_FROM_ABI bool operator>=(const _Tp& __x, const _Tp& __y) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 40fb2b88727d1..d9f475ee95cdc 100644
--- a/libcxx/include/__cxx03/__utility/small_buffer.h
+++ b/libcxx/include/__cxx03/__utility/small_buffer.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___UTILITY_SMALL_BUFFER_H
-#define _LIBCPP___CXX03___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>
@@ -23,4 +23,4 @@
 #  pragma GCC system_header
 #endif
 
-#endif // _LIBCPP___CXX03___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 df29e1e388784..24e1bb58130d1 100644
--- a/libcxx/include/__cxx03/__utility/swap.h
+++ b/libcxx/include/__cxx03/__utility/swap.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___UTILITY_SWAP_H
-#define _LIBCPP___CXX03___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>
@@ -49,4 +49,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03___UTILITY_SWAP_H
+#endif // _LIBCPP_CXX03_UTILITY_SWAP_H
diff --git a/libcxx/include/__cxx03/__utility/unreachable.h b/libcxx/include/__cxx03/__utility/unreachable.h
index 662b86662d960..0e063394b7225 100644
--- a/libcxx/include/__cxx03/__utility/unreachable.h
+++ b/libcxx/include/__cxx03/__utility/unreachable.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___UTILITY_UNREACHABLE_H
-#define _LIBCPP___CXX03___UTILITY_UNREACHABLE_H
+#ifndef _LIBCPP_CXX03_UTILITY_UNREACHABLE_H
+#define _LIBCPP_CXX03_UTILITY_UNREACHABLE_H
 
 #include <__cxx03/__assert>
 #include <__cxx03/__config>
@@ -25,4 +25,4 @@ _LIBCPP_NORETURN _LIBCPP_HIDE_FROM_ABI inline void __libcpp_unreachable() {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___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 cde3a5c791927..d397f6e40c502 100644
--- a/libcxx/include/__cxx03/__variant/monostate.h
+++ b/libcxx/include/__cxx03/__variant/monostate.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___VARIANT_MONOSTATE_H
-#define _LIBCPP___CXX03___VARIANT_MONOSTATE_H
+#ifndef _LIBCPP_CXX03_VARIANT_MONOSTATE_H
+#define _LIBCPP_CXX03_VARIANT_MONOSTATE_H
 
 #include <__cxx03/__compare/ordering.h>
 #include <__cxx03/__config>
@@ -23,4 +23,4 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___VARIANT_MONOSTATE_H
+#endif // _LIBCPP_CXX03_VARIANT_MONOSTATE_H
diff --git a/libcxx/include/__cxx03/__verbose_abort b/libcxx/include/__cxx03/__verbose_abort
index 52d1297b65593..2c115c5e0ff9a 100644
--- a/libcxx/include/__cxx03/__verbose_abort
+++ b/libcxx/include/__cxx03/__verbose_abort
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___VERBOSE_ABORT
-#define _LIBCPP___CXX03___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___CXX03___VERBOSE_ABORT
+#endif // _LIBCPP_CXX03_VERBOSE_ABORT
diff --git a/libcxx/include/__cxx03/__verbose_trap b/libcxx/include/__cxx03/__verbose_trap
index 755124b97a5ac..72bdc899c57f1 100644
--- a/libcxx/include/__cxx03/__verbose_trap
+++ b/libcxx/include/__cxx03/__verbose_trap
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03___VERBOSE_TRAP
-#define _LIBCPP___CXX03___VERBOSE_TRAP
+#ifndef _LIBCPP_CXX03_VERBOSE_TRAP
+#define _LIBCPP_CXX03_VERBOSE_TRAP
 
 #include <__cxx03/__config>
 
@@ -33,4 +33,4 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03___VERBOSE_TRAP
+#endif // _LIBCPP_CXX03_VERBOSE_TRAP
diff --git a/libcxx/include/__cxx03/algorithm b/libcxx/include/__cxx03/algorithm
index e3450c4537a6b..4d256aea5a69b 100644
--- a/libcxx/include/__cxx03/algorithm
+++ b/libcxx/include/__cxx03/algorithm
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_ALGORITHM
-#define _LIBCPP___CXX03_ALGORITHM
+#ifndef _LIBCPP_CXX03_ALGORITHM
+#define _LIBCPP_CXX03_ALGORITHM
 
 /*
     algorithm synopsis
@@ -1921,4 +1921,4 @@ template <class BidirectionalIterator, class Compare>
 #  include <__cxx03/utility>
 #endif
 
-#endif // _LIBCPP___CXX03_ALGORITHM
+#endif // _LIBCPP_CXX03_ALGORITHM
diff --git a/libcxx/include/__cxx03/array b/libcxx/include/__cxx03/array
index cacab3e86f0a7..e63461622b991 100644
--- a/libcxx/include/__cxx03/array
+++ b/libcxx/include/__cxx03/array
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_ARRAY
-#define _LIBCPP___CXX03_ARRAY
+#ifndef _LIBCPP_CXX03_ARRAY
+#define _LIBCPP_CXX03_ARRAY
 
 /*
     array synopsis
@@ -416,4 +416,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/utility>
 #endif
 
-#endif // _LIBCPP___CXX03_ARRAY
+#endif // _LIBCPP_CXX03_ARRAY
diff --git a/libcxx/include/__cxx03/atomic b/libcxx/include/__cxx03/atomic
index df0b23f1864db..77ef5d254798e 100644
--- a/libcxx/include/__cxx03/atomic
+++ b/libcxx/include/__cxx03/atomic
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_ATOMIC
-#define _LIBCPP___CXX03_ATOMIC
+#ifndef _LIBCPP_CXX03_ATOMIC
+#define _LIBCPP_CXX03_ATOMIC
 
 /*
     atomic synopsis
@@ -589,7 +589,7 @@ template <class T>
 
 #include <__cxx03/__config>
 
-#if defined(_LIBCPP___CXX03_STDATOMIC_H)
+#if defined(_LIBCPP_CXX03_STDATOMIC_H)
 #  error <atomic> is incompatible with <stdatomic.h> before C++23. Please compile with -std=c++23.
 #endif
 
@@ -624,4 +624,4 @@ template <class T>
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03_ATOMIC
+#endif // _LIBCPP_CXX03_ATOMIC
diff --git a/libcxx/include/__cxx03/bitset b/libcxx/include/__cxx03/bitset
index 37ad674686ba4..43cf87e109df8 100644
--- a/libcxx/include/__cxx03/bitset
+++ b/libcxx/include/__cxx03/bitset
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_BITSET
-#define _LIBCPP___CXX03_BITSET
+#ifndef _LIBCPP_CXX03_BITSET
+#define _LIBCPP_CXX03_BITSET
 
 // clang-format off
 
@@ -883,4 +883,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03_BITSET
+#endif // _LIBCPP_CXX03_BITSET
diff --git a/libcxx/include/__cxx03/ccomplex b/libcxx/include/__cxx03/ccomplex
index a96d7512661c7..9ad12a5bcb443 100644
--- a/libcxx/include/__cxx03/ccomplex
+++ b/libcxx/include/__cxx03/ccomplex
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CCOMPLEX
-#define _LIBCPP___CXX03_CCOMPLEX
+#ifndef _LIBCPP_CXX03_CCOMPLEX
+#define _LIBCPP_CXX03_CCOMPLEX
 
 /*
     ccomplex synopsis
@@ -23,4 +23,4 @@
 #  pragma GCC system_header
 #endif
 
-#endif // _LIBCPP___CXX03_CCOMPLEX
+#endif // _LIBCPP_CXX03_CCOMPLEX
diff --git a/libcxx/include/__cxx03/cctype b/libcxx/include/__cxx03/cctype
index e074f5410efa8..74b53808bd98a 100644
--- a/libcxx/include/__cxx03/cctype
+++ b/libcxx/include/__cxx03/cctype
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CCTYPE
-#define _LIBCPP___CXX03_CCTYPE
+#ifndef _LIBCPP_CXX03_CCTYPE
+#define _LIBCPP_CXX03_CCTYPE
 
 /*
     cctype synopsis
@@ -124,4 +124,4 @@ using ::toupper _LIBCPP_USING_IF_EXISTS;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03_CCTYPE
+#endif // _LIBCPP_CXX03_CCTYPE
diff --git a/libcxx/include/__cxx03/cerrno b/libcxx/include/__cxx03/cerrno
index a11a53f5c2ac8..8635cb0bbbc5d 100644
--- a/libcxx/include/__cxx03/cerrno
+++ b/libcxx/include/__cxx03/cerrno
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CERRNO
-#define _LIBCPP___CXX03_CERRNO
+#ifndef _LIBCPP_CXX03_CERRNO
+#define _LIBCPP_CXX03_CERRNO
 
 /*
     cerrno synopsis
@@ -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___CXX03_CERRNO
+#endif // _LIBCPP_CXX03_CERRNO
diff --git a/libcxx/include/__cxx03/cfenv b/libcxx/include/__cxx03/cfenv
index d3a5839221a82..7e1f0c88a1490 100644
--- a/libcxx/include/__cxx03/cfenv
+++ b/libcxx/include/__cxx03/cfenv
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CFENV
-#define _LIBCPP___CXX03_CFENV
+#ifndef _LIBCPP_CXX03_CFENV
+#define _LIBCPP_CXX03_CFENV
 
 /*
     cfenv synopsis
@@ -87,4 +87,4 @@ using ::feupdateenv _LIBCPP_USING_IF_EXISTS;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03_CFENV
+#endif // _LIBCPP_CXX03_CFENV
diff --git a/libcxx/include/__cxx03/cfloat b/libcxx/include/__cxx03/cfloat
index a48a213f1669f..ecf05bb946e00 100644
--- a/libcxx/include/__cxx03/cfloat
+++ b/libcxx/include/__cxx03/cfloat
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CFLOAT
-#define _LIBCPP___CXX03_CFLOAT
+#ifndef _LIBCPP_CXX03_CFLOAT
+#define _LIBCPP_CXX03_CFLOAT
 
 /*
     cfloat synopsis
@@ -85,4 +85,4 @@ Macros:
 #  pragma GCC system_header
 #endif
 
-#endif // _LIBCPP___CXX03_CFLOAT
+#endif // _LIBCPP_CXX03_CFLOAT
diff --git a/libcxx/include/__cxx03/chrono b/libcxx/include/__cxx03/chrono
index b712bea5fa7d6..b74f9715867b0 100644
--- a/libcxx/include/__cxx03/chrono
+++ b/libcxx/include/__cxx03/chrono
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CHRONO
-#define _LIBCPP___CXX03_CHRONO
+#ifndef _LIBCPP_CXX03_CHRONO
+#define _LIBCPP_CXX03_CHRONO
 
 // clang-format off
 
@@ -966,4 +966,4 @@ constexpr chrono::year                                  operator ""y(unsigned lo
 #  include <__cxx03/string>
 #endif
 
-#endif // _LIBCPP___CXX03_CHRONO
+#endif // _LIBCPP_CXX03_CHRONO
diff --git a/libcxx/include/__cxx03/cinttypes b/libcxx/include/__cxx03/cinttypes
index 68a926cc75646..7e570305c1f14 100644
--- a/libcxx/include/__cxx03/cinttypes
+++ b/libcxx/include/__cxx03/cinttypes
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CINTTYPES
-#define _LIBCPP___CXX03_CINTTYPES
+#ifndef _LIBCPP_CXX03_CINTTYPES
+#define _LIBCPP_CXX03_CINTTYPES
 
 /*
     cinttypes synopsis
@@ -267,4 +267,4 @@ using ::wcstoumax _LIBCPP_USING_IF_EXISTS;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03_CINTTYPES
+#endif // _LIBCPP_CXX03_CINTTYPES
diff --git a/libcxx/include/__cxx03/ciso646 b/libcxx/include/__cxx03/ciso646
index 5323d0b3393b2..01d11ccaac113 100644
--- a/libcxx/include/__cxx03/ciso646
+++ b/libcxx/include/__cxx03/ciso646
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CISO646
-#define _LIBCPP___CXX03_CISO646
+#ifndef _LIBCPP_CXX03_CISO646
+#define _LIBCPP_CXX03_CISO646
 
 /*
     ciso646 synopsis
@@ -21,4 +21,4 @@
 #  pragma GCC system_header
 #endif
 
-#endif // _LIBCPP___CXX03_CISO646
+#endif // _LIBCPP_CXX03_CISO646
diff --git a/libcxx/include/__cxx03/climits b/libcxx/include/__cxx03/climits
index 2c6fe5ab95b4b..fd3ad449cea32 100644
--- a/libcxx/include/__cxx03/climits
+++ b/libcxx/include/__cxx03/climits
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CLIMITS
-#define _LIBCPP___CXX03_CLIMITS
+#ifndef _LIBCPP_CXX03_CLIMITS
+#define _LIBCPP_CXX03_CLIMITS
 
 /*
     climits synopsis
@@ -45,4 +45,4 @@ Macros:
 #  pragma GCC system_header
 #endif
 
-#endif // _LIBCPP___CXX03_CLIMITS
+#endif // _LIBCPP_CXX03_CLIMITS
diff --git a/libcxx/include/__cxx03/clocale b/libcxx/include/__cxx03/clocale
index 497aed2486918..19a565c3c6492 100644
--- a/libcxx/include/__cxx03/clocale
+++ b/libcxx/include/__cxx03/clocale
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CLOCALE
-#define _LIBCPP___CXX03_CLOCALE
+#ifndef _LIBCPP_CXX03_CLOCALE
+#define _LIBCPP_CXX03_CLOCALE
 
 /*
     clocale synopsis
@@ -38,7 +38,7 @@ lconv* localeconv();
 
 #include <__cxx03/locale.h>
 
-#ifndef _LIBCPP___CXX03_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___CXX03_CLOCALE
+#endif // _LIBCPP_CXX03_CLOCALE
diff --git a/libcxx/include/__cxx03/cmath b/libcxx/include/__cxx03/cmath
index 4de9c59406c12..7e01f2340963e 100644
--- a/libcxx/include/__cxx03/cmath
+++ b/libcxx/include/__cxx03/cmath
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CMATH
-#define _LIBCPP___CXX03_CMATH
+#ifndef _LIBCPP_CXX03_CMATH
+#define _LIBCPP_CXX03_CMATH
 
 /*
     cmath synopsis
@@ -326,7 +326,7 @@ constexpr long double lerp(long double a, long double b, long double t) noexcept
 
 #include <__cxx03/math.h>
 
-#ifndef _LIBCPP___CXX03_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 \
@@ -603,4 +603,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03_CMATH
+#endif // _LIBCPP_CXX03_CMATH
diff --git a/libcxx/include/__cxx03/codecvt b/libcxx/include/__cxx03/codecvt
index b996ea404b1cc..a761e5785a82d 100644
--- a/libcxx/include/__cxx03/codecvt
+++ b/libcxx/include/__cxx03/codecvt
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CODECVT
-#define _LIBCPP___CXX03_CODECVT
+#ifndef _LIBCPP_CXX03_CODECVT
+#define _LIBCPP_CXX03_CODECVT
 
 /*
     codecvt synopsis
@@ -588,4 +588,4 @@ _LIBCPP_END_NAMESPACE_STD
 #  include <__cxx03/typeinfo>
 #endif
 
-#endif // _LIBCPP___CXX03_CODECVT
+#endif // _LIBCPP_CXX03_CODECVT
diff --git a/libcxx/include/__cxx03/complex b/libcxx/include/__cxx03/complex
index d7b9976a016d5..d13172900b156 100644
--- a/libcxx/include/__cxx03/complex
+++ b/libcxx/include/__cxx03/complex
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_COMPLEX
-#define _LIBCPP___CXX03_COMPLEX
+#ifndef _LIBCPP_CXX03_COMPLEX
+#define _LIBCPP_CXX03_COMPLEX
 
 /*
     complex synopsis
@@ -1295,4 +1295,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03_COMPLEX
+#endif // _LIBCPP_CXX03_COMPLEX
diff --git a/libcxx/include/__cxx03/condition_variable b/libcxx/include/__cxx03/condition_variable
index 45b821475640b..26388f508ffe0 100644
--- a/libcxx/include/__cxx03/condition_variable
+++ b/libcxx/include/__cxx03/condition_variable
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CONDITION_VARIABLE
-#define _LIBCPP___CXX03_CONDITION_VARIABLE
+#ifndef _LIBCPP_CXX03_CONDITION_VARIABLE
+#define _LIBCPP_CXX03_CONDITION_VARIABLE
 
 /*
     condition_variable synopsis
@@ -264,4 +264,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/typeinfo>
 #endif
 
-#endif // _LIBCPP___CXX03_CONDITION_VARIABLE
+#endif // _LIBCPP_CXX03_CONDITION_VARIABLE
diff --git a/libcxx/include/__cxx03/csetjmp b/libcxx/include/__cxx03/csetjmp
index 5eeda2dda4ba6..ec6ee2dfa5531 100644
--- a/libcxx/include/__cxx03/csetjmp
+++ b/libcxx/include/__cxx03/csetjmp
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CSETJMP
-#define _LIBCPP___CXX03_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___CXX03_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___CXX03_CSETJMP
+#endif // _LIBCPP_CXX03_CSETJMP
diff --git a/libcxx/include/__cxx03/csignal b/libcxx/include/__cxx03/csignal
index 945278d6f2dfc..76c39dae804dd 100644
--- a/libcxx/include/__cxx03/csignal
+++ b/libcxx/include/__cxx03/csignal
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CSIGNAL
-#define _LIBCPP___CXX03_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___CXX03_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___CXX03_CSIGNAL
+#endif // _LIBCPP_CXX03_CSIGNAL
diff --git a/libcxx/include/__cxx03/cstdarg b/libcxx/include/__cxx03/cstdarg
index 91a452a154f66..d17945d3f1a1c 100644
--- a/libcxx/include/__cxx03/cstdarg
+++ b/libcxx/include/__cxx03/cstdarg
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CSTDARG
-#define _LIBCPP___CXX03_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___CXX03_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___CXX03_CSTDARG
+#endif // _LIBCPP_CXX03_CSTDARG
diff --git a/libcxx/include/__cxx03/cstdbool b/libcxx/include/__cxx03/cstdbool
index 16053e239c935..ce586fec06360 100644
--- a/libcxx/include/__cxx03/cstdbool
+++ b/libcxx/include/__cxx03/cstdbool
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CSTDBOOL
-#define _LIBCPP___CXX03_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___CXX03_CSTDBOOL
+#endif // _LIBCPP_CXX03_CSTDBOOL
diff --git a/libcxx/include/__cxx03/cstddef b/libcxx/include/__cxx03/cstddef
index 2b52c5fb42f95..f247bea51a3ea 100644
--- a/libcxx/include/__cxx03/cstddef
+++ b/libcxx/include/__cxx03/cstddef
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CSTDDEF
-#define _LIBCPP___CXX03_CSTDDEF
+#ifndef _LIBCPP_CXX03_CSTDDEF
+#define _LIBCPP_CXX03_CSTDDEF
 
 /*
     cstddef synopsis
@@ -61,4 +61,4 @@ using ::size_t _LIBCPP_USING_IF_EXISTS;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03_CSTDDEF
+#endif // _LIBCPP_CXX03_CSTDDEF
diff --git a/libcxx/include/__cxx03/cstdint b/libcxx/include/__cxx03/cstdint
index 876abb7480bc1..a356db3fe4dc7 100644
--- a/libcxx/include/__cxx03/cstdint
+++ b/libcxx/include/__cxx03/cstdint
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CSTDINT
-#define _LIBCPP___CXX03_CSTDINT
+#ifndef _LIBCPP_CXX03_CSTDINT
+#define _LIBCPP_CXX03_CSTDINT
 
 /*
     cstdint synopsis
@@ -144,7 +144,7 @@ Types:
 
 #include <__cxx03/stdint.h>
 
-#ifndef _LIBCPP___CXX03_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___CXX03_CSTDINT
+#endif // _LIBCPP_CXX03_CSTDINT
diff --git a/libcxx/include/__cxx03/cstdio b/libcxx/include/__cxx03/cstdio
index 90149044aeb8b..e806350bb9593 100644
--- a/libcxx/include/__cxx03/cstdio
+++ b/libcxx/include/__cxx03/cstdio
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CSTDIO
-#define _LIBCPP___CXX03_CSTDIO
+#ifndef _LIBCPP_CXX03_CSTDIO
+#define _LIBCPP_CXX03_CSTDIO
 
 /*
     cstdio synopsis
@@ -169,4 +169,4 @@ using ::vprintf _LIBCPP_USING_IF_EXISTS;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03_CSTDIO
+#endif // _LIBCPP_CXX03_CSTDIO
diff --git a/libcxx/include/__cxx03/cstdlib b/libcxx/include/__cxx03/cstdlib
index c8e4414690aee..d03fa847089e1 100644
--- a/libcxx/include/__cxx03/cstdlib
+++ b/libcxx/include/__cxx03/cstdlib
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CSTDLIB
-#define _LIBCPP___CXX03_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___CXX03_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 \
@@ -144,4 +144,4 @@ using ::wcstombs _LIBCPP_USING_IF_EXISTS;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03_CSTDLIB
+#endif // _LIBCPP_CXX03_CSTDLIB
diff --git a/libcxx/include/__cxx03/cstring b/libcxx/include/__cxx03/cstring
index 4d57420f54f54..117bd51c31fee 100644
--- a/libcxx/include/__cxx03/cstring
+++ b/libcxx/include/__cxx03/cstring
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CSTRING
-#define _LIBCPP___CXX03_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___CXX03_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___CXX03_CSTRING
+#endif // _LIBCPP_CXX03_CSTRING
diff --git a/libcxx/include/__cxx03/ctgmath b/libcxx/include/__cxx03/ctgmath
index e3fa00fd68ab2..cb036d2c8ff76 100644
--- a/libcxx/include/__cxx03/ctgmath
+++ b/libcxx/include/__cxx03/ctgmath
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CTGMATH
-#define _LIBCPP___CXX03_CTGMATH
+#ifndef _LIBCPP_CXX03_CTGMATH
+#define _LIBCPP_CXX03_CTGMATH
 
 /*
     ctgmath synopsis
@@ -25,4 +25,4 @@
 #  pragma GCC system_header
 #endif
 
-#endif // _LIBCPP___CXX03_CTGMATH
+#endif // _LIBCPP_CXX03_CTGMATH
diff --git a/libcxx/include/__cxx03/ctime b/libcxx/include/__cxx03/ctime
index 31a29ba2e532b..4d6048bac549e 100644
--- a/libcxx/include/__cxx03/ctime
+++ b/libcxx/include/__cxx03/ctime
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CTIME
-#define _LIBCPP___CXX03_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___CXX03_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
@@ -77,4 +77,4 @@ using ::strftime _LIBCPP_USING_IF_EXISTS;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03_CTIME
+#endif // _LIBCPP_CXX03_CTIME
diff --git a/libcxx/include/__cxx03/cuchar b/libcxx/include/__cxx03/cuchar
index a11abaa4f99e7..def53e37ae023 100644
--- a/libcxx/include/__cxx03/cuchar
+++ b/libcxx/include/__cxx03/cuchar
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CUCHAR
-#define _LIBCPP___CXX03_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___CXX03_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 \
@@ -56,4 +56,4 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03_CUCHAR
+#endif // _LIBCPP_CXX03_CUCHAR
diff --git a/libcxx/include/__cxx03/cwchar b/libcxx/include/__cxx03/cwchar
index 43ff5fcb900a4..c4d868092b966 100644
--- a/libcxx/include/__cxx03/cwchar
+++ b/libcxx/include/__cxx03/cwchar
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CWCHAR
-#define _LIBCPP___CXX03_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___CXX03_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 \
@@ -253,4 +253,4 @@ _LIBCPP_END_NAMESPACE_STD
 #  include <__cxx03/cstddef>
 #endif
 
-#endif // _LIBCPP___CXX03_CWCHAR
+#endif // _LIBCPP_CXX03_CWCHAR
diff --git a/libcxx/include/__cxx03/cwctype b/libcxx/include/__cxx03/cwctype
index 336b22634abf4..b69dd49780e1b 100644
--- a/libcxx/include/__cxx03/cwctype
+++ b/libcxx/include/__cxx03/cwctype
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_CWCTYPE
-#define _LIBCPP___CXX03_CWCTYPE
+#ifndef _LIBCPP_CXX03_CWCTYPE
+#define _LIBCPP_CXX03_CWCTYPE
 
 /*
     cwctype synopsis
@@ -94,4 +94,4 @@ using ::wctrans _LIBCPP_USING_IF_EXISTS;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03_CWCTYPE
+#endif // _LIBCPP_CXX03_CWCTYPE
diff --git a/libcxx/include/__cxx03/deque b/libcxx/include/__cxx03/deque
index fcf9d606f408f..2efdd88112f66 100644
--- a/libcxx/include/__cxx03/deque
+++ b/libcxx/include/__cxx03/deque
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_DEQUE
-#define _LIBCPP___CXX03_DEQUE
+#ifndef _LIBCPP_CXX03_DEQUE
+#define _LIBCPP_CXX03_DEQUE
 
 /*
     deque synopsis
@@ -2131,4 +2131,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/typeinfo>
 #endif
 
-#endif // _LIBCPP___CXX03_DEQUE
+#endif // _LIBCPP_CXX03_DEQUE
diff --git a/libcxx/include/__cxx03/exception b/libcxx/include/__cxx03/exception
index 36406c4f3e8d4..27d75828410bf 100644
--- a/libcxx/include/__cxx03/exception
+++ b/libcxx/include/__cxx03/exception
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_EXCEPTION
-#define _LIBCPP___CXX03_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___CXX03_EXCEPTION
+#endif // _LIBCPP_CXX03_EXCEPTION
diff --git a/libcxx/include/__cxx03/experimental/__config b/libcxx/include/__cxx03/experimental/__config
index 027522ed35771..5209c114ce95e 100644
--- a/libcxx/include/__cxx03/experimental/__config
+++ b/libcxx/include/__cxx03/experimental/__config
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_EXPERIMENTAL_CONFIG
-#define _LIBCPP___CXX03_EXPERIMENTAL_CONFIG
+#ifndef _LIBCPP_CXX03_EXPERIMENTAL_CONFIG
+#define _LIBCPP_CXX03_EXPERIMENTAL_CONFIG
 
 #include <__cxx03/__config>
 
diff --git a/libcxx/include/__cxx03/experimental/utility b/libcxx/include/__cxx03/experimental/utility
index 95b6dcb595382..e0bd31e9849c6 100644
--- a/libcxx/include/__cxx03/experimental/utility
+++ b/libcxx/include/__cxx03/experimental/utility
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_EXPERIMENTAL_UTILITY
-#define _LIBCPP___CXX03_EXPERIMENTAL_UTILITY
+#ifndef _LIBCPP_CXX03_EXPERIMENTAL_UTILITY
+#define _LIBCPP_CXX03_EXPERIMENTAL_UTILITY
 
 /*
     experimental/utility synopsis
@@ -37,4 +37,4 @@ struct _LIBCPP_TEMPLATE_VIS erased_type {};
 
 _LIBCPP_END_NAMESPACE_LFTS
 
-#endif /* _LIBCPP___CXX03_EXPERIMENTAL_UTILITY */
+#endif /* _LIBCPP_CXX03_EXPERIMENTAL_UTILITY */
diff --git a/libcxx/include/__cxx03/ext/__hash b/libcxx/include/__cxx03/ext/__hash
index e2c521568280a..15aaabfbc30c7 100644
--- a/libcxx/include/__cxx03/ext/__hash
+++ b/libcxx/include/__cxx03/ext/__hash
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_EXT_HASH
-#define _LIBCPP___CXX03_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___CXX03_EXT_HASH
+#endif // _LIBCPP_CXX03_EXT_HASH
diff --git a/libcxx/include/__cxx03/ext/hash_map b/libcxx/include/__cxx03/ext/hash_map
index 003e5ddcb76b4..cf571fde471c0 100644
--- a/libcxx/include/__cxx03/ext/hash_map
+++ b/libcxx/include/__cxx03/ext/hash_map
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_HASH_MAP
-#define _LIBCPP___CXX03_HASH_MAP
+#ifndef _LIBCPP_CXX03_HASH_MAP
+#define _LIBCPP_CXX03_HASH_MAP
 
 /*
 
@@ -861,4 +861,4 @@ inline _LIBCPP_HIDE_FROM_ABI bool operator!=(const hash_multimap<_Key, _Tp, _Has
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03_HASH_MAP
+#endif // _LIBCPP_CXX03_HASH_MAP
diff --git a/libcxx/include/__cxx03/ext/hash_set b/libcxx/include/__cxx03/ext/hash_set
index 74c601fc3558e..9a6a094a087a7 100644
--- a/libcxx/include/__cxx03/ext/hash_set
+++ b/libcxx/include/__cxx03/ext/hash_set
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_HASH_SET
-#define _LIBCPP___CXX03_HASH_SET
+#ifndef _LIBCPP_CXX03_HASH_SET
+#define _LIBCPP_CXX03_HASH_SET
 
 /*
 
@@ -580,4 +580,4 @@ inline _LIBCPP_HIDE_FROM_ABI bool operator!=(const hash_multiset<_Value, _Hash,
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03_HASH_SET
+#endif // _LIBCPP_CXX03_HASH_SET
diff --git a/libcxx/include/__cxx03/forward_list b/libcxx/include/__cxx03/forward_list
index da7d9f18f0bc8..d872cadc2a4b6 100644
--- a/libcxx/include/__cxx03/forward_list
+++ b/libcxx/include/__cxx03/forward_list
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_FORWARD_LIST
-#define _LIBCPP___CXX03_FORWARD_LIST
+#ifndef _LIBCPP_CXX03_FORWARD_LIST
+#define _LIBCPP_CXX03_FORWARD_LIST
 
 /*
     forward_list synopsis
@@ -1242,4 +1242,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/typeinfo>
 #endif
 
-#endif // _LIBCPP___CXX03_FORWARD_LIST
+#endif // _LIBCPP_CXX03_FORWARD_LIST
diff --git a/libcxx/include/__cxx03/fstream b/libcxx/include/__cxx03/fstream
index 65c2c3e975032..49fbd8dae3083 100644
--- a/libcxx/include/__cxx03/fstream
+++ b/libcxx/include/__cxx03/fstream
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_FSTREAM
-#define _LIBCPP___CXX03_FSTREAM
+#ifndef _LIBCPP_CXX03_FSTREAM
+#define _LIBCPP_CXX03_FSTREAM
 
 /*
     fstream synopsis
@@ -1461,4 +1461,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03_FSTREAM
+#endif // _LIBCPP_CXX03_FSTREAM
diff --git a/libcxx/include/__cxx03/functional b/libcxx/include/__cxx03/functional
index b9c4762c1372e..cdf3b63e99935 100644
--- a/libcxx/include/__cxx03/functional
+++ b/libcxx/include/__cxx03/functional
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_FUNCTIONAL
-#define _LIBCPP___CXX03_FUNCTIONAL
+#ifndef _LIBCPP_CXX03_FUNCTIONAL
+#define _LIBCPP_CXX03_FUNCTIONAL
 
 /*
     functional synopsis
@@ -573,4 +573,4 @@ POLICY:  For non-variadic implementations, the number of arguments is limited
 #  include <__cxx03/utility>
 #endif
 
-#endif // _LIBCPP___CXX03_FUNCTIONAL
+#endif // _LIBCPP_CXX03_FUNCTIONAL
diff --git a/libcxx/include/__cxx03/future b/libcxx/include/__cxx03/future
index 20e739885ad0e..203cd7f250e0f 100644
--- a/libcxx/include/__cxx03/future
+++ b/libcxx/include/__cxx03/future
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_FUTURE
-#define _LIBCPP___CXX03_FUTURE
+#ifndef _LIBCPP_CXX03_FUTURE
+#define _LIBCPP_CXX03_FUTURE
 
 /*
     future synopsis
@@ -1943,4 +1943,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/system_error>
 #endif
 
-#endif // _LIBCPP___CXX03_FUTURE
+#endif // _LIBCPP_CXX03_FUTURE
diff --git a/libcxx/include/__cxx03/iomanip b/libcxx/include/__cxx03/iomanip
index faade2ec4e649..a1d6848d5f319 100644
--- a/libcxx/include/__cxx03/iomanip
+++ b/libcxx/include/__cxx03/iomanip
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_IOMANIP
-#define _LIBCPP___CXX03_IOMANIP
+#ifndef _LIBCPP_CXX03_IOMANIP
+#define _LIBCPP_CXX03_IOMANIP
 
 /*
     iomanip synopsis
@@ -507,4 +507,4 @@ __quoted(basic_string<_CharT, _Traits, _Allocator>& __s, _CharT __delim = _CharT
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03_IOMANIP
+#endif // _LIBCPP_CXX03_IOMANIP
diff --git a/libcxx/include/__cxx03/ios b/libcxx/include/__cxx03/ios
index aa03ce348b624..630676f963f8c 100644
--- a/libcxx/include/__cxx03/ios
+++ b/libcxx/include/__cxx03/ios
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_IOS
-#define _LIBCPP___CXX03_IOS
+#ifndef _LIBCPP_CXX03_IOS
+#define _LIBCPP_CXX03_IOS
 
 /*
     ios synopsis
@@ -874,4 +874,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/typeinfo>
 #endif
 
-#endif // _LIBCPP___CXX03_IOS
+#endif // _LIBCPP_CXX03_IOS
diff --git a/libcxx/include/__cxx03/iosfwd b/libcxx/include/__cxx03/iosfwd
index 674e901c30650..2643158c0a164 100644
--- a/libcxx/include/__cxx03/iosfwd
+++ b/libcxx/include/__cxx03/iosfwd
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_IOSFWD
-#define _LIBCPP___CXX03_IOSFWD
+#ifndef _LIBCPP_CXX03_IOSFWD
+#define _LIBCPP_CXX03_IOSFWD
 
 /*
     iosfwd synopsis
@@ -163,4 +163,4 @@ public:
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___CXX03_IOSFWD
+#endif // _LIBCPP_CXX03_IOSFWD
diff --git a/libcxx/include/__cxx03/iostream b/libcxx/include/__cxx03/iostream
index d302ad2dfc150..e359b9d90dff0 100644
--- a/libcxx/include/__cxx03/iostream
+++ b/libcxx/include/__cxx03/iostream
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_IOSTREAM
-#define _LIBCPP___CXX03_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___CXX03_IOSTREAM
+#endif // _LIBCPP_CXX03_IOSTREAM
diff --git a/libcxx/include/__cxx03/istream b/libcxx/include/__cxx03/istream
index 9e2eadc60b400..c93b06fde35b7 100644
--- a/libcxx/include/__cxx03/istream
+++ b/libcxx/include/__cxx03/istream
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_ISTREAM
-#define _LIBCPP___CXX03_ISTREAM
+#ifndef _LIBCPP_CXX03_ISTREAM
+#define _LIBCPP_CXX03_ISTREAM
 
 /*
     istream synopsis
@@ -1342,4 +1342,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03_ISTREAM
+#endif // _LIBCPP_CXX03_ISTREAM
diff --git a/libcxx/include/__cxx03/iterator b/libcxx/include/__cxx03/iterator
index 6bcd2d5f922f7..e2cab9fc7db31 100644
--- a/libcxx/include/__cxx03/iterator
+++ b/libcxx/include/__cxx03/iterator
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_ITERATOR
-#define _LIBCPP___CXX03_ITERATOR
+#ifndef _LIBCPP_CXX03_ITERATOR
+#define _LIBCPP_CXX03_ITERATOR
 
 /*
     iterator synopsis
@@ -715,4 +715,4 @@ template <class E> constexpr const E* data(initializer_list<E> il) noexcept;
 #  include <__cxx03/utility>
 #endif
 
-#endif // _LIBCPP___CXX03_ITERATOR
+#endif // _LIBCPP_CXX03_ITERATOR
diff --git a/libcxx/include/__cxx03/limits b/libcxx/include/__cxx03/limits
index 174bf8433c3b8..5c5b48671983b 100644
--- a/libcxx/include/__cxx03/limits
+++ b/libcxx/include/__cxx03/limits
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_LIMITS
-#define _LIBCPP___CXX03_LIMITS
+#ifndef _LIBCPP_CXX03_LIMITS
+#define _LIBCPP_CXX03_LIMITS
 
 /*
     limits synopsis
@@ -541,4 +541,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03_LIMITS
+#endif // _LIBCPP_CXX03_LIMITS
diff --git a/libcxx/include/__cxx03/list b/libcxx/include/__cxx03/list
index 25aff2f5ebb26..e77bd0484f67f 100644
--- a/libcxx/include/__cxx03/list
+++ b/libcxx/include/__cxx03/list
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_LIST
-#define _LIBCPP___CXX03_LIST
+#ifndef _LIBCPP_CXX03_LIST
+#define _LIBCPP_CXX03_LIST
 
 /*
     list synopsis
@@ -1365,4 +1365,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/typeinfo>
 #endif
 
-#endif // _LIBCPP___CXX03_LIST
+#endif // _LIBCPP_CXX03_LIST
diff --git a/libcxx/include/__cxx03/locale b/libcxx/include/__cxx03/locale
index 79cd50e0e2419..238bc4378cd64 100644
--- a/libcxx/include/__cxx03/locale
+++ b/libcxx/include/__cxx03/locale
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_LOCALE
-#define _LIBCPP___CXX03_LOCALE
+#ifndef _LIBCPP_CXX03_LOCALE
+#define _LIBCPP_CXX03_LOCALE
 
 /*
     locale synopsis
@@ -3721,4 +3721,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/typeinfo>
 #endif
 
-#endif // _LIBCPP___CXX03_LOCALE
+#endif // _LIBCPP_CXX03_LOCALE
diff --git a/libcxx/include/__cxx03/locale.h b/libcxx/include/__cxx03/locale.h
index 6a6773674ad93..9a23e4c7359db 100644
--- a/libcxx/include/__cxx03/locale.h
+++ b/libcxx/include/__cxx03/locale.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_LOCALE_H
-#define _LIBCPP___CXX03_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___CXX03_LOCALE_H
+#endif // _LIBCPP_CXX03_LOCALE_H
diff --git a/libcxx/include/__cxx03/map b/libcxx/include/__cxx03/map
index f4bf7107e8281..106185212ff72 100644
--- a/libcxx/include/__cxx03/map
+++ b/libcxx/include/__cxx03/map
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_MAP
-#define _LIBCPP___CXX03_MAP
+#ifndef _LIBCPP_CXX03_MAP
+#define _LIBCPP_CXX03_MAP
 
 /*
 
@@ -1329,4 +1329,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/utility>
 #endif
 
-#endif // _LIBCPP___CXX03_MAP
+#endif // _LIBCPP_CXX03_MAP
diff --git a/libcxx/include/__cxx03/math.h b/libcxx/include/__cxx03/math.h
index ca4062072e01b..db4fa87aad024 100644
--- a/libcxx/include/__cxx03/math.h
+++ b/libcxx/include/__cxx03/math.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_MATH_H
-#  define _LIBCPP___CXX03_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___CXX03_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___CXX03_MATH_H
+#endif // _LIBCPP_CXX03_MATH_H
diff --git a/libcxx/include/__cxx03/memory b/libcxx/include/__cxx03/memory
index 063dd4329e7f9..b44430a2ed0f0 100644
--- a/libcxx/include/__cxx03/memory
+++ b/libcxx/include/__cxx03/memory
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_MEMORY
-#define _LIBCPP___CXX03_MEMORY
+#ifndef _LIBCPP_CXX03_MEMORY
+#define _LIBCPP_CXX03_MEMORY
 
 // clang-format off
 
@@ -970,4 +970,4 @@ template<class Pointer = void, class Smart, class... Args>
 #  include <__cxx03/utility>
 #endif
 
-#endif // _LIBCPP___CXX03_MEMORY
+#endif // _LIBCPP_CXX03_MEMORY
diff --git a/libcxx/include/__cxx03/mutex b/libcxx/include/__cxx03/mutex
index fdd7f1e7f46af..79b9d7bfa0f21 100644
--- a/libcxx/include/__cxx03/mutex
+++ b/libcxx/include/__cxx03/mutex
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_MUTEX
-#define _LIBCPP___CXX03_MUTEX
+#ifndef _LIBCPP_CXX03_MUTEX
+#define _LIBCPP_CXX03_MUTEX
 
 /*
     mutex synopsis
@@ -372,4 +372,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/typeinfo>
 #endif
 
-#endif // _LIBCPP___CXX03_MUTEX
+#endif // _LIBCPP_CXX03_MUTEX
diff --git a/libcxx/include/__cxx03/new b/libcxx/include/__cxx03/new
index 4d9ed8b4f09d7..743a10102ced6 100644
--- a/libcxx/include/__cxx03/new
+++ b/libcxx/include/__cxx03/new
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_NEW
-#define _LIBCPP___CXX03_NEW
+#ifndef _LIBCPP_CXX03_NEW
+#define _LIBCPP_CXX03_NEW
 
 /*
     new synopsis
@@ -323,4 +323,4 @@ _LIBCPP_END_NAMESPACE_STD
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03_NEW
+#endif // _LIBCPP_CXX03_NEW
diff --git a/libcxx/include/__cxx03/numeric b/libcxx/include/__cxx03/numeric
index 95bf3ec2f835f..39995955f2257 100644
--- a/libcxx/include/__cxx03/numeric
+++ b/libcxx/include/__cxx03/numeric
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_NUMERIC
-#define _LIBCPP___CXX03_NUMERIC
+#ifndef _LIBCPP_CXX03_NUMERIC
+#define _LIBCPP_CXX03_NUMERIC
 
 /*
     numeric synopsis
@@ -184,4 +184,4 @@ constexpr T saturate_cast(U x) noexcept;                    // freestanding, Sin
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03_NUMERIC
+#endif // _LIBCPP_CXX03_NUMERIC
diff --git a/libcxx/include/__cxx03/ostream b/libcxx/include/__cxx03/ostream
index 518f46348a9ab..3539488d5d4a0 100644
--- a/libcxx/include/__cxx03/ostream
+++ b/libcxx/include/__cxx03/ostream
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_OSTREAM
-#define _LIBCPP___CXX03_OSTREAM
+#ifndef _LIBCPP_CXX03_OSTREAM
+#define _LIBCPP_CXX03_OSTREAM
 
 /*
     ostream synopsis
@@ -192,4 +192,4 @@ void vprint_nonunicode(ostream& os, string_view fmt, format_args args);
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03_OSTREAM
+#endif // _LIBCPP_CXX03_OSTREAM
diff --git a/libcxx/include/__cxx03/queue b/libcxx/include/__cxx03/queue
index c20ac525741ff..b42f133aa5e22 100644
--- a/libcxx/include/__cxx03/queue
+++ b/libcxx/include/__cxx03/queue
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_QUEUE
-#define _LIBCPP___CXX03_QUEUE
+#ifndef _LIBCPP_CXX03_QUEUE
+#define _LIBCPP_CXX03_QUEUE
 
 /*
     queue synopsis
@@ -585,4 +585,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03_QUEUE
+#endif // _LIBCPP_CXX03_QUEUE
diff --git a/libcxx/include/__cxx03/random b/libcxx/include/__cxx03/random
index f9506a4cca022..f651c53a55099 100644
--- a/libcxx/include/__cxx03/random
+++ b/libcxx/include/__cxx03/random
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_RANDOM
-#define _LIBCPP___CXX03_RANDOM
+#ifndef _LIBCPP_CXX03_RANDOM
+#define _LIBCPP_CXX03_RANDOM
 
 /*
     random synopsis
@@ -1732,4 +1732,4 @@ class piecewise_linear_distribution
 #  include <__cxx03/vector>
 #endif
 
-#endif // _LIBCPP___CXX03_RANDOM
+#endif // _LIBCPP_CXX03_RANDOM
diff --git a/libcxx/include/__cxx03/ratio b/libcxx/include/__cxx03/ratio
index 6012efd49fcb3..4bb0e2ba24092 100644
--- a/libcxx/include/__cxx03/ratio
+++ b/libcxx/include/__cxx03/ratio
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_RATIO
-#define _LIBCPP___CXX03_RATIO
+#ifndef _LIBCPP_CXX03_RATIO
+#define _LIBCPP_CXX03_RATIO
 
 /*
     ratio synopsis
@@ -458,4 +458,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03_RATIO
+#endif // _LIBCPP_CXX03_RATIO
diff --git a/libcxx/include/__cxx03/regex b/libcxx/include/__cxx03/regex
index b6a78f27fbd37..a5bd6d8886f13 100644
--- a/libcxx/include/__cxx03/regex
+++ b/libcxx/include/__cxx03/regex
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_REGEX
-#define _LIBCPP___CXX03_REGEX
+#ifndef _LIBCPP_CXX03_REGEX
+#define _LIBCPP_CXX03_REGEX
 
 /*
     regex synopsis
@@ -5637,4 +5637,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/utility>
 #endif
 
-#endif // _LIBCPP___CXX03_REGEX
+#endif // _LIBCPP_CXX03_REGEX
diff --git a/libcxx/include/__cxx03/set b/libcxx/include/__cxx03/set
index 8ddb425333eb6..22ced039e93e2 100644
--- a/libcxx/include/__cxx03/set
+++ b/libcxx/include/__cxx03/set
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_SET
-#define _LIBCPP___CXX03_SET
+#ifndef _LIBCPP_CXX03_SET
+#define _LIBCPP_CXX03_SET
 
 /*
 
@@ -911,4 +911,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03_SET
+#endif // _LIBCPP_CXX03_SET
diff --git a/libcxx/include/__cxx03/sstream b/libcxx/include/__cxx03/sstream
index 741158aa1a01f..3eb8212ec36f9 100644
--- a/libcxx/include/__cxx03/sstream
+++ b/libcxx/include/__cxx03/sstream
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_SSTREAM
-#define _LIBCPP___CXX03_SSTREAM
+#ifndef _LIBCPP_CXX03_SSTREAM
+#define _LIBCPP_CXX03_SSTREAM
 
 // clang-format off
 
@@ -903,4 +903,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03_SSTREAM
+#endif // _LIBCPP_CXX03_SSTREAM
diff --git a/libcxx/include/__cxx03/stack b/libcxx/include/__cxx03/stack
index 3c76006fd61c1..6d9c90710b43e 100644
--- a/libcxx/include/__cxx03/stack
+++ b/libcxx/include/__cxx03/stack
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_STACK
-#define _LIBCPP___CXX03_STACK
+#ifndef _LIBCPP_CXX03_STACK
+#define _LIBCPP_CXX03_STACK
 
 /*
     stack synopsis
@@ -247,4 +247,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03_STACK
+#endif // _LIBCPP_CXX03_STACK
diff --git a/libcxx/include/__cxx03/stdatomic.h b/libcxx/include/__cxx03/stdatomic.h
index 78bb745303c1a..7eb38f3515f9c 100644
--- a/libcxx/include/__cxx03/stdatomic.h
+++ b/libcxx/include/__cxx03/stdatomic.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_STDATOMIC_H
-#define _LIBCPP___CXX03_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) && false
 
-#endif // _LIBCPP___CXX03_STDATOMIC_H
+#endif // _LIBCPP_CXX03_STDATOMIC_H
diff --git a/libcxx/include/__cxx03/stdexcept b/libcxx/include/__cxx03/stdexcept
index 1831196d1101d..556f4026648aa 100644
--- a/libcxx/include/__cxx03/stdexcept
+++ b/libcxx/include/__cxx03/stdexcept
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_STDEXCEPT
-#define _LIBCPP___CXX03_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___CXX03_STDEXCEPT
+#endif // _LIBCPP_CXX03_STDEXCEPT
diff --git a/libcxx/include/__cxx03/stdint.h b/libcxx/include/__cxx03/stdint.h
index 0510da42dd8cf..3fd66183a9abb 100644
--- a/libcxx/include/__cxx03/stdint.h
+++ b/libcxx/include/__cxx03/stdint.h
@@ -7,12 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_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___CXX03_STDINT_H
+#  define _LIBCPP_CXX03_STDINT_H
 #endif // _STD_TYPES_T
 
 /*
@@ -124,4 +124,4 @@
 #  include_next <stdint.h>
 #endif
 
-#endif // _LIBCPP___CXX03_STDINT_H
+#endif // _LIBCPP_CXX03_STDINT_H
diff --git a/libcxx/include/__cxx03/stdlib.h b/libcxx/include/__cxx03/stdlib.h
index 5e7da5d90dc02..b894a63e0a819 100644
--- a/libcxx/include/__cxx03/stdlib.h
+++ b/libcxx/include/__cxx03/stdlib.h
@@ -15,8 +15,8 @@
 
 #  include_next <stdlib.h>
 
-#elif !defined(_LIBCPP___CXX03_STDLIB_H)
-#  define _LIBCPP___CXX03_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___CXX03_STDLIB_H
+#endif // _LIBCPP_CXX03_STDLIB_H
diff --git a/libcxx/include/__cxx03/streambuf b/libcxx/include/__cxx03/streambuf
index 6fcbcd0dfcfcd..dc6dadb5c3c03 100644
--- a/libcxx/include/__cxx03/streambuf
+++ b/libcxx/include/__cxx03/streambuf
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_STREAMBUF
-#define _LIBCPP___CXX03_STREAMBUF
+#ifndef _LIBCPP_CXX03_STREAMBUF
+#define _LIBCPP_CXX03_STREAMBUF
 
 /*
     streambuf synopsis
@@ -442,4 +442,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/cstdint>
 #endif
 
-#endif // _LIBCPP___CXX03_STREAMBUF
+#endif // _LIBCPP_CXX03_STREAMBUF
diff --git a/libcxx/include/__cxx03/string b/libcxx/include/__cxx03/string
index 6c43fca08f109..95e6e7c23d721 100644
--- a/libcxx/include/__cxx03/string
+++ b/libcxx/include/__cxx03/string
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_STRING
-#define _LIBCPP___CXX03_STRING
+#ifndef _LIBCPP_CXX03_STRING
+#define _LIBCPP_CXX03_STRING
 
 // clang-format off
 
@@ -3567,4 +3567,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/utility>
 #endif
 
-#endif // _LIBCPP___CXX03_STRING
+#endif // _LIBCPP_CXX03_STRING
diff --git a/libcxx/include/__cxx03/string.h b/libcxx/include/__cxx03/string.h
index 49595fecc591d..b912d7e714861 100644
--- a/libcxx/include/__cxx03/string.h
+++ b/libcxx/include/__cxx03/string.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_STRING_H
-#define _LIBCPP___CXX03_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___CXX03_STRING_H
+#endif // _LIBCPP_CXX03_STRING_H
diff --git a/libcxx/include/__cxx03/string_view b/libcxx/include/__cxx03/string_view
index da9003b635bb9..1d09e48acac2f 100644
--- a/libcxx/include/__cxx03/string_view
+++ b/libcxx/include/__cxx03/string_view
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_STRING_VIEW
-#define _LIBCPP___CXX03_STRING_VIEW
+#ifndef _LIBCPP_CXX03_STRING_VIEW
+#define _LIBCPP_CXX03_STRING_VIEW
 
 // clang-format off
 
@@ -730,4 +730,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03_STRING_VIEW
+#endif // _LIBCPP_CXX03_STRING_VIEW
diff --git a/libcxx/include/__cxx03/strstream b/libcxx/include/__cxx03/strstream
index 22b223bc7710a..41e777ca32b14 100644
--- a/libcxx/include/__cxx03/strstream
+++ b/libcxx/include/__cxx03/strstream
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_STRSTREAM
-#define _LIBCPP___CXX03_STRSTREAM
+#ifndef _LIBCPP_CXX03_STRSTREAM
+#define _LIBCPP_CXX03_STRSTREAM
 
 /*
     strstream synopsis
@@ -264,4 +264,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___CXX03_STRSTREAM
+#endif // _LIBCPP_CXX03_STRSTREAM
diff --git a/libcxx/include/__cxx03/system_error b/libcxx/include/__cxx03/system_error
index 105f00eea990c..e957e3bc0ce68 100644
--- a/libcxx/include/__cxx03/system_error
+++ b/libcxx/include/__cxx03/system_error
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_SYSTEM_ERROR
-#define _LIBCPP___CXX03_SYSTEM_ERROR
+#ifndef _LIBCPP_CXX03_SYSTEM_ERROR
+#define _LIBCPP_CXX03_SYSTEM_ERROR
 
 /*
     system_error synopsis
@@ -163,4 +163,4 @@ template <> struct hash<std::error_condition>;
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03_SYSTEM_ERROR
+#endif // _LIBCPP_CXX03_SYSTEM_ERROR
diff --git a/libcxx/include/__cxx03/thread b/libcxx/include/__cxx03/thread
index efaaa56b155e8..2dba5ba46d1eb 100644
--- a/libcxx/include/__cxx03/thread
+++ b/libcxx/include/__cxx03/thread
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_THREAD
-#define _LIBCPP___CXX03_THREAD
+#ifndef _LIBCPP_CXX03_THREAD
+#define _LIBCPP_CXX03_THREAD
 
 /*
 
@@ -120,4 +120,4 @@ void sleep_for(const chrono::duration<Rep, Period>& rel_time);
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03_THREAD
+#endif // _LIBCPP_CXX03_THREAD
diff --git a/libcxx/include/__cxx03/type_traits b/libcxx/include/__cxx03/type_traits
index 0f759f097227a..fa4099983b22d 100644
--- a/libcxx/include/__cxx03/type_traits
+++ b/libcxx/include/__cxx03/type_traits
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_TYPE_TRAITS
-#define _LIBCPP___CXX03_TYPE_TRAITS
+#ifndef _LIBCPP_CXX03_TYPE_TRAITS
+#define _LIBCPP_CXX03_TYPE_TRAITS
 
 /*
     type_traits synopsis
@@ -494,4 +494,4 @@ namespace std
 #  pragma GCC system_header
 #endif
 
-#endif // _LIBCPP___CXX03_TYPE_TRAITS
+#endif // _LIBCPP_CXX03_TYPE_TRAITS
diff --git a/libcxx/include/__cxx03/typeindex b/libcxx/include/__cxx03/typeindex
index 687b0cc3bd8b8..1e089eb3bafda 100644
--- a/libcxx/include/__cxx03/typeindex
+++ b/libcxx/include/__cxx03/typeindex
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_TYPEINDEX
-#define _LIBCPP___CXX03_TYPEINDEX
+#ifndef _LIBCPP_CXX03_TYPEINDEX
+#define _LIBCPP_CXX03_TYPEINDEX
 
 /*
 
@@ -89,4 +89,4 @@ _LIBCPP_END_NAMESPACE_STD
 #  include <__cxx03/utility>
 #endif
 
-#endif // _LIBCPP___CXX03_TYPEINDEX
+#endif // _LIBCPP_CXX03_TYPEINDEX
diff --git a/libcxx/include/__cxx03/typeinfo b/libcxx/include/__cxx03/typeinfo
index 5944d2e1926c7..0e74c53b395d4 100644
--- a/libcxx/include/__cxx03/typeinfo
+++ b/libcxx/include/__cxx03/typeinfo
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_TYPEINFO
-#define _LIBCPP___CXX03_TYPEINFO
+#ifndef _LIBCPP_CXX03_TYPEINFO
+#define _LIBCPP_CXX03_TYPEINFO
 
 /*
 
@@ -380,4 +380,4 @@ _LIBCPP_END_NAMESPACE_STD
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03_TYPEINFO
+#endif // _LIBCPP_CXX03_TYPEINFO
diff --git a/libcxx/include/__cxx03/uchar.h b/libcxx/include/__cxx03/uchar.h
index 446a03434b157..bd2fb9ae2f13e 100644
--- a/libcxx/include/__cxx03/uchar.h
+++ b/libcxx/include/__cxx03/uchar.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_UCHAR_H
-#define _LIBCPP___CXX03_UCHAR_H
+#ifndef _LIBCPP_CXX03_UCHAR_H
+#define _LIBCPP_CXX03_UCHAR_H
 
 /*
     uchar.h synopsis // since C++11
@@ -38,4 +38,4 @@ size_t c32rtomb(char* s, char32_t c32, mbstate_t* ps);
 #  pragma GCC system_header
 #endif
 
-#endif // _LIBCPP___CXX03_UCHAR_H
+#endif // _LIBCPP_CXX03_UCHAR_H
diff --git a/libcxx/include/__cxx03/unordered_map b/libcxx/include/__cxx03/unordered_map
index db5c8b60ab65b..6eddd4d40100b 100644
--- a/libcxx/include/__cxx03/unordered_map
+++ b/libcxx/include/__cxx03/unordered_map
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_UNORDERED_MAP
-#define _LIBCPP___CXX03_UNORDERED_MAP
+#ifndef _LIBCPP_CXX03_UNORDERED_MAP
+#define _LIBCPP_CXX03_UNORDERED_MAP
 
 /*
 
@@ -1453,4 +1453,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03_UNORDERED_MAP
+#endif // _LIBCPP_CXX03_UNORDERED_MAP
diff --git a/libcxx/include/__cxx03/unordered_set b/libcxx/include/__cxx03/unordered_set
index e354bd973aa13..775e8af5e86fd 100644
--- a/libcxx/include/__cxx03/unordered_set
+++ b/libcxx/include/__cxx03/unordered_set
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_UNORDERED_SET
-#define _LIBCPP___CXX03_UNORDERED_SET
+#ifndef _LIBCPP_CXX03_UNORDERED_SET
+#define _LIBCPP_CXX03_UNORDERED_SET
 
 // clang-format off
 
@@ -1042,4 +1042,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03_UNORDERED_SET
+#endif // _LIBCPP_CXX03_UNORDERED_SET
diff --git a/libcxx/include/__cxx03/utility b/libcxx/include/__cxx03/utility
index 4687f88620463..386dec3741b7b 100644
--- a/libcxx/include/__cxx03/utility
+++ b/libcxx/include/__cxx03/utility
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_UTILITY
-#define _LIBCPP___CXX03_UTILITY
+#ifndef _LIBCPP_CXX03_UTILITY
+#define _LIBCPP_CXX03_UTILITY
 
 /*
     utility synopsis
@@ -278,4 +278,4 @@ template <class T>
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03_UTILITY
+#endif // _LIBCPP_CXX03_UTILITY
diff --git a/libcxx/include/__cxx03/valarray b/libcxx/include/__cxx03/valarray
index 869bc306abb3a..d210bfe94f342 100644
--- a/libcxx/include/__cxx03/valarray
+++ b/libcxx/include/__cxx03/valarray
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_VALARRAY
-#define _LIBCPP___CXX03_VALARRAY
+#ifndef _LIBCPP_CXX03_VALARRAY
+#define _LIBCPP_CXX03_VALARRAY
 
 /*
     valarray synopsis
@@ -3194,4 +3194,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/type_traits>
 #endif
 
-#endif // _LIBCPP___CXX03_VALARRAY
+#endif // _LIBCPP_CXX03_VALARRAY
diff --git a/libcxx/include/__cxx03/vector b/libcxx/include/__cxx03/vector
index 43e82cd24b211..deb130e93cf06 100644
--- a/libcxx/include/__cxx03/vector
+++ b/libcxx/include/__cxx03/vector
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_VECTOR
-#define _LIBCPP___CXX03_VECTOR
+#ifndef _LIBCPP_CXX03_VECTOR
+#define _LIBCPP_CXX03_VECTOR
 
 // clang-format off
 
@@ -2451,4 +2451,4 @@ _LIBCPP_POP_MACROS
 #  include <__cxx03/utility>
 #endif
 
-#endif // _LIBCPP___CXX03_VECTOR
+#endif // _LIBCPP_CXX03_VECTOR
diff --git a/libcxx/include/__cxx03/version b/libcxx/include/__cxx03/version
index 9cf9306810db4..698908b89f470 100644
--- a/libcxx/include/__cxx03/version
+++ b/libcxx/include/__cxx03/version
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___CXX03_VERSIONH
-#define _LIBCPP___CXX03_VERSIONH
+#ifndef _LIBCPP_CXX03_VERSIONH
+#define _LIBCPP_CXX03_VERSIONH
 
 /*
   version synopsis
@@ -270,4 +270,4 @@ __cpp_lib_void_t                                        201411L <type_traits>
 #  pragma GCC system_header
 #endif
 
-#endif // _LIBCPP___CXX03_VERSIONH
+#endif // _LIBCPP_CXX03_VERSIONH
diff --git a/libcxx/include/__cxx03/wchar.h b/libcxx/include/__cxx03/wchar.h
index f30b18df9c9f7..3996057576afd 100644
--- a/libcxx/include/__cxx03/wchar.h
+++ b/libcxx/include/__cxx03/wchar.h
@@ -15,8 +15,8 @@
 
 #  include_next <wchar.h>
 
-#elif !defined(_LIBCPP___CXX03_WCHAR_H)
-#  define _LIBCPP___CXX03_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___CXX03_WCHAR_H
+#endif // _LIBCPP_CXX03_WCHAR_H
diff --git a/libcxx/include/__debug_utils/randomize_range.h b/libcxx/include/__debug_utils/randomize_range.h
index 7eb77d81ab2a3..68c98d41d0d61 100644
--- a/libcxx/include/__debug_utils/randomize_range.h
+++ b/libcxx/include/__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_LIBCXX_DEBUG_RANDOMIZE_RANGE_H
+#define _LIBCPP_LIBCXX_DEBUG_RANDOMIZE_RANGE_H
 
 #include <__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_LIBCXX_DEBUG_RANDOMIZE_RANGE_H
diff --git a/libcxx/include/__debug_utils/sanitizers.h b/libcxx/include/__debug_utils/sanitizers.h
index 058feab0269e1..16627ed153dfe 100644
--- a/libcxx/include/__debug_utils/sanitizers.h
+++ b/libcxx/include/__debug_utils/sanitizers.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LIBCXX_DEBUG_UTILS_SANITIZERS_H
-#define _LIBCPP___LIBCXX_DEBUG_UTILS_SANITIZERS_H
+#ifndef _LIBCPP_LIBCXX_DEBUG_UTILS_SANITIZERS_H
+#define _LIBCPP_LIBCXX_DEBUG_UTILS_SANITIZERS_H
 
 #include <__config>
 #include <__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_LIBCXX_DEBUG_UTILS_SANITIZERS_H
diff --git a/libcxx/include/__debug_utils/strict_weak_ordering_check.h b/libcxx/include/__debug_utils/strict_weak_ordering_check.h
index 3724ca95c5d42..c0b520d3eab83 100644
--- a/libcxx/include/__debug_utils/strict_weak_ordering_check.h
+++ b/libcxx/include/__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_LIBCXX_DEBUG_STRICT_WEAK_ORDERING_CHECK
+#define _LIBCPP_LIBCXX_DEBUG_STRICT_WEAK_ORDERING_CHECK
 
 #include <__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_LIBCXX_DEBUG_STRICT_WEAK_ORDERING_CHECK
diff --git a/libcxx/include/__exception/exception.h b/libcxx/include/__exception/exception.h
index 161cc49979e4a..511b4e2d7537e 100644
--- a/libcxx/include/__exception/exception.h
+++ b/libcxx/include/__exception/exception.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___EXCEPTION_EXCEPTION_H
-#define _LIBCPP___EXCEPTION_EXCEPTION_H
+#ifndef _LIBCPP_EXCEPTION_EXCEPTION_H
+#define _LIBCPP_EXCEPTION_EXCEPTION_H
 
 #include <__config>
 
@@ -91,4 +91,4 @@ class _LIBCPP_EXPORTED_FROM_ABI bad_exception : public exception {
 
 _LIBCPP_END_UNVERSIONED_NAMESPACE_STD
 
-#endif // _LIBCPP___EXCEPTION_EXCEPTION_H
+#endif // _LIBCPP_EXCEPTION_EXCEPTION_H
diff --git a/libcxx/include/__exception/exception_ptr.h b/libcxx/include/__exception/exception_ptr.h
index aef036a2c9586..ede52b006a821 100644
--- a/libcxx/include/__exception/exception_ptr.h
+++ b/libcxx/include/__exception/exception_ptr.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___EXCEPTION_EXCEPTION_PTR_H
-#define _LIBCPP___EXCEPTION_EXCEPTION_PTR_H
+#ifndef _LIBCPP_EXCEPTION_EXCEPTION_PTR_H
+#define _LIBCPP_EXCEPTION_EXCEPTION_PTR_H
 
 #include <__config>
 #include <__cstddef/nullptr_t.h>
@@ -225,4 +225,4 @@ _LIBCPP_END_UNVERSIONED_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___EXCEPTION_EXCEPTION_PTR_H
+#endif // _LIBCPP_EXCEPTION_EXCEPTION_PTR_H
diff --git a/libcxx/include/__exception/nested_exception.h b/libcxx/include/__exception/nested_exception.h
index 90b14158d57a2..7ab6222f8670f 100644
--- a/libcxx/include/__exception/nested_exception.h
+++ b/libcxx/include/__exception/nested_exception.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___EXCEPTION_NESTED_EXCEPTION_H
-#define _LIBCPP___EXCEPTION_NESTED_EXCEPTION_H
+#ifndef _LIBCPP_EXCEPTION_NESTED_EXCEPTION_H
+#define _LIBCPP_EXCEPTION_NESTED_EXCEPTION_H
 
 #include <__config>
 #include <__exception/exception_ptr.h>
@@ -97,4 +97,4 @@ inline _LIBCPP_HIDE_FROM_ABI void rethrow_if_nested(const _Ep&) {}
 
 _LIBCPP_END_UNVERSIONED_NAMESPACE_STD
 
-#endif // _LIBCPP___EXCEPTION_NESTED_EXCEPTION_H
+#endif // _LIBCPP_EXCEPTION_NESTED_EXCEPTION_H
diff --git a/libcxx/include/__exception/operations.h b/libcxx/include/__exception/operations.h
index 29d5c698a96db..579b8bf603689 100644
--- a/libcxx/include/__exception/operations.h
+++ b/libcxx/include/__exception/operations.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___EXCEPTION_OPERATIONS_H
-#define _LIBCPP___EXCEPTION_OPERATIONS_H
+#ifndef _LIBCPP_EXCEPTION_OPERATIONS_H
+#define _LIBCPP_EXCEPTION_OPERATIONS_H
 
 #include <__config>
 
@@ -39,4 +39,4 @@ _LIBCPP_EXPORTED_FROM_ABI exception_ptr current_exception() _NOEXCEPT;
 [[__noreturn__]] _LIBCPP_EXPORTED_FROM_ABI void rethrow_exception(exception_ptr);
 _LIBCPP_END_UNVERSIONED_NAMESPACE_STD
 
-#endif // _LIBCPP___EXCEPTION_OPERATIONS_H
+#endif // _LIBCPP_EXCEPTION_OPERATIONS_H
diff --git a/libcxx/include/__exception/terminate.h b/libcxx/include/__exception/terminate.h
index 955a49c2b00c3..cec920eb2b697 100644
--- a/libcxx/include/__exception/terminate.h
+++ b/libcxx/include/__exception/terminate.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___EXCEPTION_TERMINATE_H
-#define _LIBCPP___EXCEPTION_TERMINATE_H
+#ifndef _LIBCPP_EXCEPTION_TERMINATE_H
+#define _LIBCPP_EXCEPTION_TERMINATE_H
 
 #include <__config>
 
@@ -19,4 +19,4 @@ _LIBCPP_BEGIN_UNVERSIONED_NAMESPACE_STD
 [[__noreturn__]] _LIBCPP_EXPORTED_FROM_ABI void terminate() _NOEXCEPT;
 _LIBCPP_END_UNVERSIONED_NAMESPACE_STD
 
-#endif // _LIBCPP___EXCEPTION_TERMINATE_H
+#endif // _LIBCPP_EXCEPTION_TERMINATE_H
diff --git a/libcxx/include/__expected/bad_expected_access.h b/libcxx/include/__expected/bad_expected_access.h
index 1b734389e8311..75e53df913f4d 100644
--- a/libcxx/include/__expected/bad_expected_access.h
+++ b/libcxx/include/__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_EXPECTED_BAD_EXPECTED_ACCESS_H
+#define _LIBCPP_EXPECTED_BAD_EXPECTED_ACCESS_H
 
 #include <__config>
 #include <__exception/exception.h>
@@ -70,4 +70,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___EXPECTED_BAD_EXPECTED_ACCESS_H
+#endif // _LIBCPP_EXPECTED_BAD_EXPECTED_ACCESS_H
diff --git a/libcxx/include/__expected/expected.h b/libcxx/include/__expected/expected.h
index 8b3eeebd38ae7..d5d30cbd70a42 100644
--- a/libcxx/include/__expected/expected.h
+++ b/libcxx/include/__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_EXPECTED_EXPECTED_H
+#define _LIBCPP_EXPECTED_EXPECTED_H
 
 #include <__assert>
 #include <__config>
@@ -1907,4 +1907,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___EXPECTED_EXPECTED_H
+#endif // _LIBCPP_EXPECTED_EXPECTED_H
diff --git a/libcxx/include/__expected/unexpect.h b/libcxx/include/__expected/unexpect.h
index df52787d36faf..73c381e645e33 100644
--- a/libcxx/include/__expected/unexpect.h
+++ b/libcxx/include/__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_EXPECTED_UNEXPECT_H
+#define _LIBCPP_EXPECTED_UNEXPECT_H
 
 #include <__config>
 
@@ -29,4 +29,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 23
 
-#endif // _LIBCPP___EXPECTED_UNEXPECT_H
+#endif // _LIBCPP_EXPECTED_UNEXPECT_H
diff --git a/libcxx/include/__expected/unexpected.h b/libcxx/include/__expected/unexpected.h
index 6904889b8c6b1..c11ebabbbbe08 100644
--- a/libcxx/include/__expected/unexpected.h
+++ b/libcxx/include/__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_EXPECTED_UNEXPECTED_H
+#define _LIBCPP_EXPECTED_UNEXPECTED_H
 
 #include <__config>
 #include <__type_traits/conjunction.h>
@@ -124,4 +124,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___EXPECTED_UNEXPECTED_H
+#endif // _LIBCPP_EXPECTED_UNEXPECTED_H
diff --git a/libcxx/include/__filesystem/copy_options.h b/libcxx/include/__filesystem/copy_options.h
index 097eebe61137d..c507252d28b2a 100644
--- a/libcxx/include/__filesystem/copy_options.h
+++ b/libcxx/include/__filesystem/copy_options.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FILESYSTEM_COPY_OPTIONS_H
-#define _LIBCPP___FILESYSTEM_COPY_OPTIONS_H
+#ifndef _LIBCPP_FILESYSTEM_COPY_OPTIONS_H
+#define _LIBCPP_FILESYSTEM_COPY_OPTIONS_H
 
 #include <__config>
 
@@ -66,4 +66,4 @@ _LIBCPP_END_NAMESPACE_FILESYSTEM
 
 #endif // _LIBCPP_STD_VER >= 17
 
-#endif // _LIBCPP___FILESYSTEM_COPY_OPTIONS_H
+#endif // _LIBCPP_FILESYSTEM_COPY_OPTIONS_H
diff --git a/libcxx/include/__filesystem/directory_entry.h b/libcxx/include/__filesystem/directory_entry.h
index 3513a4975ad8f..e4baa92c5eb0d 100644
--- a/libcxx/include/__filesystem/directory_entry.h
+++ b/libcxx/include/__filesystem/directory_entry.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FILESYSTEM_DIRECTORY_ENTRY_H
-#define _LIBCPP___FILESYSTEM_DIRECTORY_ENTRY_H
+#ifndef _LIBCPP_FILESYSTEM_DIRECTORY_ENTRY_H
+#define _LIBCPP_FILESYSTEM_DIRECTORY_ENTRY_H
 
 #include <__chrono/time_point.h>
 #include <__compare/ordering.h>
@@ -463,4 +463,4 @@ _LIBCPP_END_NAMESPACE_FILESYSTEM
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___FILESYSTEM_DIRECTORY_ENTRY_H
+#endif // _LIBCPP_FILESYSTEM_DIRECTORY_ENTRY_H
diff --git a/libcxx/include/__filesystem/directory_iterator.h b/libcxx/include/__filesystem/directory_iterator.h
index 5e9fea636de0b..6789b5390b53d 100644
--- a/libcxx/include/__filesystem/directory_iterator.h
+++ b/libcxx/include/__filesystem/directory_iterator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FILESYSTEM_DIRECTORY_ITERATOR_H
-#define _LIBCPP___FILESYSTEM_DIRECTORY_ITERATOR_H
+#ifndef _LIBCPP_FILESYSTEM_DIRECTORY_ITERATOR_H
+#define _LIBCPP_FILESYSTEM_DIRECTORY_ITERATOR_H
 
 #include <__assert>
 #include <__config>
@@ -141,4 +141,4 @@ inline constexpr bool std::ranges::enable_view<std::filesystem::directory_iterat
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___FILESYSTEM_DIRECTORY_ITERATOR_H
+#endif // _LIBCPP_FILESYSTEM_DIRECTORY_ITERATOR_H
diff --git a/libcxx/include/__filesystem/directory_options.h b/libcxx/include/__filesystem/directory_options.h
index d0cd3ebfdaa7e..23ce408bf7b2c 100644
--- a/libcxx/include/__filesystem/directory_options.h
+++ b/libcxx/include/__filesystem/directory_options.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FILESYSTEM_DIRECTORY_OPTIONS_H
-#define _LIBCPP___FILESYSTEM_DIRECTORY_OPTIONS_H
+#ifndef _LIBCPP_FILESYSTEM_DIRECTORY_OPTIONS_H
+#define _LIBCPP_FILESYSTEM_DIRECTORY_OPTIONS_H
 
 #include <__config>
 
@@ -54,4 +54,4 @@ _LIBCPP_END_NAMESPACE_FILESYSTEM
 
 #endif // _LIBCPP_STD_VER >= 17
 
-#endif // _LIBCPP___FILESYSTEM_DIRECTORY_OPTIONS_H
+#endif // _LIBCPP_FILESYSTEM_DIRECTORY_OPTIONS_H
diff --git a/libcxx/include/__filesystem/file_status.h b/libcxx/include/__filesystem/file_status.h
index eecaf3c492f03..5e556f580ab72 100644
--- a/libcxx/include/__filesystem/file_status.h
+++ b/libcxx/include/__filesystem/file_status.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FILESYSTEM_FILE_STATUS_H
-#define _LIBCPP___FILESYSTEM_FILE_STATUS_H
+#ifndef _LIBCPP_FILESYSTEM_FILE_STATUS_H
+#define _LIBCPP_FILESYSTEM_FILE_STATUS_H
 
 #include <__config>
 #include <__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_FILESYSTEM_FILE_STATUS_H
diff --git a/libcxx/include/__filesystem/file_time_type.h b/libcxx/include/__filesystem/file_time_type.h
index 63e4ae1578cfd..4a30728b1a3a7 100644
--- a/libcxx/include/__filesystem/file_time_type.h
+++ b/libcxx/include/__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_FILESYSTEM_FILE_TIME_TYPE_H
+#define _LIBCPP_FILESYSTEM_FILE_TIME_TYPE_H
 
 #include <__chrono/file_clock.h>
 #include <__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_FILESYSTEM_FILE_TIME_TYPE_H
diff --git a/libcxx/include/__filesystem/file_type.h b/libcxx/include/__filesystem/file_type.h
index e4ac1dfee9ed9..6f58284dcb418 100644
--- a/libcxx/include/__filesystem/file_type.h
+++ b/libcxx/include/__filesystem/file_type.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FILESYSTEM_FILE_TYPE_H
-#define _LIBCPP___FILESYSTEM_FILE_TYPE_H
+#ifndef _LIBCPP_FILESYSTEM_FILE_TYPE_H
+#define _LIBCPP_FILESYSTEM_FILE_TYPE_H
 
 #include <__config>
 
@@ -39,4 +39,4 @@ _LIBCPP_END_NAMESPACE_FILESYSTEM
 
 #endif // _LIBCPP_STD_VER >= 17
 
-#endif // _LIBCPP___FILESYSTEM_FILE_TYPE_H
+#endif // _LIBCPP_FILESYSTEM_FILE_TYPE_H
diff --git a/libcxx/include/__filesystem/filesystem_error.h b/libcxx/include/__filesystem/filesystem_error.h
index 0df170f3d3a9f..0178fa268ffbb 100644
--- a/libcxx/include/__filesystem/filesystem_error.h
+++ b/libcxx/include/__filesystem/filesystem_error.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FILESYSTEM_FILESYSTEM_ERROR_H
-#define _LIBCPP___FILESYSTEM_FILESYSTEM_ERROR_H
+#ifndef _LIBCPP_FILESYSTEM_FILESYSTEM_ERROR_H
+#define _LIBCPP_FILESYSTEM_FILESYSTEM_ERROR_H
 
 #include <__config>
 #include <__filesystem/path.h>
@@ -83,4 +83,4 @@ _LIBCPP_END_NAMESPACE_FILESYSTEM
 
 #endif // _LIBCPP_STD_VER >= 17
 
-#endif // _LIBCPP___FILESYSTEM_FILESYSTEM_ERROR_H
+#endif // _LIBCPP_FILESYSTEM_FILESYSTEM_ERROR_H
diff --git a/libcxx/include/__filesystem/operations.h b/libcxx/include/__filesystem/operations.h
index 0fd55c19414c4..23a1e8d09e807 100644
--- a/libcxx/include/__filesystem/operations.h
+++ b/libcxx/include/__filesystem/operations.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FILESYSTEM_OPERATIONS_H
-#define _LIBCPP___FILESYSTEM_OPERATIONS_H
+#ifndef _LIBCPP_FILESYSTEM_OPERATIONS_H
+#define _LIBCPP_FILESYSTEM_OPERATIONS_H
 
 #include <__chrono/time_point.h>
 #include <__config>
@@ -303,4 +303,4 @@ _LIBCPP_END_NAMESPACE_FILESYSTEM
 
 #endif // _LIBCPP_STD_VER >= 17 && _LIBCPP_HAS_FILESYSTEM
 
-#endif // _LIBCPP___FILESYSTEM_OPERATIONS_H
+#endif // _LIBCPP_FILESYSTEM_OPERATIONS_H
diff --git a/libcxx/include/__filesystem/path.h b/libcxx/include/__filesystem/path.h
index b3f324342f800..0b68c0d2e8be3 100644
--- a/libcxx/include/__filesystem/path.h
+++ b/libcxx/include/__filesystem/path.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FILESYSTEM_PATH_H
-#define _LIBCPP___FILESYSTEM_PATH_H
+#ifndef _LIBCPP_FILESYSTEM_PATH_H
+#define _LIBCPP_FILESYSTEM_PATH_H
 
 #include <__algorithm/replace.h>
 #include <__algorithm/replace_copy.h>
@@ -925,4 +925,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___FILESYSTEM_PATH_H
+#endif // _LIBCPP_FILESYSTEM_PATH_H
diff --git a/libcxx/include/__filesystem/path_iterator.h b/libcxx/include/__filesystem/path_iterator.h
index 3fab2b7ff34d0..b54f1982dc0a4 100644
--- a/libcxx/include/__filesystem/path_iterator.h
+++ b/libcxx/include/__filesystem/path_iterator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FILESYSTEM_PATH_ITERATOR_H
-#define _LIBCPP___FILESYSTEM_PATH_ITERATOR_H
+#ifndef _LIBCPP_FILESYSTEM_PATH_ITERATOR_H
+#define _LIBCPP_FILESYSTEM_PATH_ITERATOR_H
 
 #include <__assert>
 #include <__config>
@@ -107,4 +107,4 @@ _LIBCPP_END_NAMESPACE_FILESYSTEM
 
 #endif // _LIBCPP_STD_VER >= 17
 
-#endif // _LIBCPP___FILESYSTEM_PATH_ITERATOR_H
+#endif // _LIBCPP_FILESYSTEM_PATH_ITERATOR_H
diff --git a/libcxx/include/__filesystem/perm_options.h b/libcxx/include/__filesystem/perm_options.h
index 64c16ee60a17d..5de48e62a7f69 100644
--- a/libcxx/include/__filesystem/perm_options.h
+++ b/libcxx/include/__filesystem/perm_options.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FILESYSTEM_PERM_OPTIONS_H
-#define _LIBCPP___FILESYSTEM_PERM_OPTIONS_H
+#ifndef _LIBCPP_FILESYSTEM_PERM_OPTIONS_H
+#define _LIBCPP_FILESYSTEM_PERM_OPTIONS_H
 
 #include <__config>
 
@@ -54,4 +54,4 @@ _LIBCPP_END_NAMESPACE_FILESYSTEM
 
 #endif // _LIBCPP_STD_VER >= 17
 
-#endif // _LIBCPP___FILESYSTEM_PERM_OPTIONS_H
+#endif // _LIBCPP_FILESYSTEM_PERM_OPTIONS_H
diff --git a/libcxx/include/__filesystem/perms.h b/libcxx/include/__filesystem/perms.h
index 458f1e6e53483..020a328b98baf 100644
--- a/libcxx/include/__filesystem/perms.h
+++ b/libcxx/include/__filesystem/perms.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FILESYSTEM_PERMS_H
-#define _LIBCPP___FILESYSTEM_PERMS_H
+#ifndef _LIBCPP_FILESYSTEM_PERMS_H
+#define _LIBCPP_FILESYSTEM_PERMS_H
 
 #include <__config>
 
@@ -77,4 +77,4 @@ _LIBCPP_END_NAMESPACE_FILESYSTEM
 
 #endif // _LIBCPP_STD_VER >= 17
 
-#endif // _LIBCPP___FILESYSTEM_PERMS_H
+#endif // _LIBCPP_FILESYSTEM_PERMS_H
diff --git a/libcxx/include/__filesystem/recursive_directory_iterator.h b/libcxx/include/__filesystem/recursive_directory_iterator.h
index 6ea875285b357..c72479a55c3fa 100644
--- a/libcxx/include/__filesystem/recursive_directory_iterator.h
+++ b/libcxx/include/__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_FILESYSTEM_RECURSIVE_DIRECTORY_ITERATOR_H
+#define _LIBCPP_FILESYSTEM_RECURSIVE_DIRECTORY_ITERATOR_H
 
 #include <__config>
 #include <__filesystem/directory_entry.h>
@@ -154,4 +154,4 @@ inline constexpr bool std::ranges::enable_view<std::filesystem::recursive_direct
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___FILESYSTEM_RECURSIVE_DIRECTORY_ITERATOR_H
+#endif // _LIBCPP_FILESYSTEM_RECURSIVE_DIRECTORY_ITERATOR_H
diff --git a/libcxx/include/__filesystem/space_info.h b/libcxx/include/__filesystem/space_info.h
index 28f7ced40d27d..edb6a8d82e1f2 100644
--- a/libcxx/include/__filesystem/space_info.h
+++ b/libcxx/include/__filesystem/space_info.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FILESYSTEM_SPACE_INFO_H
-#define _LIBCPP___FILESYSTEM_SPACE_INFO_H
+#ifndef _LIBCPP_FILESYSTEM_SPACE_INFO_H
+#define _LIBCPP_FILESYSTEM_SPACE_INFO_H
 
 #include <__config>
 #include <cstdint>
@@ -35,4 +35,4 @@ _LIBCPP_END_NAMESPACE_FILESYSTEM
 
 #endif // _LIBCPP_STD_VER >= 17
 
-#endif // _LIBCPP___FILESYSTEM_SPACE_INFO_H
+#endif // _LIBCPP_FILESYSTEM_SPACE_INFO_H
diff --git a/libcxx/include/__filesystem/u8path.h b/libcxx/include/__filesystem/u8path.h
index 885372b0d1f86..07edb8ef87075 100644
--- a/libcxx/include/__filesystem/u8path.h
+++ b/libcxx/include/__filesystem/u8path.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FILESYSTEM_U8PATH_H
-#define _LIBCPP___FILESYSTEM_U8PATH_H
+#ifndef _LIBCPP_FILESYSTEM_U8PATH_H
+#define _LIBCPP_FILESYSTEM_U8PATH_H
 
 #include <__algorithm/unwrap_iter.h>
 #include <__config>
@@ -88,4 +88,4 @@ _LIBCPP_END_NAMESPACE_FILESYSTEM
 
 #endif // _LIBCPP_STD_VER >= 17
 
-#endif // _LIBCPP___FILESYSTEM_U8PATH_H
+#endif // _LIBCPP_FILESYSTEM_U8PATH_H
diff --git a/libcxx/include/__flat_map/flat_map.h b/libcxx/include/__flat_map/flat_map.h
index 159e652e1a326..ab8c04550ad7c 100644
--- a/libcxx/include/__flat_map/flat_map.h
+++ b/libcxx/include/__flat_map/flat_map.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FLAT_MAP_FLAT_MAP_H
-#define _LIBCPP___FLAT_MAP_FLAT_MAP_H
+#ifndef _LIBCPP_FLAT_MAP_FLAT_MAP_H
+#define _LIBCPP_FLAT_MAP_FLAT_MAP_H
 
 #include <__algorithm/lexicographical_compare_three_way.h>
 #include <__algorithm/lower_bound.h>
@@ -1264,4 +1264,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___FLAT_MAP_FLAT_MAP_H
+#endif // _LIBCPP_FLAT_MAP_FLAT_MAP_H
diff --git a/libcxx/include/__flat_map/flat_multimap.h b/libcxx/include/__flat_map/flat_multimap.h
index 6a608723da1ba..3f8263efaa6b1 100644
--- a/libcxx/include/__flat_map/flat_multimap.h
+++ b/libcxx/include/__flat_map/flat_multimap.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FLAT_MAP_FLAT_MULTIMAP_H
-#define _LIBCPP___FLAT_MAP_FLAT_MULTIMAP_H
+#ifndef _LIBCPP_FLAT_MAP_FLAT_MULTIMAP_H
+#define _LIBCPP_FLAT_MAP_FLAT_MULTIMAP_H
 
 #include <__algorithm/equal_range.h>
 #include <__algorithm/lexicographical_compare_three_way.h>
@@ -1065,4 +1065,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___FLAT_MAP_FLAT_MULTIMAP_H
+#endif // _LIBCPP_FLAT_MAP_FLAT_MULTIMAP_H
diff --git a/libcxx/include/__flat_map/key_value_iterator.h b/libcxx/include/__flat_map/key_value_iterator.h
index 795651a07937b..156665ee32bd7 100644
--- a/libcxx/include/__flat_map/key_value_iterator.h
+++ b/libcxx/include/__flat_map/key_value_iterator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FLAT_MAP_KEY_VALUE_ITERATOR_H
-#define _LIBCPP___FLAT_MAP_KEY_VALUE_ITERATOR_H
+#ifndef _LIBCPP_FLAT_MAP_KEY_VALUE_ITERATOR_H
+#define _LIBCPP_FLAT_MAP_KEY_VALUE_ITERATOR_H
 
 #include <__compare/three_way_comparable.h>
 #include <__concepts/convertible_to.h>
@@ -214,4 +214,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___FLAT_MAP_KEY_VALUE_ITERATOR_H
+#endif // _LIBCPP_FLAT_MAP_KEY_VALUE_ITERATOR_H
diff --git a/libcxx/include/__flat_map/sorted_equivalent.h b/libcxx/include/__flat_map/sorted_equivalent.h
index 1db935cc6ee75..9d500d22c1883 100644
--- a/libcxx/include/__flat_map/sorted_equivalent.h
+++ b/libcxx/include/__flat_map/sorted_equivalent.h
@@ -6,8 +6,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FLAT_MAP_SORTED_EQUIVALENT_H
-#define _LIBCPP___FLAT_MAP_SORTED_EQUIVALENT_H
+#ifndef _LIBCPP_FLAT_MAP_SORTED_EQUIVALENT_H
+#define _LIBCPP_FLAT_MAP_SORTED_EQUIVALENT_H
 
 #include <__config>
 
@@ -28,4 +28,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 23
 
-#endif // _LIBCPP___FLAT_MAP_SORTED_EQUIVALENT_H
+#endif // _LIBCPP_FLAT_MAP_SORTED_EQUIVALENT_H
diff --git a/libcxx/include/__flat_map/sorted_unique.h b/libcxx/include/__flat_map/sorted_unique.h
index 0189a5ff1d568..cc2dd38aa575c 100644
--- a/libcxx/include/__flat_map/sorted_unique.h
+++ b/libcxx/include/__flat_map/sorted_unique.h
@@ -6,8 +6,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-#ifndef _LIBCPP___FLAT_MAP_SORTED_UNIQUE_H
-#define _LIBCPP___FLAT_MAP_SORTED_UNIQUE_H
+#ifndef _LIBCPP_FLAT_MAP_SORTED_UNIQUE_H
+#define _LIBCPP_FLAT_MAP_SORTED_UNIQUE_H
 
 #include <__config>
 
@@ -28,4 +28,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 23
 
-#endif // _LIBCPP___FLAT_MAP_SORTED_UNIQUE_H
+#endif // _LIBCPP_FLAT_MAP_SORTED_UNIQUE_H
diff --git a/libcxx/include/__flat_map/utils.h b/libcxx/include/__flat_map/utils.h
index 3a05c715660dc..bc9a751b349df 100644
--- a/libcxx/include/__flat_map/utils.h
+++ b/libcxx/include/__flat_map/utils.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FLAT_MAP_UTILS_H
-#define _LIBCPP___FLAT_MAP_UTILS_H
+#ifndef _LIBCPP_FLAT_MAP_UTILS_H
+#define _LIBCPP_FLAT_MAP_UTILS_H
 
 #include <__config>
 #include <__iterator/product_iterator.h>
@@ -118,4 +118,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // #define _LIBCPP___FLAT_MAP_UTILS_H
+#endif // #define _LIBCPP_FLAT_MAP_UTILS_H
diff --git a/libcxx/include/__flat_set/flat_multiset.h b/libcxx/include/__flat_set/flat_multiset.h
index 0f6bae584ca90..fae5173d2e585 100644
--- a/libcxx/include/__flat_set/flat_multiset.h
+++ b/libcxx/include/__flat_set/flat_multiset.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FLAT_MAP_FLAT_MULTISET_H
-#define _LIBCPP___FLAT_MAP_FLAT_MULTISET_H
+#ifndef _LIBCPP_FLAT_MAP_FLAT_MULTISET_H
+#define _LIBCPP_FLAT_MAP_FLAT_MULTISET_H
 
 #include <__algorithm/equal_range.h>
 #include <__algorithm/lexicographical_compare_three_way.h>
@@ -832,4 +832,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___FLAT_MAP_FLAT_MULTISET_H
+#endif // _LIBCPP_FLAT_MAP_FLAT_MULTISET_H
diff --git a/libcxx/include/__flat_set/flat_set.h b/libcxx/include/__flat_set/flat_set.h
index 0c8fdb5a803c8..2b55cb67da3cd 100644
--- a/libcxx/include/__flat_set/flat_set.h
+++ b/libcxx/include/__flat_set/flat_set.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FLAT_SET_FLAT_SET_H
-#define _LIBCPP___FLAT_SET_FLAT_SET_H
+#ifndef _LIBCPP_FLAT_SET_FLAT_SET_H
+#define _LIBCPP_FLAT_SET_FLAT_SET_H
 
 #include <__algorithm/lexicographical_compare_three_way.h>
 #include <__algorithm/lower_bound.h>
@@ -863,4 +863,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___FLAT_SET_FLAT_SET_H
+#endif // _LIBCPP_FLAT_SET_FLAT_SET_H
diff --git a/libcxx/include/__flat_set/ra_iterator.h b/libcxx/include/__flat_set/ra_iterator.h
index 6fac62895a0c6..d96bc1f799437 100644
--- a/libcxx/include/__flat_set/ra_iterator.h
+++ b/libcxx/include/__flat_set/ra_iterator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FLAT_SET_RA_ITERATOR_H
-#define _LIBCPP___FLAT_SET_RA_ITERATOR_H
+#ifndef _LIBCPP_FLAT_SET_RA_ITERATOR_H
+#define _LIBCPP_FLAT_SET_RA_ITERATOR_H
 
 #include "__type_traits/is_same.h"
 #include <__compare/three_way_comparable.h>
@@ -154,4 +154,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___FLAT_SET_RA_ITERATOR_H
+#endif // _LIBCPP_FLAT_SET_RA_ITERATOR_H
diff --git a/libcxx/include/__flat_set/utils.h b/libcxx/include/__flat_set/utils.h
index 8a7f93a00465d..11374ed5dcaae 100644
--- a/libcxx/include/__flat_set/utils.h
+++ b/libcxx/include/__flat_set/utils.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FLAT_SET_UTILS_H
-#define _LIBCPP___FLAT_SET_UTILS_H
+#ifndef _LIBCPP_FLAT_SET_UTILS_H
+#define _LIBCPP_FLAT_SET_UTILS_H
 
 #include <__config>
 #include <__iterator/iterator_traits.h>
@@ -79,4 +79,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // #define _LIBCPP___FLAT_SET_UTILS_H
+#endif // #define _LIBCPP_FLAT_SET_UTILS_H
diff --git a/libcxx/include/__format/buffer.h b/libcxx/include/__format/buffer.h
index e7454f08f45d5..b860d0421c43e 100644
--- a/libcxx/include/__format/buffer.h
+++ b/libcxx/include/__format/buffer.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FORMAT_BUFFER_H
-#define _LIBCPP___FORMAT_BUFFER_H
+#ifndef _LIBCPP_FORMAT_BUFFER_H
+#define _LIBCPP_FORMAT_BUFFER_H
 
 #include <__algorithm/copy_n.h>
 #include <__algorithm/fill_n.h>
@@ -705,4 +705,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___FORMAT_BUFFER_H
+#endif // _LIBCPP_FORMAT_BUFFER_H
diff --git a/libcxx/include/__format/concepts.h b/libcxx/include/__format/concepts.h
index 5b603701c0248..b4b262cc57a34 100644
--- a/libcxx/include/__format/concepts.h
+++ b/libcxx/include/__format/concepts.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FORMAT_CONCEPTS_H
-#define _LIBCPP___FORMAT_CONCEPTS_H
+#ifndef _LIBCPP_FORMAT_CONCEPTS_H
+#define _LIBCPP_FORMAT_CONCEPTS_H
 
 #include <__concepts/same_as.h>
 #include <__concepts/semiregular.h>
@@ -66,4 +66,4 @@ concept formattable = __formattable<_Tp, _CharT>;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FORMAT_CONCEPTS_H
+#endif // _LIBCPP_FORMAT_CONCEPTS_H
diff --git a/libcxx/include/__format/container_adaptor.h b/libcxx/include/__format/container_adaptor.h
index 6a99a028615c6..1908d8e97f9db 100644
--- a/libcxx/include/__format/container_adaptor.h
+++ b/libcxx/include/__format/container_adaptor.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FORMAT_CONTAINER_ADAPTOR_H
-#define _LIBCPP___FORMAT_CONTAINER_ADAPTOR_H
+#ifndef _LIBCPP_FORMAT_CONTAINER_ADAPTOR_H
+#define _LIBCPP_FORMAT_CONTAINER_ADAPTOR_H
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
@@ -70,4 +70,4 @@ struct formatter<stack<_Tp, _Container>, _CharT>
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FORMAT_CONTAINER_ADAPTOR_H
+#endif // _LIBCPP_FORMAT_CONTAINER_ADAPTOR_H
diff --git a/libcxx/include/__format/enable_insertable.h b/libcxx/include/__format/enable_insertable.h
index 29fe566ff06a3..35e67aa493d5d 100644
--- a/libcxx/include/__format/enable_insertable.h
+++ b/libcxx/include/__format/enable_insertable.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FORMAT_ENABLE_INSERTABLE_H
-#define _LIBCPP___FORMAT_ENABLE_INSERTABLE_H
+#ifndef _LIBCPP_FORMAT_ENABLE_INSERTABLE_H
+#define _LIBCPP_FORMAT_ENABLE_INSERTABLE_H
 
 #include <__config>
 
@@ -32,4 +32,4 @@ inline constexpr bool __enable_insertable = false;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FORMAT_ENABLE_INSERTABLE_H
+#endif // _LIBCPP_FORMAT_ENABLE_INSERTABLE_H
diff --git a/libcxx/include/__format/escaped_output_table.h b/libcxx/include/__format/escaped_output_table.h
index 1401b4637d839..480a7ef1236a3 100644
--- a/libcxx/include/__format/escaped_output_table.h
+++ b/libcxx/include/__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_FORMAT_ESCAPED_OUTPUT_TABLE_H
+#define _LIBCPP_FORMAT_ESCAPED_OUTPUT_TABLE_H
 
 #include <__algorithm/ranges_upper_bound.h>
 #include <__config>
@@ -884,4 +884,4 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr uint32_t __entries[735] = {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FORMAT_ESCAPED_OUTPUT_TABLE_H
+#endif // _LIBCPP_FORMAT_ESCAPED_OUTPUT_TABLE_H
diff --git a/libcxx/include/__format/extended_grapheme_cluster_table.h b/libcxx/include/__format/extended_grapheme_cluster_table.h
index f76e018df7ae1..5770e3844aaa9 100644
--- a/libcxx/include/__format/extended_grapheme_cluster_table.h
+++ b/libcxx/include/__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_FORMAT_EXTENDED_GRAPHEME_CLUSTER_TABLE_H
+#define _LIBCPP_FORMAT_EXTENDED_GRAPHEME_CLUSTER_TABLE_H
 
 #include <__algorithm/ranges_upper_bound.h>
 #include <__config>
@@ -1665,4 +1665,4 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr uint32_t __entries[1501] = {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FORMAT_EXTENDED_GRAPHEME_CLUSTER_TABLE_H
+#endif // _LIBCPP_FORMAT_EXTENDED_GRAPHEME_CLUSTER_TABLE_H
diff --git a/libcxx/include/__format/fmt_pair_like.h b/libcxx/include/__format/fmt_pair_like.h
index d2f2f54d5ac0b..230a47dffa3fa 100644
--- a/libcxx/include/__format/fmt_pair_like.h
+++ b/libcxx/include/__format/fmt_pair_like.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FORMAT_FMT_PAIR_LIKE_H
-#define _LIBCPP___FORMAT_FMT_PAIR_LIKE_H
+#ifndef _LIBCPP_FORMAT_FMT_PAIR_LIKE_H
+#define _LIBCPP_FORMAT_FMT_PAIR_LIKE_H
 
 #include <__config>
 #include <__fwd/pair.h>
@@ -39,4 +39,4 @@ concept __fmt_pair_like =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FORMAT_FMT_PAIR_LIKE_H
+#endif // _LIBCPP_FORMAT_FMT_PAIR_LIKE_H
diff --git a/libcxx/include/__format/format_arg.h b/libcxx/include/__format/format_arg.h
index 19794f0f084ce..48c7f37941234 100644
--- a/libcxx/include/__format/format_arg.h
+++ b/libcxx/include/__format/format_arg.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FORMAT_FORMAT_ARG_H
-#define _LIBCPP___FORMAT_FORMAT_ARG_H
+#ifndef _LIBCPP_FORMAT_FORMAT_ARG_H
+#define _LIBCPP_FORMAT_FORMAT_ARG_H
 
 #include <__assert>
 #include <__concepts/arithmetic.h>
@@ -396,4 +396,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___FORMAT_FORMAT_ARG_H
+#endif // _LIBCPP_FORMAT_FORMAT_ARG_H
diff --git a/libcxx/include/__format/format_arg_store.h b/libcxx/include/__format/format_arg_store.h
index fbb4cad21b232..efc11895add11 100644
--- a/libcxx/include/__format/format_arg_store.h
+++ b/libcxx/include/__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_FORMAT_FORMAT_ARG_STORE_H
+#define _LIBCPP_FORMAT_FORMAT_ARG_STORE_H
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
@@ -279,4 +279,4 @@ struct __format_arg_store {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FORMAT_FORMAT_ARG_STORE_H
+#endif // _LIBCPP_FORMAT_FORMAT_ARG_STORE_H
diff --git a/libcxx/include/__format/format_args.h b/libcxx/include/__format/format_args.h
index 9dd7a5ed9c094..f722e18e8b61f 100644
--- a/libcxx/include/__format/format_args.h
+++ b/libcxx/include/__format/format_args.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FORMAT_FORMAT_ARGS_H
-#define _LIBCPP___FORMAT_FORMAT_ARGS_H
+#ifndef _LIBCPP_FORMAT_FORMAT_ARGS_H
+#define _LIBCPP_FORMAT_FORMAT_ARGS_H
 
 #include <__config>
 #include <__cstddef/size_t.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_FORMAT_FORMAT_ARGS_H
diff --git a/libcxx/include/__format/format_context.h b/libcxx/include/__format/format_context.h
index 1771dd34b82fb..7183a7a2a0f1e 100644
--- a/libcxx/include/__format/format_context.h
+++ b/libcxx/include/__format/format_context.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FORMAT_FORMAT_CONTEXT_H
-#define _LIBCPP___FORMAT_FORMAT_CONTEXT_H
+#ifndef _LIBCPP_FORMAT_FORMAT_CONTEXT_H
+#define _LIBCPP_FORMAT_FORMAT_CONTEXT_H
 
 #include <__concepts/same_as.h>
 #include <__config>
@@ -212,4 +212,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___FORMAT_FORMAT_CONTEXT_H
+#endif // _LIBCPP_FORMAT_FORMAT_CONTEXT_H
diff --git a/libcxx/include/__format/format_error.h b/libcxx/include/__format/format_error.h
index b92e6d1de00e2..2aa2b8b7556af 100644
--- a/libcxx/include/__format/format_error.h
+++ b/libcxx/include/__format/format_error.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FORMAT_FORMAT_ERROR_H
-#define _LIBCPP___FORMAT_FORMAT_ERROR_H
+#ifndef _LIBCPP_FORMAT_FORMAT_ERROR_H
+#define _LIBCPP_FORMAT_FORMAT_ERROR_H
 
 #include <__config>
 #include <__verbose_abort>
@@ -47,4 +47,4 @@ _LIBCPP_DIAGNOSTIC_POP
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FORMAT_FORMAT_ERROR_H
+#endif // _LIBCPP_FORMAT_FORMAT_ERROR_H
diff --git a/libcxx/include/__format/format_functions.h b/libcxx/include/__format/format_functions.h
index 873265bc17c24..5cdb3feda682c 100644
--- a/libcxx/include/__format/format_functions.h
+++ b/libcxx/include/__format/format_functions.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FORMAT_FORMAT_FUNCTIONS
-#define _LIBCPP___FORMAT_FORMAT_FUNCTIONS
+#ifndef _LIBCPP_FORMAT_FORMAT_FUNCTIONS
+#define _LIBCPP_FORMAT_FORMAT_FUNCTIONS
 
 #include <__algorithm/clamp.h>
 #include <__algorithm/ranges_find_first_of.h>
@@ -719,4 +719,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___FORMAT_FORMAT_FUNCTIONS
+#endif // _LIBCPP_FORMAT_FORMAT_FUNCTIONS
diff --git a/libcxx/include/__format/format_parse_context.h b/libcxx/include/__format/format_parse_context.h
index 67b90c7b7e62a..5ec1834be8a12 100644
--- a/libcxx/include/__format/format_parse_context.h
+++ b/libcxx/include/__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_FORMAT_FORMAT_PARSE_CONTEXT_H
+#define _LIBCPP_FORMAT_FORMAT_PARSE_CONTEXT_H
 
 #include <__config>
 #include <__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_FORMAT_FORMAT_PARSE_CONTEXT_H
diff --git a/libcxx/include/__format/format_string.h b/libcxx/include/__format/format_string.h
index b60ed4db382ea..7bc4a62bd40f9 100644
--- a/libcxx/include/__format/format_string.h
+++ b/libcxx/include/__format/format_string.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FORMAT_FORMAT_STRING_H
-#define _LIBCPP___FORMAT_FORMAT_STRING_H
+#ifndef _LIBCPP_FORMAT_FORMAT_STRING_H
+#define _LIBCPP_FORMAT_FORMAT_STRING_H
 
 #include <__assert>
 #include <__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_FORMAT_FORMAT_STRING_H
diff --git a/libcxx/include/__format/format_to_n_result.h b/libcxx/include/__format/format_to_n_result.h
index 0c807be732d8c..0afcf3eb05f43 100644
--- a/libcxx/include/__format/format_to_n_result.h
+++ b/libcxx/include/__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_FORMAT_FORMAT_TO_N_RESULT_H
+#define _LIBCPP_FORMAT_FORMAT_TO_N_RESULT_H
 
 #include <__config>
 #include <__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_FORMAT_FORMAT_TO_N_RESULT_H
diff --git a/libcxx/include/__format/formatter.h b/libcxx/include/__format/formatter.h
index cbbd9d4f7c6ab..95e3ded068f82 100644
--- a/libcxx/include/__format/formatter.h
+++ b/libcxx/include/__format/formatter.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FORMAT_FORMATTER_H
-#define _LIBCPP___FORMAT_FORMATTER_H
+#ifndef _LIBCPP_FORMAT_FORMATTER_H
+#define _LIBCPP_FORMAT_FORMATTER_H
 
 #include <__config>
 #include <__fwd/format.h>
@@ -55,4 +55,4 @@ _LIBCPP_HIDE_FROM_ABI constexpr void __set_debug_format(_Tp& __formatter) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FORMAT_FORMATTER_H
+#endif // _LIBCPP_FORMAT_FORMATTER_H
diff --git a/libcxx/include/__format/formatter_bool.h b/libcxx/include/__format/formatter_bool.h
index 33a148a54668b..d596586390516 100644
--- a/libcxx/include/__format/formatter_bool.h
+++ b/libcxx/include/__format/formatter_bool.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FORMAT_FORMATTER_BOOL_H
-#define _LIBCPP___FORMAT_FORMATTER_BOOL_H
+#ifndef _LIBCPP_FORMAT_FORMATTER_BOOL_H
+#define _LIBCPP_FORMAT_FORMATTER_BOOL_H
 
 #include <__algorithm/copy.h>
 #include <__assert>
@@ -77,4 +77,4 @@ inline constexpr bool enable_nonlocking_formatter_optimization<bool> = true;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FORMAT_FORMATTER_BOOL_H
+#endif // _LIBCPP_FORMAT_FORMATTER_BOOL_H
diff --git a/libcxx/include/__format/formatter_char.h b/libcxx/include/__format/formatter_char.h
index 40eb5a02a79e5..85c718176bbb4 100644
--- a/libcxx/include/__format/formatter_char.h
+++ b/libcxx/include/__format/formatter_char.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FORMAT_FORMATTER_CHAR_H
-#define _LIBCPP___FORMAT_FORMATTER_CHAR_H
+#ifndef _LIBCPP_FORMAT_FORMATTER_CHAR_H
+#define _LIBCPP_FORMAT_FORMATTER_CHAR_H
 
 #include <__concepts/same_as.h>
 #include <__config>
@@ -98,4 +98,4 @@ inline constexpr bool enable_nonlocking_formatter_optimization<wchar_t> = true;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FORMAT_FORMATTER_CHAR_H
+#endif // _LIBCPP_FORMAT_FORMATTER_CHAR_H
diff --git a/libcxx/include/__format/formatter_floating_point.h b/libcxx/include/__format/formatter_floating_point.h
index b200bc58baa21..f73643d0ea229 100644
--- a/libcxx/include/__format/formatter_floating_point.h
+++ b/libcxx/include/__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_FORMAT_FORMATTER_FLOATING_POINT_H
+#define _LIBCPP_FORMAT_FORMATTER_FLOATING_POINT_H
 
 #include <__algorithm/copy_n.h>
 #include <__algorithm/find.h>
@@ -789,4 +789,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___FORMAT_FORMATTER_FLOATING_POINT_H
+#endif // _LIBCPP_FORMAT_FORMATTER_FLOATING_POINT_H
diff --git a/libcxx/include/__format/formatter_integer.h b/libcxx/include/__format/formatter_integer.h
index cf186c64e3d0f..b7f025888a272 100644
--- a/libcxx/include/__format/formatter_integer.h
+++ b/libcxx/include/__format/formatter_integer.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FORMAT_FORMATTER_INTEGER_H
-#define _LIBCPP___FORMAT_FORMATTER_INTEGER_H
+#ifndef _LIBCPP_FORMAT_FORMATTER_INTEGER_H
+#define _LIBCPP_FORMAT_FORMATTER_INTEGER_H
 
 #include <__concepts/arithmetic.h>
 #include <__config>
@@ -123,4 +123,4 @@ inline constexpr bool enable_nonlocking_formatter_optimization<__uint128_t> = tr
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FORMAT_FORMATTER_INTEGER_H
+#endif // _LIBCPP_FORMAT_FORMATTER_INTEGER_H
diff --git a/libcxx/include/__format/formatter_integral.h b/libcxx/include/__format/formatter_integral.h
index 85f509fad4f5d..f9281e12e7195 100644
--- a/libcxx/include/__format/formatter_integral.h
+++ b/libcxx/include/__format/formatter_integral.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FORMAT_FORMATTER_INTEGRAL_H
-#define _LIBCPP___FORMAT_FORMATTER_INTEGRAL_H
+#ifndef _LIBCPP_FORMAT_FORMATTER_INTEGRAL_H
+#define _LIBCPP_FORMAT_FORMATTER_INTEGRAL_H
 
 #include <__charconv/to_chars_integral.h>
 #include <__charconv/to_chars_result.h>
@@ -443,4 +443,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___FORMAT_FORMATTER_INTEGRAL_H
+#endif // _LIBCPP_FORMAT_FORMATTER_INTEGRAL_H
diff --git a/libcxx/include/__format/formatter_output.h b/libcxx/include/__format/formatter_output.h
index 63dd7fcacdcc9..029fa7571d1c5 100644
--- a/libcxx/include/__format/formatter_output.h
+++ b/libcxx/include/__format/formatter_output.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FORMAT_FORMATTER_OUTPUT_H
-#define _LIBCPP___FORMAT_FORMATTER_OUTPUT_H
+#ifndef _LIBCPP_FORMAT_FORMATTER_OUTPUT_H
+#define _LIBCPP_FORMAT_FORMATTER_OUTPUT_H
 
 #include <__algorithm/ranges_copy.h>
 #include <__algorithm/ranges_fill_n.h>
@@ -310,4 +310,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___FORMAT_FORMATTER_OUTPUT_H
+#endif // _LIBCPP_FORMAT_FORMATTER_OUTPUT_H
diff --git a/libcxx/include/__format/formatter_pointer.h b/libcxx/include/__format/formatter_pointer.h
index 4c5896d589cfc..ec57f21c205b6 100644
--- a/libcxx/include/__format/formatter_pointer.h
+++ b/libcxx/include/__format/formatter_pointer.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FORMAT_FORMATTER_POINTER_H
-#define _LIBCPP___FORMAT_FORMATTER_POINTER_H
+#ifndef _LIBCPP_FORMAT_FORMATTER_POINTER_H
+#define _LIBCPP_FORMAT_FORMATTER_POINTER_H
 
 #include <__config>
 #include <__cstddef/nullptr_t.h>
@@ -77,4 +77,4 @@ inline constexpr bool enable_nonlocking_formatter_optimization<const void*> = tr
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FORMAT_FORMATTER_POINTER_H
+#endif // _LIBCPP_FORMAT_FORMATTER_POINTER_H
diff --git a/libcxx/include/__format/formatter_string.h b/libcxx/include/__format/formatter_string.h
index bad6a4d2bb899..99f7b4528c357 100644
--- a/libcxx/include/__format/formatter_string.h
+++ b/libcxx/include/__format/formatter_string.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FORMAT_FORMATTER_STRING_H
-#define _LIBCPP___FORMAT_FORMATTER_STRING_H
+#ifndef _LIBCPP_FORMAT_FORMATTER_STRING_H
+#define _LIBCPP_FORMAT_FORMATTER_STRING_H
 
 #include <__assert>
 #include <__config>
@@ -170,4 +170,4 @@ inline constexpr bool enable_nonlocking_formatter_optimization<basic_string_view
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FORMAT_FORMATTER_STRING_H
+#endif // _LIBCPP_FORMAT_FORMATTER_STRING_H
diff --git a/libcxx/include/__format/formatter_tuple.h b/libcxx/include/__format/formatter_tuple.h
index 0b095e6f71af4..4841f5f94e85e 100644
--- a/libcxx/include/__format/formatter_tuple.h
+++ b/libcxx/include/__format/formatter_tuple.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FORMAT_FORMATTER_TUPLE_H
-#define _LIBCPP___FORMAT_FORMATTER_TUPLE_H
+#ifndef _LIBCPP_FORMAT_FORMATTER_TUPLE_H
+#define _LIBCPP_FORMAT_FORMATTER_TUPLE_H
 
 #include <__algorithm/ranges_copy.h>
 #include <__chrono/statically_widen.h>
@@ -145,4 +145,4 @@ struct formatter<tuple<_Args...>, _CharT> : public __formatter_tuple<_CharT, tup
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FORMAT_FORMATTER_TUPLE_H
+#endif // _LIBCPP_FORMAT_FORMATTER_TUPLE_H
diff --git a/libcxx/include/__format/indic_conjunct_break_table.h b/libcxx/include/__format/indic_conjunct_break_table.h
index f48ea625908e9..d7678a86172e4 100644
--- a/libcxx/include/__format/indic_conjunct_break_table.h
+++ b/libcxx/include/__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_FORMAT_INDIC_CONJUNCT_BREAK_TABLE_H
+#define _LIBCPP_FORMAT_INDIC_CONJUNCT_BREAK_TABLE_H
 
 #include <__algorithm/ranges_upper_bound.h>
 #include <__config>
@@ -549,4 +549,4 @@ _LIBCPP_HIDE_FROM_ABI inline constexpr uint32_t __entries[403] = {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FORMAT_INDIC_CONJUNCT_BREAK_TABLE_H
+#endif // _LIBCPP_FORMAT_INDIC_CONJUNCT_BREAK_TABLE_H
diff --git a/libcxx/include/__format/parser_std_format_spec.h b/libcxx/include/__format/parser_std_format_spec.h
index 99ab3dc23c295..78e8872ac1179 100644
--- a/libcxx/include/__format/parser_std_format_spec.h
+++ b/libcxx/include/__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_FORMAT_PARSER_STD_FORMAT_SPEC_H
+#define _LIBCPP_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_FORMAT_PARSER_STD_FORMAT_SPEC_H
diff --git a/libcxx/include/__format/range_default_formatter.h b/libcxx/include/__format/range_default_formatter.h
index 2d2190657b1af..0a5c52ec1f911 100644
--- a/libcxx/include/__format/range_default_formatter.h
+++ b/libcxx/include/__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_FORMAT_RANGE_DEFAULT_FORMATTER_H
+#define _LIBCPP_FORMAT_RANGE_DEFAULT_FORMATTER_H
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
@@ -172,4 +172,4 @@ struct formatter<_Rp, _CharT> : __range_default_formatter<format_kind<_Rp>, _Rp,
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FORMAT_RANGE_DEFAULT_FORMATTER_H
+#endif // _LIBCPP_FORMAT_RANGE_DEFAULT_FORMATTER_H
diff --git a/libcxx/include/__format/range_format.h b/libcxx/include/__format/range_format.h
index fe43923f9d940..66821c27e80d9 100644
--- a/libcxx/include/__format/range_format.h
+++ b/libcxx/include/__format/range_format.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FORMAT_RANGE_FORMAT_H
-#define _LIBCPP___FORMAT_RANGE_FORMAT_H
+#ifndef _LIBCPP_FORMAT_RANGE_FORMAT_H
+#define _LIBCPP_FORMAT_RANGE_FORMAT_H
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
diff --git a/libcxx/include/__format/range_formatter.h b/libcxx/include/__format/range_formatter.h
index 06d2b4cb4b9f4..e9a08ca63c5ca 100644
--- a/libcxx/include/__format/range_formatter.h
+++ b/libcxx/include/__format/range_formatter.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FORMAT_RANGE_FORMATTER_H
-#define _LIBCPP___FORMAT_RANGE_FORMATTER_H
+#ifndef _LIBCPP_FORMAT_RANGE_FORMATTER_H
+#define _LIBCPP_FORMAT_RANGE_FORMATTER_H
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
@@ -262,4 +262,4 @@ struct range_formatter {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FORMAT_RANGE_FORMATTER_H
+#endif // _LIBCPP_FORMAT_RANGE_FORMATTER_H
diff --git a/libcxx/include/__format/unicode.h b/libcxx/include/__format/unicode.h
index 46096fda1e8ae..3faf327d28cb2 100644
--- a/libcxx/include/__format/unicode.h
+++ b/libcxx/include/__format/unicode.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FORMAT_UNICODE_H
-#define _LIBCPP___FORMAT_UNICODE_H
+#ifndef _LIBCPP_FORMAT_UNICODE_H
+#define _LIBCPP_FORMAT_UNICODE_H
 
 #include <__assert>
 #include <__bit/countl.h>
@@ -599,4 +599,4 @@ class __code_point_view {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FORMAT_UNICODE_H
+#endif // _LIBCPP_FORMAT_UNICODE_H
diff --git a/libcxx/include/__format/width_estimation_table.h b/libcxx/include/__format/width_estimation_table.h
index 0ea0b4f413a74..968135ecd9e76 100644
--- a/libcxx/include/__format/width_estimation_table.h
+++ b/libcxx/include/__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_FORMAT_WIDTH_ESTIMATION_TABLE_H
+#define _LIBCPP_FORMAT_WIDTH_ESTIMATION_TABLE_H
 
 #include <__algorithm/ranges_upper_bound.h>
 #include <__config>
@@ -270,4 +270,4 @@ inline constexpr uint32_t __table_upper_bound = 0x0003fffd;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FORMAT_WIDTH_ESTIMATION_TABLE_H
+#endif // _LIBCPP_FORMAT_WIDTH_ESTIMATION_TABLE_H
diff --git a/libcxx/include/__format/write_escaped.h b/libcxx/include/__format/write_escaped.h
index aa74940032f78..8dcccaf59ad75 100644
--- a/libcxx/include/__format/write_escaped.h
+++ b/libcxx/include/__format/write_escaped.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FORMAT_WRITE_ESCAPED_H
-#define _LIBCPP___FORMAT_WRITE_ESCAPED_H
+#ifndef _LIBCPP_FORMAT_WRITE_ESCAPED_H
+#define _LIBCPP_FORMAT_WRITE_ESCAPED_H
 
 #include <__algorithm/ranges_copy.h>
 #include <__algorithm/ranges_for_each.h>
@@ -239,4 +239,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___FORMAT_WRITE_ESCAPED_H
+#endif // _LIBCPP_FORMAT_WRITE_ESCAPED_H
diff --git a/libcxx/include/__functional/binary_function.h b/libcxx/include/__functional/binary_function.h
index 531274b7d4f18..64a6e11ceaf35 100644
--- a/libcxx/include/__functional/binary_function.h
+++ b/libcxx/include/__functional/binary_function.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FUNCTIONAL_BINARY_FUNCTION_H
-#define _LIBCPP___FUNCTIONAL_BINARY_FUNCTION_H
+#ifndef _LIBCPP_FUNCTIONAL_BINARY_FUNCTION_H
+#define _LIBCPP_FUNCTIONAL_BINARY_FUNCTION_H
 
 #include <__config>
 
@@ -50,4 +50,4 @@ using __binary_function _LIBCPP_NODEBUG = __binary_function_keep_layout_base<_Ar
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FUNCTIONAL_BINARY_FUNCTION_H
+#endif // _LIBCPP_FUNCTIONAL_BINARY_FUNCTION_H
diff --git a/libcxx/include/__functional/binary_negate.h b/libcxx/include/__functional/binary_negate.h
index 73acfb37a7ee1..ed0a71e96e068 100644
--- a/libcxx/include/__functional/binary_negate.h
+++ b/libcxx/include/__functional/binary_negate.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FUNCTIONAL_BINARY_NEGATE_H
-#define _LIBCPP___FUNCTIONAL_BINARY_NEGATE_H
+#ifndef _LIBCPP_FUNCTIONAL_BINARY_NEGATE_H
+#define _LIBCPP_FUNCTIONAL_BINARY_NEGATE_H
 
 #include <__config>
 #include <__functional/binary_function.h>
@@ -48,4 +48,4 @@ not2(const _Predicate& __pred) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FUNCTIONAL_BINARY_NEGATE_H
+#endif // _LIBCPP_FUNCTIONAL_BINARY_NEGATE_H
diff --git a/libcxx/include/__functional/bind.h b/libcxx/include/__functional/bind.h
index def9e4c4ec7a9..16a7aaec00d4f 100644
--- a/libcxx/include/__functional/bind.h
+++ b/libcxx/include/__functional/bind.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FUNCTIONAL_BIND_H
-#define _LIBCPP___FUNCTIONAL_BIND_H
+#ifndef _LIBCPP_FUNCTIONAL_BIND_H
+#define _LIBCPP_FUNCTIONAL_BIND_H
 
 #include <__config>
 #include <__functional/weak_result_type.h>
@@ -295,4 +295,4 @@ bind(_Fp&& __f, _BoundArgs&&... __bound_args) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FUNCTIONAL_BIND_H
+#endif // _LIBCPP_FUNCTIONAL_BIND_H
diff --git a/libcxx/include/__functional/bind_back.h b/libcxx/include/__functional/bind_back.h
index e44768d2283c0..d58d50d615747 100644
--- a/libcxx/include/__functional/bind_back.h
+++ b/libcxx/include/__functional/bind_back.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FUNCTIONAL_BIND_BACK_H
-#define _LIBCPP___FUNCTIONAL_BIND_BACK_H
+#ifndef _LIBCPP_FUNCTIONAL_BIND_BACK_H
+#define _LIBCPP_FUNCTIONAL_BIND_BACK_H
 
 #include <__config>
 #include <__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_FUNCTIONAL_BIND_BACK_H
diff --git a/libcxx/include/__functional/bind_front.h b/libcxx/include/__functional/bind_front.h
index 87ef3affe80b6..66571f1121765 100644
--- a/libcxx/include/__functional/bind_front.h
+++ b/libcxx/include/__functional/bind_front.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FUNCTIONAL_BIND_FRONT_H
-#define _LIBCPP___FUNCTIONAL_BIND_FRONT_H
+#ifndef _LIBCPP_FUNCTIONAL_BIND_FRONT_H
+#define _LIBCPP_FUNCTIONAL_BIND_FRONT_H
 
 #include <__config>
 #include <__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_FUNCTIONAL_BIND_FRONT_H
diff --git a/libcxx/include/__functional/binder1st.h b/libcxx/include/__functional/binder1st.h
index 77a032245096b..e79d6fc964d3b 100644
--- a/libcxx/include/__functional/binder1st.h
+++ b/libcxx/include/__functional/binder1st.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FUNCTIONAL_BINDER1ST_H
-#define _LIBCPP___FUNCTIONAL_BINDER1ST_H
+#ifndef _LIBCPP_FUNCTIONAL_BINDER1ST_H
+#define _LIBCPP_FUNCTIONAL_BINDER1ST_H
 
 #include <__config>
 #include <__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_FUNCTIONAL_BINDER1ST_H
diff --git a/libcxx/include/__functional/binder2nd.h b/libcxx/include/__functional/binder2nd.h
index 8cc644151aff5..b3f7a2b04a472 100644
--- a/libcxx/include/__functional/binder2nd.h
+++ b/libcxx/include/__functional/binder2nd.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FUNCTIONAL_BINDER2ND_H
-#define _LIBCPP___FUNCTIONAL_BINDER2ND_H
+#ifndef _LIBCPP_FUNCTIONAL_BINDER2ND_H
+#define _LIBCPP_FUNCTIONAL_BINDER2ND_H
 
 #include <__config>
 #include <__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_FUNCTIONAL_BINDER2ND_H
diff --git a/libcxx/include/__functional/boyer_moore_searcher.h b/libcxx/include/__functional/boyer_moore_searcher.h
index 6c51c32d2f89b..2890e49aee581 100644
--- a/libcxx/include/__functional/boyer_moore_searcher.h
+++ b/libcxx/include/__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_FUNCTIONAL_BOYER_MOORE_SEARCHER_H
+#define _LIBCPP_FUNCTIONAL_BOYER_MOORE_SEARCHER_H
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
@@ -302,4 +302,4 @@ _LIBCPP_POP_MACROS
 
 #endif // _LIBCPP_STD_VER >= 17
 
-#endif // _LIBCPP___FUNCTIONAL_BOYER_MOORE_SEARCHER_H
+#endif // _LIBCPP_FUNCTIONAL_BOYER_MOORE_SEARCHER_H
diff --git a/libcxx/include/__functional/compose.h b/libcxx/include/__functional/compose.h
index 4b86dd37cd48a..1562a70fefe0f 100644
--- a/libcxx/include/__functional/compose.h
+++ b/libcxx/include/__functional/compose.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FUNCTIONAL_COMPOSE_H
-#define _LIBCPP___FUNCTIONAL_COMPOSE_H
+#ifndef _LIBCPP_FUNCTIONAL_COMPOSE_H
+#define _LIBCPP_FUNCTIONAL_COMPOSE_H
 
 #include <__config>
 #include <__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_FUNCTIONAL_COMPOSE_H
diff --git a/libcxx/include/__functional/default_searcher.h b/libcxx/include/__functional/default_searcher.h
index afbf07e238b8c..983d897bc8342 100644
--- a/libcxx/include/__functional/default_searcher.h
+++ b/libcxx/include/__functional/default_searcher.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FUNCTIONAL_DEFAULT_SEARCHER_H
-#define _LIBCPP___FUNCTIONAL_DEFAULT_SEARCHER_H
+#ifndef _LIBCPP_FUNCTIONAL_DEFAULT_SEARCHER_H
+#define _LIBCPP_FUNCTIONAL_DEFAULT_SEARCHER_H
 
 #include <__algorithm/search.h>
 #include <__config>
@@ -51,4 +51,4 @@ _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(default_searcher);
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FUNCTIONAL_DEFAULT_SEARCHER_H
+#endif // _LIBCPP_FUNCTIONAL_DEFAULT_SEARCHER_H
diff --git a/libcxx/include/__functional/function.h b/libcxx/include/__functional/function.h
index c768fd90d01b4..5c43363a86d2a 100644
--- a/libcxx/include/__functional/function.h
+++ b/libcxx/include/__functional/function.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FUNCTIONAL_FUNCTION_H
-#define _LIBCPP___FUNCTIONAL_FUNCTION_H
+#ifndef _LIBCPP_FUNCTIONAL_FUNCTION_H
+#define _LIBCPP_FUNCTIONAL_FUNCTION_H
 
 #include <__assert>
 #include <__config>
@@ -810,4 +810,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___FUNCTIONAL_FUNCTION_H
+#endif // _LIBCPP_FUNCTIONAL_FUNCTION_H
diff --git a/libcxx/include/__functional/hash.h b/libcxx/include/__functional/hash.h
index f74f25fa6e84b..fe3333bbd60f2 100644
--- a/libcxx/include/__functional/hash.h
+++ b/libcxx/include/__functional/hash.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FUNCTIONAL_HASH_H
-#define _LIBCPP___FUNCTIONAL_HASH_H
+#ifndef _LIBCPP_FUNCTIONAL_HASH_H
+#define _LIBCPP_FUNCTIONAL_HASH_H
 
 #include <__config>
 #include <__cstddef/nullptr_t.h>
@@ -459,4 +459,4 @@ using __enable_hash_helper _LIBCPP_NODEBUG =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FUNCTIONAL_HASH_H
+#endif // _LIBCPP_FUNCTIONAL_HASH_H
diff --git a/libcxx/include/__functional/identity.h b/libcxx/include/__functional/identity.h
index 02dde2b4f323d..74e982969ee88 100644
--- a/libcxx/include/__functional/identity.h
+++ b/libcxx/include/__functional/identity.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FUNCTIONAL_IDENTITY_H
-#define _LIBCPP___FUNCTIONAL_IDENTITY_H
+#ifndef _LIBCPP_FUNCTIONAL_IDENTITY_H
+#define _LIBCPP_FUNCTIONAL_IDENTITY_H
 
 #include <__config>
 #include <__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_FUNCTIONAL_IDENTITY_H
diff --git a/libcxx/include/__functional/invoke.h b/libcxx/include/__functional/invoke.h
index ab201e94206e1..5510add1fba18 100644
--- a/libcxx/include/__functional/invoke.h
+++ b/libcxx/include/__functional/invoke.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FUNCTIONAL_INVOKE_H
-#define _LIBCPP___FUNCTIONAL_INVOKE_H
+#ifndef _LIBCPP_FUNCTIONAL_INVOKE_H
+#define _LIBCPP_FUNCTIONAL_INVOKE_H
 
 #include <__config>
 #include <__type_traits/invoke.h>
@@ -52,4 +52,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_FUNCTIONAL_INVOKE_H
diff --git a/libcxx/include/__functional/is_transparent.h b/libcxx/include/__functional/is_transparent.h
index c2c6fbce2465b..e957701961d2a 100644
--- a/libcxx/include/__functional/is_transparent.h
+++ b/libcxx/include/__functional/is_transparent.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FUNCTIONAL_IS_TRANSPARENT
-#define _LIBCPP___FUNCTIONAL_IS_TRANSPARENT
+#ifndef _LIBCPP_FUNCTIONAL_IS_TRANSPARENT
+#define _LIBCPP_FUNCTIONAL_IS_TRANSPARENT
 
 #include <__config>
 #include <__type_traits/void_t.h>
@@ -39,4 +39,4 @@ inline const bool __is_transparently_comparable_v = false;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FUNCTIONAL_IS_TRANSPARENT
+#endif // _LIBCPP_FUNCTIONAL_IS_TRANSPARENT
diff --git a/libcxx/include/__functional/mem_fn.h b/libcxx/include/__functional/mem_fn.h
index 690393988c5a5..17725b3b862d1 100644
--- a/libcxx/include/__functional/mem_fn.h
+++ b/libcxx/include/__functional/mem_fn.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FUNCTIONAL_MEM_FN_H
-#define _LIBCPP___FUNCTIONAL_MEM_FN_H
+#ifndef _LIBCPP_FUNCTIONAL_MEM_FN_H
+#define _LIBCPP_FUNCTIONAL_MEM_FN_H
 
 #include <__config>
 #include <__functional/binary_function.h>
@@ -49,4 +49,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_FUNCTIONAL_MEM_FN_H
diff --git a/libcxx/include/__functional/mem_fun_ref.h b/libcxx/include/__functional/mem_fun_ref.h
index 68223772a1587..49d5c99fd800b 100644
--- a/libcxx/include/__functional/mem_fun_ref.h
+++ b/libcxx/include/__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_FUNCTIONAL_MEM_FUN_REF_H
+#define _LIBCPP_FUNCTIONAL_MEM_FUN_REF_H
 
 #include <__config>
 #include <__functional/binary_function.h>
@@ -142,4 +142,4 @@ mem_fun_ref(_Sp (_Tp::*__f)(_Ap) const) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FUNCTIONAL_MEM_FUN_REF_H
+#endif // _LIBCPP_FUNCTIONAL_MEM_FUN_REF_H
diff --git a/libcxx/include/__functional/not_fn.h b/libcxx/include/__functional/not_fn.h
index e6f14be799db3..92953f6490fbb 100644
--- a/libcxx/include/__functional/not_fn.h
+++ b/libcxx/include/__functional/not_fn.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FUNCTIONAL_NOT_FN_H
-#define _LIBCPP___FUNCTIONAL_NOT_FN_H
+#ifndef _LIBCPP_FUNCTIONAL_NOT_FN_H
+#define _LIBCPP_FUNCTIONAL_NOT_FN_H
 
 #include <__config>
 #include <__functional/invoke.h>
@@ -73,4 +73,4 @@ template <auto _Fn>
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FUNCTIONAL_NOT_FN_H
+#endif // _LIBCPP_FUNCTIONAL_NOT_FN_H
diff --git a/libcxx/include/__functional/operations.h b/libcxx/include/__functional/operations.h
index 7f315ca851c08..feecbe056e2fb 100644
--- a/libcxx/include/__functional/operations.h
+++ b/libcxx/include/__functional/operations.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FUNCTIONAL_OPERATIONS_H
-#define _LIBCPP___FUNCTIONAL_OPERATIONS_H
+#ifndef _LIBCPP_FUNCTIONAL_OPERATIONS_H
+#define _LIBCPP_FUNCTIONAL_OPERATIONS_H
 
 #include <__config>
 #include <__functional/binary_function.h>
@@ -566,4 +566,4 @@ struct logical_or<void> {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FUNCTIONAL_OPERATIONS_H
+#endif // _LIBCPP_FUNCTIONAL_OPERATIONS_H
diff --git a/libcxx/include/__functional/perfect_forward.h b/libcxx/include/__functional/perfect_forward.h
index 37c3d15b4bec0..d892c76d972a3 100644
--- a/libcxx/include/__functional/perfect_forward.h
+++ b/libcxx/include/__functional/perfect_forward.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FUNCTIONAL_PERFECT_FORWARD_H
-#define _LIBCPP___FUNCTIONAL_PERFECT_FORWARD_H
+#ifndef _LIBCPP_FUNCTIONAL_PERFECT_FORWARD_H
+#define _LIBCPP_FUNCTIONAL_PERFECT_FORWARD_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -102,4 +102,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___FUNCTIONAL_PERFECT_FORWARD_H
+#endif // _LIBCPP_FUNCTIONAL_PERFECT_FORWARD_H
diff --git a/libcxx/include/__functional/pointer_to_binary_function.h b/libcxx/include/__functional/pointer_to_binary_function.h
index eb0e7674eea93..a2ddaf3c6ae57 100644
--- a/libcxx/include/__functional/pointer_to_binary_function.h
+++ b/libcxx/include/__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_FUNCTIONAL_POINTER_TO_BINARY_FUNCTION_H
+#define _LIBCPP_FUNCTIONAL_POINTER_TO_BINARY_FUNCTION_H
 
 #include <__config>
 #include <__functional/binary_function.h>
@@ -40,4 +40,4 @@ ptr_fun(_Result (*__f)(_Arg1, _Arg2)) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FUNCTIONAL_POINTER_TO_BINARY_FUNCTION_H
+#endif // _LIBCPP_FUNCTIONAL_POINTER_TO_BINARY_FUNCTION_H
diff --git a/libcxx/include/__functional/pointer_to_unary_function.h b/libcxx/include/__functional/pointer_to_unary_function.h
index 459d24abdd7e7..e2c959d9f6038 100644
--- a/libcxx/include/__functional/pointer_to_unary_function.h
+++ b/libcxx/include/__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_FUNCTIONAL_POINTER_TO_UNARY_FUNCTION_H
+#define _LIBCPP_FUNCTIONAL_POINTER_TO_UNARY_FUNCTION_H
 
 #include <__config>
 #include <__functional/unary_function.h>
@@ -40,4 +40,4 @@ ptr_fun(_Result (*__f)(_Arg)) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FUNCTIONAL_POINTER_TO_UNARY_FUNCTION_H
+#endif // _LIBCPP_FUNCTIONAL_POINTER_TO_UNARY_FUNCTION_H
diff --git a/libcxx/include/__functional/ranges_operations.h b/libcxx/include/__functional/ranges_operations.h
index dc9da061af264..3d1cb27791071 100644
--- a/libcxx/include/__functional/ranges_operations.h
+++ b/libcxx/include/__functional/ranges_operations.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FUNCTIONAL_RANGES_OPERATIONS_H
-#define _LIBCPP___FUNCTIONAL_RANGES_OPERATIONS_H
+#ifndef _LIBCPP_FUNCTIONAL_RANGES_OPERATIONS_H
+#define _LIBCPP_FUNCTIONAL_RANGES_OPERATIONS_H
 
 #include <__concepts/equality_comparable.h>
 #include <__concepts/totally_ordered.h>
@@ -119,4 +119,4 @@ inline const bool __is_generic_transparent_comparator_v<ranges::greater> = true;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FUNCTIONAL_RANGES_OPERATIONS_H
+#endif // _LIBCPP_FUNCTIONAL_RANGES_OPERATIONS_H
diff --git a/libcxx/include/__functional/reference_wrapper.h b/libcxx/include/__functional/reference_wrapper.h
index 148703b21d84a..0e4bff93986e7 100644
--- a/libcxx/include/__functional/reference_wrapper.h
+++ b/libcxx/include/__functional/reference_wrapper.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FUNCTIONAL_REFERENCE_WRAPPER_H
-#define _LIBCPP___FUNCTIONAL_REFERENCE_WRAPPER_H
+#ifndef _LIBCPP_FUNCTIONAL_REFERENCE_WRAPPER_H
+#define _LIBCPP_FUNCTIONAL_REFERENCE_WRAPPER_H
 
 #include <__compare/synth_three_way.h>
 #include <__concepts/convertible_to.h>
@@ -187,4 +187,4 @@ struct basic_common_reference<_Tp, _Rp, _TpQual, _RpQual> {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FUNCTIONAL_REFERENCE_WRAPPER_H
+#endif // _LIBCPP_FUNCTIONAL_REFERENCE_WRAPPER_H
diff --git a/libcxx/include/__functional/unary_function.h b/libcxx/include/__functional/unary_function.h
index d6d5fae45b903..53b1393690ec4 100644
--- a/libcxx/include/__functional/unary_function.h
+++ b/libcxx/include/__functional/unary_function.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FUNCTIONAL_UNARY_FUNCTION_H
-#define _LIBCPP___FUNCTIONAL_UNARY_FUNCTION_H
+#ifndef _LIBCPP_FUNCTIONAL_UNARY_FUNCTION_H
+#define _LIBCPP_FUNCTIONAL_UNARY_FUNCTION_H
 
 #include <__config>
 
@@ -47,4 +47,4 @@ using __unary_function _LIBCPP_NODEBUG = __unary_function_keep_layout_base<_Arg,
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FUNCTIONAL_UNARY_FUNCTION_H
+#endif // _LIBCPP_FUNCTIONAL_UNARY_FUNCTION_H
diff --git a/libcxx/include/__functional/unary_negate.h b/libcxx/include/__functional/unary_negate.h
index a93abc8e6b1c6..91ed7b1d37510 100644
--- a/libcxx/include/__functional/unary_negate.h
+++ b/libcxx/include/__functional/unary_negate.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FUNCTIONAL_UNARY_NEGATE_H
-#define _LIBCPP___FUNCTIONAL_UNARY_NEGATE_H
+#ifndef _LIBCPP_FUNCTIONAL_UNARY_NEGATE_H
+#define _LIBCPP_FUNCTIONAL_UNARY_NEGATE_H
 
 #include <__config>
 #include <__functional/unary_function.h>
@@ -44,4 +44,4 @@ not1(const _Predicate& __pred) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FUNCTIONAL_UNARY_NEGATE_H
+#endif // _LIBCPP_FUNCTIONAL_UNARY_NEGATE_H
diff --git a/libcxx/include/__functional/weak_result_type.h b/libcxx/include/__functional/weak_result_type.h
index aa462e4d5c56f..c8466208b60c2 100644
--- a/libcxx/include/__functional/weak_result_type.h
+++ b/libcxx/include/__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_FUNCTIONAL_WEAK_RESULT_TYPE_H
+#define _LIBCPP_FUNCTIONAL_WEAK_RESULT_TYPE_H
 
 #include <__config>
 #include <__functional/binary_function.h>
@@ -225,4 +225,4 @@ struct __weak_result_type<_Rp (_Cp::*)(_A1, _A2, _A3...) const volatile> {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FUNCTIONAL_WEAK_RESULT_TYPE_H
+#endif // _LIBCPP_FUNCTIONAL_WEAK_RESULT_TYPE_H
diff --git a/libcxx/include/__fwd/array.h b/libcxx/include/__fwd/array.h
index 476de885c511d..2a7edae766ebf 100644
--- a/libcxx/include/__fwd/array.h
+++ b/libcxx/include/__fwd/array.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_ARRAY_H
-#define _LIBCPP___FWD_ARRAY_H
+#ifndef _LIBCPP_FWD_ARRAY_H
+#define _LIBCPP_FWD_ARRAY_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -44,4 +44,4 @@ inline const bool __is_std_array_v<array<_Tp, _Size> > = true;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FWD_ARRAY_H
+#endif // _LIBCPP_FWD_ARRAY_H
diff --git a/libcxx/include/__fwd/bit_reference.h b/libcxx/include/__fwd/bit_reference.h
index 36058d59cc22a..1e5652a66805a 100644
--- a/libcxx/include/__fwd/bit_reference.h
+++ b/libcxx/include/__fwd/bit_reference.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_BIT_REFERENCE_H
-#define _LIBCPP___FWD_BIT_REFERENCE_H
+#ifndef _LIBCPP_FWD_BIT_REFERENCE_H
+#define _LIBCPP_FWD_BIT_REFERENCE_H
 
 #include <__config>
 
@@ -41,4 +41,4 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_CONSTEXPR_SINCE_CXX20 _StorageType __middle_mask(u
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FWD_BIT_REFERENCE_H
+#endif // _LIBCPP_FWD_BIT_REFERENCE_H
diff --git a/libcxx/include/__fwd/byte.h b/libcxx/include/__fwd/byte.h
index 6f2d6ae254a24..c56a14d2f2dc2 100644
--- a/libcxx/include/__fwd/byte.h
+++ b/libcxx/include/__fwd/byte.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_BYTE_H
-#define _LIBCPP___FWD_BYTE_H
+#ifndef _LIBCPP_FWD_BYTE_H
+#define _LIBCPP_FWD_BYTE_H
 
 #include <__config>
 
@@ -23,4 +23,4 @@ enum class byte : unsigned char;
 _LIBCPP_END_UNVERSIONED_NAMESPACE_STD
 #endif // _LIBCPP_STD_VER >= 17
 
-#endif // _LIBCPP___FWD_BYTE_H
+#endif // _LIBCPP_FWD_BYTE_H
diff --git a/libcxx/include/__fwd/complex.h b/libcxx/include/__fwd/complex.h
index ff3c5c1e148b8..cc48e5e0cdaf1 100644
--- a/libcxx/include/__fwd/complex.h
+++ b/libcxx/include/__fwd/complex.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_COMPLEX_H
-#define _LIBCPP___FWD_COMPLEX_H
+#ifndef _LIBCPP_FWD_COMPLEX_H
+#define _LIBCPP_FWD_COMPLEX_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -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_FWD_COMPLEX_H
diff --git a/libcxx/include/__fwd/deque.h b/libcxx/include/__fwd/deque.h
index 35877a70e9d5b..c9d1867d782c2 100644
--- a/libcxx/include/__fwd/deque.h
+++ b/libcxx/include/__fwd/deque.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_DEQUE_H
-#define _LIBCPP___FWD_DEQUE_H
+#ifndef _LIBCPP_FWD_DEQUE_H
+#define _LIBCPP_FWD_DEQUE_H
 
 #include <__config>
 #include <__fwd/memory.h>
@@ -23,4 +23,4 @@ class deque;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FWD_DEQUE_H
+#endif // _LIBCPP_FWD_DEQUE_H
diff --git a/libcxx/include/__fwd/format.h b/libcxx/include/__fwd/format.h
index b7f4cecb65c1e..021934e10ae6b 100644
--- a/libcxx/include/__fwd/format.h
+++ b/libcxx/include/__fwd/format.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_FORMAT_H
-#define _LIBCPP___FWD_FORMAT_H
+#ifndef _LIBCPP_FWD_FORMAT_H
+#define _LIBCPP_FWD_FORMAT_H
 
 #include <__config>
 #include <__iterator/concepts.h>
@@ -35,4 +35,4 @@ struct formatter;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FWD_FORMAT_H
+#endif // _LIBCPP_FWD_FORMAT_H
diff --git a/libcxx/include/__fwd/fstream.h b/libcxx/include/__fwd/fstream.h
index 34a14dfa84013..f5c20eca3ba47 100644
--- a/libcxx/include/__fwd/fstream.h
+++ b/libcxx/include/__fwd/fstream.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_FSTREAM_H
-#define _LIBCPP___FWD_FSTREAM_H
+#ifndef _LIBCPP_FWD_FSTREAM_H
+#define _LIBCPP_FWD_FSTREAM_H
 
 #include <__config>
 #include <__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_FWD_FSTREAM_H
diff --git a/libcxx/include/__fwd/functional.h b/libcxx/include/__fwd/functional.h
index a8c602417b981..7b3508a2cf1e1 100644
--- a/libcxx/include/__fwd/functional.h
+++ b/libcxx/include/__fwd/functional.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_FUNCTIONAL_H
-#define _LIBCPP___FWD_FUNCTIONAL_H
+#ifndef _LIBCPP_FWD_FUNCTIONAL_H
+#define _LIBCPP_FWD_FUNCTIONAL_H
 
 #include <__config>
 
@@ -32,4 +32,4 @@ class reference_wrapper;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FWD_FUNCTIONAL_H
+#endif // _LIBCPP_FWD_FUNCTIONAL_H
diff --git a/libcxx/include/__fwd/get.h b/libcxx/include/__fwd/get.h
index 6121ed0efd2ba..b267be49f934e 100644
--- a/libcxx/include/__fwd/get.h
+++ b/libcxx/include/__fwd/get.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_GET_H
-#define _LIBCPP___FWD_GET_H
+#ifndef _LIBCPP_FWD_GET_H
+#define _LIBCPP_FWD_GET_H
 
 #include <__config>
 #include <__fwd/array.h>
@@ -21,4 +21,4 @@
 #  pragma GCC system_header
 #endif
 
-#endif // _LIBCPP___FWD_GET_H
+#endif // _LIBCPP_FWD_GET_H
diff --git a/libcxx/include/__fwd/ios.h b/libcxx/include/__fwd/ios.h
index 831624f4b1c57..552412c1644ed 100644
--- a/libcxx/include/__fwd/ios.h
+++ b/libcxx/include/__fwd/ios.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_IOS_H
-#define _LIBCPP___FWD_IOS_H
+#ifndef _LIBCPP_FWD_IOS_H
+#define _LIBCPP_FWD_IOS_H
 
 #include <__config>
 #include <__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_FWD_IOS_H
diff --git a/libcxx/include/__fwd/istream.h b/libcxx/include/__fwd/istream.h
index 91c21c1dab263..f2f2bd0a33c86 100644
--- a/libcxx/include/__fwd/istream.h
+++ b/libcxx/include/__fwd/istream.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_ISTREAM_H
-#define _LIBCPP___FWD_ISTREAM_H
+#ifndef _LIBCPP_FWD_ISTREAM_H
+#define _LIBCPP_FWD_ISTREAM_H
 
 #include <__config>
 #include <__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_FWD_ISTREAM_H
diff --git a/libcxx/include/__fwd/mdspan.h b/libcxx/include/__fwd/mdspan.h
index 8889567a047f6..e909189cd0414 100644
--- a/libcxx/include/__fwd/mdspan.h
+++ b/libcxx/include/__fwd/mdspan.h
@@ -14,8 +14,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MDSPAN_LAYOUTS_H
-#define _LIBCPP___MDSPAN_LAYOUTS_H
+#ifndef _LIBCPP_MDSPAN_LAYOUTS_H
+#define _LIBCPP_MDSPAN_LAYOUTS_H
 
 #include <__config>
 
@@ -54,4 +54,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___MDSPAN_LAYOUTS_H
+#endif // _LIBCPP_MDSPAN_LAYOUTS_H
diff --git a/libcxx/include/__fwd/memory.h b/libcxx/include/__fwd/memory.h
index 09ab5d861bff9..33ab3b171ebc5 100644
--- a/libcxx/include/__fwd/memory.h
+++ b/libcxx/include/__fwd/memory.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_MEMORY_H
-#define _LIBCPP___FWD_MEMORY_H
+#ifndef _LIBCPP_FWD_MEMORY_H
+#define _LIBCPP_FWD_MEMORY_H
 
 #include <__config>
 
@@ -25,4 +25,4 @@ class shared_ptr;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FWD_MEMORY_H
+#endif // _LIBCPP_FWD_MEMORY_H
diff --git a/libcxx/include/__fwd/memory_resource.h b/libcxx/include/__fwd/memory_resource.h
index dc5a7ccb4a8c0..1132a0240c527 100644
--- a/libcxx/include/__fwd/memory_resource.h
+++ b/libcxx/include/__fwd/memory_resource.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_MEMORY_RESOURCE_H
-#define _LIBCPP___FWD_MEMORY_RESOURCE_H
+#ifndef _LIBCPP_FWD_MEMORY_RESOURCE_H
+#define _LIBCPP_FWD_MEMORY_RESOURCE_H
 
 #include <__config>
 
@@ -28,4 +28,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 17
 
-#endif // _LIBCPP___FWD_MEMORY_RESOURCE_H
+#endif // _LIBCPP_FWD_MEMORY_RESOURCE_H
diff --git a/libcxx/include/__fwd/ostream.h b/libcxx/include/__fwd/ostream.h
index 9ceb02dc286b1..54d34e760eecf 100644
--- a/libcxx/include/__fwd/ostream.h
+++ b/libcxx/include/__fwd/ostream.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_OSTREAM_H
-#define _LIBCPP___FWD_OSTREAM_H
+#ifndef _LIBCPP_FWD_OSTREAM_H
+#define _LIBCPP_FWD_OSTREAM_H
 
 #include <__config>
 #include <__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_FWD_OSTREAM_H
diff --git a/libcxx/include/__fwd/pair.h b/libcxx/include/__fwd/pair.h
index cf07eabab6903..f19cf494459a0 100644
--- a/libcxx/include/__fwd/pair.h
+++ b/libcxx/include/__fwd/pair.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_PAIR_H
-#define _LIBCPP___FWD_PAIR_H
+#ifndef _LIBCPP_FWD_PAIR_H
+#define _LIBCPP_FWD_PAIR_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -48,4 +48,4 @@ get(const pair<_T1, _T2>&&) _NOEXCEPT;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FWD_PAIR_H
+#endif // _LIBCPP_FWD_PAIR_H
diff --git a/libcxx/include/__fwd/queue.h b/libcxx/include/__fwd/queue.h
index d32730da13e7e..b962438c46ab1 100644
--- a/libcxx/include/__fwd/queue.h
+++ b/libcxx/include/__fwd/queue.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_QUEUE_H
-#define _LIBCPP___FWD_QUEUE_H
+#ifndef _LIBCPP_FWD_QUEUE_H
+#define _LIBCPP_FWD_QUEUE_H
 
 #include <__config>
 #include <__functional/operations.h>
@@ -28,4 +28,4 @@ class priority_queue;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FWD_QUEUE_H
+#endif // _LIBCPP_FWD_QUEUE_H
diff --git a/libcxx/include/__fwd/span.h b/libcxx/include/__fwd/span.h
index 5d473ee51c6b7..c97f9e2f17ade 100644
--- a/libcxx/include/__fwd/span.h
+++ b/libcxx/include/__fwd/span.h
@@ -7,8 +7,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_SPAN_H
-#define _LIBCPP___FWD_SPAN_H
+#ifndef _LIBCPP_FWD_SPAN_H
+#define _LIBCPP_FWD_SPAN_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -35,4 +35,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___FWD_SPAN_H
+#endif // _LIBCPP_FWD_SPAN_H
diff --git a/libcxx/include/__fwd/sstream.h b/libcxx/include/__fwd/sstream.h
index fe637d8624d7e..d8d2e5d89a3e2 100644
--- a/libcxx/include/__fwd/sstream.h
+++ b/libcxx/include/__fwd/sstream.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_SSTREAM_H
-#define _LIBCPP___FWD_SSTREAM_H
+#ifndef _LIBCPP_FWD_SSTREAM_H
+#define _LIBCPP_FWD_SSTREAM_H
 
 #include <__config>
 #include <__fwd/memory.h>
@@ -55,4 +55,4 @@ class _LIBCPP_PREFERRED_NAME(stringstream)
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FWD_SSTREAM_H
+#endif // _LIBCPP_FWD_SSTREAM_H
diff --git a/libcxx/include/__fwd/stack.h b/libcxx/include/__fwd/stack.h
index 922f03e9402e8..ac4f2c92a08f7 100644
--- a/libcxx/include/__fwd/stack.h
+++ b/libcxx/include/__fwd/stack.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_STACK_H
-#define _LIBCPP___FWD_STACK_H
+#ifndef _LIBCPP_FWD_STACK_H
+#define _LIBCPP_FWD_STACK_H
 
 #include <__config>
 #include <__fwd/deque.h>
@@ -23,4 +23,4 @@ class stack;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FWD_STACK_H
+#endif // _LIBCPP_FWD_STACK_H
diff --git a/libcxx/include/__fwd/streambuf.h b/libcxx/include/__fwd/streambuf.h
index d3d9d466fde6a..7045d6f355253 100644
--- a/libcxx/include/__fwd/streambuf.h
+++ b/libcxx/include/__fwd/streambuf.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_STREAMBUF_H
-#define _LIBCPP___FWD_STREAMBUF_H
+#ifndef _LIBCPP_FWD_STREAMBUF_H
+#define _LIBCPP_FWD_STREAMBUF_H
 
 #include <__config>
 #include <__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_FWD_STREAMBUF_H
diff --git a/libcxx/include/__fwd/string.h b/libcxx/include/__fwd/string.h
index 254d0c874ab7f..85d51bc6c82b4 100644
--- a/libcxx/include/__fwd/string.h
+++ b/libcxx/include/__fwd/string.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_STRING_H
-#define _LIBCPP___FWD_STRING_H
+#ifndef _LIBCPP_FWD_STRING_H
+#define _LIBCPP_FWD_STRING_H
 
 #include <__config>
 #include <__fwd/memory.h>
@@ -104,4 +104,4 @@ class _LIBCPP_PREFERRED_NAME(string)
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FWD_STRING_H
+#endif // _LIBCPP_FWD_STRING_H
diff --git a/libcxx/include/__fwd/string_view.h b/libcxx/include/__fwd/string_view.h
index 8da963d105d78..efc4cd0f01fc8 100644
--- a/libcxx/include/__fwd/string_view.h
+++ b/libcxx/include/__fwd/string_view.h
@@ -7,8 +7,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_STRING_VIEW_H
-#define _LIBCPP___FWD_STRING_VIEW_H
+#ifndef _LIBCPP_FWD_STRING_VIEW_H
+#define _LIBCPP_FWD_STRING_VIEW_H
 
 #include <__config>
 #include <__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_FWD_STRING_VIEW_H
diff --git a/libcxx/include/__fwd/subrange.h b/libcxx/include/__fwd/subrange.h
index 81db94ab736fa..a37b4ca3629a8 100644
--- a/libcxx/include/__fwd/subrange.h
+++ b/libcxx/include/__fwd/subrange.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_SUBRANGE_H
-#define _LIBCPP___FWD_SUBRANGE_H
+#ifndef _LIBCPP_FWD_SUBRANGE_H
+#define _LIBCPP_FWD_SUBRANGE_H
 
 #include <__concepts/copyable.h>
 #include <__config>
@@ -46,4 +46,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 20
 
-#endif // _LIBCPP___FWD_SUBRANGE_H
+#endif // _LIBCPP_FWD_SUBRANGE_H
diff --git a/libcxx/include/__fwd/tuple.h b/libcxx/include/__fwd/tuple.h
index dc96c03e2024f..a6494bdcc2c76 100644
--- a/libcxx/include/__fwd/tuple.h
+++ b/libcxx/include/__fwd/tuple.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_TUPLE_H
-#define _LIBCPP___FWD_TUPLE_H
+#ifndef _LIBCPP_FWD_TUPLE_H
+#define _LIBCPP_FWD_TUPLE_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -63,4 +63,4 @@ get(const tuple<_Tp...>&&) _NOEXCEPT;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FWD_TUPLE_H
+#endif // _LIBCPP_FWD_TUPLE_H
diff --git a/libcxx/include/__fwd/variant.h b/libcxx/include/__fwd/variant.h
index fef7071b32646..f297acf5d083b 100644
--- a/libcxx/include/__fwd/variant.h
+++ b/libcxx/include/__fwd/variant.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_VARIANT_H
-#define _LIBCPP___FWD_VARIANT_H
+#ifndef _LIBCPP_FWD_VARIANT_H
+#define _LIBCPP_FWD_VARIANT_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -65,4 +65,4 @@ _LIBCPP_HIDE_FROM_ABI constexpr const _Tp&& get(const variant<_Types...>&&);
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FWD_VARIANT_H
+#endif // _LIBCPP_FWD_VARIANT_H
diff --git a/libcxx/include/__fwd/vector.h b/libcxx/include/__fwd/vector.h
index 31084ec995b69..40debeadfb3a5 100644
--- a/libcxx/include/__fwd/vector.h
+++ b/libcxx/include/__fwd/vector.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___FWD_VECTOR_H
-#define _LIBCPP___FWD_VECTOR_H
+#ifndef _LIBCPP_FWD_VECTOR_H
+#define _LIBCPP_FWD_VECTOR_H
 
 #include <__config>
 #include <__fwd/memory.h>
@@ -26,4 +26,4 @@ class vector<bool, _Allocator>;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FWD_VECTOR_H
+#endif // _LIBCPP_FWD_VECTOR_H
diff --git a/libcxx/include/__hash_table b/libcxx/include/__hash_table
index e1897949a47e6..9704465d3b1c9 100644
--- a/libcxx/include/__hash_table
+++ b/libcxx/include/__hash_table
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___HASH_TABLE
-#define _LIBCPP___HASH_TABLE
+#ifndef _LIBCPP_HASH_TABLE
+#define _LIBCPP_HASH_TABLE
 
 #include <__algorithm/fill_n.h>
 #include <__algorithm/max.h>
@@ -2119,4 +2119,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___HASH_TABLE
+#endif // _LIBCPP_HASH_TABLE
diff --git a/libcxx/include/__ios/fpos.h b/libcxx/include/__ios/fpos.h
index e5c21b439188c..48799b6838bf5 100644
--- a/libcxx/include/__ios/fpos.h
+++ b/libcxx/include/__ios/fpos.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___IOS_FPOS_H
-#define _LIBCPP___IOS_FPOS_H
+#ifndef _LIBCPP_IOS_FPOS_H
+#define _LIBCPP_IOS_FPOS_H
 
 #include <__config>
 #include <__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_IOS_FPOS_H
diff --git a/libcxx/include/__iterator/access.h b/libcxx/include/__iterator/access.h
index d42855f925487..70da2bee13530 100644
--- a/libcxx/include/__iterator/access.h
+++ b/libcxx/include/__iterator/access.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_ACCESS_H
-#define _LIBCPP___ITERATOR_ACCESS_H
+#ifndef _LIBCPP_ITERATOR_ACCESS_H
+#define _LIBCPP_ITERATOR_ACCESS_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -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_ITERATOR_ACCESS_H
diff --git a/libcxx/include/__iterator/advance.h b/libcxx/include/__iterator/advance.h
index c7d3c1f0e8f05..7ecd2d75eb2ae 100644
--- a/libcxx/include/__iterator/advance.h
+++ b/libcxx/include/__iterator/advance.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_ADVANCE_H
-#define _LIBCPP___ITERATOR_ADVANCE_H
+#ifndef _LIBCPP_ITERATOR_ADVANCE_H
+#define _LIBCPP_ITERATOR_ADVANCE_H
 
 #include <__assert>
 #include <__concepts/assignable.h>
@@ -196,4 +196,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ITERATOR_ADVANCE_H
+#endif // _LIBCPP_ITERATOR_ADVANCE_H
diff --git a/libcxx/include/__iterator/aliasing_iterator.h b/libcxx/include/__iterator/aliasing_iterator.h
index 528e95eb14d68..622b4b8c4723f 100644
--- a/libcxx/include/__iterator/aliasing_iterator.h
+++ b/libcxx/include/__iterator/aliasing_iterator.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_ALIASING_ITERATOR_H
-#define _LIBCPP___ITERATOR_ALIASING_ITERATOR_H
+#ifndef _LIBCPP_ITERATOR_ALIASING_ITERATOR_H
+#define _LIBCPP_ITERATOR_ALIASING_ITERATOR_H
 
 #include <__config>
 #include <__cstddef/ptrdiff_t.h>
@@ -127,4 +127,4 @@ using __aliasing_iterator _LIBCPP_NODEBUG = typename __aliasing_iterator_wrapper
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ITERATOR_ALIASING_ITERATOR_H
+#endif // _LIBCPP_ITERATOR_ALIASING_ITERATOR_H
diff --git a/libcxx/include/__iterator/back_insert_iterator.h b/libcxx/include/__iterator/back_insert_iterator.h
index d051c08751d39..34d68712113f3 100644
--- a/libcxx/include/__iterator/back_insert_iterator.h
+++ b/libcxx/include/__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_ITERATOR_BACK_INSERT_ITERATOR_H
+#define _LIBCPP_ITERATOR_BACK_INSERT_ITERATOR_H
 
 #include <__config>
 #include <__cstddef/ptrdiff_t.h>
@@ -76,4 +76,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ITERATOR_BACK_INSERT_ITERATOR_H
+#endif // _LIBCPP_ITERATOR_BACK_INSERT_ITERATOR_H
diff --git a/libcxx/include/__iterator/bounded_iter.h b/libcxx/include/__iterator/bounded_iter.h
index d2a09061126bd..c3381bed2e47c 100644
--- a/libcxx/include/__iterator/bounded_iter.h
+++ b/libcxx/include/__iterator/bounded_iter.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_BOUNDED_ITER_H
-#define _LIBCPP___ITERATOR_BOUNDED_ITER_H
+#ifndef _LIBCPP_ITERATOR_BOUNDED_ITER_H
+#define _LIBCPP_ITERATOR_BOUNDED_ITER_H
 
 #include <__assert>
 #include <__compare/ordering.h>
@@ -289,4 +289,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ITERATOR_BOUNDED_ITER_H
+#endif // _LIBCPP_ITERATOR_BOUNDED_ITER_H
diff --git a/libcxx/include/__iterator/common_iterator.h b/libcxx/include/__iterator/common_iterator.h
index a59063d245d9c..6e1ff43caeafe 100644
--- a/libcxx/include/__iterator/common_iterator.h
+++ b/libcxx/include/__iterator/common_iterator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_COMMON_ITERATOR_H
-#define _LIBCPP___ITERATOR_COMMON_ITERATOR_H
+#ifndef _LIBCPP_ITERATOR_COMMON_ITERATOR_H
+#define _LIBCPP_ITERATOR_COMMON_ITERATOR_H
 
 #include <__assert>
 #include <__concepts/assignable.h>
@@ -298,4 +298,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ITERATOR_COMMON_ITERATOR_H
+#endif // _LIBCPP_ITERATOR_COMMON_ITERATOR_H
diff --git a/libcxx/include/__iterator/concepts.h b/libcxx/include/__iterator/concepts.h
index 3b43920443636..6b821df2b0949 100644
--- a/libcxx/include/__iterator/concepts.h
+++ b/libcxx/include/__iterator/concepts.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_CONCEPTS_H
-#define _LIBCPP___ITERATOR_CONCEPTS_H
+#ifndef _LIBCPP_ITERATOR_CONCEPTS_H
+#define _LIBCPP_ITERATOR_CONCEPTS_H
 
 #include <__concepts/arithmetic.h>
 #include <__concepts/assignable.h>
@@ -321,4 +321,4 @@ using __has_random_access_iterator_category_or_concept _LIBCPP_NODEBUG
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ITERATOR_CONCEPTS_H
+#endif // _LIBCPP_ITERATOR_CONCEPTS_H
diff --git a/libcxx/include/__iterator/counted_iterator.h b/libcxx/include/__iterator/counted_iterator.h
index 65e178bc0cf21..967dbbdca9dff 100644
--- a/libcxx/include/__iterator/counted_iterator.h
+++ b/libcxx/include/__iterator/counted_iterator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_COUNTED_ITERATOR_H
-#define _LIBCPP___ITERATOR_COUNTED_ITERATOR_H
+#ifndef _LIBCPP_ITERATOR_COUNTED_ITERATOR_H
+#define _LIBCPP_ITERATOR_COUNTED_ITERATOR_H
 
 #include <__assert>
 #include <__compare/ordering.h>
@@ -286,4 +286,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ITERATOR_COUNTED_ITERATOR_H
+#endif // _LIBCPP_ITERATOR_COUNTED_ITERATOR_H
diff --git a/libcxx/include/__iterator/cpp17_iterator_concepts.h b/libcxx/include/__iterator/cpp17_iterator_concepts.h
index ecd30d8e11680..5f00a7526a703 100644
--- a/libcxx/include/__iterator/cpp17_iterator_concepts.h
+++ b/libcxx/include/__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_ITERATOR_CPP17_ITERATOR_CONCEPTS_H
+#define _LIBCPP_ITERATOR_CPP17_ITERATOR_CONCEPTS_H
 
 #include <__concepts/boolean_testable.h>
 #include <__concepts/convertible_to.h>
@@ -188,4 +188,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ITERATOR_CPP17_ITERATOR_CONCEPTS_H
+#endif // _LIBCPP_ITERATOR_CPP17_ITERATOR_CONCEPTS_H
diff --git a/libcxx/include/__iterator/data.h b/libcxx/include/__iterator/data.h
index 5f2624c2b819e..90a90875ce7a9 100644
--- a/libcxx/include/__iterator/data.h
+++ b/libcxx/include/__iterator/data.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_DATA_H
-#define _LIBCPP___ITERATOR_DATA_H
+#ifndef _LIBCPP_ITERATOR_DATA_H
+#define _LIBCPP_ITERATOR_DATA_H
 
 #include <__config>
 #include <initializer_list>
@@ -45,4 +45,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_ITERATOR_DATA_H
diff --git a/libcxx/include/__iterator/default_sentinel.h b/libcxx/include/__iterator/default_sentinel.h
index 3b65f442f1a85..d52f1a2d96875 100644
--- a/libcxx/include/__iterator/default_sentinel.h
+++ b/libcxx/include/__iterator/default_sentinel.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_DEFAULT_SENTINEL_H
-#define _LIBCPP___ITERATOR_DEFAULT_SENTINEL_H
+#ifndef _LIBCPP_ITERATOR_DEFAULT_SENTINEL_H
+#define _LIBCPP_ITERATOR_DEFAULT_SENTINEL_H
 
 #include <__config>
 
@@ -27,4 +27,4 @@ inline constexpr default_sentinel_t default_sentinel{};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ITERATOR_DEFAULT_SENTINEL_H
+#endif // _LIBCPP_ITERATOR_DEFAULT_SENTINEL_H
diff --git a/libcxx/include/__iterator/distance.h b/libcxx/include/__iterator/distance.h
index 1a9fbf27f776b..0401a6045e77f 100644
--- a/libcxx/include/__iterator/distance.h
+++ b/libcxx/include/__iterator/distance.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_DISTANCE_H
-#define _LIBCPP___ITERATOR_DISTANCE_H
+#ifndef _LIBCPP_ITERATOR_DISTANCE_H
+#define _LIBCPP_ITERATOR_DISTANCE_H
 
 #include <__algorithm/for_each_segment.h>
 #include <__concepts/same_as.h>
@@ -114,4 +114,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ITERATOR_DISTANCE_H
+#endif // _LIBCPP_ITERATOR_DISTANCE_H
diff --git a/libcxx/include/__iterator/empty.h b/libcxx/include/__iterator/empty.h
index f2c653bcb329b..70b6d4ae1ed5a 100644
--- a/libcxx/include/__iterator/empty.h
+++ b/libcxx/include/__iterator/empty.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_EMPTY_H
-#define _LIBCPP___ITERATOR_EMPTY_H
+#ifndef _LIBCPP_ITERATOR_EMPTY_H
+#define _LIBCPP_ITERATOR_EMPTY_H
 
 #include <__config>
 #include <initializer_list>
@@ -41,4 +41,4 @@ template <class _Ep>
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ITERATOR_EMPTY_H
+#endif // _LIBCPP_ITERATOR_EMPTY_H
diff --git a/libcxx/include/__iterator/erase_if_container.h b/libcxx/include/__iterator/erase_if_container.h
index 0f87f50cd1c16..fc44918912904 100644
--- a/libcxx/include/__iterator/erase_if_container.h
+++ b/libcxx/include/__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_ITERATOR_ERASE_IF_CONTAINER_H
+#define _LIBCPP_ITERATOR_ERASE_IF_CONTAINER_H
 
 #include <__config>
 
@@ -40,4 +40,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ITERATOR_ERASE_IF_CONTAINER_H
+#endif // _LIBCPP_ITERATOR_ERASE_IF_CONTAINER_H
diff --git a/libcxx/include/__iterator/front_insert_iterator.h b/libcxx/include/__iterator/front_insert_iterator.h
index 2ab5383a1d91a..4133a25dc830e 100644
--- a/libcxx/include/__iterator/front_insert_iterator.h
+++ b/libcxx/include/__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_ITERATOR_FRONT_INSERT_ITERATOR_H
+#define _LIBCPP_ITERATOR_FRONT_INSERT_ITERATOR_H
 
 #include <__config>
 #include <__cstddef/ptrdiff_t.h>
@@ -74,4 +74,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ITERATOR_FRONT_INSERT_ITERATOR_H
+#endif // _LIBCPP_ITERATOR_FRONT_INSERT_ITERATOR_H
diff --git a/libcxx/include/__iterator/incrementable_traits.h b/libcxx/include/__iterator/incrementable_traits.h
index 37c8daddf8a86..8e35e91fc1ac8 100644
--- a/libcxx/include/__iterator/incrementable_traits.h
+++ b/libcxx/include/__iterator/incrementable_traits.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_INCREMENTABLE_TRAITS_H
-#define _LIBCPP___ITERATOR_INCREMENTABLE_TRAITS_H
+#ifndef _LIBCPP_ITERATOR_INCREMENTABLE_TRAITS_H
+#define _LIBCPP_ITERATOR_INCREMENTABLE_TRAITS_H
 
 #include <__concepts/arithmetic.h>
 #include <__config>
@@ -76,4 +76,4 @@ using iter_difference_t =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ITERATOR_INCREMENTABLE_TRAITS_H
+#endif // _LIBCPP_ITERATOR_INCREMENTABLE_TRAITS_H
diff --git a/libcxx/include/__iterator/indirectly_comparable.h b/libcxx/include/__iterator/indirectly_comparable.h
index e8a7398bacd2b..871bc5fc09fbb 100644
--- a/libcxx/include/__iterator/indirectly_comparable.h
+++ b/libcxx/include/__iterator/indirectly_comparable.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_INDIRECTLY_COMPARABLE_H
-#define _LIBCPP___ITERATOR_INDIRECTLY_COMPARABLE_H
+#ifndef _LIBCPP_ITERATOR_INDIRECTLY_COMPARABLE_H
+#define _LIBCPP_ITERATOR_INDIRECTLY_COMPARABLE_H
 
 #include <__config>
 #include <__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_ITERATOR_INDIRECTLY_COMPARABLE_H
diff --git a/libcxx/include/__iterator/insert_iterator.h b/libcxx/include/__iterator/insert_iterator.h
index 6a5818b478771..9669bd3a2679b 100644
--- a/libcxx/include/__iterator/insert_iterator.h
+++ b/libcxx/include/__iterator/insert_iterator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_INSERT_ITERATOR_H
-#define _LIBCPP___ITERATOR_INSERT_ITERATOR_H
+#ifndef _LIBCPP_ITERATOR_INSERT_ITERATOR_H
+#define _LIBCPP_ITERATOR_INSERT_ITERATOR_H
 
 #include <__config>
 #include <__cstddef/ptrdiff_t.h>
@@ -86,4 +86,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ITERATOR_INSERT_ITERATOR_H
+#endif // _LIBCPP_ITERATOR_INSERT_ITERATOR_H
diff --git a/libcxx/include/__iterator/istream_iterator.h b/libcxx/include/__iterator/istream_iterator.h
index f4b13f09c7e2d..184448fbd2901 100644
--- a/libcxx/include/__iterator/istream_iterator.h
+++ b/libcxx/include/__iterator/istream_iterator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_ISTREAM_ITERATOR_H
-#define _LIBCPP___ITERATOR_ISTREAM_ITERATOR_H
+#ifndef _LIBCPP_ITERATOR_ISTREAM_ITERATOR_H
+#define _LIBCPP_ITERATOR_ISTREAM_ITERATOR_H
 
 #include <__config>
 #include <__cstddef/ptrdiff_t.h>
@@ -100,4 +100,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_ITERATOR_ISTREAM_ITERATOR_H
diff --git a/libcxx/include/__iterator/istreambuf_iterator.h b/libcxx/include/__iterator/istreambuf_iterator.h
index 4fc87a84f0192..e49ed5f613917 100644
--- a/libcxx/include/__iterator/istreambuf_iterator.h
+++ b/libcxx/include/__iterator/istreambuf_iterator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_ISTREAMBUF_ITERATOR_H
-#define _LIBCPP___ITERATOR_ISTREAMBUF_ITERATOR_H
+#ifndef _LIBCPP_ITERATOR_ISTREAMBUF_ITERATOR_H
+#define _LIBCPP_ITERATOR_ISTREAMBUF_ITERATOR_H
 
 #include <__config>
 #include <__fwd/istream.h>
@@ -107,4 +107,4 @@ operator!=(const istreambuf_iterator<_CharT, _Traits>& __a, const istreambuf_ite
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ITERATOR_ISTREAMBUF_ITERATOR_H
+#endif // _LIBCPP_ITERATOR_ISTREAMBUF_ITERATOR_H
diff --git a/libcxx/include/__iterator/iter_move.h b/libcxx/include/__iterator/iter_move.h
index 5cc16152593c3..c3e88295a553b 100644
--- a/libcxx/include/__iterator/iter_move.h
+++ b/libcxx/include/__iterator/iter_move.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_ITER_MOVE_H
-#define _LIBCPP___ITERATOR_ITER_MOVE_H
+#ifndef _LIBCPP_ITERATOR_ITER_MOVE_H
+#define _LIBCPP_ITERATOR_ITER_MOVE_H
 
 #include <__concepts/class_or_enum.h>
 #include <__config>
@@ -101,4 +101,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ITERATOR_ITER_MOVE_H
+#endif // _LIBCPP_ITERATOR_ITER_MOVE_H
diff --git a/libcxx/include/__iterator/iter_swap.h b/libcxx/include/__iterator/iter_swap.h
index 01ab1b97d6501..b70ca18b90d6e 100644
--- a/libcxx/include/__iterator/iter_swap.h
+++ b/libcxx/include/__iterator/iter_swap.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_ITER_SWAP_H
-#define _LIBCPP___ITERATOR_ITER_SWAP_H
+#ifndef _LIBCPP_ITERATOR_ITER_SWAP_H
+#define _LIBCPP_ITERATOR_ITER_SWAP_H
 
 #include <__concepts/class_or_enum.h>
 #include <__concepts/swappable.h>
@@ -105,4 +105,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ITERATOR_ITER_SWAP_H
+#endif // _LIBCPP_ITERATOR_ITER_SWAP_H
diff --git a/libcxx/include/__iterator/iterator.h b/libcxx/include/__iterator/iterator.h
index c599f61797a74..f9c3653481d18 100644
--- a/libcxx/include/__iterator/iterator.h
+++ b/libcxx/include/__iterator/iterator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_ITERATOR_H
-#define _LIBCPP___ITERATOR_ITERATOR_H
+#ifndef _LIBCPP_ITERATOR_ITERATOR_H
+#define _LIBCPP_ITERATOR_ITERATOR_H
 
 #include <__config>
 #include <__cstddef/ptrdiff_t.h>
@@ -43,4 +43,4 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ITERATOR_ITERATOR_H
+#endif // _LIBCPP_ITERATOR_ITERATOR_H
diff --git a/libcxx/include/__iterator/iterator_traits.h b/libcxx/include/__iterator/iterator_traits.h
index ebf315a53b6b7..244ebfa05063d 100644
--- a/libcxx/include/__iterator/iterator_traits.h
+++ b/libcxx/include/__iterator/iterator_traits.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_ITERATOR_TRAITS_H
-#define _LIBCPP___ITERATOR_ITERATOR_TRAITS_H
+#ifndef _LIBCPP_ITERATOR_ITERATOR_TRAITS_H
+#define _LIBCPP_ITERATOR_ITERATOR_TRAITS_H
 
 #include <__concepts/arithmetic.h>
 #include <__concepts/constructible.h>
@@ -476,4 +476,4 @@ using iter_value_t =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ITERATOR_ITERATOR_TRAITS_H
+#endif // _LIBCPP_ITERATOR_ITERATOR_TRAITS_H
diff --git a/libcxx/include/__iterator/iterator_with_data.h b/libcxx/include/__iterator/iterator_with_data.h
index afdc0a4e12e21..cc3ca32ce180f 100644
--- a/libcxx/include/__iterator/iterator_with_data.h
+++ b/libcxx/include/__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_ITERATOR_ITERATOR_WITH_DATA_H
+#define _LIBCPP_ITERATOR_ITERATOR_WITH_DATA_H
 
 #include <__compare/compare_three_way_result.h>
 #include <__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_ITERATOR_ITERATOR_WITH_DATA_H
diff --git a/libcxx/include/__iterator/mergeable.h b/libcxx/include/__iterator/mergeable.h
index 7976d751095e5..c59da8d136288 100644
--- a/libcxx/include/__iterator/mergeable.h
+++ b/libcxx/include/__iterator/mergeable.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_MERGEABLE_H
-#define _LIBCPP___ITERATOR_MERGEABLE_H
+#ifndef _LIBCPP_ITERATOR_MERGEABLE_H
+#define _LIBCPP_ITERATOR_MERGEABLE_H
 
 #include <__config>
 #include <__functional/identity.h>
@@ -39,4 +39,4 @@ concept mergeable =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ITERATOR_MERGEABLE_H
+#endif // _LIBCPP_ITERATOR_MERGEABLE_H
diff --git a/libcxx/include/__iterator/move_iterator.h b/libcxx/include/__iterator/move_iterator.h
index 2b64680a3474a..a14aa554ca118 100644
--- a/libcxx/include/__iterator/move_iterator.h
+++ b/libcxx/include/__iterator/move_iterator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_MOVE_ITERATOR_H
-#define _LIBCPP___ITERATOR_MOVE_ITERATOR_H
+#ifndef _LIBCPP_ITERATOR_MOVE_ITERATOR_H
+#define _LIBCPP_ITERATOR_MOVE_ITERATOR_H
 
 #include <__compare/compare_three_way_result.h>
 #include <__compare/three_way_comparable.h>
@@ -344,4 +344,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ITERATOR_MOVE_ITERATOR_H
+#endif // _LIBCPP_ITERATOR_MOVE_ITERATOR_H
diff --git a/libcxx/include/__iterator/move_sentinel.h b/libcxx/include/__iterator/move_sentinel.h
index c77ca5f1a9142..467068b539592 100644
--- a/libcxx/include/__iterator/move_sentinel.h
+++ b/libcxx/include/__iterator/move_sentinel.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_MOVE_SENTINEL_H
-#define _LIBCPP___ITERATOR_MOVE_SENTINEL_H
+#ifndef _LIBCPP_ITERATOR_MOVE_SENTINEL_H
+#define _LIBCPP_ITERATOR_MOVE_SENTINEL_H
 
 #include <__concepts/assignable.h>
 #include <__concepts/convertible_to.h>
@@ -58,4 +58,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ITERATOR_MOVE_SENTINEL_H
+#endif // _LIBCPP_ITERATOR_MOVE_SENTINEL_H
diff --git a/libcxx/include/__iterator/next.h b/libcxx/include/__iterator/next.h
index 1143ab31ff7c2..deff108aa9784 100644
--- a/libcxx/include/__iterator/next.h
+++ b/libcxx/include/__iterator/next.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_NEXT_H
-#define _LIBCPP___ITERATOR_NEXT_H
+#ifndef _LIBCPP_ITERATOR_NEXT_H
+#define _LIBCPP_ITERATOR_NEXT_H
 
 #include <__config>
 #include <__iterator/advance.h>
@@ -71,4 +71,4 @@ inline constexpr auto next = __next{};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ITERATOR_NEXT_H
+#endif // _LIBCPP_ITERATOR_NEXT_H
diff --git a/libcxx/include/__iterator/ostream_iterator.h b/libcxx/include/__iterator/ostream_iterator.h
index 64e79f010f64a..e9b3d3a3ee59a 100644
--- a/libcxx/include/__iterator/ostream_iterator.h
+++ b/libcxx/include/__iterator/ostream_iterator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_OSTREAM_ITERATOR_H
-#define _LIBCPP___ITERATOR_OSTREAM_ITERATOR_H
+#ifndef _LIBCPP_ITERATOR_OSTREAM_ITERATOR_H
+#define _LIBCPP_ITERATOR_OSTREAM_ITERATOR_H
 
 #include <__config>
 #include <__cstddef/ptrdiff_t.h>
@@ -66,4 +66,4 @@ class ostream_iterator
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ITERATOR_OSTREAM_ITERATOR_H
+#endif // _LIBCPP_ITERATOR_OSTREAM_ITERATOR_H
diff --git a/libcxx/include/__iterator/ostreambuf_iterator.h b/libcxx/include/__iterator/ostreambuf_iterator.h
index 4a3b2fa024490..340912af937b9 100644
--- a/libcxx/include/__iterator/ostreambuf_iterator.h
+++ b/libcxx/include/__iterator/ostreambuf_iterator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_OSTREAMBUF_ITERATOR_H
-#define _LIBCPP___ITERATOR_OSTREAMBUF_ITERATOR_H
+#ifndef _LIBCPP_ITERATOR_OSTREAMBUF_ITERATOR_H
+#define _LIBCPP_ITERATOR_OSTREAMBUF_ITERATOR_H
 
 #include <__config>
 #include <__cstddef/ptrdiff_t.h>
@@ -68,4 +68,4 @@ class ostreambuf_iterator
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ITERATOR_OSTREAMBUF_ITERATOR_H
+#endif // _LIBCPP_ITERATOR_OSTREAMBUF_ITERATOR_H
diff --git a/libcxx/include/__iterator/permutable.h b/libcxx/include/__iterator/permutable.h
index f65ba3bfbbaad..32a4d00784bf9 100644
--- a/libcxx/include/__iterator/permutable.h
+++ b/libcxx/include/__iterator/permutable.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_PERMUTABLE_H
-#define _LIBCPP___ITERATOR_PERMUTABLE_H
+#ifndef _LIBCPP_ITERATOR_PERMUTABLE_H
+#define _LIBCPP_ITERATOR_PERMUTABLE_H
 
 #include <__config>
 #include <__iterator/concepts.h>
@@ -31,4 +31,4 @@ concept permutable =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ITERATOR_PERMUTABLE_H
+#endif // _LIBCPP_ITERATOR_PERMUTABLE_H
diff --git a/libcxx/include/__iterator/prev.h b/libcxx/include/__iterator/prev.h
index 97139e067c896..1c50fec97b7a1 100644
--- a/libcxx/include/__iterator/prev.h
+++ b/libcxx/include/__iterator/prev.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_PREV_H
-#define _LIBCPP___ITERATOR_PREV_H
+#ifndef _LIBCPP_ITERATOR_PREV_H
+#define _LIBCPP_ITERATOR_PREV_H
 
 #include <__config>
 #include <__iterator/advance.h>
@@ -81,4 +81,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ITERATOR_PREV_H
+#endif // _LIBCPP_ITERATOR_PREV_H
diff --git a/libcxx/include/__iterator/product_iterator.h b/libcxx/include/__iterator/product_iterator.h
index 1db673bafd337..b2c6a43d2a364 100644
--- a/libcxx/include/__iterator/product_iterator.h
+++ b/libcxx/include/__iterator/product_iterator.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_PRODUCT_ITERATOR_H
-#define _LIBCPP___ITERATOR_PRODUCT_ITERATOR_H
+#ifndef _LIBCPP_ITERATOR_PRODUCT_ITERATOR_H
+#define _LIBCPP_ITERATOR_PRODUCT_ITERATOR_H
 
 // Product iterators are iterators that contain two or more underlying iterators.
 //
@@ -73,4 +73,4 @@ using __product_iterator_element_t _LIBCPP_NODEBUG =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ITERATOR_PRODUCT_ITERATOR_H
+#endif // _LIBCPP_ITERATOR_PRODUCT_ITERATOR_H
diff --git a/libcxx/include/__iterator/projected.h b/libcxx/include/__iterator/projected.h
index d12f0167de1df..96cfc7dd0a127 100644
--- a/libcxx/include/__iterator/projected.h
+++ b/libcxx/include/__iterator/projected.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_PROJECTED_H
-#define _LIBCPP___ITERATOR_PROJECTED_H
+#ifndef _LIBCPP_ITERATOR_PROJECTED_H
+#define _LIBCPP_ITERATOR_PROJECTED_H
 
 #include <__config>
 #include <__iterator/concepts.h>
@@ -58,4 +58,4 @@ using projected = typename __projected_impl<_It, _Proj>::__type;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ITERATOR_PROJECTED_H
+#endif // _LIBCPP_ITERATOR_PROJECTED_H
diff --git a/libcxx/include/__iterator/ranges_iterator_traits.h b/libcxx/include/__iterator/ranges_iterator_traits.h
index 9a31b651eb5da..1a5aed91534ae 100644
--- a/libcxx/include/__iterator/ranges_iterator_traits.h
+++ b/libcxx/include/__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_ITERATOR_RANGES_ITERATOR_TRAITS_H
+#define _LIBCPP_ITERATOR_RANGES_ITERATOR_TRAITS_H
 
 #include <__config>
 #include <__fwd/pair.h>
@@ -37,4 +37,4 @@ using __range_to_alloc_type _LIBCPP_NODEBUG =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ITERATOR_RANGES_ITERATOR_TRAITS_H
+#endif // _LIBCPP_ITERATOR_RANGES_ITERATOR_TRAITS_H
diff --git a/libcxx/include/__iterator/readable_traits.h b/libcxx/include/__iterator/readable_traits.h
index 25e74567fff11..16633724d2373 100644
--- a/libcxx/include/__iterator/readable_traits.h
+++ b/libcxx/include/__iterator/readable_traits.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_READABLE_TRAITS_H
-#define _LIBCPP___ITERATOR_READABLE_TRAITS_H
+#ifndef _LIBCPP_ITERATOR_READABLE_TRAITS_H
+#define _LIBCPP_ITERATOR_READABLE_TRAITS_H
 
 #include <__concepts/same_as.h>
 #include <__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_ITERATOR_READABLE_TRAITS_H
diff --git a/libcxx/include/__iterator/reverse_access.h b/libcxx/include/__iterator/reverse_access.h
index f6e60c3fb75b3..393e7c4177d52 100644
--- a/libcxx/include/__iterator/reverse_access.h
+++ b/libcxx/include/__iterator/reverse_access.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_REVERSE_ACCESS_H
-#define _LIBCPP___ITERATOR_REVERSE_ACCESS_H
+#ifndef _LIBCPP_ITERATOR_REVERSE_ACCESS_H
+#define _LIBCPP_ITERATOR_REVERSE_ACCESS_H
 
 #include <__config>
 #include <__iterator/reverse_iterator.h>
@@ -76,4 +76,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_ITERATOR_REVERSE_ACCESS_H
diff --git a/libcxx/include/__iterator/reverse_iterator.h b/libcxx/include/__iterator/reverse_iterator.h
index 834695dd16703..1cf00c71a9ec4 100644
--- a/libcxx/include/__iterator/reverse_iterator.h
+++ b/libcxx/include/__iterator/reverse_iterator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_REVERSE_ITERATOR_H
-#define _LIBCPP___ITERATOR_REVERSE_ITERATOR_H
+#ifndef _LIBCPP_ITERATOR_REVERSE_ITERATOR_H
+#define _LIBCPP_ITERATOR_REVERSE_ITERATOR_H
 
 #include <__algorithm/unwrap_iter.h>
 #include <__compare/compare_three_way_result.h>
@@ -340,4 +340,4 @@ struct __unwrap_iter_impl<reverse_iterator<reverse_iterator<_Iter> >, __b> {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ITERATOR_REVERSE_ITERATOR_H
+#endif // _LIBCPP_ITERATOR_REVERSE_ITERATOR_H
diff --git a/libcxx/include/__iterator/segmented_iterator.h b/libcxx/include/__iterator/segmented_iterator.h
index dc56a740130b5..d9657da6d0541 100644
--- a/libcxx/include/__iterator/segmented_iterator.h
+++ b/libcxx/include/__iterator/segmented_iterator.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___SEGMENTED_ITERATOR_H
-#define _LIBCPP___SEGMENTED_ITERATOR_H
+#ifndef _LIBCPP_SEGMENTED_ITERATOR_H
+#define _LIBCPP_SEGMENTED_ITERATOR_H
 
 // Segmented iterators are iterators over (not necessarily contiguous) sub-ranges.
 //
@@ -77,4 +77,4 @@ inline const bool __is_segmented_iterator_v = __has_specialization_v<__segmented
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___SEGMENTED_ITERATOR_H
+#endif // _LIBCPP_SEGMENTED_ITERATOR_H
diff --git a/libcxx/include/__iterator/size.h b/libcxx/include/__iterator/size.h
index 84e2e3b21f1d5..51fc72a7aefaa 100644
--- a/libcxx/include/__iterator/size.h
+++ b/libcxx/include/__iterator/size.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_SIZE_H
-#define _LIBCPP___ITERATOR_SIZE_H
+#ifndef _LIBCPP_ITERATOR_SIZE_H
+#define _LIBCPP_ITERATOR_SIZE_H
 
 #include <__config>
 #include <__cstddef/ptrdiff_t.h>
@@ -57,4 +57,4 @@ _LIBCPP_DIAGNOSTIC_POP
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ITERATOR_SIZE_H
+#endif // _LIBCPP_ITERATOR_SIZE_H
diff --git a/libcxx/include/__iterator/sortable.h b/libcxx/include/__iterator/sortable.h
index 1444860f2aa10..8e6d77dd94222 100644
--- a/libcxx/include/__iterator/sortable.h
+++ b/libcxx/include/__iterator/sortable.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_SORTABLE_H
-#define _LIBCPP___ITERATOR_SORTABLE_H
+#ifndef _LIBCPP_ITERATOR_SORTABLE_H
+#define _LIBCPP_ITERATOR_SORTABLE_H
 
 #include <__config>
 #include <__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_ITERATOR_SORTABLE_H
diff --git a/libcxx/include/__iterator/static_bounded_iter.h b/libcxx/include/__iterator/static_bounded_iter.h
index d8fc7d185e7bc..84914da9a3881 100644
--- a/libcxx/include/__iterator/static_bounded_iter.h
+++ b/libcxx/include/__iterator/static_bounded_iter.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_STATIC_BOUNDED_ITER_H
-#define _LIBCPP___ITERATOR_STATIC_BOUNDED_ITER_H
+#ifndef _LIBCPP_ITERATOR_STATIC_BOUNDED_ITER_H
+#define _LIBCPP_ITERATOR_STATIC_BOUNDED_ITER_H
 
 #include <__assert>
 #include <__compare/ordering.h>
@@ -315,4 +315,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___ITERATOR_STATIC_BOUNDED_ITER_H
+#endif // _LIBCPP_ITERATOR_STATIC_BOUNDED_ITER_H
diff --git a/libcxx/include/__iterator/unreachable_sentinel.h b/libcxx/include/__iterator/unreachable_sentinel.h
index 77e663da4b3a6..222299bee9b3f 100644
--- a/libcxx/include/__iterator/unreachable_sentinel.h
+++ b/libcxx/include/__iterator/unreachable_sentinel.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_UNREACHABLE_SENTINEL_H
-#define _LIBCPP___ITERATOR_UNREACHABLE_SENTINEL_H
+#ifndef _LIBCPP_ITERATOR_UNREACHABLE_SENTINEL_H
+#define _LIBCPP_ITERATOR_UNREACHABLE_SENTINEL_H
 
 #include <__config>
 #include <__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_ITERATOR_UNREACHABLE_SENTINEL_H
diff --git a/libcxx/include/__iterator/wrap_iter.h b/libcxx/include/__iterator/wrap_iter.h
index d18d9682da449..257e11d659292 100644
--- a/libcxx/include/__iterator/wrap_iter.h
+++ b/libcxx/include/__iterator/wrap_iter.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ITERATOR_WRAP_ITER_H
-#define _LIBCPP___ITERATOR_WRAP_ITER_H
+#ifndef _LIBCPP_ITERATOR_WRAP_ITER_H
+#define _LIBCPP_ITERATOR_WRAP_ITER_H
 
 #include <__compare/ordering.h>
 #include <__compare/three_way_comparable.h>
@@ -250,4 +250,4 @@ struct pointer_traits<__wrap_iter<_It> > {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ITERATOR_WRAP_ITER_H
+#endif // _LIBCPP_ITERATOR_WRAP_ITER_H
diff --git a/libcxx/include/__locale b/libcxx/include/__locale
index eb7b7786208e8..75984afff5244 100644
--- a/libcxx/include/__locale
+++ b/libcxx/include/__locale
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOCALE
-#define _LIBCPP___LOCALE
+#ifndef _LIBCPP_LOCALE
+#define _LIBCPP_LOCALE
 
 #include <__config>
 
@@ -1505,4 +1505,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_HAS_LOCALIZATION
 
-#endif // _LIBCPP___LOCALE
+#endif // _LIBCPP_LOCALE
diff --git a/libcxx/include/__locale_dir/check_grouping.h b/libcxx/include/__locale_dir/check_grouping.h
index 93e9e404bb5f3..452f9e32d7b0e 100644
--- a/libcxx/include/__locale_dir/check_grouping.h
+++ b/libcxx/include/__locale_dir/check_grouping.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOCALE_DIR_CHECK_GROUPING_H
-#define _LIBCPP___LOCALE_DIR_CHECK_GROUPING_H
+#ifndef _LIBCPP_LOCALE_DIR_CHECK_GROUPING_H
+#define _LIBCPP_LOCALE_DIR_CHECK_GROUPING_H
 
 #include <__config>
 #include <__fwd/string.h>
@@ -28,4 +28,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_HAS_LOCALIZATION
 
-#endif // _LIBCPP___LOCALE_DIR_CHECK_GROUPING_H
+#endif // _LIBCPP_LOCALE_DIR_CHECK_GROUPING_H
diff --git a/libcxx/include/__locale_dir/get_c_locale.h b/libcxx/include/__locale_dir/get_c_locale.h
index e8bac9a87095b..aed3e35f74cb3 100644
--- a/libcxx/include/__locale_dir/get_c_locale.h
+++ b/libcxx/include/__locale_dir/get_c_locale.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOCALE_DIR_GET_C_LOCALE_H
-#define _LIBCPP___LOCALE_DIR_GET_C_LOCALE_H
+#ifndef _LIBCPP_LOCALE_DIR_GET_C_LOCALE_H
+#define _LIBCPP_LOCALE_DIR_GET_C_LOCALE_H
 
 #include <__config>
 #include <__locale_dir/locale_base_api.h>
@@ -37,4 +37,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_HAS_LOCALIZATION
 
-#endif // _LIBCPP___LOCALE_DIR_GET_C_LOCALE_H
+#endif // _LIBCPP_LOCALE_DIR_GET_C_LOCALE_H
diff --git a/libcxx/include/__locale_dir/locale_base_api.h b/libcxx/include/__locale_dir/locale_base_api.h
index 8c8f00061d1ed..a2f2f7d970830 100644
--- a/libcxx/include/__locale_dir/locale_base_api.h
+++ b/libcxx/include/__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_LOCALE_DIR_LOCALE_BASE_API_H
+#define _LIBCPP_LOCALE_DIR_LOCALE_BASE_API_H
 
 #include <__config>
 
@@ -319,4 +319,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_HAS_LOCALIZATION
 
-#endif // _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_H
+#endif // _LIBCPP_LOCALE_DIR_LOCALE_BASE_API_H
diff --git a/libcxx/include/__locale_dir/locale_base_api/bsd_locale_fallbacks.h b/libcxx/include/__locale_dir/locale_base_api/bsd_locale_fallbacks.h
index b62a1b737e97f..230ededc3e605 100644
--- a/libcxx/include/__locale_dir/locale_base_api/bsd_locale_fallbacks.h
+++ b/libcxx/include/__locale_dir/locale_base_api/bsd_locale_fallbacks.h
@@ -10,8 +10,8 @@
 // of those functions for non-BSD platforms.
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_BSD_LOCALE_FALLBACKS_H
-#define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_BSD_LOCALE_FALLBACKS_H
+#ifndef _LIBCPP_LOCALE_DIR_LOCALE_BASE_API_BSD_LOCALE_FALLBACKS_H
+#define _LIBCPP_LOCALE_DIR_LOCALE_BASE_API_BSD_LOCALE_FALLBACKS_H
 
 #include <locale.h>
 #include <stdarg.h>
@@ -137,4 +137,4 @@ inline _LIBCPP_ATTRIBUTE_FORMAT(__scanf__, 3, 4) int __libcpp_sscanf_l(
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_BSD_LOCALE_FALLBACKS_H
+#endif // _LIBCPP_LOCALE_DIR_LOCALE_BASE_API_BSD_LOCALE_FALLBACKS_H
diff --git a/libcxx/include/__locale_dir/locale_base_api/ibm.h b/libcxx/include/__locale_dir/locale_base_api/ibm.h
index 1d1d15df9f799..ee924051bccaf 100644
--- a/libcxx/include/__locale_dir/locale_base_api/ibm.h
+++ b/libcxx/include/__locale_dir/locale_base_api/ibm.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_IBM_H
-#define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_IBM_H
+#ifndef _LIBCPP_LOCALE_DIR_LOCALE_BASE_API_IBM_H
+#define _LIBCPP_LOCALE_DIR_LOCALE_BASE_API_IBM_H
 
 #if defined(__MVS__)
 #  include <__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_DIR_LOCALE_BASE_API_IBM_H
+#endif // _LIBCPP_LOCALE_DIR_LOCALE_BASE_API_IBM_H
diff --git a/libcxx/include/__locale_dir/locale_base_api/musl.h b/libcxx/include/__locale_dir/locale_base_api/musl.h
index 1653214cdba1e..b1e4016acbbd0 100644
--- a/libcxx/include/__locale_dir/locale_base_api/musl.h
+++ b/libcxx/include/__locale_dir/locale_base_api/musl.h
@@ -14,8 +14,8 @@
 // in Musl.
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_MUSL_H
-#define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_MUSL_H
+#ifndef _LIBCPP_LOCALE_DIR_LOCALE_BASE_API_MUSL_H
+#define _LIBCPP_LOCALE_DIR_LOCALE_BASE_API_MUSL_H
 
 #include <cstdlib>
 #include <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_DIR_LOCALE_BASE_API_MUSL_H
+#endif // _LIBCPP_LOCALE_DIR_LOCALE_BASE_API_MUSL_H
diff --git a/libcxx/include/__locale_dir/locale_base_api/openbsd.h b/libcxx/include/__locale_dir/locale_base_api/openbsd.h
index d4fb224e0c80a..7a0a79c784231 100644
--- a/libcxx/include/__locale_dir/locale_base_api/openbsd.h
+++ b/libcxx/include/__locale_dir/locale_base_api/openbsd.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_OPENBSD_H
-#define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_OPENBSD_H
+#ifndef _LIBCPP_LOCALE_DIR_LOCALE_BASE_API_OPENBSD_H
+#define _LIBCPP_LOCALE_DIR_LOCALE_BASE_API_OPENBSD_H
 
 #include <__support/xlocale/__strtonum_fallback.h>
 #include <clocale>
@@ -16,4 +16,4 @@
 #include <ctype.h>
 #include <cwctype>
 
-#endif // _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_OPENBSD_H
+#endif // _LIBCPP_LOCALE_DIR_LOCALE_BASE_API_OPENBSD_H
diff --git a/libcxx/include/__locale_dir/messages.h b/libcxx/include/__locale_dir/messages.h
index c04bf04025ff0..568b7bc2da6a3 100644
--- a/libcxx/include/__locale_dir/messages.h
+++ b/libcxx/include/__locale_dir/messages.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOCALE_DIR_MESSAGES_H
-#define _LIBCPP___LOCALE_DIR_MESSAGES_H
+#ifndef _LIBCPP_LOCALE_DIR_MESSAGES_H
+#define _LIBCPP_LOCALE_DIR_MESSAGES_H
 
 #include <__config>
 #include <__iterator/back_insert_iterator.h>
@@ -140,4 +140,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_HAS_LOCALIZATION
 
-#endif // _LIBCPP___LOCALE_DIR_MESSAGES_H
+#endif // _LIBCPP_LOCALE_DIR_MESSAGES_H
diff --git a/libcxx/include/__locale_dir/money.h b/libcxx/include/__locale_dir/money.h
index c1296665505e1..aa0cd136106f3 100644
--- a/libcxx/include/__locale_dir/money.h
+++ b/libcxx/include/__locale_dir/money.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOCALE_DIR_MONEY_H
-#define _LIBCPP___LOCALE_DIR_MONEY_H
+#ifndef _LIBCPP_LOCALE_DIR_MONEY_H
+#define _LIBCPP_LOCALE_DIR_MONEY_H
 
 #include <__algorithm/copy.h>
 #include <__algorithm/equal.h>
@@ -870,4 +870,4 @@ _LIBCPP_POP_MACROS
 
 #endif // _LIBCPP_HAS_LOCALIZATION
 
-#endif // _LIBCPP___LOCALE_DIR_MONEY_H
+#endif // _LIBCPP_LOCALE_DIR_MONEY_H
diff --git a/libcxx/include/__locale_dir/num.h b/libcxx/include/__locale_dir/num.h
index 7ca8ffe348959..2ffc25dd01461 100644
--- a/libcxx/include/__locale_dir/num.h
+++ b/libcxx/include/__locale_dir/num.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOCALE_DIR_NUM_H
-#define _LIBCPP___LOCALE_DIR_NUM_H
+#ifndef _LIBCPP_LOCALE_DIR_NUM_H
+#define _LIBCPP_LOCALE_DIR_NUM_H
 
 #include <__algorithm/find.h>
 #include <__algorithm/reverse.h>
@@ -1069,4 +1069,4 @@ _LIBCPP_POP_MACROS
 
 #endif // _LIBCPP_HAS_LOCALIZATION
 
-#endif // _LIBCPP___LOCALE_DIR_NUM_H
+#endif // _LIBCPP_LOCALE_DIR_NUM_H
diff --git a/libcxx/include/__locale_dir/pad_and_output.h b/libcxx/include/__locale_dir/pad_and_output.h
index a1cb37d0786da..b325ec02bcf1b 100644
--- a/libcxx/include/__locale_dir/pad_and_output.h
+++ b/libcxx/include/__locale_dir/pad_and_output.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOCALE_DIR_PAD_AND_OUTPUT_H
-#define _LIBCPP___LOCALE_DIR_PAD_AND_OUTPUT_H
+#ifndef _LIBCPP_LOCALE_DIR_PAD_AND_OUTPUT_H
+#define _LIBCPP_LOCALE_DIR_PAD_AND_OUTPUT_H
 
 #include <__config>
 
@@ -85,4 +85,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_HAS_LOCALIZATION
 
-#endif // _LIBCPP___LOCALE_DIR_PAD_AND_OUTPUT_H
+#endif // _LIBCPP_LOCALE_DIR_PAD_AND_OUTPUT_H
diff --git a/libcxx/include/__locale_dir/scan_keyword.h b/libcxx/include/__locale_dir/scan_keyword.h
index 78dd0a46a8ee1..166271a682503 100644
--- a/libcxx/include/__locale_dir/scan_keyword.h
+++ b/libcxx/include/__locale_dir/scan_keyword.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOCALE_DIR_SCAN_KEYWORD_H
-#define _LIBCPP___LOCALE_DIR_SCAN_KEYWORD_H
+#ifndef _LIBCPP_LOCALE_DIR_SCAN_KEYWORD_H
+#define _LIBCPP_LOCALE_DIR_SCAN_KEYWORD_H
 
 #include <__config>
 #include <__memory/unique_ptr.h>
@@ -140,4 +140,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_HAS_LOCALIZATION
 
-#endif // _LIBCPP___LOCALE_DIR_SCAN_KEYWORD_H
+#endif // _LIBCPP_LOCALE_DIR_SCAN_KEYWORD_H
diff --git a/libcxx/include/__locale_dir/support/apple.h b/libcxx/include/__locale_dir/support/apple.h
index 62eb79c30d435..541cc0d0d2eaf 100644
--- a/libcxx/include/__locale_dir/support/apple.h
+++ b/libcxx/include/__locale_dir/support/apple.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOCALE_DIR_SUPPORT_APPLE_H
-#define _LIBCPP___LOCALE_DIR_SUPPORT_APPLE_H
+#ifndef _LIBCPP_LOCALE_DIR_SUPPORT_APPLE_H
+#define _LIBCPP_LOCALE_DIR_SUPPORT_APPLE_H
 
 #include <__config>
 
@@ -17,4 +17,4 @@
 
 #include <__locale_dir/support/bsd_like.h>
 
-#endif // _LIBCPP___LOCALE_DIR_SUPPORT_APPLE_H
+#endif // _LIBCPP_LOCALE_DIR_SUPPORT_APPLE_H
diff --git a/libcxx/include/__locale_dir/support/bsd_like.h b/libcxx/include/__locale_dir/support/bsd_like.h
index 9d4bdd1d5775f..cec5f836aec41 100644
--- a/libcxx/include/__locale_dir/support/bsd_like.h
+++ b/libcxx/include/__locale_dir/support/bsd_like.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOCALE_DIR_SUPPORT_BSD_LIKE_H
-#define _LIBCPP___LOCALE_DIR_SUPPORT_BSD_LIKE_H
+#ifndef _LIBCPP_LOCALE_DIR_SUPPORT_BSD_LIKE_H
+#define _LIBCPP_LOCALE_DIR_SUPPORT_BSD_LIKE_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -227,4 +227,4 @@ _LIBCPP_DIAGNOSTIC_POP
 } // namespace __locale
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___LOCALE_DIR_SUPPORT_BSD_LIKE_H
+#endif // _LIBCPP_LOCALE_DIR_SUPPORT_BSD_LIKE_H
diff --git a/libcxx/include/__locale_dir/support/freebsd.h b/libcxx/include/__locale_dir/support/freebsd.h
index 5c6e21e387271..e03beaa7fe768 100644
--- a/libcxx/include/__locale_dir/support/freebsd.h
+++ b/libcxx/include/__locale_dir/support/freebsd.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOCALE_DIR_SUPPORT_FREEBSD_H
-#define _LIBCPP___LOCALE_DIR_SUPPORT_FREEBSD_H
+#ifndef _LIBCPP_LOCALE_DIR_SUPPORT_FREEBSD_H
+#define _LIBCPP_LOCALE_DIR_SUPPORT_FREEBSD_H
 
 #include <__config>
 
@@ -17,4 +17,4 @@
 
 #include <__locale_dir/support/bsd_like.h>
 
-#endif // _LIBCPP___LOCALE_DIR_SUPPORT_FREEBSD_H
+#endif // _LIBCPP_LOCALE_DIR_SUPPORT_FREEBSD_H
diff --git a/libcxx/include/__locale_dir/support/fuchsia.h b/libcxx/include/__locale_dir/support/fuchsia.h
index 4b9e63facb19e..c9c67c1605d23 100644
--- a/libcxx/include/__locale_dir/support/fuchsia.h
+++ b/libcxx/include/__locale_dir/support/fuchsia.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOCALE_DIR_SUPPORT_FUCHSIA_H
-#define _LIBCPP___LOCALE_DIR_SUPPORT_FUCHSIA_H
+#ifndef _LIBCPP_LOCALE_DIR_SUPPORT_FUCHSIA_H
+#define _LIBCPP_LOCALE_DIR_SUPPORT_FUCHSIA_H
 
 #include <__config>
 #include <__utility/forward.h>
@@ -157,4 +157,4 @@ _LIBCPP_END_NAMESPACE_STD
 #include <__locale_dir/support/no_locale/characters.h>
 #include <__locale_dir/support/no_locale/strtonum.h>
 
-#endif // _LIBCPP___LOCALE_DIR_SUPPORT_FUCHSIA_H
+#endif // _LIBCPP_LOCALE_DIR_SUPPORT_FUCHSIA_H
diff --git a/libcxx/include/__locale_dir/support/linux.h b/libcxx/include/__locale_dir/support/linux.h
index 23bcf44c31dbf..5c0672c58522e 100644
--- a/libcxx/include/__locale_dir/support/linux.h
+++ b/libcxx/include/__locale_dir/support/linux.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOCALE_DIR_SUPPORT_LINUX_H
-#define _LIBCPP___LOCALE_DIR_SUPPORT_LINUX_H
+#ifndef _LIBCPP_LOCALE_DIR_SUPPORT_LINUX_H
+#define _LIBCPP_LOCALE_DIR_SUPPORT_LINUX_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -278,4 +278,4 @@ inline _LIBCPP_ATTRIBUTE_FORMAT(__scanf__, 3, 4) int __sscanf(
 } // namespace __locale
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___LOCALE_DIR_SUPPORT_LINUX_H
+#endif // _LIBCPP_LOCALE_DIR_SUPPORT_LINUX_H
diff --git a/libcxx/include/__locale_dir/support/netbsd.h b/libcxx/include/__locale_dir/support/netbsd.h
index 190857f6f84fe..9fbafec67de79 100644
--- a/libcxx/include/__locale_dir/support/netbsd.h
+++ b/libcxx/include/__locale_dir/support/netbsd.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOCALE_DIR_SUPPORT_NETBSD_H
-#define _LIBCPP___LOCALE_DIR_SUPPORT_NETBSD_H
+#ifndef _LIBCPP_LOCALE_DIR_SUPPORT_NETBSD_H
+#define _LIBCPP_LOCALE_DIR_SUPPORT_NETBSD_H
 
 #include <__config>
 
@@ -17,4 +17,4 @@
 
 #include <__locale_dir/support/bsd_like.h>
 
-#endif // _LIBCPP___LOCALE_DIR_SUPPORT_NETBSD_H
+#endif // _LIBCPP_LOCALE_DIR_SUPPORT_NETBSD_H
diff --git a/libcxx/include/__locale_dir/support/no_locale/characters.h b/libcxx/include/__locale_dir/support/no_locale/characters.h
index 1281b8bd13094..d2c29d60cc471 100644
--- a/libcxx/include/__locale_dir/support/no_locale/characters.h
+++ b/libcxx/include/__locale_dir/support/no_locale/characters.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOCALE_DIR_SUPPORT_NO_LOCALE_CHARACTERS_H
-#define _LIBCPP___LOCALE_DIR_SUPPORT_NO_LOCALE_CHARACTERS_H
+#ifndef _LIBCPP_LOCALE_DIR_SUPPORT_NO_LOCALE_CHARACTERS_H
+#define _LIBCPP_LOCALE_DIR_SUPPORT_NO_LOCALE_CHARACTERS_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -93,4 +93,4 @@ __strftime(char* __s, size_t __max, const char* __format, const struct tm* __tm,
 } // namespace __locale
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___LOCALE_DIR_SUPPORT_NO_LOCALE_CHARACTERS_H
+#endif // _LIBCPP_LOCALE_DIR_SUPPORT_NO_LOCALE_CHARACTERS_H
diff --git a/libcxx/include/__locale_dir/support/no_locale/strtonum.h b/libcxx/include/__locale_dir/support/no_locale/strtonum.h
index 0e7a32993e736..f7d65c87b32b3 100644
--- a/libcxx/include/__locale_dir/support/no_locale/strtonum.h
+++ b/libcxx/include/__locale_dir/support/no_locale/strtonum.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOCALE_DIR_SUPPORT_NO_LOCALE_STRTONUM_H
-#define _LIBCPP___LOCALE_DIR_SUPPORT_NO_LOCALE_STRTONUM_H
+#ifndef _LIBCPP_LOCALE_DIR_SUPPORT_NO_LOCALE_STRTONUM_H
+#define _LIBCPP_LOCALE_DIR_SUPPORT_NO_LOCALE_STRTONUM_H
 
 #include <__config>
 #include <cstdlib>
@@ -46,4 +46,4 @@ __strtoull(const char* __nptr, char** __endptr, int __base, __locale_t) {
 } // namespace __locale
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___LOCALE_DIR_SUPPORT_NO_LOCALE_STRTONUM_H
+#endif // _LIBCPP_LOCALE_DIR_SUPPORT_NO_LOCALE_STRTONUM_H
diff --git a/libcxx/include/__locale_dir/support/windows.h b/libcxx/include/__locale_dir/support/windows.h
index 0df8709f118d0..1e1843446060c 100644
--- a/libcxx/include/__locale_dir/support/windows.h
+++ b/libcxx/include/__locale_dir/support/windows.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOCALE_DIR_SUPPORT_WINDOWS_H
-#define _LIBCPP___LOCALE_DIR_SUPPORT_WINDOWS_H
+#ifndef _LIBCPP_LOCALE_DIR_SUPPORT_WINDOWS_H
+#define _LIBCPP_LOCALE_DIR_SUPPORT_WINDOWS_H
 
 #include <__config>
 #include <__cstddef/nullptr_t.h>
@@ -334,4 +334,4 @@ struct __locale_guard {
 } // namespace __locale
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___LOCALE_DIR_SUPPORT_WINDOWS_H
+#endif // _LIBCPP_LOCALE_DIR_SUPPORT_WINDOWS_H
diff --git a/libcxx/include/__locale_dir/time.h b/libcxx/include/__locale_dir/time.h
index 78698e9651918..fa0f68ca40bfd 100644
--- a/libcxx/include/__locale_dir/time.h
+++ b/libcxx/include/__locale_dir/time.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOCALE_DIR_TIME_H
-#define _LIBCPP___LOCALE_DIR_TIME_H
+#ifndef _LIBCPP_LOCALE_DIR_TIME_H
+#define _LIBCPP_LOCALE_DIR_TIME_H
 
 #include <__algorithm/copy.h>
 #include <__config>
@@ -759,4 +759,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_HAS_LOCALIZATION
 
-#endif // _LIBCPP___LOCALE_DIR_TIME_H
+#endif // _LIBCPP_LOCALE_DIR_TIME_H
diff --git a/libcxx/include/__locale_dir/wbuffer_convert.h b/libcxx/include/__locale_dir/wbuffer_convert.h
index a6818aadf5d0b..832e4f06c5df0 100644
--- a/libcxx/include/__locale_dir/wbuffer_convert.h
+++ b/libcxx/include/__locale_dir/wbuffer_convert.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOCALE_DIR_WBUFFER_CONVERT_H
-#define _LIBCPP___LOCALE_DIR_WBUFFER_CONVERT_H
+#ifndef _LIBCPP_LOCALE_DIR_WBUFFER_CONVERT_H
+#define _LIBCPP_LOCALE_DIR_WBUFFER_CONVERT_H
 
 #include <__algorithm/reverse.h>
 #include <__config>
@@ -427,4 +427,4 @@ _LIBCPP_POP_MACROS
 
 #endif // _LIBCPP_HAS_LOCALIZATION
 
-#endif // _LIBCPP___LOCALE_DIR_WBUFFER_CONVERT_H
+#endif // _LIBCPP_LOCALE_DIR_WBUFFER_CONVERT_H
diff --git a/libcxx/include/__locale_dir/wstring_convert.h b/libcxx/include/__locale_dir/wstring_convert.h
index 42a56eb8573ea..92287d2f2a077 100644
--- a/libcxx/include/__locale_dir/wstring_convert.h
+++ b/libcxx/include/__locale_dir/wstring_convert.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOCALE_DIR_WSTRING_CONVERT_H
-#define _LIBCPP___LOCALE_DIR_WSTRING_CONVERT_H
+#ifndef _LIBCPP_LOCALE_DIR_WSTRING_CONVERT_H
+#define _LIBCPP_LOCALE_DIR_WSTRING_CONVERT_H
 
 #include <__config>
 #include <__locale>
@@ -251,4 +251,4 @@ _LIBCPP_POP_MACROS
 
 #endif // _LIBCPP_HAS_LOCALIZATION
 
-#endif // _LIBCPP___LOCALE_DIR_WSTRING_CONVERT_H
+#endif // _LIBCPP_LOCALE_DIR_WSTRING_CONVERT_H
diff --git a/libcxx/include/__log_hardening_failure b/libcxx/include/__log_hardening_failure
index d1805306f6b6e..e1cb4c1ef97a7 100644
--- a/libcxx/include/__log_hardening_failure
+++ b/libcxx/include/__log_hardening_failure
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___LOG_HARDENING_FAILURE
-#define _LIBCPP___LOG_HARDENING_FAILURE
+#ifndef _LIBCPP_LOG_HARDENING_FAILURE
+#define _LIBCPP_LOG_HARDENING_FAILURE
 
 #include <__config>
 
@@ -39,4 +39,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_HAS_EXPERIMENTAL_HARDENING_OBSERVE_SEMANTIC && !defined(_LIBCPP_CXX03_LANG)
 
-#endif // _LIBCPP___LOG_HARDENING_FAILURE
+#endif // _LIBCPP_LOG_HARDENING_FAILURE
diff --git a/libcxx/include/__math/abs.h b/libcxx/include/__math/abs.h
index b780159f11ebf..484fc92a5b63a 100644
--- a/libcxx/include/__math/abs.h
+++ b/libcxx/include/__math/abs.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MATH_ABS_H
-#define _LIBCPP___MATH_ABS_H
+#ifndef _LIBCPP_MATH_ABS_H
+#define _LIBCPP_MATH_ABS_H
 
 #include <__config>
 #include <__type_traits/enable_if.h>
@@ -67,4 +67,4 @@ template <class = int>
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MATH_ABS_H
+#endif // _LIBCPP_MATH_ABS_H
diff --git a/libcxx/include/__math/copysign.h b/libcxx/include/__math/copysign.h
index 4c297cb0894e9..1126c61af2331 100644
--- a/libcxx/include/__math/copysign.h
+++ b/libcxx/include/__math/copysign.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MATH_COPYSIGN_H
-#define _LIBCPP___MATH_COPYSIGN_H
+#ifndef _LIBCPP_MATH_COPYSIGN_H
+#define _LIBCPP_MATH_COPYSIGN_H
 
 #include <__config>
 #include <__type_traits/enable_if.h>
@@ -41,4 +41,4 @@ template <class _A1, class _A2, __enable_if_t<is_arithmetic<_A1>::value && is_ar
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MATH_COPYSIGN_H
+#endif // _LIBCPP_MATH_COPYSIGN_H
diff --git a/libcxx/include/__math/error_functions.h b/libcxx/include/__math/error_functions.h
index 6b528bb290001..a3459144eb781 100644
--- a/libcxx/include/__math/error_functions.h
+++ b/libcxx/include/__math/error_functions.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MATH_ERROR_FUNCTIONS_H
-#define _LIBCPP___MATH_ERROR_FUNCTIONS_H
+#ifndef _LIBCPP_MATH_ERROR_FUNCTIONS_H
+#define _LIBCPP_MATH_ERROR_FUNCTIONS_H
 
 #include <__config>
 #include <__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_MATH_ERROR_FUNCTIONS_H
diff --git a/libcxx/include/__math/exponential_functions.h b/libcxx/include/__math/exponential_functions.h
index 09930b7819e23..8717c71804ec0 100644
--- a/libcxx/include/__math/exponential_functions.h
+++ b/libcxx/include/__math/exponential_functions.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MATH_EXPONENTIAL_FUNCTIONS_H
-#define _LIBCPP___MATH_EXPONENTIAL_FUNCTIONS_H
+#ifndef _LIBCPP_MATH_EXPONENTIAL_FUNCTIONS_H
+#define _LIBCPP_MATH_EXPONENTIAL_FUNCTIONS_H
 
 #include <__config>
 #include <__type_traits/enable_if.h>
@@ -168,4 +168,4 @@ inline _LIBCPP_HIDE_FROM_ABI __promote_t<_A1, _A2> pow(_A1 __x, _A2 __y) _NOEXCE
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MATH_EXPONENTIAL_FUNCTIONS_H
+#endif // _LIBCPP_MATH_EXPONENTIAL_FUNCTIONS_H
diff --git a/libcxx/include/__math/fdim.h b/libcxx/include/__math/fdim.h
index a1081c7bde3d3..ff72ac373fba9 100644
--- a/libcxx/include/__math/fdim.h
+++ b/libcxx/include/__math/fdim.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MATH_FDIM_H
-#define _LIBCPP___MATH_FDIM_H
+#ifndef _LIBCPP_MATH_FDIM_H
+#define _LIBCPP_MATH_FDIM_H
 
 #include <__config>
 #include <__type_traits/enable_if.h>
@@ -45,4 +45,4 @@ inline _LIBCPP_HIDE_FROM_ABI __promote_t<_A1, _A2> fdim(_A1 __x, _A2 __y) _NOEXC
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MATH_FDIM_H
+#endif // _LIBCPP_MATH_FDIM_H
diff --git a/libcxx/include/__math/fma.h b/libcxx/include/__math/fma.h
index b972d85b89cb3..d9be2e8deb21c 100644
--- a/libcxx/include/__math/fma.h
+++ b/libcxx/include/__math/fma.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MATH_FMA_H
-#define _LIBCPP___MATH_FMA_H
+#ifndef _LIBCPP_MATH_FMA_H
+#define _LIBCPP_MATH_FMA_H
 
 #include <__config>
 #include <__type_traits/enable_if.h>
@@ -52,4 +52,4 @@ inline _LIBCPP_HIDE_FROM_ABI __promote_t<_A1, _A2, _A3> fma(_A1 __x, _A2 __y, _A
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MATH_FMA_H
+#endif // _LIBCPP_MATH_FMA_H
diff --git a/libcxx/include/__math/gamma.h b/libcxx/include/__math/gamma.h
index 693e111a84e99..ddf3cf9c3e9fb 100644
--- a/libcxx/include/__math/gamma.h
+++ b/libcxx/include/__math/gamma.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MATH_GAMMA_H
-#define _LIBCPP___MATH_GAMMA_H
+#ifndef _LIBCPP_MATH_GAMMA_H
+#define _LIBCPP_MATH_GAMMA_H
 
 #include <__config>
 #include <__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_MATH_GAMMA_H
diff --git a/libcxx/include/__math/hyperbolic_functions.h b/libcxx/include/__math/hyperbolic_functions.h
index 78832bae70c9d..0a3e82884b2fe 100644
--- a/libcxx/include/__math/hyperbolic_functions.h
+++ b/libcxx/include/__math/hyperbolic_functions.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MATH_HYPERBOLIC_FUNCTIONS_H
-#define _LIBCPP___MATH_HYPERBOLIC_FUNCTIONS_H
+#ifndef _LIBCPP_MATH_HYPERBOLIC_FUNCTIONS_H
+#define _LIBCPP_MATH_HYPERBOLIC_FUNCTIONS_H
 
 #include <__config>
 #include <__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_MATH_HYPERBOLIC_FUNCTIONS_H
diff --git a/libcxx/include/__math/hypot.h b/libcxx/include/__math/hypot.h
index 2b12d7be21072..aa4c105fc0cee 100644
--- a/libcxx/include/__math/hypot.h
+++ b/libcxx/include/__math/hypot.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MATH_HYPOT_H
-#define _LIBCPP___MATH_HYPOT_H
+#ifndef _LIBCPP_MATH_HYPOT_H
+#define _LIBCPP_MATH_HYPOT_H
 
 #include <__config>
 #include <__math/abs.h>
@@ -105,4 +105,4 @@ _LIBCPP_HIDE_FROM_ABI __promote_t<_A1, _A2, _A3> hypot(_A1 __x, _A2 __y, _A3 __z
 _LIBCPP_END_NAMESPACE_STD
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___MATH_HYPOT_H
+#endif // _LIBCPP_MATH_HYPOT_H
diff --git a/libcxx/include/__math/inverse_hyperbolic_functions.h b/libcxx/include/__math/inverse_hyperbolic_functions.h
index 4660a58e4eba0..78eb0cb67dcc9 100644
--- a/libcxx/include/__math/inverse_hyperbolic_functions.h
+++ b/libcxx/include/__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_MATH_INVERSE_HYPERBOLIC_FUNCTIONS_H
+#define _LIBCPP_MATH_INVERSE_HYPERBOLIC_FUNCTIONS_H
 
 #include <__config>
 #include <__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_MATH_INVERSE_HYPERBOLIC_FUNCTIONS_H
diff --git a/libcxx/include/__math/inverse_trigonometric_functions.h b/libcxx/include/__math/inverse_trigonometric_functions.h
index 409500278e7a9..f8c1b0a25b481 100644
--- a/libcxx/include/__math/inverse_trigonometric_functions.h
+++ b/libcxx/include/__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_MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS_H
+#define _LIBCPP_MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS_H
 
 #include <__config>
 #include <__type_traits/enable_if.h>
@@ -96,4 +96,4 @@ inline _LIBCPP_HIDE_FROM_ABI __promote_t<_A1, _A2> atan2(_A1 __y, _A2 __x) _NOEX
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS_H
+#endif // _LIBCPP_MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS_H
diff --git a/libcxx/include/__math/logarithms.h b/libcxx/include/__math/logarithms.h
index 7343d6a84ad4b..b0c2466b53b8e 100644
--- a/libcxx/include/__math/logarithms.h
+++ b/libcxx/include/__math/logarithms.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MATH_LOGARITHMS_H
-#define _LIBCPP___MATH_LOGARITHMS_H
+#ifndef _LIBCPP_MATH_LOGARITHMS_H
+#define _LIBCPP_MATH_LOGARITHMS_H
 
 #include <__config>
 #include <__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_MATH_LOGARITHMS_H
diff --git a/libcxx/include/__math/min_max.h b/libcxx/include/__math/min_max.h
index 1ddbb557d1e8f..56a59e5e53f44 100644
--- a/libcxx/include/__math/min_max.h
+++ b/libcxx/include/__math/min_max.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MATH_MIN_MAX_H
-#define _LIBCPP___MATH_MIN_MAX_H
+#ifndef _LIBCPP_MATH_MIN_MAX_H
+#define _LIBCPP_MATH_MIN_MAX_H
 
 #include <__config>
 #include <__type_traits/enable_if.h>
@@ -71,4 +71,4 @@ template <class _A1, class _A2, __enable_if_t<is_arithmetic<_A1>::value && is_ar
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MATH_MIN_MAX_H
+#endif // _LIBCPP_MATH_MIN_MAX_H
diff --git a/libcxx/include/__math/modulo.h b/libcxx/include/__math/modulo.h
index 71405abb6b9b8..3ea3ffeb4cdab 100644
--- a/libcxx/include/__math/modulo.h
+++ b/libcxx/include/__math/modulo.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MATH_MODULO_H
-#define _LIBCPP___MATH_MODULO_H
+#ifndef _LIBCPP_MATH_MODULO_H
+#define _LIBCPP_MATH_MODULO_H
 
 #include <__config>
 #include <__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_MATH_MODULO_H
diff --git a/libcxx/include/__math/remainder.h b/libcxx/include/__math/remainder.h
index 39fb76af6bdec..d85676d51e45e 100644
--- a/libcxx/include/__math/remainder.h
+++ b/libcxx/include/__math/remainder.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MATH_REMAINDER_H
-#define _LIBCPP___MATH_REMAINDER_H
+#ifndef _LIBCPP_MATH_REMAINDER_H
+#define _LIBCPP_MATH_REMAINDER_H
 
 #include <__config>
 #include <__type_traits/enable_if.h>
@@ -69,4 +69,4 @@ inline _LIBCPP_HIDE_FROM_ABI __promote_t<_A1, _A2> remquo(_A1 __x, _A2 __y, int*
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MATH_REMAINDER_H
+#endif // _LIBCPP_MATH_REMAINDER_H
diff --git a/libcxx/include/__math/roots.h b/libcxx/include/__math/roots.h
index cef376fb008cf..7fdf5a855cd53 100644
--- a/libcxx/include/__math/roots.h
+++ b/libcxx/include/__math/roots.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MATH_ROOTS_H
-#define _LIBCPP___MATH_ROOTS_H
+#ifndef _LIBCPP_MATH_ROOTS_H
+#define _LIBCPP_MATH_ROOTS_H
 
 #include <__config>
 #include <__type_traits/enable_if.h>
@@ -59,4 +59,4 @@ template <class _A1, __enable_if_t<is_integral<_A1>::value, int> = 0>
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MATH_ROOTS_H
+#endif // _LIBCPP_MATH_ROOTS_H
diff --git a/libcxx/include/__math/rounding_functions.h b/libcxx/include/__math/rounding_functions.h
index aadeb395fa2eb..8666a58eb5fb6 100644
--- a/libcxx/include/__math/rounding_functions.h
+++ b/libcxx/include/__math/rounding_functions.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MATH_ROUNDING_FUNCTIONS_H
-#define _LIBCPP___MATH_ROUNDING_FUNCTIONS_H
+#ifndef _LIBCPP_MATH_ROUNDING_FUNCTIONS_H
+#define _LIBCPP_MATH_ROUNDING_FUNCTIONS_H
 
 #include <__config>
 #include <__type_traits/enable_if.h>
@@ -242,4 +242,4 @@ template <class _A1, __enable_if_t<is_integral<_A1>::value, int> = 0>
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MATH_ROUNDING_FUNCTIONS_H
+#endif // _LIBCPP_MATH_ROUNDING_FUNCTIONS_H
diff --git a/libcxx/include/__math/special_functions.h b/libcxx/include/__math/special_functions.h
index 0b1c753a659ad..2887cebdb6152 100644
--- a/libcxx/include/__math/special_functions.h
+++ b/libcxx/include/__math/special_functions.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MATH_SPECIAL_FUNCTIONS_H
-#define _LIBCPP___MATH_SPECIAL_FUNCTIONS_H
+#ifndef _LIBCPP_MATH_SPECIAL_FUNCTIONS_H
+#define _LIBCPP_MATH_SPECIAL_FUNCTIONS_H
 
 #include <__config>
 #include <__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_MATH_SPECIAL_FUNCTIONS_H
diff --git a/libcxx/include/__math/traits.h b/libcxx/include/__math/traits.h
index ff22cee7305d7..eb0f100089f78 100644
--- a/libcxx/include/__math/traits.h
+++ b/libcxx/include/__math/traits.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MATH_TRAITS_H
-#define _LIBCPP___MATH_TRAITS_H
+#ifndef _LIBCPP_MATH_TRAITS_H
+#define _LIBCPP_MATH_TRAITS_H
 
 #include <__config>
 #include <__type_traits/enable_if.h>
@@ -262,4 +262,4 @@ template <class _A1, class _A2>
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MATH_TRAITS_H
+#endif // _LIBCPP_MATH_TRAITS_H
diff --git a/libcxx/include/__math/trigonometric_functions.h b/libcxx/include/__math/trigonometric_functions.h
index 0ad91c7631609..b300fa68b7d84 100644
--- a/libcxx/include/__math/trigonometric_functions.h
+++ b/libcxx/include/__math/trigonometric_functions.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MATH_TRIGONOMETRIC_FUNCTIONS_H
-#define _LIBCPP___MATH_TRIGONOMETRIC_FUNCTIONS_H
+#ifndef _LIBCPP_MATH_TRIGONOMETRIC_FUNCTIONS_H
+#define _LIBCPP_MATH_TRIGONOMETRIC_FUNCTIONS_H
 
 #include <__config>
 #include <__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_MATH_TRIGONOMETRIC_FUNCTIONS_H
diff --git a/libcxx/include/__mbstate_t.h b/libcxx/include/__mbstate_t.h
index c23ea7113ca70..8982d066de2bb 100644
--- a/libcxx/include/__mbstate_t.h
+++ b/libcxx/include/__mbstate_t.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MBSTATE_T_H
-#define _LIBCPP___MBSTATE_T_H
+#ifndef _LIBCPP_MBSTATE_T_H
+#define _LIBCPP_MBSTATE_T_H
 
 #include <__config>
 
@@ -51,4 +51,4 @@
 #  error "We don't know how to get the definition of mbstate_t on your platform."
 #endif
 
-#endif // _LIBCPP___MBSTATE_T_H
+#endif // _LIBCPP_MBSTATE_T_H
diff --git a/libcxx/include/__mdspan/aligned_accessor.h b/libcxx/include/__mdspan/aligned_accessor.h
index 2b8d4c52d8737..8886a204da3fe 100644
--- a/libcxx/include/__mdspan/aligned_accessor.h
+++ b/libcxx/include/__mdspan/aligned_accessor.h
@@ -14,8 +14,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MDSPAN_ALIGNED_ACCESSOR_H
-#define _LIBCPP___MDSPAN_ALIGNED_ACCESSOR_H
+#ifndef _LIBCPP_MDSPAN_ALIGNED_ACCESSOR_H
+#define _LIBCPP_MDSPAN_ALIGNED_ACCESSOR_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -84,4 +84,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___MDSPAN_ALIGNED_ACCESSOR_H
+#endif // _LIBCPP_MDSPAN_ALIGNED_ACCESSOR_H
diff --git a/libcxx/include/__mdspan/default_accessor.h b/libcxx/include/__mdspan/default_accessor.h
index d6f3ddb998e96..8169945af27c3 100644
--- a/libcxx/include/__mdspan/default_accessor.h
+++ b/libcxx/include/__mdspan/default_accessor.h
@@ -14,8 +14,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MDSPAN_DEFAULT_ACCESSOR_H
-#define _LIBCPP___MDSPAN_DEFAULT_ACCESSOR_H
+#ifndef _LIBCPP_MDSPAN_DEFAULT_ACCESSOR_H
+#define _LIBCPP_MDSPAN_DEFAULT_ACCESSOR_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -62,4 +62,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___MDSPAN_DEFAULT_ACCESSOR_H
+#endif // _LIBCPP_MDSPAN_DEFAULT_ACCESSOR_H
diff --git a/libcxx/include/__mdspan/extents.h b/libcxx/include/__mdspan/extents.h
index 99b54badf893c..0d62032468da8 100644
--- a/libcxx/include/__mdspan/extents.h
+++ b/libcxx/include/__mdspan/extents.h
@@ -14,8 +14,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MDSPAN_EXTENTS_H
-#define _LIBCPP___MDSPAN_EXTENTS_H
+#ifndef _LIBCPP_MDSPAN_EXTENTS_H
+#define _LIBCPP_MDSPAN_EXTENTS_H
 
 #include <__assert>
 #include <__config>
@@ -530,4 +530,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___MDSPAN_EXTENTS_H
+#endif // _LIBCPP_MDSPAN_EXTENTS_H
diff --git a/libcxx/include/__mdspan/layout_left.h b/libcxx/include/__mdspan/layout_left.h
index 2f515afb6c860..e144a691880bc 100644
--- a/libcxx/include/__mdspan/layout_left.h
+++ b/libcxx/include/__mdspan/layout_left.h
@@ -14,8 +14,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MDSPAN_LAYOUT_LEFT_H
-#define _LIBCPP___MDSPAN_LAYOUT_LEFT_H
+#ifndef _LIBCPP_MDSPAN_LAYOUT_LEFT_H
+#define _LIBCPP_MDSPAN_LAYOUT_LEFT_H
 
 #include <__assert>
 #include <__config>
@@ -200,4 +200,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___MDSPAN_LAYOUT_LEFT_H
+#endif // _LIBCPP_MDSPAN_LAYOUT_LEFT_H
diff --git a/libcxx/include/__mdspan/layout_right.h b/libcxx/include/__mdspan/layout_right.h
index ccfbd23e28ad7..559404bb3db0e 100644
--- a/libcxx/include/__mdspan/layout_right.h
+++ b/libcxx/include/__mdspan/layout_right.h
@@ -14,8 +14,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MDSPAN_LAYOUT_RIGHT_H
-#define _LIBCPP___MDSPAN_LAYOUT_RIGHT_H
+#ifndef _LIBCPP_MDSPAN_LAYOUT_RIGHT_H
+#define _LIBCPP_MDSPAN_LAYOUT_RIGHT_H
 
 #include <__assert>
 #include <__config>
@@ -198,4 +198,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___MDSPAN_LAYOUT_RIGHT_H
+#endif // _LIBCPP_MDSPAN_LAYOUT_RIGHT_H
diff --git a/libcxx/include/__mdspan/layout_stride.h b/libcxx/include/__mdspan/layout_stride.h
index 9d77d71bc3598..9ef2ffd9faa22 100644
--- a/libcxx/include/__mdspan/layout_stride.h
+++ b/libcxx/include/__mdspan/layout_stride.h
@@ -14,8 +14,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MDSPAN_LAYOUT_STRIDE_H
-#define _LIBCPP___MDSPAN_LAYOUT_STRIDE_H
+#ifndef _LIBCPP_MDSPAN_LAYOUT_STRIDE_H
+#define _LIBCPP_MDSPAN_LAYOUT_STRIDE_H
 
 #include <__assert>
 #include <__concepts/same_as.h>
@@ -368,4 +368,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___MDSPAN_LAYOUT_STRIDE_H
+#endif // _LIBCPP_MDSPAN_LAYOUT_STRIDE_H
diff --git a/libcxx/include/__mdspan/mdspan.h b/libcxx/include/__mdspan/mdspan.h
index c0f27678197ce..14f3a5572d2b6 100644
--- a/libcxx/include/__mdspan/mdspan.h
+++ b/libcxx/include/__mdspan/mdspan.h
@@ -14,8 +14,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MDSPAN_MDSPAN_H
-#define _LIBCPP___MDSPAN_MDSPAN_H
+#ifndef _LIBCPP_MDSPAN_MDSPAN_H
+#define _LIBCPP_MDSPAN_MDSPAN_H
 
 #include <__assert>
 #include <__config>
@@ -315,4 +315,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___MDSPAN_MDSPAN_H
+#endif // _LIBCPP_MDSPAN_MDSPAN_H
diff --git a/libcxx/include/__memory/addressof.h b/libcxx/include/__memory/addressof.h
index 667071dfc6635..8407721ce8aeb 100644
--- a/libcxx/include/__memory/addressof.h
+++ b/libcxx/include/__memory/addressof.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_ADDRESSOF_H
-#define _LIBCPP___MEMORY_ADDRESSOF_H
+#ifndef _LIBCPP_MEMORY_ADDRESSOF_H
+#define _LIBCPP_MEMORY_ADDRESSOF_H
 
 #include <__config>
 
@@ -56,4 +56,4 @@ _Tp* addressof(const _Tp&&) noexcept = delete;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MEMORY_ADDRESSOF_H
+#endif // _LIBCPP_MEMORY_ADDRESSOF_H
diff --git a/libcxx/include/__memory/align.h b/libcxx/include/__memory/align.h
index 402eac3380925..1f6e000a3b00b 100644
--- a/libcxx/include/__memory/align.h
+++ b/libcxx/include/__memory/align.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_ALIGN_H
-#define _LIBCPP___MEMORY_ALIGN_H
+#ifndef _LIBCPP_MEMORY_ALIGN_H
+#define _LIBCPP_MEMORY_ALIGN_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -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_MEMORY_ALIGN_H
diff --git a/libcxx/include/__memory/aligned_alloc.h b/libcxx/include/__memory/aligned_alloc.h
index fb36983d9c3dc..d6f1d57465893 100644
--- a/libcxx/include/__memory/aligned_alloc.h
+++ b/libcxx/include/__memory/aligned_alloc.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_ALIGNED_ALLOC_H
-#define _LIBCPP___MEMORY_ALIGNED_ALLOC_H
+#ifndef _LIBCPP_MEMORY_ALIGNED_ALLOC_H
+#define _LIBCPP_MEMORY_ALIGNED_ALLOC_H
 
 #include <__config>
 #include <cstdlib>
@@ -60,4 +60,4 @@ inline _LIBCPP_HIDE_FROM_ABI void __libcpp_aligned_free(void* __ptr) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MEMORY_ALIGNED_ALLOC_H
+#endif // _LIBCPP_MEMORY_ALIGNED_ALLOC_H
diff --git a/libcxx/include/__memory/allocate_at_least.h b/libcxx/include/__memory/allocate_at_least.h
index 72140d0de27af..23c47babe917f 100644
--- a/libcxx/include/__memory/allocate_at_least.h
+++ b/libcxx/include/__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_MEMORY_ALLOCATE_AT_LEAST_H
+#define _LIBCPP_MEMORY_ALLOCATE_AT_LEAST_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -50,4 +50,4 @@ __allocate_at_least(_Alloc& __alloc, size_t __n) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MEMORY_ALLOCATE_AT_LEAST_H
+#endif // _LIBCPP_MEMORY_ALLOCATE_AT_LEAST_H
diff --git a/libcxx/include/__memory/allocation_guard.h b/libcxx/include/__memory/allocation_guard.h
index 016e1a3a429b8..bbaa746c262f3 100644
--- a/libcxx/include/__memory/allocation_guard.h
+++ b/libcxx/include/__memory/allocation_guard.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_ALLOCATION_GUARD_H
-#define _LIBCPP___MEMORY_ALLOCATION_GUARD_H
+#ifndef _LIBCPP_MEMORY_ALLOCATION_GUARD_H
+#define _LIBCPP_MEMORY_ALLOCATION_GUARD_H
 
 #include <__config>
 #include <__memory/addressof.h>
@@ -106,4 +106,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___MEMORY_ALLOCATION_GUARD_H
+#endif // _LIBCPP_MEMORY_ALLOCATION_GUARD_H
diff --git a/libcxx/include/__memory/allocator.h b/libcxx/include/__memory/allocator.h
index 52f4122a9bf5f..83ff38468b46a 100644
--- a/libcxx/include/__memory/allocator.h
+++ b/libcxx/include/__memory/allocator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_ALLOCATOR_H
-#define _LIBCPP___MEMORY_ALLOCATOR_H
+#ifndef _LIBCPP_MEMORY_ALLOCATOR_H
+#define _LIBCPP_MEMORY_ALLOCATOR_H
 
 #include <__config>
 #include <__cstddef/ptrdiff_t.h>
@@ -174,4 +174,4 @@ inline _LIBCPP_HIDE_FROM_ABI bool operator!=(const allocator<_Tp>&, const alloca
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MEMORY_ALLOCATOR_H
+#endif // _LIBCPP_MEMORY_ALLOCATOR_H
diff --git a/libcxx/include/__memory/allocator_arg_t.h b/libcxx/include/__memory/allocator_arg_t.h
index 31a73fc4557ef..8eb9c91c5a45e 100644
--- a/libcxx/include/__memory/allocator_arg_t.h
+++ b/libcxx/include/__memory/allocator_arg_t.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_ALLOCATOR_ARG_T_H
-#define _LIBCPP___MEMORY_ALLOCATOR_ARG_T_H
+#ifndef _LIBCPP_MEMORY_ALLOCATOR_ARG_T_H
+#define _LIBCPP_MEMORY_ALLOCATOR_ARG_T_H
 
 #include <__config>
 #include <__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___MEMORY_ALLOCATOR_ARG_T_H
+#endif // _LIBCPP_MEMORY_ALLOCATOR_ARG_T_H
diff --git a/libcxx/include/__memory/allocator_destructor.h b/libcxx/include/__memory/allocator_destructor.h
index aac92a23fa0d4..c6d8085dc2b88 100644
--- a/libcxx/include/__memory/allocator_destructor.h
+++ b/libcxx/include/__memory/allocator_destructor.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_ALLOCATOR_DESTRUCTOR_H
-#define _LIBCPP___MEMORY_ALLOCATOR_DESTRUCTOR_H
+#ifndef _LIBCPP_MEMORY_ALLOCATOR_DESTRUCTOR_H
+#define _LIBCPP_MEMORY_ALLOCATOR_DESTRUCTOR_H
 
 #include <__config>
 #include <__memory/allocator_traits.h>
@@ -37,4 +37,4 @@ class __allocator_destructor {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MEMORY_ALLOCATOR_DESTRUCTOR_H
+#endif // _LIBCPP_MEMORY_ALLOCATOR_DESTRUCTOR_H
diff --git a/libcxx/include/__memory/allocator_traits.h b/libcxx/include/__memory/allocator_traits.h
index 46c247f7040e0..776dfa986db73 100644
--- a/libcxx/include/__memory/allocator_traits.h
+++ b/libcxx/include/__memory/allocator_traits.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_ALLOCATOR_TRAITS_H
-#define _LIBCPP___MEMORY_ALLOCATOR_TRAITS_H
+#ifndef _LIBCPP_MEMORY_ALLOCATOR_TRAITS_H
+#define _LIBCPP_MEMORY_ALLOCATOR_TRAITS_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -378,4 +378,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___MEMORY_ALLOCATOR_TRAITS_H
+#endif // _LIBCPP_MEMORY_ALLOCATOR_TRAITS_H
diff --git a/libcxx/include/__memory/array_cookie.h b/libcxx/include/__memory/array_cookie.h
index be59f365aa80c..d33b3c13aad16 100644
--- a/libcxx/include/__memory/array_cookie.h
+++ b/libcxx/include/__memory/array_cookie.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_ARRAY_COOKIE_H
-#define _LIBCPP___MEMORY_ARRAY_COOKIE_H
+#ifndef _LIBCPP_MEMORY_ARRAY_COOKIE_H
+#define _LIBCPP_MEMORY_ARRAY_COOKIE_H
 
 #include <__config>
 #include <__configuration/abi.h>
@@ -120,4 +120,4 @@ _LIBCPP_HIDE_FROM_ABI _LIBCPP_NO_SANITIZE("address") size_t __get_array_cookie([
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MEMORY_ARRAY_COOKIE_H
+#endif // _LIBCPP_MEMORY_ARRAY_COOKIE_H
diff --git a/libcxx/include/__memory/assume_aligned.h b/libcxx/include/__memory/assume_aligned.h
index 08f1772cd6dfa..5f2b68c679aad 100644
--- a/libcxx/include/__memory/assume_aligned.h
+++ b/libcxx/include/__memory/assume_aligned.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_ASSUME_ALIGNED_H
-#define _LIBCPP___MEMORY_ASSUME_ALIGNED_H
+#ifndef _LIBCPP_MEMORY_ASSUME_ALIGNED_H
+#define _LIBCPP_MEMORY_ASSUME_ALIGNED_H
 
 #include <__assert>
 #include <__config>
@@ -47,4 +47,4 @@ template <size_t _Np, class _Tp>
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MEMORY_ASSUME_ALIGNED_H
+#endif // _LIBCPP_MEMORY_ASSUME_ALIGNED_H
diff --git a/libcxx/include/__memory/auto_ptr.h b/libcxx/include/__memory/auto_ptr.h
index 9efd74ad5e766..f40cdf8ba5e1f 100644
--- a/libcxx/include/__memory/auto_ptr.h
+++ b/libcxx/include/__memory/auto_ptr.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_AUTO_PTR_H
-#define _LIBCPP___MEMORY_AUTO_PTR_H
+#ifndef _LIBCPP_MEMORY_AUTO_PTR_H
+#define _LIBCPP_MEMORY_AUTO_PTR_H
 
 #include <__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_MEMORY_AUTO_PTR_H
diff --git a/libcxx/include/__memory/compressed_pair.h b/libcxx/include/__memory/compressed_pair.h
index 0388d752ccc8b..d13b3951b2449 100644
--- a/libcxx/include/__memory/compressed_pair.h
+++ b/libcxx/include/__memory/compressed_pair.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_COMPRESSED_PAIR_H
-#define _LIBCPP___MEMORY_COMPRESSED_PAIR_H
+#ifndef _LIBCPP_MEMORY_COMPRESSED_PAIR_H
+#define _LIBCPP_MEMORY_COMPRESSED_PAIR_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -139,4 +139,4 @@ class __compressed_pair_padding<_ToPad, true> {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MEMORY_COMPRESSED_PAIR_H
+#endif // _LIBCPP_MEMORY_COMPRESSED_PAIR_H
diff --git a/libcxx/include/__memory/concepts.h b/libcxx/include/__memory/concepts.h
index 216144aad7480..79b04ca4a342f 100644
--- a/libcxx/include/__memory/concepts.h
+++ b/libcxx/include/__memory/concepts.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_CONCEPTS_H
-#define _LIBCPP___MEMORY_CONCEPTS_H
+#ifndef _LIBCPP_MEMORY_CONCEPTS_H
+#define _LIBCPP_MEMORY_CONCEPTS_H
 
 #include <__concepts/same_as.h>
 #include <__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_MEMORY_CONCEPTS_H
diff --git a/libcxx/include/__memory/construct_at.h b/libcxx/include/__memory/construct_at.h
index 5378c03abab3a..d2d920ba36bcb 100644
--- a/libcxx/include/__memory/construct_at.h
+++ b/libcxx/include/__memory/construct_at.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_CONSTRUCT_AT_H
-#define _LIBCPP___MEMORY_CONSTRUCT_AT_H
+#ifndef _LIBCPP_MEMORY_CONSTRUCT_AT_H
+#define _LIBCPP_MEMORY_CONSTRUCT_AT_H
 
 #include <__assert>
 #include <__config>
@@ -79,4 +79,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___MEMORY_CONSTRUCT_AT_H
+#endif // _LIBCPP_MEMORY_CONSTRUCT_AT_H
diff --git a/libcxx/include/__memory/destroy.h b/libcxx/include/__memory/destroy.h
index 69a252ba1331d..0467c3481a1e7 100644
--- a/libcxx/include/__memory/destroy.h
+++ b/libcxx/include/__memory/destroy.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_DESTROY_H
-#define _LIBCPP___MEMORY_DESTROY_H
+#ifndef _LIBCPP_MEMORY_DESTROY_H
+#define _LIBCPP_MEMORY_DESTROY_H
 
 #include <__config>
 #include <__memory/addressof.h>
@@ -68,4 +68,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___MEMORY_DESTROY_H
+#endif // _LIBCPP_MEMORY_DESTROY_H
diff --git a/libcxx/include/__memory/destruct_n.h b/libcxx/include/__memory/destruct_n.h
index db227a4ea1dc7..f6dde2aee6eed 100644
--- a/libcxx/include/__memory/destruct_n.h
+++ b/libcxx/include/__memory/destruct_n.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_DESTRUCT_N_H
-#define _LIBCPP___MEMORY_DESTRUCT_N_H
+#ifndef _LIBCPP_MEMORY_DESTRUCT_N_H
+#define _LIBCPP_MEMORY_DESTRUCT_N_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -60,4 +60,4 @@ struct __destruct_n {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MEMORY_DESTRUCT_N_H
+#endif // _LIBCPP_MEMORY_DESTRUCT_N_H
diff --git a/libcxx/include/__memory/inout_ptr.h b/libcxx/include/__memory/inout_ptr.h
index ef345fe469bca..e4446cbd7149b 100644
--- a/libcxx/include/__memory/inout_ptr.h
+++ b/libcxx/include/__memory/inout_ptr.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___INOUT_PTR_H
-#define _LIBCPP___INOUT_PTR_H
+#ifndef _LIBCPP_INOUT_PTR_H
+#define _LIBCPP_INOUT_PTR_H
 
 #include <__config>
 #include <__memory/addressof.h>
@@ -107,4 +107,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___INOUT_PTR_H
+#endif // _LIBCPP_INOUT_PTR_H
diff --git a/libcxx/include/__memory/is_sufficiently_aligned.h b/libcxx/include/__memory/is_sufficiently_aligned.h
index 4280920cabb4b..919cf2250c1ad 100644
--- a/libcxx/include/__memory/is_sufficiently_aligned.h
+++ b/libcxx/include/__memory/is_sufficiently_aligned.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_IS_SUFFICIENTLY_ALIGNED_H
-#define _LIBCPP___MEMORY_IS_SUFFICIENTLY_ALIGNED_H
+#ifndef _LIBCPP_MEMORY_IS_SUFFICIENTLY_ALIGNED_H
+#define _LIBCPP_MEMORY_IS_SUFFICIENTLY_ALIGNED_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -31,4 +31,4 @@ _LIBCPP_HIDE_FROM_ABI bool is_sufficiently_aligned(_Tp* __ptr) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MEMORY_IS_SUFFICIENTLY_ALIGNED_H
+#endif // _LIBCPP_MEMORY_IS_SUFFICIENTLY_ALIGNED_H
diff --git a/libcxx/include/__memory/noexcept_move_assign_container.h b/libcxx/include/__memory/noexcept_move_assign_container.h
index b0063516aaafc..77dcee7c166c6 100644
--- a/libcxx/include/__memory/noexcept_move_assign_container.h
+++ b/libcxx/include/__memory/noexcept_move_assign_container.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_NOEXCEPT_MOVE_ASSIGN_CONTAINER_H
-#define _LIBCPP___MEMORY_NOEXCEPT_MOVE_ASSIGN_CONTAINER_H
+#ifndef _LIBCPP_MEMORY_NOEXCEPT_MOVE_ASSIGN_CONTAINER_H
+#define _LIBCPP_MEMORY_NOEXCEPT_MOVE_ASSIGN_CONTAINER_H
 
 #include <__config>
 #include <__memory/allocator_traits.h>
@@ -34,4 +34,4 @@ struct __noexcept_move_assign_container
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MEMORY_NOEXCEPT_MOVE_ASSIGN_CONTAINER_H
+#endif // _LIBCPP_MEMORY_NOEXCEPT_MOVE_ASSIGN_CONTAINER_H
diff --git a/libcxx/include/__memory/out_ptr.h b/libcxx/include/__memory/out_ptr.h
index e498e3307b9d6..fa070c22ed05c 100644
--- a/libcxx/include/__memory/out_ptr.h
+++ b/libcxx/include/__memory/out_ptr.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___OUT_PTR_H
-#define _LIBCPP___OUT_PTR_H
+#ifndef _LIBCPP_OUT_PTR_H
+#define _LIBCPP_OUT_PTR_H
 
 #include <__config>
 #include <__memory/addressof.h>
@@ -99,4 +99,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___OUT_PTR_H
+#endif // _LIBCPP_OUT_PTR_H
diff --git a/libcxx/include/__memory/pointer_traits.h b/libcxx/include/__memory/pointer_traits.h
index 62fcd93263b02..c8c7fa59bee46 100644
--- a/libcxx/include/__memory/pointer_traits.h
+++ b/libcxx/include/__memory/pointer_traits.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_POINTER_TRAITS_H
-#define _LIBCPP___MEMORY_POINTER_TRAITS_H
+#ifndef _LIBCPP_MEMORY_POINTER_TRAITS_H
+#define _LIBCPP_MEMORY_POINTER_TRAITS_H
 
 #include <__config>
 #include <__cstddef/ptrdiff_t.h>
@@ -268,4 +268,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___MEMORY_POINTER_TRAITS_H
+#endif // _LIBCPP_MEMORY_POINTER_TRAITS_H
diff --git a/libcxx/include/__memory/ranges_construct_at.h b/libcxx/include/__memory/ranges_construct_at.h
index b8a94678c10c8..180f349cc50fe 100644
--- a/libcxx/include/__memory/ranges_construct_at.h
+++ b/libcxx/include/__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_MEMORY_RANGES_CONSTRUCT_AT_H
+#define _LIBCPP_MEMORY_RANGES_CONSTRUCT_AT_H
 
 #include <__concepts/destructible.h>
 #include <__config>
@@ -69,4 +69,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___MEMORY_RANGES_CONSTRUCT_AT_H
+#endif // _LIBCPP_MEMORY_RANGES_CONSTRUCT_AT_H
diff --git a/libcxx/include/__memory/ranges_destroy.h b/libcxx/include/__memory/ranges_destroy.h
index f134f1422e82c..4a271f7708eaa 100644
--- a/libcxx/include/__memory/ranges_destroy.h
+++ b/libcxx/include/__memory/ranges_destroy.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_RANGES_DESTROY_H
-#define _LIBCPP___MEMORY_RANGES_DESTROY_H
+#ifndef _LIBCPP_MEMORY_RANGES_DESTROY_H
+#define _LIBCPP_MEMORY_RANGES_DESTROY_H
 
 #include <__concepts/destructible.h>
 #include <__config>
@@ -76,4 +76,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___MEMORY_RANGES_DESTROY_H
+#endif // _LIBCPP_MEMORY_RANGES_DESTROY_H
diff --git a/libcxx/include/__memory/ranges_uninitialized_algorithms.h b/libcxx/include/__memory/ranges_uninitialized_algorithms.h
index 57a7a4616826e..56621af04d7ac 100644
--- a/libcxx/include/__memory/ranges_uninitialized_algorithms.h
+++ b/libcxx/include/__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_MEMORY_RANGES_UNINITIALIZED_ALGORITHMS_H
+#define _LIBCPP_MEMORY_RANGES_UNINITIALIZED_ALGORITHMS_H
 
 #include <__algorithm/in_out_result.h>
 #include <__concepts/constructible.h>
@@ -281,4 +281,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___MEMORY_RANGES_UNINITIALIZED_ALGORITHMS_H
+#endif // _LIBCPP_MEMORY_RANGES_UNINITIALIZED_ALGORITHMS_H
diff --git a/libcxx/include/__memory/raw_storage_iterator.h b/libcxx/include/__memory/raw_storage_iterator.h
index d98b3faf48468..d6a76fd8b6767 100644
--- a/libcxx/include/__memory/raw_storage_iterator.h
+++ b/libcxx/include/__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_MEMORY_RAW_STORAGE_ITERATOR_H
+#define _LIBCPP_MEMORY_RAW_STORAGE_ITERATOR_H
 
 #include <__config>
 #include <__cstddef/ptrdiff_t.h>
@@ -77,4 +77,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___MEMORY_RAW_STORAGE_ITERATOR_H
+#endif // _LIBCPP_MEMORY_RAW_STORAGE_ITERATOR_H
diff --git a/libcxx/include/__memory/shared_count.h b/libcxx/include/__memory/shared_count.h
index b40d8c9cf77d1..c5dea52182efd 100644
--- a/libcxx/include/__memory/shared_count.h
+++ b/libcxx/include/__memory/shared_count.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_SHARED_COUNT_H
-#define _LIBCPP___MEMORY_SHARED_COUNT_H
+#ifndef _LIBCPP_MEMORY_SHARED_COUNT_H
+#define _LIBCPP_MEMORY_SHARED_COUNT_H
 
 #include <__config>
 #include <__memory/addressof.h>
@@ -113,4 +113,4 @@ class _LIBCPP_EXPORTED_FROM_ABI __shared_weak_count : private __shared_count {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MEMORY_SHARED_COUNT_H
+#endif // _LIBCPP_MEMORY_SHARED_COUNT_H
diff --git a/libcxx/include/__memory/shared_ptr.h b/libcxx/include/__memory/shared_ptr.h
index e90db587d2836..cdf2ef69c2516 100644
--- a/libcxx/include/__memory/shared_ptr.h
+++ b/libcxx/include/__memory/shared_ptr.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_SHARED_PTR_H
-#define _LIBCPP___MEMORY_SHARED_PTR_H
+#ifndef _LIBCPP_MEMORY_SHARED_PTR_H
+#define _LIBCPP_MEMORY_SHARED_PTR_H
 
 #include <__compare/compare_three_way.h>
 #include <__compare/ordering.h>
@@ -1558,4 +1558,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___MEMORY_SHARED_PTR_H
+#endif // _LIBCPP_MEMORY_SHARED_PTR_H
diff --git a/libcxx/include/__memory/swap_allocator.h b/libcxx/include/__memory/swap_allocator.h
index b17e082a43c9f..6a8151c903662 100644
--- a/libcxx/include/__memory/swap_allocator.h
+++ b/libcxx/include/__memory/swap_allocator.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_SWAP_ALLOCATOR_H
-#define _LIBCPP___MEMORY_SWAP_ALLOCATOR_H
+#ifndef _LIBCPP_MEMORY_SWAP_ALLOCATOR_H
+#define _LIBCPP_MEMORY_SWAP_ALLOCATOR_H
 
 #include <__config>
 #include <__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_MEMORY_SWAP_ALLOCATOR_H
diff --git a/libcxx/include/__memory/temp_value.h b/libcxx/include/__memory/temp_value.h
index 4a133b3fbcf6c..f075ecef6ad2d 100644
--- a/libcxx/include/__memory/temp_value.h
+++ b/libcxx/include/__memory/temp_value.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_TEMP_VALUE_H
-#define _LIBCPP___MEMORY_TEMP_VALUE_H
+#ifndef _LIBCPP_MEMORY_TEMP_VALUE_H
+#define _LIBCPP_MEMORY_TEMP_VALUE_H
 
 #include <__config>
 #include <__memory/addressof.h>
@@ -55,4 +55,4 @@ struct __temp_value {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MEMORY_TEMP_VALUE_H
+#endif // _LIBCPP_MEMORY_TEMP_VALUE_H
diff --git a/libcxx/include/__memory/temporary_buffer.h b/libcxx/include/__memory/temporary_buffer.h
index d18717f52d1cd..99a9c2b92b180 100644
--- a/libcxx/include/__memory/temporary_buffer.h
+++ b/libcxx/include/__memory/temporary_buffer.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_TEMPORARY_BUFFER_H
-#define _LIBCPP___MEMORY_TEMPORARY_BUFFER_H
+#ifndef _LIBCPP_MEMORY_TEMPORARY_BUFFER_H
+#define _LIBCPP_MEMORY_TEMPORARY_BUFFER_H
 
 #include <__config>
 #include <__cstddef/ptrdiff_t.h>
@@ -42,4 +42,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER <= 17 || defined(_LIBCPP_ENABLE_CXX20_REMOVED_TEMPORARY_BUFFER)
 
-#endif // _LIBCPP___MEMORY_TEMPORARY_BUFFER_H
+#endif // _LIBCPP_MEMORY_TEMPORARY_BUFFER_H
diff --git a/libcxx/include/__memory/uninitialized_algorithms.h b/libcxx/include/__memory/uninitialized_algorithms.h
index 34d065dc973e5..b7701ff5a77c1 100644
--- a/libcxx/include/__memory/uninitialized_algorithms.h
+++ b/libcxx/include/__memory/uninitialized_algorithms.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_UNINITIALIZED_ALGORITHMS_H
-#define _LIBCPP___MEMORY_UNINITIALIZED_ALGORITHMS_H
+#ifndef _LIBCPP_MEMORY_UNINITIALIZED_ALGORITHMS_H
+#define _LIBCPP_MEMORY_UNINITIALIZED_ALGORITHMS_H
 
 #include <__algorithm/copy.h>
 #include <__algorithm/move.h>
@@ -575,4 +575,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___MEMORY_UNINITIALIZED_ALGORITHMS_H
+#endif // _LIBCPP_MEMORY_UNINITIALIZED_ALGORITHMS_H
diff --git a/libcxx/include/__memory/unique_ptr.h b/libcxx/include/__memory/unique_ptr.h
index eff24546cdc01..36f0987c1c770 100644
--- a/libcxx/include/__memory/unique_ptr.h
+++ b/libcxx/include/__memory/unique_ptr.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_UNIQUE_PTR_H
-#define _LIBCPP___MEMORY_UNIQUE_PTR_H
+#ifndef _LIBCPP_MEMORY_UNIQUE_PTR_H
+#define _LIBCPP_MEMORY_UNIQUE_PTR_H
 
 #include <__assert>
 #include <__compare/compare_three_way.h>
@@ -812,4 +812,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___MEMORY_UNIQUE_PTR_H
+#endif // _LIBCPP_MEMORY_UNIQUE_PTR_H
diff --git a/libcxx/include/__memory/unique_temporary_buffer.h b/libcxx/include/__memory/unique_temporary_buffer.h
index 32a3f0f081c00..6eafc6aba7cb2 100644
--- a/libcxx/include/__memory/unique_temporary_buffer.h
+++ b/libcxx/include/__memory/unique_temporary_buffer.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_UNIQUE_TEMPORARY_BUFFER_H
-#define _LIBCPP___MEMORY_UNIQUE_TEMPORARY_BUFFER_H
+#ifndef _LIBCPP_MEMORY_UNIQUE_TEMPORARY_BUFFER_H
+#define _LIBCPP_MEMORY_UNIQUE_TEMPORARY_BUFFER_H
 
 #include <__assert>
 #include <__config>
@@ -90,4 +90,4 @@ __allocate_unique_temporary_buffer(ptrdiff_t __count) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MEMORY_UNIQUE_TEMPORARY_BUFFER_H
+#endif // _LIBCPP_MEMORY_UNIQUE_TEMPORARY_BUFFER_H
diff --git a/libcxx/include/__memory/uses_allocator.h b/libcxx/include/__memory/uses_allocator.h
index bbba85a9724c7..ba865297316d5 100644
--- a/libcxx/include/__memory/uses_allocator.h
+++ b/libcxx/include/__memory/uses_allocator.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MEMORY_USES_ALLOCATOR_H
-#define _LIBCPP___MEMORY_USES_ALLOCATOR_H
+#ifndef _LIBCPP_MEMORY_USES_ALLOCATOR_H
+#define _LIBCPP_MEMORY_USES_ALLOCATOR_H
 
 #include <__config>
 #include <__type_traits/integral_constant.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_MEMORY_USES_ALLOCATOR_H
diff --git a/libcxx/include/__memory/uses_allocator_construction.h b/libcxx/include/__memory/uses_allocator_construction.h
index 6733f5cf6fc35..78c04e7d93e97 100644
--- a/libcxx/include/__memory/uses_allocator_construction.h
+++ b/libcxx/include/__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_MEMORY_USES_ALLOCATOR_CONSTRUCTION_H
+#define _LIBCPP_MEMORY_USES_ALLOCATOR_CONSTRUCTION_H
 
 #include <__config>
 #include <__memory/construct_at.h>
@@ -231,4 +231,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___MEMORY_USES_ALLOCATOR_CONSTRUCTION_H
+#endif // _LIBCPP_MEMORY_USES_ALLOCATOR_CONSTRUCTION_H
diff --git a/libcxx/include/__memory_resource/memory_resource.h b/libcxx/include/__memory_resource/memory_resource.h
index f93f10fe21a2d..b29e286d88f6c 100644
--- a/libcxx/include/__memory_resource/memory_resource.h
+++ b/libcxx/include/__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_MEMORY_RESOURCE_MEMORY_RESOURCE_H
+#define _LIBCPP_MEMORY_RESOURCE_MEMORY_RESOURCE_H
 
 #include <__config>
 #include <__cstddef/max_align_t.h>
@@ -86,4 +86,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 17
 
-#endif // _LIBCPP___MEMORY_RESOURCE_MEMORY_RESOURCE_H
+#endif // _LIBCPP_MEMORY_RESOURCE_MEMORY_RESOURCE_H
diff --git a/libcxx/include/__memory_resource/monotonic_buffer_resource.h b/libcxx/include/__memory_resource/monotonic_buffer_resource.h
index 942d490ce3aea..9750932862222 100644
--- a/libcxx/include/__memory_resource/monotonic_buffer_resource.h
+++ b/libcxx/include/__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_MEMORY_RESOURCE_MONOTONIC_BUFFER_RESOURCE_H
+#define _LIBCPP_MEMORY_RESOURCE_MONOTONIC_BUFFER_RESOURCE_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -116,4 +116,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 17
 
-#endif // _LIBCPP___MEMORY_RESOURCE_MONOTONIC_BUFFER_RESOURCE_H
+#endif // _LIBCPP_MEMORY_RESOURCE_MONOTONIC_BUFFER_RESOURCE_H
diff --git a/libcxx/include/__memory_resource/polymorphic_allocator.h b/libcxx/include/__memory_resource/polymorphic_allocator.h
index 9a351199b5b16..f10826c004435 100644
--- a/libcxx/include/__memory_resource/polymorphic_allocator.h
+++ b/libcxx/include/__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_MEMORY_RESOURCE_POLYMORPHIC_ALLOCATOR_H
+#define _LIBCPP_MEMORY_RESOURCE_POLYMORPHIC_ALLOCATOR_H
 
 #include <__assert>
 #include <__config>
@@ -246,4 +246,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___MEMORY_RESOURCE_POLYMORPHIC_ALLOCATOR_H
+#endif // _LIBCPP_MEMORY_RESOURCE_POLYMORPHIC_ALLOCATOR_H
diff --git a/libcxx/include/__memory_resource/pool_options.h b/libcxx/include/__memory_resource/pool_options.h
index fd20ced56795f..55a78d394bb6e 100644
--- a/libcxx/include/__memory_resource/pool_options.h
+++ b/libcxx/include/__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_MEMORY_RESOURCE_POOL_OPTIONS_H
+#define _LIBCPP_MEMORY_RESOURCE_POOL_OPTIONS_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -35,4 +35,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 17
 
-#endif // _LIBCPP___MEMORY_RESOURCE_POOL_OPTIONS_H
+#endif // _LIBCPP_MEMORY_RESOURCE_POOL_OPTIONS_H
diff --git a/libcxx/include/__memory_resource/synchronized_pool_resource.h b/libcxx/include/__memory_resource/synchronized_pool_resource.h
index bcc1ac4a172e3..f7f34eea642f1 100644
--- a/libcxx/include/__memory_resource/synchronized_pool_resource.h
+++ b/libcxx/include/__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_MEMORY_RESOURCE_SYNCHRONIZED_POOL_RESOURCE_H
+#define _LIBCPP_MEMORY_RESOURCE_SYNCHRONIZED_POOL_RESOURCE_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -90,4 +90,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 17
 
-#endif // _LIBCPP___MEMORY_RESOURCE_SYNCHRONIZED_POOL_RESOURCE_H
+#endif // _LIBCPP_MEMORY_RESOURCE_SYNCHRONIZED_POOL_RESOURCE_H
diff --git a/libcxx/include/__memory_resource/unsynchronized_pool_resource.h b/libcxx/include/__memory_resource/unsynchronized_pool_resource.h
index 92da16c559fea..b81bac1f43c9d 100644
--- a/libcxx/include/__memory_resource/unsynchronized_pool_resource.h
+++ b/libcxx/include/__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_MEMORY_RESOURCE_UNSYNCHRONIZED_POOL_RESOURCE_H
+#define _LIBCPP_MEMORY_RESOURCE_UNSYNCHRONIZED_POOL_RESOURCE_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -103,4 +103,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 17
 
-#endif // _LIBCPP___MEMORY_RESOURCE_UNSYNCHRONIZED_POOL_RESOURCE_H
+#endif // _LIBCPP_MEMORY_RESOURCE_UNSYNCHRONIZED_POOL_RESOURCE_H
diff --git a/libcxx/include/__mutex/lock_guard.h b/libcxx/include/__mutex/lock_guard.h
index 67a25ed2f8a89..0c8648269825a 100644
--- a/libcxx/include/__mutex/lock_guard.h
+++ b/libcxx/include/__mutex/lock_guard.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MUTEX_LOCK_GUARD_H
-#define _LIBCPP___MUTEX_LOCK_GUARD_H
+#ifndef _LIBCPP_MUTEX_LOCK_GUARD_H
+#define _LIBCPP_MUTEX_LOCK_GUARD_H
 
 #include <__config>
 #include <__mutex/tag_types.h>
@@ -43,4 +43,4 @@ _LIBCPP_CTAD_SUPPORTED_FOR_TYPE(lock_guard);
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MUTEX_LOCK_GUARD_H
+#endif // _LIBCPP_MUTEX_LOCK_GUARD_H
diff --git a/libcxx/include/__mutex/mutex.h b/libcxx/include/__mutex/mutex.h
index 68c8842b35eda..3834340fd99ce 100644
--- a/libcxx/include/__mutex/mutex.h
+++ b/libcxx/include/__mutex/mutex.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MUTEX_MUTEX_H
-#define _LIBCPP___MUTEX_MUTEX_H
+#ifndef _LIBCPP_MUTEX_MUTEX_H
+#define _LIBCPP_MUTEX_MUTEX_H
 
 #include <__config>
 #include <__thread/support.h>
@@ -50,4 +50,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_HAS_THREADS
 
-#endif // _LIBCPP___MUTEX_MUTEX_H
+#endif // _LIBCPP_MUTEX_MUTEX_H
diff --git a/libcxx/include/__mutex/once_flag.h b/libcxx/include/__mutex/once_flag.h
index 808b1ea99cc0b..2d98e5d1bd2b7 100644
--- a/libcxx/include/__mutex/once_flag.h
+++ b/libcxx/include/__mutex/once_flag.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MUTEX_ONCE_FLAG_H
-#define _LIBCPP___MUTEX_ONCE_FLAG_H
+#ifndef _LIBCPP_MUTEX_ONCE_FLAG_H
+#define _LIBCPP_MUTEX_ONCE_FLAG_H
 
 #include <__config>
 #include <__memory/addressof.h>
@@ -162,4 +162,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___MUTEX_ONCE_FLAG_H
+#endif // _LIBCPP_MUTEX_ONCE_FLAG_H
diff --git a/libcxx/include/__mutex/tag_types.h b/libcxx/include/__mutex/tag_types.h
index 36b1a3d92b14e..d4561be795bcc 100644
--- a/libcxx/include/__mutex/tag_types.h
+++ b/libcxx/include/__mutex/tag_types.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MUTEX_TAG_TYPES_H
-#define _LIBCPP___MUTEX_TAG_TYPES_H
+#ifndef _LIBCPP_MUTEX_TAG_TYPES_H
+#define _LIBCPP_MUTEX_TAG_TYPES_H
 
 #include <__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_MUTEX_TAG_TYPES_H
diff --git a/libcxx/include/__mutex/unique_lock.h b/libcxx/include/__mutex/unique_lock.h
index aea93eb9b8c9b..e9cc0af0e5e5d 100644
--- a/libcxx/include/__mutex/unique_lock.h
+++ b/libcxx/include/__mutex/unique_lock.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___MUTEX_UNIQUE_LOCK_H
-#define _LIBCPP___MUTEX_UNIQUE_LOCK_H
+#ifndef _LIBCPP_MUTEX_UNIQUE_LOCK_H
+#define _LIBCPP_MUTEX_UNIQUE_LOCK_H
 
 #include <__chrono/duration.h>
 #include <__chrono/time_point.h>
@@ -170,4 +170,4 @@ inline _LIBCPP_HIDE_FROM_ABI void swap(unique_lock<_Mutex>& __x, unique_lock<_Mu
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___MUTEX_UNIQUE_LOCK_H
+#endif // _LIBCPP_MUTEX_UNIQUE_LOCK_H
diff --git a/libcxx/include/__new/align_val_t.h b/libcxx/include/__new/align_val_t.h
index d8ce5283345fb..db29592b50e7d 100644
--- a/libcxx/include/__new/align_val_t.h
+++ b/libcxx/include/__new/align_val_t.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NEW_ALIGN_VAL_T_H
-#define _LIBCPP___NEW_ALIGN_VAL_T_H
+#ifndef _LIBCPP_NEW_ALIGN_VAL_T_H
+#define _LIBCPP_NEW_ALIGN_VAL_T_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -32,4 +32,4 @@ enum align_val_t { __zero = 0, __max = (size_t)-1 };
 #endif
 _LIBCPP_END_UNVERSIONED_NAMESPACE_STD
 
-#endif // _LIBCPP___NEW_ALIGN_VAL_T_H
+#endif // _LIBCPP_NEW_ALIGN_VAL_T_H
diff --git a/libcxx/include/__new/allocate.h b/libcxx/include/__new/allocate.h
index 9bfe19aedb79f..510398e5bcc2c 100644
--- a/libcxx/include/__new/allocate.h
+++ b/libcxx/include/__new/allocate.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NEW_ALLOCATE_H
-#define _LIBCPP___NEW_ALLOCATE_H
+#ifndef _LIBCPP_NEW_ALLOCATE_H
+#define _LIBCPP_NEW_ALLOCATE_H
 
 #include <__config>
 #include <__cstddef/max_align_t.h>
@@ -76,4 +76,4 @@ inline _LIBCPP_HIDE_FROM_ABI void __libcpp_deallocate_unsized(
 }
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___NEW_ALLOCATE_H
+#endif // _LIBCPP_NEW_ALLOCATE_H
diff --git a/libcxx/include/__new/destroying_delete_t.h b/libcxx/include/__new/destroying_delete_t.h
index 1d06d912b44e5..f9e56e19afc56 100644
--- a/libcxx/include/__new/destroying_delete_t.h
+++ b/libcxx/include/__new/destroying_delete_t.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NEW_DESTROYING_DELETE_T_H
-#define _LIBCPP___NEW_DESTROYING_DELETE_T_H
+#ifndef _LIBCPP_NEW_DESTROYING_DELETE_T_H
+#define _LIBCPP_NEW_DESTROYING_DELETE_T_H
 
 #include <__config>
 
@@ -26,4 +26,4 @@ inline constexpr destroying_delete_t destroying_delete{};
 _LIBCPP_END_UNVERSIONED_NAMESPACE_STD
 #endif
 
-#endif // _LIBCPP___NEW_DESTROYING_DELETE_T_H
+#endif // _LIBCPP_NEW_DESTROYING_DELETE_T_H
diff --git a/libcxx/include/__new/exceptions.h b/libcxx/include/__new/exceptions.h
index 483e5e3811182..acb20dbf83023 100644
--- a/libcxx/include/__new/exceptions.h
+++ b/libcxx/include/__new/exceptions.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NEW_EXCEPTIONS_H
-#define _LIBCPP___NEW_EXCEPTIONS_H
+#ifndef _LIBCPP_NEW_EXCEPTIONS_H
+#define _LIBCPP_NEW_EXCEPTIONS_H
 
 #include <__config>
 #include <__exception/exception.h>
@@ -76,4 +76,4 @@ class bad_array_new_length : public bad_alloc {
 }
 _LIBCPP_END_UNVERSIONED_NAMESPACE_STD
 
-#endif // _LIBCPP___NEW_EXCEPTIONS_H
+#endif // _LIBCPP_NEW_EXCEPTIONS_H
diff --git a/libcxx/include/__new/global_new_delete.h b/libcxx/include/__new/global_new_delete.h
index 96510ab56b00b..9821b9dc27405 100644
--- a/libcxx/include/__new/global_new_delete.h
+++ b/libcxx/include/__new/global_new_delete.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NEW_GLOBAL_NEW_DELETE_H
-#define _LIBCPP___NEW_GLOBAL_NEW_DELETE_H
+#ifndef _LIBCPP_NEW_GLOBAL_NEW_DELETE_H
+#define _LIBCPP_NEW_GLOBAL_NEW_DELETE_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -74,4 +74,4 @@ _LIBCPP_OVERRIDABLE_FUNC_VIS void operator delete[](void* __p, std::size_t __sz,
 #  endif
 #endif
 
-#endif // _LIBCPP___NEW_GLOBAL_NEW_DELETE_H
+#endif // _LIBCPP_NEW_GLOBAL_NEW_DELETE_H
diff --git a/libcxx/include/__new/interference_size.h b/libcxx/include/__new/interference_size.h
index d326c43a33203..bc63fa5ff8445 100644
--- a/libcxx/include/__new/interference_size.h
+++ b/libcxx/include/__new/interference_size.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NEW_INTERFERENCE_SIZE_H
-#define _LIBCPP___NEW_INTERFERENCE_SIZE_H
+#ifndef _LIBCPP_NEW_INTERFERENCE_SIZE_H
+#define _LIBCPP_NEW_INTERFERENCE_SIZE_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -31,4 +31,4 @@ inline constexpr size_t hardware_constructive_interference_size = __GCC_CONSTRUC
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___NEW_INTERFERENCE_SIZE_H
+#endif // _LIBCPP_NEW_INTERFERENCE_SIZE_H
diff --git a/libcxx/include/__new/launder.h b/libcxx/include/__new/launder.h
index 886f614eed2e7..3fc8601fac714 100644
--- a/libcxx/include/__new/launder.h
+++ b/libcxx/include/__new/launder.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NEW_LAUNDER_H
-#define _LIBCPP___NEW_LAUNDER_H
+#ifndef _LIBCPP_NEW_LAUNDER_H
+#define _LIBCPP_NEW_LAUNDER_H
 
 #include <__config>
 
@@ -31,4 +31,4 @@ template <class _Tp>
 #endif
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___NEW_LAUNDER_H
+#endif // _LIBCPP_NEW_LAUNDER_H
diff --git a/libcxx/include/__new/new_handler.h b/libcxx/include/__new/new_handler.h
index 05f4e846c3ef9..e91d5a74f5570 100644
--- a/libcxx/include/__new/new_handler.h
+++ b/libcxx/include/__new/new_handler.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NEW_NEW_HANDLER_H
-#define _LIBCPP___NEW_NEW_HANDLER_H
+#ifndef _LIBCPP_NEW_NEW_HANDLER_H
+#define _LIBCPP_NEW_NEW_HANDLER_H
 
 #include <__config>
 
@@ -25,4 +25,4 @@ _LIBCPP_EXPORTED_FROM_ABI new_handler get_new_handler() _NOEXCEPT;
 _LIBCPP_END_UNVERSIONED_NAMESPACE_STD
 #endif // _LIBCPP_ABI_VCRUNTIME
 
-#endif // _LIBCPP___NEW_NEW_HANDLER_H
+#endif // _LIBCPP_NEW_NEW_HANDLER_H
diff --git a/libcxx/include/__new/nothrow_t.h b/libcxx/include/__new/nothrow_t.h
index a099772123934..ec4d0d41a7abb 100644
--- a/libcxx/include/__new/nothrow_t.h
+++ b/libcxx/include/__new/nothrow_t.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NEW_NOTHROW_T_H
-#define _LIBCPP___NEW_NOTHROW_T_H
+#ifndef _LIBCPP_NEW_NOTHROW_T_H
+#define _LIBCPP_NEW_NOTHROW_T_H
 
 #include <__config>
 
@@ -26,4 +26,4 @@ extern _LIBCPP_EXPORTED_FROM_ABI const nothrow_t nothrow;
 _LIBCPP_END_UNVERSIONED_NAMESPACE_STD
 #endif // _LIBCPP_ABI_VCRUNTIME
 
-#endif // _LIBCPP___NEW_NOTHROW_T_H
+#endif // _LIBCPP_NEW_NOTHROW_T_H
diff --git a/libcxx/include/__new/placement_new_delete.h b/libcxx/include/__new/placement_new_delete.h
index 42c9f34036775..ad9704dfc163a 100644
--- a/libcxx/include/__new/placement_new_delete.h
+++ b/libcxx/include/__new/placement_new_delete.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NEW_PLACEMENT_NEW_DELETE_H
-#define _LIBCPP___NEW_PLACEMENT_NEW_DELETE_H
+#ifndef _LIBCPP_NEW_PLACEMENT_NEW_DELETE_H
+#define _LIBCPP_NEW_PLACEMENT_NEW_DELETE_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -31,4 +31,4 @@ inline _LIBCPP_HIDE_FROM_ABI void operator delete(void*, void*) _NOEXCEPT {}
 inline _LIBCPP_HIDE_FROM_ABI void operator delete[](void*, void*) _NOEXCEPT {}
 #endif
 
-#endif // _LIBCPP___NEW_PLACEMENT_NEW_DELETE_H
+#endif // _LIBCPP_NEW_PLACEMENT_NEW_DELETE_H
diff --git a/libcxx/include/__node_handle b/libcxx/include/__node_handle
index b20b0c73a0518..803e82cb5b90e 100644
--- a/libcxx/include/__node_handle
+++ b/libcxx/include/__node_handle
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NODE_HANDLE
-#define _LIBCPP___NODE_HANDLE
+#ifndef _LIBCPP_NODE_HANDLE
+#define _LIBCPP_NODE_HANDLE
 
 /*
 
@@ -207,4 +207,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___NODE_HANDLE
+#endif // _LIBCPP_NODE_HANDLE
diff --git a/libcxx/include/__numeric/accumulate.h b/libcxx/include/__numeric/accumulate.h
index fedc1c46dfd02..fc8225eba0104 100644
--- a/libcxx/include/__numeric/accumulate.h
+++ b/libcxx/include/__numeric/accumulate.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NUMERIC_ACCUMULATE_H
-#define _LIBCPP___NUMERIC_ACCUMULATE_H
+#ifndef _LIBCPP_NUMERIC_ACCUMULATE_H
+#define _LIBCPP_NUMERIC_ACCUMULATE_H
 
 #include <__config>
 #include <__utility/move.h>
@@ -50,4 +50,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___NUMERIC_ACCUMULATE_H
+#endif // _LIBCPP_NUMERIC_ACCUMULATE_H
diff --git a/libcxx/include/__numeric/adjacent_difference.h b/libcxx/include/__numeric/adjacent_difference.h
index 62b53342d9a41..c803f0af3f3b0 100644
--- a/libcxx/include/__numeric/adjacent_difference.h
+++ b/libcxx/include/__numeric/adjacent_difference.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NUMERIC_ADJACENT_DIFFERENCE_H
-#define _LIBCPP___NUMERIC_ADJACENT_DIFFERENCE_H
+#ifndef _LIBCPP_NUMERIC_ADJACENT_DIFFERENCE_H
+#define _LIBCPP_NUMERIC_ADJACENT_DIFFERENCE_H
 
 #include <__config>
 #include <__iterator/iterator_traits.h>
@@ -65,4 +65,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___NUMERIC_ADJACENT_DIFFERENCE_H
+#endif // _LIBCPP_NUMERIC_ADJACENT_DIFFERENCE_H
diff --git a/libcxx/include/__numeric/exclusive_scan.h b/libcxx/include/__numeric/exclusive_scan.h
index af85b477dfe68..b9f7303d8c8e6 100644
--- a/libcxx/include/__numeric/exclusive_scan.h
+++ b/libcxx/include/__numeric/exclusive_scan.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NUMERIC_EXCLUSIVE_SCAN_H
-#define _LIBCPP___NUMERIC_EXCLUSIVE_SCAN_H
+#ifndef _LIBCPP_NUMERIC_EXCLUSIVE_SCAN_H
+#define _LIBCPP_NUMERIC_EXCLUSIVE_SCAN_H
 
 #include <__config>
 #include <__functional/operations.h>
@@ -55,4 +55,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___NUMERIC_EXCLUSIVE_SCAN_H
+#endif // _LIBCPP_NUMERIC_EXCLUSIVE_SCAN_H
diff --git a/libcxx/include/__numeric/gcd_lcm.h b/libcxx/include/__numeric/gcd_lcm.h
index 95df54dc066df..303245df5b7bd 100644
--- a/libcxx/include/__numeric/gcd_lcm.h
+++ b/libcxx/include/__numeric/gcd_lcm.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NUMERIC_GCD_LCM_H
-#define _LIBCPP___NUMERIC_GCD_LCM_H
+#ifndef _LIBCPP_NUMERIC_GCD_LCM_H
+#define _LIBCPP_NUMERIC_GCD_LCM_H
 
 #include <__assert>
 #include <__bit/countr.h>
@@ -127,4 +127,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___NUMERIC_GCD_LCM_H
+#endif // _LIBCPP_NUMERIC_GCD_LCM_H
diff --git a/libcxx/include/__numeric/inclusive_scan.h b/libcxx/include/__numeric/inclusive_scan.h
index d714f102d74ef..7cfb49a5dc388 100644
--- a/libcxx/include/__numeric/inclusive_scan.h
+++ b/libcxx/include/__numeric/inclusive_scan.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NUMERIC_INCLUSIVE_SCAN_H
-#define _LIBCPP___NUMERIC_INCLUSIVE_SCAN_H
+#ifndef _LIBCPP_NUMERIC_INCLUSIVE_SCAN_H
+#define _LIBCPP_NUMERIC_INCLUSIVE_SCAN_H
 
 #include <__config>
 #include <__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_NUMERIC_INCLUSIVE_SCAN_H
diff --git a/libcxx/include/__numeric/inner_product.h b/libcxx/include/__numeric/inner_product.h
index 0deab3d421b77..61fec05159901 100644
--- a/libcxx/include/__numeric/inner_product.h
+++ b/libcxx/include/__numeric/inner_product.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NUMERIC_INNER_PRODUCT_H
-#define _LIBCPP___NUMERIC_INNER_PRODUCT_H
+#ifndef _LIBCPP_NUMERIC_INNER_PRODUCT_H
+#define _LIBCPP_NUMERIC_INNER_PRODUCT_H
 
 #include <__config>
 #include <__utility/move.h>
@@ -55,4 +55,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___NUMERIC_INNER_PRODUCT_H
+#endif // _LIBCPP_NUMERIC_INNER_PRODUCT_H
diff --git a/libcxx/include/__numeric/iota.h b/libcxx/include/__numeric/iota.h
index 27bd84e395a3a..8b2dce8194f22 100644
--- a/libcxx/include/__numeric/iota.h
+++ b/libcxx/include/__numeric/iota.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NUMERIC_IOTA_H
-#define _LIBCPP___NUMERIC_IOTA_H
+#ifndef _LIBCPP_NUMERIC_IOTA_H
+#define _LIBCPP_NUMERIC_IOTA_H
 
 #include <__config>
 
@@ -27,4 +27,4 @@ iota(_ForwardIterator __first, _ForwardIterator __last, _Tp __value) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___NUMERIC_IOTA_H
+#endif // _LIBCPP_NUMERIC_IOTA_H
diff --git a/libcxx/include/__numeric/midpoint.h b/libcxx/include/__numeric/midpoint.h
index 2ba80e5cca07d..06a969ea4c9e9 100644
--- a/libcxx/include/__numeric/midpoint.h
+++ b/libcxx/include/__numeric/midpoint.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NUMERIC_MIDPOINT_H
-#define _LIBCPP___NUMERIC_MIDPOINT_H
+#ifndef _LIBCPP_NUMERIC_MIDPOINT_H
+#define _LIBCPP_NUMERIC_MIDPOINT_H
 
 #include <__config>
 #include <__cstddef/ptrdiff_t.h>
@@ -85,4 +85,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___NUMERIC_MIDPOINT_H
+#endif // _LIBCPP_NUMERIC_MIDPOINT_H
diff --git a/libcxx/include/__numeric/partial_sum.h b/libcxx/include/__numeric/partial_sum.h
index 7c3cf7fb20b04..2ce44eeb0d7a3 100644
--- a/libcxx/include/__numeric/partial_sum.h
+++ b/libcxx/include/__numeric/partial_sum.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NUMERIC_PARTIAL_SUM_H
-#define _LIBCPP___NUMERIC_PARTIAL_SUM_H
+#ifndef _LIBCPP_NUMERIC_PARTIAL_SUM_H
+#define _LIBCPP_NUMERIC_PARTIAL_SUM_H
 
 #include <__config>
 #include <__iterator/iterator_traits.h>
@@ -63,4 +63,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___NUMERIC_PARTIAL_SUM_H
+#endif // _LIBCPP_NUMERIC_PARTIAL_SUM_H
diff --git a/libcxx/include/__numeric/pstl.h b/libcxx/include/__numeric/pstl.h
index fe7b2cc7a82cc..4a0f980e90ac2 100644
--- a/libcxx/include/__numeric/pstl.h
+++ b/libcxx/include/__numeric/pstl.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NUMERIC_PSTL_H
-#define _LIBCPP___NUMERIC_PSTL_H
+#ifndef _LIBCPP_NUMERIC_PSTL_H
+#define _LIBCPP_NUMERIC_PSTL_H
 
 #include <__config>
 
@@ -171,4 +171,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___NUMERIC_PSTL_H
+#endif // _LIBCPP_NUMERIC_PSTL_H
diff --git a/libcxx/include/__numeric/ranges_iota.h b/libcxx/include/__numeric/ranges_iota.h
index bf53dd85fecef..223b9ae4c7a58 100644
--- a/libcxx/include/__numeric/ranges_iota.h
+++ b/libcxx/include/__numeric/ranges_iota.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NUMERIC_RANGES_IOTA_H
-#define _LIBCPP___NUMERIC_RANGES_IOTA_H
+#ifndef _LIBCPP_NUMERIC_RANGES_IOTA_H
+#define _LIBCPP_NUMERIC_RANGES_IOTA_H
 
 #include <__algorithm/out_value_result.h>
 #include <__config>
@@ -62,4 +62,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___NUMERIC_RANGES_IOTA_H
+#endif // _LIBCPP_NUMERIC_RANGES_IOTA_H
diff --git a/libcxx/include/__numeric/reduce.h b/libcxx/include/__numeric/reduce.h
index 6c205bf581fb9..6b25e211645c1 100644
--- a/libcxx/include/__numeric/reduce.h
+++ b/libcxx/include/__numeric/reduce.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NUMERIC_REDUCE_H
-#define _LIBCPP___NUMERIC_REDUCE_H
+#ifndef _LIBCPP_NUMERIC_REDUCE_H
+#define _LIBCPP_NUMERIC_REDUCE_H
 
 #include <__config>
 #include <__functional/operations.h>
@@ -50,4 +50,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___NUMERIC_REDUCE_H
+#endif // _LIBCPP_NUMERIC_REDUCE_H
diff --git a/libcxx/include/__numeric/saturation_arithmetic.h b/libcxx/include/__numeric/saturation_arithmetic.h
index 4491bab2b1479..64781d2b32f76 100644
--- a/libcxx/include/__numeric/saturation_arithmetic.h
+++ b/libcxx/include/__numeric/saturation_arithmetic.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NUMERIC_SATURATION_ARITHMETIC_H
-#define _LIBCPP___NUMERIC_SATURATION_ARITHMETIC_H
+#ifndef _LIBCPP_NUMERIC_SATURATION_ARITHMETIC_H
+#define _LIBCPP_NUMERIC_SATURATION_ARITHMETIC_H
 
 #include <__assert>
 #include <__config>
@@ -151,4 +151,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___NUMERIC_SATURATION_ARITHMETIC_H
+#endif // _LIBCPP_NUMERIC_SATURATION_ARITHMETIC_H
diff --git a/libcxx/include/__numeric/transform_exclusive_scan.h b/libcxx/include/__numeric/transform_exclusive_scan.h
index fb88aa52cd105..fcb7f653b215e 100644
--- a/libcxx/include/__numeric/transform_exclusive_scan.h
+++ b/libcxx/include/__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_NUMERIC_TRANSFORM_EXCLUSIVE_SCAN_H
+#define _LIBCPP_NUMERIC_TRANSFORM_EXCLUSIVE_SCAN_H
 
 #include <__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_NUMERIC_TRANSFORM_EXCLUSIVE_SCAN_H
diff --git a/libcxx/include/__numeric/transform_inclusive_scan.h b/libcxx/include/__numeric/transform_inclusive_scan.h
index 2eab1a142439a..57162131c5243 100644
--- a/libcxx/include/__numeric/transform_inclusive_scan.h
+++ b/libcxx/include/__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_NUMERIC_TRANSFORM_INCLUSIVE_SCAN_H
+#define _LIBCPP_NUMERIC_TRANSFORM_INCLUSIVE_SCAN_H
 
 #include <__config>
 #include <__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_NUMERIC_TRANSFORM_INCLUSIVE_SCAN_H
diff --git a/libcxx/include/__numeric/transform_reduce.h b/libcxx/include/__numeric/transform_reduce.h
index f1150510f0c36..01fa48c517273 100644
--- a/libcxx/include/__numeric/transform_reduce.h
+++ b/libcxx/include/__numeric/transform_reduce.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___NUMERIC_TRANSFORM_REDUCE_H
-#define _LIBCPP___NUMERIC_TRANSFORM_REDUCE_H
+#ifndef _LIBCPP_NUMERIC_TRANSFORM_REDUCE_H
+#define _LIBCPP_NUMERIC_TRANSFORM_REDUCE_H
 
 #include <__config>
 #include <__functional/operations.h>
@@ -56,4 +56,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___NUMERIC_TRANSFORM_REDUCE_H
+#endif // _LIBCPP_NUMERIC_TRANSFORM_REDUCE_H
diff --git a/libcxx/include/__ostream/basic_ostream.h b/libcxx/include/__ostream/basic_ostream.h
index effeef491f341..ec43b6bf85f2d 100644
--- a/libcxx/include/__ostream/basic_ostream.h
+++ b/libcxx/include/__ostream/basic_ostream.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___OSTREAM_BASIC_OSTREAM_H
-#define _LIBCPP___OSTREAM_BASIC_OSTREAM_H
+#ifndef _LIBCPP_OSTREAM_BASIC_OSTREAM_H
+#define _LIBCPP_OSTREAM_BASIC_OSTREAM_H
 
 #include <__config>
 
@@ -678,4 +678,4 @@ _LIBCPP_POP_MACROS
 
 #endif // _LIBCPP_HAS_LOCALIZATION
 
-#endif // _LIBCPP___OSTREAM_BASIC_OSTREAM_H
+#endif // _LIBCPP_OSTREAM_BASIC_OSTREAM_H
diff --git a/libcxx/include/__ostream/print.h b/libcxx/include/__ostream/print.h
index c5906c41b95b5..29f5cf94b61ee 100644
--- a/libcxx/include/__ostream/print.h
+++ b/libcxx/include/__ostream/print.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___OSTREAM_PRINT_H
-#define _LIBCPP___OSTREAM_PRINT_H
+#ifndef _LIBCPP_OSTREAM_PRINT_H
+#define _LIBCPP_OSTREAM_PRINT_H
 
 #include <__config>
 
@@ -171,4 +171,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_HAS_LOCALIZATION
 
-#endif // _LIBCPP___OSTREAM_PRINT_H
+#endif // _LIBCPP_OSTREAM_PRINT_H
diff --git a/libcxx/include/__ostream/put_character_sequence.h b/libcxx/include/__ostream/put_character_sequence.h
index aa771b34d58b5..d558f9505aab6 100644
--- a/libcxx/include/__ostream/put_character_sequence.h
+++ b/libcxx/include/__ostream/put_character_sequence.h
@@ -6,8 +6,8 @@
 //
 //===---------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___OSTREAM_PUT_CHARACTER_SEQUENCE_H
-#define _LIBCPP___OSTREAM_PUT_CHARACTER_SEQUENCE_H
+#ifndef _LIBCPP_OSTREAM_PUT_CHARACTER_SEQUENCE_H
+#define _LIBCPP_OSTREAM_PUT_CHARACTER_SEQUENCE_H
 
 #include <__config>
 
@@ -56,4 +56,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_HAS_LOCALIZATION
 
-#endif // _LIBCPP___OSTREAM_PUT_CHARACTER_SEQUENCE_H
+#endif // _LIBCPP_OSTREAM_PUT_CHARACTER_SEQUENCE_H
diff --git a/libcxx/include/__pstl/backend.h b/libcxx/include/__pstl/backend.h
index 5980b0708cd34..cc4509996e354 100644
--- a/libcxx/include/__pstl/backend.h
+++ b/libcxx/include/__pstl/backend.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___PSTL_BACKEND_H
-#define _LIBCPP___PSTL_BACKEND_H
+#ifndef _LIBCPP_PSTL_BACKEND_H
+#define _LIBCPP_PSTL_BACKEND_H
 
 #include <__config>
 #include <__pstl/backend_fwd.h>
@@ -36,4 +36,4 @@ _LIBCPP_PUSH_MACROS
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___PSTL_BACKEND_H
+#endif // _LIBCPP_PSTL_BACKEND_H
diff --git a/libcxx/include/__pstl/backend_fwd.h b/libcxx/include/__pstl/backend_fwd.h
index a7d53b6a1c989..1cc0c79cf04d5 100644
--- a/libcxx/include/__pstl/backend_fwd.h
+++ b/libcxx/include/__pstl/backend_fwd.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___PSTL_BACKEND_FWD_H
-#define _LIBCPP___PSTL_BACKEND_FWD_H
+#ifndef _LIBCPP_PSTL_BACKEND_FWD_H
+#define _LIBCPP_PSTL_BACKEND_FWD_H
 
 #include <__config>
 
@@ -304,4 +304,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___PSTL_BACKEND_FWD_H
+#endif // _LIBCPP_PSTL_BACKEND_FWD_H
diff --git a/libcxx/include/__pstl/backends/default.h b/libcxx/include/__pstl/backends/default.h
index 43b1f1ce3870a..d9c4ee1855604 100644
--- a/libcxx/include/__pstl/backends/default.h
+++ b/libcxx/include/__pstl/backends/default.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___PSTL_BACKENDS_DEFAULT_H
-#define _LIBCPP___PSTL_BACKENDS_DEFAULT_H
+#ifndef _LIBCPP_PSTL_BACKENDS_DEFAULT_H
+#define _LIBCPP_PSTL_BACKENDS_DEFAULT_H
 
 #include <__algorithm/copy_n.h>
 #include <__algorithm/equal.h>
@@ -504,4 +504,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___PSTL_BACKENDS_DEFAULT_H
+#endif // _LIBCPP_PSTL_BACKENDS_DEFAULT_H
diff --git a/libcxx/include/__pstl/backends/libdispatch.h b/libcxx/include/__pstl/backends/libdispatch.h
index 88d4231d29a0a..2aa13b4b234d2 100644
--- a/libcxx/include/__pstl/backends/libdispatch.h
+++ b/libcxx/include/__pstl/backends/libdispatch.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___PSTL_BACKENDS_LIBDISPATCH_H
-#define _LIBCPP___PSTL_BACKENDS_LIBDISPATCH_H
+#ifndef _LIBCPP_PSTL_BACKENDS_LIBDISPATCH_H
+#define _LIBCPP_PSTL_BACKENDS_LIBDISPATCH_H
 
 #include <__algorithm/inplace_merge.h>
 #include <__algorithm/lower_bound.h>
@@ -399,4 +399,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___PSTL_BACKENDS_LIBDISPATCH_H
+#endif // _LIBCPP_PSTL_BACKENDS_LIBDISPATCH_H
diff --git a/libcxx/include/__pstl/backends/serial.h b/libcxx/include/__pstl/backends/serial.h
index f4142016ccc79..90fa3af8bee50 100644
--- a/libcxx/include/__pstl/backends/serial.h
+++ b/libcxx/include/__pstl/backends/serial.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___PSTL_BACKENDS_SERIAL_H
-#define _LIBCPP___PSTL_BACKENDS_SERIAL_H
+#ifndef _LIBCPP_PSTL_BACKENDS_SERIAL_H
+#define _LIBCPP_PSTL_BACKENDS_SERIAL_H
 
 #include <__algorithm/find_if.h>
 #include <__algorithm/for_each.h>
@@ -182,4 +182,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___PSTL_BACKENDS_SERIAL_H
+#endif // _LIBCPP_PSTL_BACKENDS_SERIAL_H
diff --git a/libcxx/include/__pstl/backends/std_thread.h b/libcxx/include/__pstl/backends/std_thread.h
index dd2c3f15403e3..d5dfada5a5a40 100644
--- a/libcxx/include/__pstl/backends/std_thread.h
+++ b/libcxx/include/__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_PSTL_BACKENDS_STD_THREAD_H
+#define _LIBCPP_PSTL_BACKENDS_STD_THREAD_H
 
 #include <__config>
 #include <__pstl/backend_fwd.h>
@@ -136,4 +136,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___PSTL_BACKENDS_STD_THREAD_H
+#endif // _LIBCPP_PSTL_BACKENDS_STD_THREAD_H
diff --git a/libcxx/include/__pstl/cpu_algos/any_of.h b/libcxx/include/__pstl/cpu_algos/any_of.h
index 803db7974eca7..66b31f37d5c1e 100644
--- a/libcxx/include/__pstl/cpu_algos/any_of.h
+++ b/libcxx/include/__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_PSTL_CPU_ALGOS_ANY_OF_H
+#define _LIBCPP_PSTL_CPU_ALGOS_ANY_OF_H
 
 #include <__algorithm/any_of.h>
 #include <__assert>
@@ -100,4 +100,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___PSTL_CPU_ALGOS_ANY_OF_H
+#endif // _LIBCPP_PSTL_CPU_ALGOS_ANY_OF_H
diff --git a/libcxx/include/__pstl/cpu_algos/cpu_traits.h b/libcxx/include/__pstl/cpu_algos/cpu_traits.h
index ec1622419d049..45711781fc9e3 100644
--- a/libcxx/include/__pstl/cpu_algos/cpu_traits.h
+++ b/libcxx/include/__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_PSTL_CPU_ALGOS_CPU_TRAITS_H
+#define _LIBCPP_PSTL_CPU_ALGOS_CPU_TRAITS_H
 
 #include <__config>
 
@@ -86,4 +86,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___PSTL_CPU_ALGOS_CPU_TRAITS_H
+#endif // _LIBCPP_PSTL_CPU_ALGOS_CPU_TRAITS_H
diff --git a/libcxx/include/__pstl/cpu_algos/fill.h b/libcxx/include/__pstl/cpu_algos/fill.h
index 3e5936589a6a6..6dc41fd2bf5cc 100644
--- a/libcxx/include/__pstl/cpu_algos/fill.h
+++ b/libcxx/include/__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_PSTL_CPU_ALGOS_FILL_H
+#define _LIBCPP_PSTL_CPU_ALGOS_FILL_H
 
 #include <__algorithm/fill.h>
 #include <__assert>
@@ -67,4 +67,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 17
 
-#endif // _LIBCPP___PSTL_CPU_ALGOS_FILL_H
+#endif // _LIBCPP_PSTL_CPU_ALGOS_FILL_H
diff --git a/libcxx/include/__pstl/cpu_algos/find_if.h b/libcxx/include/__pstl/cpu_algos/find_if.h
index aae64b66eb0c0..1ceababc15499 100644
--- a/libcxx/include/__pstl/cpu_algos/find_if.h
+++ b/libcxx/include/__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_PSTL_CPU_ALGOS_FIND_IF_H
+#define _LIBCPP_PSTL_CPU_ALGOS_FIND_IF_H
 
 #include <__algorithm/find_if.h>
 #include <__assert>
@@ -137,4 +137,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___PSTL_CPU_ALGOS_FIND_IF_H
+#endif // _LIBCPP_PSTL_CPU_ALGOS_FIND_IF_H
diff --git a/libcxx/include/__pstl/cpu_algos/for_each.h b/libcxx/include/__pstl/cpu_algos/for_each.h
index cec719bc47b88..8677f84e8250f 100644
--- a/libcxx/include/__pstl/cpu_algos/for_each.h
+++ b/libcxx/include/__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_PSTL_CPU_ALGOS_FOR_EACH_H
+#define _LIBCPP_PSTL_CPU_ALGOS_FOR_EACH_H
 
 #include <__algorithm/for_each.h>
 #include <__assert>
@@ -67,4 +67,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 17
 
-#endif // _LIBCPP___PSTL_CPU_ALGOS_FOR_EACH_H
+#endif // _LIBCPP_PSTL_CPU_ALGOS_FOR_EACH_H
diff --git a/libcxx/include/__pstl/cpu_algos/merge.h b/libcxx/include/__pstl/cpu_algos/merge.h
index a9069ca51de2f..c72f75d885541 100644
--- a/libcxx/include/__pstl/cpu_algos/merge.h
+++ b/libcxx/include/__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_PSTL_CPU_ALGOS_MERGE_H
+#define _LIBCPP_PSTL_CPU_ALGOS_MERGE_H
 
 #include <__algorithm/merge.h>
 #include <__assert>
@@ -86,4 +86,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___PSTL_CPU_ALGOS_MERGE_H
+#endif // _LIBCPP_PSTL_CPU_ALGOS_MERGE_H
diff --git a/libcxx/include/__pstl/cpu_algos/stable_sort.h b/libcxx/include/__pstl/cpu_algos/stable_sort.h
index 5afdd3fd629ba..621f45dc9f287 100644
--- a/libcxx/include/__pstl/cpu_algos/stable_sort.h
+++ b/libcxx/include/__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_PSTL_CPU_ALGOS_STABLE_SORT_H
+#define _LIBCPP_PSTL_CPU_ALGOS_STABLE_SORT_H
 
 #include <__algorithm/stable_sort.h>
 #include <__config>
@@ -48,4 +48,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 17
 
-#endif // _LIBCPP___PSTL_CPU_ALGOS_STABLE_SORT_H
+#endif // _LIBCPP_PSTL_CPU_ALGOS_STABLE_SORT_H
diff --git a/libcxx/include/__pstl/cpu_algos/transform.h b/libcxx/include/__pstl/cpu_algos/transform.h
index 30d117d754b31..7cc45fdb23ca2 100644
--- a/libcxx/include/__pstl/cpu_algos/transform.h
+++ b/libcxx/include/__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_PSTL_CPU_ALGOS_TRANSFORM_H
+#define _LIBCPP_PSTL_CPU_ALGOS_TRANSFORM_H
 
 #include <__algorithm/transform.h>
 #include <__assert>
@@ -153,4 +153,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___PSTL_CPU_ALGOS_TRANSFORM_H
+#endif // _LIBCPP_PSTL_CPU_ALGOS_TRANSFORM_H
diff --git a/libcxx/include/__pstl/cpu_algos/transform_reduce.h b/libcxx/include/__pstl/cpu_algos/transform_reduce.h
index edfb28b4466fc..c96ffc8019f2e 100644
--- a/libcxx/include/__pstl/cpu_algos/transform_reduce.h
+++ b/libcxx/include/__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_PSTL_CPU_ALGOS_TRANSFORM_REDUCE_H
+#define _LIBCPP_PSTL_CPU_ALGOS_TRANSFORM_REDUCE_H
 
 #include <__assert>
 #include <__config>
@@ -216,4 +216,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___PSTL_CPU_ALGOS_TRANSFORM_REDUCE_H
+#endif // _LIBCPP_PSTL_CPU_ALGOS_TRANSFORM_REDUCE_H
diff --git a/libcxx/include/__pstl/dispatch.h b/libcxx/include/__pstl/dispatch.h
index 828842368e339..c997b1b1d53e0 100644
--- a/libcxx/include/__pstl/dispatch.h
+++ b/libcxx/include/__pstl/dispatch.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___PSTL_DISPATCH_H
-#define _LIBCPP___PSTL_DISPATCH_H
+#ifndef _LIBCPP_PSTL_DISPATCH_H
+#define _LIBCPP_PSTL_DISPATCH_H
 
 #include <__config>
 #include <__pstl/backend_fwd.h>
@@ -68,4 +68,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___PSTL_DISPATCH_H
+#endif // _LIBCPP_PSTL_DISPATCH_H
diff --git a/libcxx/include/__pstl/handle_exception.h b/libcxx/include/__pstl/handle_exception.h
index 3b5fca86902b0..403928c3cafb5 100644
--- a/libcxx/include/__pstl/handle_exception.h
+++ b/libcxx/include/__pstl/handle_exception.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___PSTL_HANDLE_EXCEPTION_H
-#define _LIBCPP___PSTL_HANDLE_EXCEPTION_H
+#ifndef _LIBCPP_PSTL_HANDLE_EXCEPTION_H
+#define _LIBCPP_PSTL_HANDLE_EXCEPTION_H
 
 #include <__config>
 #include <__new/exceptions.h>
@@ -58,4 +58,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___PSTL_HANDLE_EXCEPTION_H
+#endif // _LIBCPP_PSTL_HANDLE_EXCEPTION_H
diff --git a/libcxx/include/__random/bernoulli_distribution.h b/libcxx/include/__random/bernoulli_distribution.h
index 8d1bfad9e7d29..33d1a888b09ac 100644
--- a/libcxx/include/__random/bernoulli_distribution.h
+++ b/libcxx/include/__random/bernoulli_distribution.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANDOM_BERNOULLI_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_BERNOULLI_DISTRIBUTION_H
+#ifndef _LIBCPP_RANDOM_BERNOULLI_DISTRIBUTION_H
+#define _LIBCPP_RANDOM_BERNOULLI_DISTRIBUTION_H
 
 #include <__config>
 #include <__random/is_valid.h>
@@ -120,4 +120,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_BERNOULLI_DISTRIBUTION_H
+#endif // _LIBCPP_RANDOM_BERNOULLI_DISTRIBUTION_H
diff --git a/libcxx/include/__random/binomial_distribution.h b/libcxx/include/__random/binomial_distribution.h
index bada8cfdd74a3..b16ab9bfd6fe9 100644
--- a/libcxx/include/__random/binomial_distribution.h
+++ b/libcxx/include/__random/binomial_distribution.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANDOM_BINOMIAL_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_BINOMIAL_DISTRIBUTION_H
+#ifndef _LIBCPP_RANDOM_BINOMIAL_DISTRIBUTION_H
+#define _LIBCPP_RANDOM_BINOMIAL_DISTRIBUTION_H
 
 #include <__config>
 #include <__random/is_valid.h>
@@ -208,4 +208,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_BINOMIAL_DISTRIBUTION_H
+#endif // _LIBCPP_RANDOM_BINOMIAL_DISTRIBUTION_H
diff --git a/libcxx/include/__random/cauchy_distribution.h b/libcxx/include/__random/cauchy_distribution.h
index 0ad887dd8d645..9f59260f40768 100644
--- a/libcxx/include/__random/cauchy_distribution.h
+++ b/libcxx/include/__random/cauchy_distribution.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANDOM_CAUCHY_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_CAUCHY_DISTRIBUTION_H
+#ifndef _LIBCPP_RANDOM_CAUCHY_DISTRIBUTION_H
+#define _LIBCPP_RANDOM_CAUCHY_DISTRIBUTION_H
 
 #include <__config>
 #include <__random/is_valid.h>
@@ -136,4 +136,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_CAUCHY_DISTRIBUTION_H
+#endif // _LIBCPP_RANDOM_CAUCHY_DISTRIBUTION_H
diff --git a/libcxx/include/__random/chi_squared_distribution.h b/libcxx/include/__random/chi_squared_distribution.h
index 4ce2c17c354c5..33f22a7a1e16d 100644
--- a/libcxx/include/__random/chi_squared_distribution.h
+++ b/libcxx/include/__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_RANDOM_CHI_SQUARED_DISTRIBUTION_H
+#define _LIBCPP_RANDOM_CHI_SQUARED_DISTRIBUTION_H
 
 #include <__config>
 #include <__random/gamma_distribution.h>
@@ -122,4 +122,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_CHI_SQUARED_DISTRIBUTION_H
+#endif // _LIBCPP_RANDOM_CHI_SQUARED_DISTRIBUTION_H
diff --git a/libcxx/include/__random/clamp_to_integral.h b/libcxx/include/__random/clamp_to_integral.h
index 9ddf41e0a39a2..a8fe9aeb5a9d5 100644
--- a/libcxx/include/__random/clamp_to_integral.h
+++ b/libcxx/include/__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_RANDOM_CLAMP_TO_INTEGRAL_H
+#define _LIBCPP_RANDOM_CLAMP_TO_INTEGRAL_H
 
 #include <__config>
 #include <cmath>
@@ -56,4 +56,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_CLAMP_TO_INTEGRAL_H
+#endif // _LIBCPP_RANDOM_CLAMP_TO_INTEGRAL_H
diff --git a/libcxx/include/__random/default_random_engine.h b/libcxx/include/__random/default_random_engine.h
index 89792f4f0d43e..ff41b55885d3f 100644
--- a/libcxx/include/__random/default_random_engine.h
+++ b/libcxx/include/__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_RANDOM_DEFAULT_RANDOM_ENGINE_H
+#define _LIBCPP_RANDOM_DEFAULT_RANDOM_ENGINE_H
 
 #include <__config>
 #include <__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_RANDOM_DEFAULT_RANDOM_ENGINE_H
diff --git a/libcxx/include/__random/discard_block_engine.h b/libcxx/include/__random/discard_block_engine.h
index 12d1ff318ccd2..9bd59b55fba15 100644
--- a/libcxx/include/__random/discard_block_engine.h
+++ b/libcxx/include/__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_RANDOM_DISCARD_BLOCK_ENGINE_H
+#define _LIBCPP_RANDOM_DISCARD_BLOCK_ENGINE_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -163,4 +163,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_DISCARD_BLOCK_ENGINE_H
+#endif // _LIBCPP_RANDOM_DISCARD_BLOCK_ENGINE_H
diff --git a/libcxx/include/__random/discrete_distribution.h b/libcxx/include/__random/discrete_distribution.h
index 528de4245ef51..c852760c68c9f 100644
--- a/libcxx/include/__random/discrete_distribution.h
+++ b/libcxx/include/__random/discrete_distribution.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANDOM_DISCRETE_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_DISCRETE_DISTRIBUTION_H
+#ifndef _LIBCPP_RANDOM_DISCRETE_DISTRIBUTION_H
+#define _LIBCPP_RANDOM_DISCRETE_DISTRIBUTION_H
 
 #include <__algorithm/upper_bound.h>
 #include <__config>
@@ -209,4 +209,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_DISCRETE_DISTRIBUTION_H
+#endif // _LIBCPP_RANDOM_DISCRETE_DISTRIBUTION_H
diff --git a/libcxx/include/__random/exponential_distribution.h b/libcxx/include/__random/exponential_distribution.h
index a5ce6ce332f9f..1e3c361348c18 100644
--- a/libcxx/include/__random/exponential_distribution.h
+++ b/libcxx/include/__random/exponential_distribution.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANDOM_EXPONENTIAL_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_EXPONENTIAL_DISTRIBUTION_H
+#ifndef _LIBCPP_RANDOM_EXPONENTIAL_DISTRIBUTION_H
+#define _LIBCPP_RANDOM_EXPONENTIAL_DISTRIBUTION_H
 
 #include <__config>
 #include <__random/generate_canonical.h>
@@ -129,4 +129,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_EXPONENTIAL_DISTRIBUTION_H
+#endif // _LIBCPP_RANDOM_EXPONENTIAL_DISTRIBUTION_H
diff --git a/libcxx/include/__random/extreme_value_distribution.h b/libcxx/include/__random/extreme_value_distribution.h
index 26d4bc67c2b60..9bfe896422c1e 100644
--- a/libcxx/include/__random/extreme_value_distribution.h
+++ b/libcxx/include/__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_RANDOM_EXTREME_VALUE_DISTRIBUTION_H
+#define _LIBCPP_RANDOM_EXTREME_VALUE_DISTRIBUTION_H
 
 #include <__config>
 #include <__random/is_valid.h>
@@ -136,4 +136,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_EXTREME_VALUE_DISTRIBUTION_H
+#endif // _LIBCPP_RANDOM_EXTREME_VALUE_DISTRIBUTION_H
diff --git a/libcxx/include/__random/fisher_f_distribution.h b/libcxx/include/__random/fisher_f_distribution.h
index 84362fd0b4414..ebcdfd4df46b5 100644
--- a/libcxx/include/__random/fisher_f_distribution.h
+++ b/libcxx/include/__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_RANDOM_FISHER_F_DISTRIBUTION_H
+#define _LIBCPP_RANDOM_FISHER_F_DISTRIBUTION_H
 
 #include <__config>
 #include <__random/gamma_distribution.h>
@@ -135,4 +135,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_FISHER_F_DISTRIBUTION_H
+#endif // _LIBCPP_RANDOM_FISHER_F_DISTRIBUTION_H
diff --git a/libcxx/include/__random/gamma_distribution.h b/libcxx/include/__random/gamma_distribution.h
index 10a6cb8a8eb2c..f1c7107e57c88 100644
--- a/libcxx/include/__random/gamma_distribution.h
+++ b/libcxx/include/__random/gamma_distribution.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANDOM_GAMMA_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_GAMMA_DISTRIBUTION_H
+#ifndef _LIBCPP_RANDOM_GAMMA_DISTRIBUTION_H
+#define _LIBCPP_RANDOM_GAMMA_DISTRIBUTION_H
 
 #include <__config>
 #include <__random/exponential_distribution.h>
@@ -178,4 +178,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_GAMMA_DISTRIBUTION_H
+#endif // _LIBCPP_RANDOM_GAMMA_DISTRIBUTION_H
diff --git a/libcxx/include/__random/generate_canonical.h b/libcxx/include/__random/generate_canonical.h
index 738de1517e286..3194bf7447758 100644
--- a/libcxx/include/__random/generate_canonical.h
+++ b/libcxx/include/__random/generate_canonical.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANDOM_GENERATE_CANONICAL_H
-#define _LIBCPP___RANDOM_GENERATE_CANONICAL_H
+#ifndef _LIBCPP_RANDOM_GENERATE_CANONICAL_H
+#define _LIBCPP_RANDOM_GENERATE_CANONICAL_H
 
 #include <__config>
 #include <__random/log2.h>
@@ -48,4 +48,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_GENERATE_CANONICAL_H
+#endif // _LIBCPP_RANDOM_GENERATE_CANONICAL_H
diff --git a/libcxx/include/__random/geometric_distribution.h b/libcxx/include/__random/geometric_distribution.h
index c04ec2acb5607..3a763fdafaa43 100644
--- a/libcxx/include/__random/geometric_distribution.h
+++ b/libcxx/include/__random/geometric_distribution.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANDOM_GEOMETRIC_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_GEOMETRIC_DISTRIBUTION_H
+#ifndef _LIBCPP_RANDOM_GEOMETRIC_DISTRIBUTION_H
+#define _LIBCPP_RANDOM_GEOMETRIC_DISTRIBUTION_H
 
 #include <__config>
 #include <__random/is_valid.h>
@@ -117,4 +117,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_GEOMETRIC_DISTRIBUTION_H
+#endif // _LIBCPP_RANDOM_GEOMETRIC_DISTRIBUTION_H
diff --git a/libcxx/include/__random/independent_bits_engine.h b/libcxx/include/__random/independent_bits_engine.h
index 7484857049414..18329ddc9e383 100644
--- a/libcxx/include/__random/independent_bits_engine.h
+++ b/libcxx/include/__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_RANDOM_INDEPENDENT_BITS_ENGINE_H
+#define _LIBCPP_RANDOM_INDEPENDENT_BITS_ENGINE_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -202,4 +202,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_INDEPENDENT_BITS_ENGINE_H
+#endif // _LIBCPP_RANDOM_INDEPENDENT_BITS_ENGINE_H
diff --git a/libcxx/include/__random/is_seed_sequence.h b/libcxx/include/__random/is_seed_sequence.h
index c7171cff2eda0..2b4961c872f48 100644
--- a/libcxx/include/__random/is_seed_sequence.h
+++ b/libcxx/include/__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_RANDOM_IS_SEED_SEQUENCE_H
+#define _LIBCPP_RANDOM_IS_SEED_SEQUENCE_H
 
 #include <__config>
 #include <__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_RANDOM_IS_SEED_SEQUENCE_H
diff --git a/libcxx/include/__random/is_valid.h b/libcxx/include/__random/is_valid.h
index f6679b3fdc427..778854c5a5b62 100644
--- a/libcxx/include/__random/is_valid.h
+++ b/libcxx/include/__random/is_valid.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANDOM_IS_VALID_H
-#define _LIBCPP___RANDOM_IS_VALID_H
+#ifndef _LIBCPP_RANDOM_IS_VALID_H
+#define _LIBCPP_RANDOM_IS_VALID_H
 
 #include <__config>
 #include <__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_RANDOM_IS_VALID_H
diff --git a/libcxx/include/__random/knuth_b.h b/libcxx/include/__random/knuth_b.h
index f5b31cb64fa4a..a39365230f072 100644
--- a/libcxx/include/__random/knuth_b.h
+++ b/libcxx/include/__random/knuth_b.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANDOM_KNUTH_B_H
-#define _LIBCPP___RANDOM_KNUTH_B_H
+#ifndef _LIBCPP_RANDOM_KNUTH_B_H
+#define _LIBCPP_RANDOM_KNUTH_B_H
 
 #include <__config>
 #include <__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_RANDOM_KNUTH_B_H
diff --git a/libcxx/include/__random/linear_congruential_engine.h b/libcxx/include/__random/linear_congruential_engine.h
index f74129d9b8ffe..748bd96657ca8 100644
--- a/libcxx/include/__random/linear_congruential_engine.h
+++ b/libcxx/include/__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_RANDOM_LINEAR_CONGRUENTIAL_ENGINE_H
+#define _LIBCPP_RANDOM_LINEAR_CONGRUENTIAL_ENGINE_H
 
 #include <__config>
 #include <__random/is_seed_sequence.h>
@@ -368,4 +368,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_LINEAR_CONGRUENTIAL_ENGINE_H
+#endif // _LIBCPP_RANDOM_LINEAR_CONGRUENTIAL_ENGINE_H
diff --git a/libcxx/include/__random/log2.h b/libcxx/include/__random/log2.h
index fbf35bab91728..796f7f48dae18 100644
--- a/libcxx/include/__random/log2.h
+++ b/libcxx/include/__random/log2.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANDOM_LOG2_H
-#define _LIBCPP___RANDOM_LOG2_H
+#ifndef _LIBCPP_RANDOM_LOG2_H
+#define _LIBCPP_RANDOM_LOG2_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -63,4 +63,4 @@ struct __log2 {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___RANDOM_LOG2_H
+#endif // _LIBCPP_RANDOM_LOG2_H
diff --git a/libcxx/include/__random/lognormal_distribution.h b/libcxx/include/__random/lognormal_distribution.h
index e6ca5b4612a2d..2e5ed7651775a 100644
--- a/libcxx/include/__random/lognormal_distribution.h
+++ b/libcxx/include/__random/lognormal_distribution.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANDOM_LOGNORMAL_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_LOGNORMAL_DISTRIBUTION_H
+#ifndef _LIBCPP_RANDOM_LOGNORMAL_DISTRIBUTION_H
+#define _LIBCPP_RANDOM_LOGNORMAL_DISTRIBUTION_H
 
 #include <__config>
 #include <__random/is_valid.h>
@@ -123,4 +123,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_LOGNORMAL_DISTRIBUTION_H
+#endif // _LIBCPP_RANDOM_LOGNORMAL_DISTRIBUTION_H
diff --git a/libcxx/include/__random/mersenne_twister_engine.h b/libcxx/include/__random/mersenne_twister_engine.h
index c60fe1529bf57..2409a392140b1 100644
--- a/libcxx/include/__random/mersenne_twister_engine.h
+++ b/libcxx/include/__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_RANDOM_MERSENNE_TWISTER_ENGINE_H
+#define _LIBCPP_RANDOM_MERSENNE_TWISTER_ENGINE_H
 
 #include <__algorithm/equal.h>
 #include <__algorithm/min.h>
@@ -589,4 +589,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_MERSENNE_TWISTER_ENGINE_H
+#endif // _LIBCPP_RANDOM_MERSENNE_TWISTER_ENGINE_H
diff --git a/libcxx/include/__random/negative_binomial_distribution.h b/libcxx/include/__random/negative_binomial_distribution.h
index 610a02445a1bc..84c9f6ec837af 100644
--- a/libcxx/include/__random/negative_binomial_distribution.h
+++ b/libcxx/include/__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_RANDOM_NEGATIVE_BINOMIAL_DISTRIBUTION_H
+#define _LIBCPP_RANDOM_NEGATIVE_BINOMIAL_DISTRIBUTION_H
 
 #include <__assert>
 #include <__config>
@@ -154,4 +154,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_NEGATIVE_BINOMIAL_DISTRIBUTION_H
+#endif // _LIBCPP_RANDOM_NEGATIVE_BINOMIAL_DISTRIBUTION_H
diff --git a/libcxx/include/__random/normal_distribution.h b/libcxx/include/__random/normal_distribution.h
index a735d8307a3e0..02b89320f9516 100644
--- a/libcxx/include/__random/normal_distribution.h
+++ b/libcxx/include/__random/normal_distribution.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANDOM_NORMAL_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_NORMAL_DISTRIBUTION_H
+#ifndef _LIBCPP_RANDOM_NORMAL_DISTRIBUTION_H
+#define _LIBCPP_RANDOM_NORMAL_DISTRIBUTION_H
 
 #include <__config>
 #include <__random/is_valid.h>
@@ -173,4 +173,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_NORMAL_DISTRIBUTION_H
+#endif // _LIBCPP_RANDOM_NORMAL_DISTRIBUTION_H
diff --git a/libcxx/include/__random/piecewise_constant_distribution.h b/libcxx/include/__random/piecewise_constant_distribution.h
index c5bfa8dc3a4be..6c71a4c4daae2 100644
--- a/libcxx/include/__random/piecewise_constant_distribution.h
+++ b/libcxx/include/__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_RANDOM_PIECEWISE_CONSTANT_DISTRIBUTION_H
+#define _LIBCPP_RANDOM_PIECEWISE_CONSTANT_DISTRIBUTION_H
 
 #include <__algorithm/upper_bound.h>
 #include <__config>
@@ -301,4 +301,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_PIECEWISE_CONSTANT_DISTRIBUTION_H
+#endif // _LIBCPP_RANDOM_PIECEWISE_CONSTANT_DISTRIBUTION_H
diff --git a/libcxx/include/__random/piecewise_linear_distribution.h b/libcxx/include/__random/piecewise_linear_distribution.h
index a9906430c005c..34a236e5a9dce 100644
--- a/libcxx/include/__random/piecewise_linear_distribution.h
+++ b/libcxx/include/__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_RANDOM_PIECEWISE_LINEAR_DISTRIBUTION_H
+#define _LIBCPP_RANDOM_PIECEWISE_LINEAR_DISTRIBUTION_H
 
 #include <__algorithm/upper_bound.h>
 #include <__config>
@@ -315,4 +315,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_PIECEWISE_LINEAR_DISTRIBUTION_H
+#endif // _LIBCPP_RANDOM_PIECEWISE_LINEAR_DISTRIBUTION_H
diff --git a/libcxx/include/__random/poisson_distribution.h b/libcxx/include/__random/poisson_distribution.h
index 85398c751b453..bd4f1038a85d1 100644
--- a/libcxx/include/__random/poisson_distribution.h
+++ b/libcxx/include/__random/poisson_distribution.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANDOM_POISSON_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_POISSON_DISTRIBUTION_H
+#ifndef _LIBCPP_RANDOM_POISSON_DISTRIBUTION_H
+#define _LIBCPP_RANDOM_POISSON_DISTRIBUTION_H
 
 #include <__config>
 #include <__random/clamp_to_integral.h>
@@ -238,4 +238,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_POISSON_DISTRIBUTION_H
+#endif // _LIBCPP_RANDOM_POISSON_DISTRIBUTION_H
diff --git a/libcxx/include/__random/random_device.h b/libcxx/include/__random/random_device.h
index 33ec585cc0efb..2c548685aee5e 100644
--- a/libcxx/include/__random/random_device.h
+++ b/libcxx/include/__random/random_device.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANDOM_RANDOM_DEVICE_H
-#define _LIBCPP___RANDOM_RANDOM_DEVICE_H
+#ifndef _LIBCPP_RANDOM_RANDOM_DEVICE_H
+#define _LIBCPP_RANDOM_RANDOM_DEVICE_H
 
 #include <__config>
 #include <string>
@@ -78,4 +78,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_RANDOM_DEVICE_H
+#endif // _LIBCPP_RANDOM_RANDOM_DEVICE_H
diff --git a/libcxx/include/__random/ranlux.h b/libcxx/include/__random/ranlux.h
index 952afde91b109..1583c1360d67f 100644
--- a/libcxx/include/__random/ranlux.h
+++ b/libcxx/include/__random/ranlux.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANDOM_RANLUX_H
-#define _LIBCPP___RANDOM_RANLUX_H
+#ifndef _LIBCPP_RANDOM_RANLUX_H
+#define _LIBCPP_RANDOM_RANLUX_H
 
 #include <__config>
 #include <__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_RANDOM_RANLUX_H
diff --git a/libcxx/include/__random/seed_seq.h b/libcxx/include/__random/seed_seq.h
index b1ccc8329b8f9..a3c5318188d70 100644
--- a/libcxx/include/__random/seed_seq.h
+++ b/libcxx/include/__random/seed_seq.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANDOM_SEED_SEQ_H
-#define _LIBCPP___RANDOM_SEED_SEQ_H
+#ifndef _LIBCPP_RANDOM_SEED_SEQ_H
+#define _LIBCPP_RANDOM_SEED_SEQ_H
 
 #include <__algorithm/copy.h>
 #include <__algorithm/fill.h>
@@ -165,4 +165,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_SEED_SEQ_H
+#endif // _LIBCPP_RANDOM_SEED_SEQ_H
diff --git a/libcxx/include/__random/shuffle_order_engine.h b/libcxx/include/__random/shuffle_order_engine.h
index 64d73033a1609..973c36a57a410 100644
--- a/libcxx/include/__random/shuffle_order_engine.h
+++ b/libcxx/include/__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_RANDOM_SHUFFLE_ORDER_ENGINE_H
+#define _LIBCPP_RANDOM_SHUFFLE_ORDER_ENGINE_H
 
 #include <__algorithm/equal.h>
 #include <__config>
@@ -224,4 +224,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_SHUFFLE_ORDER_ENGINE_H
+#endif // _LIBCPP_RANDOM_SHUFFLE_ORDER_ENGINE_H
diff --git a/libcxx/include/__random/student_t_distribution.h b/libcxx/include/__random/student_t_distribution.h
index dc199506862b8..8d4b40c90fcbc 100644
--- a/libcxx/include/__random/student_t_distribution.h
+++ b/libcxx/include/__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_RANDOM_STUDENT_T_DISTRIBUTION_H
+#define _LIBCPP_RANDOM_STUDENT_T_DISTRIBUTION_H
 
 #include <__config>
 #include <__random/gamma_distribution.h>
@@ -129,4 +129,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_STUDENT_T_DISTRIBUTION_H
+#endif // _LIBCPP_RANDOM_STUDENT_T_DISTRIBUTION_H
diff --git a/libcxx/include/__random/subtract_with_carry_engine.h b/libcxx/include/__random/subtract_with_carry_engine.h
index c2b17cc889769..6eed0e79aa2ad 100644
--- a/libcxx/include/__random/subtract_with_carry_engine.h
+++ b/libcxx/include/__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_RANDOM_SUBTRACT_WITH_CARRY_ENGINE_H
+#define _LIBCPP_RANDOM_SUBTRACT_WITH_CARRY_ENGINE_H
 
 #include <__algorithm/equal.h>
 #include <__algorithm/min.h>
@@ -261,4 +261,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_SUBTRACT_WITH_CARRY_ENGINE_H
+#endif // _LIBCPP_RANDOM_SUBTRACT_WITH_CARRY_ENGINE_H
diff --git a/libcxx/include/__random/uniform_int_distribution.h b/libcxx/include/__random/uniform_int_distribution.h
index fa2c33755b739..36cbcbb953a8b 100644
--- a/libcxx/include/__random/uniform_int_distribution.h
+++ b/libcxx/include/__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_RANDOM_UNIFORM_INT_DISTRIBUTION_H
+#define _LIBCPP_RANDOM_UNIFORM_INT_DISTRIBUTION_H
 
 #include <__bit/countl.h>
 #include <__config>
@@ -261,4 +261,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_UNIFORM_INT_DISTRIBUTION_H
+#endif // _LIBCPP_RANDOM_UNIFORM_INT_DISTRIBUTION_H
diff --git a/libcxx/include/__random/uniform_random_bit_generator.h b/libcxx/include/__random/uniform_random_bit_generator.h
index 75ffc27f9fcd8..a9b7bd0c381ad 100644
--- a/libcxx/include/__random/uniform_random_bit_generator.h
+++ b/libcxx/include/__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_RANDOM_UNIFORM_RANDOM_BIT_GENERATOR_H
+#define _LIBCPP_RANDOM_UNIFORM_RANDOM_BIT_GENERATOR_H
 
 #include <__concepts/arithmetic.h>
 #include <__concepts/invocable.h>
@@ -41,4 +41,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_UNIFORM_RANDOM_BIT_GENERATOR_H
+#endif // _LIBCPP_RANDOM_UNIFORM_RANDOM_BIT_GENERATOR_H
diff --git a/libcxx/include/__random/uniform_real_distribution.h b/libcxx/include/__random/uniform_real_distribution.h
index 9407827b2a5d5..b0c6b271d9dd2 100644
--- a/libcxx/include/__random/uniform_real_distribution.h
+++ b/libcxx/include/__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_RANDOM_UNIFORM_REAL_DISTRIBUTION_H
+#define _LIBCPP_RANDOM_UNIFORM_REAL_DISTRIBUTION_H
 
 #include <__config>
 #include <__random/generate_canonical.h>
@@ -135,4 +135,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_UNIFORM_REAL_DISTRIBUTION_H
+#endif // _LIBCPP_RANDOM_UNIFORM_REAL_DISTRIBUTION_H
diff --git a/libcxx/include/__random/weibull_distribution.h b/libcxx/include/__random/weibull_distribution.h
index 1d65b09ca663f..9749c439edfbe 100644
--- a/libcxx/include/__random/weibull_distribution.h
+++ b/libcxx/include/__random/weibull_distribution.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANDOM_WEIBULL_DISTRIBUTION_H
-#define _LIBCPP___RANDOM_WEIBULL_DISTRIBUTION_H
+#ifndef _LIBCPP_RANDOM_WEIBULL_DISTRIBUTION_H
+#define _LIBCPP_RANDOM_WEIBULL_DISTRIBUTION_H
 
 #include <__config>
 #include <__random/exponential_distribution.h>
@@ -129,4 +129,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANDOM_WEIBULL_DISTRIBUTION_H
+#endif // _LIBCPP_RANDOM_WEIBULL_DISTRIBUTION_H
diff --git a/libcxx/include/__ranges/access.h b/libcxx/include/__ranges/access.h
index bbacef3eae6be..8e01293cea456 100644
--- a/libcxx/include/__ranges/access.h
+++ b/libcxx/include/__ranges/access.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_ACCESS_H
-#define _LIBCPP___RANGES_ACCESS_H
+#ifndef _LIBCPP_RANGES_ACCESS_H
+#define _LIBCPP_RANGES_ACCESS_H
 
 #include <__concepts/class_or_enum.h>
 #include <__config>
@@ -207,4 +207,4 @@ inline constexpr auto cend = __cend::__fn{};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___RANGES_ACCESS_H
+#endif // _LIBCPP_RANGES_ACCESS_H
diff --git a/libcxx/include/__ranges/all.h b/libcxx/include/__ranges/all.h
index 023cee6caa9a2..8a76ed12584f4 100644
--- a/libcxx/include/__ranges/all.h
+++ b/libcxx/include/__ranges/all.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_ALL_H
-#define _LIBCPP___RANGES_ALL_H
+#ifndef _LIBCPP_RANGES_ALL_H
+#define _LIBCPP_RANGES_ALL_H
 
 #include <__config>
 #include <__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_RANGES_ALL_H
diff --git a/libcxx/include/__ranges/as_rvalue_view.h b/libcxx/include/__ranges/as_rvalue_view.h
index 08acf3d7736c6..740b0b6f4fdf5 100644
--- a/libcxx/include/__ranges/as_rvalue_view.h
+++ b/libcxx/include/__ranges/as_rvalue_view.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_AS_RVALUE_H
-#define _LIBCPP___RANGES_AS_RVALUE_H
+#ifndef _LIBCPP_RANGES_AS_RVALUE_H
+#define _LIBCPP_RANGES_AS_RVALUE_H
 
 #include <__concepts/constructible.h>
 #include <__concepts/same_as.h>
@@ -139,4 +139,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_AS_RVALUE_H
+#endif // _LIBCPP_RANGES_AS_RVALUE_H
diff --git a/libcxx/include/__ranges/chunk_by_view.h b/libcxx/include/__ranges/chunk_by_view.h
index 71fee3a4f2d1e..796bdf0038574 100644
--- a/libcxx/include/__ranges/chunk_by_view.h
+++ b/libcxx/include/__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_RANGES_CHUNK_BY_VIEW_H
+#define _LIBCPP_RANGES_CHUNK_BY_VIEW_H
 
 #include <__algorithm/ranges_adjacent_find.h>
 #include <__assert>
@@ -232,4 +232,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_CHUNK_BY_VIEW_H
+#endif // _LIBCPP_RANGES_CHUNK_BY_VIEW_H
diff --git a/libcxx/include/__ranges/common_view.h b/libcxx/include/__ranges/common_view.h
index 133236dd1d78a..4e717db24003d 100644
--- a/libcxx/include/__ranges/common_view.h
+++ b/libcxx/include/__ranges/common_view.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_COMMON_VIEW_H
-#define _LIBCPP___RANGES_COMMON_VIEW_H
+#ifndef _LIBCPP_RANGES_COMMON_VIEW_H
+#define _LIBCPP_RANGES_COMMON_VIEW_H
 
 #include <__concepts/constructible.h>
 #include <__concepts/copyable.h>
@@ -139,4 +139,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_COMMON_VIEW_H
+#endif // _LIBCPP_RANGES_COMMON_VIEW_H
diff --git a/libcxx/include/__ranges/concepts.h b/libcxx/include/__ranges/concepts.h
index bf75fe8a6fef4..94af5ef4754d8 100644
--- a/libcxx/include/__ranges/concepts.h
+++ b/libcxx/include/__ranges/concepts.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_CONCEPTS_H
-#define _LIBCPP___RANGES_CONCEPTS_H
+#ifndef _LIBCPP_RANGES_CONCEPTS_H
+#define _LIBCPP_RANGES_CONCEPTS_H
 
 #include <__concepts/common_reference_with.h>
 #include <__concepts/constructible.h>
@@ -179,4 +179,4 @@ concept __concatable = requires {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___RANGES_CONCEPTS_H
+#endif // _LIBCPP_RANGES_CONCEPTS_H
diff --git a/libcxx/include/__ranges/container_compatible_range.h b/libcxx/include/__ranges/container_compatible_range.h
index a58f1119885e3..ca35f39edb225 100644
--- a/libcxx/include/__ranges/container_compatible_range.h
+++ b/libcxx/include/__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_RANGES_CONTAINER_COMPATIBLE_RANGE_H
+#define _LIBCPP_RANGES_CONTAINER_COMPATIBLE_RANGE_H
 
 #include <__concepts/convertible_to.h>
 #include <__config>
@@ -30,4 +30,4 @@ concept _ContainerCompatibleRange =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___RANGES_CONTAINER_COMPATIBLE_RANGE_H
+#endif // _LIBCPP_RANGES_CONTAINER_COMPATIBLE_RANGE_H
diff --git a/libcxx/include/__ranges/counted.h b/libcxx/include/__ranges/counted.h
index 65bf1a371ec78..ffbcaffc4dd8a 100644
--- a/libcxx/include/__ranges/counted.h
+++ b/libcxx/include/__ranges/counted.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_COUNTED_H
-#define _LIBCPP___RANGES_COUNTED_H
+#ifndef _LIBCPP_RANGES_COUNTED_H
+#define _LIBCPP_RANGES_COUNTED_H
 
 #include <__concepts/convertible_to.h>
 #include <__config>
@@ -86,4 +86,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_COUNTED_H
+#endif // _LIBCPP_RANGES_COUNTED_H
diff --git a/libcxx/include/__ranges/dangling.h b/libcxx/include/__ranges/dangling.h
index 613084d5fb9fc..505e38b620d1d 100644
--- a/libcxx/include/__ranges/dangling.h
+++ b/libcxx/include/__ranges/dangling.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_DANGLING_H
-#define _LIBCPP___RANGES_DANGLING_H
+#ifndef _LIBCPP_RANGES_DANGLING_H
+#define _LIBCPP_RANGES_DANGLING_H
 
 #include <__config>
 #include <__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_RANGES_DANGLING_H
diff --git a/libcxx/include/__ranges/data.h b/libcxx/include/__ranges/data.h
index 50db3cffeeed8..c2780a250032f 100644
--- a/libcxx/include/__ranges/data.h
+++ b/libcxx/include/__ranges/data.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_DATA_H
-#define _LIBCPP___RANGES_DATA_H
+#ifndef _LIBCPP_RANGES_DATA_H
+#define _LIBCPP_RANGES_DATA_H
 
 #include <__concepts/class_or_enum.h>
 #include <__config>
@@ -99,4 +99,4 @@ inline constexpr auto cdata = __cdata::__fn{};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___RANGES_DATA_H
+#endif // _LIBCPP_RANGES_DATA_H
diff --git a/libcxx/include/__ranges/drop_view.h b/libcxx/include/__ranges/drop_view.h
index 42ada9299a779..f0385eea6c208 100644
--- a/libcxx/include/__ranges/drop_view.h
+++ b/libcxx/include/__ranges/drop_view.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_DROP_VIEW_H
-#define _LIBCPP___RANGES_DROP_VIEW_H
+#ifndef _LIBCPP_RANGES_DROP_VIEW_H
+#define _LIBCPP_RANGES_DROP_VIEW_H
 
 #include <__algorithm/min.h>
 #include <__assert>
@@ -326,4 +326,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_DROP_VIEW_H
+#endif // _LIBCPP_RANGES_DROP_VIEW_H
diff --git a/libcxx/include/__ranges/drop_while_view.h b/libcxx/include/__ranges/drop_while_view.h
index bc7f019393a80..1853a506bb4c7 100644
--- a/libcxx/include/__ranges/drop_while_view.h
+++ b/libcxx/include/__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_RANGES_DROP_WHILE_VIEW_H
+#define _LIBCPP_RANGES_DROP_WHILE_VIEW_H
 
 #include <__algorithm/ranges_find_if_not.h>
 #include <__assert>
@@ -133,4 +133,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_DROP_WHILE_VIEW_H
+#endif // _LIBCPP_RANGES_DROP_WHILE_VIEW_H
diff --git a/libcxx/include/__ranges/elements_view.h b/libcxx/include/__ranges/elements_view.h
index b1419f2a1dd91..87e12970251bd 100644
--- a/libcxx/include/__ranges/elements_view.h
+++ b/libcxx/include/__ranges/elements_view.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_ELEMENTS_VIEW_H
-#define _LIBCPP___RANGES_ELEMENTS_VIEW_H
+#ifndef _LIBCPP_RANGES_ELEMENTS_VIEW_H
+#define _LIBCPP_RANGES_ELEMENTS_VIEW_H
 
 #include <__compare/three_way_comparable.h>
 #include <__concepts/constructible.h>
@@ -415,4 +415,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_ELEMENTS_VIEW_H
+#endif // _LIBCPP_RANGES_ELEMENTS_VIEW_H
diff --git a/libcxx/include/__ranges/empty.h b/libcxx/include/__ranges/empty.h
index 5c1004042aba5..b3124e0dc2dad 100644
--- a/libcxx/include/__ranges/empty.h
+++ b/libcxx/include/__ranges/empty.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_EMPTY_H
-#define _LIBCPP___RANGES_EMPTY_H
+#ifndef _LIBCPP_RANGES_EMPTY_H
+#define _LIBCPP_RANGES_EMPTY_H
 
 #include <__concepts/class_or_enum.h>
 #include <__config>
@@ -68,4 +68,4 @@ inline constexpr auto empty = __empty::__fn{};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___RANGES_EMPTY_H
+#endif // _LIBCPP_RANGES_EMPTY_H
diff --git a/libcxx/include/__ranges/empty_view.h b/libcxx/include/__ranges/empty_view.h
index fc08492110f53..e1bc65d28f200 100644
--- a/libcxx/include/__ranges/empty_view.h
+++ b/libcxx/include/__ranges/empty_view.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_EMPTY_VIEW_H
-#define _LIBCPP___RANGES_EMPTY_VIEW_H
+#ifndef _LIBCPP_RANGES_EMPTY_VIEW_H
+#define _LIBCPP_RANGES_EMPTY_VIEW_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -51,4 +51,4 @@ inline constexpr empty_view<_Tp> empty{};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___RANGES_EMPTY_VIEW_H
+#endif // _LIBCPP_RANGES_EMPTY_VIEW_H
diff --git a/libcxx/include/__ranges/enable_borrowed_range.h b/libcxx/include/__ranges/enable_borrowed_range.h
index 1d068335e20af..7945593e08486 100644
--- a/libcxx/include/__ranges/enable_borrowed_range.h
+++ b/libcxx/include/__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_RANGES_ENABLE_BORROWED_RANGE_H
+#define _LIBCPP_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_RANGES_ENABLE_BORROWED_RANGE_H
diff --git a/libcxx/include/__ranges/enable_view.h b/libcxx/include/__ranges/enable_view.h
index 6dee6ea3fa3d2..d9f96f6cc3dcf 100644
--- a/libcxx/include/__ranges/enable_view.h
+++ b/libcxx/include/__ranges/enable_view.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_ENABLE_VIEW_H
-#define _LIBCPP___RANGES_ENABLE_VIEW_H
+#ifndef _LIBCPP_RANGES_ENABLE_VIEW_H
+#define _LIBCPP_RANGES_ENABLE_VIEW_H
 
 #include <__concepts/derived_from.h>
 #include <__concepts/same_as.h>
@@ -47,4 +47,4 @@ inline constexpr bool enable_view = derived_from<_Tp, view_base> || requires {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___RANGES_ENABLE_VIEW_H
+#endif // _LIBCPP_RANGES_ENABLE_VIEW_H
diff --git a/libcxx/include/__ranges/filter_view.h b/libcxx/include/__ranges/filter_view.h
index 07980e7353190..59aeeb8c22e20 100644
--- a/libcxx/include/__ranges/filter_view.h
+++ b/libcxx/include/__ranges/filter_view.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_FILTER_VIEW_H
-#define _LIBCPP___RANGES_FILTER_VIEW_H
+#ifndef _LIBCPP_RANGES_FILTER_VIEW_H
+#define _LIBCPP_RANGES_FILTER_VIEW_H
 
 #include <__algorithm/ranges_find_if.h>
 #include <__assert>
@@ -257,4 +257,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_FILTER_VIEW_H
+#endif // _LIBCPP_RANGES_FILTER_VIEW_H
diff --git a/libcxx/include/__ranges/from_range.h b/libcxx/include/__ranges/from_range.h
index a6cb9e3d439eb..11fa0ff3e9b85 100644
--- a/libcxx/include/__ranges/from_range.h
+++ b/libcxx/include/__ranges/from_range.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_FROM_RANGE_H
-#define _LIBCPP___RANGES_FROM_RANGE_H
+#ifndef _LIBCPP_RANGES_FROM_RANGE_H
+#define _LIBCPP_RANGES_FROM_RANGE_H
 
 #include <__config>
 
@@ -30,4 +30,4 @@ inline constexpr from_range_t from_range{};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___RANGES_FROM_RANGE_H
+#endif // _LIBCPP_RANGES_FROM_RANGE_H
diff --git a/libcxx/include/__ranges/iota_view.h b/libcxx/include/__ranges/iota_view.h
index 22adc22e69190..3b872e0523b64 100644
--- a/libcxx/include/__ranges/iota_view.h
+++ b/libcxx/include/__ranges/iota_view.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_IOTA_VIEW_H
-#define _LIBCPP___RANGES_IOTA_VIEW_H
+#ifndef _LIBCPP_RANGES_IOTA_VIEW_H
+#define _LIBCPP_RANGES_IOTA_VIEW_H
 
 #include <__assert>
 #include <__compare/three_way_comparable.h>
@@ -411,4 +411,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_IOTA_VIEW_H
+#endif // _LIBCPP_RANGES_IOTA_VIEW_H
diff --git a/libcxx/include/__ranges/istream_view.h b/libcxx/include/__ranges/istream_view.h
index ab05cb6ef1fe3..52cf10e15bf3d 100644
--- a/libcxx/include/__ranges/istream_view.h
+++ b/libcxx/include/__ranges/istream_view.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_ISTREAM_VIEW_H
-#define _LIBCPP___RANGES_ISTREAM_VIEW_H
+#ifndef _LIBCPP_RANGES_ISTREAM_VIEW_H
+#define _LIBCPP_RANGES_ISTREAM_VIEW_H
 
 #include <__concepts/constructible.h>
 #include <__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_RANGES_ISTREAM_VIEW_H
diff --git a/libcxx/include/__ranges/join_view.h b/libcxx/include/__ranges/join_view.h
index 364f056d8d2cf..49716e045e866 100644
--- a/libcxx/include/__ranges/join_view.h
+++ b/libcxx/include/__ranges/join_view.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_JOIN_VIEW_H
-#define _LIBCPP___RANGES_JOIN_VIEW_H
+#ifndef _LIBCPP_RANGES_JOIN_VIEW_H
+#define _LIBCPP_RANGES_JOIN_VIEW_H
 
 #include <__concepts/constructible.h>
 #include <__concepts/convertible_to.h>
@@ -426,4 +426,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_JOIN_VIEW_H
+#endif // _LIBCPP_RANGES_JOIN_VIEW_H
diff --git a/libcxx/include/__ranges/join_with_view.h b/libcxx/include/__ranges/join_with_view.h
index 8ed989a664687..11d33513677db 100644
--- a/libcxx/include/__ranges/join_with_view.h
+++ b/libcxx/include/__ranges/join_with_view.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_JOIN_WITH_VIEW_H
-#define _LIBCPP___RANGES_JOIN_WITH_VIEW_H
+#ifndef _LIBCPP_RANGES_JOIN_WITH_VIEW_H
+#define _LIBCPP_RANGES_JOIN_WITH_VIEW_H
 
 #include <__concepts/common_reference_with.h>
 #include <__concepts/common_with.h>
@@ -457,4 +457,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_JOIN_WITH_VIEW_H
+#endif // _LIBCPP_RANGES_JOIN_WITH_VIEW_H
diff --git a/libcxx/include/__ranges/lazy_split_view.h b/libcxx/include/__ranges/lazy_split_view.h
index cca9191d26818..39b1667e5094c 100644
--- a/libcxx/include/__ranges/lazy_split_view.h
+++ b/libcxx/include/__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_RANGES_LAZY_SPLIT_VIEW_H
+#define _LIBCPP_RANGES_LAZY_SPLIT_VIEW_H
 
 #include <__algorithm/ranges_find.h>
 #include <__algorithm/ranges_mismatch.h>
@@ -439,4 +439,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_LAZY_SPLIT_VIEW_H
+#endif // _LIBCPP_RANGES_LAZY_SPLIT_VIEW_H
diff --git a/libcxx/include/__ranges/movable_box.h b/libcxx/include/__ranges/movable_box.h
index 5a456cc3a1b66..0c32aad26c64f 100644
--- a/libcxx/include/__ranges/movable_box.h
+++ b/libcxx/include/__ranges/movable_box.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_MOVABLE_BOX_H
-#define _LIBCPP___RANGES_MOVABLE_BOX_H
+#ifndef _LIBCPP_RANGES_MOVABLE_BOX_H
+#define _LIBCPP_RANGES_MOVABLE_BOX_H
 
 #include <__concepts/constructible.h>
 #include <__concepts/copyable.h>
@@ -244,4 +244,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_MOVABLE_BOX_H
+#endif // _LIBCPP_RANGES_MOVABLE_BOX_H
diff --git a/libcxx/include/__ranges/non_propagating_cache.h b/libcxx/include/__ranges/non_propagating_cache.h
index beae13a98e9e3..a706f4e124b0c 100644
--- a/libcxx/include/__ranges/non_propagating_cache.h
+++ b/libcxx/include/__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_RANGES_NON_PROPAGATING_CACHE_H
+#define _LIBCPP_RANGES_NON_PROPAGATING_CACHE_H
 
 #include <__config>
 #include <__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_RANGES_NON_PROPAGATING_CACHE_H
diff --git a/libcxx/include/__ranges/owning_view.h b/libcxx/include/__ranges/owning_view.h
index 254bdb4329119..c18d846e116d5 100644
--- a/libcxx/include/__ranges/owning_view.h
+++ b/libcxx/include/__ranges/owning_view.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_OWNING_VIEW_H
-#define _LIBCPP___RANGES_OWNING_VIEW_H
+#ifndef _LIBCPP_RANGES_OWNING_VIEW_H
+#define _LIBCPP_RANGES_OWNING_VIEW_H
 
 #include <__concepts/constructible.h>
 #include <__concepts/movable.h>
@@ -113,4 +113,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_OWNING_VIEW_H
+#endif // _LIBCPP_RANGES_OWNING_VIEW_H
diff --git a/libcxx/include/__ranges/range_adaptor.h b/libcxx/include/__ranges/range_adaptor.h
index 4bcb53e1a5846..f2b17e1f013c6 100644
--- a/libcxx/include/__ranges/range_adaptor.h
+++ b/libcxx/include/__ranges/range_adaptor.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_RANGE_ADAPTOR_H
-#define _LIBCPP___RANGES_RANGE_ADAPTOR_H
+#ifndef _LIBCPP_RANGES_RANGE_ADAPTOR_H
+#define _LIBCPP_RANGES_RANGE_ADAPTOR_H
 
 #include <__concepts/constructible.h>
 #include <__concepts/derived_from.h>
@@ -96,4 +96,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_RANGE_ADAPTOR_H
+#endif // _LIBCPP_RANGES_RANGE_ADAPTOR_H
diff --git a/libcxx/include/__ranges/rbegin.h b/libcxx/include/__ranges/rbegin.h
index 12e739e1a2b85..f58899daaa031 100644
--- a/libcxx/include/__ranges/rbegin.h
+++ b/libcxx/include/__ranges/rbegin.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_RBEGIN_H
-#define _LIBCPP___RANGES_RBEGIN_H
+#ifndef _LIBCPP_RANGES_RBEGIN_H
+#define _LIBCPP_RANGES_RBEGIN_H
 
 #include <__concepts/class_or_enum.h>
 #include <__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_RANGES_RBEGIN_H
diff --git a/libcxx/include/__ranges/ref_view.h b/libcxx/include/__ranges/ref_view.h
index 5329d778dd30d..a7160ecb2b415 100644
--- a/libcxx/include/__ranges/ref_view.h
+++ b/libcxx/include/__ranges/ref_view.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_REF_VIEW_H
-#define _LIBCPP___RANGES_REF_VIEW_H
+#ifndef _LIBCPP_RANGES_REF_VIEW_H
+#define _LIBCPP_RANGES_REF_VIEW_H
 
 #include <__concepts/convertible_to.h>
 #include <__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_RANGES_REF_VIEW_H
diff --git a/libcxx/include/__ranges/rend.h b/libcxx/include/__ranges/rend.h
index 02b4c5999a7eb..9cc2f40c74f4f 100644
--- a/libcxx/include/__ranges/rend.h
+++ b/libcxx/include/__ranges/rend.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_REND_H
-#define _LIBCPP___RANGES_REND_H
+#ifndef _LIBCPP_RANGES_REND_H
+#define _LIBCPP_RANGES_REND_H
 
 #include <__concepts/class_or_enum.h>
 #include <__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_RANGES_REND_H
diff --git a/libcxx/include/__ranges/repeat_view.h b/libcxx/include/__ranges/repeat_view.h
index 56b09701c8090..f22b4801455f7 100644
--- a/libcxx/include/__ranges/repeat_view.h
+++ b/libcxx/include/__ranges/repeat_view.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_REPEAT_VIEW_H
-#define _LIBCPP___RANGES_REPEAT_VIEW_H
+#ifndef _LIBCPP_RANGES_REPEAT_VIEW_H
+#define _LIBCPP_RANGES_REPEAT_VIEW_H
 
 #include <__assert>
 #include <__concepts/constructible.h>
@@ -264,4 +264,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_REPEAT_VIEW_H
+#endif // _LIBCPP_RANGES_REPEAT_VIEW_H
diff --git a/libcxx/include/__ranges/reverse_view.h b/libcxx/include/__ranges/reverse_view.h
index c36ba77dd8f6d..89f5d8c63e4d8 100644
--- a/libcxx/include/__ranges/reverse_view.h
+++ b/libcxx/include/__ranges/reverse_view.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_REVERSE_VIEW_H
-#define _LIBCPP___RANGES_REVERSE_VIEW_H
+#ifndef _LIBCPP_RANGES_REVERSE_VIEW_H
+#define _LIBCPP_RANGES_REVERSE_VIEW_H
 
 #include <__concepts/constructible.h>
 #include <__config>
@@ -201,4 +201,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_REVERSE_VIEW_H
+#endif // _LIBCPP_RANGES_REVERSE_VIEW_H
diff --git a/libcxx/include/__ranges/single_view.h b/libcxx/include/__ranges/single_view.h
index 955578b99cf58..a32a4e6f61001 100644
--- a/libcxx/include/__ranges/single_view.h
+++ b/libcxx/include/__ranges/single_view.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_SINGLE_VIEW_H
-#define _LIBCPP___RANGES_SINGLE_VIEW_H
+#ifndef _LIBCPP_RANGES_SINGLE_VIEW_H
+#define _LIBCPP_RANGES_SINGLE_VIEW_H
 
 #include <__concepts/constructible.h>
 #include <__config>
@@ -109,4 +109,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_SINGLE_VIEW_H
+#endif // _LIBCPP_RANGES_SINGLE_VIEW_H
diff --git a/libcxx/include/__ranges/size.h b/libcxx/include/__ranges/size.h
index 5da3a6ff268e8..1e62448582013 100644
--- a/libcxx/include/__ranges/size.h
+++ b/libcxx/include/__ranges/size.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_SIZE_H
-#define _LIBCPP___RANGES_SIZE_H
+#ifndef _LIBCPP_RANGES_SIZE_H
+#define _LIBCPP_RANGES_SIZE_H
 
 #include <__concepts/arithmetic.h>
 #include <__concepts/class_or_enum.h>
@@ -135,4 +135,4 @@ inline constexpr auto ssize = __ssize::__fn{};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___RANGES_SIZE_H
+#endif // _LIBCPP_RANGES_SIZE_H
diff --git a/libcxx/include/__ranges/split_view.h b/libcxx/include/__ranges/split_view.h
index 2ec908ba4070e..78aab07e56506 100644
--- a/libcxx/include/__ranges/split_view.h
+++ b/libcxx/include/__ranges/split_view.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_SPLIT_VIEW_H
-#define _LIBCPP___RANGES_SPLIT_VIEW_H
+#ifndef _LIBCPP_RANGES_SPLIT_VIEW_H
+#define _LIBCPP_RANGES_SPLIT_VIEW_H
 
 #include <__algorithm/ranges_search.h>
 #include <__concepts/constructible.h>
@@ -229,4 +229,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_SPLIT_VIEW_H
+#endif // _LIBCPP_RANGES_SPLIT_VIEW_H
diff --git a/libcxx/include/__ranges/subrange.h b/libcxx/include/__ranges/subrange.h
index df8766216dbe2..2a4ef0a5468b4 100644
--- a/libcxx/include/__ranges/subrange.h
+++ b/libcxx/include/__ranges/subrange.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_SUBRANGE_H
-#define _LIBCPP___RANGES_SUBRANGE_H
+#ifndef _LIBCPP_RANGES_SUBRANGE_H
+#define _LIBCPP_RANGES_SUBRANGE_H
 
 #include <__assert>
 #include <__concepts/constructible.h>
@@ -271,4 +271,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_SUBRANGE_H
+#endif // _LIBCPP_RANGES_SUBRANGE_H
diff --git a/libcxx/include/__ranges/take_view.h b/libcxx/include/__ranges/take_view.h
index 85723dc5e36b6..a60a34cae2031 100644
--- a/libcxx/include/__ranges/take_view.h
+++ b/libcxx/include/__ranges/take_view.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_TAKE_VIEW_H
-#define _LIBCPP___RANGES_TAKE_VIEW_H
+#ifndef _LIBCPP_RANGES_TAKE_VIEW_H
+#define _LIBCPP_RANGES_TAKE_VIEW_H
 
 #include <__algorithm/min.h>
 #include <__algorithm/ranges_min.h>
@@ -365,4 +365,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_TAKE_VIEW_H
+#endif // _LIBCPP_RANGES_TAKE_VIEW_H
diff --git a/libcxx/include/__ranges/take_while_view.h b/libcxx/include/__ranges/take_while_view.h
index 4977f139fc555..ccac1517d6625 100644
--- a/libcxx/include/__ranges/take_while_view.h
+++ b/libcxx/include/__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_RANGES_TAKE_WHILE_VIEW_H
+#define _LIBCPP_RANGES_TAKE_WHILE_VIEW_H
 
 #include <__concepts/constructible.h>
 #include <__concepts/convertible_to.h>
@@ -167,4 +167,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_TAKE_WHILE_VIEW_H
+#endif // _LIBCPP_RANGES_TAKE_WHILE_VIEW_H
diff --git a/libcxx/include/__ranges/to.h b/libcxx/include/__ranges/to.h
index 3a2bc42969f7b..533b79844b10e 100644
--- a/libcxx/include/__ranges/to.h
+++ b/libcxx/include/__ranges/to.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_TO_H
-#define _LIBCPP___RANGES_TO_H
+#ifndef _LIBCPP_RANGES_TO_H
+#define _LIBCPP_RANGES_TO_H
 
 #include <__concepts/constructible.h>
 #include <__concepts/convertible_to.h>
@@ -245,4 +245,4 @@ template <template <class...> class _Container, class... _Args>
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___RANGES_TO_H
+#endif // _LIBCPP_RANGES_TO_H
diff --git a/libcxx/include/__ranges/transform_view.h b/libcxx/include/__ranges/transform_view.h
index ab1adf9cdbe68..1af858c728205 100644
--- a/libcxx/include/__ranges/transform_view.h
+++ b/libcxx/include/__ranges/transform_view.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_TRANSFORM_VIEW_H
-#define _LIBCPP___RANGES_TRANSFORM_VIEW_H
+#ifndef _LIBCPP_RANGES_TRANSFORM_VIEW_H
+#define _LIBCPP_RANGES_TRANSFORM_VIEW_H
 
 #include <__compare/three_way_comparable.h>
 #include <__concepts/constructible.h>
@@ -416,4 +416,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_TRANSFORM_VIEW_H
+#endif // _LIBCPP_RANGES_TRANSFORM_VIEW_H
diff --git a/libcxx/include/__ranges/view_interface.h b/libcxx/include/__ranges/view_interface.h
index 3bcfbaf3a2f9e..eec2abe058d8d 100644
--- a/libcxx/include/__ranges/view_interface.h
+++ b/libcxx/include/__ranges/view_interface.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_VIEW_INTERFACE_H
-#define _LIBCPP___RANGES_VIEW_INTERFACE_H
+#ifndef _LIBCPP_RANGES_VIEW_INTERFACE_H
+#define _LIBCPP_RANGES_VIEW_INTERFACE_H
 
 #include <__assert>
 #include <__concepts/derived_from.h>
@@ -167,4 +167,4 @@ class view_interface {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___RANGES_VIEW_INTERFACE_H
+#endif // _LIBCPP_RANGES_VIEW_INTERFACE_H
diff --git a/libcxx/include/__ranges/views.h b/libcxx/include/__ranges/views.h
index a4de2a5e52a9d..d1814c9f14943 100644
--- a/libcxx/include/__ranges/views.h
+++ b/libcxx/include/__ranges/views.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_VIEWS
-#define _LIBCPP___RANGES_VIEWS
+#ifndef _LIBCPP_RANGES_VIEWS
+#define _LIBCPP_RANGES_VIEWS
 
 #include <__config>
 
@@ -32,4 +32,4 @@ namespace views = ranges::views;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___RANGES_VIEWS
+#endif // _LIBCPP_RANGES_VIEWS
diff --git a/libcxx/include/__ranges/zip_transform_view.h b/libcxx/include/__ranges/zip_transform_view.h
index 07aa182f2858f..65ffa68110427 100644
--- a/libcxx/include/__ranges/zip_transform_view.h
+++ b/libcxx/include/__ranges/zip_transform_view.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_ZIP_TRANSFORM_VIEW_H
-#define _LIBCPP___RANGES_ZIP_TRANSFORM_VIEW_H
+#ifndef _LIBCPP_RANGES_ZIP_TRANSFORM_VIEW_H
+#define _LIBCPP_RANGES_ZIP_TRANSFORM_VIEW_H
 
 #include <__config>
 
@@ -354,4 +354,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_ZIP_TRANSFORM_VIEW_H
+#endif // _LIBCPP_RANGES_ZIP_TRANSFORM_VIEW_H
diff --git a/libcxx/include/__ranges/zip_view.h b/libcxx/include/__ranges/zip_view.h
index ce00c98710c4e..0f38aabbfa394 100644
--- a/libcxx/include/__ranges/zip_view.h
+++ b/libcxx/include/__ranges/zip_view.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___RANGES_ZIP_VIEW_H
-#define _LIBCPP___RANGES_ZIP_VIEW_H
+#ifndef _LIBCPP_RANGES_ZIP_VIEW_H
+#define _LIBCPP_RANGES_ZIP_VIEW_H
 
 #include <__config>
 
@@ -504,4 +504,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___RANGES_ZIP_VIEW_H
+#endif // _LIBCPP_RANGES_ZIP_VIEW_H
diff --git a/libcxx/include/__split_buffer b/libcxx/include/__split_buffer
index 15368a3bc8955..efd99075e9003 100644
--- a/libcxx/include/__split_buffer
+++ b/libcxx/include/__split_buffer
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___SPLIT_BUFFER
-#define _LIBCPP___SPLIT_BUFFER
+#ifndef _LIBCPP_SPLIT_BUFFER
+#define _LIBCPP_SPLIT_BUFFER
 
 #include <__algorithm/max.h>
 #include <__algorithm/move.h>
@@ -866,4 +866,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___SPLIT_BUFFER
+#endif // _LIBCPP_SPLIT_BUFFER
diff --git a/libcxx/include/__std_mbstate_t.h b/libcxx/include/__std_mbstate_t.h
index e79cc789fddf9..ef4b9c464edd0 100644
--- a/libcxx/include/__std_mbstate_t.h
+++ b/libcxx/include/__std_mbstate_t.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___STD_MBSTATE_T_H
-#define _LIBCPP___STD_MBSTATE_T_H
+#ifndef _LIBCPP_STD_MBSTATE_T_H
+#define _LIBCPP_STD_MBSTATE_T_H
 
 #include <__config>
 #include <__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_STD_MBSTATE_T_H
diff --git a/libcxx/include/__stop_token/atomic_unique_lock.h b/libcxx/include/__stop_token/atomic_unique_lock.h
index 4b0ae05ca86c8..a09a433e6512f 100644
--- a/libcxx/include/__stop_token/atomic_unique_lock.h
+++ b/libcxx/include/__stop_token/atomic_unique_lock.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___STOP_TOKEN_ATOMIC_UNIQUE_LOCK_H
-#define _LIBCPP___STOP_TOKEN_ATOMIC_UNIQUE_LOCK_H
+#ifndef _LIBCPP_STOP_TOKEN_ATOMIC_UNIQUE_LOCK_H
+#define _LIBCPP_STOP_TOKEN_ATOMIC_UNIQUE_LOCK_H
 
 #include <__bit/popcount.h>
 #include <__config>
@@ -137,4 +137,4 @@ class __atomic_unique_lock {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___STOP_TOKEN_ATOMIC_UNIQUE_LOCK_H
+#endif // _LIBCPP_STOP_TOKEN_ATOMIC_UNIQUE_LOCK_H
diff --git a/libcxx/include/__stop_token/intrusive_list_view.h b/libcxx/include/__stop_token/intrusive_list_view.h
index 11a3e267e7c6d..17be5e02a5d2c 100644
--- a/libcxx/include/__stop_token/intrusive_list_view.h
+++ b/libcxx/include/__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_STOP_TOKEN_INTRUSIVE_LIST_VIEW_H
+#define _LIBCPP_STOP_TOKEN_INTRUSIVE_LIST_VIEW_H
 
 #include <__assert>
 #include <__config>
@@ -82,4 +82,4 @@ struct __intrusive_list_view {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___STOP_TOKEN_INTRUSIVE_LIST_VIEW_H
+#endif // _LIBCPP_STOP_TOKEN_INTRUSIVE_LIST_VIEW_H
diff --git a/libcxx/include/__stop_token/intrusive_shared_ptr.h b/libcxx/include/__stop_token/intrusive_shared_ptr.h
index 0d5ffe0647166..c10c7d5d530d0 100644
--- a/libcxx/include/__stop_token/intrusive_shared_ptr.h
+++ b/libcxx/include/__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_STOP_TOKEN_INTRUSIVE_SHARED_PTR_H
+#define _LIBCPP_STOP_TOKEN_INTRUSIVE_SHARED_PTR_H
 
 #include <__atomic/atomic.h>
 #include <__atomic/memory_order.h>
@@ -132,4 +132,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___STOP_TOKEN_INTRUSIVE_SHARED_PTR_H
+#endif // _LIBCPP_STOP_TOKEN_INTRUSIVE_SHARED_PTR_H
diff --git a/libcxx/include/__stop_token/stop_callback.h b/libcxx/include/__stop_token/stop_callback.h
index 76d438e096c03..8e0b3570f24a5 100644
--- a/libcxx/include/__stop_token/stop_callback.h
+++ b/libcxx/include/__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_STOP_TOKEN_STOP_CALLBACK_H
+#define _LIBCPP_STOP_TOKEN_STOP_CALLBACK_H
 
 #include <__concepts/constructible.h>
 #include <__concepts/destructible.h>
@@ -99,4 +99,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___STOP_TOKEN_STOP_CALLBACK_H
+#endif // _LIBCPP_STOP_TOKEN_STOP_CALLBACK_H
diff --git a/libcxx/include/__stop_token/stop_source.h b/libcxx/include/__stop_token/stop_source.h
index aea9429388847..eb836764e63d4 100644
--- a/libcxx/include/__stop_token/stop_source.h
+++ b/libcxx/include/__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_STOP_TOKEN_STOP_SOURCE_H
+#define _LIBCPP_STOP_TOKEN_STOP_SOURCE_H
 
 #include <__config>
 #include <__stop_token/intrusive_shared_ptr.h>
@@ -88,4 +88,4 @@ class stop_source {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___STOP_TOKEN_STOP_SOURCE_H
+#endif // _LIBCPP_STOP_TOKEN_STOP_SOURCE_H
diff --git a/libcxx/include/__stop_token/stop_state.h b/libcxx/include/__stop_token/stop_state.h
index 74fafbdc637af..e77fd6997abfe 100644
--- a/libcxx/include/__stop_token/stop_state.h
+++ b/libcxx/include/__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_STOP_TOKEN_STOP_STATE_H
+#define _LIBCPP_STOP_TOKEN_STOP_STATE_H
 
 #include <__assert>
 #include <__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_STOP_TOKEN_STOP_STATE_H
diff --git a/libcxx/include/__stop_token/stop_token.h b/libcxx/include/__stop_token/stop_token.h
index 4a6ca27ac44d9..83fbfda0fc718 100644
--- a/libcxx/include/__stop_token/stop_token.h
+++ b/libcxx/include/__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_STOP_TOKEN_STOP_TOKEN_H
+#define _LIBCPP_STOP_TOKEN_STOP_TOKEN_H
 
 #include <__config>
 #include <__stop_token/intrusive_shared_ptr.h>
@@ -60,4 +60,4 @@ class stop_token {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___STOP_TOKEN_STOP_TOKEN_H
+#endif // _LIBCPP_STOP_TOKEN_STOP_TOKEN_H
diff --git a/libcxx/include/__string/char_traits.h b/libcxx/include/__string/char_traits.h
index 8292750919427..7606e667dd554 100644
--- a/libcxx/include/__string/char_traits.h
+++ b/libcxx/include/__string/char_traits.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___STRING_CHAR_TRAITS_H
-#define _LIBCPP___STRING_CHAR_TRAITS_H
+#ifndef _LIBCPP_STRING_CHAR_TRAITS_H
+#define _LIBCPP_STRING_CHAR_TRAITS_H
 
 #include <__algorithm/fill_n.h>
 #include <__algorithm/find.h>
@@ -541,4 +541,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___STRING_CHAR_TRAITS_H
+#endif // _LIBCPP_STRING_CHAR_TRAITS_H
diff --git a/libcxx/include/__string/constexpr_c_functions.h b/libcxx/include/__string/constexpr_c_functions.h
index 160d2af10950f..992ad4d64047b 100644
--- a/libcxx/include/__string/constexpr_c_functions.h
+++ b/libcxx/include/__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_STRING_CONSTEXPR_C_FUNCTIONS_H
+#define _LIBCPP_STRING_CONSTEXPR_C_FUNCTIONS_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -234,4 +234,4 @@ __constexpr_memmove(_Tp* __dest, _Up* __src, __element_count __n) {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___STRING_CONSTEXPR_C_FUNCTIONS_H
+#endif // _LIBCPP_STRING_CONSTEXPR_C_FUNCTIONS_H
diff --git a/libcxx/include/__string/extern_template_lists.h b/libcxx/include/__string/extern_template_lists.h
index 18f0ff9f11bd5..62940a8ba0890 100644
--- a/libcxx/include/__string/extern_template_lists.h
+++ b/libcxx/include/__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_STRING_EXTERN_TEMPLATE_LISTS_H
+#define _LIBCPP_STRING_EXTERN_TEMPLATE_LISTS_H
 
 #include <__config>
 
@@ -91,4 +91,4 @@
 
 // clang-format on
 
-#endif // _LIBCPP___STRING_EXTERN_TEMPLATE_LISTS_H
+#endif // _LIBCPP_STRING_EXTERN_TEMPLATE_LISTS_H
diff --git a/libcxx/include/__support/ibm/gettod_zos.h b/libcxx/include/__support/ibm/gettod_zos.h
index bd7e467736697..3c8cc0d4354a9 100644
--- a/libcxx/include/__support/ibm/gettod_zos.h
+++ b/libcxx/include/__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_SUPPORT_IBM_GETTOD_ZOS_H
+#define _LIBCPP_SUPPORT_IBM_GETTOD_ZOS_H
 
 #include <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_SUPPORT_IBM_GETTOD_ZOS_H
diff --git a/libcxx/include/__support/ibm/locale_mgmt_zos.h b/libcxx/include/__support/ibm/locale_mgmt_zos.h
index 5fc04b6b4b299..42e785371262d 100644
--- a/libcxx/include/__support/ibm/locale_mgmt_zos.h
+++ b/libcxx/include/__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_SUPPORT_IBM_LOCALE_MGMT_ZOS_H
+#define _LIBCPP_SUPPORT_IBM_LOCALE_MGMT_ZOS_H
 
 #if defined(__MVS__)
 #  include <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_SUPPORT_IBM_LOCALE_MGMT_ZOS_H
diff --git a/libcxx/include/__support/ibm/nanosleep.h b/libcxx/include/__support/ibm/nanosleep.h
index fadc784c0297c..7fcd4939eb45e 100644
--- a/libcxx/include/__support/ibm/nanosleep.h
+++ b/libcxx/include/__support/ibm/nanosleep.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___SUPPORT_IBM_NANOSLEEP_H
-#define _LIBCPP___SUPPORT_IBM_NANOSLEEP_H
+#ifndef _LIBCPP_SUPPORT_IBM_NANOSLEEP_H
+#define _LIBCPP_SUPPORT_IBM_NANOSLEEP_H
 
 #include <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_SUPPORT_IBM_NANOSLEEP_H
diff --git a/libcxx/include/__support/xlocale/__nop_locale_mgmt.h b/libcxx/include/__support/xlocale/__nop_locale_mgmt.h
index eabe169cc4bc8..24c3bf55ae7e2 100644
--- a/libcxx/include/__support/xlocale/__nop_locale_mgmt.h
+++ b/libcxx/include/__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_SUPPORT_XLOCALE_NOP_LOCALE_MGMT_H
+#define _LIBCPP_SUPPORT_XLOCALE_NOP_LOCALE_MGMT_H
 
 #include <__config>
 
@@ -30,4 +30,4 @@ inline _LIBCPP_HIDE_FROM_ABI locale_t newlocale(int, const char*, locale_t) { re
 #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_SUPPORT_XLOCALE_NOP_LOCALE_MGMT_H
diff --git a/libcxx/include/__support/xlocale/__posix_l_fallback.h b/libcxx/include/__support/xlocale/__posix_l_fallback.h
index a56de0a5d78cd..f0d1ccc36c1cc 100644
--- a/libcxx/include/__support/xlocale/__posix_l_fallback.h
+++ b/libcxx/include/__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_SUPPORT_XLOCALE_POSIX_L_FALLBACK_H
+#define _LIBCPP_SUPPORT_XLOCALE_POSIX_L_FALLBACK_H
 
 #include <__config>
 #include <ctype.h>
@@ -88,4 +88,4 @@ inline _LIBCPP_HIDE_FROM_ABI size_t wcsxfrm_l(wchar_t* __dest, const wchar_t* __
 }
 #endif // _LIBCPP_HAS_WIDE_CHARACTERS
 
-#endif // _LIBCPP___SUPPORT_XLOCALE_POSIX_L_FALLBACK_H
+#endif // _LIBCPP_SUPPORT_XLOCALE_POSIX_L_FALLBACK_H
diff --git a/libcxx/include/__support/xlocale/__strtonum_fallback.h b/libcxx/include/__support/xlocale/__strtonum_fallback.h
index 5275aead35af9..fd5bed5badc84 100644
--- a/libcxx/include/__support/xlocale/__strtonum_fallback.h
+++ b/libcxx/include/__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_SUPPORT_XLOCALE_STRTONUM_FALLBACK_H
+#define _LIBCPP_SUPPORT_XLOCALE_STRTONUM_FALLBACK_H
 
 #include <__config>
 #include <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_SUPPORT_XLOCALE_STRTONUM_FALLBACK_H
diff --git a/libcxx/include/__system_error/errc.h b/libcxx/include/__system_error/errc.h
index 23c84d95b62aa..4c413d721a960 100644
--- a/libcxx/include/__system_error/errc.h
+++ b/libcxx/include/__system_error/errc.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ERRC
-#define _LIBCPP___ERRC
+#ifndef _LIBCPP_ERRC
+#define _LIBCPP_ERRC
 
 /*
     system_error synopsis
@@ -263,4 +263,4 @@ _LIBCPP_DECLARE_STRONG_ENUM_EPILOG(errc)
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___ERRC
+#endif // _LIBCPP_ERRC
diff --git a/libcxx/include/__system_error/error_category.h b/libcxx/include/__system_error/error_category.h
index 191f4d83a90c0..1909e03457b5f 100644
--- a/libcxx/include/__system_error/error_category.h
+++ b/libcxx/include/__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_SYSTEM_ERROR_ERROR_CATEGORY_H
+#define _LIBCPP_SYSTEM_ERROR_ERROR_CATEGORY_H
 
 #include <__compare/ordering.h>
 #include <__config>
@@ -72,4 +72,4 @@ class _LIBCPP_HIDDEN __do_message : public error_category {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___SYSTEM_ERROR_ERROR_CATEGORY_H
+#endif // _LIBCPP_SYSTEM_ERROR_ERROR_CATEGORY_H
diff --git a/libcxx/include/__system_error/error_code.h b/libcxx/include/__system_error/error_code.h
index f6ea40d6efcb9..8c40ba2962143 100644
--- a/libcxx/include/__system_error/error_code.h
+++ b/libcxx/include/__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_SYSTEM_ERROR_ERROR_CODE_H
+#define _LIBCPP_SYSTEM_ERROR_ERROR_CODE_H
 
 #include <__compare/ordering.h>
 #include <__config>
@@ -139,4 +139,4 @@ struct hash<error_code> : public __unary_function<error_code, size_t> {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___SYSTEM_ERROR_ERROR_CODE_H
+#endif // _LIBCPP_SYSTEM_ERROR_ERROR_CODE_H
diff --git a/libcxx/include/__system_error/error_condition.h b/libcxx/include/__system_error/error_condition.h
index 34819f4b6de4c..9a0a8dd7efcb0 100644
--- a/libcxx/include/__system_error/error_condition.h
+++ b/libcxx/include/__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_SYSTEM_ERROR_ERROR_CONDITION_H
+#define _LIBCPP_SYSTEM_ERROR_ERROR_CONDITION_H
 
 #include <__compare/ordering.h>
 #include <__config>
@@ -126,4 +126,4 @@ struct hash<error_condition> : public __unary_function<error_condition, size_t>
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___SYSTEM_ERROR_ERROR_CONDITION_H
+#endif // _LIBCPP_SYSTEM_ERROR_ERROR_CONDITION_H
diff --git a/libcxx/include/__system_error/system_error.h b/libcxx/include/__system_error/system_error.h
index 36ccf94cc010d..1bd3219031185 100644
--- a/libcxx/include/__system_error/system_error.h
+++ b/libcxx/include/__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_SYSTEM_ERROR_SYSTEM_ERROR_H
+#define _LIBCPP_SYSTEM_ERROR_SYSTEM_ERROR_H
 
 #include <__config>
 #include <__system_error/error_category.h>
@@ -54,4 +54,4 @@ class _LIBCPP_EXPORTED_FROM_ABI system_error : public runtime_error {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___SYSTEM_ERROR_SYSTEM_ERROR_H
+#endif // _LIBCPP_SYSTEM_ERROR_SYSTEM_ERROR_H
diff --git a/libcxx/include/__system_error/throw_system_error.h b/libcxx/include/__system_error/throw_system_error.h
index e4605b6f014dc..1ed51df582a89 100644
--- a/libcxx/include/__system_error/throw_system_error.h
+++ b/libcxx/include/__system_error/throw_system_error.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___SYSTEM_ERROR_THROW_SYSTEM_ERROR_H
-#define _LIBCPP___SYSTEM_ERROR_THROW_SYSTEM_ERROR_H
+#ifndef _LIBCPP_SYSTEM_ERROR_THROW_SYSTEM_ERROR_H
+#define _LIBCPP_SYSTEM_ERROR_THROW_SYSTEM_ERROR_H
 
 #include <__config>
 
@@ -22,4 +22,4 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___SYSTEM_ERROR_THROW_SYSTEM_ERROR_H
+#endif // _LIBCPP_SYSTEM_ERROR_THROW_SYSTEM_ERROR_H
diff --git a/libcxx/include/__thread/formatter.h b/libcxx/include/__thread/formatter.h
index 826607d47b469..0a9bc121d4a17 100644
--- a/libcxx/include/__thread/formatter.h
+++ b/libcxx/include/__thread/formatter.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___THREAD_FORMATTER_H
-#define _LIBCPP___THREAD_FORMATTER_H
+#ifndef _LIBCPP_THREAD_FORMATTER_H
+#define _LIBCPP_THREAD_FORMATTER_H
 
 #include <__concepts/arithmetic.h>
 #include <__config>
@@ -77,4 +77,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 23
 
-#endif // _LIBCPP___THREAD_FORMATTER_H
+#endif // _LIBCPP_THREAD_FORMATTER_H
diff --git a/libcxx/include/__thread/id.h b/libcxx/include/__thread/id.h
index 14a51fc9ee880..d3a165eec943a 100644
--- a/libcxx/include/__thread/id.h
+++ b/libcxx/include/__thread/id.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___THREAD_ID_H
-#define _LIBCPP___THREAD_ID_H
+#ifndef _LIBCPP_THREAD_ID_H
+#define _LIBCPP_THREAD_ID_H
 
 #include <__compare/ordering.h>
 #include <__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_THREAD_ID_H
diff --git a/libcxx/include/__thread/jthread.h b/libcxx/include/__thread/jthread.h
index 481ffe296c271..a7b6ec5d293fb 100644
--- a/libcxx/include/__thread/jthread.h
+++ b/libcxx/include/__thread/jthread.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___THREAD_JTHREAD_H
-#define _LIBCPP___THREAD_JTHREAD_H
+#ifndef _LIBCPP_THREAD_JTHREAD_H
+#define _LIBCPP_THREAD_JTHREAD_H
 
 #include <__config>
 #include <__stop_token/stop_source.h>
@@ -133,4 +133,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___THREAD_JTHREAD_H
+#endif // _LIBCPP_THREAD_JTHREAD_H
diff --git a/libcxx/include/__thread/poll_with_backoff.h b/libcxx/include/__thread/poll_with_backoff.h
index b42b1285c13c8..b0aa8a36a7a92 100644
--- a/libcxx/include/__thread/poll_with_backoff.h
+++ b/libcxx/include/__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_THREAD_POLL_WITH_BACKOFF_H
+#define _LIBCPP_THREAD_POLL_WITH_BACKOFF_H
 
 #include <__chrono/duration.h>
 #include <__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_THREAD_POLL_WITH_BACKOFF_H
diff --git a/libcxx/include/__thread/support.h b/libcxx/include/__thread/support.h
index 50a18daf2b685..c5a6da93321cf 100644
--- a/libcxx/include/__thread/support.h
+++ b/libcxx/include/__thread/support.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___THREAD_SUPPORT_H
-#define _LIBCPP___THREAD_SUPPORT_H
+#ifndef _LIBCPP_THREAD_SUPPORT_H
+#define _LIBCPP_THREAD_SUPPORT_H
 
 #include <__config>
 
@@ -120,4 +120,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_HAS_THREADS
 
-#endif // _LIBCPP___THREAD_SUPPORT_H
+#endif // _LIBCPP_THREAD_SUPPORT_H
diff --git a/libcxx/include/__thread/support/c11.h b/libcxx/include/__thread/support/c11.h
index fe00a2d97fadc..727d1fc8151ea 100644
--- a/libcxx/include/__thread/support/c11.h
+++ b/libcxx/include/__thread/support/c11.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___THREAD_SUPPORT_C11_H
-#define _LIBCPP___THREAD_SUPPORT_C11_H
+#ifndef _LIBCPP_THREAD_SUPPORT_C11_H
+#define _LIBCPP_THREAD_SUPPORT_C11_H
 
 #include <__chrono/convert_to_timespec.h>
 #include <__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_THREAD_SUPPORT_C11_H
diff --git a/libcxx/include/__thread/support/external.h b/libcxx/include/__thread/support/external.h
index d5e212491cfdb..e00587ba269fd 100644
--- a/libcxx/include/__thread/support/external.h
+++ b/libcxx/include/__thread/support/external.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___THREAD_SUPPORT_EXTERNAL_H
-#define _LIBCPP___THREAD_SUPPORT_EXTERNAL_H
+#ifndef _LIBCPP_THREAD_SUPPORT_EXTERNAL_H
+#define _LIBCPP_THREAD_SUPPORT_EXTERNAL_H
 
 #include <__config>
 
@@ -18,4 +18,4 @@
 
 #include <__external_threading>
 
-#endif // _LIBCPP___THREAD_SUPPORT_EXTERNAL_H
+#endif // _LIBCPP_THREAD_SUPPORT_EXTERNAL_H
diff --git a/libcxx/include/__thread/support/pthread.h b/libcxx/include/__thread/support/pthread.h
index 14e92079dadfe..1365b0c3d1837 100644
--- a/libcxx/include/__thread/support/pthread.h
+++ b/libcxx/include/__thread/support/pthread.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___THREAD_SUPPORT_PTHREAD_H
-#define _LIBCPP___THREAD_SUPPORT_PTHREAD_H
+#ifndef _LIBCPP_THREAD_SUPPORT_PTHREAD_H
+#define _LIBCPP_THREAD_SUPPORT_PTHREAD_H
 
 #include <__chrono/convert_to_timespec.h>
 #include <__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_THREAD_SUPPORT_PTHREAD_H
diff --git a/libcxx/include/__thread/support/windows.h b/libcxx/include/__thread/support/windows.h
index 2921ed900e716..aa43f4aecf5ec 100644
--- a/libcxx/include/__thread/support/windows.h
+++ b/libcxx/include/__thread/support/windows.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___THREAD_SUPPORT_WINDOWS_H
-#define _LIBCPP___THREAD_SUPPORT_WINDOWS_H
+#ifndef _LIBCPP_THREAD_SUPPORT_WINDOWS_H
+#define _LIBCPP_THREAD_SUPPORT_WINDOWS_H
 
 #include <__chrono/duration.h>
 #include <__config>
@@ -128,4 +128,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_THREAD_SUPPORT_WINDOWS_H
diff --git a/libcxx/include/__thread/this_thread.h b/libcxx/include/__thread/this_thread.h
index 4df137711a7fd..38a89af7700f6 100644
--- a/libcxx/include/__thread/this_thread.h
+++ b/libcxx/include/__thread/this_thread.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___THREAD_THIS_THREAD_H
-#define _LIBCPP___THREAD_THIS_THREAD_H
+#ifndef _LIBCPP_THREAD_THIS_THREAD_H
+#define _LIBCPP_THREAD_THIS_THREAD_H
 
 #include <__chrono/duration.h>
 #include <__chrono/steady_clock.h>
@@ -76,4 +76,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___THREAD_THIS_THREAD_H
+#endif // _LIBCPP_THREAD_THIS_THREAD_H
diff --git a/libcxx/include/__thread/thread.h b/libcxx/include/__thread/thread.h
index a3b672bc0f0e7..e30fb701eecec 100644
--- a/libcxx/include/__thread/thread.h
+++ b/libcxx/include/__thread/thread.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___THREAD_THREAD_H
-#define _LIBCPP___THREAD_THREAD_H
+#ifndef _LIBCPP_THREAD_THREAD_H
+#define _LIBCPP_THREAD_THREAD_H
 
 #include <__assert>
 #include <__condition_variable/condition_variable.h>
@@ -259,4 +259,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___THREAD_THREAD_H
+#endif // _LIBCPP_THREAD_THREAD_H
diff --git a/libcxx/include/__thread/timed_backoff_policy.h b/libcxx/include/__thread/timed_backoff_policy.h
index 35a72eb61f77e..5c6ced99c59c9 100644
--- a/libcxx/include/__thread/timed_backoff_policy.h
+++ b/libcxx/include/__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_THREAD_TIMED_BACKOFF_POLICY_H
+#define _LIBCPP_THREAD_TIMED_BACKOFF_POLICY_H
 
 #include <__config>
 
@@ -41,4 +41,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_HAS_THREADS
 
-#endif // _LIBCPP___THREAD_TIMED_BACKOFF_POLICY_H
+#endif // _LIBCPP_THREAD_TIMED_BACKOFF_POLICY_H
diff --git a/libcxx/include/__tree b/libcxx/include/__tree
index 694796922c914..45c918d01d2c7 100644
--- a/libcxx/include/__tree
+++ b/libcxx/include/__tree
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TREE
-#define _LIBCPP___TREE
+#ifndef _LIBCPP_TREE
+#define _LIBCPP_TREE
 
 #include <__algorithm/min.h>
 #include <__assert>
@@ -2323,4 +2323,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___TREE
+#endif // _LIBCPP_TREE
diff --git a/libcxx/include/__tuple/find_index.h b/libcxx/include/__tuple/find_index.h
index cc7329d3e89b4..9343b1950b8cb 100644
--- a/libcxx/include/__tuple/find_index.h
+++ b/libcxx/include/__tuple/find_index.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TUPLE_FIND_INDEX_H
-#define _LIBCPP___TUPLE_FIND_INDEX_H
+#ifndef _LIBCPP_TUPLE_FIND_INDEX_H
+#define _LIBCPP_TUPLE_FIND_INDEX_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -59,4 +59,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 14
 
-#endif // _LIBCPP___TUPLE_FIND_INDEX_H
+#endif // _LIBCPP_TUPLE_FIND_INDEX_H
diff --git a/libcxx/include/__tuple/ignore.h b/libcxx/include/__tuple/ignore.h
index 43cce5387411b..b356f6b8fa6c4 100644
--- a/libcxx/include/__tuple/ignore.h
+++ b/libcxx/include/__tuple/ignore.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TUPLE_IGNORE_H
-#define _LIBCPP___TUPLE_IGNORE_H
+#ifndef _LIBCPP_TUPLE_IGNORE_H
+#define _LIBCPP_TUPLE_IGNORE_H
 
 #include <__config>
 
@@ -36,4 +36,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_CXX03_LANG
 
-#endif // _LIBCPP___TUPLE_IGNORE_H
+#endif // _LIBCPP_TUPLE_IGNORE_H
diff --git a/libcxx/include/__tuple/sfinae_helpers.h b/libcxx/include/__tuple/sfinae_helpers.h
index f81048f4062bd..2a33dfe55101b 100644
--- a/libcxx/include/__tuple/sfinae_helpers.h
+++ b/libcxx/include/__tuple/sfinae_helpers.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TUPLE_SFINAE_HELPERS_H
-#define _LIBCPP___TUPLE_SFINAE_HELPERS_H
+#ifndef _LIBCPP_TUPLE_SFINAE_HELPERS_H
+#define _LIBCPP_TUPLE_SFINAE_HELPERS_H
 
 #include <__config>
 
@@ -96,4 +96,4 @@ struct __sfinae_assign_base<false, true> {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TUPLE_SFINAE_HELPERS_H
+#endif // _LIBCPP_TUPLE_SFINAE_HELPERS_H
diff --git a/libcxx/include/__tuple/tuple_element.h b/libcxx/include/__tuple/tuple_element.h
index 50a98079ccf89..ddc5d0724ff26 100644
--- a/libcxx/include/__tuple/tuple_element.h
+++ b/libcxx/include/__tuple/tuple_element.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TUPLE_TUPLE_ELEMENT_H
-#define _LIBCPP___TUPLE_TUPLE_ELEMENT_H
+#ifndef _LIBCPP_TUPLE_TUPLE_ELEMENT_H
+#define _LIBCPP_TUPLE_TUPLE_ELEMENT_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -43,4 +43,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_TUPLE_TUPLE_ELEMENT_H
diff --git a/libcxx/include/__tuple/tuple_like.h b/libcxx/include/__tuple/tuple_like.h
index c080a3dcf1e25..daa25c50ac337 100644
--- a/libcxx/include/__tuple/tuple_like.h
+++ b/libcxx/include/__tuple/tuple_like.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TUPLE_TUPLE_LIKE_H
-#define _LIBCPP___TUPLE_TUPLE_LIKE_H
+#ifndef _LIBCPP_TUPLE_TUPLE_LIKE_H
+#define _LIBCPP_TUPLE_TUPLE_LIKE_H
 
 #include <__config>
 #include <__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_TUPLE_TUPLE_LIKE_H
diff --git a/libcxx/include/__tuple/tuple_like_no_subrange.h b/libcxx/include/__tuple/tuple_like_no_subrange.h
index 30018d6a05ae2..19167cb6592dd 100644
--- a/libcxx/include/__tuple/tuple_like_no_subrange.h
+++ b/libcxx/include/__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_TUPLE_TUPLE_LIKE_NO_SUBRANGE_H
+#define _LIBCPP_TUPLE_TUPLE_LIKE_NO_SUBRANGE_H
 
 #include <__config>
 #include <__cstddef/size_t.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_TUPLE_TUPLE_LIKE_NO_SUBRANGE_H
diff --git a/libcxx/include/__tuple/tuple_size.h b/libcxx/include/__tuple/tuple_size.h
index 60f2a667a1ba3..1460d7c81b776 100644
--- a/libcxx/include/__tuple/tuple_size.h
+++ b/libcxx/include/__tuple/tuple_size.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TUPLE_TUPLE_SIZE_H
-#define _LIBCPP___TUPLE_TUPLE_SIZE_H
+#ifndef _LIBCPP_TUPLE_TUPLE_SIZE_H
+#define _LIBCPP_TUPLE_TUPLE_SIZE_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -68,4 +68,4 @@ inline constexpr size_t tuple_size_v = tuple_size<_Tp>::value;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TUPLE_TUPLE_SIZE_H
+#endif // _LIBCPP_TUPLE_TUPLE_SIZE_H
diff --git a/libcxx/include/__tuple/tuple_types.h b/libcxx/include/__tuple/tuple_types.h
index 7e1256cf8790e..b6d44656b39f5 100644
--- a/libcxx/include/__tuple/tuple_types.h
+++ b/libcxx/include/__tuple/tuple_types.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TUPLE_TUPLE_TYPES_H
-#define _LIBCPP___TUPLE_TUPLE_TYPES_H
+#ifndef _LIBCPP_TUPLE_TUPLE_TYPES_H
+#define _LIBCPP_TUPLE_TUPLE_TYPES_H
 
 #include <__config>
 
@@ -22,4 +22,4 @@ struct __tuple_types {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TUPLE_TUPLE_TYPES_H
+#endif // _LIBCPP_TUPLE_TUPLE_TYPES_H
diff --git a/libcxx/include/__type_traits/add_cv_quals.h b/libcxx/include/__type_traits/add_cv_quals.h
index 6c27f683b8ab3..c196c171de935 100644
--- a/libcxx/include/__type_traits/add_cv_quals.h
+++ b/libcxx/include/__type_traits/add_cv_quals.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_ADD_CV_H
-#define _LIBCPP___TYPE_TRAITS_ADD_CV_H
+#ifndef _LIBCPP_TYPE_TRAITS_ADD_CV_H
+#define _LIBCPP_TYPE_TRAITS_ADD_CV_H
 
 #include <__config>
 
@@ -49,4 +49,4 @@ using add_volatile_t = typename add_volatile<_Tp>::type;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_ADD_CV_H
+#endif // _LIBCPP_TYPE_TRAITS_ADD_CV_H
diff --git a/libcxx/include/__type_traits/add_pointer.h b/libcxx/include/__type_traits/add_pointer.h
index fa9376699a74a..c2780db032fc3 100644
--- a/libcxx/include/__type_traits/add_pointer.h
+++ b/libcxx/include/__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_TYPE_TRAITS_ADD_POINTER_H
+#define _LIBCPP_TYPE_TRAITS_ADD_POINTER_H
 
 #include <__config>
 #include <__type_traits/is_referenceable.h>
@@ -62,4 +62,4 @@ using add_pointer_t = __add_pointer_t<_Tp>;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_ADD_POINTER_H
+#endif // _LIBCPP_TYPE_TRAITS_ADD_POINTER_H
diff --git a/libcxx/include/__type_traits/add_reference.h b/libcxx/include/__type_traits/add_reference.h
index c6f5d63d26dea..b8a6118e8d5bf 100644
--- a/libcxx/include/__type_traits/add_reference.h
+++ b/libcxx/include/__type_traits/add_reference.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_ADD_REFERENCE_H
-#define _LIBCPP___TYPE_TRAITS_ADD_REFERENCE_H
+#ifndef _LIBCPP_TYPE_TRAITS_ADD_REFERENCE_H
+#define _LIBCPP_TYPE_TRAITS_ADD_REFERENCE_H
 
 #include <__config>
 
@@ -55,4 +55,4 @@ using add_rvalue_reference_t = __add_rvalue_reference_t<_Tp>;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_ADD_REFERENCE_H
+#endif // _LIBCPP_TYPE_TRAITS_ADD_REFERENCE_H
diff --git a/libcxx/include/__type_traits/aligned_storage.h b/libcxx/include/__type_traits/aligned_storage.h
index 5c2208ae0c70a..56f7799c27727 100644
--- a/libcxx/include/__type_traits/aligned_storage.h
+++ b/libcxx/include/__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_TYPE_TRAITS_ALIGNED_STORAGE_H
+#define _LIBCPP_TYPE_TRAITS_ALIGNED_STORAGE_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -85,4 +85,4 @@ _LIBCPP_SUPPRESS_DEPRECATED_POP
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_ALIGNED_STORAGE_H
+#endif // _LIBCPP_TYPE_TRAITS_ALIGNED_STORAGE_H
diff --git a/libcxx/include/__type_traits/aligned_union.h b/libcxx/include/__type_traits/aligned_union.h
index 1223dc25e40a0..395a4ca6aec7a 100644
--- a/libcxx/include/__type_traits/aligned_union.h
+++ b/libcxx/include/__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_TYPE_TRAITS_ALIGNED_UNION_H
+#define _LIBCPP_TYPE_TRAITS_ALIGNED_UNION_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -47,4 +47,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_TYPE_TRAITS_ALIGNED_UNION_H
diff --git a/libcxx/include/__type_traits/alignment_of.h b/libcxx/include/__type_traits/alignment_of.h
index 2a740942cca84..ad348dc3d459a 100644
--- a/libcxx/include/__type_traits/alignment_of.h
+++ b/libcxx/include/__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_TYPE_TRAITS_ALIGNMENT_OF_H
+#define _LIBCPP_TYPE_TRAITS_ALIGNMENT_OF_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -29,4 +29,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr size_t alignment_of_v = _LIBCPP_ALIG
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_ALIGNMENT_OF_H
+#endif // _LIBCPP_TYPE_TRAITS_ALIGNMENT_OF_H
diff --git a/libcxx/include/__type_traits/common_reference.h b/libcxx/include/__type_traits/common_reference.h
index 59badb64267de..e45b6ac6453a4 100644
--- a/libcxx/include/__type_traits/common_reference.h
+++ b/libcxx/include/__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_TYPE_TRAITS_COMMON_REFERENCE_H
+#define _LIBCPP_TYPE_TRAITS_COMMON_REFERENCE_H
 
 #include <__config>
 #include <__type_traits/add_pointer.h>
@@ -199,4 +199,4 @@ struct _LIBCPP_NO_SPECIALIZATIONS common_reference {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_COMMON_REFERENCE_H
+#endif // _LIBCPP_TYPE_TRAITS_COMMON_REFERENCE_H
diff --git a/libcxx/include/__type_traits/common_type.h b/libcxx/include/__type_traits/common_type.h
index 5643ce019c20e..e1006708c859a 100644
--- a/libcxx/include/__type_traits/common_type.h
+++ b/libcxx/include/__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_TYPE_TRAITS_COMMON_TYPE_H
+#define _LIBCPP_TYPE_TRAITS_COMMON_TYPE_H
 
 #include <__config>
 #include <__type_traits/conditional.h>
@@ -114,4 +114,4 @@ using common_type_t = typename common_type<_Tp...>::type;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_COMMON_TYPE_H
+#endif // _LIBCPP_TYPE_TRAITS_COMMON_TYPE_H
diff --git a/libcxx/include/__type_traits/conditional.h b/libcxx/include/__type_traits/conditional.h
index 71882fb1917b1..bacea91c0d9c5 100644
--- a/libcxx/include/__type_traits/conditional.h
+++ b/libcxx/include/__type_traits/conditional.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_CONDITIONAL_H
-#define _LIBCPP___TYPE_TRAITS_CONDITIONAL_H
+#ifndef _LIBCPP_TYPE_TRAITS_CONDITIONAL_H
+#define _LIBCPP_TYPE_TRAITS_CONDITIONAL_H
 
 #include <__config>
 
@@ -61,4 +61,4 @@ using __conditional_t _LIBCPP_NODEBUG = typename conditional<_Bp, _If, _Then>::t
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_CONDITIONAL_H
+#endif // _LIBCPP_TYPE_TRAITS_CONDITIONAL_H
diff --git a/libcxx/include/__type_traits/conjunction.h b/libcxx/include/__type_traits/conjunction.h
index ad9656acd47ec..316bfb1faea1d 100644
--- a/libcxx/include/__type_traits/conjunction.h
+++ b/libcxx/include/__type_traits/conjunction.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_CONJUNCTION_H
-#define _LIBCPP___TYPE_TRAITS_CONJUNCTION_H
+#ifndef _LIBCPP_TYPE_TRAITS_CONJUNCTION_H
+#define _LIBCPP_TYPE_TRAITS_CONJUNCTION_H
 
 #include <__config>
 #include <__type_traits/conditional.h>
@@ -67,4 +67,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool conjunction_v = conjunction<_Ar
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_CONJUNCTION_H
+#endif // _LIBCPP_TYPE_TRAITS_CONJUNCTION_H
diff --git a/libcxx/include/__type_traits/container_traits.h b/libcxx/include/__type_traits/container_traits.h
index ed4e19c675032..6c2a6347e69fa 100644
--- a/libcxx/include/__type_traits/container_traits.h
+++ b/libcxx/include/__type_traits/container_traits.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_CONTAINER_TRAITS_H
-#define _LIBCPP___TYPE_TRAITS_CONTAINER_TRAITS_H
+#ifndef _LIBCPP_TYPE_TRAITS_CONTAINER_TRAITS_H
+#define _LIBCPP_TYPE_TRAITS_CONTAINER_TRAITS_H
 
 #include <__config>
 
@@ -43,4 +43,4 @@ struct __container_traits {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_CONTAINER_TRAITS_H
+#endif // _LIBCPP_TYPE_TRAITS_CONTAINER_TRAITS_H
diff --git a/libcxx/include/__type_traits/copy_cv.h b/libcxx/include/__type_traits/copy_cv.h
index 8378fbd50ef53..af11486f97f79 100644
--- a/libcxx/include/__type_traits/copy_cv.h
+++ b/libcxx/include/__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_TYPE_TRAITS_COPY_CV_H
+#define _LIBCPP_TYPE_TRAITS_COPY_CV_H
 
 #include <__config>
 
@@ -48,4 +48,4 @@ using __copy_cv_t _LIBCPP_NODEBUG = typename __copy_cv<_From>::template __apply<
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_COPY_CV_H
+#endif // _LIBCPP_TYPE_TRAITS_COPY_CV_H
diff --git a/libcxx/include/__type_traits/copy_cvref.h b/libcxx/include/__type_traits/copy_cvref.h
index 39002347d4a94..369402af08055 100644
--- a/libcxx/include/__type_traits/copy_cvref.h
+++ b/libcxx/include/__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_TYPE_TRAITS_COPY_CVREF_H
+#define _LIBCPP_TYPE_TRAITS_COPY_CVREF_H
 
 #include <__config>
 #include <__type_traits/add_reference.h>
@@ -42,4 +42,4 @@ using __copy_cvref_t _LIBCPP_NODEBUG = typename __copy_cvref<_From>::template __
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_COPY_CVREF_H
+#endif // _LIBCPP_TYPE_TRAITS_COPY_CVREF_H
diff --git a/libcxx/include/__type_traits/datasizeof.h b/libcxx/include/__type_traits/datasizeof.h
index 54735cd52fdb5..33356ac0f8d63 100644
--- a/libcxx/include/__type_traits/datasizeof.h
+++ b/libcxx/include/__type_traits/datasizeof.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_DATASIZEOF_H
-#define _LIBCPP___TYPE_TRAITS_DATASIZEOF_H
+#ifndef _LIBCPP_TYPE_TRAITS_DATASIZEOF_H
+#define _LIBCPP_TYPE_TRAITS_DATASIZEOF_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -47,4 +47,4 @@ _LIBCPP_DIAGNOSTIC_POP
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_DATASIZEOF_H
+#endif // _LIBCPP_TYPE_TRAITS_DATASIZEOF_H
diff --git a/libcxx/include/__type_traits/decay.h b/libcxx/include/__type_traits/decay.h
index 661fba53dfaa4..cc06679a7a070 100644
--- a/libcxx/include/__type_traits/decay.h
+++ b/libcxx/include/__type_traits/decay.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_DECAY_H
-#define _LIBCPP___TYPE_TRAITS_DECAY_H
+#ifndef _LIBCPP_TYPE_TRAITS_DECAY_H
+#define _LIBCPP_TYPE_TRAITS_DECAY_H
 
 #include <__config>
 
@@ -37,4 +37,4 @@ using decay_t = __decay_t<_Tp>;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_DECAY_H
+#endif // _LIBCPP_TYPE_TRAITS_DECAY_H
diff --git a/libcxx/include/__type_traits/dependent_type.h b/libcxx/include/__type_traits/dependent_type.h
index 354705c49c90e..45117ef6f3b2e 100644
--- a/libcxx/include/__type_traits/dependent_type.h
+++ b/libcxx/include/__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_TYPE_TRAITS_DEPENDENT_TYPE_H
+#define _LIBCPP_TYPE_TRAITS_DEPENDENT_TYPE_H
 
 #include <__config>
 
@@ -22,4 +22,4 @@ struct __dependent_type : public _Tp {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_DEPENDENT_TYPE_H
+#endif // _LIBCPP_TYPE_TRAITS_DEPENDENT_TYPE_H
diff --git a/libcxx/include/__type_traits/desugars_to.h b/libcxx/include/__type_traits/desugars_to.h
index 029b3c6336837..b260e8306d93b 100644
--- a/libcxx/include/__type_traits/desugars_to.h
+++ b/libcxx/include/__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_TYPE_TRAITS_DESUGARS_TO_H
+#define _LIBCPP_TYPE_TRAITS_DESUGARS_TO_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -70,4 +70,4 @@ struct __desugars_to : integral_constant<bool, __desugars_to_v<_CanonicalTag, _O
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_DESUGARS_TO_H
+#endif // _LIBCPP_TYPE_TRAITS_DESUGARS_TO_H
diff --git a/libcxx/include/__type_traits/detected_or.h b/libcxx/include/__type_traits/detected_or.h
index 49c0c7111aebf..1d110cf2ed2bc 100644
--- a/libcxx/include/__type_traits/detected_or.h
+++ b/libcxx/include/__type_traits/detected_or.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_DETECTED_OR_H
-#define _LIBCPP___TYPE_TRAITS_DETECTED_OR_H
+#ifndef _LIBCPP_TYPE_TRAITS_DETECTED_OR_H
+#define _LIBCPP_TYPE_TRAITS_DETECTED_OR_H
 
 #include <__config>
 #include <__type_traits/void_t.h>
@@ -33,4 +33,4 @@ using __detected_or_t _LIBCPP_NODEBUG = typename __detector<_Default, void, _Op,
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_DETECTED_OR_H
+#endif // _LIBCPP_TYPE_TRAITS_DETECTED_OR_H
diff --git a/libcxx/include/__type_traits/disjunction.h b/libcxx/include/__type_traits/disjunction.h
index 8e7a38413a985..bd38a1c427427 100644
--- a/libcxx/include/__type_traits/disjunction.h
+++ b/libcxx/include/__type_traits/disjunction.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_DISJUNCTION_H
-#define _LIBCPP___TYPE_TRAITS_DISJUNCTION_H
+#ifndef _LIBCPP_TYPE_TRAITS_DISJUNCTION_H
+#define _LIBCPP_TYPE_TRAITS_DISJUNCTION_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -55,4 +55,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool disjunction_v = _Or<_Args...>::
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_DISJUNCTION_H
+#endif // _LIBCPP_TYPE_TRAITS_DISJUNCTION_H
diff --git a/libcxx/include/__type_traits/enable_if.h b/libcxx/include/__type_traits/enable_if.h
index ae1af6ebf17d9..4be99b5380abc 100644
--- a/libcxx/include/__type_traits/enable_if.h
+++ b/libcxx/include/__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_TYPE_TRAITS_ENABLE_IF_H
+#define _LIBCPP_TYPE_TRAITS_ENABLE_IF_H
 
 #include <__config>
 
@@ -40,4 +40,4 @@ using enable_if_t = typename enable_if<_Bp, _Tp>::type;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_ENABLE_IF_H
+#endif // _LIBCPP_TYPE_TRAITS_ENABLE_IF_H
diff --git a/libcxx/include/__type_traits/extent.h b/libcxx/include/__type_traits/extent.h
index 9a82f03d1fc17..56ebf9616e1d3 100644
--- a/libcxx/include/__type_traits/extent.h
+++ b/libcxx/include/__type_traits/extent.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_EXTENT_H
-#define _LIBCPP___TYPE_TRAITS_EXTENT_H
+#ifndef _LIBCPP_TYPE_TRAITS_EXTENT_H
+#define _LIBCPP_TYPE_TRAITS_EXTENT_H
 
 #include <__config>
 #include <__cstddef/size_t.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_TYPE_TRAITS_EXTENT_H
diff --git a/libcxx/include/__type_traits/has_unique_object_representation.h b/libcxx/include/__type_traits/has_unique_object_representation.h
index af9abfe81d41f..c189bd690b11b 100644
--- a/libcxx/include/__type_traits/has_unique_object_representation.h
+++ b/libcxx/include/__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_TYPE_TRAITS_HAS_UNIQUE_OBJECT_REPRESENTATION_H
+#define _LIBCPP_TYPE_TRAITS_HAS_UNIQUE_OBJECT_REPRESENTATION_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -32,4 +32,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool has_unique_object_representatio
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_HAS_UNIQUE_OBJECT_REPRESENTATION_H
+#endif // _LIBCPP_TYPE_TRAITS_HAS_UNIQUE_OBJECT_REPRESENTATION_H
diff --git a/libcxx/include/__type_traits/has_virtual_destructor.h b/libcxx/include/__type_traits/has_virtual_destructor.h
index bceb61a9d2ddf..d9a705cced1a2 100644
--- a/libcxx/include/__type_traits/has_virtual_destructor.h
+++ b/libcxx/include/__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_TYPE_TRAITS_HAS_VIRTUAL_DESTRUCTOR_H
+#define _LIBCPP_TYPE_TRAITS_HAS_VIRTUAL_DESTRUCTOR_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -29,4 +29,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool has_virtual_destructor_v = __ha
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_HAS_VIRTUAL_DESTRUCTOR_H
+#endif // _LIBCPP_TYPE_TRAITS_HAS_VIRTUAL_DESTRUCTOR_H
diff --git a/libcxx/include/__type_traits/integer_traits.h b/libcxx/include/__type_traits/integer_traits.h
index fad502c44e301..8e7358e290006 100644
--- a/libcxx/include/__type_traits/integer_traits.h
+++ b/libcxx/include/__type_traits/integer_traits.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_INTEGER_TRAITS_H
-#define _LIBCPP___TYPE_TRAITS_INTEGER_TRAITS_H
+#ifndef _LIBCPP_TYPE_TRAITS_INTEGER_TRAITS_H
+#define _LIBCPP_TYPE_TRAITS_INTEGER_TRAITS_H
 
 #include <__config>
 
@@ -70,4 +70,4 @@ concept __signed_or_unsigned_integer = __signed_integer<_Tp> || __unsigned_integ
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_INTEGER_TRAITS_H
+#endif // _LIBCPP_TYPE_TRAITS_INTEGER_TRAITS_H
diff --git a/libcxx/include/__type_traits/integral_constant.h b/libcxx/include/__type_traits/integral_constant.h
index ff55a85e0d38a..617963c0b43a6 100644
--- a/libcxx/include/__type_traits/integral_constant.h
+++ b/libcxx/include/__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_TYPE_TRAITS_INTEGRAL_CONSTANT_H
+#define _LIBCPP_TYPE_TRAITS_INTEGRAL_CONSTANT_H
 
 #include <__config>
 
@@ -41,4 +41,4 @@ using bool_constant = integral_constant<bool, __b>;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_INTEGRAL_CONSTANT_H
+#endif // _LIBCPP_TYPE_TRAITS_INTEGRAL_CONSTANT_H
diff --git a/libcxx/include/__type_traits/invoke.h b/libcxx/include/__type_traits/invoke.h
index ba8202576593e..d1484666eeece 100644
--- a/libcxx/include/__type_traits/invoke.h
+++ b/libcxx/include/__type_traits/invoke.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_INVOKE_H
-#define _LIBCPP___TYPE_TRAITS_INVOKE_H
+#ifndef _LIBCPP_TYPE_TRAITS_INVOKE_H
+#define _LIBCPP_TYPE_TRAITS_INVOKE_H
 
 #include <__config>
 #include <__type_traits/conditional.h>
@@ -398,4 +398,4 @@ using invoke_result_t = __invoke_result_t<_Fn, _Args...>;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_INVOKE_H
+#endif // _LIBCPP_TYPE_TRAITS_INVOKE_H
diff --git a/libcxx/include/__type_traits/is_abstract.h b/libcxx/include/__type_traits/is_abstract.h
index e2f68f2383c9f..ec80722973467 100644
--- a/libcxx/include/__type_traits/is_abstract.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_ABSTRACT_H
+#define _LIBCPP_TYPE_TRAITS_IS_ABSTRACT_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_abstract_v = __is_abstract(_
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_ABSTRACT_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_ABSTRACT_H
diff --git a/libcxx/include/__type_traits/is_aggregate.h b/libcxx/include/__type_traits/is_aggregate.h
index d1acec6b3e102..ce281e5d4a955 100644
--- a/libcxx/include/__type_traits/is_aggregate.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_AGGREGATE_H
+#define _LIBCPP_TYPE_TRAITS_IS_AGGREGATE_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -30,4 +30,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_aggregate_v = __is_aggregate
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_AGGREGATE_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_AGGREGATE_H
diff --git a/libcxx/include/__type_traits/is_allocator.h b/libcxx/include/__type_traits/is_allocator.h
index f37c029a2aa89..52d7f2cc5bee5 100644
--- a/libcxx/include/__type_traits/is_allocator.h
+++ b/libcxx/include/__type_traits/is_allocator.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_IS_ALLOCATOR_H
-#define _LIBCPP___TYPE_IS_ALLOCATOR_H
+#ifndef _LIBCPP_TYPE_IS_ALLOCATOR_H
+#define _LIBCPP_TYPE_IS_ALLOCATOR_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -30,4 +30,4 @@ inline const bool __is_allocator_v<_Alloc,
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_IS_ALLOCATOR_H
+#endif // _LIBCPP_TYPE_IS_ALLOCATOR_H
diff --git a/libcxx/include/__type_traits/is_always_bitcastable.h b/libcxx/include/__type_traits/is_always_bitcastable.h
index 044d2501669a8..b03c2156328ae 100644
--- a/libcxx/include/__type_traits/is_always_bitcastable.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_ALWAYS_BITCASTABLE_H
+#define _LIBCPP_TYPE_TRAITS_IS_ALWAYS_BITCASTABLE_H
 
 #include <__config>
 #include <__type_traits/is_integral.h>
@@ -80,4 +80,4 @@ struct __is_always_bitcastable {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_ALWAYS_BITCASTABLE_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_ALWAYS_BITCASTABLE_H
diff --git a/libcxx/include/__type_traits/is_arithmetic.h b/libcxx/include/__type_traits/is_arithmetic.h
index 0d5c29385f25d..1bc8cc8dfbc64 100644
--- a/libcxx/include/__type_traits/is_arithmetic.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_ARITHMETIC_H
+#define _LIBCPP_TYPE_TRAITS_IS_ARITHMETIC_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -31,4 +31,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_arithmetic_v = is_arithmetic
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_ARITHMETIC_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_ARITHMETIC_H
diff --git a/libcxx/include/__type_traits/is_array.h b/libcxx/include/__type_traits/is_array.h
index e734d1a3043ee..dbe6b3f2890ea 100644
--- a/libcxx/include/__type_traits/is_array.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_ARRAY_H
+#define _LIBCPP_TYPE_TRAITS_IS_ARRAY_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_array_v = __is_array(_Tp);
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_ARRAY_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_ARRAY_H
diff --git a/libcxx/include/__type_traits/is_assignable.h b/libcxx/include/__type_traits/is_assignable.h
index da9080db3b76f..325d5d340d033 100644
--- a/libcxx/include/__type_traits/is_assignable.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_ASSIGNABLE_H
+#define _LIBCPP_TYPE_TRAITS_IS_ASSIGNABLE_H
 
 #include <__config>
 #include <__type_traits/add_reference.h>
@@ -47,4 +47,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_move_assignable_v = is_move_
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_ASSIGNABLE_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_ASSIGNABLE_H
diff --git a/libcxx/include/__type_traits/is_base_of.h b/libcxx/include/__type_traits/is_base_of.h
index afbe8cac659e5..9de15c05bd660 100644
--- a/libcxx/include/__type_traits/is_base_of.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_BASE_OF_H
+#define _LIBCPP_TYPE_TRAITS_IS_BASE_OF_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -40,4 +40,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_virtual_base_of_v = __builti
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_BASE_OF_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_BASE_OF_H
diff --git a/libcxx/include/__type_traits/is_bounded_array.h b/libcxx/include/__type_traits/is_bounded_array.h
index 8a41e07aa019b..b2fbd49a8e795 100644
--- a/libcxx/include/__type_traits/is_bounded_array.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_BOUNDED_ARRAY_H
+#define _LIBCPP_TYPE_TRAITS_IS_BOUNDED_ARRAY_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -33,4 +33,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_bounded_array_v = __is_bound
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_BOUNDED_ARRAY_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_BOUNDED_ARRAY_H
diff --git a/libcxx/include/__type_traits/is_callable.h b/libcxx/include/__type_traits/is_callable.h
index 49724fe892ee5..cf8d419317cd7 100644
--- a/libcxx/include/__type_traits/is_callable.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_CALLABLE_H
+#define _LIBCPP_TYPE_TRAITS_IS_CALLABLE_H
 
 #include <__config>
 #include <__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_TYPE_TRAITS_IS_CALLABLE_H
diff --git a/libcxx/include/__type_traits/is_char_like_type.h b/libcxx/include/__type_traits/is_char_like_type.h
index ca440b52fcd45..0e0bb39a09cd2 100644
--- a/libcxx/include/__type_traits/is_char_like_type.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_CHAR_LIKE_TYPE_H
+#define _LIBCPP_TYPE_TRAITS_IS_CHAR_LIKE_TYPE_H
 
 #include <__config>
 #include <__type_traits/conjunction.h>
@@ -27,4 +27,4 @@ using _IsCharLikeType _LIBCPP_NODEBUG =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_CHAR_LIKE_TYPE_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_CHAR_LIKE_TYPE_H
diff --git a/libcxx/include/__type_traits/is_class.h b/libcxx/include/__type_traits/is_class.h
index ba466f1bbddaf..977eb6a677946 100644
--- a/libcxx/include/__type_traits/is_class.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_CLASS_H
+#define _LIBCPP_TYPE_TRAITS_IS_CLASS_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_class_v = __is_class(_Tp);
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_CLASS_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_CLASS_H
diff --git a/libcxx/include/__type_traits/is_compound.h b/libcxx/include/__type_traits/is_compound.h
index 1ecedb665aae4..026cce29ff2a9 100644
--- a/libcxx/include/__type_traits/is_compound.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_COMPOUND_H
+#define _LIBCPP_TYPE_TRAITS_IS_COMPOUND_H
 
 #include <__config>
 #include <__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_TYPE_TRAITS_IS_COMPOUND_H
diff --git a/libcxx/include/__type_traits/is_const.h b/libcxx/include/__type_traits/is_const.h
index 85cc32bff1eaf..a6dcb2e246964 100644
--- a/libcxx/include/__type_traits/is_const.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_CONST_H
+#define _LIBCPP_TYPE_TRAITS_IS_CONST_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_const_v = __is_const(_Tp);
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_CONST_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_CONST_H
diff --git a/libcxx/include/__type_traits/is_constant_evaluated.h b/libcxx/include/__type_traits/is_constant_evaluated.h
index 05e070a747884..ff9adc1817e1c 100644
--- a/libcxx/include/__type_traits/is_constant_evaluated.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_CONSTANT_EVALUATED_H
+#define _LIBCPP_TYPE_TRAITS_IS_CONSTANT_EVALUATED_H
 
 #include <__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_TYPE_TRAITS_IS_CONSTANT_EVALUATED_H
diff --git a/libcxx/include/__type_traits/is_constructible.h b/libcxx/include/__type_traits/is_constructible.h
index 28d3048719b03..be7c9b8b67f0b 100644
--- a/libcxx/include/__type_traits/is_constructible.h
+++ b/libcxx/include/__type_traits/is_constructible.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_IS_CONSTRUCTIBLE_H
-#define _LIBCPP___TYPE_IS_CONSTRUCTIBLE_H
+#ifndef _LIBCPP_TYPE_IS_CONSTRUCTIBLE_H
+#define _LIBCPP_TYPE_IS_CONSTRUCTIBLE_H
 
 #include <__config>
 #include <__type_traits/add_reference.h>
@@ -55,4 +55,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_default_constructible_v = __
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_IS_CONSTRUCTIBLE_H
+#endif // _LIBCPP_TYPE_IS_CONSTRUCTIBLE_H
diff --git a/libcxx/include/__type_traits/is_convertible.h b/libcxx/include/__type_traits/is_convertible.h
index f0a859f9cc16d..5c3a3ded22994 100644
--- a/libcxx/include/__type_traits/is_convertible.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_CONVERTIBLE_H
+#define _LIBCPP_TYPE_TRAITS_IS_CONVERTIBLE_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -38,4 +38,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_nothrow_convertible_v = __is
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_CONVERTIBLE_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_CONVERTIBLE_H
diff --git a/libcxx/include/__type_traits/is_core_convertible.h b/libcxx/include/__type_traits/is_core_convertible.h
index b1f2a5cc7d684..dace95178d7a5 100644
--- a/libcxx/include/__type_traits/is_core_convertible.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_CORE_CONVERTIBLE_H
+#define _LIBCPP_TYPE_TRAITS_IS_CORE_CONVERTIBLE_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -51,4 +51,4 @@ inline const bool __is_nothrow_core_convertible_v<_Tp, _Up, true> =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_CORE_CONVERTIBLE_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_CORE_CONVERTIBLE_H
diff --git a/libcxx/include/__type_traits/is_destructible.h b/libcxx/include/__type_traits/is_destructible.h
index ae661a46168b8..0d5de6c38da46 100644
--- a/libcxx/include/__type_traits/is_destructible.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_DESTRUCTIBLE_H
+#define _LIBCPP_TYPE_TRAITS_IS_DESTRUCTIBLE_H
 
 #include <__config>
 #include <__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_TYPE_TRAITS_IS_DESTRUCTIBLE_H
diff --git a/libcxx/include/__type_traits/is_empty.h b/libcxx/include/__type_traits/is_empty.h
index be6a0d1de7865..fc9583ad0315b 100644
--- a/libcxx/include/__type_traits/is_empty.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_EMPTY_H
+#define _LIBCPP_TYPE_TRAITS_IS_EMPTY_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_empty_v = __is_empty(_Tp);
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_EMPTY_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_EMPTY_H
diff --git a/libcxx/include/__type_traits/is_enum.h b/libcxx/include/__type_traits/is_enum.h
index 4a58b193fe78e..31ed26e884d58 100644
--- a/libcxx/include/__type_traits/is_enum.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_ENUM_H
+#define _LIBCPP_TYPE_TRAITS_IS_ENUM_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -38,4 +38,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_scoped_enum_v = __is_scoped_
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_ENUM_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_ENUM_H
diff --git a/libcxx/include/__type_traits/is_equality_comparable.h b/libcxx/include/__type_traits/is_equality_comparable.h
index 3ee1839996bef..41ce156c42a96 100644
--- a/libcxx/include/__type_traits/is_equality_comparable.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_EQUALITY_COMPARABLE_H
+#define _LIBCPP_TYPE_TRAITS_IS_EQUALITY_COMPARABLE_H
 
 #include <__config>
 #include <__type_traits/enable_if.h>
@@ -85,4 +85,4 @@ using __libcpp_is_trivially_equality_comparable _LIBCPP_NODEBUG =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_EQUALITY_COMPARABLE_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_EQUALITY_COMPARABLE_H
diff --git a/libcxx/include/__type_traits/is_execution_policy.h b/libcxx/include/__type_traits/is_execution_policy.h
index 84393e83a8efc..2c68e4b8c5519 100644
--- a/libcxx/include/__type_traits/is_execution_policy.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_EXECUTION_POLICY_H
+#define _LIBCPP_TYPE_TRAITS_IS_EXECUTION_POLICY_H
 
 #include <__config>
 #include <__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_TYPE_TRAITS_IS_EXECUTION_POLICY_H
diff --git a/libcxx/include/__type_traits/is_final.h b/libcxx/include/__type_traits/is_final.h
index e9ef1425c9760..b9e5d0af7b3b5 100644
--- a/libcxx/include/__type_traits/is_final.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_FINAL_H
+#define _LIBCPP_TYPE_TRAITS_IS_FINAL_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -33,4 +33,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_final_v = __is_final(_Tp);
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_FINAL_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_FINAL_H
diff --git a/libcxx/include/__type_traits/is_floating_point.h b/libcxx/include/__type_traits/is_floating_point.h
index b87363fe5b357..c3b994e15469f 100644
--- a/libcxx/include/__type_traits/is_floating_point.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_FLOATING_POINT_H
+#define _LIBCPP_TYPE_TRAITS_IS_FLOATING_POINT_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -36,4 +36,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_floating_point_v = is_floati
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_FLOATING_POINT_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_FLOATING_POINT_H
diff --git a/libcxx/include/__type_traits/is_function.h b/libcxx/include/__type_traits/is_function.h
index 119892ee1aec7..6164e3ceb1043 100644
--- a/libcxx/include/__type_traits/is_function.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_FUNCTIONAL_H
+#define _LIBCPP_TYPE_TRAITS_IS_FUNCTIONAL_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_function_v = __is_function(_
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_FUNCTIONAL_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_FUNCTIONAL_H
diff --git a/libcxx/include/__type_traits/is_fundamental.h b/libcxx/include/__type_traits/is_fundamental.h
index 6236553cfb836..2752cf1722b25 100644
--- a/libcxx/include/__type_traits/is_fundamental.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_FUNDAMENTAL_H
+#define _LIBCPP_TYPE_TRAITS_IS_FUNDAMENTAL_H
 
 #include <__config>
 #include <__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_TYPE_TRAITS_IS_FUNDAMENTAL_H
diff --git a/libcxx/include/__type_traits/is_generic_transparent_comparator.h b/libcxx/include/__type_traits/is_generic_transparent_comparator.h
index fd02c0b0423d1..08bda6867192e 100644
--- a/libcxx/include/__type_traits/is_generic_transparent_comparator.h
+++ b/libcxx/include/__type_traits/is_generic_transparent_comparator.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_IS_GENERIC_TRANSPARENT_COMPARATOR_H
-#define _LIBCPP___TYPE_TRAITS_IS_GENERIC_TRANSPARENT_COMPARATOR_H
+#ifndef _LIBCPP_TYPE_TRAITS_IS_GENERIC_TRANSPARENT_COMPARATOR_H
+#define _LIBCPP_TYPE_TRAITS_IS_GENERIC_TRANSPARENT_COMPARATOR_H
 
 #include <__config>
 
@@ -27,4 +27,4 @@ inline const bool __is_generic_transparent_comparator_v = false;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_GENERIC_TRANSPARENT_COMPARATOR_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_GENERIC_TRANSPARENT_COMPARATOR_H
diff --git a/libcxx/include/__type_traits/is_implicit_lifetime.h b/libcxx/include/__type_traits/is_implicit_lifetime.h
index e5d1c05c437fc..cb6cc3b621c15 100644
--- a/libcxx/include/__type_traits/is_implicit_lifetime.h
+++ b/libcxx/include/__type_traits/is_implicit_lifetime.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_IS_IMPLICIT_LIFETIME_H
-#define _LIBCPP___TYPE_TRAITS_IS_IMPLICIT_LIFETIME_H
+#ifndef _LIBCPP_TYPE_TRAITS_IS_IMPLICIT_LIFETIME_H
+#define _LIBCPP_TYPE_TRAITS_IS_IMPLICIT_LIFETIME_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -32,4 +32,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_implicit_lifetime_v = __buil
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_IMPLICIT_LIFETIME_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_IMPLICIT_LIFETIME_H
diff --git a/libcxx/include/__type_traits/is_implicitly_default_constructible.h b/libcxx/include/__type_traits/is_implicitly_default_constructible.h
index d5dadd7b870dd..fb9e0faaa9f7f 100644
--- a/libcxx/include/__type_traits/is_implicitly_default_constructible.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_IMPLICITLY_DEFAULT_CONSTRUCTIBLE_H
+#define _LIBCPP_TYPE_TRAITS_IS_IMPLICITLY_DEFAULT_CONSTRUCTIBLE_H
 
 #include <__config>
 #include <__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_TYPE_TRAITS_IS_IMPLICITLY_DEFAULT_CONSTRUCTIBLE_H
diff --git a/libcxx/include/__type_traits/is_integral.h b/libcxx/include/__type_traits/is_integral.h
index 5a340965f0384..dde86bea44ee8 100644
--- a/libcxx/include/__type_traits/is_integral.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_INTEGRAL_H
+#define _LIBCPP_TYPE_TRAITS_IS_INTEGRAL_H
 
 #include <__config>
 #include <__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_TYPE_TRAITS_IS_INTEGRAL_H
diff --git a/libcxx/include/__type_traits/is_literal_type.h b/libcxx/include/__type_traits/is_literal_type.h
index 2e0df3ad1be38..56b0fcbb00883 100644
--- a/libcxx/include/__type_traits/is_literal_type.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_LITERAL_TYPE
+#define _LIBCPP_TYPE_TRAITS_IS_LITERAL_TYPE
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -31,4 +31,4 @@ _LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_LITERAL_TYPE
+#endif // _LIBCPP_TYPE_TRAITS_IS_LITERAL_TYPE
diff --git a/libcxx/include/__type_traits/is_member_pointer.h b/libcxx/include/__type_traits/is_member_pointer.h
index e4fd9e0f26d69..a19e2bcafbf46 100644
--- a/libcxx/include/__type_traits/is_member_pointer.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_MEMBER_POINTER_H
+#define _LIBCPP_TYPE_TRAITS_IS_MEMBER_POINTER_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -40,4 +40,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_member_function_pointer_v =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_MEMBER_POINTER_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_MEMBER_POINTER_H
diff --git a/libcxx/include/__type_traits/is_nothrow_assignable.h b/libcxx/include/__type_traits/is_nothrow_assignable.h
index 15ad047c566e3..76914d82a15ed 100644
--- a/libcxx/include/__type_traits/is_nothrow_assignable.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_NOTHROW_ASSIGNABLE_H
+#define _LIBCPP_TYPE_TRAITS_IS_NOTHROW_ASSIGNABLE_H
 
 #include <__config>
 #include <__type_traits/add_reference.h>
@@ -49,4 +49,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_nothrow_move_assignable_v =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_NOTHROW_ASSIGNABLE_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_NOTHROW_ASSIGNABLE_H
diff --git a/libcxx/include/__type_traits/is_nothrow_constructible.h b/libcxx/include/__type_traits/is_nothrow_constructible.h
index bc4c2ee45b9f5..0f86a90f66cd1 100644
--- a/libcxx/include/__type_traits/is_nothrow_constructible.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_NOTHROW_CONSTRUCTIBLE_H
+#define _LIBCPP_TYPE_TRAITS_IS_NOTHROW_CONSTRUCTIBLE_H
 
 #include <__config>
 #include <__type_traits/add_reference.h>
@@ -60,4 +60,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_nothrow_default_constructibl
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_NOTHROW_CONSTRUCTIBLE_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_NOTHROW_CONSTRUCTIBLE_H
diff --git a/libcxx/include/__type_traits/is_nothrow_destructible.h b/libcxx/include/__type_traits/is_nothrow_destructible.h
index 81a34f98adf0a..2a94e059e8aeb 100644
--- a/libcxx/include/__type_traits/is_nothrow_destructible.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_NOTHROW_DESTRUCTIBLE_H
+#define _LIBCPP_TYPE_TRAITS_IS_NOTHROW_DESTRUCTIBLE_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -58,4 +58,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_nothrow_destructible_v = is_
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_NOTHROW_DESTRUCTIBLE_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_NOTHROW_DESTRUCTIBLE_H
diff --git a/libcxx/include/__type_traits/is_null_pointer.h b/libcxx/include/__type_traits/is_null_pointer.h
index 63bfb7d4dabcd..759f34db2f9b4 100644
--- a/libcxx/include/__type_traits/is_null_pointer.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_NULL_POINTER_H
+#define _LIBCPP_TYPE_TRAITS_IS_NULL_POINTER_H
 
 #include <__config>
 #include <__cstddef/nullptr_t.h>
@@ -34,4 +34,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_null_pointer_v = __is_null_p
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_NULL_POINTER_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_NULL_POINTER_H
diff --git a/libcxx/include/__type_traits/is_object.h b/libcxx/include/__type_traits/is_object.h
index 6532835961e48..b49f6f1b6b300 100644
--- a/libcxx/include/__type_traits/is_object.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_OBJECT_H
+#define _LIBCPP_TYPE_TRAITS_IS_OBJECT_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_object_v = __is_object(_Tp);
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_OBJECT_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_OBJECT_H
diff --git a/libcxx/include/__type_traits/is_pod.h b/libcxx/include/__type_traits/is_pod.h
index 8b805e946ae81..7766bf73daa17 100644
--- a/libcxx/include/__type_traits/is_pod.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_POD_H
+#define _LIBCPP_TYPE_TRAITS_IS_POD_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ _LIBCPP_DEPRECATED_IN_CXX20 _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_POD_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_POD_H
diff --git a/libcxx/include/__type_traits/is_pointer.h b/libcxx/include/__type_traits/is_pointer.h
index 1c3a93d1256c9..a26059a6a9cac 100644
--- a/libcxx/include/__type_traits/is_pointer.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_POINTER_H
+#define _LIBCPP_TYPE_TRAITS_IS_POINTER_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_pointer_v = __is_pointer(_Tp
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_POINTER_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_POINTER_H
diff --git a/libcxx/include/__type_traits/is_polymorphic.h b/libcxx/include/__type_traits/is_polymorphic.h
index 4ced8ec0b4f9a..444a72b72b7c1 100644
--- a/libcxx/include/__type_traits/is_polymorphic.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_POLYMORPHIC_H
+#define _LIBCPP_TYPE_TRAITS_IS_POLYMORPHIC_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_polymorphic_v = __is_polymor
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_POLYMORPHIC_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_POLYMORPHIC_H
diff --git a/libcxx/include/__type_traits/is_primary_template.h b/libcxx/include/__type_traits/is_primary_template.h
index 5fe6820bc7f7a..3a1d9214f8393 100644
--- a/libcxx/include/__type_traits/is_primary_template.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_PRIMARY_TEMPLATE_H
+#define _LIBCPP_TYPE_TRAITS_IS_PRIMARY_TEMPLATE_H
 
 #include <__config>
 #include <__type_traits/enable_if.h>
@@ -29,4 +29,4 @@ using __is_primary_template _LIBCPP_NODEBUG = _IsValidExpansion<__test_for_prima
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_PRIMARY_TEMPLATE_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_PRIMARY_TEMPLATE_H
diff --git a/libcxx/include/__type_traits/is_reference.h b/libcxx/include/__type_traits/is_reference.h
index 9c98c13fd1f49..7acb4d90110e8 100644
--- a/libcxx/include/__type_traits/is_reference.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_REFERENCE_H
+#define _LIBCPP_TYPE_TRAITS_IS_REFERENCE_H
 
 #include <__config>
 #include <__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_TYPE_TRAITS_IS_REFERENCE_H
diff --git a/libcxx/include/__type_traits/is_reference_wrapper.h b/libcxx/include/__type_traits/is_reference_wrapper.h
index 4bd8ebd44f05f..77cb7396a756c 100644
--- a/libcxx/include/__type_traits/is_reference_wrapper.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_REFERENCE_WRAPPER_H
+#define _LIBCPP_TYPE_TRAITS_IS_REFERENCE_WRAPPER_H
 
 #include <__config>
 #include <__fwd/functional.h>
@@ -29,4 +29,4 @@ struct __is_reference_wrapper : __is_reference_wrapper_impl<__remove_cv_t<_Tp> >
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_ENABLE_IF_H
+#endif // _LIBCPP_TYPE_TRAITS_ENABLE_IF_H
diff --git a/libcxx/include/__type_traits/is_referenceable.h b/libcxx/include/__type_traits/is_referenceable.h
index 3a9d2858ba4c9..b04d90f16447a 100644
--- a/libcxx/include/__type_traits/is_referenceable.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_REFERENCEABLE_H
+#define _LIBCPP_TYPE_TRAITS_IS_REFERENCEABLE_H
 
 #include <__config>
 #include <__type_traits/void_t.h>
@@ -31,4 +31,4 @@ concept __referenceable = __is_referenceable_v<_Tp>;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_REFERENCEABLE_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_REFERENCEABLE_H
diff --git a/libcxx/include/__type_traits/is_replaceable.h b/libcxx/include/__type_traits/is_replaceable.h
index e1d17c099cd3a..cd984bf730019 100644
--- a/libcxx/include/__type_traits/is_replaceable.h
+++ b/libcxx/include/__type_traits/is_replaceable.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_IS_REPLACEABLE_H
-#define _LIBCPP___TYPE_TRAITS_IS_REPLACEABLE_H
+#ifndef _LIBCPP_TYPE_TRAITS_IS_REPLACEABLE_H
+#define _LIBCPP_TYPE_TRAITS_IS_REPLACEABLE_H
 
 #include <__config>
 #include <__type_traits/enable_if.h>
@@ -58,4 +58,4 @@ struct __container_allocator_is_replaceable
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_REPLACEABLE_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_REPLACEABLE_H
diff --git a/libcxx/include/__type_traits/is_same.h b/libcxx/include/__type_traits/is_same.h
index 8efffa1291f4d..58057fea60ea4 100644
--- a/libcxx/include/__type_traits/is_same.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_SAME_H
+#define _LIBCPP_TYPE_TRAITS_IS_SAME_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -41,4 +41,4 @@ using _IsNotSame _LIBCPP_NODEBUG = _BoolConstant<!__is_same(_Tp, _Up)>;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_SAME_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_SAME_H
diff --git a/libcxx/include/__type_traits/is_scalar.h b/libcxx/include/__type_traits/is_scalar.h
index 4cf8c3948d9f0..aab13843a50bd 100644
--- a/libcxx/include/__type_traits/is_scalar.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_SCALAR_H
+#define _LIBCPP_TYPE_TRAITS_IS_SCALAR_H
 
 #include <__config>
 #include <__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_TYPE_TRAITS_IS_SCALAR_H
diff --git a/libcxx/include/__type_traits/is_signed.h b/libcxx/include/__type_traits/is_signed.h
index 02f51f9cc9b19..a9c80a8d9f464 100644
--- a/libcxx/include/__type_traits/is_signed.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_SIGNED_H
+#define _LIBCPP_TYPE_TRAITS_IS_SIGNED_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -49,4 +49,4 @@ inline constexpr bool is_signed_v = __is_signed_v<_Tp>;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_SIGNED_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_SIGNED_H
diff --git a/libcxx/include/__type_traits/is_specialization.h b/libcxx/include/__type_traits/is_specialization.h
index f14ab93c3c7dc..28664aef9cb4d 100644
--- a/libcxx/include/__type_traits/is_specialization.h
+++ b/libcxx/include/__type_traits/is_specialization.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_IS_SPECIALIZATION
-#define _LIBCPP___TYPE_TRAITS_IS_SPECIALIZATION
+#ifndef _LIBCPP_TYPE_TRAITS_IS_SPECIALIZATION
+#define _LIBCPP_TYPE_TRAITS_IS_SPECIALIZATION
 
 // This contains parts of P2098R1 but is based on MSVC STL's implementation.
 //
@@ -38,4 +38,4 @@ inline const bool __is_specialization_v<_Template<_Args...>, _Template> = true;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_SPECIALIZATION
+#endif // _LIBCPP_TYPE_TRAITS_IS_SPECIALIZATION
diff --git a/libcxx/include/__type_traits/is_standard_layout.h b/libcxx/include/__type_traits/is_standard_layout.h
index 1489d40219f25..8cc5740099a93 100644
--- a/libcxx/include/__type_traits/is_standard_layout.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_STANDARD_LAYOUT_H
+#define _LIBCPP_TYPE_TRAITS_IS_STANDARD_LAYOUT_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_standard_layout_v = __is_sta
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_STANDARD_LAYOUT_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_STANDARD_LAYOUT_H
diff --git a/libcxx/include/__type_traits/is_swappable.h b/libcxx/include/__type_traits/is_swappable.h
index 5c060402f16d1..51014f1269a4b 100644
--- a/libcxx/include/__type_traits/is_swappable.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_SWAPPABLE_H
+#define _LIBCPP_TYPE_TRAITS_IS_SWAPPABLE_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -103,4 +103,4 @@ struct _LIBCPP_NO_SPECIALIZATIONS is_nothrow_swappable : bool_constant<is_nothro
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_SWAPPABLE_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_SWAPPABLE_H
diff --git a/libcxx/include/__type_traits/is_trivial.h b/libcxx/include/__type_traits/is_trivial.h
index d42ba2ca1d14f..d4f1f2145e471 100644
--- a/libcxx/include/__type_traits/is_trivial.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_TRIVIAL_H
+#define _LIBCPP_TYPE_TRAITS_IS_TRIVIAL_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -32,4 +32,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_trivial_v = __is_trivial(_Tp
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_TRIVIAL_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_TRIVIAL_H
diff --git a/libcxx/include/__type_traits/is_trivially_assignable.h b/libcxx/include/__type_traits/is_trivially_assignable.h
index c95ed9dd57be4..c83420dfa9afa 100644
--- a/libcxx/include/__type_traits/is_trivially_assignable.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_TRIVIALLY_ASSIGNABLE_H
+#define _LIBCPP_TYPE_TRAITS_IS_TRIVIALLY_ASSIGNABLE_H
 
 #include <__config>
 #include <__type_traits/add_reference.h>
@@ -53,4 +53,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_trivially_move_assignable_v
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_ASSIGNABLE_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_TRIVIALLY_ASSIGNABLE_H
diff --git a/libcxx/include/__type_traits/is_trivially_constructible.h b/libcxx/include/__type_traits/is_trivially_constructible.h
index 820b04287c517..9bf3fabf6d7fb 100644
--- a/libcxx/include/__type_traits/is_trivially_constructible.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_TRIVIALLY_CONSTRUCTIBLE_H
+#define _LIBCPP_TYPE_TRAITS_IS_TRIVIALLY_CONSTRUCTIBLE_H
 
 #include <__config>
 #include <__type_traits/add_reference.h>
@@ -61,4 +61,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_trivially_default_constructi
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_CONSTRUCTIBLE_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_TRIVIALLY_CONSTRUCTIBLE_H
diff --git a/libcxx/include/__type_traits/is_trivially_copyable.h b/libcxx/include/__type_traits/is_trivially_copyable.h
index 454ec0f2e7a05..0b2670b3f7baf 100644
--- a/libcxx/include/__type_traits/is_trivially_copyable.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_TRIVIALLY_COPYABLE_H
+#define _LIBCPP_TYPE_TRAITS_IS_TRIVIALLY_COPYABLE_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -32,4 +32,4 @@ inline const bool __is_cheap_to_copy = __is_trivially_copyable(_Tp) && sizeof(_T
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_COPYABLE_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_TRIVIALLY_COPYABLE_H
diff --git a/libcxx/include/__type_traits/is_trivially_destructible.h b/libcxx/include/__type_traits/is_trivially_destructible.h
index 6fa6f2a1537a2..2e0891213b405 100644
--- a/libcxx/include/__type_traits/is_trivially_destructible.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_TRIVIALLY_DESTRUCTIBLE_H
+#define _LIBCPP_TYPE_TRAITS_IS_TRIVIALLY_DESTRUCTIBLE_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -44,4 +44,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_trivially_destructible_v = i
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_DESTRUCTIBLE_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_TRIVIALLY_DESTRUCTIBLE_H
diff --git a/libcxx/include/__type_traits/is_trivially_lexicographically_comparable.h b/libcxx/include/__type_traits/is_trivially_lexicographically_comparable.h
index 15dda5824a362..a1690843551bc 100644
--- a/libcxx/include/__type_traits/is_trivially_lexicographically_comparable.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_TRIVIALLY_LEXICOGRAPHICALLY_COMPARABLE_H
+#define _LIBCPP_TYPE_TRAITS_IS_TRIVIALLY_LEXICOGRAPHICALLY_COMPARABLE_H
 
 #include <__config>
 #include <__fwd/byte.h>
@@ -60,4 +60,4 @@ inline const bool __is_trivially_lexicographically_comparable_v =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_LEXICOGRAPHICALLY_COMPARABLE_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_TRIVIALLY_LEXICOGRAPHICALLY_COMPARABLE_H
diff --git a/libcxx/include/__type_traits/is_trivially_relocatable.h b/libcxx/include/__type_traits/is_trivially_relocatable.h
index 9b0e240de55f4..0e774b3f9d2bd 100644
--- a/libcxx/include/__type_traits/is_trivially_relocatable.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_TRIVIALLY_RELOCATABLE_H
+#define _LIBCPP_TYPE_TRAITS_IS_TRIVIALLY_RELOCATABLE_H
 
 #include <__config>
 #include <__type_traits/enable_if.h>
@@ -41,4 +41,4 @@ struct __libcpp_is_trivially_relocatable<_Tp,
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_TRIVIALLY_RELOCATABLE_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_TRIVIALLY_RELOCATABLE_H
diff --git a/libcxx/include/__type_traits/is_unbounded_array.h b/libcxx/include/__type_traits/is_unbounded_array.h
index e14809e26a787..eeec3e59d3818 100644
--- a/libcxx/include/__type_traits/is_unbounded_array.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_UNBOUNDED_ARRAY_H
+#define _LIBCPP_TYPE_TRAITS_IS_UNBOUNDED_ARRAY_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -35,4 +35,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_unbounded_array_v = __is_unb
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_UNBOUNDED_ARRAY_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_UNBOUNDED_ARRAY_H
diff --git a/libcxx/include/__type_traits/is_union.h b/libcxx/include/__type_traits/is_union.h
index 91a28eef28b49..fd293fd5a1599 100644
--- a/libcxx/include/__type_traits/is_union.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_UNION_H
+#define _LIBCPP_TYPE_TRAITS_IS_UNION_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_union_v = __is_union(_Tp);
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_UNION_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_UNION_H
diff --git a/libcxx/include/__type_traits/is_unqualified.h b/libcxx/include/__type_traits/is_unqualified.h
index 7970b3611601f..b93640e4bfc19 100644
--- a/libcxx/include/__type_traits/is_unqualified.h
+++ b/libcxx/include/__type_traits/is_unqualified.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_IS_UNQUALIFIED_H
-#define _LIBCPP___TYPE_TRAITS_IS_UNQUALIFIED_H
+#ifndef _LIBCPP_TYPE_TRAITS_IS_UNQUALIFIED_H
+#define _LIBCPP_TYPE_TRAITS_IS_UNQUALIFIED_H
 
 #include <__config>
 
@@ -22,4 +22,4 @@ inline const bool __is_unqualified_v = __is_same(_Tp, __remove_cvref(_Tp));
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_UNQUALIFIED_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_UNQUALIFIED_H
diff --git a/libcxx/include/__type_traits/is_unsigned.h b/libcxx/include/__type_traits/is_unsigned.h
index b66027c8d7791..6e277eef8a294 100644
--- a/libcxx/include/__type_traits/is_unsigned.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_UNSIGNED_H
+#define _LIBCPP_TYPE_TRAITS_IS_UNSIGNED_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -49,4 +49,4 @@ inline constexpr bool is_unsigned_v = __is_unsigned_v<_Tp>;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_UNSIGNED_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_UNSIGNED_H
diff --git a/libcxx/include/__type_traits/is_valid_expansion.h b/libcxx/include/__type_traits/is_valid_expansion.h
index 346bc98b110ff..ada1f91ae3c34 100644
--- a/libcxx/include/__type_traits/is_valid_expansion.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_VALID_EXPANSION_H
+#define _LIBCPP_TYPE_TRAITS_IS_VALID_EXPANSION_H
 
 #include <__config>
 #include <__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_TYPE_TRAITS_IS_VALID_EXPANSION_H
diff --git a/libcxx/include/__type_traits/is_void.h b/libcxx/include/__type_traits/is_void.h
index f3af756863d03..64b17b03acc33 100644
--- a/libcxx/include/__type_traits/is_void.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_VOID_H
+#define _LIBCPP_TYPE_TRAITS_IS_VOID_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_void_v = __is_same(__remove_
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_VOID_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_VOID_H
diff --git a/libcxx/include/__type_traits/is_volatile.h b/libcxx/include/__type_traits/is_volatile.h
index c654ebba9299e..d16269de910f1 100644
--- a/libcxx/include/__type_traits/is_volatile.h
+++ b/libcxx/include/__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_TYPE_TRAITS_IS_VOLATILE_H
+#define _LIBCPP_TYPE_TRAITS_IS_VOLATILE_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -28,4 +28,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool is_volatile_v = __is_volatile(_
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_VOLATILE_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_VOLATILE_H
diff --git a/libcxx/include/__type_traits/is_within_lifetime.h b/libcxx/include/__type_traits/is_within_lifetime.h
index 242f2adaf357b..1cc64b4d3379f 100644
--- a/libcxx/include/__type_traits/is_within_lifetime.h
+++ b/libcxx/include/__type_traits/is_within_lifetime.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_IS_WITHIN_LIFETIME_H
-#define _LIBCPP___TYPE_TRAITS_IS_WITHIN_LIFETIME_H
+#ifndef _LIBCPP_TYPE_TRAITS_IS_WITHIN_LIFETIME_H
+#define _LIBCPP_TYPE_TRAITS_IS_WITHIN_LIFETIME_H
 
 #include <__config>
 
@@ -26,4 +26,4 @@ _LIBCPP_HIDE_FROM_ABI consteval bool is_within_lifetime(const _Tp* __p) noexcept
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_IS_WITHIN_LIFETIME_H
+#endif // _LIBCPP_TYPE_TRAITS_IS_WITHIN_LIFETIME_H
diff --git a/libcxx/include/__type_traits/lazy.h b/libcxx/include/__type_traits/lazy.h
index 80826f1d64f60..aa7045ba59e5a 100644
--- a/libcxx/include/__type_traits/lazy.h
+++ b/libcxx/include/__type_traits/lazy.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_LAZY_H
-#define _LIBCPP___TYPE_TRAITS_LAZY_H
+#ifndef _LIBCPP_TYPE_TRAITS_LAZY_H
+#define _LIBCPP_TYPE_TRAITS_LAZY_H
 
 #include <__config>
 
@@ -22,4 +22,4 @@ struct _Lazy : _Func<_Args...> {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_LAZY_H
+#endif // _LIBCPP_TYPE_TRAITS_LAZY_H
diff --git a/libcxx/include/__type_traits/make_32_64_or_128_bit.h b/libcxx/include/__type_traits/make_32_64_or_128_bit.h
index 7016209ec9c0a..bb99cec6773fa 100644
--- a/libcxx/include/__type_traits/make_32_64_or_128_bit.h
+++ b/libcxx/include/__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_TYPE_TRAITS_MAKE_32_64_OR_128_BIT_H
+#define _LIBCPP_TYPE_TRAITS_MAKE_32_64_OR_128_BIT_H
 
 #include <__config>
 #include <__type_traits/conditional.h>
@@ -46,4 +46,4 @@ using __make_32_64_or_128_bit_t _LIBCPP_NODEBUG =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_MAKE_32_64_OR_128_BIT_H
+#endif // _LIBCPP_TYPE_TRAITS_MAKE_32_64_OR_128_BIT_H
diff --git a/libcxx/include/__type_traits/make_const_lvalue_ref.h b/libcxx/include/__type_traits/make_const_lvalue_ref.h
index f9955334de30b..6122b496e44c7 100644
--- a/libcxx/include/__type_traits/make_const_lvalue_ref.h
+++ b/libcxx/include/__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_TYPE_TRAITS_MAKE_CONST_LVALUE_REF_H
+#define _LIBCPP_TYPE_TRAITS_MAKE_CONST_LVALUE_REF_H
 
 #include <__config>
 #include <__type_traits/remove_reference.h>
@@ -23,4 +23,4 @@ using __make_const_lvalue_ref _LIBCPP_NODEBUG = const __libcpp_remove_reference_
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_MAKE_CONST_LVALUE_REF_H
+#endif // _LIBCPP_TYPE_TRAITS_MAKE_CONST_LVALUE_REF_H
diff --git a/libcxx/include/__type_traits/make_signed.h b/libcxx/include/__type_traits/make_signed.h
index dff23d880dc30..16f52b9493dcb 100644
--- a/libcxx/include/__type_traits/make_signed.h
+++ b/libcxx/include/__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_TYPE_TRAITS_MAKE_SIGNED_H
+#define _LIBCPP_TYPE_TRAITS_MAKE_SIGNED_H
 
 #include <__config>
 #include <__type_traits/copy_cv.h>
@@ -81,4 +81,4 @@ using make_signed_t = __make_signed_t<_Tp>;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_MAKE_SIGNED_H
+#endif // _LIBCPP_TYPE_TRAITS_MAKE_SIGNED_H
diff --git a/libcxx/include/__type_traits/make_transparent.h b/libcxx/include/__type_traits/make_transparent.h
index 4d3207a807fa7..a50d3d856bfe7 100644
--- a/libcxx/include/__type_traits/make_transparent.h
+++ b/libcxx/include/__type_traits/make_transparent.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_MAKE_TRANSPARENT_H
-#define _LIBCPP___TYPE_TRAITS_MAKE_TRANSPARENT_H
+#ifndef _LIBCPP_TYPE_TRAITS_MAKE_TRANSPARENT_H
+#define _LIBCPP_TYPE_TRAITS_MAKE_TRANSPARENT_H
 
 #include <__config>
 #include <__type_traits/enable_if.h>
@@ -45,4 +45,4 @@ _LIBCPP_HIDE_FROM_ABI __make_transparent_t<_Comparator> __as_transparent(_Compar
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_MAKE_TRANSPARENT_H
+#endif // _LIBCPP_TYPE_TRAITS_MAKE_TRANSPARENT_H
diff --git a/libcxx/include/__type_traits/make_unsigned.h b/libcxx/include/__type_traits/make_unsigned.h
index a83baa658e294..df4ad48d2b5d8 100644
--- a/libcxx/include/__type_traits/make_unsigned.h
+++ b/libcxx/include/__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_TYPE_TRAITS_MAKE_UNSIGNED_H
+#define _LIBCPP_TYPE_TRAITS_MAKE_UNSIGNED_H
 
 #include <__config>
 #include <__type_traits/conditional.h>
@@ -91,4 +91,4 @@ using __copy_unsigned_t _LIBCPP_NODEBUG = __conditional_t<is_unsigned<_Tp>::valu
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_MAKE_UNSIGNED_H
+#endif // _LIBCPP_TYPE_TRAITS_MAKE_UNSIGNED_H
diff --git a/libcxx/include/__type_traits/maybe_const.h b/libcxx/include/__type_traits/maybe_const.h
index 7ef742a123d02..0df7ffe8a9796 100644
--- a/libcxx/include/__type_traits/maybe_const.h
+++ b/libcxx/include/__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_TYPE_TRAITS_MAYBE_CONST_H
+#define _LIBCPP_TYPE_TRAITS_MAYBE_CONST_H
 
 #include <__config>
 #include <__type_traits/conditional.h>
@@ -23,4 +23,4 @@ using __maybe_const _LIBCPP_NODEBUG = __conditional_t<_Const, const _Tp, _Tp>;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_MAYBE_CONST_H
+#endif // _LIBCPP_TYPE_TRAITS_MAYBE_CONST_H
diff --git a/libcxx/include/__type_traits/nat.h b/libcxx/include/__type_traits/nat.h
index 9f39b806814e2..30cf7349f9898 100644
--- a/libcxx/include/__type_traits/nat.h
+++ b/libcxx/include/__type_traits/nat.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_NAT_H
-#define _LIBCPP___TYPE_TRAITS_NAT_H
+#ifndef _LIBCPP_TYPE_TRAITS_NAT_H
+#define _LIBCPP_TYPE_TRAITS_NAT_H
 
 #include <__config>
 
@@ -28,4 +28,4 @@ struct __nat {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_NAT_H
+#endif // _LIBCPP_TYPE_TRAITS_NAT_H
diff --git a/libcxx/include/__type_traits/negation.h b/libcxx/include/__type_traits/negation.h
index a745a999a8bfb..633da6cdf2aa5 100644
--- a/libcxx/include/__type_traits/negation.h
+++ b/libcxx/include/__type_traits/negation.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_NEGATION_H
-#define _LIBCPP___TYPE_TRAITS_NEGATION_H
+#ifndef _LIBCPP_TYPE_TRAITS_NEGATION_H
+#define _LIBCPP_TYPE_TRAITS_NEGATION_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -30,4 +30,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool negation_v = !_Tp::value;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_NEGATION_H
+#endif // _LIBCPP_TYPE_TRAITS_NEGATION_H
diff --git a/libcxx/include/__type_traits/promote.h b/libcxx/include/__type_traits/promote.h
index 96b4903032b18..adbbefdd6c644 100644
--- a/libcxx/include/__type_traits/promote.h
+++ b/libcxx/include/__type_traits/promote.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_PROMOTE_H
-#define _LIBCPP___TYPE_TRAITS_PROMOTE_H
+#ifndef _LIBCPP_TYPE_TRAITS_PROMOTE_H
+#define _LIBCPP_TYPE_TRAITS_PROMOTE_H
 
 #include <__config>
 #include <__type_traits/enable_if.h>
@@ -40,4 +40,4 @@ using __promote_t _LIBCPP_NODEBUG =
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_PROMOTE_H
+#endif // _LIBCPP_TYPE_TRAITS_PROMOTE_H
diff --git a/libcxx/include/__type_traits/rank.h b/libcxx/include/__type_traits/rank.h
index 5196b62949fa2..add1de6895a10 100644
--- a/libcxx/include/__type_traits/rank.h
+++ b/libcxx/include/__type_traits/rank.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_RANK_H
-#define _LIBCPP___TYPE_TRAITS_RANK_H
+#ifndef _LIBCPP_TYPE_TRAITS_RANK_H
+#define _LIBCPP_TYPE_TRAITS_RANK_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -49,4 +49,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr size_t rank_v = rank<_Tp>::value;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_RANK_H
+#endif // _LIBCPP_TYPE_TRAITS_RANK_H
diff --git a/libcxx/include/__type_traits/reference_constructs_from_temporary.h b/libcxx/include/__type_traits/reference_constructs_from_temporary.h
index a8325620414ea..e3121b96df36c 100644
--- a/libcxx/include/__type_traits/reference_constructs_from_temporary.h
+++ b/libcxx/include/__type_traits/reference_constructs_from_temporary.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_REFERENCE_CONSTRUCTS_FROM_TEMPORARY_H
-#define _LIBCPP___TYPE_TRAITS_REFERENCE_CONSTRUCTS_FROM_TEMPORARY_H
+#ifndef _LIBCPP_TYPE_TRAITS_REFERENCE_CONSTRUCTS_FROM_TEMPORARY_H
+#define _LIBCPP_TYPE_TRAITS_REFERENCE_CONSTRUCTS_FROM_TEMPORARY_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -35,4 +35,4 @@ inline const bool __reference_constructs_from_temporary_v = __reference_construc
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_REFERENCE_CONSTRUCTS_FROM_TEMPORARY_H
+#endif // _LIBCPP_TYPE_TRAITS_REFERENCE_CONSTRUCTS_FROM_TEMPORARY_H
diff --git a/libcxx/include/__type_traits/reference_converts_from_temporary.h b/libcxx/include/__type_traits/reference_converts_from_temporary.h
index 9c51225e53b8e..3a703d6d6b714 100644
--- a/libcxx/include/__type_traits/reference_converts_from_temporary.h
+++ b/libcxx/include/__type_traits/reference_converts_from_temporary.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___TYPE_TRAITS_REFERENCE_CONVERTS_FROM_TEMPORARY_H
-#define _LIBCPP___TYPE_TRAITS_REFERENCE_CONVERTS_FROM_TEMPORARY_H
+#ifndef _LIBCPP_TYPE_TRAITS_REFERENCE_CONVERTS_FROM_TEMPORARY_H
+#define _LIBCPP_TYPE_TRAITS_REFERENCE_CONVERTS_FROM_TEMPORARY_H
 
 #include <__config>
 #include <__type_traits/integral_constant.h>
@@ -32,4 +32,4 @@ _LIBCPP_NO_SPECIALIZATIONS inline constexpr bool reference_converts_from_tempora
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_REFERENCE_CONVERTS_FROM_TEMPORARY_H
+#endif // _LIBCPP_TYPE_TRAITS_REFERENCE_CONVERTS_FROM_TEMPORARY_H
diff --git a/libcxx/include/__type_traits/remove_all_extents.h b/libcxx/include/__type_traits/remove_all_extents.h
index a9aaad488078a..73ed6e6942172 100644
--- a/libcxx/include/__type_traits/remove_all_extents.h
+++ b/libcxx/include/__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_TYPE_TRAITS_REMOVE_ALL_EXTENTS_H
+#define _LIBCPP_TYPE_TRAITS_REMOVE_ALL_EXTENTS_H
 
 #include <__config>
 
@@ -37,4 +37,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_TYPE_TRAITS_REMOVE_ALL_EXTENTS_H
diff --git a/libcxx/include/__type_traits/remove_const.h b/libcxx/include/__type_traits/remove_const.h
index e141a2b068821..8b91fc8417f92 100644
--- a/libcxx/include/__type_traits/remove_const.h
+++ b/libcxx/include/__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_TYPE_TRAITS_REMOVE_CONST_H
+#define _LIBCPP_TYPE_TRAITS_REMOVE_CONST_H
 
 #include <__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_TYPE_TRAITS_REMOVE_CONST_H
diff --git a/libcxx/include/__type_traits/remove_const_ref.h b/libcxx/include/__type_traits/remove_const_ref.h
index e6583b396e6c7..943f0f6417525 100644
--- a/libcxx/include/__type_traits/remove_const_ref.h
+++ b/libcxx/include/__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_TYPE_TRAITS_REMOVE_CONST_REF_H
+#define _LIBCPP_TYPE_TRAITS_REMOVE_CONST_REF_H
 
 #include <__config>
 #include <__type_traits/remove_const.h>
@@ -24,4 +24,4 @@ using __remove_const_ref_t _LIBCPP_NODEBUG = __remove_const_t<__libcpp_remove_re
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_REMOVE_CONST_REF_H
+#endif // _LIBCPP_TYPE_TRAITS_REMOVE_CONST_REF_H
diff --git a/libcxx/include/__type_traits/remove_cv.h b/libcxx/include/__type_traits/remove_cv.h
index 0beaf3367ecba..71d9dafb7f116 100644
--- a/libcxx/include/__type_traits/remove_cv.h
+++ b/libcxx/include/__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_TYPE_TRAITS_REMOVE_CV_H
+#define _LIBCPP_TYPE_TRAITS_REMOVE_CV_H
 
 #include <__config>
 
@@ -37,4 +37,4 @@ using remove_cv_t = __remove_cv_t<_Tp>;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_REMOVE_CV_H
+#endif // _LIBCPP_TYPE_TRAITS_REMOVE_CV_H
diff --git a/libcxx/include/__type_traits/remove_cvref.h b/libcxx/include/__type_traits/remove_cvref.h
index c568e8df3099d..0b6f6767ec0fd 100644
--- a/libcxx/include/__type_traits/remove_cvref.h
+++ b/libcxx/include/__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_TYPE_TRAITS_REMOVE_CVREF_H
+#define _LIBCPP_TYPE_TRAITS_REMOVE_CVREF_H
 
 #include <__config>
 
@@ -42,4 +42,4 @@ using remove_cvref_t = __remove_cvref_t<_Tp>;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_REMOVE_CVREF_H
+#endif // _LIBCPP_TYPE_TRAITS_REMOVE_CVREF_H
diff --git a/libcxx/include/__type_traits/remove_extent.h b/libcxx/include/__type_traits/remove_extent.h
index 108b867bd0b49..2add384b75c0d 100644
--- a/libcxx/include/__type_traits/remove_extent.h
+++ b/libcxx/include/__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_TYPE_TRAITS_REMOVE_EXTENT_H
+#define _LIBCPP_TYPE_TRAITS_REMOVE_EXTENT_H
 
 #include <__config>
 
@@ -37,4 +37,4 @@ using remove_extent_t = __remove_extent_t<_Tp>;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_REMOVE_EXTENT_H
+#endif // _LIBCPP_TYPE_TRAITS_REMOVE_EXTENT_H
diff --git a/libcxx/include/__type_traits/remove_pointer.h b/libcxx/include/__type_traits/remove_pointer.h
index 975ed43047dee..bff74a340f38f 100644
--- a/libcxx/include/__type_traits/remove_pointer.h
+++ b/libcxx/include/__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_TYPE_TRAITS_REMOVE_POINTER_H
+#define _LIBCPP_TYPE_TRAITS_REMOVE_POINTER_H
 
 #include <__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_TYPE_TRAITS_REMOVE_POINTER_H
diff --git a/libcxx/include/__type_traits/remove_reference.h b/libcxx/include/__type_traits/remove_reference.h
index 7cc3ca1705de2..e09d2de836a38 100644
--- a/libcxx/include/__type_traits/remove_reference.h
+++ b/libcxx/include/__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_TYPE_TRAITS_REMOVE_REFERENCE_H
+#define _LIBCPP_TYPE_TRAITS_REMOVE_REFERENCE_H
 
 #include <__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_TYPE_TRAITS_REMOVE_REFERENCE_H
diff --git a/libcxx/include/__type_traits/remove_volatile.h b/libcxx/include/__type_traits/remove_volatile.h
index ee861c050ea50..80297cf8cfd72 100644
--- a/libcxx/include/__type_traits/remove_volatile.h
+++ b/libcxx/include/__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_TYPE_TRAITS_REMOVE_VOLATILE_H
+#define _LIBCPP_TYPE_TRAITS_REMOVE_VOLATILE_H
 
 #include <__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_TYPE_TRAITS_REMOVE_VOLATILE_H
diff --git a/libcxx/include/__type_traits/result_of.h b/libcxx/include/__type_traits/result_of.h
index 1714cf4dd96ae..9a26470dba67f 100644
--- a/libcxx/include/__type_traits/result_of.h
+++ b/libcxx/include/__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_TYPE_TRAITS_RESULT_OF_H
+#define _LIBCPP_TYPE_TRAITS_RESULT_OF_H
 
 #include <__config>
 #include <__type_traits/invoke.h>
@@ -40,4 +40,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_TYPE_TRAITS_RESULT_OF_H
diff --git a/libcxx/include/__type_traits/strip_signature.h b/libcxx/include/__type_traits/strip_signature.h
index c8b33278737ed..d7ea17dfca08a 100644
--- a/libcxx/include/__type_traits/strip_signature.h
+++ b/libcxx/include/__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_TYPE_TRAITS_STRIP_SIGNATURE_H
+#define _LIBCPP_TYPE_TRAITS_STRIP_SIGNATURE_H
 
 #include <__config>
 
@@ -78,4 +78,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 17
 
-#endif // _LIBCPP___TYPE_TRAITS_STRIP_SIGNATURE_H
+#endif // _LIBCPP_TYPE_TRAITS_STRIP_SIGNATURE_H
diff --git a/libcxx/include/__type_traits/type_identity.h b/libcxx/include/__type_traits/type_identity.h
index f526aef4d5b2f..6b2216184dc30 100644
--- a/libcxx/include/__type_traits/type_identity.h
+++ b/libcxx/include/__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_TYPE_TRAITS_TYPE_IDENTITY_H
+#define _LIBCPP_TYPE_TRAITS_TYPE_IDENTITY_H
 
 #include <__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_TYPE_TRAITS_TYPE_IDENTITY_H
diff --git a/libcxx/include/__type_traits/type_list.h b/libcxx/include/__type_traits/type_list.h
index f20c384db5ca8..9bce3a039e04e 100644
--- a/libcxx/include/__type_traits/type_list.h
+++ b/libcxx/include/__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_TYPE_TRAITS_TYPE_LIST_H
+#define _LIBCPP_TYPE_TRAITS_TYPE_LIST_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -44,4 +44,4 @@ struct __find_first<__type_list<_Head, _Tail...>, _Size, false> {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_TYPE_LIST_H
+#endif // _LIBCPP_TYPE_TRAITS_TYPE_LIST_H
diff --git a/libcxx/include/__type_traits/underlying_type.h b/libcxx/include/__type_traits/underlying_type.h
index 100734ccf15d6..54d23a8e7742d 100644
--- a/libcxx/include/__type_traits/underlying_type.h
+++ b/libcxx/include/__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_TYPE_TRAITS_UNDERLYING_TYPE_H
+#define _LIBCPP_TYPE_TRAITS_UNDERLYING_TYPE_H
 
 #include <__config>
 #include <__type_traits/is_enum.h>
@@ -48,4 +48,4 @@ using underlying_type_t = __underlying_type_t<_Tp>;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_UNDERLYING_TYPE_H
+#endif // _LIBCPP_TYPE_TRAITS_UNDERLYING_TYPE_H
diff --git a/libcxx/include/__type_traits/unwrap_ref.h b/libcxx/include/__type_traits/unwrap_ref.h
index e8ca2b5028f6c..ae8fbe0a48fba 100644
--- a/libcxx/include/__type_traits/unwrap_ref.h
+++ b/libcxx/include/__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_TYPE_TRAITS_UNWRAP_REF_H
+#define _LIBCPP_TYPE_TRAITS_UNWRAP_REF_H
 
 #include <__config>
 #include <__fwd/functional.h>
@@ -48,4 +48,4 @@ using unwrap_ref_decay_t = __unwrap_ref_decay_t<_Tp>;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_UNWRAP_REF_H
+#endif // _LIBCPP_TYPE_TRAITS_UNWRAP_REF_H
diff --git a/libcxx/include/__type_traits/void_t.h b/libcxx/include/__type_traits/void_t.h
index 8adadfa696372..4812333b5d652 100644
--- a/libcxx/include/__type_traits/void_t.h
+++ b/libcxx/include/__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_TYPE_TRAITS_VOID_T_H
+#define _LIBCPP_TYPE_TRAITS_VOID_T_H
 
 #include <__config>
 
@@ -27,4 +27,4 @@ using __void_t _LIBCPP_NODEBUG = void;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___TYPE_TRAITS_VOID_T_H
+#endif // _LIBCPP_TYPE_TRAITS_VOID_T_H
diff --git a/libcxx/include/__utility/as_const.h b/libcxx/include/__utility/as_const.h
index 0f54b984725c6..d524a9563f39c 100644
--- a/libcxx/include/__utility/as_const.h
+++ b/libcxx/include/__utility/as_const.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_AS_CONST_H
-#define _LIBCPP___UTILITY_AS_CONST_H
+#ifndef _LIBCPP_UTILITY_AS_CONST_H
+#define _LIBCPP_UTILITY_AS_CONST_H
 
 #include <__config>
 
@@ -29,4 +29,4 @@ void as_const(const _Tp&&) = delete;
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___UTILITY_AS_CONST_H
+#endif // _LIBCPP_UTILITY_AS_CONST_H
diff --git a/libcxx/include/__utility/as_lvalue.h b/libcxx/include/__utility/as_lvalue.h
index 159f45dad4d41..2d11dd6a189f9 100644
--- a/libcxx/include/__utility/as_lvalue.h
+++ b/libcxx/include/__utility/as_lvalue.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_AS_LVALUE_H
-#define _LIBCPP___UTILITY_AS_LVALUE_H
+#ifndef _LIBCPP_UTILITY_AS_LVALUE_H
+#define _LIBCPP_UTILITY_AS_LVALUE_H
 
 #include <__config>
 
@@ -34,4 +34,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___UTILITY_AS_LVALUE_H
+#endif // _LIBCPP_UTILITY_AS_LVALUE_H
diff --git a/libcxx/include/__utility/auto_cast.h b/libcxx/include/__utility/auto_cast.h
index 06715b3438f99..73cbe32f98d73 100644
--- a/libcxx/include/__utility/auto_cast.h
+++ b/libcxx/include/__utility/auto_cast.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_AUTO_CAST_H
-#define _LIBCPP___UTILITY_AUTO_CAST_H
+#ifndef _LIBCPP_UTILITY_AUTO_CAST_H
+#define _LIBCPP_UTILITY_AUTO_CAST_H
 
 #include <__config>
 #include <__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_UTILITY_AUTO_CAST_H
diff --git a/libcxx/include/__utility/cmp.h b/libcxx/include/__utility/cmp.h
index 68864e23e0397..95dfe614e6b96 100644
--- a/libcxx/include/__utility/cmp.h
+++ b/libcxx/include/__utility/cmp.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_CMP_H
-#define _LIBCPP___UTILITY_CMP_H
+#ifndef _LIBCPP_UTILITY_CMP_H
+#define _LIBCPP_UTILITY_CMP_H
 
 #include <__config>
 #include <__type_traits/integer_traits.h>
@@ -90,4 +90,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___UTILITY_CMP_H
+#endif // _LIBCPP_UTILITY_CMP_H
diff --git a/libcxx/include/__utility/convert_to_integral.h b/libcxx/include/__utility/convert_to_integral.h
index c8149b7744984..9fb32aef20b0b 100644
--- a/libcxx/include/__utility/convert_to_integral.h
+++ b/libcxx/include/__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_UTILITY_CONVERT_TO_INTEGRAL_H
+#define _LIBCPP_UTILITY_CONVERT_TO_INTEGRAL_H
 
 #include <__config>
 #include <__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_UTILITY_CONVERT_TO_INTEGRAL_H
diff --git a/libcxx/include/__utility/declval.h b/libcxx/include/__utility/declval.h
index d0856b8afa4db..2183bc8ca3c51 100644
--- a/libcxx/include/__utility/declval.h
+++ b/libcxx/include/__utility/declval.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_DECLVAL_H
-#define _LIBCPP___UTILITY_DECLVAL_H
+#ifndef _LIBCPP_UTILITY_DECLVAL_H
+#define _LIBCPP_UTILITY_DECLVAL_H
 
 #include <__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_UTILITY_DECLVAL_H
diff --git a/libcxx/include/__utility/default_three_way_comparator.h b/libcxx/include/__utility/default_three_way_comparator.h
index 92cdce6aae117..823853fd5770f 100644
--- a/libcxx/include/__utility/default_three_way_comparator.h
+++ b/libcxx/include/__utility/default_three_way_comparator.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_DEFAULT_THREE_WAY_COMPARATOR_H
-#define _LIBCPP___UTILITY_DEFAULT_THREE_WAY_COMPARATOR_H
+#ifndef _LIBCPP_UTILITY_DEFAULT_THREE_WAY_COMPARATOR_H
+#define _LIBCPP_UTILITY_DEFAULT_THREE_WAY_COMPARATOR_H
 
 #include <__config>
 #include <__type_traits/enable_if.h>
@@ -67,4 +67,4 @@ struct __has_default_three_way_comparator<_LHS, _RHS, sizeof(__default_three_way
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___UTILITY_DEFAULT_THREE_WAY_COMPARATOR_H
+#endif // _LIBCPP_UTILITY_DEFAULT_THREE_WAY_COMPARATOR_H
diff --git a/libcxx/include/__utility/element_count.h b/libcxx/include/__utility/element_count.h
index 82b05a7bde483..f8994b71090d7 100644
--- a/libcxx/include/__utility/element_count.h
+++ b/libcxx/include/__utility/element_count.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_ELEMENT_COUNT_H
-#define _LIBCPP___UTILITY_ELEMENT_COUNT_H
+#ifndef _LIBCPP_UTILITY_ELEMENT_COUNT_H
+#define _LIBCPP_UTILITY_ELEMENT_COUNT_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -24,4 +24,4 @@ enum class __element_count : size_t {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___UTILITY_ELEMENT_COUNT_H
+#endif // _LIBCPP_UTILITY_ELEMENT_COUNT_H
diff --git a/libcxx/include/__utility/empty.h b/libcxx/include/__utility/empty.h
index 8cca197145c72..383190f0b36ac 100644
--- a/libcxx/include/__utility/empty.h
+++ b/libcxx/include/__utility/empty.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_EMPTY_H
-#define _LIBCPP___UTILITY_EMPTY_H
+#ifndef _LIBCPP_UTILITY_EMPTY_H
+#define _LIBCPP_UTILITY_EMPTY_H
 
 #include <__config>
 
@@ -21,4 +21,4 @@ struct __empty {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___UTILITY_EMPTY_H
+#endif // _LIBCPP_UTILITY_EMPTY_H
diff --git a/libcxx/include/__utility/exception_guard.h b/libcxx/include/__utility/exception_guard.h
index 6fa744e8b4f32..556bb13c2f6a0 100644
--- a/libcxx/include/__utility/exception_guard.h
+++ b/libcxx/include/__utility/exception_guard.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_EXCEPTION_GUARD_H
-#define _LIBCPP___UTILITY_EXCEPTION_GUARD_H
+#ifndef _LIBCPP_UTILITY_EXCEPTION_GUARD_H
+#define _LIBCPP_UTILITY_EXCEPTION_GUARD_H
 
 #include <__assert>
 #include <__config>
@@ -140,4 +140,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___UTILITY_EXCEPTION_GUARD_H
+#endif // _LIBCPP_UTILITY_EXCEPTION_GUARD_H
diff --git a/libcxx/include/__utility/exchange.h b/libcxx/include/__utility/exchange.h
index 957e9d0acaa65..25ceceb9c7f6a 100644
--- a/libcxx/include/__utility/exchange.h
+++ b/libcxx/include/__utility/exchange.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_EXCHANGE_H
-#define _LIBCPP___UTILITY_EXCHANGE_H
+#ifndef _LIBCPP_UTILITY_EXCHANGE_H
+#define _LIBCPP_UTILITY_EXCHANGE_H
 
 #include <__config>
 #include <__type_traits/is_nothrow_assignable.h>
@@ -38,4 +38,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___UTILITY_EXCHANGE_H
+#endif // _LIBCPP_UTILITY_EXCHANGE_H
diff --git a/libcxx/include/__utility/forward.h b/libcxx/include/__utility/forward.h
index 6674066447033..1022034420736 100644
--- a/libcxx/include/__utility/forward.h
+++ b/libcxx/include/__utility/forward.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_FORWARD_H
-#define _LIBCPP___UTILITY_FORWARD_H
+#ifndef _LIBCPP_UTILITY_FORWARD_H
+#define _LIBCPP_UTILITY_FORWARD_H
 
 #include <__config>
 #include <__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_UTILITY_FORWARD_H
diff --git a/libcxx/include/__utility/forward_like.h b/libcxx/include/__utility/forward_like.h
index 409f716cfbced..9406990cc35ab 100644
--- a/libcxx/include/__utility/forward_like.h
+++ b/libcxx/include/__utility/forward_like.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_FORWARD_LIKE_H
-#define _LIBCPP___UTILITY_FORWARD_LIKE_H
+#ifndef _LIBCPP_UTILITY_FORWARD_LIKE_H
+#define _LIBCPP_UTILITY_FORWARD_LIKE_H
 
 #include <__config>
 #include <__type_traits/conditional.h>
@@ -60,4 +60,4 @@ __forward_as(_LIBCPP_LIFETIMEBOUND _Up&& __val) noexcept {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___UTILITY_FORWARD_LIKE_H
+#endif // _LIBCPP_UTILITY_FORWARD_LIKE_H
diff --git a/libcxx/include/__utility/in_place.h b/libcxx/include/__utility/in_place.h
index c5bfa947058fb..5f5f02c924334 100644
--- a/libcxx/include/__utility/in_place.h
+++ b/libcxx/include/__utility/in_place.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_IN_PLACE_H
-#define _LIBCPP___UTILITY_IN_PLACE_H
+#ifndef _LIBCPP_UTILITY_IN_PLACE_H
+#define _LIBCPP_UTILITY_IN_PLACE_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -61,4 +61,4 @@ using __is_inplace_index _LIBCPP_NODEBUG = __is_inplace_index_imp<__remove_cvref
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___UTILITY_IN_PLACE_H
+#endif // _LIBCPP_UTILITY_IN_PLACE_H
diff --git a/libcxx/include/__utility/integer_sequence.h b/libcxx/include/__utility/integer_sequence.h
index 329826ae5eda2..4d78238cc0211 100644
--- a/libcxx/include/__utility/integer_sequence.h
+++ b/libcxx/include/__utility/integer_sequence.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_INTEGER_SEQUENCE_H
-#define _LIBCPP___UTILITY_INTEGER_SEQUENCE_H
+#ifndef _LIBCPP_UTILITY_INTEGER_SEQUENCE_H
+#define _LIBCPP_UTILITY_INTEGER_SEQUENCE_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -73,4 +73,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_CXX03_LANG
 
-#endif // _LIBCPP___UTILITY_INTEGER_SEQUENCE_H
+#endif // _LIBCPP_UTILITY_INTEGER_SEQUENCE_H
diff --git a/libcxx/include/__utility/is_pointer_in_range.h b/libcxx/include/__utility/is_pointer_in_range.h
index 55fac6256b74e..71482061158d8 100644
--- a/libcxx/include/__utility/is_pointer_in_range.h
+++ b/libcxx/include/__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_UTILITY_IS_POINTER_IN_RANGE_H
+#define _LIBCPP_UTILITY_IS_POINTER_IN_RANGE_H
 
 #include <__algorithm/comp.h>
 #include <__assert>
@@ -67,4 +67,4 @@ __is_overlapping_range(const _Tp* __begin, const _Tp* __end, const _Up* __begin2
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___UTILITY_IS_POINTER_IN_RANGE_H
+#endif // _LIBCPP_UTILITY_IS_POINTER_IN_RANGE_H
diff --git a/libcxx/include/__utility/is_valid_range.h b/libcxx/include/__utility/is_valid_range.h
index 7286662dbf309..a46376a8e1c67 100644
--- a/libcxx/include/__utility/is_valid_range.h
+++ b/libcxx/include/__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_UTILITY_IS_VALID_RANGE_H
+#define _LIBCPP_UTILITY_IS_VALID_RANGE_H
 
 #include <__algorithm/comp.h>
 #include <__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_UTILITY_IS_VALID_RANGE_H
diff --git a/libcxx/include/__utility/lazy_synth_three_way_comparator.h b/libcxx/include/__utility/lazy_synth_three_way_comparator.h
index 8c78742ccb4e3..35afabfc4bad4 100644
--- a/libcxx/include/__utility/lazy_synth_three_way_comparator.h
+++ b/libcxx/include/__utility/lazy_synth_three_way_comparator.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_LAZY_SYNTH_THREE_WAY_COMPARATOR_H
-#define _LIBCPP___UTILITY_LAZY_SYNTH_THREE_WAY_COMPARATOR_H
+#ifndef _LIBCPP_UTILITY_LAZY_SYNTH_THREE_WAY_COMPARATOR_H
+#define _LIBCPP_UTILITY_LAZY_SYNTH_THREE_WAY_COMPARATOR_H
 
 #include <__config>
 #include <__type_traits/conjunction.h>
@@ -105,4 +105,4 @@ struct __lazy_synth_three_way_comparator<_Comparator,
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___UTILITY_LAZY_SYNTH_THREE_WAY_COMPARATOR_H
+#endif // _LIBCPP_UTILITY_LAZY_SYNTH_THREE_WAY_COMPARATOR_H
diff --git a/libcxx/include/__utility/move.h b/libcxx/include/__utility/move.h
index bc16697b5c893..2696228793e4b 100644
--- a/libcxx/include/__utility/move.h
+++ b/libcxx/include/__utility/move.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_MOVE_H
-#define _LIBCPP___UTILITY_MOVE_H
+#ifndef _LIBCPP_UTILITY_MOVE_H
+#define _LIBCPP_UTILITY_MOVE_H
 
 #include <__config>
 #include <__type_traits/conditional.h>
@@ -46,4 +46,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___UTILITY_MOVE_H
+#endif // _LIBCPP_UTILITY_MOVE_H
diff --git a/libcxx/include/__utility/no_destroy.h b/libcxx/include/__utility/no_destroy.h
index e1eccb3950332..f11ecb3adb951 100644
--- a/libcxx/include/__utility/no_destroy.h
+++ b/libcxx/include/__utility/no_destroy.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_NO_DESTROY_H
-#define _LIBCPP___UTILITY_NO_DESTROY_H
+#ifndef _LIBCPP_UTILITY_NO_DESTROY_H
+#define _LIBCPP_UTILITY_NO_DESTROY_H
 
 #include <__config>
 #include <__new/placement_new_delete.h>
@@ -50,4 +50,4 @@ struct __no_destroy {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___UTILITY_NO_DESTROY_H
+#endif // _LIBCPP_UTILITY_NO_DESTROY_H
diff --git a/libcxx/include/__utility/pair.h b/libcxx/include/__utility/pair.h
index 33694c52430f1..84b52c862a710 100644
--- a/libcxx/include/__utility/pair.h
+++ b/libcxx/include/__utility/pair.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_PAIR_H
-#define _LIBCPP___UTILITY_PAIR_H
+#ifndef _LIBCPP_UTILITY_PAIR_H
+#define _LIBCPP_UTILITY_PAIR_H
 
 #include <__compare/common_comparison_category.h>
 #include <__compare/synth_three_way.h>
@@ -689,4 +689,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___UTILITY_PAIR_H
+#endif // _LIBCPP_UTILITY_PAIR_H
diff --git a/libcxx/include/__utility/piecewise_construct.h b/libcxx/include/__utility/piecewise_construct.h
index 9823b707531de..b78ad418b6eb2 100644
--- a/libcxx/include/__utility/piecewise_construct.h
+++ b/libcxx/include/__utility/piecewise_construct.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_PIECEWISE_CONSTRUCT_H
-#define _LIBCPP___UTILITY_PIECEWISE_CONSTRUCT_H
+#ifndef _LIBCPP_UTILITY_PIECEWISE_CONSTRUCT_H
+#define _LIBCPP_UTILITY_PIECEWISE_CONSTRUCT_H
 
 #include <__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_UTILITY_PIECEWISE_CONSTRUCT_H
diff --git a/libcxx/include/__utility/priority_tag.h b/libcxx/include/__utility/priority_tag.h
index ef7cf162b9b4c..5629c53310315 100644
--- a/libcxx/include/__utility/priority_tag.h
+++ b/libcxx/include/__utility/priority_tag.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_PRIORITY_TAG_H
-#define _LIBCPP___UTILITY_PRIORITY_TAG_H
+#ifndef _LIBCPP_UTILITY_PRIORITY_TAG_H
+#define _LIBCPP_UTILITY_PRIORITY_TAG_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -25,4 +25,4 @@ struct __priority_tag<0> {};
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___UTILITY_PRIORITY_TAG_H
+#endif // _LIBCPP_UTILITY_PRIORITY_TAG_H
diff --git a/libcxx/include/__utility/rel_ops.h b/libcxx/include/__utility/rel_ops.h
index a8caf5bdeaf27..3c9d37dd93592 100644
--- a/libcxx/include/__utility/rel_ops.h
+++ b/libcxx/include/__utility/rel_ops.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_REL_OPS_H
-#define _LIBCPP___UTILITY_REL_OPS_H
+#ifndef _LIBCPP_UTILITY_REL_OPS_H
+#define _LIBCPP_UTILITY_REL_OPS_H
 
 #include <__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_UTILITY_REL_OPS_H
diff --git a/libcxx/include/__utility/scope_guard.h b/libcxx/include/__utility/scope_guard.h
index db4f0e4c73a2a..07c29ec9b08ba 100644
--- a/libcxx/include/__utility/scope_guard.h
+++ b/libcxx/include/__utility/scope_guard.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_SCOPE_GUARD_H
-#define _LIBCPP___UTILITY_SCOPE_GUARD_H
+#ifndef _LIBCPP_UTILITY_SCOPE_GUARD_H
+#define _LIBCPP_UTILITY_SCOPE_GUARD_H
 
 #include <__config>
 #include <__utility/move.h>
@@ -54,4 +54,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___UTILITY_SCOPE_GUARD_H
+#endif // _LIBCPP_UTILITY_SCOPE_GUARD_H
diff --git a/libcxx/include/__utility/small_buffer.h b/libcxx/include/__utility/small_buffer.h
index 132a57f0fefab..b495306a235d4 100644
--- a/libcxx/include/__utility/small_buffer.h
+++ b/libcxx/include/__utility/small_buffer.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_SMALL_BUFFER_H
-#define _LIBCPP___UTILITY_SMALL_BUFFER_H
+#ifndef _LIBCPP_UTILITY_SMALL_BUFFER_H
+#define _LIBCPP_UTILITY_SMALL_BUFFER_H
 
 #include <__config>
 #include <__cstddef/byte.h>
@@ -98,4 +98,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 23
 
-#endif // _LIBCPP___UTILITY_SMALL_BUFFER_H
+#endif // _LIBCPP_UTILITY_SMALL_BUFFER_H
diff --git a/libcxx/include/__utility/swap.h b/libcxx/include/__utility/swap.h
index d374825d7c4d1..ad75dca7541a9 100644
--- a/libcxx/include/__utility/swap.h
+++ b/libcxx/include/__utility/swap.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_SWAP_H
-#define _LIBCPP___UTILITY_SWAP_H
+#ifndef _LIBCPP_UTILITY_SWAP_H
+#define _LIBCPP_UTILITY_SWAP_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -57,4 +57,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___UTILITY_SWAP_H
+#endif // _LIBCPP_UTILITY_SWAP_H
diff --git a/libcxx/include/__utility/to_underlying.h b/libcxx/include/__utility/to_underlying.h
index 3e9d405a5f666..8493a7306fef3 100644
--- a/libcxx/include/__utility/to_underlying.h
+++ b/libcxx/include/__utility/to_underlying.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_TO_UNDERLYING_H
-#define _LIBCPP___UTILITY_TO_UNDERLYING_H
+#ifndef _LIBCPP_UTILITY_TO_UNDERLYING_H
+#define _LIBCPP_UTILITY_TO_UNDERLYING_H
 
 #include <__config>
 #include <__type_traits/underlying_type.h>
@@ -35,4 +35,4 @@ template <class _Tp>
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___UTILITY_TO_UNDERLYING_H
+#endif // _LIBCPP_UTILITY_TO_UNDERLYING_H
diff --git a/libcxx/include/__utility/try_key_extraction.h b/libcxx/include/__utility/try_key_extraction.h
index 755c08214019f..11fc55a89a710 100644
--- a/libcxx/include/__utility/try_key_extraction.h
+++ b/libcxx/include/__utility/try_key_extraction.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_TRY_EXTRACT_KEY_H
-#define _LIBCPP___UTILITY_TRY_EXTRACT_KEY_H
+#ifndef _LIBCPP_UTILITY_TRY_EXTRACT_KEY_H
+#define _LIBCPP_UTILITY_TRY_EXTRACT_KEY_H
 
 #include <__config>
 #include <__fwd/pair.h>
@@ -111,4 +111,4 @@ __try_key_extraction(_WithKey __with_key, _WithoutKey __without_key, _Args&&...
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___UTILITY_TRY_EXTRACT_KEY_H
+#endif // _LIBCPP_UTILITY_TRY_EXTRACT_KEY_H
diff --git a/libcxx/include/__utility/unreachable.h b/libcxx/include/__utility/unreachable.h
index 5525452aa55ef..9701371d5146a 100644
--- a/libcxx/include/__utility/unreachable.h
+++ b/libcxx/include/__utility/unreachable.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___UTILITY_UNREACHABLE_H
-#define _LIBCPP___UTILITY_UNREACHABLE_H
+#ifndef _LIBCPP_UTILITY_UNREACHABLE_H
+#define _LIBCPP_UTILITY_UNREACHABLE_H
 
 #include <__assert>
 #include <__config>
@@ -31,4 +31,4 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___UTILITY_UNREACHABLE_H
+#endif // _LIBCPP_UTILITY_UNREACHABLE_H
diff --git a/libcxx/include/__variant/monostate.h b/libcxx/include/__variant/monostate.h
index 3939e42a94772..d9bc2e5b33783 100644
--- a/libcxx/include/__variant/monostate.h
+++ b/libcxx/include/__variant/monostate.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___VARIANT_MONOSTATE_H
-#define _LIBCPP___VARIANT_MONOSTATE_H
+#ifndef _LIBCPP_VARIANT_MONOSTATE_H
+#define _LIBCPP_VARIANT_MONOSTATE_H
 
 #include <__compare/ordering.h>
 #include <__config>
@@ -63,4 +63,4 @@ struct hash<monostate> {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___VARIANT_MONOSTATE_H
+#endif // _LIBCPP_VARIANT_MONOSTATE_H
diff --git a/libcxx/include/__vector/comparison.h b/libcxx/include/__vector/comparison.h
index 27178e41ec513..675267aad5103 100644
--- a/libcxx/include/__vector/comparison.h
+++ b/libcxx/include/__vector/comparison.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___VECTOR_COMPARISON_H
-#define _LIBCPP___VECTOR_COMPARISON_H
+#ifndef _LIBCPP_VECTOR_COMPARISON_H
+#define _LIBCPP_VECTOR_COMPARISON_H
 
 #include <__algorithm/equal.h>
 #include <__algorithm/lexicographical_compare.h>
@@ -68,4 +68,4 @@ operator<=>(const vector<_Tp, _Allocator>& __x, const vector<_Tp, _Allocator>& _
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___VECTOR_COMPARISON_H
+#endif // _LIBCPP_VECTOR_COMPARISON_H
diff --git a/libcxx/include/__vector/container_traits.h b/libcxx/include/__vector/container_traits.h
index 20f2b9ef042cb..92e495e9f3f41 100644
--- a/libcxx/include/__vector/container_traits.h
+++ b/libcxx/include/__vector/container_traits.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___VECTOR_CONTAINER_TRAITS_H
-#define _LIBCPP___VECTOR_CONTAINER_TRAITS_H
+#ifndef _LIBCPP_VECTOR_CONTAINER_TRAITS_H
+#define _LIBCPP_VECTOR_CONTAINER_TRAITS_H
 
 #include <__config>
 #include <__fwd/vector.h>
@@ -38,4 +38,4 @@ struct __container_traits<vector<_Tp, _Allocator> > {
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___VECTOR_CONTAINER_TRAITS_H
+#endif // _LIBCPP_VECTOR_CONTAINER_TRAITS_H
diff --git a/libcxx/include/__vector/erase.h b/libcxx/include/__vector/erase.h
index d7379fc1d04e1..76b04e6c8232d 100644
--- a/libcxx/include/__vector/erase.h
+++ b/libcxx/include/__vector/erase.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___VECTOR_ERASE_H
-#define _LIBCPP___VECTOR_ERASE_H
+#ifndef _LIBCPP_VECTOR_ERASE_H
+#define _LIBCPP_VECTOR_ERASE_H
 
 #include <__algorithm/remove.h>
 #include <__algorithm/remove_if.h>
@@ -47,4 +47,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___VECTOR_ERASE_H
+#endif // _LIBCPP_VECTOR_ERASE_H
diff --git a/libcxx/include/__vector/pmr.h b/libcxx/include/__vector/pmr.h
index 8ef603c739a17..d40f6e19af7cf 100644
--- a/libcxx/include/__vector/pmr.h
+++ b/libcxx/include/__vector/pmr.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___VECTOR_PMR_H
-#define _LIBCPP___VECTOR_PMR_H
+#ifndef _LIBCPP_VECTOR_PMR_H
+#define _LIBCPP_VECTOR_PMR_H
 
 #include <__config>
 #include <__fwd/vector.h>
@@ -30,4 +30,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif
 
-#endif // _LIBCPP___VECTOR_PMR_H
+#endif // _LIBCPP_VECTOR_PMR_H
diff --git a/libcxx/include/__vector/swap.h b/libcxx/include/__vector/swap.h
index 7fe27a91419b3..29146365b1bec 100644
--- a/libcxx/include/__vector/swap.h
+++ b/libcxx/include/__vector/swap.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___VECTOR_SWAP_H
-#define _LIBCPP___VECTOR_SWAP_H
+#ifndef _LIBCPP_VECTOR_SWAP_H
+#define _LIBCPP_VECTOR_SWAP_H
 
 #include <__config>
 #include <__fwd/vector.h>
@@ -26,4 +26,4 @@ swap(vector<_Tp, _Allocator>& __x, vector<_Tp, _Allocator>& __y) _NOEXCEPT_(_NOE
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___VECTOR_SWAP_H
+#endif // _LIBCPP_VECTOR_SWAP_H
diff --git a/libcxx/include/__vector/vector.h b/libcxx/include/__vector/vector.h
index 316d3a9d10eff..933741077c33f 100644
--- a/libcxx/include/__vector/vector.h
+++ b/libcxx/include/__vector/vector.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___VECTOR_VECTOR_H
-#define _LIBCPP___VECTOR_VECTOR_H
+#ifndef _LIBCPP_VECTOR_VECTOR_H
+#define _LIBCPP_VECTOR_VECTOR_H
 
 #include <__algorithm/copy.h>
 #include <__algorithm/copy_n.h>
@@ -1466,4 +1466,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___VECTOR_VECTOR_H
+#endif // _LIBCPP_VECTOR_VECTOR_H
diff --git a/libcxx/include/__vector/vector_bool.h b/libcxx/include/__vector/vector_bool.h
index 6cb8f2a7fb012..e1432c27fbae4 100644
--- a/libcxx/include/__vector/vector_bool.h
+++ b/libcxx/include/__vector/vector_bool.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___VECTOR_VECTOR_BOOL_H
-#define _LIBCPP___VECTOR_VECTOR_BOOL_H
+#ifndef _LIBCPP_VECTOR_VECTOR_BOOL_H
+#define _LIBCPP_VECTOR_VECTOR_BOOL_H
 
 #include <__algorithm/copy.h>
 #include <__algorithm/copy_backward.h>
@@ -1119,4 +1119,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP___VECTOR_VECTOR_BOOL_H
+#endif // _LIBCPP_VECTOR_VECTOR_BOOL_H
diff --git a/libcxx/include/__vector/vector_bool_formatter.h b/libcxx/include/__vector/vector_bool_formatter.h
index b08c39c6d574b..6e1a23f70c72a 100644
--- a/libcxx/include/__vector/vector_bool_formatter.h
+++ b/libcxx/include/__vector/vector_bool_formatter.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___VECTOR_VECTOR_BOOL_FORMATTER_H
-#define _LIBCPP___VECTOR_VECTOR_BOOL_FORMATTER_H
+#ifndef _LIBCPP_VECTOR_VECTOR_BOOL_FORMATTER_H
+#define _LIBCPP_VECTOR_VECTOR_BOOL_FORMATTER_H
 
 #include <__concepts/same_as.h>
 #include <__config>
@@ -46,4 +46,4 @@ _LIBCPP_END_NAMESPACE_STD
 
 #endif // _LIBCPP_STD_VER >= 23
 
-#endif // _LIBCPP___VECTOR_VECTOR_BOOL_FORMATTER_H
+#endif // _LIBCPP_VECTOR_VECTOR_BOOL_FORMATTER_H
diff --git a/libcxx/include/__verbose_abort b/libcxx/include/__verbose_abort
index f8b696733e2b3..f17faa37e3af9 100644
--- a/libcxx/include/__verbose_abort
+++ b/libcxx/include/__verbose_abort
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___VERBOSE_ABORT
-#define _LIBCPP___VERBOSE_ABORT
+#ifndef _LIBCPP_VERBOSE_ABORT
+#define _LIBCPP_VERBOSE_ABORT
 
 #include <__config>
 
@@ -49,4 +49,4 @@ void __use(const char*, ...);
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___VERBOSE_ABORT
+#endif // _LIBCPP_VERBOSE_ABORT
diff --git a/libcxx/include/__verbose_trap b/libcxx/include/__verbose_trap
index 13ea727738c3b..63d2559a36071 100644
--- a/libcxx/include/__verbose_trap
+++ b/libcxx/include/__verbose_trap
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___VERBOSE_TRAP
-#define _LIBCPP___VERBOSE_TRAP
+#ifndef _LIBCPP_VERBOSE_TRAP
+#define _LIBCPP_VERBOSE_TRAP
 
 #include <__config>
 
@@ -33,4 +33,4 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___VERBOSE_TRAP
+#endif // _LIBCPP_VERBOSE_TRAP
diff --git a/libcxx/include/experimental/__simd/aligned_tag.h b/libcxx/include/experimental/__simd/aligned_tag.h
index d208bf5c4fbb9..698013f0479e4 100644
--- a/libcxx/include/experimental/__simd/aligned_tag.h
+++ b/libcxx/include/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_EXPERIMENTAL_SIMD_ALIGNED_TAG_H
+#define _LIBCPP_EXPERIMENTAL_SIMD_ALIGNED_TAG_H
 
 #include <__config>
 #include <__cstddef/size_t.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_EXPERIMENTAL_SIMD_ALIGNED_TAG_H
diff --git a/libcxx/include/experimental/__simd/declaration.h b/libcxx/include/experimental/__simd/declaration.h
index d9395baecfe0f..881a83013b8e5 100644
--- a/libcxx/include/experimental/__simd/declaration.h
+++ b/libcxx/include/experimental/__simd/declaration.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP_EXPERIMENTAL___SIMD_DECLARATION_H
-#define _LIBCPP_EXPERIMENTAL___SIMD_DECLARATION_H
+#ifndef _LIBCPP_EXPERIMENTAL_SIMD_DECLARATION_H
+#define _LIBCPP_EXPERIMENTAL_SIMD_DECLARATION_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -85,4 +85,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_EXPERIMENTAL_SIMD_DECLARATION_H
diff --git a/libcxx/include/experimental/__simd/reference.h b/libcxx/include/experimental/__simd/reference.h
index b9fe962348adc..c04ec61f951bb 100644
--- a/libcxx/include/experimental/__simd/reference.h
+++ b/libcxx/include/experimental/__simd/reference.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP_EXPERIMENTAL___SIMD_REFERENCE_H
-#define _LIBCPP_EXPERIMENTAL___SIMD_REFERENCE_H
+#ifndef _LIBCPP_EXPERIMENTAL_SIMD_REFERENCE_H
+#define _LIBCPP_EXPERIMENTAL_SIMD_REFERENCE_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -189,4 +189,4 @@ _LIBCPP_END_NAMESPACE_EXPERIMENTAL
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP_EXPERIMENTAL___SIMD_REFERENCE_H
+#endif // _LIBCPP_EXPERIMENTAL_SIMD_REFERENCE_H
diff --git a/libcxx/include/experimental/__simd/scalar.h b/libcxx/include/experimental/__simd/scalar.h
index 20c8b02c65890..a8710acdbe7a5 100644
--- a/libcxx/include/experimental/__simd/scalar.h
+++ b/libcxx/include/experimental/__simd/scalar.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP_EXPERIMENTAL___SIMD_SCALAR_H
-#define _LIBCPP_EXPERIMENTAL___SIMD_SCALAR_H
+#ifndef _LIBCPP_EXPERIMENTAL_SIMD_SCALAR_H
+#define _LIBCPP_EXPERIMENTAL_SIMD_SCALAR_H
 
 #include <__assert>
 #include <__config>
@@ -99,4 +99,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_EXPERIMENTAL_SIMD_SCALAR_H
diff --git a/libcxx/include/experimental/__simd/simd.h b/libcxx/include/experimental/__simd/simd.h
index 2fd2b2644d0b2..2dc17cb4d4f77 100644
--- a/libcxx/include/experimental/__simd/simd.h
+++ b/libcxx/include/experimental/__simd/simd.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP_EXPERIMENTAL___SIMD_SIMD_H
-#define _LIBCPP_EXPERIMENTAL___SIMD_SIMD_H
+#ifndef _LIBCPP_EXPERIMENTAL_SIMD_SIMD_H
+#define _LIBCPP_EXPERIMENTAL_SIMD_SIMD_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -152,4 +152,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_EXPERIMENTAL_SIMD_SIMD_H
diff --git a/libcxx/include/experimental/__simd/simd_mask.h b/libcxx/include/experimental/__simd/simd_mask.h
index a11766545b43d..b2b8b7f94ec53 100644
--- a/libcxx/include/experimental/__simd/simd_mask.h
+++ b/libcxx/include/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_EXPERIMENTAL_SIMD_SIMD_MASK_H
+#define _LIBCPP_EXPERIMENTAL_SIMD_SIMD_MASK_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -94,4 +94,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_EXPERIMENTAL_SIMD_SIMD_MASK_H
diff --git a/libcxx/include/experimental/__simd/traits.h b/libcxx/include/experimental/__simd/traits.h
index 0bcc2eeba5ce8..bcb8ddee4ecdf 100644
--- a/libcxx/include/experimental/__simd/traits.h
+++ b/libcxx/include/experimental/__simd/traits.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP_EXPERIMENTAL___SIMD_TRAITS_H
-#define _LIBCPP_EXPERIMENTAL___SIMD_TRAITS_H
+#ifndef _LIBCPP_EXPERIMENTAL_SIMD_TRAITS_H
+#define _LIBCPP_EXPERIMENTAL_SIMD_TRAITS_H
 
 #include <__bit/bit_ceil.h>
 #include <__config>
@@ -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_EXPERIMENTAL_SIMD_TRAITS_H
diff --git a/libcxx/include/experimental/__simd/utility.h b/libcxx/include/experimental/__simd/utility.h
index 2af61e34082fc..28513a03d7d78 100644
--- a/libcxx/include/experimental/__simd/utility.h
+++ b/libcxx/include/experimental/__simd/utility.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP_EXPERIMENTAL___SIMD_UTILITY_H
-#define _LIBCPP_EXPERIMENTAL___SIMD_UTILITY_H
+#ifndef _LIBCPP_EXPERIMENTAL_SIMD_UTILITY_H
+#define _LIBCPP_EXPERIMENTAL_SIMD_UTILITY_H
 
 #include <__config>
 #include <__cstddef/size_t.h>
@@ -100,4 +100,4 @@ _LIBCPP_END_NAMESPACE_EXPERIMENTAL
 
 _LIBCPP_POP_MACROS
 
-#endif // _LIBCPP_EXPERIMENTAL___SIMD_UTILITY_H
+#endif // _LIBCPP_EXPERIMENTAL_SIMD_UTILITY_H
diff --git a/libcxx/include/experimental/__simd/vec_ext.h b/libcxx/include/experimental/__simd/vec_ext.h
index 2a4b8c748f86d..6ae2b2ffb7c45 100644
--- a/libcxx/include/experimental/__simd/vec_ext.h
+++ b/libcxx/include/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_EXPERIMENTAL_SIMD_VEC_EXT_H
+#define _LIBCPP_EXPERIMENTAL_SIMD_VEC_EXT_H
 
 #include <__assert>
 #include <__bit/bit_ceil.h>
@@ -127,4 +127,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_EXPERIMENTAL_SIMD_VEC_EXT_H
diff --git a/libcxx/utils/generate_escaped_output_table.py b/libcxx/utils/generate_escaped_output_table.py
index 59dd707ae6126..1e1636604c5d0 100755
--- a/libcxx/utils/generate_escaped_output_table.py
+++ b/libcxx/utils/generate_escaped_output_table.py
@@ -213,8 +213,8 @@ def compactPropertyRanges(input: list[PropertyRange]) -> list[PropertyRange]:
 // 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_FORMAT_ESCAPED_OUTPUT_TABLE_H
+#define _LIBCPP_FORMAT_ESCAPED_OUTPUT_TABLE_H
 
 #include <__algorithm/ranges_upper_bound.h>
 #include <__config>
@@ -239,7 +239,7 @@ def compactPropertyRanges(input: list[PropertyRange]) -> list[PropertyRange]:
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FORMAT_ESCAPED_OUTPUT_TABLE_H"""
+#endif // _LIBCPP_FORMAT_ESCAPED_OUTPUT_TABLE_H"""
 
 
 def property_ranges_to_table(ranges: list[PropertyRange]) -> list[Entry]:
diff --git a/libcxx/utils/generate_extended_grapheme_cluster_table.py b/libcxx/utils/generate_extended_grapheme_cluster_table.py
index eba88a4f48776..e120673cad008 100755
--- a/libcxx/utils/generate_extended_grapheme_cluster_table.py
+++ b/libcxx/utils/generate_extended_grapheme_cluster_table.py
@@ -209,8 +209,8 @@ def compactPropertyRanges(input: list[PropertyRange]) -> list[PropertyRange]:
 // 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_FORMAT_EXTENDED_GRAPHEME_CLUSTER_TABLE_H
+#define _LIBCPP_FORMAT_EXTENDED_GRAPHEME_CLUSTER_TABLE_H
 
 #include <__algorithm/ranges_upper_bound.h>
 #include <__config>
@@ -234,7 +234,7 @@ def compactPropertyRanges(input: list[PropertyRange]) -> list[PropertyRange]:
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FORMAT_EXTENDED_GRAPHEME_CLUSTER_TABLE_H"""
+#endif // _LIBCPP_FORMAT_EXTENDED_GRAPHEME_CLUSTER_TABLE_H"""
 
 
 def property_ranges_to_table(
diff --git a/libcxx/utils/generate_indic_conjunct_break_table.py b/libcxx/utils/generate_indic_conjunct_break_table.py
index 580d8157ffebf..99cf3a9ab6778 100755
--- a/libcxx/utils/generate_indic_conjunct_break_table.py
+++ b/libcxx/utils/generate_indic_conjunct_break_table.py
@@ -202,8 +202,8 @@ def compactPropertyRanges(input: list[PropertyRange]) -> list[PropertyRange]:
 // 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_FORMAT_INDIC_CONJUNCT_BREAK_TABLE_H
+#define _LIBCPP_FORMAT_INDIC_CONJUNCT_BREAK_TABLE_H
 
 #include <__algorithm/ranges_upper_bound.h>
 #include <__config>
@@ -227,7 +227,7 @@ def compactPropertyRanges(input: list[PropertyRange]) -> list[PropertyRange]:
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FORMAT_INDIC_CONJUNCT_BREAK_TABLE_H"""
+#endif // _LIBCPP_FORMAT_INDIC_CONJUNCT_BREAK_TABLE_H"""
 
 
 def property_ranges_to_table(
diff --git a/libcxx/utils/generate_width_estimation_table.py b/libcxx/utils/generate_width_estimation_table.py
index f81f0ba77489e..84fdc62d20be7 100644
--- a/libcxx/utils/generate_width_estimation_table.py
+++ b/libcxx/utils/generate_width_estimation_table.py
@@ -241,8 +241,8 @@ def compactPropertyRanges(input: list[PropertyRange]) -> list[PropertyRange]:
 // 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_FORMAT_WIDTH_ESTIMATION_TABLE_H
+#define _LIBCPP_FORMAT_WIDTH_ESTIMATION_TABLE_H
 
 #include <__algorithm/ranges_upper_bound.h>
 #include <__config>
@@ -265,7 +265,7 @@ def compactPropertyRanges(input: list[PropertyRange]) -> list[PropertyRange]:
 
 _LIBCPP_END_NAMESPACE_STD
 
-#endif // _LIBCPP___FORMAT_WIDTH_ESTIMATION_TABLE_H"""
+#endif // _LIBCPP_FORMAT_WIDTH_ESTIMATION_TABLE_H"""
 
 
 def property_ranges_to_table(ranges: list[PropertyRange]) -> list[Entry]:
diff --git a/libcxx/vendor/llvm/default_assertion_handler.in b/libcxx/vendor/llvm/default_assertion_handler.in
index d352405e905b5..b704d8466c928 100644
--- a/libcxx/vendor/llvm/default_assertion_handler.in
+++ b/libcxx/vendor/llvm/default_assertion_handler.in
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef _LIBCPP___ASSERTION_HANDLER
-#define _LIBCPP___ASSERTION_HANDLER
+#ifndef _LIBCPP_ASSERTION_HANDLER
+#define _LIBCPP_ASSERTION_HANDLER
 
 #if __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
 #  include <__cxx03/__config>
@@ -61,4 +61,4 @@ _LIBCPP_ASSERTION_SEMANTIC_ENFORCE
 
 #endif // __cplusplus < 201103L && defined(_LIBCPP_USE_FROZEN_CXX03_HEADERS)
 
-#endif // _LIBCPP___ASSERTION_HANDLER
+#endif // _LIBCPP_ASSERTION_HANDLER