From bfbd73f87d7b2c1140b43192cea6b7fbbfc35cd0 Mon Sep 17 00:00:00 2001
From: Arthur O'Dwyer <arthur.j.odwyer@gmail.com>
Date: Wed, 19 May 2021 11:57:04 -0400
Subject: [PATCH] [libc++] Alphabetize and include-what-you-use. NFCI.

Differential Revision: https://reviews.llvm.org/D102781
---
 libcxx/include/__functional_base   |  4 ++--
 libcxx/include/__hash_table        | 12 ++++++------
 libcxx/include/__locale            |  2 +-
 libcxx/include/__mutex_base        |  3 +--
 libcxx/include/__split_buffer      |  2 +-
 libcxx/include/__std_stream        |  4 ++--
 libcxx/include/__threading_support |  4 ++--
 libcxx/include/__tree              |  2 +-
 libcxx/include/algorithm           | 16 ++++++++--------
 libcxx/include/any                 |  8 ++++----
 libcxx/include/array               | 13 +++++--------
 libcxx/include/atomic              |  2 +-
 libcxx/include/barrier             |  2 +-
 libcxx/include/bit                 |  2 +-
 libcxx/include/bitset              | 10 +++++-----
 libcxx/include/charconv            |  2 +-
 libcxx/include/chrono              |  6 +++---
 libcxx/include/complex             |  4 ++--
 libcxx/include/exception           |  2 +-
 libcxx/include/filesystem          | 13 ++++++-------
 libcxx/include/forward_list        |  8 ++++----
 libcxx/include/fstream             |  2 +-
 libcxx/include/functional          |  7 +++----
 libcxx/include/future              |  2 +-
 libcxx/include/ios                 |  2 +-
 libcxx/include/iostream            |  4 ++--
 libcxx/include/istream             |  2 +-
 libcxx/include/latch               |  2 +-
 libcxx/include/list                | 10 ++++------
 libcxx/include/locale              | 18 +++++++++---------
 libcxx/include/map                 |  5 ++---
 libcxx/include/memory              | 24 ++++++++++++------------
 libcxx/include/mutex               |  4 ++--
 libcxx/include/new                 |  2 +-
 libcxx/include/numbers             |  5 ++---
 libcxx/include/optional            |  2 +-
 libcxx/include/ostream             |  8 ++++----
 libcxx/include/queue               |  4 ++--
 libcxx/include/random              | 16 ++++++++--------
 libcxx/include/ranges              |  2 +-
 libcxx/include/ratio               |  2 +-
 libcxx/include/semaphore           |  2 +-
 libcxx/include/shared_mutex        |  2 +-
 libcxx/include/sstream             |  2 +-
 libcxx/include/stdexcept           |  2 +-
 libcxx/include/streambuf           |  2 +-
 libcxx/include/string              | 26 +++++++++++++-------------
 libcxx/include/string_view         |  4 ++--
 libcxx/include/strstream           |  2 +-
 libcxx/include/thread              | 14 ++++++--------
 libcxx/include/tuple               |  2 +-
 libcxx/include/typeindex           |  2 +-
 libcxx/include/typeinfo            |  5 +++--
 libcxx/include/unordered_map       |  3 +--
 libcxx/include/unordered_set       |  3 +--
 libcxx/include/utility             |  8 ++++----
 libcxx/include/valarray            |  7 +++----
 libcxx/include/variant             |  4 ++--
 libcxx/include/vector              | 17 ++++++++---------
 59 files changed, 168 insertions(+), 183 deletions(-)

diff --git a/libcxx/include/__functional_base b/libcxx/include/__functional_base
index 7bd40b96a7e1..0c438275da60 100644
--- a/libcxx/include/__functional_base
+++ b/libcxx/include/__functional_base
@@ -11,10 +11,10 @@
 #define _LIBCPP_FUNCTIONAL_BASE
 
 #include <__config>
-#include <type_traits>
-#include <typeinfo>
 #include <exception>
 #include <new>
+#include <type_traits>
+#include <typeinfo>
 #include <utility>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/libcxx/include/__hash_table b/libcxx/include/__hash_table
index ed354405dc27..f28100eba691 100644
--- a/libcxx/include/__hash_table
+++ b/libcxx/include/__hash_table
@@ -10,16 +10,16 @@
 #ifndef _LIBCPP__HASH_TABLE
 #define _LIBCPP__HASH_TABLE
 
+#include <__bits> // __libcpp_clz
 #include <__config>
-#include <initializer_list>
-#include <memory>
-#include <iterator>
+#include <__debug>
 #include <algorithm>
 #include <cmath>
-#include <utility>
+#include <initializer_list>
+#include <iterator>
+#include <memory>
 #include <type_traits>
