diff --git a/libcxx/include/version b/libcxx/include/version
--- a/libcxx/include/version
+++ b/libcxx/include/version
@@ -186,8 +186,6 @@
 #pragma GCC system_header
 #endif
 
-// clang-format off
-
 #if _LIBCPP_STD_VER > 11
 # define __cpp_lib_chrono_udls                          201304L
 # define __cpp_lib_complex_udls                         201309L
@@ -380,6 +378,4 @@
 # define __cpp_lib_to_underlying                        202102L
 #endif
 
-// clang-format on
-
 #endif // _LIBCPP_VERSIONH
diff --git a/libcxx/test/libcxx/double_include.sh.cpp b/libcxx/test/libcxx/double_include.sh.cpp
--- a/libcxx/test/libcxx/double_include.sh.cpp
+++ b/libcxx/test/libcxx/double_include.sh.cpp
@@ -22,8 +22,6 @@
 // BEGIN-GENERATED-HEADERS
 ////////////////////////////////////////////////////////////////////////////////
 
-// clang-format off
-
 // WARNING: This test was generated by generate_header_tests.py
 // and should not be edited manually.
 
@@ -237,8 +235,6 @@
 #include <ext/hash_map>
 #include <ext/hash_set>
 
-// clang-format on
-
 ////////////////////////////////////////////////////////////////////////////////
 // END-GENERATED-HEADERS
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/libcxx/test/libcxx/inclusions/algorithm.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/algorithm.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/algorithm.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/algorithm.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <algorithm>
 
diff --git a/libcxx/test/libcxx/inclusions/array.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/array.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/array.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/array.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <array>
 
diff --git a/libcxx/test/libcxx/inclusions/bitset.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/bitset.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/bitset.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/bitset.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <bitset>
 
diff --git a/libcxx/test/libcxx/inclusions/chrono.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/chrono.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/chrono.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/chrono.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: c++03
 
diff --git a/libcxx/test/libcxx/inclusions/cinttypes.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/cinttypes.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/cinttypes.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/cinttypes.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <cinttypes>
 
diff --git a/libcxx/test/libcxx/inclusions/complex.h.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/complex.h.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/complex.h.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/complex.h.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <complex.h>
 
diff --git a/libcxx/test/libcxx/inclusions/coroutine.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/coroutine.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/coroutine.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/coroutine.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: c++03, c++11, c++14, c++17
 
diff --git a/libcxx/test/libcxx/inclusions/deque.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/deque.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/deque.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/deque.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <deque>
 
diff --git a/libcxx/test/libcxx/inclusions/filesystem.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/filesystem.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/filesystem.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/filesystem.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: c++03, c++11, c++14
 // UNSUPPORTED: libcpp-has-no-filesystem-library
diff --git a/libcxx/test/libcxx/inclusions/forward_list.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/forward_list.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/forward_list.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/forward_list.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <forward_list>
 
diff --git a/libcxx/test/libcxx/inclusions/ios.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/ios.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/ios.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/ios.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-localization
 
diff --git a/libcxx/test/libcxx/inclusions/iostream.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/iostream.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/iostream.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/iostream.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-localization
 
diff --git a/libcxx/test/libcxx/inclusions/iterator.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/iterator.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/iterator.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/iterator.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <iterator>
 
diff --git a/libcxx/test/libcxx/inclusions/list.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/list.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/list.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/list.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <list>
 
diff --git a/libcxx/test/libcxx/inclusions/map.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/map.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/map.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/map.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <map>
 
diff --git a/libcxx/test/libcxx/inclusions/memory.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/memory.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/memory.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/memory.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <memory>
 
diff --git a/libcxx/test/libcxx/inclusions/optional.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/optional.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/optional.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/optional.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: c++03, c++11, c++14
 
diff --git a/libcxx/test/libcxx/inclusions/queue.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/queue.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/queue.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/queue.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <queue>
 
diff --git a/libcxx/test/libcxx/inclusions/random.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/random.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/random.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/random.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <random>
 
diff --git a/libcxx/test/libcxx/inclusions/ranges.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/ranges.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/ranges.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/ranges.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: c++03, c++11, c++14, c++17
 // UNSUPPORTED: libcpp-has-no-incomplete-ranges
diff --git a/libcxx/test/libcxx/inclusions/regex.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/regex.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/regex.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/regex.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-localization
 
diff --git a/libcxx/test/libcxx/inclusions/set.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/set.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/set.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/set.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <set>
 
diff --git a/libcxx/test/libcxx/inclusions/stack.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/stack.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/stack.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/stack.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <stack>
 
diff --git a/libcxx/test/libcxx/inclusions/string.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/string.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/string.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/string.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <string>
 
diff --git a/libcxx/test/libcxx/inclusions/string_view.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/string_view.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/string_view.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/string_view.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: c++03, c++11, c++14
 
