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 @@ -29,7 +29,6 @@ #include <__format/format_string.h> #include <__format/unicode.h> #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,10 +11,11 @@ #define _LIBCPP___FORMAT_UNICODE_H #include <__assert> +#include <__bit/countl.h> #include <__config> #include <__format/extended_grapheme_cluster_table.h> +#include <__type_traits/make_unsigned.h> #include <__utility/unreachable.h> -#include #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) # pragma GCC 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,10 +9,10 @@ #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 #include #include #include diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm --- a/libcxx/include/algorithm +++ b/libcxx/include/algorithm @@ -1916,6 +1916,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 @@ -344,7 +345,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 @@ -344,7 +345,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 @@ -346,7 +347,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 @@ -346,7 +347,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 @@ -354,7 +354,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 @@ -51,7 +50,6 @@ bit cstdint bit cstdlib bit limits -bit type_traits bit version bitset climits bitset cstddef @@ -77,7 +75,6 @@ charconv limits charconv type_traits chrono array -chrono bit chrono charconv chrono cmath chrono compare @@ -265,7 +262,6 @@ filesystem type_traits filesystem version format array -format bit format charconv format cstddef format cstdint @@ -494,7 +490,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,11 +12,10 @@ // #include -#include #include #include - -#include "test_macros.h" +#include +#include int main(int, char**) { static_assert(std::is_enum::value, ""); diff --git a/libcxx/test/std/numerics/bit/bit.pow.two/bit_ceil.fail.cpp b/libcxx/test/std/numerics/bit/bit.pow.two/bit_ceil.fail.cpp --- a/libcxx/test/std/numerics/bit/bit.pow.two/bit_ceil.fail.cpp +++ b/libcxx/test/std/numerics/bit/bit.pow.two/bit_ceil.fail.cpp @@ -15,11 +15,10 @@ // T is an unsigned integer type #include +#include +#include #include #include -#include - -#include "test_macros.h" class A{}; enum E1 : unsigned char { rEd };