-
-#include <__debug>
+#include <utility>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/__locale b/libcxx/include/__locale
index cf5f4b310da4..ad742997d9ac 100644
--- a/libcxx/include/__locale
+++ b/libcxx/include/__locale
@@ -10,8 +10,8 @@
 #ifndef _LIBCPP___LOCALE
 #define _LIBCPP___LOCALE
 
-#include <__config>
 #include <__availability>
+#include <__config>
 #include <string>
 #include <memory>
 #include <utility>
diff --git a/libcxx/include/__mutex_base b/libcxx/include/__mutex_base
index 05a08a55846e..121973ded474 100644
--- a/libcxx/include/__mutex_base
+++ b/libcxx/include/__mutex_base
@@ -11,10 +11,9 @@
 #define _LIBCPP___MUTEX_BASE
 
 #include <__config>
+#include <__threading_support>
 #include <chrono>
 #include <system_error>
-#include <__threading_support>
-
 #include <time.h>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/libcxx/include/__split_buffer b/libcxx/include/__split_buffer
index 3e8173c179f4..85cc0db3e909 100644
--- a/libcxx/include/__split_buffer
+++ b/libcxx/include/__split_buffer
@@ -3,8 +3,8 @@
 #define _LIBCPP_SPLIT_BUFFER
 
 #include <__config>
-#include <type_traits>
 #include <algorithm>
+#include <type_traits>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/__std_stream b/libcxx/include/__std_stream
index c6e7929ffd83..65e90b7894b6 100644
--- a/libcxx/include/__std_stream
+++ b/libcxx/include/__std_stream
@@ -11,10 +11,10 @@
 #define _LIBCPP___STD_STREAM
 
 #include <__config>
-#include <ostream>
-#include <istream>
 #include <__locale>
 #include <cstdio>
+#include <istream>
+#include <ostream>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/__threading_support b/libcxx/include/__threading_support
index 430ec5419118..788cae853e58 100644
--- a/libcxx/include/__threading_support
+++ b/libcxx/include/__threading_support
@@ -10,11 +10,11 @@
 #ifndef _LIBCPP_THREADING_SUPPORT
 #define _LIBCPP_THREADING_SUPPORT
 
-#include <__config>
 #include <__availability>
+#include <__config>
 #include <chrono>
-#include <iosfwd>
 #include <errno.h>
+#include <iosfwd>
 #include <limits>
 
 #ifdef __MVS__
diff --git a/libcxx/include/__tree b/libcxx/include/__tree
index 70f3a276773a..b599a0449adf 100644
--- a/libcxx/include/__tree
+++ b/libcxx/include/__tree
@@ -11,10 +11,10 @@
 #define _LIBCPP___TREE
 
 #include <__config>
+#include <algorithm>
 #include <iterator>
 #include <memory>
 #include <stdexcept>
-#include <algorithm>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm
index 65655d70425f..1ae84f7dff7f 100644
--- a/libcxx/include/algorithm
+++ b/libcxx/include/algorithm
@@ -646,15 +646,15 @@ template <class BidirectionalIterator, class Compare>
 */
 
 #include <__config>
-#include <initializer_list>
-#include <type_traits>
-#include <cstring>
-#include <utility> // needed to provide swap_ranges.
-#include <memory>
-#include <functional>
-#include <iterator>
+#include <__bits> // __libcpp_clz
 #include <cstddef>
-#include <bit>
+#include <cstring>
+#include <functional>
+#include <initializer_list>
+#include <iterator>
+#include <memory>
+#include <type_traits>
+#include <utility> // swap_ranges
 #include <version>
 
 #include <__debug>