diff --git a/libcxx/test/libcxx/inclusions/system_error.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/system_error.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/system_error.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/system_error.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: c++03
 
diff --git a/libcxx/test/libcxx/inclusions/tgmath.h.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/tgmath.h.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/tgmath.h.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/tgmath.h.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <tgmath.h>
 
diff --git a/libcxx/test/libcxx/inclusions/thread.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/thread.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/thread.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/thread.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: c++03
 // UNSUPPORTED: libcpp-has-no-threads
diff --git a/libcxx/test/libcxx/inclusions/tuple.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/tuple.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/tuple.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/tuple.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: c++03
 
diff --git a/libcxx/test/libcxx/inclusions/typeindex.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/typeindex.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/typeindex.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/typeindex.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <typeindex>
 
diff --git a/libcxx/test/libcxx/inclusions/unordered_map.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/unordered_map.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/unordered_map.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/unordered_map.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: c++03
 
diff --git a/libcxx/test/libcxx/inclusions/unordered_set.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/unordered_set.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/unordered_set.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/unordered_set.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: c++03
 
diff --git a/libcxx/test/libcxx/inclusions/utility.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/utility.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/utility.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/utility.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <utility>
 
diff --git a/libcxx/test/libcxx/inclusions/valarray.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/valarray.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/valarray.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/valarray.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <valarray>
 
diff --git a/libcxx/test/libcxx/inclusions/variant.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/variant.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/variant.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/variant.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: c++03, c++11, c++14
 
diff --git a/libcxx/test/libcxx/inclusions/vector.inclusions.compile.pass.cpp b/libcxx/test/libcxx/inclusions/vector.inclusions.compile.pass.cpp
--- a/libcxx/test/libcxx/inclusions/vector.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/vector.inclusions.compile.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_header_inclusion_tests.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <vector>
 
diff --git a/libcxx/test/libcxx/min_max_macros.compile.pass.cpp b/libcxx/test/libcxx/min_max_macros.compile.pass.cpp
--- a/libcxx/test/libcxx/min_max_macros.compile.pass.cpp
+++ b/libcxx/test/libcxx/min_max_macros.compile.pass.cpp
@@ -22,8 +22,6 @@
 // BEGIN-GENERATED-HEADERS
 ////////////////////////////////////////////////////////////////////////////////
 
-// clang-format off
-
 // WARNING: This test was generated by generate_header_tests.py
 // and should not be edited manually.
 
@@ -375,8 +373,6 @@
 #include <ext/hash_set>
 TEST_MACROS();
 
-// clang-format on
-
 ////////////////////////////////////////////////////////////////////////////////
 // END-GENERATED-HEADERS
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/libcxx/test/libcxx/no_assert_include.compile.pass.cpp b/libcxx/test/libcxx/no_assert_include.compile.pass.cpp
--- a/libcxx/test/libcxx/no_assert_include.compile.pass.cpp
+++ b/libcxx/test/libcxx/no_assert_include.compile.pass.cpp
@@ -18,8 +18,6 @@
 // BEGIN-GENERATED-HEADERS
 ////////////////////////////////////////////////////////////////////////////////
 
-// clang-format off
-
 // WARNING: This test was generated by generate_header_tests.py
 // and should not be edited manually.
 
@@ -232,8 +230,6 @@
 #include <ext/hash_map>
 #include <ext/hash_set>
 
