SERVER-105050 clang-format IncludeBlocks: Regroup (#36096)

GitOrigin-RevId: 5abd171fa9d539578d5f1d3d4417a4ca4606c078

.clang-format

@@ -75,21 +75,25 @@ ForEachMacros:
   - BOOST_FOREACH
 StatementAttributeLikeMacros:
   - Q_EMIT
-IncludeBlocks:   Preserve
+IncludeBlocks:   Regroup
 IncludeCategories:
-  - Regex:           '.*'
-    Priority:        1
+  - Regex:           '"mongo/.*"'
+    Priority:        10
+    SortPriority:    0
+    CaseSensitive:   true
+  - Regex:           '[<"][a-z_]*[">]' # c++ stdlib headers (no folder or extension)
+    Priority:        20
     SortPriority:    0
     CaseSensitive:   false
-  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
-    Priority:        3
+  - Regex:           '[<"][^/]*[">]' # top-level headers with no folder
+    Priority:        30
     SortPriority:    0
     CaseSensitive:   false
   - Regex:           '.*'
-    Priority:        1
+    Priority:        40
     SortPriority:    0
     CaseSensitive:   false
-IncludeIsMainRegex: '(Test)?$'
+IncludeIsMainRegex: '(_(test|bm))?$'
 IncludeIsMainSourceRegex: ''
 IndentCaseLabels: true
 IndentCaseBlocks: false

src/mongo/base/checked_cast.h

@@ -29,12 +29,12 @@
 
 #pragma once
 
-#include <memory>
-#include <type_traits>
-
 #include "mongo/util/assert_util_core.h"
 #include "mongo/util/debug_util.h"
 
+#include <memory>
+#include <type_traits>
+
 namespace mongo {
 
 /**

src/mongo/base/clonable_ptr_test.cpp

@@ -29,14 +29,14 @@
 
 #include "mongo/base/clonable_ptr.h"
 
+#include "mongo/base/string_data.h"
+#include "mongo/unittest/unittest.h"
+
 #include <functional>
 #include <memory>
 #include <string>
 #include <tuple>
 
-#include "mongo/base/string_data.h"
-#include "mongo/unittest/unittest.h"
-
 
 namespace {
 

src/mongo/base/compare_numbers.h

@@ -29,11 +29,11 @@
 
 #pragma once
 
-#include <cmath>
-
 #include "mongo/platform/decimal128.h"
 #include "mongo/util/assert_util.h"
 
+#include <cmath>
+
 namespace mongo {
 
 /**

src/mongo/base/concept/constructible.h

@@ -28,10 +28,10 @@
  */
 #pragma once
 
-#include <type_traits>
-
 #include "mongo/stdx/type_traits.h"
 
+#include <type_traits>
+
 namespace mongo {
 namespace concept {
 

src/mongo/base/counter.h

@@ -29,10 +29,10 @@
 
 #pragma once
 
-#include <cstdint>
-
 #include "mongo/platform/atomic_word.h"
 
+#include <cstdint>
+
 namespace mongo {
 /**
  * A 64bit (atomic) counter.

src/mongo/base/counter_test.cpp

@@ -29,6 +29,7 @@
 
 
 #include "mongo/base/counter.h"
+
 #include "mongo/base/string_data.h"
 #include "mongo/unittest/unittest.h"
 

src/mongo/base/data_builder.h

@@ -29,6 +29,12 @@
 
 #pragma once
 
+#include "mongo/base/data_range_cursor.h"
+#include "mongo/base/data_type.h"
+#include "mongo/base/status.h"
+#include "mongo/util/allocator.h"
+#include "mongo/util/assert_util.h"
+
 #include <algorithm>
 #include <cstddef>
 #include <cstdlib>
@@ -37,12 +43,6 @@
 #include <memory>
 #include <utility>
 
-#include "mongo/base/data_range_cursor.h"
-#include "mongo/base/data_type.h"
-#include "mongo/base/status.h"
-#include "mongo/util/allocator.h"
-#include "mongo/util/assert_util.h"
-
 namespace mongo {
 
 /**

src/mongo/base/data_builder_test.cpp

@@ -29,16 +29,17 @@
 
 #include "mongo/base/data_builder.h"
 
-#include <boost/cstdint.hpp>
-#include <boost/move/utility_core.hpp>
-#include <cstddef>
-#include <cstdint>
-
 #include "mongo/base/data_type_endian.h"
 #include "mongo/base/data_type_terminated.h"
 #include "mongo/base/string_data.h"
 #include "mongo/unittest/unittest.h"
 
+#include <cstddef>
+#include <cstdint>
+
+#include <boost/cstdint.hpp>
+#include <boost/move/utility_core.hpp>
+
 namespace mongo {
 
 namespace {

src/mongo/base/data_cursor.h

@@ -29,13 +29,13 @@
 
 #pragma once
 
-#include <cstddef>
-#include <cstring>
-
 #include "mongo/base/data_type.h"
 #include "mongo/base/data_view.h"
 #include "mongo/platform/endian.h"
 
+#include <cstddef>
+#include <cstring>
+
 namespace mongo {
 
 class ConstDataCursor : public ConstDataView {

src/mongo/base/data_cursor_test.cpp

@@ -29,12 +29,12 @@
 
 #include "mongo/base/data_cursor.h"
 
-#include <cstdint>
-
 #include "mongo/base/data_type_endian.h"
 #include "mongo/base/string_data.h"
 #include "mongo/unittest/unittest.h"
 
+#include <cstdint>
+
 namespace mongo {
 
 TEST(DataCursor, ConstDataCursor) {

src/mongo/base/data_range.h

@@ -29,12 +29,6 @@
 
 #pragma once
 
-#include <cstddef>
-#include <cstring>
-#include <tuple>
-#include <type_traits>
-#include <utility>
-
 #include "mongo/base/data_type.h"
 #include "mongo/base/error_codes.h"
 #include "mongo/base/status.h"
@@ -44,6 +38,12 @@
 #include "mongo/util/assert_util.h"
 #include "mongo/util/str.h"
 
+#include <cstddef>
+#include <cstring>
+#include <tuple>
+#include <type_traits>
+#include <utility>
+
 namespace mongo {
 class ConstDataRange {
 protected:

src/mongo/base/data_range_cursor.h

@@ -29,11 +29,6 @@
 
 #pragma once
 
-#include <cstddef>
-#include <cstring>
-#include <limits>
-#include <utility>
-
 #include "mongo/base/data_range.h"
 #include "mongo/base/data_type.h"
 #include "mongo/base/status.h"
@@ -42,6 +37,11 @@
 #include "mongo/util/assert_util.h"
 #include "mongo/util/str.h"
 
+#include <cstddef>
+#include <cstring>
+#include <limits>
+#include <utility>
+
 namespace mongo {
 
 class ConstDataRangeCursor : public ConstDataRange {

src/mongo/base/data_range_cursor_test.cpp

@@ -29,17 +29,17 @@
 
 #include "mongo/base/data_range_cursor.h"
 
+#include "mongo/base/data_type_endian.h"
+#include "mongo/base/data_view.h"
+#include "mongo/base/string_data.h"
+#include "mongo/unittest/unittest.h"
+
 #include <cstdint>
 #include <string>
 
 #include <boost/cstdint.hpp>
 #include <boost/move/utility_core.hpp>
 
-#include "mongo/base/data_type_endian.h"
-#include "mongo/base/data_view.h"
-#include "mongo/base/string_data.h"
-#include "mongo/unittest/unittest.h"
-
 namespace mongo {
 namespace {
 // ConstDataRange::operator==() requires that the pointers

src/mongo/base/data_range_test.cpp

@@ -29,6 +29,11 @@
 
 #include "mongo/base/data_range.h"
 
+#include "mongo/base/data_type_endian.h"
+#include "mongo/base/string_data.h"
+#include "mongo/platform/endian.h"
+#include "mongo/unittest/unittest.h"
+
 #include <array>
 #include <cstdint>
 #include <cstring>
@@ -39,11 +44,6 @@
 #include <boost/cstdint.hpp>
 #include <boost/move/utility_core.hpp>
 
-#include "mongo/base/data_type_endian.h"
-#include "mongo/base/string_data.h"
-#include "mongo/platform/endian.h"
-#include "mongo/unittest/unittest.h"
-
 namespace mongo {
 namespace {
 // ConstDataRange::operator==() requires that the pointers

src/mongo/base/data_type.cpp

@@ -29,11 +29,11 @@
 
 #include "mongo/base/data_type.h"
 
-#include <fmt/format.h>
-
 #include "mongo/base/error_codes.h"
 #include "mongo/base/string_data.h"
 
+#include <fmt/format.h>
+
 namespace mongo {
 
 namespace {

src/mongo/base/data_type.h

@@ -29,10 +29,6 @@
 
 #pragma once
 
-#include <cstring>
-#include <iosfwd>
-#include <type_traits>
-
 #include "mongo/base/error_codes.h"
 #include "mongo/base/static_assert.h"
 #include "mongo/base/status.h"
@@ -40,6 +36,10 @@
 #include "mongo/config.h"  // IWYU pragma: keep
 #include "mongo/platform/compiler.h"
 
+#include <cstring>
+#include <iosfwd>
+#include <type_traits>
+
 namespace mongo {
 
 struct DataType {

src/mongo/base/data_type_endian.h

@@ -29,13 +29,13 @@
 
 #pragma once
 
-#include <cstring>
-#include <type_traits>
-
 #include "mongo/base/data_type.h"
 #include "mongo/base/error_codes.h"
 #include "mongo/platform/endian.h"
 
+#include <cstring>
+#include <type_traits>
+
 namespace mongo {
 
 template <typename T>

src/mongo/base/data_type_string_data.cpp

@@ -27,15 +27,15 @@
  *    it in the license file.
  */
 
-#include <cstddef>
-#include <cstring>
-
 #include "mongo/base/data_type.h"
 #include "mongo/base/error_codes.h"
 #include "mongo/base/status.h"
 #include "mongo/base/string_data.h"
 #include "mongo/util/str.h"
 
+#include <cstddef>
+#include <cstring>
+
 namespace mongo {
 
 namespace {

src/mongo/base/data_type_string_data_test.cpp

@@ -27,13 +27,13 @@
  *    it in the license file.
  */
 
-#include <utility>
-
 #include "mongo/base/data_range_cursor.h"
 #include "mongo/base/data_type_terminated.h"
 #include "mongo/base/string_data.h"
 #include "mongo/unittest/unittest.h"
 
+#include <utility>
+
 namespace mongo {
 
 TEST(DataTypeStringData, Basic) {

src/mongo/base/data_type_terminated.h

@@ -29,12 +29,12 @@
 
 #pragma once
 
-#include <cstring>
-#include <iosfwd>
-
 #include "mongo/base/data_type.h"
 #include "mongo/base/status.h"
 
+#include <cstring>
+#include <iosfwd>
+
 namespace mongo {
 
 template <char C, typename T>

src/mongo/base/data_type_terminated_test.cpp

@@ -29,15 +29,15 @@
 
 #include "mongo/base/data_type_terminated.h"
 
-#include <string>
-#include <utility>
-
 #include "mongo/base/data_range.h"
 #include "mongo/base/data_range_cursor.h"
 #include "mongo/base/error_codes.h"
 #include "mongo/base/string_data.h"
 #include "mongo/unittest/unittest.h"
 
+#include <string>
+#include <utility>
+
 namespace mongo {
 namespace {
 

src/mongo/base/data_type_validated.h

@@ -29,12 +29,12 @@
 
 #pragma once
 
-#include <cstddef>
-#include <utility>
-
 #include "mongo/base/data_type.h"
 #include "mongo/base/status.h"
 
+#include <cstddef>
+#include <utility>
+
 namespace mongo {
 
 /**

src/mongo/base/data_type_validated_test.cpp

@@ -29,8 +29,6 @@
 
 #include "mongo/base/data_type_validated.h"
 
-#include <iterator>
-
 #include "mongo/base/data_range_cursor.h"
 #include "mongo/base/error_codes.h"
 #include "mongo/base/status.h"
@@ -38,6 +36,8 @@
 #include "mongo/stdx/type_traits.h"
 #include "mongo/unittest/unittest.h"
 
+#include <iterator>
+
 namespace mongo {
 template <>
 struct Validator<char> {

src/mongo/base/data_view.h

@@ -29,13 +29,13 @@
 
 #pragma once
 
+#include "mongo/base/data_type.h"
+#include "mongo/config.h"  // IWYU pragma: keep
+
 #include <cstring>
 #include <iosfwd>
 #include <type_traits>
 
-#include "mongo/base/data_type.h"
-#include "mongo/config.h"  // IWYU pragma: keep
-
 namespace mongo {
 
 class ConstDataView {

src/mongo/base/data_view_test.cpp

@@ -29,14 +29,14 @@
 
 #include "mongo/base/data_view.h"
 
-#include <cstdint>
-#include <cstring>
-
 #include "mongo/base/data_type_endian.h"
 #include "mongo/base/string_data.h"
 #include "mongo/platform/endian.h"
 #include "mongo/unittest/unittest.h"
 
+#include <cstdint>
+#include <cstring>
+
 namespace mongo {
 
 TEST(DataView, ConstDataView) {

src/mongo/base/dependency_graph.cpp

@@ -29,10 +29,13 @@
 
 #include "mongo/base/dependency_graph.h"
 
+#include "mongo/base/error_codes.h"
+#include "mongo/base/string_data.h"
+#include "mongo/util/assert_util.h"
+#include "mongo/util/string_map.h"
+
 #include <algorithm>
 #include <compare>
-#include <fmt/format.h>
-#include <fmt/ranges.h>  // IWYU pragma: keep
 #include <iterator>
 #include <random>
 #include <utility>
@@ -40,11 +43,8 @@
 #include <absl/container/node_hash_map.h>
 #include <absl/container/node_hash_set.h>
 #include <absl/meta/type_traits.h>
-
-#include "mongo/base/error_codes.h"
-#include "mongo/base/string_data.h"
-#include "mongo/util/assert_util.h"
-#include "mongo/util/string_map.h"
+#include <fmt/format.h>
+#include <fmt/ranges.h>  // IWYU pragma: keep
 
 namespace mongo {
 

src/mongo/base/dependency_graph.h

@@ -29,15 +29,15 @@
 
 #pragma once
 
+#include "mongo/base/status.h"
+#include "mongo/stdx/unordered_map.h"
+#include "mongo/stdx/unordered_set.h"
+
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "mongo/base/status.h"
-#include "mongo/stdx/unordered_map.h"
-#include "mongo/stdx/unordered_set.h"
-
 namespace mongo {
 
 /**

src/mongo/base/dependency_graph_test.cpp

@@ -33,12 +33,12 @@
 
 #include <algorithm>
 #include <cstddef>
-#include <fmt/ranges.h>  // IWYU pragma: keep
 #include <random>
 #include <string>
 #include <vector>
 
 #include <fmt/format.h>
+#include <fmt/ranges.h>  // IWYU pragma: keep
 // IWYU pragma: no_include "format.h"
 
 #include "mongo/base/dependency_graph.h"

src/mongo/base/encoded_value_storage.h

@@ -29,10 +29,10 @@
 
 #pragma once
 
-#include <cstring>
-
 #include "mongo/base/data_view.h"
 
+#include <cstring>
+
 namespace mongo {
 
 struct ZeroInitTag_t {

src/mongo/base/encoded_value_storage_test.cpp

@@ -29,15 +29,15 @@
 
 #include "mongo/base/encoded_value_storage.h"
 
-#include <cstdint>
-#include <cstring>
-
 #include "mongo/base/data_type_endian.h"
 #include "mongo/base/data_view.h"
 #include "mongo/base/static_assert.h"
 #include "mongo/base/string_data.h"
 #include "mongo/unittest/unittest.h"
 
+#include <cstdint>
+#include <cstring>
+
 namespace mongo {
 
 // Simplistic encoded value view and value classes to test EncodedValueStorage

src/mongo/base/error_extra_info.cpp

@@ -28,6 +28,7 @@
  */
 
 #include "mongo/base/error_extra_info.h"
+
 #include "mongo/base/init.h"  // IWYU pragma: keep
 #include "mongo/bson/bsonelement.h"
 #include "mongo/bson/bsonobj.h"

src/mongo/base/init.cpp

@@ -29,13 +29,13 @@
 
 #include "mongo/base/init.h"  // IWYU pragma: keep
 
+#include "mongo/base/initializer.h"
+#include "mongo/util/assert_util.h"
+
 #include <cstdlib>
 #include <iostream>
 #include <utility>
 
-#include "mongo/base/initializer.h"
-#include "mongo/util/assert_util.h"
-
 namespace mongo {
 
 GlobalInitializerRegisterer::GlobalInitializerRegisterer(std::string name,

src/mongo/base/init.h

@@ -41,12 +41,12 @@
 
 #pragma once
 
-#include <string>
-#include <vector>
-
 #include "mongo/base/initializer.h"
 #include "mongo/base/status.h"
 
+#include <string>
+#include <vector>
+
 /**
  * Macro to define an initializer function named "NAME" with the default
  * prerequisite set, that is `("default")`, and no explicit dependents.

src/mongo/base/initializer.cpp

@@ -27,21 +27,23 @@
  *    it in the license file.
  */
 
-#include <fmt/format.h>
+#include "mongo/base/initializer.h"
+
+#include "mongo/base/dependency_graph.h"
+#include "mongo/base/error_codes.h"
+#include "mongo/base/status.h"
+#include "mongo/logv2/log.h"
+#include "mongo/util/assert_util.h"
+#include "mongo/util/exit_code.h"
+#include "mongo/util/quick_exit.h"
+
 #include <iostream>
 #include <random>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "mongo/base/dependency_graph.h"
-#include "mongo/base/error_codes.h"
-#include "mongo/base/initializer.h"
-#include "mongo/base/status.h"
-#include "mongo/logv2/log.h"
-#include "mongo/util/assert_util.h"
-#include "mongo/util/exit_code.h"
-#include "mongo/util/quick_exit.h"
+#include <fmt/format.h>
 
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kDefault
 

src/mongo/base/initializer.h

@@ -29,14 +29,14 @@
 
 #pragma once
 
+#include "mongo/base/status.h"
+
 #include <functional>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "mongo/base/status.h"
-
 namespace mongo {
 
 /** Context of an initialization process. Passed as a parameter to initialization functions. */

src/mongo/base/initializer_test.cpp

@@ -31,17 +31,19 @@
  * Unit tests of the Initializer type.
  */
 
-#include <cstddef>
-#include <fmt/format.h>
+#include "mongo/base/initializer.h"
 
 #include "mongo/base/error_codes.h"
 #include "mongo/base/init.h"  // IWYU pragma: keep
-#include "mongo/base/initializer.h"
 #include "mongo/base/string_data.h"
 #include "mongo/logv2/log.h"
 #include "mongo/unittest/unittest.h"
 #include "mongo/util/assert_util.h"
 
+#include <cstddef>
+
+#include <fmt/format.h>
+
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kDefault
 
 namespace mongo {

src/mongo/base/murmurhash3_test.cpp

@@ -27,17 +27,17 @@
  *    it in the license file.
  */
 
-#include <array>
-#include <cstdint>
-#include <string>
-#include <utility>
-
 #include "mongo/base/data_type_endian.h"
 #include "mongo/base/data_view.h"
 #include "mongo/base/string_data.h"
 #include "mongo/unittest/unittest.h"
 #include "mongo/util/murmur3.h"
 
+#include <array>
+#include <cstdint>
+#include <string>
+#include <utility>
+
 #define TEST_STRING32(str, seed, expected) \
     ASSERT_EQUALS(murmur3<sizeof(uint32_t)>(StringData{str}, seed), expected)
 

src/mongo/base/parse_number.cpp

@@ -27,6 +27,15 @@
  *    it in the license file.
  */
 
+#include "mongo/base/parse_number.h"
+
+#include "mongo/base/error_codes.h"
+#include "mongo/base/static_assert.h"
+#include "mongo/base/status_with.h"
+#include "mongo/platform/decimal128.h"
+#include "mongo/platform/overflow_arithmetic.h"
+#include "mongo/util/ctype.h"
+
 #include <algorithm>
 #include <cerrno>
 #include <cstdint>
@@ -38,14 +47,6 @@
 #include <boost/cstdint.hpp>
 #include <boost/move/utility_core.hpp>
 
-#include "mongo/base/error_codes.h"
-#include "mongo/base/parse_number.h"
-#include "mongo/base/static_assert.h"
-#include "mongo/base/status_with.h"
-#include "mongo/platform/decimal128.h"
-#include "mongo/platform/overflow_arithmetic.h"
-#include "mongo/util/ctype.h"
-
 namespace mongo {
 namespace {
 

src/mongo/base/parse_number.h

@@ -33,12 +33,12 @@
 
 #pragma once
 
-#include <cstdint>
-
 #include "mongo/base/status.h"
 #include "mongo/base/string_data.h"
 #include "mongo/platform/decimal128.h"
 
+#include <cstdint>
+
 namespace mongo {
 
 /**

src/mongo/base/parse_number_test.cpp

@@ -27,9 +27,15 @@
  *    it in the license file.
  */
 
+#include "mongo/base/parse_number.h"
+
+#include "mongo/base/error_codes.h"
+#include "mongo/base/status.h"
+#include "mongo/unittest/unittest.h"
+#include "mongo/util/str.h"  // for str::stream()!
+
 #include <algorithm>
 #include <cmath>
-#include <fmt/format.h>
 #include <iterator>
 #include <limits>
 #include <memory>
@@ -37,11 +43,7 @@
 #include <typeinfo>
 #include <vector>
 
-#include "mongo/base/error_codes.h"
-#include "mongo/base/parse_number.h"
-#include "mongo/base/status.h"
-#include "mongo/unittest/unittest.h"
-#include "mongo/util/str.h"  // for str::stream()!
+#include <fmt/format.h>
 
 #define ASSERT_PARSES_WITH_PARSER(type, input_string, parser, expected_value) \
     do {                                                                      \

src/mongo/base/secure_allocator.cpp

@@ -28,16 +28,17 @@
  */
 
 
+#include "mongo/base/secure_allocator.h"
+
+#include "mongo/base/initializer.h"
+#include "mongo/util/errno_util.h"
+
 #include <cerrno>
-#include <fmt/format.h>
 #include <memory>
 #include <mutex>
 
 #include <absl/container/node_hash_map.h>
-
-#include "mongo/base/initializer.h"
-#include "mongo/base/secure_allocator.h"
-#include "mongo/util/errno_util.h"
+#include <fmt/format.h>
 
 #ifdef _WIN32
 #include <psapi.h>

src/mongo/base/secure_allocator.h

@@ -29,6 +29,15 @@
 
 #pragma once
 
+#include "mongo/base/static_assert.h"
+#include "mongo/base/string_data.h"
+#include "mongo/config.h"  // IWYU pragma: keep
+#include "mongo/db/server_options.h"
+#include "mongo/platform/atomic_word.h"
+#include "mongo/stdx/type_traits.h"
+#include "mongo/util/allocator.h"
+#include "mongo/util/assert_util.h"
+
 #include <array>
 #include <cstddef>
 #include <cstdlib>
@@ -40,15 +49,6 @@
 #include <utility>
 #include <vector>
 
-#include "mongo/base/static_assert.h"
-#include "mongo/base/string_data.h"
-#include "mongo/config.h"  // IWYU pragma: keep
-#include "mongo/db/server_options.h"
-#include "mongo/platform/atomic_word.h"
-#include "mongo/stdx/type_traits.h"
-#include "mongo/util/allocator.h"
-#include "mongo/util/assert_util.h"
-
 namespace mongo {
 
 namespace secure_allocator_details {

src/mongo/base/secure_allocator_test.cpp

@@ -27,13 +27,14 @@
  *    it in the license file.
  */
 
-#include <array>
-#include <cstdint>
-
 #include "mongo/base/secure_allocator.h"
+
 #include "mongo/unittest/unittest.h"
 #include "mongo/util/processinfo.h"
 
+#include <array>
+#include <cstdint>
+
 namespace mongo {
 
 TEST(SecureAllocator, SecureVector) {

src/mongo/base/shim.h

@@ -29,16 +29,16 @@
 
 #pragma once
 
+#include "mongo/base/init.h"  // IWYU pragma: keep
+#include "mongo/config.h"     // IWYU pragma: keep
+#include "mongo/util/assert_util.h"
+
 #include <functional>
 #include <map>
 #include <memory>
 #include <string>
 #include <utility>
 
-#include "mongo/base/init.h"  // IWYU pragma: keep
-#include "mongo/config.h"     // IWYU pragma: keep
-#include "mongo/util/assert_util.h"
-
 /**
  * The `WeakFunction` mechanism allows for the creation of "weak-symbol-like" functions
  * which can have implementations injected into a link target without creating a link

src/mongo/base/status.cpp

@@ -28,12 +28,8 @@
  */
 
 
-#include <exception>
-#include <ostream>
-
-#include <boost/smart_ptr/intrusive_ptr.hpp>
-
 #include "mongo/base/status.h"
+
 #include "mongo/bson/bsonobj.h"
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/bson/util/builder.h"
@@ -42,6 +38,11 @@
 #include "mongo/util/debug_util.h"
 #include "mongo/util/str.h"
 
+#include <exception>
+#include <ostream>
+
+#include <boost/smart_ptr/intrusive_ptr.hpp>
+
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kControl
 
 

src/mongo/base/status.h

@@ -29,17 +29,6 @@
 
 #pragma once
 
-#include <boost/intrusive_ptr.hpp>
-#include <boost/smart_ptr.hpp>
-#include <boost/smart_ptr/intrusive_ptr.hpp>
-#include <boost/smart_ptr/intrusive_ref_counter.hpp>
-#include <iosfwd>
-#include <memory>
-#include <new>
-#include <string>
-#include <type_traits>
-#include <utility>
-
 #include "mongo/base/error_codes.h"
 #include "mongo/base/error_extra_info.h"
 #include "mongo/base/static_assert.h"
@@ -50,6 +39,18 @@
 #include "mongo/util/intrusive_counter.h"
 #include "mongo/util/static_immortal.h"
 
+#include <iosfwd>
+#include <memory>
+#include <new>
+#include <string>
+#include <type_traits>
+#include <utility>
+
+#include <boost/intrusive_ptr.hpp>
+#include <boost/smart_ptr.hpp>
+#include <boost/smart_ptr/intrusive_ptr.hpp>
+#include <boost/smart_ptr/intrusive_ref_counter.hpp>
+
 namespace mongo {
 
 /**

src/mongo/base/status_bm.cpp

@@ -27,14 +27,15 @@
  *    it in the license file.
  */
 
-#include <atomic>
-#include <benchmark/benchmark.h>
-#include <cstdint>
-
-#include <boost/smart_ptr/intrusive_ptr.hpp>
+#include "mongo/base/status.h"
 
 #include "mongo/base/error_codes.h"
-#include "mongo/base/status.h"
+
+#include <atomic>
+#include <cstdint>
+
+#include <benchmark/benchmark.h>
+#include <boost/smart_ptr/intrusive_ptr.hpp>
 
 namespace mongo {
 namespace {

src/mongo/base/status_test.cpp

@@ -27,15 +27,8 @@
  *    it in the license file.
  */
 
-#include <boost/exception/exception.hpp>
-#include <fmt/format.h>
-#include <functional>
-#include <stdexcept>
-#include <string>
-
-#include <boost/optional/optional.hpp>
-
 #include "mongo/base/status.h"
+
 #include "mongo/bson/json.h"
 #include "mongo/config.h"  // IWYU pragma: keep
 #include "mongo/unittest/death_test.h"
@@ -43,6 +36,14 @@
 #include "mongo/util/assert_util.h"
 #include "mongo/util/str.h"
 
+#include <functional>
+#include <stdexcept>
+#include <string>
+
+#include <boost/exception/exception.hpp>
+#include <boost/optional/optional.hpp>
+#include <fmt/format.h>
+
 namespace mongo {
 namespace {
 

src/mongo/base/status_with.h

@@ -29,13 +29,6 @@
 
 #pragma once
 
-#include <boost/optional.hpp>
-#include <boost/optional/optional.hpp>
-#include <iosfwd>
-#include <string>
-#include <type_traits>
-#include <utility>
-
 #include "mongo/base/error_codes.h"
 #include "mongo/base/static_assert.h"
 #include "mongo/base/status.h"
@@ -44,6 +37,14 @@
 #include "mongo/unittest/stringify.h"
 #include "mongo/util/assert_util_core.h"
 
+#include <iosfwd>
+#include <string>
+#include <type_traits>
+#include <utility>
+
+#include <boost/optional.hpp>
+#include <boost/optional/optional.hpp>
+
 namespace mongo {
 
 template <typename T>

src/mongo/base/status_with_test.cpp

@@ -27,20 +27,21 @@
  *    it in the license file.
  */
 
+#include "mongo/base/status_with.h"
+
+#include "mongo/base/error_codes.h"
+#include "mongo/base/status.h"
+#include "mongo/base/string_data.h"
+#include "mongo/unittest/stringify.h"
+#include "mongo/unittest/unittest.h"
+#include "mongo/util/assert_util.h"
+
 #include <string>
 #include <utility>
 #include <vector>
 
 #include <boost/move/utility_core.hpp>
 
-#include "mongo/base/error_codes.h"
-#include "mongo/base/status.h"
-#include "mongo/base/status_with.h"
-#include "mongo/base/string_data.h"
-#include "mongo/unittest/stringify.h"
-#include "mongo/unittest/unittest.h"
-#include "mongo/util/assert_util.h"
-
 namespace mongo {
 namespace {
 

src/mongo/base/string_data.cpp

@@ -29,10 +29,10 @@
 
 #include "mongo/base/string_data.h"
 
-#include <boost/container_hash/hash.hpp>
-
 #include <ostream>
 
+#include <boost/container_hash/hash.hpp>
+
 namespace mongo {
 std::ostream& operator<<(std::ostream& stream, StringData value) {
     return stream << toStdStringViewForInterop(value);

src/mongo/base/string_data.h

@@ -29,10 +29,14 @@
 
 #pragma once
 
-#include <absl/hash/hash.h>
+#include "mongo/platform/compiler.h"
+#include "mongo/stdx/type_traits.h"
+#include "mongo/util/assert_util_core.h"
+#include "mongo/util/ctype.h"
+#include "mongo/util/debug_util.h"
+
 #include <algorithm>
 #include <cstring>
-#include <fmt/format.h>
 #include <functional>
 #include <iosfwd>
 #include <limits>
@@ -41,11 +45,8 @@
 #include <string_view>  // NOLINT
 #include <type_traits>
 
-#include "mongo/platform/compiler.h"
-#include "mongo/stdx/type_traits.h"
-#include "mongo/util/assert_util_core.h"
-#include "mongo/util/ctype.h"
-#include "mongo/util/debug_util.h"
+#include <absl/hash/hash.h>
+#include <fmt/format.h>
 
 namespace mongo {
 

src/mongo/base/string_data_comparator.cpp

@@ -29,10 +29,10 @@
 
 #include "mongo/base/string_data_comparator.h"
 
-#include <cstdlib>
-
 #include "mongo/util/murmur3.h"
 
+#include <cstdlib>
+
 namespace mongo {
 
 void SimpleStringDataComparator::hash_combine(size_t& seed, StringData stringToHash) const {

src/mongo/base/string_data_test.cpp

@@ -27,6 +27,13 @@
  *    it in the license file.
  */
 
+#include "mongo/base/string_data.h"
+
+#include "mongo/base/string_data_comparator.h"
+#include "mongo/config.h"  // IWYU pragma: keep
+#include "mongo/unittest/death_test.h"
+#include "mongo/unittest/unittest.h"
+
 #include <algorithm>
 #include <functional>
 #include <initializer_list>
@@ -37,12 +44,6 @@
 
 #include <fmt/format.h>
 
-#include "mongo/base/string_data.h"
-#include "mongo/base/string_data_comparator.h"
-#include "mongo/config.h"  // IWYU pragma: keep
-#include "mongo/unittest/death_test.h"
-#include "mongo/unittest/unittest.h"
-
 namespace mongo {
 namespace {
 

src/mongo/base/system_error.cpp

@@ -27,10 +27,10 @@
  *    it in the license file.
  */
 
-#include <string>
-
 #include "mongo/base/system_error.h"
 
+#include <string>
+
 namespace mongo {
 
 namespace {

src/mongo/base/system_error.h

@@ -29,11 +29,11 @@
 
 #pragma once
 
+#include "mongo/base/error_codes.h"
+
 #include <system_error>
 #include <type_traits>
 
-#include "mongo/base/error_codes.h"
-
 namespace mongo {
 
 const std::error_category& mongoErrorCategory();

src/mongo/base/system_error_test.cpp

@@ -27,13 +27,14 @@
  *    it in the license file.
  */
 
-#include <memory>
-#include <system_error>
+#include "mongo/base/system_error.h"
 
 #include "mongo/base/string_data.h"
-#include "mongo/base/system_error.h"
 #include "mongo/unittest/unittest.h"
 
+#include <memory>
+#include <system_error>
+
 namespace mongo {
 namespace {
 

src/mongo/base/uuid_test.cpp

@@ -27,11 +27,7 @@
  *    it in the license file.
  */
 
-#include <cstdint>
-#include <memory>
-#include <utility>
-
-#include <absl/container/node_hash_map.h>
+#include "mongo/util/uuid.h"
 
 #include "mongo/base/data_range.h"
 #include "mongo/base/error_codes.h"
@@ -44,7 +40,12 @@
 #include "mongo/bson/bsontypes_util.h"
 #include "mongo/stdx/unordered_set.h"
 #include "mongo/unittest/unittest.h"
-#include "mongo/util/uuid.h"
+
+#include <cstdint>
+#include <memory>
+#include <utility>
+
+#include <absl/container/node_hash_map.h>
 
 namespace mongo {
 namespace {

src/mongo/base/validate_locale.cpp

@@ -27,18 +27,19 @@
  *    it in the license file.
  */
 
-#include <boost/filesystem/path.hpp>
-#include <codecvt>  // IWYU pragma: keep
-#include <locale>   // IWYU pragma: keep
-#include <stdexcept>
-#include <string>
-
 #include "mongo/base/error_codes.h"
 #include "mongo/base/init.h"  // IWYU pragma: keep
 #include "mongo/base/initializer.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/str.h"
 
+#include <codecvt>  // IWYU pragma: keep
+#include <locale>   // IWYU pragma: keep
+#include <stdexcept>
+#include <string>
+
+#include <boost/filesystem/path.hpp>
+
 namespace mongo {
 
 MONGO_INITIALIZER_GENERAL(ValidateLocale, (), ("default"))

src/mongo/bson/bson_bm.cpp

@@ -28,11 +28,6 @@
  */
 
 
-#include <benchmark/benchmark.h>
-#include <cstddef>
-#include <fmt/format.h>
-#include <string>
-
 #include "mongo/base/status.h"
 #include "mongo/base/string_data.h"
 #include "mongo/bson/bson_validate.h"
@@ -44,6 +39,12 @@
 #include "mongo/logv2/log.h"
 #include "mongo/util/assert_util.h"
 
+#include <cstddef>
+#include <string>
+
+#include <benchmark/benchmark.h>
+#include <fmt/format.h>
+
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kDefault
 
 namespace mongo {

src/mongo/bson/bson_comparator_interface_base.cpp

@@ -27,12 +27,9 @@
  *    it in the license file.
  */
 
-#include <boost/functional/hash.hpp>
-#include <cmath>
-#include <limits>
+#include "mongo/bson/bson_comparator_interface_base.h"
 
 #include "mongo/base/string_data_comparator.h"
-#include "mongo/bson/bson_comparator_interface_base.h"
 #include "mongo/bson/bsonelement.h"
 #include "mongo/bson/bsonobj.h"
 #include "mongo/bson/bsontypes.h"
@@ -41,6 +38,11 @@
 #include "mongo/platform/decimal128.h"
 #include "mongo/util/time_support.h"
 
+#include <cmath>
+#include <limits>
+
+#include <boost/functional/hash.hpp>
+
 namespace mongo {
 
 template <typename T>

src/mongo/bson/bson_comparator_interface_base.h

@@ -29,7 +29,13 @@
 
 #pragma once
 
-#include <absl/container/node_hash_map.h>
+#include "mongo/base/error_extra_info.h"
+#include "mongo/base/string_data.h"
+#include "mongo/base/string_data_comparator.h"
+#include "mongo/stdx/unordered_map.h"
+#include "mongo/stdx/unordered_set.h"
+#include "mongo/util/assert_util.h"
+
 #include <cstddef>
 #include <cstdint>
 #include <initializer_list>
@@ -38,12 +44,7 @@
 #include <set>
 #include <vector>
 
-#include "mongo/base/error_extra_info.h"
-#include "mongo/base/string_data.h"
-#include "mongo/base/string_data_comparator.h"
-#include "mongo/stdx/unordered_map.h"
-#include "mongo/stdx/unordered_set.h"
-#include "mongo/util/assert_util.h"
+#include <absl/container/node_hash_map.h>
 
 namespace mongo {
 

src/mongo/bson/bson_field.h

@@ -29,11 +29,12 @@
 
 #pragma once
 
-#include <boost/optional.hpp>
-#include <boost/optional/optional.hpp>
+#include "mongo/bson/bsonobj.h"
+
 #include <string>
 
-#include "mongo/bson/bsonobj.h"
+#include <boost/optional.hpp>
+#include <boost/optional/optional.hpp>
 
 namespace mongo {
 

src/mongo/bson/bson_field_test.cpp

@@ -27,8 +27,9 @@
  *    it in the license file.
  */
 
-#include "mongo/base/string_data.h"
 #include "mongo/bson/bson_field.h"
+
+#include "mongo/base/string_data.h"
 #include "mongo/bson/bsonmisc.h"
 #include "mongo/bson/bsonobj.h"
 #include "mongo/bson/bsonobjbuilder.h"

src/mongo/bson/bson_iterator_test.cpp

@@ -28,14 +28,6 @@
  */
 
 
-#include <cstdio>
-#include <cstring>
-#include <ctime>
-#include <memory>
-#include <ostream>
-#include <string>
-#include <utility>
-
 #include "mongo/bson/bsonelement.h"
 #include "mongo/bson/bsonobj.h"
 #include "mongo/bson/bsonobjbuilder.h"
@@ -44,6 +36,14 @@
 #include "mongo/unittest/unittest.h"
 #include "mongo/util/assert_util.h"
 
+#include <cstdio>
+#include <cstring>
+#include <ctime>
+#include <memory>
+#include <ostream>
+#include <string>
+#include <utility>
+
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kTest
 
 

src/mongo/bson/bson_obj_data_type_test.cpp

@@ -27,8 +27,6 @@
  *    it in the license file.
  */
 
-#include <boost/move/utility_core.hpp>
-
 #include "mongo/base/data_range_cursor.h"
 #include "mongo/base/string_data.h"
 #include "mongo/bson/bsonelement.h"
@@ -36,6 +34,8 @@
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/unittest/unittest.h"
 
+#include <boost/move/utility_core.hpp>
+
 namespace mongo {
 
 TEST(BSONObjDataType, ConstDataTypeRangeBSON) {

src/mongo/bson/bson_obj_test.cpp

@@ -27,16 +27,6 @@
  *    it in the license file.
  */
 
-#include <array>
-#include <cstddef>
-#include <cstdint>
-#include <limits>
-#include <string>
-#include <vector>
-
-#include <boost/move/utility_core.hpp>
-#include <boost/none.hpp>
-
 #include "mongo/base/data_range.h"
 #include "mongo/base/data_type_endian.h"
 #include "mongo/base/error_codes.h"
@@ -59,6 +49,16 @@
 #include "mongo/util/assert_util.h"
 #include "mongo/util/string_map.h"
 
+#include <array>
+#include <cstddef>
+#include <cstdint>
+#include <limits>
+#include <string>
+#include <vector>
+
+#include <boost/move/utility_core.hpp>
+#include <boost/none.hpp>
+
 namespace {
 using namespace mongo;
 

src/mongo/bson/bson_utf8.cpp

@@ -29,8 +29,6 @@
 
 #include "mongo/bson/bson_utf8.h"
 
-#include <algorithm>
-
 #include "mongo/base/string_data.h"
 #include "mongo/bson/bsonelement.h"
 #include "mongo/bson/bsonobj.h"
@@ -38,6 +36,8 @@
 #include "mongo/bson/bsontypes.h"
 #include "mongo/util/str_escape.h"
 
+#include <algorithm>
+
 namespace mongo {
 bool isValidUTF8(const BSONObj& obj) {
     return std::all_of(obj.begin(), obj.end(), [](const auto& elem) {

src/mongo/bson/bson_utf8_test.cpp

@@ -27,10 +27,9 @@
  *    it in the license file.
  */
 
-#include <algorithm>
+#include "mongo/bson/bson_utf8.h"
 
 #include "mongo/base/string_data.h"
-#include "mongo/bson/bson_utf8.h"
 #include "mongo/bson/bsonmisc.h"
 #include "mongo/bson/bsonobj.h"
 #include "mongo/bson/bsontypes_util.h"
@@ -41,6 +40,8 @@
 #include "mongo/util/assert_util.h"
 #include "mongo/util/str.h"
 
+#include <algorithm>
+
 namespace mongo {
 
 /**

src/mongo/bson/bson_validate.cpp

@@ -29,17 +29,6 @@
 
 #include "mongo/bson/bson_validate.h"
 
-#include <algorithm>
-#include <array>
-#include <cstring>
-#include <fmt/format.h>
-#include <memory>
-#include <string>
-#include <type_traits>
-#include <utility>
-#include <vector>
-
-
 #include "mongo/base/data_type_endian.h"
 #include "mongo/base/data_view.h"
 #include "mongo/base/error_codes.h"
@@ -61,6 +50,17 @@
 #include "mongo/util/str.h"
 #include "mongo/util/str_escape.h"
 
+#include <algorithm>
+#include <array>
+#include <cstring>
+#include <memory>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+#include <fmt/format.h>
+
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kDefault
 
 

src/mongo/bson/bson_validate.h

@@ -29,13 +29,13 @@
 
 #pragma once
 
-#include <cstdint>
-
 #include "mongo/base/status.h"
 #include "mongo/bson/bson_validate_gen.h"
 #include "mongo/bson/bsonobj.h"
 #include "mongo/bson/bsontypes.h"
 
+#include <cstdint>
+
 namespace mongo {
 
 enum ValidationVersion {

src/mongo/bson/bson_validate_old.cpp

@@ -27,16 +27,16 @@
  *    it in the license file.
  */
 
-#include <cstring>
-#include <limits>
-#include <vector>
-
 #include "mongo/base/data_view.h"
 #include "mongo/bson/bson_depth.h"
 #include "mongo/bson/bson_validate.h"
 #include "mongo/bson/oid.h"
 #include "mongo/platform/decimal128.h"
 
+#include <cstring>
+#include <limits>
+#include <vector>
+
 namespace mongo {
 
 namespace {

src/mongo/bson/bson_validate_old.h

@@ -29,11 +29,11 @@
 
 #pragma once
 
-#include <cstdint>
-
 #include "mongo/base/string_data.h"
 #include "mongo/bson/bsontypes.h"
 
+#include <cstdint>
+
 namespace mongo {
 class BSONObj;
 class Status;

src/mongo/bson/bson_validate_test.cpp

@@ -28,13 +28,7 @@
  */
 
 
-#include <cstdio>
-#include <cstring>
-#include <ctime>
-#include <memory>
-#include <ostream>
-#include <string>
-#include <utility>
+#include "mongo/bson/bson_validate.h"
 
 #include "mongo/base/data_type_endian.h"
 #include "mongo/base/data_view.h"
@@ -42,7 +36,6 @@
 #include "mongo/base/status.h"
 #include "mongo/base/string_data.h"
 #include "mongo/bson/bson_depth.h"
-#include "mongo/bson/bson_validate.h"
 #include "mongo/bson/bsonelement.h"
 #include "mongo/bson/bsonmisc.h"
 #include "mongo/bson/bsonobjbuilder.h"
@@ -64,6 +57,14 @@
 #include "mongo/util/base64.h"
 #include "mongo/util/time_support.h"
 
+#include <cstdio>
+#include <cstring>
+#include <ctime>
+#include <memory>
+#include <ostream>
+#include <string>
+#include <utility>
+
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kTest
 
 

src/mongo/bson/bsonelement.cpp

@@ -33,9 +33,6 @@
 #include <boost/move/utility_core.hpp>
 #include <fmt/format.h>
 // IWYU pragma: no_include "ext/alloc_traits.h"
-#include <cmath>
-#include <ostream>
-
 #include "mongo/base/compare_numbers.h"
 #include "mongo/base/data_cursor.h"
 #include "mongo/base/parse_number.h"
@@ -53,6 +50,9 @@
 #include "mongo/util/hex.h"
 #include "mongo/util/str.h"
 
+#include <cmath>
+#include <ostream>
+
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kDefault
 
 namespace mongo {

src/mongo/bson/bsonelement.h

@@ -29,18 +29,6 @@
 
 #pragma once
 
-#include <algorithm>
-#include <array>
-#include <cmath>
-#include <cstdint>
-#include <cstring>  // strlen
-#include <fmt/format.h>
-#include <limits>
-#include <string>
-#include <type_traits>
-#include <utility>
-#include <vector>
-
 #include "mongo/base/data_type_endian.h"
 #include "mongo/base/data_view.h"
 #include "mongo/base/error_codes.h"
@@ -60,6 +48,19 @@
 #include "mongo/util/str.h"
 #include "mongo/util/time_support.h"
 
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <cstdint>
+#include <cstring>  // strlen
+#include <limits>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+#include <fmt/format.h>
+
 namespace mongo {
 class BSONObj;
 

src/mongo/bson/bsonelement_test.cpp

@@ -29,11 +29,6 @@
 
 #include <fmt/format.h>
 // IWYU pragma: no_include "ext/type_traits.h"
-#include <array>
-#include <cmath>
-#include <limits>
-#include <ostream>
-
 #include "mongo/base/data_range.h"
 #include "mongo/base/string_data.h"
 #include "mongo/bson/bsonelement.h"
@@ -44,6 +39,11 @@
 #include "mongo/util/duration.h"
 #include "mongo/util/uuid.h"
 
+#include <array>
+#include <cmath>
+#include <limits>
+#include <ostream>
+
 namespace mongo {
 namespace {
 

src/mongo/bson/bsonelementvalue.h

@@ -29,9 +29,6 @@
 
 #pragma once
 
-#include <cstdint>
-#include <cstring>  // strlen
-
 #include "mongo/base/data_type_endian.h"
 #include "mongo/base/data_view.h"
 #include "mongo/base/string_data.h"
@@ -43,6 +40,9 @@
 #include "mongo/platform/decimal128.h"
 #include "mongo/util/time_support.h"
 
+#include <cstdint>
+#include <cstring>  // strlen
+
 namespace mongo {
 class BSONObj;
 struct BSONArray;

src/mongo/bson/bsonmisc.cpp

@@ -28,12 +28,12 @@
  */
 #include "mongo/bson/bsonmisc.h"
 
-#include <algorithm>
-
 #include "mongo/base/string_data.h"
 #include "mongo/bson/bsonelement.h"
 #include "mongo/bson/bsonobj.h"
 
+#include <algorithm>
+
 namespace mongo {
 
 bool fieldsMatch(const BSONObj& a, const BSONObj& b) {

src/mongo/bson/bsonmisc.h

@@ -29,8 +29,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include "mongo/base/string_data.h"
 #include "mongo/bson/bsonelement.h"
 #include "mongo/bson/bsonobj.h"
@@ -38,6 +36,8 @@
 #include "mongo/bson/bsontypes_util.h"
 #include "mongo/bson/util/builder.h"
 
+#include <memory>
+
 namespace mongo {
 
 class BSONElementCmpWithoutField {

src/mongo/bson/bsonobj.cpp

@@ -27,20 +27,7 @@
  *    it in the license file.
  */
 
-#include <algorithm>
-#include <functional>
-#include <limits>
-#include <list>
-#include <memory>
-#include <ostream>
-#include <set>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include <absl/container/flat_hash_set.h>
-#include <boost/optional/optional.hpp>
-#include <fmt/format.h>
+#include "mongo/bson/bsonobj.h"
 
 #include "mongo/base/data_type.h"
 #include "mongo/base/error_codes.h"
@@ -48,7 +35,6 @@
 #include "mongo/base/string_data.h"
 #include "mongo/bson/bsonelement.h"
 #include "mongo/bson/bsonelement_comparator_interface.h"
-#include "mongo/bson/bsonobj.h"
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/bson/bsontypes.h"
 #include "mongo/bson/generator_extended_canonical_2_0_0.h"
@@ -65,6 +51,21 @@
 #include "mongo/util/str.h"
 #include "mongo/util/string_map.h"
 
+#include <algorithm>
+#include <functional>
+#include <limits>
+#include <list>
+#include <memory>
+#include <ostream>
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
+
+#include <absl/container/flat_hash_set.h>
+#include <boost/optional/optional.hpp>
+#include <fmt/format.h>
+
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kDefault
 
 

src/mongo/bson/bsonobj.h

@@ -29,25 +29,6 @@
 
 #pragma once
 
-#include <array>
-#include <bitset>
-#include <boost/none.hpp>
-#include <boost/optional/optional.hpp>
-#include <cstddef>
-#include <cstring>
-#include <fmt/format.h>
-#include <functional>
-#include <iosfwd>
-#include <iterator>
-#include <limits>
-#include <list>
-#include <memory>
-#include <set>
-#include <string>
-#include <type_traits>
-#include <utility>
-#include <vector>
-
 #include "mongo/base/data_type.h"
 #include "mongo/base/data_type_endian.h"
 #include "mongo/base/data_view.h"
@@ -70,6 +51,26 @@
 #include "mongo/util/shared_buffer.h"
 #include "mongo/util/string_map.h"
 
+#include <array>
+#include <bitset>
+#include <cstddef>
+#include <cstring>
+#include <functional>
+#include <iosfwd>
+#include <iterator>
+#include <limits>
+#include <list>
+#include <memory>
+#include <set>
+#include <string>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+#include <boost/none.hpp>
+#include <boost/optional/optional.hpp>
+#include <fmt/format.h>
+
 namespace mongo {
 
 class BSONObjBuilder;

src/mongo/bson/bsonobjbuilder.cpp

@@ -29,11 +29,11 @@
 
 #include "mongo/bson/bsonobjbuilder.h"
 
-#include <string>
-
 #include "mongo/bson/timestamp.h"
 #include "mongo/logv2/log.h"
 
+#include <string>
+
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kDefault
 
 namespace mongo {

src/mongo/bson/bsonobjbuilder.h

@@ -29,18 +29,6 @@
 
 #pragma once
 
-#include <cmath>
-#include <cstdint>
-#include <cstring>
-#include <limits>
-#include <list>
-#include <map>
-#include <set>
-#include <sys/types.h>
-#include <type_traits>
-#include <utility>
-#include <vector>
-
 #include "mongo/base/checked_cast.h"
 #include "mongo/base/data_type_endian.h"
 #include "mongo/base/data_view.h"
@@ -63,6 +51,19 @@
 #include "mongo/util/time_support.h"
 #include "mongo/util/tracking/allocator.h"
 
+#include <cmath>
+#include <cstdint>
+#include <cstring>
+#include <limits>
+#include <list>
+#include <map>
+#include <set>
+#include <type_traits>
+#include <utility>
+#include <vector>
+
+#include <sys/types.h>
+
 namespace mongo {
 
 /**

src/mongo/bson/bsonobjbuilder_test.cpp

@@ -40,8 +40,6 @@
 #include <boost/container/small_vector.hpp>
 #include <boost/container/vector.hpp>
 // IWYU pragma: no_include "boost/intrusive/detail/iterator.hpp"
-#include <boost/move/utility_core.hpp>
-
 #include "mongo/base/data_range.h"
 #include "mongo/base/data_type_endian.h"
 #include "mongo/base/error_codes.h"
@@ -58,6 +56,8 @@
 #include "mongo/util/assert_util.h"
 #include "mongo/util/shared_buffer.h"
 
+#include <boost/move/utility_core.hpp>
+
 namespace mongo {
 namespace {
 

src/mongo/bson/bsontypes.cpp

@@ -27,18 +27,19 @@
  *    it in the license file.
  */
 
-#include <absl/container/flat_hash_map.h>
-#include <boost/none.hpp>
-#include <fmt/format.h>
+#include "mongo/bson/bsontypes.h"
+
+#include "mongo/bson/bsonobj.h"
+#include "mongo/config.h"  // IWYU pragma: keep
+#include "mongo/util/string_map.h"
+
 #include <ostream>
 #include <utility>
 
+#include <absl/container/flat_hash_map.h>
+#include <boost/none.hpp>
 #include <boost/optional/optional.hpp>
-
-#include "mongo/bson/bsonobj.h"
-#include "mongo/bson/bsontypes.h"
-#include "mongo/config.h"  // IWYU pragma: keep
-#include "mongo/util/string_map.h"
+#include <fmt/format.h>
 
 namespace mongo {
 namespace {

src/mongo/bson/bsontypes.h

@@ -29,14 +29,6 @@
 
 #pragma once
 
-#include <boost/optional.hpp>
-#include <boost/optional/optional.hpp>
-#include <cstdint>
-#include <fmt/format.h>
-#include <iosfwd>
-#include <limits>
-#include <type_traits>
-
 #include "mongo/base/counter.h"
 #include "mongo/base/error_codes.h"
 #include "mongo/base/status.h"
@@ -45,6 +37,15 @@
 #include "mongo/platform/decimal128.h"
 #include "mongo/util/assert_util.h"
 
+#include <cstdint>
+#include <iosfwd>
+#include <limits>
+#include <type_traits>
+
+#include <boost/optional.hpp>
+#include <boost/optional/optional.hpp>
+#include <fmt/format.h>
+
 namespace mongo {
 
 class BSONArrayBuilder;

src/mongo/bson/column/bson_column_encoder.cpp

@@ -27,16 +27,6 @@
  *    it in the license file.
  */
 
-#include <algorithm>
-#include <boost/filesystem/operations.hpp>
-#include <boost/program_options.hpp>
-#include <boost/program_options/errors.hpp>
-#include <boost/program_options/options_description.hpp>
-#include <boost/program_options/value_semantic.hpp>
-#include <boost/program_options/variables_map.hpp>
-#include <fstream>
-#include <string>
-
 #include "mongo/base/data_view.h"
 #include "mongo/base/error_extra_info.h"
 #include "mongo/base/initializer.h"
@@ -46,6 +36,17 @@
 #include "mongo/bson/column/bsoncolumnbuilder.h"
 #include "mongo/bson/util/builder.h"
 
+#include <algorithm>
+#include <fstream>
+#include <string>
+
+#include <boost/filesystem/operations.hpp>
+#include <boost/program_options.hpp>
+#include <boost/program_options/errors.hpp>
+#include <boost/program_options/options_description.hpp>
+#include <boost/program_options/value_semantic.hpp>
+#include <boost/program_options/variables_map.hpp>
+
 using namespace mongo;
 using namespace std;
 

src/mongo/bson/column/bsoncolumn.cpp

@@ -29,18 +29,6 @@
 
 #include "mongo/bson/column/bsoncolumn.h"
 
-#include <algorithm>
-#include <array>
-#include <boost/move/utility_core.hpp>
-#include <boost/none.hpp>
-#include <boost/smart_ptr/intrusive_ptr.hpp>
-#include <boost/smart_ptr/intrusive_ref_counter.hpp>
-#include <cstdint>
-#include <cstring>
-#include <utility>
-
-#include <boost/optional/optional.hpp>
-
 #include "mongo/base/data_type_endian.h"
 #include "mongo/base/data_view.h"
 #include "mongo/bson/bsonelement.h"
@@ -56,6 +44,18 @@
 #include "mongo/util/overloaded_visitor.h"  // IWYU pragma: keep
 #include "mongo/util/time_support.h"
 
+#include <algorithm>
+#include <array>
+#include <cstdint>
+#include <cstring>
+#include <utility>
+
+#include <boost/move/utility_core.hpp>
+#include <boost/none.hpp>
+#include <boost/optional/optional.hpp>
+#include <boost/smart_ptr/intrusive_ptr.hpp>
+#include <boost/smart_ptr/intrusive_ref_counter.hpp>
+
 namespace mongo {
 using namespace bsoncolumn;
 

src/mongo/bson/column/bsoncolumn.h

@@ -29,19 +29,6 @@
 
 #pragma once
 
-#include <absl/numeric/int128.h>
-#include <boost/cstdint.hpp>
-#include <boost/move/utility_core.hpp>
-#include <boost/optional/optional.hpp>
-#include <boost/smart_ptr/intrusive_ptr.hpp>
-#include <boost/smart_ptr/intrusive_ref_counter.hpp>
-#include <cstddef>
-#include <cstdint>
-#include <iterator>
-#include <span>
-#include <variant>
-#include <vector>
-
 #include "mongo/base/string_data.h"
 #include "mongo/bson/bsonelement.h"
 #include "mongo/bson/bsonobj.h"
@@ -55,6 +42,20 @@
 #include "mongo/bson/util/bsonobj_traversal.h"
 #include "mongo/platform/int128.h"
 
+#include <cstddef>
+#include <cstdint>
+#include <iterator>
+#include <span>
+#include <variant>
+#include <vector>
+
+#include <absl/numeric/int128.h>
+#include <boost/cstdint.hpp>
+#include <boost/move/utility_core.hpp>
+#include <boost/optional/optional.hpp>
+#include <boost/smart_ptr/intrusive_ptr.hpp>
+#include <boost/smart_ptr/intrusive_ref_counter.hpp>
+
 namespace mongo {
 
 /**

src/mongo/bson/column/bsoncolumn_blockbased_test.cpp

@@ -30,7 +30,6 @@
 #include "mongo/bson/column/bsoncolumn.h"
 #include "mongo/bson/column/bsoncolumnbuilder.h"
 #include "mongo/bson/json.h"
-
 #include "mongo/unittest/unittest.h"
 
 namespace mongo {

src/mongo/bson/column/bsoncolumn_bm.cpp

@@ -27,21 +27,13 @@
  *    it in the license file.
  */
 
-#include <array>
-#include <benchmark/benchmark.h>
-#include <cmath>
-#include <cstdint>
-#include <fmt/format.h>
-#include <random>
-#include <string>
-#include <vector>
+#include "mongo/bson/column/bsoncolumn.h"
 
 #include "mongo/base/string_data.h"
 #include "mongo/bson/bsonelement.h"
 #include "mongo/bson/bsonobj.h"
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/bson/bsontypes.h"
-#include "mongo/bson/column/bsoncolumn.h"
 #include "mongo/bson/column/bsoncolumnbuilder.h"
 #include "mongo/bson/oid.h"
 #include "mongo/bson/timestamp.h"
@@ -49,6 +41,16 @@
 #include "mongo/db/exec/sbe/values/bsoncolumn_materializer.h"
 #include "mongo/util/time_support.h"
 
+#include <array>
+#include <cmath>
+#include <cstdint>
+#include <random>
+#include <string>
+#include <vector>
+
+#include <benchmark/benchmark.h>
+#include <fmt/format.h>
+
 namespace mongo {
 namespace {
 

src/mongo/bson/column/bsoncolumn_builder_fuzzer.cpp

@@ -27,21 +27,21 @@
  *    it in the license file.
  */
 
-#include "mongo/bson/bsontypes.h"
-#include "mongo/bson/column/simple8b_type_util.h"
-#include "mongo/bson/util/builder.h"
-#include <cstring>
-
 #include "mongo/base/string_data.h"
 #include "mongo/bson/bsonelement.h"
 #include "mongo/bson/bsonobj.h"
 #include "mongo/bson/bsonobjbuilder.h"
+#include "mongo/bson/bsontypes.h"
 #include "mongo/bson/column/bsoncolumn.h"
 #include "mongo/bson/column/bsoncolumn_fuzzer_util.h"
 #include "mongo/bson/column/bsoncolumnbuilder.h"
 #include "mongo/bson/column/simple8b_helpers.h"
+#include "mongo/bson/column/simple8b_type_util.h"
+#include "mongo/bson/util/builder.h"
 #include "mongo/util/base64.h"
 
+#include <cstring>
+
 using namespace mongo;
 
 /**

src/mongo/bson/column/bsoncolumn_fuzzer_util.cpp

@@ -28,9 +28,11 @@
  */
 
 #include "mongo/bson/column/bsoncolumn_fuzzer_util.h"
+
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/bson/column/simple8b_helpers.h"
 #include "mongo/bson/column/simple8b_type_util.h"
+
 #include <absl/numeric/int128.h>
 
 namespace mongo::bsoncolumn {

src/mongo/bson/column/bsoncolumn_fuzzer_util.h

@@ -30,6 +30,7 @@
 
 #include "mongo/bson/bsonelement.h"
 #include "mongo/bson/bsonobj.h"
+
 #include <forward_list>
 
 namespace mongo::bsoncolumn {

src/mongo/bson/column/bsoncolumn_helpers.h

@@ -29,9 +29,6 @@
 
 #pragma once
 
-#include <boost/container/small_vector.hpp>
-#include <concepts>
-
 #include "mongo/bson/bsonelement.h"
 #include "mongo/bson/bsonelementvalue.h"
 #include "mongo/bson/bsonobj.h"
@@ -42,6 +39,10 @@
 #include "mongo/bson/column/simple8b_type_util.h"
 #include "mongo/bson/util/bsonobj_traversal.h"
 
+#include <concepts>
+
+#include <boost/container/small_vector.hpp>
+
 namespace mongo {
 namespace bsoncolumn {
 

src/mongo/bson/column/bsoncolumn_interleaved.h

@@ -29,14 +29,14 @@
 
 #pragma once
 
-#include <algorithm>
-#include <span>
-
 #include "mongo/bson/column/bsoncolumn_helpers.h"
 #include "mongo/bson/util/bsonobj_traversal.h"
 #include "mongo/platform/compiler.h"
 #include "mongo/util/overloaded_visitor.h"
 
+#include <algorithm>
+#include <span>
+
 namespace mongo::bsoncolumn {
 
 /**

src/mongo/bson/column/bsoncolumn_test.cpp

@@ -27,22 +27,16 @@
  *    it in the license file.
  */
 
-#include "mongo/bson/bsonelement.h"
 #include "mongo/bson/column/bsoncolumn.h"
 
+#include "mongo/bson/bsonelement.h"
+
 #include <absl/numeric/int128.h>
 #include <boost/cstdint.hpp>
 #include <boost/move/utility_core.hpp>
 #include <boost/none.hpp>
 #include <boost/optional/optional.hpp>
 // IWYU pragma: no_include "ext/alloc_traits.h"
-#include <array>
-#include <cstdint>
-#include <cstring>
-#include <forward_list>
-#include <limits>
-#include <string>
-
 #include "mongo/base/error_codes.h"
 #include "mongo/bson/bsonmisc.h"
 #include "mongo/bson/bsonobjbuilder.h"
@@ -63,6 +57,13 @@
 #include "mongo/util/time_support.h"
 #include "mongo/util/tracking/context.h"
 
+#include <array>
+#include <cstdint>
+#include <cstring>
+#include <forward_list>
+#include <limits>
+#include <string>
+
 namespace mongo::bsoncolumn {
 namespace {
 

src/mongo/bson/column/bsoncolumnbuilder.cpp

@@ -29,20 +29,6 @@
 
 #include "mongo/bson/column/bsoncolumnbuilder.h"
 
-#include <absl/numeric/int128.h>
-#include <algorithm>
-#include <array>
-#include <boost/cstdint.hpp>
-#include <boost/none.hpp>
-#include <cstdint>
-#include <cstring>
-#include <iterator>
-#include <memory>
-#include <tuple>
-
-#include <boost/move/utility_core.hpp>
-#include <boost/optional/optional.hpp>
-
 #include "mongo/base/string_data.h"
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/bson/column/bsoncolumn.h"
@@ -54,6 +40,20 @@
 #include "mongo/util/time_support.h"
 #include "mongo/util/tracking/allocator.h"
 
+#include <algorithm>
+#include <array>
+#include <cstdint>
+#include <cstring>
+#include <iterator>
+#include <memory>
+#include <tuple>
+
+#include <absl/numeric/int128.h>
+#include <boost/cstdint.hpp>
+#include <boost/move/utility_core.hpp>
+#include <boost/none.hpp>
+#include <boost/optional/optional.hpp>
+
 namespace mongo {
 using namespace bsoncolumn;