diff --git a/libcxx/include/any b/libcxx/include/any
index aaeaab6c8f74..f844800f32ca 100644
--- a/libcxx/include/any
+++ b/libcxx/include/any
@@ -80,12 +80,12 @@ namespace std {
 
 */
 
-#include <__config>
 #include <__availability>
-#include <memory>
-#include <typeinfo>
-#include <type_traits>
+#include <__config>
 #include <cstdlib>
+#include <memory>
+#include <type_traits>
+#include <typeinfo>
 #include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/libcxx/include/array b/libcxx/include/array
index b56fcfe6c63a..022172b86ec9 100644
--- a/libcxx/include/array
+++ b/libcxx/include/array
@@ -109,25 +109,22 @@ template <size_t I, class T, size_t N> const T&& get(const array<T, N>&&) noexce
 */
 
 #include <__config>
+#include <__debug>
 #include <__tuple>
+#include <algorithm>
+#include <cstdlib> // for _LIBCPP_UNREACHABLE
+#include <iterator>
+#include <stdexcept>
 #include <type_traits>
 #include <utility>
-#include <iterator>
-#include <algorithm>
-#include <stdexcept>
-#include <cstdlib> // for _LIBCPP_UNREACHABLE
 #include <version>
-#include <__debug>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
 #endif
 
-
-
 _LIBCPP_BEGIN_NAMESPACE_STD
 
-
 template <class _Tp, size_t _Size>
 struct _LIBCPP_TEMPLATE_VIS array
 {
diff --git a/libcxx/include/atomic b/libcxx/include/atomic
index 5ab10da5ffc7..2f47f6b17b2a 100644
--- a/libcxx/include/atomic
+++ b/libcxx/include/atomic
@@ -574,8 +574,8 @@ template <class T>
 
 */
 
-#include <__config>
 #include <__availability>
+#include <__config>
 #include <__threading_support>
 #include <cstddef>
 #include <cstdint>
diff --git a/libcxx/include/barrier b/libcxx/include/barrier
index e650773d430f..0ba9d20a69ac 100644
--- a/libcxx/include/barrier
+++ b/libcxx/include/barrier
@@ -45,8 +45,8 @@ namespace std
 
 */
 
-#include <__config>
 #include <__availability>
+#include <__config>
 #include <atomic>
 #ifndef _LIBCPP_HAS_NO_TREE_BARRIER
 # include <memory>
diff --git a/libcxx/include/bit b/libcxx/include/bit
index 7708106c8a71..c64e45c5fa30 100644
--- a/libcxx/include/bit
+++ b/libcxx/include/bit
@@ -55,7 +55,7 @@ namespace std {
 */
 
 #include <__config>
-#include <__bits>
+#include <__bits> // __libcpp_clz
 #include <__debug>
 #include <limits>
 #include <type_traits>
diff --git a/libcxx/include/bitset b/libcxx/include/bitset
index 1a7e5d1f563a..4b8827e774a3 100644
--- a/libcxx/include/bitset
+++ b/libcxx/include/bitset
@@ -114,12 +114,12 @@ template <size_t N> struct hash<std::bitset<N>>;
 
 #include <__config>
 #include <__bit_reference>
-#include <cstddef>
-#include <climits>
-#include <string>
-#include <stdexcept>
-#include <iosfwd>
 #include <__functional_base>
+#include <climits>
+#include <cstddef>
+#include <iosfwd>
+#include <stdexcept>
+#include <string>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/charconv b/libcxx/include/charconv
index 5077e393d103..4a5c65df7c75 100644
--- a/libcxx/include/charconv
+++ b/libcxx/include/charconv
@@ -73,8 +73,8 @@ namespace std {
 
 */
 
-#include <__config>
 #include <__availability>
+#include <__config>
 #include <__errc>
 #include <__utility/to_underlying.h>
 #include <cmath> // for log2f
diff --git a/libcxx/include/chrono b/libcxx/include/chrono
index b6fbde462c45..6bdb92912ad0 100644
--- a/libcxx/include/chrono
+++ b/libcxx/include/chrono
@@ -823,13 +823,13 @@ constexpr chrono::year                                  operator ""y(unsigned lo
 }  // std
 */
 
-#include <__config>
 #include <__availability>
+#include <__config>
 #include <compare>
 #include <ctime>
-#include <type_traits>
-#include <ratio>
 #include <limits>
+#include <ratio>
+#include <type_traits>
 #include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/libcxx/include/complex b/libcxx/include/complex
index 08249ae005cf..fc52697f7749 100644
--- a/libcxx/include/complex
+++ b/libcxx/include/complex
@@ -232,10 +232,10 @@ template<class T> complex<T> tanh (const complex<T>&);
 */
 
 #include <__config>
-#include <type_traits>
-#include <stdexcept>
 #include <cmath>
 #include <iosfwd>
+#include <stdexcept>
+#include <type_traits>
 #include <version>
 
 #if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
diff --git a/libcxx/include/exception b/libcxx/include/exception
index fd0cb22fe800..3405a4260fc6 100644
--- a/libcxx/include/exception
+++ b/libcxx/include/exception
@@ -76,8 +76,8 @@ template <class E> void rethrow_if_nested(const E& e);
 
 */
 
-#include <__config>
 #include <__availability>
+#include <__config>
 #include <__memory/addressof.h>
 #include <cstddef>
 #include <cstdlib>
diff --git a/libcxx/include/filesystem b/libcxx/include/filesystem
index 50fb35301739..a652eede4ff0 100644
--- a/libcxx/include/filesystem
+++ b/libcxx/include/filesystem
@@ -229,20 +229,21 @@
 
 */
 
-#include <__config>
 #include <__availability>
-#include <cstddef>
-#include <cstdlib>
+#include <__config>
+#include <__debug>
 #include <chrono>
 #include <compare>
-#include <iterator>
+#include <cstddef>
+#include <cstdlib>
 #include <iosfwd>
+#include <iterator>
 #include <memory>
 #include <stack>
 #include <string>
+#include <string_view>
 #include <system_error>
 #include <utility>
-#include <string_view>
 #include <version>
 
 #if !defined(_LIBCPP_HAS_NO_LOCALIZATION)
@@ -250,8 +251,6 @@
 # include <iomanip> // for quoted
 #endif
 
-#include <__debug>
-
 #if defined(_LIBCPP_HAS_NO_FILESYSTEM_LIBRARY)
 # error "The Filesystem library is not supported by this configuration of libc++"
 #endif
diff --git a/libcxx/include/forward_list b/libcxx/include/forward_list
index 39ffac31a555..66bb449d9f75 100644
--- a/libcxx/include/forward_list
+++ b/libcxx/include/forward_list
@@ -180,11 +180,11 @@ template <class T, class Allocator, class Predicate>
 */
 
 #include <__config>
-#include <initializer_list>
-#include <memory>
-#include <limits>
-#include <iterator>
 #include <algorithm>
+#include <initializer_list>
+#include <iterator>
+#include <limits>
+#include <memory>
 #include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/libcxx/include/fstream b/libcxx/include/fstream
index dd1aa72cf157..09af0d91e79b 100644
--- a/libcxx/include/fstream
+++ b/libcxx/include/fstream
@@ -179,8 +179,8 @@ typedef basic_fstream<wchar_t> wfstream;
 
 */
 
-#include <__config>
 #include <__availability>
+#include <__config>
 #include <__debug>
 #include <__locale>
 #include <cstdio>
diff --git a/libcxx/include/functional b/libcxx/include/functional
index 1380c819f908..a08154869ced 100644
--- a/libcxx/include/functional
+++ b/libcxx/include/functional
@@ -508,17 +508,16 @@ POLICY:  For non-variadic implementations, the number of arguments is limited
 
 #include <__config>
 #include <__debug>
+#include <__functional_base>
 #include <concepts>
-#include <type_traits>
-#include <typeinfo>
 #include <exception>
 #include <memory>
 #include <tuple>
+#include <type_traits>
+#include <typeinfo>
 #include <utility>
 #include <version>
 
-#include <__functional_base>
-
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
 #endif
diff --git a/libcxx/include/future b/libcxx/include/future
index 5701c294aa4b..d794fae7dc25 100644
--- a/libcxx/include/future
+++ b/libcxx/include/future
@@ -361,8 +361,8 @@ template <class R, class Alloc> struct uses_allocator<packaged_task<R>, Alloc>;
 
 */
 
-#include <__config>
 #include <__availability>
+#include <__config>
 #include <__debug>
 #include <chrono>
 #include <exception>
diff --git a/libcxx/include/ios b/libcxx/include/ios
index 0104b33edd13..c58b98383f64 100644
--- a/libcxx/include/ios
+++ b/libcxx/include/ios
@@ -211,8 +211,8 @@ storage-class-specifier const error_category& iostream_category() noexcept;
 */
 
 #include <__config>
-#include <iosfwd>
 #include <__locale>
+#include <iosfwd>
 #include <system_error>
 
 #if !defined(_LIBCPP_HAS_NO_ATOMIC_HEADER)
diff --git a/libcxx/include/iostream b/libcxx/include/iostream
index b184234d8a77..5811fc37c85d 100644
--- a/libcxx/include/iostream
+++ b/libcxx/include/iostream
@@ -14,9 +14,9 @@
     iostream synopsis
 
 #include <ios>
-#include <streambuf>
 #include <istream>
 #include <ostream>
+#include <streambuf>
 
 namespace std {
 
@@ -35,9 +35,9 @@ extern wostream wclog;
 
 #include <__config>
 #include <ios>
-#include <streambuf>
 #include <istream>
 #include <ostream>
+#include <streambuf>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/istream b/libcxx/include/istream
index b1b31845c047..122ea37cf65e 100644
--- a/libcxx/include/istream
+++ b/libcxx/include/istream
@@ -159,8 +159,8 @@ template <class Stream, class T>
 */
 
 #include <__config>
-#include <version>
 #include <ostream>
+#include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/latch b/libcxx/include/latch
index a894f8cafd1c..10ae5721fbec 100644
--- a/libcxx/include/latch
+++ b/libcxx/include/latch
@@ -40,8 +40,8 @@ namespace std
 
 */
 
-#include <__config>
 #include <__availability>
+#include <__config>
 #include <atomic>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/libcxx/include/list b/libcxx/include/list
index b1c9746e72fa..439b53398b8f 100644
--- a/libcxx/include/list
+++ b/libcxx/include/list
@@ -181,17 +181,15 @@ template <class T, class Allocator, class Predicate>
 */
 
 #include <__config>
-
-#include <memory>
-#include <limits>
+#include <__debug>
+#include <algorithm>
 #include <initializer_list>
 #include <iterator>
-#include <algorithm>
+#include <limits>
+#include <memory>
 #include <type_traits>
 #include <version>
 
-#include <__debug>
-
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
 #endif
diff --git a/libcxx/include/locale b/libcxx/include/locale
index 664c470f26c9..85155a88300f 100644
--- a/libcxx/include/locale
+++ b/libcxx/include/locale
@@ -188,21 +188,21 @@ template <class charT> class messages_byname;
 */
 
 #include <__config>
-#include <__locale>
 #include <__debug>
+#include <__locale>
 #include <algorithm>
-#include <memory>
-#include <ios>
-#include <streambuf>
-#include <iterator>
-#include <limits>
-#include <version>
 #ifndef __APPLE__
-#include <cstdarg>
+# include <cstdarg>
 #endif
+#include <cstdio>
 #include <cstdlib>
 #include <ctime>
-#include <cstdio>
+#include <ios>
+#include <iterator>
+#include <limits>
+#include <memory>
+#include <streambuf>
+#include <version>
 
 #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
 // Most unix variants have catopen.  These are the specific ones that don't.
diff --git a/libcxx/include/map b/libcxx/include/map
index 4512dbd5aed6..22376f30680f 100644
--- a/libcxx/include/map
+++ b/libcxx/include/map
@@ -490,13 +490,12 @@ erase_if(multimap<Key, T, Compare, Allocator>& c, Predicate pred);  // C++20
 #include <__node_handle>
 #include <__tree>
 #include <compare>
+#include <functional>
 #include <initializer_list>
 #include <iterator> // __libcpp_erase_if_container
 #include <memory>
-#include <utility>
-#include <functional>
-#include <initializer_list>
 #include <type_traits>
+#include <utility>
 #include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/libcxx/include/memory b/libcxx/include/memory
index 7c3c92c2015d..46acab6aa8f4 100644
--- a/libcxx/include/memory
+++ b/libcxx/include/memory
@@ -661,19 +661,7 @@ void* align(size_t alignment, size_t size, void*& ptr, size_t& space);
 */
 
 #include <__config>
-#include <type_traits>
-#include <typeinfo>
-#include <compare>
-#include <cstddef>
-#include <cstdint>
-#include <new>
-#include <utility>
-#include <iterator>
 #include <__functional_base>
-#include <iosfwd>
-#include <tuple>
-#include <stdexcept>
-#include <cstring>
 #include <__memory/addressof.h>
 #include <__memory/allocation_guard.h>
 #include <__memory/allocator.h>
@@ -687,6 +675,18 @@ void* align(size_t alignment, size_t size, void*& ptr, size_t& space);
 #include <__memory/temporary_buffer.h>
 #include <__memory/uninitialized_algorithms.h>
 #include <__memory/unique_ptr.h>
+#include <compare>
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+#include <iosfwd>
+#include <iterator>
+#include <new>
+#include <stdexcept>
+#include <tuple>
+#include <type_traits>
+#include <typeinfo>
+#include <utility>
 #include <version>
 
 #if _LIBCPP_STD_VER <= 14 || defined(_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR)
diff --git a/libcxx/include/mutex b/libcxx/include/mutex
index babb2b429739..a23c213f4b95 100644
--- a/libcxx/include/mutex
+++ b/libcxx/include/mutex
@@ -188,14 +188,14 @@ template<class Callable, class ...Args>
 
 #include <__config>
 #include <__mutex_base>
+#include <__threading_support>
 #include <cstdint>
 #include <functional>
 #include <memory>
 #ifndef _LIBCPP_CXX03_LANG
-#include <tuple>
+# include <tuple>
 #endif
 #include <version>
-#include <__threading_support>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/new b/libcxx/include/new
index ea563c9d01e8..aefc08c161ca 100644
--- a/libcxx/include/new
+++ b/libcxx/include/new
@@ -86,8 +86,8 @@ void  operator delete[](void* ptr, void*) noexcept;
 
 */
 
-#include <__config>
 #include <__availability>
+#include <__config>
 #include <cstddef>
 #include <cstdlib>
 #include <exception>
diff --git a/libcxx/include/numbers b/libcxx/include/numbers
index e5172af9f544..52c67dd35930 100644
--- a/libcxx/include/numbers
+++ b/libcxx/include/numbers
@@ -59,13 +59,12 @@ namespace std::numbers {
 */
 
 #include <__config>
-
-#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
-
 #include <concepts>
 #include <type_traits>
 #include <version>
 
+#if _LIBCPP_STD_VER > 17 && !defined(_LIBCPP_HAS_NO_CONCEPTS)
+
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
 #endif
diff --git a/libcxx/include/optional b/libcxx/include/optional
index e4f3938e752e..b6a464f54e6f 100644
--- a/libcxx/include/optional
+++ b/libcxx/include/optional
@@ -146,8 +146,8 @@ template<class T>
 
 */
 
-#include <__config>
 #include <__availability>
+#include <__config>
 #include <__debug>
 #include <__functional_base>
 #include <compare>
diff --git a/libcxx/include/ostream b/libcxx/include/ostream
index af50680f9a7c..6a211f34b6cc 100644
--- a/libcxx/include/ostream
+++ b/libcxx/include/ostream
@@ -134,11 +134,11 @@ template <class Stream, class T>
 */
 
 #include <__config>
-#include <ios>
-#include <streambuf>
-#include <locale>
-#include <iterator>
 #include <bitset>
+#include <ios>
+#include <iterator>
+#include <locale>
+#include <streambuf>
 #include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/libcxx/include/queue b/libcxx/include/queue
index ce75353b5da8..cc9aa874efe0 100644
--- a/libcxx/include/queue
+++ b/libcxx/include/queue
@@ -179,11 +179,11 @@ template <class T, class Container, class Compare>
 */
 
 #include <__config>
+#include <algorithm>
 #include <compare>
 #include <deque>
-#include <vector>
 #include <functional>
-#include <algorithm>
+#include <vector>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/random b/libcxx/include/random
index f2eaf840b3bd..e72181cfd051 100644
--- a/libcxx/include/random
+++ b/libcxx/include/random
@@ -1678,18 +1678,18 @@ class piecewise_linear_distribution
 */
 
 #include <__config>
-#include <cstddef>
-#include <cstdint>
+#include <algorithm>
 #include <cmath>
 #include <concepts>
-#include <type_traits>
+#include <cstddef>
+#include <cstdint>
 #include <initializer_list>
-#include <limits>
-#include <algorithm>
-#include <numeric>
-#include <vector>
-#include <string>
 #include <iosfwd>
+#include <limits>
+#include <numeric>
+#include <string>
+#include <type_traits>
+#include <vector>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/ranges b/libcxx/include/ranges
index fb140107ca1f..3d5a833cec33 100644
--- a/libcxx/include/ranges
+++ b/libcxx/include/ranges
@@ -88,8 +88,8 @@ namespace std::ranges {
 #include <__ranges/data.h>
 #include <__ranges/empty.h>
 #include <__ranges/enable_borrowed_range.h>
-#include <__ranges/view.h>
 #include <__ranges/size.h>
+#include <__ranges/view.h>
 #include <compare>          // Required by the standard.
 #include <initializer_list> // Required by the standard.
 #include <iterator>         // Required by the standard.
diff --git a/libcxx/include/ratio b/libcxx/include/ratio
index c9676003af6b..091ea53accce 100644
--- a/libcxx/include/ratio
+++ b/libcxx/include/ratio
@@ -78,8 +78,8 @@ typedef ratio<1000000000000000000000000, 1> yotta;  // not supported
 */
 
 #include <__config>
-#include <cstdint>
 #include <climits>
+#include <cstdint>
 #include <type_traits>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/libcxx/include/semaphore b/libcxx/include/semaphore
index 0e0434f7fbd5..20c9b1e33730 100644
--- a/libcxx/include/semaphore
+++ b/libcxx/include/semaphore
@@ -45,8 +45,8 @@ using binary_semaphore = counting_semaphore<1>;
 
 */
 
-#include <__config>
 #include <__availability>
+#include <__config>
 #include <__threading_support>
 #include <atomic>
 
diff --git a/libcxx/include/shared_mutex b/libcxx/include/shared_mutex
index 72a0ffab5ca2..8205c3e0af0c 100644
--- a/libcxx/include/shared_mutex
+++ b/libcxx/include/shared_mutex
@@ -122,8 +122,8 @@ template <class Mutex>
 
 */
 
-#include <__config>
 #include <__availability>
+#include <__config>
 #include <version>
 
 _LIBCPP_PUSH_MACROS
diff --git a/libcxx/include/sstream b/libcxx/include/sstream
index 0b739f4b682c..0b614a0b0956 100644
--- a/libcxx/include/sstream
+++ b/libcxx/include/sstream
@@ -181,8 +181,8 @@ typedef basic_stringstream<wchar_t> wstringstream;
 */
 
 #include <__config>
-#include <ostream>
 #include <istream>
+#include <ostream>
 #include <string>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/libcxx/include/stdexcept b/libcxx/include/stdexcept
index 8eb7280e5a9f..c0470d1e1dd3 100644
--- a/libcxx/include/stdexcept
+++ b/libcxx/include/stdexcept
@@ -42,9 +42,9 @@ public:
 */
 
 #include <__config>
-#include <cstdlib>
 #include <exception>
 #include <iosfwd>  // for string forward decl
+#include <cstdlib>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/streambuf b/libcxx/include/streambuf
index ee1afac645fe..385d48694580 100644
--- a/libcxx/include/streambuf
+++ b/libcxx/include/streambuf
@@ -108,8 +108,8 @@ protected:
 */
 
 #include <__config>
-#include <iosfwd>
 #include <ios>
+#include <iosfwd>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/string b/libcxx/include/string
index db29f21bdd59..9b76be30ad7d 100644
--- a/libcxx/include/string
+++ b/libcxx/include/string
@@ -514,26 +514,26 @@ basic_string<char32_t> operator "" s( const char32_t *str, size_t len ); // C++1
 */
 
 #include <__config>
-#include <compare>
-#include <string_view>
-#include <iosfwd>
-#include <cstring>
-#include <cstdio>  // For EOF.
-#include <cwchar>
+#include <__debug>
+#include <__functional_base>
 #include <algorithm>
+#include <compare>
+#include <cstdio>  // EOF
+#include <cstring>
+#include <cwchar>
+#include <initializer_list>
+#include <iosfwd>
 #include <iterator>
-#include <utility>
 #include <memory>
 #include <stdexcept>
+#include <string_view>
 #include <type_traits>
-#include <initializer_list>
-#include <__functional_base>
+#include <utility>
 #include <version>
-#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
-#include <cstdint>
-#endif
 
-#include <__debug>
+#ifndef _LIBCPP_HAS_NO_UNICODE_CHARS
+# include <cstdint>
+#endif
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/string_view b/libcxx/include/string_view
index dc64ec6b1fd7..491f49f06534 100644
--- a/libcxx/include/string_view
+++ b/libcxx/include/string_view
@@ -182,16 +182,16 @@ namespace std {
 */
 
 #include <__config>
+#include <__debug>
 #include <__ranges/enable_borrowed_range.h>
 #include <__string>
-#include <iosfwd>
 #include <algorithm>
 #include <compare>
+#include <iosfwd>
 #include <iterator>
 #include <limits>
 #include <stdexcept>
 #include <version>
-#include <__debug>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/strstream b/libcxx/include/strstream
index cbcce4ad15b5..ca837aef670f 100644
--- a/libcxx/include/strstream
+++ b/libcxx/include/strstream
@@ -130,8 +130,8 @@ private:
 */
 
 #include <__config>
-#include <ostream>
 #include <istream>
+#include <ostream>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/thread b/libcxx/include/thread
index 89a9c61e4a85..09a1f02a04c4 100644
--- a/libcxx/include/thread
+++ b/libcxx/include/thread
@@ -83,20 +83,18 @@ void sleep_for(const chrono::duration<Rep, Period>& rel_time);
 */
 
 #include <__config>
-#include <iosfwd>
+#include <__debug>
 #include <__functional_base>
-#include <type_traits>
+#include <__mutex_base>
+#include <__threading_support>
+#include <chrono>
 #include <cstddef>
 #include <functional>
+#include <iosfwd>
 #include <memory>
 #include <system_error>
-#include <chrono>
-#include <__mutex_base>
-#ifndef _LIBCPP_CXX03_LANG
 #include <tuple>
-#endif
-#include <__threading_support>
-#include <__debug>
+#include <type_traits>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/tuple b/libcxx/include/tuple
index 0a131f302ae3..58f72b15d767 100644
--- a/libcxx/include/tuple
+++ b/libcxx/include/tuple
@@ -150,11 +150,11 @@ template <class... Types>
 */
 
 #include <__config>
+#include <__functional_base>
 #include <__tuple>
 #include <compare>
 #include <cstddef>
 #include <type_traits>
-#include <__functional_base>
 #include <utility>
 #include <version>
 
diff --git a/libcxx/include/typeindex b/libcxx/include/typeindex
index e83a4888e09c..36d8bfd88ec3 100644
--- a/libcxx/include/typeindex
+++ b/libcxx/include/typeindex
@@ -45,9 +45,9 @@ struct hash<type_index>
 */
 
 #include <__config>
-#include <typeinfo>
 #include <__functional_base>
 #include <compare>
+#include <typeinfo>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/typeinfo b/libcxx/include/typeinfo
index 70f372aacfe9..65ce53a0e9d7 100644
--- a/libcxx/include/typeinfo
+++ b/libcxx/include/typeinfo
@@ -56,12 +56,13 @@ public:
 
 */
 
-#include <__config>
 #include <__availability>
-#include <exception>
+#include <__config>
 #include <cstddef>
 #include <cstdint>
+#include <exception>
 #include <type_traits>
+
 #ifdef _LIBCPP_NO_EXCEPTIONS
 #include <cstdlib>
 #endif
diff --git a/libcxx/include/unordered_map b/libcxx/include/unordered_map
index a93a6525c66e..66fd5205a2c0 100644
--- a/libcxx/include/unordered_map
+++ b/libcxx/include/unordered_map
@@ -432,6 +432,7 @@ template <class Key, class T, class Hash, class Pred, class Alloc>
 */
 
 #include <__config>
+#include <__debug>
 #include <__hash_table>
 #include <__node_handle>
 #include <compare>
@@ -441,8 +442,6 @@ template <class Key, class T, class Hash, class Pred, class Alloc>
 #include <tuple>
 #include <version>
 
-#include <__debug>
-
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
 #endif
diff --git a/libcxx/include/unordered_set b/libcxx/include/unordered_set
index 14919e476512..f44dcacbfc60 100644
--- a/libcxx/include/unordered_set
+++ b/libcxx/include/unordered_set
@@ -387,6 +387,7 @@ template <class Value, class Hash, class Pred, class Alloc>
 */
 
 #include <__config>
+#include <__debug>
 #include <__hash_table>
 #include <__node_handle>
 #include <compare>
@@ -394,8 +395,6 @@ template <class Value, class Hash, class Pred, class Alloc>
 #include <iterator> // __libcpp_erase_if_container
 #include <version>
 
-#include <__debug>
-
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
 #endif
diff --git a/libcxx/include/utility b/libcxx/include/utility
index 6e028bacf0da..d895cfe5367a 100644
--- a/libcxx/include/utility
+++ b/libcxx/include/utility
@@ -208,17 +208,17 @@ template <class T>
 */
 
 #include <__config>
+#include <__debug>
 #include <__tuple>
 #include <__utility/to_underlying.h>
 #include <compare>
-#include <type_traits>
-#include <initializer_list>
 #include <cstddef>
-#include <cstring>
 #include <cstdint>
+#include <cstring>
+#include <initializer_list>
 #include <limits>
+#include <type_traits>
 #include <version>
-#include <__debug>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
diff --git a/libcxx/include/valarray b/libcxx/include/valarray
index 6405a7e5498d..beb0e1d7031a 100644
--- a/libcxx/include/valarray
+++ b/libcxx/include/valarray
@@ -340,11 +340,11 @@ template <class T> unspecified2 end(const valarray<T>& v);
 */
 
 #include <__config>
-#include <cstddef>
-#include <cmath>
-#include <initializer_list>
 #include <algorithm>
+#include <cmath>
+#include <cstddef>
 #include <functional>
+#include <initializer_list>
 #include <new>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
@@ -354,7 +354,6 @@ template <class T> unspecified2 end(const valarray<T>& v);
 _LIBCPP_PUSH_MACROS
 #include <__undef_macros>
 
-
 _LIBCPP_BEGIN_NAMESPACE_STD
 
 template<class _Tp> class _LIBCPP_TEMPLATE_VIS valarray;
diff --git a/libcxx/include/variant b/libcxx/include/variant
index 426683aa58f3..5a431c35ea32 100644
--- a/libcxx/include/variant
+++ b/libcxx/include/variant
@@ -199,19 +199,19 @@ namespace std {
 
 */
 
-#include <__config>
 #include <__availability>
+#include <__config>
 #include <__tuple>
 #include <array>
 #include <compare>
 #include <exception>
 #include <functional>
 #include <initializer_list>
+#include <limits>
 #include <new>
 #include <tuple>
 #include <type_traits>
 #include <utility>
-#include <limits>
 #include <version>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/libcxx/include/vector b/libcxx/include/vector
index 6ee377b6fb3f..f75a1694910f 100644
--- a/libcxx/include/vector
+++ b/libcxx/include/vector
@@ -272,22 +272,21 @@ erase_if(vector<T, Allocator>& c, Predicate pred);    // C++20
 */
 
 #include <__config>
-#include <iosfwd> // for forward declaration of vector
 #include <__bit_reference>
-#include <type_traits>
+#include <__debug>
+#include <__functional_base>
+#include <__split_buffer>
+#include <algorithm>
 #include <climits>
 #include <compare>
-#include <limits>
+#include <cstring>
 #include <initializer_list>
+#include <iosfwd> // for forward declaration of vector
+#include <limits>
 #include <memory>
 #include <stdexcept>
-#include <algorithm>
-#include <cstring>
+#include <type_traits>
 #include <version>
-#include <__split_buffer>
-#include <__functional_base>
-
-#include <__debug>
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header