-// clang-format on
-
 ////////////////////////////////////////////////////////////////////////////////
 // END-GENERATED-HEADERS
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/algorithm.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/algorithm.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/algorithm.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/algorithm.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <algorithm>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/any.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/any.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/any.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/any.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <any>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/array.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/array.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/array.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/array.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <array>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/atomic.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <atomic>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/barrier.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/barrier.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/barrier.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/barrier.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-threads
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/bit.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/bit.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/bit.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/bit.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <bit>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/charconv.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/charconv.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/charconv.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/charconv.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <charconv>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/chrono.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/chrono.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/chrono.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/chrono.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <chrono>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/cmath.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/cmath.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/cmath.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/cmath.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <cmath>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/compare.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/compare.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/compare.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/compare.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <compare>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/complex.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/complex.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/complex.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/complex.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <complex>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/concepts.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/concepts.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/concepts.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/concepts.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <concepts>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/coroutine.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/coroutine.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/coroutine.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/coroutine.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <coroutine>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/cstddef.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/cstddef.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/cstddef.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/cstddef.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <cstddef>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/deque.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/deque.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/deque.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/deque.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <deque>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/exception.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/exception.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/exception.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/exception.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <exception>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/execution.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <execution>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/filesystem.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-filesystem-library
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/format.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/format.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/format.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/format.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-incomplete-format
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/forward_list.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/forward_list.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/forward_list.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/forward_list.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <forward_list>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/functional.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/functional.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/functional.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/functional.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <functional>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/iomanip.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/iomanip.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/iomanip.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/iomanip.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-localization
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/istream.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-localization
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/iterator.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/iterator.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/iterator.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/iterator.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <iterator>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/latch.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/latch.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/latch.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/latch.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-threads
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/limits.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <limits>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/list.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/list.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/list.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/list.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <list>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/locale.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-localization
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/map.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/map.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/map.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/map.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <map>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/memory.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/memory.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/memory.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/memory.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <memory>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/mutex.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/mutex.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/mutex.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/mutex.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-threads
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/new.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/new.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/new.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/new.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <new>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/numbers.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/numbers.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/numbers.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/numbers.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <numbers>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/numeric.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/numeric.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/numeric.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/numeric.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <numeric>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/optional.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/optional.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/optional.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/optional.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <optional>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/ostream.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-localization
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/queue.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/queue.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/queue.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/queue.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <queue>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/ranges.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/ranges.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/ranges.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/ranges.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-incomplete-ranges
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/regex.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/regex.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/regex.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/regex.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-localization
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/scoped_allocator.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/scoped_allocator.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/scoped_allocator.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/scoped_allocator.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <scoped_allocator>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/semaphore.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/semaphore.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/semaphore.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/semaphore.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-threads
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/set.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/set.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/set.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/set.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <set>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/shared_mutex.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/shared_mutex.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/shared_mutex.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/shared_mutex.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-threads
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/span.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/span.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/span.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/span.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <span>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/stack.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/stack.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/stack.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/stack.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <stack>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/string.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <string>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/string_view.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <string_view>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/thread.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/thread.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/thread.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/thread.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // UNSUPPORTED: libcpp-has-no-threads
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/tuple.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/tuple.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/tuple.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/tuple.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <tuple>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/type_traits.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/type_traits.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/type_traits.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/type_traits.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <type_traits>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/typeinfo.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/typeinfo.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/typeinfo.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/typeinfo.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <typeinfo>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_map.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_map.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_map.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_map.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <unordered_map>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_set.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_set.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_set.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/unordered_set.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <unordered_set>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/utility.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/utility.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/utility.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/utility.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <utility>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/variant.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/variant.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/variant.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/variant.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <variant>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/vector.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/vector.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/vector.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/vector.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <vector>
 
diff --git a/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp b/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp
--- a/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp
+++ b/libcxx/test/std/language.support/support.limits/support.limits.general/version.version.pass.cpp
@@ -8,8 +8,6 @@
 //
 // WARNING: This test was generated by generate_feature_test_macro_components.py
 // and should not be edited manually.
-//
-// clang-format off
 
 // <version>
 
diff --git a/libcxx/utils/generate_feature_test_macro_components.py b/libcxx/utils/generate_feature_test_macro_components.py
--- a/libcxx/utils/generate_feature_test_macro_components.py
+++ b/libcxx/utils/generate_feature_test_macro_components.py
@@ -898,12 +898,8 @@
 #pragma GCC system_header
 #endif
 
-// clang-format off
-
 {cxx_macros}
 
-// clang-format on
-
 #endif // _LIBCPP_VERSIONH
 """
 
@@ -1047,8 +1043,6 @@
 //
 // WARNING: This test was generated by {script_name}
 // and should not be edited manually.
-//
-// clang-format off
 {markup}
 // <{header}>
 
diff --git a/libcxx/utils/generate_header_inclusion_tests.py b/libcxx/utils/generate_header_inclusion_tests.py
--- a/libcxx/utils/generate_header_inclusion_tests.py
+++ b/libcxx/utils/generate_header_inclusion_tests.py
@@ -170,8 +170,6 @@
 //
 // WARNING: This test was generated by {script_name}
 // and should not be edited manually.
-//
-// clang-format off
 {markup}
 // <{header}>
 
diff --git a/libcxx/utils/generate_header_tests.py b/libcxx/utils/generate_header_tests.py
--- a/libcxx/utils/generate_header_tests.py
+++ b/libcxx/utils/generate_header_tests.py
@@ -67,15 +67,14 @@
 ////////////////////////////////////////////////////////////////////////////////
 // BEGIN-GENERATED-HEADERS
 ////////////////////////////////////////////////////////////////////////////////
-"""
 
-warning_note = """\
 // WARNING: This test was generated by {script_name}
 // and should not be edited manually.
 
 """.format(script_name=script_name)
 
 end_pattern = """\
+
 ////////////////////////////////////////////////////////////////////////////////
 // END-GENERATED-HEADERS
 ////////////////////////////////////////////////////////////////////////////////
@@ -174,8 +173,8 @@
     with open(test_path, 'r') as f:
         content = f.read()
 
-    preamble = begin_pattern + '\n// clang-format off\n\n' + warning_note
-    postamble = '\n// clang-format on\n\n' + end_pattern
+    preamble = begin_pattern
+    postamble = end_pattern
     content = generated_part_pattern.sub(
         preamble + test_str + postamble, content)