diff --git a/libcxx/include/__format/parser_std_format_spec.h b/libcxx/include/__format/parser_std_format_spec.h --- a/libcxx/include/__format/parser_std_format_spec.h +++ b/libcxx/include/__format/parser_std_format_spec.h @@ -31,7 +31,6 @@ #include <__iterator/concepts.h> #include <__iterator/readable_traits.h> // iter_value_t #include <__variant/monostate.h> -#include #include #include #include diff --git a/libcxx/include/__format/unicode.h b/libcxx/include/__format/unicode.h --- a/libcxx/include/__format/unicode.h +++ b/libcxx/include/__format/unicode.h @@ -11,6 +11,7 @@ #define _LIBCPP___FORMAT_UNICODE_H #include <__assert> +#include <__bit/countl.h> #include <__concepts/same_as.h> #include <__config> #include <__format/extended_grapheme_cluster_table.h> @@ -18,7 +19,6 @@ #include <__iterator/readable_traits.h> // iter_value_t #include <__type_traits/make_unsigned.h> #include <__utility/unreachable.h> -#include #include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) diff --git a/libcxx/include/__random/uniform_int_distribution.h b/libcxx/include/__random/uniform_int_distribution.h --- a/libcxx/include/__random/uniform_int_distribution.h +++ b/libcxx/include/__random/uniform_int_distribution.h @@ -9,12 +9,12 @@ #ifndef _LIBCPP___RANDOM_UNIFORM_INT_DISTRIBUTION_H #define _LIBCPP___RANDOM_UNIFORM_INT_DISTRIBUTION_H +#include <__bit/countl.h> #include <__config> #include <__random/is_valid.h> #include <__random/log2.h> #include <__type_traits/conditional.h> #include <__type_traits/make_unsigned.h> -#include #include #include #include diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm --- a/libcxx/include/algorithm +++ b/libcxx/include/algorithm @@ -1927,6 +1927,7 @@ #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 # include +# include # include # include # include diff --git a/libcxx/include/chrono b/libcxx/include/chrono --- a/libcxx/include/chrono +++ b/libcxx/include/chrono @@ -782,6 +782,7 @@ #endif #if !defined(_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) && _LIBCPP_STD_VER <= 20 +# include # include #endif diff --git a/libcxx/test/libcxx/transitive_includes/cxx03.csv b/libcxx/test/libcxx/transitive_includes/cxx03.csv --- a/libcxx/test/libcxx/transitive_includes/cxx03.csv +++ b/libcxx/test/libcxx/transitive_includes/cxx03.csv @@ -105,6 +105,7 @@ charconv iosfwd charconv limits charconv type_traits +chrono bit chrono compare chrono concepts chrono cstddef @@ -322,7 +323,6 @@ filesystem type_traits filesystem version format array -format bit format charconv format cstddef format cstdint diff --git a/libcxx/test/libcxx/transitive_includes/cxx11.csv b/libcxx/test/libcxx/transitive_includes/cxx11.csv --- a/libcxx/test/libcxx/transitive_includes/cxx11.csv +++ b/libcxx/test/libcxx/transitive_includes/cxx11.csv @@ -105,6 +105,7 @@ charconv iosfwd charconv limits charconv type_traits +chrono bit chrono compare chrono concepts chrono cstddef @@ -322,7 +323,6 @@ filesystem type_traits filesystem version format array -format bit format charconv format cstddef format cstdint diff --git a/libcxx/test/libcxx/transitive_includes/cxx14.csv b/libcxx/test/libcxx/transitive_includes/cxx14.csv --- a/libcxx/test/libcxx/transitive_includes/cxx14.csv +++ b/libcxx/test/libcxx/transitive_includes/cxx14.csv @@ -105,6 +105,7 @@ charconv iosfwd charconv limits charconv type_traits +chrono bit chrono compare chrono concepts chrono cstddef @@ -324,7 +325,6 @@ filesystem type_traits filesystem version format array -format bit format charconv format cstddef format cstdint diff --git a/libcxx/test/libcxx/transitive_includes/cxx17.csv b/libcxx/test/libcxx/transitive_includes/cxx17.csv --- a/libcxx/test/libcxx/transitive_includes/cxx17.csv +++ b/libcxx/test/libcxx/transitive_includes/cxx17.csv @@ -105,6 +105,7 @@ charconv iosfwd charconv limits charconv type_traits +chrono bit chrono compare chrono concepts chrono cstddef @@ -324,7 +325,6 @@ filesystem type_traits filesystem version format array -format bit format charconv format cstddef format cstdint diff --git a/libcxx/test/libcxx/transitive_includes/cxx20.csv b/libcxx/test/libcxx/transitive_includes/cxx20.csv --- a/libcxx/test/libcxx/transitive_includes/cxx20.csv +++ b/libcxx/test/libcxx/transitive_includes/cxx20.csv @@ -333,7 +333,6 @@ filesystem type_traits filesystem version format array -format bit format charconv format cstddef format cstdint diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b.csv b/libcxx/test/libcxx/transitive_includes/cxx2b.csv --- a/libcxx/test/libcxx/transitive_includes/cxx2b.csv +++ b/libcxx/test/libcxx/transitive_includes/cxx2b.csv @@ -1,4 +1,3 @@ -algorithm bit algorithm climits algorithm cstddef algorithm cstdint @@ -73,7 +72,6 @@ charconv limits charconv type_traits chrono array -chrono bit chrono charconv chrono cmath chrono compare @@ -255,7 +253,6 @@ filesystem type_traits filesystem version format array -format bit format charconv format cstddef format cstdint @@ -484,7 +481,6 @@ queue type_traits queue vector queue version -random bit random cmath random cstddef random cstdint diff --git a/libcxx/test/std/numerics/bit/bit.endian/endian.pass.cpp b/libcxx/test/std/numerics/bit/bit.endian/endian.pass.cpp --- a/libcxx/test/std/numerics/bit/bit.endian/endian.pass.cpp +++ b/libcxx/test/std/numerics/bit/bit.endian/endian.pass.cpp @@ -12,9 +12,9 @@ // #include -#include #include #include +#include #include #include "test_macros.h"