[libc++] Alphabetize and include-what-you-use. NFCI.
Differential Revision: https://reviews.llvm.org/D102781
NOKEYCHECK=True
GitOrigin-RevId: bfbd73f87d7b2c1140b43192cea6b7fbbfc35cd0
diff --git a/include/__functional_base b/include/__functional_base
index 7bd40b9..0c43827 100644
--- a/include/__functional_base
+++ b/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/include/__hash_table b/include/__hash_table
index ed35440..f28100e 100644
--- a/include/__hash_table
+++ b/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/include/__locale b/include/__locale
index cf5f4b3..ad74299 100644
--- a/include/__locale
+++ b/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/include/__mutex_base b/include/__mutex_base
index 05a08a5..121973d 100644
--- a/include/__mutex_base
+++ b/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/include/__split_buffer b/include/__split_buffer
index 3e8173c..85cc0db 100644
--- a/include/__split_buffer
+++ b/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/include/__std_stream b/include/__std_stream
index c6e7929..65e90b7 100644
--- a/include/__std_stream
+++ b/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/include/__threading_support b/include/__threading_support
index 430ec54..788cae8 100644
--- a/include/__threading_support
+++ b/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/include/__tree b/include/__tree
index 70f3a27..b599a04 100644
--- a/include/__tree
+++ b/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/include/algorithm b/include/algorithm
index 65655d7..1ae84f7 100644
--- a/include/algorithm
+++ b/include/algorithm
@@ -646,15 +646,15 @@
*/
#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/include/any b/include/any
index aaeaab6..f844800 100644
--- a/include/any
+++ b/include/any
@@ -80,12 +80,12 @@
*/
-#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/include/array b/include/array
index b56fcfe..022172b 100644
--- a/include/array
+++ b/include/array
@@ -109,25 +109,22 @@
*/
#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/include/atomic b/include/atomic
index 5ab10da..2f47f6b 100644
--- a/include/atomic
+++ b/include/atomic
@@ -574,8 +574,8 @@
*/
-#include <__config>
#include <__availability>
+#include <__config>
#include <__threading_support>
#include <cstddef>
#include <cstdint>
diff --git a/include/barrier b/include/barrier
index e650773..0ba9d20 100644
--- a/include/barrier
+++ b/include/barrier
@@ -45,8 +45,8 @@
*/
-#include <__config>
#include <__availability>
+#include <__config>
#include <atomic>
#ifndef _LIBCPP_HAS_NO_TREE_BARRIER
# include <memory>
diff --git a/include/bit b/include/bit
index 7708106..c64e45c 100644
--- a/include/bit
+++ b/include/bit
@@ -55,7 +55,7 @@
*/
#include <__config>
-#include <__bits>
+#include <__bits> // __libcpp_clz
#include <__debug>
#include <limits>
#include <type_traits>
diff --git a/include/bitset b/include/bitset
index 1a7e5d1..4b8827e 100644
--- a/include/bitset
+++ b/include/bitset
@@ -114,12 +114,12 @@
#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/include/charconv b/include/charconv
index 5077e39..4a5c65d 100644
--- a/include/charconv
+++ b/include/charconv
@@ -73,8 +73,8 @@
*/
-#include <__config>
#include <__availability>
+#include <__config>
#include <__errc>
#include <__utility/to_underlying.h>
#include <cmath> // for log2f
diff --git a/include/chrono b/include/chrono
index b6fbde4..6bdb929 100644
--- a/include/chrono
+++ b/include/chrono
@@ -823,13 +823,13 @@
} // 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/include/complex b/include/complex
index 08249ae..fc52697 100644
--- a/include/complex
+++ b/include/complex
@@ -232,10 +232,10 @@
*/
#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/include/exception b/include/exception
index fd0cb22..3405a42 100644
--- a/include/exception
+++ b/include/exception
@@ -76,8 +76,8 @@
*/
-#include <__config>
#include <__availability>
+#include <__config>
#include <__memory/addressof.h>
#include <cstddef>
#include <cstdlib>
diff --git a/include/filesystem b/include/filesystem
index 50fb353..a652eed 100644
--- a/include/filesystem
+++ b/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/include/forward_list b/include/forward_list
index 39ffac3..66bb449 100644
--- a/include/forward_list
+++ b/include/forward_list
@@ -180,11 +180,11 @@
*/
#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/include/fstream b/include/fstream
index dd1aa72..09af0d9 100644
--- a/include/fstream
+++ b/include/fstream
@@ -179,8 +179,8 @@
*/
-#include <__config>
#include <__availability>
+#include <__config>
#include <__debug>
#include <__locale>
#include <cstdio>
diff --git a/include/functional b/include/functional
index 1380c81..a081548 100644
--- a/include/functional
+++ b/include/functional
@@ -508,17 +508,16 @@
#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/include/future b/include/future
index 5701c29..d794fae 100644
--- a/include/future
+++ b/include/future
@@ -361,8 +361,8 @@
*/
-#include <__config>
#include <__availability>
+#include <__config>
#include <__debug>
#include <chrono>
#include <exception>
diff --git a/include/ios b/include/ios
index 0104b33..c58b983 100644
--- a/include/ios
+++ b/include/ios
@@ -211,8 +211,8 @@
*/
#include <__config>
-#include <iosfwd>
#include <__locale>
+#include <iosfwd>
#include <system_error>
#if !defined(_LIBCPP_HAS_NO_ATOMIC_HEADER)
diff --git a/include/iostream b/include/iostream
index b184234..5811fc3 100644
--- a/include/iostream
+++ b/include/iostream
@@ -14,9 +14,9 @@
iostream synopsis
#include <ios>
-#include <streambuf>
#include <istream>
#include <ostream>
+#include <streambuf>
namespace std {
@@ -35,9 +35,9 @@
#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/include/istream b/include/istream
index b1b3184..122ea37 100644
--- a/include/istream
+++ b/include/istream
@@ -159,8 +159,8 @@
*/
#include <__config>
-#include <version>
#include <ostream>
+#include <version>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
diff --git a/include/latch b/include/latch
index a894f8c..10ae572 100644
--- a/include/latch
+++ b/include/latch
@@ -40,8 +40,8 @@
*/
-#include <__config>
#include <__availability>
+#include <__config>
#include <atomic>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/include/list b/include/list
index b1c9746..439b533 100644
--- a/include/list
+++ b/include/list
@@ -181,17 +181,15 @@
*/
#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/include/locale b/include/locale
index 664c470..85155a8 100644
--- a/include/locale
+++ b/include/locale
@@ -188,21 +188,21 @@
*/
#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/include/map b/include/map
index 4512dbd..22376f3 100644
--- a/include/map
+++ b/include/map
@@ -490,13 +490,12 @@
#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/include/memory b/include/memory
index 7c3c92c..46acab6 100644
--- a/include/memory
+++ b/include/memory
@@ -661,19 +661,7 @@
*/
#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 @@
#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/include/mutex b/include/mutex
index babb2b4..a23c213 100644
--- a/include/mutex
+++ b/include/mutex
@@ -188,14 +188,14 @@
#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/include/new b/include/new
index ea563c9..aefc08c 100644
--- a/include/new
+++ b/include/new
@@ -86,8 +86,8 @@
*/
-#include <__config>
#include <__availability>
+#include <__config>
#include <cstddef>
#include <cstdlib>
#include <exception>
diff --git a/include/numbers b/include/numbers
index e5172af..52c67dd 100644
--- a/include/numbers
+++ b/include/numbers
@@ -59,13 +59,12 @@
*/
#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/include/optional b/include/optional
index e4f3938..b6a464f 100644
--- a/include/optional
+++ b/include/optional
@@ -146,8 +146,8 @@
*/
-#include <__config>
#include <__availability>
+#include <__config>
#include <__debug>
#include <__functional_base>
#include <compare>
diff --git a/include/ostream b/include/ostream
index af50680..6a211f3 100644
--- a/include/ostream
+++ b/include/ostream
@@ -134,11 +134,11 @@
*/
#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/include/queue b/include/queue
index ce75353..cc9aa87 100644
--- a/include/queue
+++ b/include/queue
@@ -179,11 +179,11 @@
*/
#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/include/random b/include/random
index f2eaf84..e72181c 100644
--- a/include/random
+++ b/include/random
@@ -1678,18 +1678,18 @@
*/
#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/include/ranges b/include/ranges
index fb14010..3d5a833 100644
--- a/include/ranges
+++ b/include/ranges
@@ -88,8 +88,8 @@
#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/include/ratio b/include/ratio
index c967600..091ea53 100644
--- a/include/ratio
+++ b/include/ratio
@@ -78,8 +78,8 @@
*/
#include <__config>
-#include <cstdint>
#include <climits>
+#include <cstdint>
#include <type_traits>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/include/semaphore b/include/semaphore
index 0e0434f..20c9b1e 100644
--- a/include/semaphore
+++ b/include/semaphore
@@ -45,8 +45,8 @@
*/
-#include <__config>
#include <__availability>
+#include <__config>
#include <__threading_support>
#include <atomic>
diff --git a/include/shared_mutex b/include/shared_mutex
index 72a0ffa..8205c3e 100644
--- a/include/shared_mutex
+++ b/include/shared_mutex
@@ -122,8 +122,8 @@
*/
-#include <__config>
#include <__availability>
+#include <__config>
#include <version>
_LIBCPP_PUSH_MACROS
diff --git a/include/sstream b/include/sstream
index 0b739f4..0b614a0 100644
--- a/include/sstream
+++ b/include/sstream
@@ -181,8 +181,8 @@
*/
#include <__config>
-#include <ostream>
#include <istream>
+#include <ostream>
#include <string>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
diff --git a/include/stdexcept b/include/stdexcept
index 8eb7280..c0470d1 100644
--- a/include/stdexcept
+++ b/include/stdexcept
@@ -42,9 +42,9 @@
*/
#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/include/streambuf b/include/streambuf
index ee1afac..385d486 100644
--- a/include/streambuf
+++ b/include/streambuf
@@ -108,8 +108,8 @@
*/
#include <__config>
-#include <iosfwd>
#include <ios>
+#include <iosfwd>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
diff --git a/include/string b/include/string
index db29f21..9b76be3 100644
--- a/include/string
+++ b/include/string
@@ -514,26 +514,26 @@
*/
#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/include/string_view b/include/string_view
index dc64ec6..491f49f 100644
--- a/include/string_view
+++ b/include/string_view
@@ -182,16 +182,16 @@
*/
#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/include/strstream b/include/strstream
index cbcce4a..ca837ae 100644
--- a/include/strstream
+++ b/include/strstream
@@ -130,8 +130,8 @@
*/
#include <__config>
-#include <ostream>
#include <istream>
+#include <ostream>
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
diff --git a/include/thread b/include/thread
index 89a9c61..09a1f02 100644
--- a/include/thread
+++ b/include/thread
@@ -83,20 +83,18 @@
*/
#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/include/tuple b/include/tuple
index 0a131f3..58f72b1 100644
--- a/include/tuple
+++ b/include/tuple
@@ -150,11 +150,11 @@
*/
#include <__config>
+#include <__functional_base>
#include <__tuple>
#include <compare>
#include <cstddef>
#include <type_traits>
-#include <__functional_base>
#include <utility>
#include <version>
diff --git a/include/typeindex b/include/typeindex
index e83a488..36d8bfd 100644
--- a/include/typeindex
+++ b/include/typeindex
@@ -45,9 +45,9 @@
*/
#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/include/typeinfo b/include/typeinfo
index 70f372a..65ce53a 100644
--- a/include/typeinfo
+++ b/include/typeinfo
@@ -56,12 +56,13 @@
*/
-#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/include/unordered_map b/include/unordered_map
index a93a652..66fd520 100644
--- a/include/unordered_map
+++ b/include/unordered_map
@@ -432,6 +432,7 @@
*/
#include <__config>
+#include <__debug>
#include <__hash_table>
#include <__node_handle>
#include <compare>
@@ -441,8 +442,6 @@
#include <tuple>
#include <version>
-#include <__debug>
-
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
#pragma GCC system_header
#endif
diff --git a/include/unordered_set b/include/unordered_set
index 14919e4..f44dcac 100644
--- a/include/unordered_set
+++ b/include/unordered_set
@@ -387,6 +387,7 @@
*/
#include <__config>
+#include <__debug>
#include <__hash_table>
#include <__node_handle>
#include <compare>
@@ -394,8 +395,6 @@
#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/include/utility b/include/utility
index 6e028ba..d895cfe 100644
--- a/include/utility
+++ b/include/utility
@@ -208,17 +208,17 @@
*/
#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/include/valarray b/include/valarray
index 6405a7e..beb0e1d 100644
--- a/include/valarray
+++ b/include/valarray
@@ -340,11 +340,11 @@
*/
#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 @@
_LIBCPP_PUSH_MACROS
#include <__undef_macros>
-
_LIBCPP_BEGIN_NAMESPACE_STD
template<class _Tp> class _LIBCPP_TEMPLATE_VIS valarray;
diff --git a/include/variant b/include/variant
index 426683a..5a431c3 100644
--- a/include/variant
+++ b/include/variant
@@ -199,19 +199,19 @@
*/
-#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/include/vector b/include/vector
index 6ee377b..f75a169 100644
--- a/include/vector
+++ b/include/vector
@@ -272,22 +272,21 @@
*/
#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