SERVER-113193 apply standard mongo include path (#43328)

GitOrigin-RevId: 03a1791e053bdaf803f395c52039fd125ff4ce14

.clang-tidy.in

@@ -74,6 +74,7 @@ Checks:          '-*,
                   mongo-cxx20-std-chrono-check,
                   mongo-fcv-constant-check,
                   mongo-header-bracket-check,
+                  mongo-header-include-path-check,
                   mongo-invariant-status-is-ok-check,
                   mongo-invariant-ddl-coordinator-check,
                   mongo-macro-definition-leaks-check,

src/mongo/bson/column/bsoncolumn.h

@@ -688,4 +688,4 @@ void BSONColumnBlockBased::decompress(boost::intrusive_ptr<BSONElementStorage> a
 }  // namespace bsoncolumn
 }  // namespace mongo
 
-#include "bsoncolumn.inl"
+#include "mongo/bson/column/bsoncolumn.inl"

src/mongo/bson/column/simple8b.h

@@ -417,4 +417,4 @@ inline constexpr int128_t add(int128_t lhs, int128_t rhs) {
 
 }  // namespace mongo
 
-#include "simple8b.inl"
+#include "mongo/bson/column/simple8b.inl"

src/mongo/client/sdam/sdam_configuration.cpp

@@ -26,7 +26,7 @@
  *    exception statement from all source files in the program, then also delete
  *    it in the license file.
  */
-#include "sdam_configuration.h"
+#include "mongo/client/sdam/sdam_configuration.h"
 
 #include "mongo/base/error_codes.h"
 #include "mongo/bson/bsonobjbuilder.h"

src/mongo/client/sdam/server_selector.cpp

@@ -26,7 +26,7 @@
  *    exception statement from all source files in the program, then also delete
  *    it in the license file.
  */
-#include "server_selector.h"
+#include "mongo/client/sdam/server_selector.h"
 
 #include <boost/move/utility_core.hpp>
 #include <boost/none.hpp>

src/mongo/crypto/aead_encryption_test.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "aead_encryption.h"
+#include "mongo/crypto/aead_encryption.h"
 
 #include "mongo/base/data_range.h"
 #include "mongo/base/data_type_endian.h"

src/mongo/crypto/encryption_fields_validation.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "encryption_fields_validation.h"
+#include "mongo/crypto/encryption_fields_validation.h"
 
 #include <cmath>
 #include <cstdint>

src/mongo/crypto/fle_crypto_test_vectors.cpp

@@ -118,7 +118,7 @@ struct EdgeCalcTestVector {
 
 TEST(EdgeCalcTest, Int32_TestVectors) {
     std::vector<EdgeCalcTestVector<int32_t>> testVectors = {
-#include "test_vectors/edges_int32.cstruct.h"  // IWYU pragma: keep
+#include "mongo/crypto/test_vectors/edges_int32.cstruct.h"  // IWYU pragma: keep
     };
     for (const auto& testVector : testVectors) {
         ASSERT_TRUE(testVector.validate());
@@ -127,7 +127,7 @@ TEST(EdgeCalcTest, Int32_TestVectors) {
 
 TEST(EdgeCalcTest, Int64_TestVectors) {
     std::vector<EdgeCalcTestVector<int64_t>> testVectors = {
-#include "test_vectors/edges_int64.cstruct.h"  // IWYU pragma: keep
+#include "mongo/crypto/test_vectors/edges_int64.cstruct.h"  // IWYU pragma: keep
     };
     for (const auto& testVector : testVectors) {
         ASSERT_TRUE(testVector.validate());
@@ -145,7 +145,7 @@ std::unique_ptr<Edges> getEdgesDoubleForTest(double value,
 
 TEST(EdgeCalcTest, Double_TestVectors) {
     std::vector<EdgeCalcTestVector<double>> testVectors = {
-#include "test_vectors/edges_double.cstruct.h"  // IWYU pragma: keep
+#include "mongo/crypto/test_vectors/edges_double.cstruct.h"  // IWYU pragma: keep
     };
     for (const auto& testVector : testVectors) {
         ASSERT_TRUE(testVector.validate());
@@ -166,7 +166,7 @@ std::unique_ptr<Edges> getEdgesDecimal128ForTest(Decimal128 value,
 
 TEST(EdgeCalcTest, Decimal128_TestVectors) {
     std::vector<EdgeCalcTestVector<Decimal128>> testVectors = {
-#include "test_vectors/edges_decimal128.cstruct.h"  // IWYU pragma: keep
+#include "mongo/crypto/test_vectors/edges_decimal128.cstruct.h"  // IWYU pragma: keep
     };
     for (const auto& testVector : testVectors) {
         ASSERT_TRUE(testVector.validate());
@@ -214,7 +214,7 @@ struct MinCoverTestVector {
 
 TEST(MinCoverCalcTest, Int32_TestVectors) {
     const MinCoverTestVector<int32_t> testVectors[] = {
-#include "test_vectors/mincover_int32.cstruct.h"  // IWYU pragma: keep
+#include "mongo/crypto/test_vectors/mincover_int32.cstruct.h"  // IWYU pragma: keep
     };
     for (const auto& testVector : testVectors) {
         ASSERT_TRUE(testVector.validate(minCoverInt32));
@@ -223,7 +223,7 @@ TEST(MinCoverCalcTest, Int32_TestVectors) {
 
 TEST(MinCoverCalcTest, Int64_TestVectors) {
     const MinCoverTestVector<int64_t> testVectors[] = {
-#include "test_vectors/mincover_int64.cstruct.h"  // IWYU pragma: keep
+#include "mongo/crypto/test_vectors/mincover_int64.cstruct.h"  // IWYU pragma: keep
     };
     for (const auto& testVector : testVectors) {
         ASSERT_TRUE(testVector.validate(minCoverInt64));
@@ -252,7 +252,7 @@ std::vector<std::string> minCoverDoubleForTest(double lowerBound,
 
 TEST(MinCoverCalcTest, Double_TestVectors) {
     MinCoverTestVector<double> testVectors[] = {
-#include "test_vectors/mincover_double.cstruct.h"  // IWYU pragma: keep
+#include "mongo/crypto/test_vectors/mincover_double.cstruct.h"  // IWYU pragma: keep
     };
     for (const auto& testVector : testVectors) {
         ASSERT_TRUE(testVector.validate(minCoverDoubleForTest));
@@ -283,7 +283,7 @@ std::vector<std::string> minCoverDecimal128ForTest(Decimal128 lowerBound,
 
 TEST(MinCoverCalcTest, Decimal128_TestVectors) {
     MinCoverTestVector<Decimal128> testVectors[] = {
-#include "test_vectors/mincover_decimal128.cstruct.h"  // IWYU pragma: keep
+#include "mongo/crypto/test_vectors/mincover_decimal128.cstruct.h"  // IWYU pragma: keep
     };
     for (const auto& testVector : testVectors) {
         ASSERT_TRUE(testVector.validate(minCoverDecimal128ForTest));
@@ -333,7 +333,7 @@ struct MinCoverTestVectorPrecision {
 
 TEST(MinCoverCalcPrecisionTest, Double_TestVectors) {
     MinCoverTestVectorPrecision<double> testVectors[] = {
-#include "test_vectors/mincover_double_precision.cstruct.h"  // IWYU pragma: keep
+#include "mongo/crypto/test_vectors/mincover_double_precision.cstruct.h"  // IWYU pragma: keep
     };
     for (const auto& testVector : testVectors) {
         ASSERT_TRUE(testVector.validate(minCoverDouble));
@@ -342,7 +342,7 @@ TEST(MinCoverCalcPrecisionTest, Double_TestVectors) {
 
 TEST(MinCoverCalcPrecisionTest, Decimal128_TestVectors) {
     MinCoverTestVectorPrecision<Decimal128> testVectors[] = {
-#include "test_vectors/mincover_decimal128_precision.cstruct.h"  // IWYU pragma: keep
+#include "mongo/crypto/test_vectors/mincover_decimal128_precision.cstruct.h"  // IWYU pragma: keep
     };
     for (const auto& testVector : testVectors) {
         ASSERT_TRUE(testVector.validate(minCoverDecimal128));

src/mongo/db/auth/authorization_manager_factory.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "authorization_manager_factory.h"
+#include "mongo/db/auth/authorization_manager_factory.h"
 
 
 namespace mongo {

src/mongo/db/auth/umc_info_command_arg.h

@@ -35,6 +35,7 @@
 #include "mongo/db/auth/role_name.h"
 #include "mongo/db/auth/user_name.h"
 #include "mongo/db/database_name.h"
+#include "mongo/util/serialization_context.h"
 
 #include <string>
 #include <variant>

src/mongo/db/commands/test_commands_enabled.idl

@@ -29,7 +29,7 @@
 global:
     cpp_namespace: "mongo"
     cpp_includes:
-        - "src/mongo/db/commands/test_commands_enabled.h"
+        - "mongo/db/commands/test_commands_enabled.h"
 
 server_parameters:
     enableTestCommands:

src/mongo/db/database_name.cpp

@@ -28,7 +28,7 @@
  */
 
 
-#include "database_name.h"
+#include "mongo/db/database_name.h"
 
 #include <boost/container_hash/hash.hpp>
 

src/mongo/db/exec/agg/internal_apply_oplog_update_stage.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "src/mongo/db/exec/agg/internal_apply_oplog_update_stage.h"
+#include "mongo/db/exec/agg/internal_apply_oplog_update_stage.h"
 
 #include "mongo/bson/bsontypes.h"
 #include "mongo/db/exec/agg/document_source_to_stage_registry.h"

src/mongo/db/exec/projection_executor_redaction_test.cpp

@@ -31,6 +31,7 @@
 #include "mongo/bson/bsonobj.h"
 #include "mongo/bson/json.h"
 #include "mongo/db/exec/document_value/document.h"
+#include "mongo/db/exec/document_value/document_value_test_util.h"
 #include "mongo/db/exec/projection_executor.h"
 #include "mongo/db/exec/projection_executor_builder.h"
 #include "mongo/db/pipeline/expression_context.h"
@@ -48,8 +49,6 @@
 #include <memory>
 #include <string>
 
-#include "document_value/document_value_test_util.h"
-
 
 namespace mongo {
 namespace {

src/mongo/db/exec/sbe/values/bsoncolumn_materializer.h

@@ -36,8 +36,6 @@
 #include "mongo/db/exec/sbe/values/bson_block.h"
 #include "mongo/db/exec/sbe/values/value.h"
 
-#include "bson_block.h"
-
 
 namespace mongo::sbe {
 namespace bsoncolumn {

src/mongo/db/local_catalog/collection_catalog.cpp

@@ -48,6 +48,7 @@
 #include "mongo/crypto/fle_stats.h"
 #include "mongo/db/client.h"
 #include "mongo/db/commands/server_status/server_status.h"
+#include "mongo/db/local_catalog/collection_catalog.h"
 #include "mongo/db/local_catalog/collection_options.h"
 #include "mongo/db/local_catalog/collection_record_store_options.h"
 #include "mongo/db/local_catalog/durable_catalog.h"
@@ -83,8 +84,6 @@
 #include <mutex>
 #include <shared_mutex>
 
-#include "collection_catalog.h"
-
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kStorage
 
 

src/mongo/db/local_catalog/ddl/replica_set_ddl_tracker.cpp

@@ -27,9 +27,9 @@
  *    it in the license file.
  */
 
-#include "src/mongo/db/local_catalog/ddl/replica_set_ddl_tracker.h"
+#include "mongo/db/local_catalog/ddl/replica_set_ddl_tracker.h"
 
-#include "src/mongo/db/service_context.h"
+#include "mongo/db/service_context.h"
 
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kSharding
 

src/mongo/db/local_catalog/shard_role_api/shard_role_loop.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "shard_role_loop.h"
+#include "mongo/db/local_catalog/shard_role_api/shard_role_loop.h"
 
 #include "mongo/db/global_catalog/catalog_cache/shard_cannot_refresh_due_to_locks_held_exception.h"
 #include "mongo/db/local_catalog/shard_role_api/transaction_resources.h"

src/mongo/db/local_catalog/shard_role_api/shard_role_loop_test.cpp

@@ -33,18 +33,17 @@
 #include "mongo/db/global_catalog/catalog_cache/shard_cannot_refresh_due_to_locks_held_exception.h"
 #include "mongo/db/global_catalog/catalog_cache/shard_server_catalog_cache_loader_mock.h"
 #include "mongo/db/local_catalog/lock_manager/d_concurrency.h"
+#include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h"
+#include "mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h"
+#include "mongo/db/service_context_test_fixture.h"
 #include "mongo/db/sharding_environment/grid.h"
 #include "mongo/db/sharding_environment/sharding_api_d_params_gen.h"
 #include "mongo/db/versioning_protocol/shard_version_factory.h"
+#include "mongo/db/versioning_protocol/stale_exception.h"
 
 #include <memory>
 #include <queue>
 
-#include "src/mongo/db/local_catalog/shard_role_catalog/collection_sharding_state.h"
-#include "src/mongo/db/local_catalog/shard_role_catalog/database_sharding_state.h"
-#include "src/mongo/db/service_context_test_fixture.h"
-#include "src/mongo/db/versioning_protocol/stale_exception.h"
-
 namespace mongo {
 
 using shard_role_loop::CanRetry;

src/mongo/db/local_catalog/shard_role_catalog/stale_shard_exception_handler.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "stale_shard_exception_handler.h"
+#include "mongo/db/local_catalog/shard_role_catalog/stale_shard_exception_handler.h"
 
 #include "mongo/db/local_catalog/shard_role_catalog/collection_sharding_runtime.h"
 #include "mongo/db/local_catalog/shard_role_catalog/database_sharding_runtime.h"

src/mongo/db/local_catalog/uncommitted_catalog_updates.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "uncommitted_catalog_updates.h"
+#include "mongo/db/local_catalog/uncommitted_catalog_updates.h"
 
 #include "mongo/db/local_catalog/collection_catalog.h"
 #include "mongo/db/local_catalog/shard_role_api/transaction_resources.h"

src/mongo/db/local_catalog/views_for_database.cpp

@@ -28,7 +28,7 @@
  */
 
 
-#include "views_for_database.h"
+#include "mongo/db/local_catalog/views_for_database.h"
 
 #include "mongo/base/error_codes.h"
 #include "mongo/base/string_data.h"

src/mongo/db/pipeline/change_stream_expired_pre_image_remover.cpp

@@ -29,7 +29,7 @@
 
 
 // IWYU pragma: no_include "cxxabi.h"
-#include "change_stream_expired_pre_image_remover.h"
+#include "mongo/db/pipeline/change_stream_expired_pre_image_remover.h"
 
 #include "mongo/db/auth/authorization_session.h"
 #include "mongo/db/change_stream_pre_images_collection_manager.h"

src/mongo/db/pipeline/document_source_bucket_test.cpp

@@ -32,6 +32,7 @@
 #include "mongo/base/string_data.h"
 #include "mongo/bson/bsonobj.h"
 #include "mongo/bson/json.h"
+#include "mongo/db/exec/agg/document_source_to_stage_registry.h"
 #include "mongo/db/exec/agg/mock_stage.h"
 #include "mongo/db/exec/document_value/document.h"
 #include "mongo/db/exec/document_value/document_value_test_util.h"
@@ -48,7 +49,6 @@
 #include <memory>
 #include <vector>
 
-#include "src/mongo/db/exec/agg/document_source_to_stage_registry.h"
 #include <boost/smart_ptr/intrusive_ptr.hpp>
 
 namespace mongo {

src/mongo/db/pipeline/document_source_documents_test.cpp

@@ -26,7 +26,7 @@
  *    exception statement from all source files in the program, then also delete
  *    it in the license file.
  */
-#include "document_source_documents.h"
+#include "mongo/db/pipeline/document_source_documents.h"
 
 #include "mongo/bson/bsonobj.h"
 #include "mongo/bson/json.h"

src/mongo/db/pipeline/document_source_query_settings.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "document_source_query_settings.h"
+#include "mongo/db/pipeline/document_source_query_settings.h"
 
 #include "mongo/bson/bsontypes.h"
 #include "mongo/db/exec/document_value/document.h"

src/mongo/db/pipeline/document_source_rank_fusion_test.cpp

@@ -31,13 +31,12 @@
 
 #include "mongo/bson/json.h"
 #include "mongo/db/pipeline/aggregation_context_fixture.h"
+#include "mongo/db/pipeline/expression_context.h"
 #include "mongo/db/pipeline/pipeline.h"
 #include "mongo/idl/server_parameter_test_controller.h"
 #include "mongo/unittest/unittest.h"
 #include "mongo/util/assert_util.h"
 
-#include "expression_context.h"
-
 namespace mongo {
 namespace {
 

src/mongo/db/pipeline/expression_trigonometric.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "expression_trigonometric.h"
+#include "mongo/db/pipeline/expression_trigonometric.h"
 
 #include "mongo/db/exec/expression/evaluate.h"
 #include "mongo/db/pipeline/expression.h"

src/mongo/db/pipeline/expression_trigonometric.h

@@ -31,6 +31,7 @@
 
 #include "mongo/bson/bsontypes.h"
 #include "mongo/db/exec/document_value/value.h"
+#include "mongo/db/pipeline/expression.h"
 #include "mongo/db/pipeline/expression_context.h"
 #include "mongo/db/pipeline/expression_visitor.h"
 #include "mongo/platform/decimal128.h"
@@ -43,8 +44,6 @@
 #include <string>
 #include <utility>
 
-#include "expression.h"
-
 namespace mongo {
 
 /**

src/mongo/db/pipeline/search/search_helper_bson_obj.h

@@ -39,8 +39,6 @@
 #include "mongo/db/pipeline/search/document_source_vector_search.h"
 #include "mongo/util/modules.h"
 
-#include "document_source_list_search_indexes.h"
-
 namespace mongo {
 
 namespace search_helper_bson_obj {

src/mongo/db/pipeline/window_function/window_function_count.h

@@ -30,11 +30,10 @@
 #pragma once
 #include "mongo/bson/bsonobj.h"
 #include "mongo/db/pipeline/expression_context.h"
+#include "mongo/db/pipeline/window_function/window_function_expression.h"
 #include "mongo/db/query/compiler/logical_model/sort_pattern/sort_pattern.h"
 #include "mongo/util/modules.h"
 
-#include "window_function_expression.h"
-
 #include <boost/optional/optional.hpp>
 #include <boost/smart_ptr/intrusive_ptr.hpp>
 

src/mongo/db/pipeline/window_function/window_function_shift.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "window_function_shift.h"
+#include "mongo/db/pipeline/window_function/window_function_shift.h"
 
 #include "mongo/base/error_codes.h"
 #include "mongo/base/status_with.h"

src/mongo/db/query/fle/encrypted_predicate.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "encrypted_predicate.h"
+#include "mongo/db/query/fle/encrypted_predicate.h"
 
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/bson/bsontypes.h"

src/mongo/db/query/fle/equality_predicate.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "equality_predicate.h"
+#include "mongo/db/query/fle/equality_predicate.h"
 
 #include "mongo/base/string_data.h"
 #include "mongo/bson/bsonelement.h"

src/mongo/db/query/fle/query_rewriter.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "query_rewriter.h"
+#include "mongo/db/query/fle/query_rewriter.h"
 
 #include "mongo/db/matcher/expression_expr.h"
 #include "mongo/db/pipeline/expression_walker.h"

src/mongo/db/query/fle/query_rewriter_test.cpp

@@ -28,7 +28,7 @@
  */
 
 
-#include "query_rewriter.h"
+#include "mongo/db/query/fle/query_rewriter.h"
 
 #include "mongo/base/string_data.h"
 #include "mongo/bson/bsonelement.h"

src/mongo/db/query/fle/range_predicate.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "range_predicate.h"
+#include "mongo/db/query/fle/range_predicate.h"
 
 #include "mongo/crypto/fle_crypto.h"
 #include "mongo/crypto/fle_tags.h"

src/mongo/db/query/fle/range_validator.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "range_validator.h"
+#include "mongo/db/query/fle/range_validator.h"
 
 #include "mongo/bson/bsonelement.h"
 #include "mongo/crypto/fle_crypto.h"

src/mongo/db/query/fle/range_validator_test.cpp

@@ -26,7 +26,7 @@
  *    exception statement from all source files in the program, then also delete
  *    it in the license file.
  */
-#include "range_validator.h"
+#include "mongo/db/query/fle/range_validator.h"
 
 #include "mongo/base/string_data.h"
 #include "mongo/bson/bsonelement.h"
@@ -41,6 +41,7 @@
 #include "mongo/db/pipeline/expression_context.h"
 #include "mongo/db/pipeline/expression_context_for_test.h"
 #include "mongo/db/query/compiler/parsers/matcher/expression_parser.h"
+#include "mongo/db/query/fle/encrypted_predicate_test_fixtures.h"
 #include "mongo/unittest/unittest.h"
 #include "mongo/util/intrusive_counter.h"
 #include "mongo/util/str.h"
@@ -52,8 +53,6 @@
 #include <utility>
 #include <vector>
 
-#include "encrypted_predicate_test_fixtures.h"
-
 #include <boost/none.hpp>
 #include <boost/optional/optional.hpp>
 #include <boost/smart_ptr/intrusive_ptr.hpp>

src/mongo/db/query/fle/text_search_predicate.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "text_search_predicate.h"
+#include "mongo/db/query/fle/text_search_predicate.h"
 
 #include "mongo/crypto/fle_tags.h"
 #include "mongo/db/server_feature_flags_gen.h"

src/mongo/db/query/query_planner_params.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "query_planner_params.h"
+#include "mongo/db/query/query_planner_params.h"
 
 #include "mongo/db/exec/projection_executor_utils.h"
 #include "mongo/db/global_catalog/shard_key_pattern_query_util.h"

src/mongo/db/query/query_settings/query_settings_comment.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "query_settings_comment.h"
+#include "mongo/db/query/query_settings/query_settings_comment.h"
 
 namespace mongo::query_settings {
 std::strong_ordering Comment::operator<=>(const Comment& other) const {

src/mongo/db/query/query_shape/serialization_options.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "serialization_options.h"
+#include "mongo/db/query/query_shape/serialization_options.h"
 
 #include "mongo/base/string_data.h"
 #include "mongo/bson/bsonmisc.h"

src/mongo/db/query/query_stats/rate_limiting.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "rate_limiting.h"
+#include "mongo/db/query/query_stats/rate_limiting.h"
 
 #include "mongo/stdx/mutex.h"
 #include "mongo/util/clock_source.h"

src/mongo/db/query/query_tester/command_helpers.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "command_helpers.h"
+#include "mongo/db/query/query_tester/command_helpers.h"
 
 #include "mongo/bson/bsonelement.h"
 #include "mongo/db/database_name.h"

src/mongo/db/query/query_tester/file_helpers.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "file_helpers.h"
+#include "mongo/db/query/query_tester/file_helpers.h"
 
 #include "mongo/base/string_data.h"
 #include "mongo/bson/bsonobj.h"

src/mongo/db/query/query_tester/main.cpp

@@ -27,6 +27,9 @@
  *    it in the license file.
  */
 
+#include "mongo/db/query/query_tester/command_helpers.h"
+#include "mongo/db/query/query_tester/mock_version_info.h"
+#include "mongo/db/query/query_tester/testfile.h"
 #include "mongo/db/service_context.h"
 #include "mongo/db/wire_version.h"
 #include "mongo/platform/random.h"
@@ -44,10 +47,6 @@
 #include <memory>
 #include <vector>
 
-#include "command_helpers.h"
-#include "mock_version_info.h"
-#include "testfile.h"
-
 namespace mongo::query_tester {
 namespace {
 struct TestSpec {

src/mongo/db/query/query_tester/test.cpp

@@ -27,11 +27,12 @@
  *    it in the license file.
  */
 
-#include "test.h"
+#include "mongo/db/query/query_tester/test.h"
 
 #include "mongo/base/string_data_comparator.h"
 #include "mongo/bson/bsonelement.h"
 #include "mongo/bson/json.h"
+#include "mongo/db/query/query_tester/command_helpers.h"
 #include "mongo/db/query/util/jparse_util.h"
 #include "mongo/rpc/op_msg.h"
 #include "mongo/shell/shell_utils.h"
@@ -40,8 +41,6 @@
 #include <fstream>
 #include <thread>
 
-#include "command_helpers.h"
-
 namespace mongo::query_tester {
 namespace {
 // If a line begins with a mode string, it is a test.

src/mongo/db/query/query_tester/test.h

@@ -30,6 +30,7 @@
 #pragma once
 
 #include "mongo/client/dbclient_connection.h"
+#include "mongo/db/query/query_tester/file_helpers.h"
 #include "mongo/db/query/util/jparse_util.h"
 #include "mongo/shell/shell_utils.h"
 #include "mongo/util/modules.h"
@@ -38,8 +39,6 @@
 #include <fstream>
 #include <string>
 
-#include "file_helpers.h"
-
 namespace mongo::query_tester {
 using shell_utils::NormalizationOpts;
 using shell_utils::NormalizationOptsSet;

src/mongo/db/query/query_tester/testfile.cpp

@@ -27,9 +27,10 @@
  *    it in the license file.
  */
 
-#include "testfile.h"
+#include "mongo/db/query/query_tester/testfile.h"
 
 #include "mongo/base/error_codes.h"
+#include "mongo/db/query/query_tester/command_helpers.h"
 #include "mongo/db/query/util/jparse_util.h"
 #include "mongo/util/pcre.h"
 #include "mongo/util/shell_exec.h"
@@ -38,8 +39,6 @@
 #include <ostream>
 #include <vector>
 
-#include "command_helpers.h"
-
 namespace mongo::query_tester {
 namespace {
 

src/mongo/db/query/query_tester/testfile.h

@@ -29,6 +29,7 @@
 
 #pragma once
 
+#include "mongo/db/query/query_tester/test.h"
 #include "mongo/stdx/unordered_map.h"
 #include "mongo/util/modules.h"
 
@@ -36,8 +37,6 @@
 #include <string>
 #include <vector>
 
-#include "test.h"
-
 namespace mongo::query_tester {
 
 static constexpr auto kMinTestNum = size_t{0};

src/mongo/db/query/search/search_task_executors.cpp

@@ -28,8 +28,10 @@
  */
 
 
-#include "search_task_executors.h"
+#include "mongo/db/query/search/search_task_executors.h"
 
+#include "mongo/db/query/search/mongot_options.h"
+#include "mongo/db/query/search/search_index_options.h"
 #include "mongo/executor/connection_pool_controllers.h"
 #include "mongo/executor/network_interface_factory.h"
 #include "mongo/executor/network_interface_thread_pool.h"
@@ -41,9 +43,6 @@
 #include <memory>
 #include <utility>
 
-#include "mongot_options.h"
-#include "search_index_options.h"
-
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kExecutor
 
 

src/mongo/db/query/search/search_task_executors_integration_test.cpp

@@ -27,14 +27,13 @@
  *    it in the license file.
  */
 
+#include "mongo/db/query/search/search_task_executors.h"
 #include "mongo/db/service_context.h"
 #include "mongo/executor/pinned_connection_task_executor_factory.h"
 #include "mongo/unittest/integration_test.h"
 #include "mongo/unittest/unittest.h"
 #include "mongo/util/future.h"
 
-#include "search_task_executors.h"
-
 namespace mongo {
 namespace executor {
 namespace {

src/mongo/db/query/util/cartesian_product_test.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "cartesian_product.h"
+#include "mongo/db/query/util/cartesian_product.h"
 
 #include "mongo/unittest/unittest.h"
 

src/mongo/db/repl/repl_set_heartbeat_args_v1_test.cpp

@@ -28,7 +28,7 @@
  */
 
 
-#include "repl_set_heartbeat_args_v1.h"
+#include "mongo/db/repl/repl_set_heartbeat_args_v1.h"
 
 #include "mongo/unittest/unittest.h"
 

src/mongo/db/repl/replication_coordinator_noop.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "replication_coordinator_noop.h"
+#include "mongo/db/repl/replication_coordinator_noop.h"
 
 #include "mongo/base/error_codes.h"
 #include "mongo/util/assert_util.h"

src/mongo/db/storage/oplog_cap_maintainer_thread.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "oplog_cap_maintainer_thread.h"
+#include "mongo/db/storage/oplog_cap_maintainer_thread.h"
 
 #include "mongo/base/error_codes.h"
 #include "mongo/base/status.h"

src/mongo/db/timeseries/timeseries_index_schema_conversion_functions.cpp

@@ -59,7 +59,6 @@
 #include <tuple>
 #include <utility>
 
-#include "src/mongo/db/local_catalog/index_descriptor.h"
 #include <boost/container/small_vector.hpp>
 #include <boost/move/utility_core.hpp>
 #include <boost/none.hpp>

src/mongo/db/timeseries/timeseries_write_commands_test.cpp

@@ -40,8 +40,7 @@
 #include "mongo/db/storage/write_unit_of_work.h"
 #include "mongo/db/timeseries/timeseries_gen.h"
 #include "mongo/db/timeseries/timeseries_test_fixture.h"
-
-#include "src/mongo/rpc/get_status_from_command_result_write_util.h"
+#include "mongo/rpc/get_status_from_command_result_write_util.h"
 
 namespace mongo {
 namespace {

src/mongo/db/traffic_recorder.idl

@@ -33,7 +33,7 @@ global:
     cpp_namespace: "mongo"
     cpp_includes:
         - "mongo/db/traffic_recorder_validators.h"
-        - "src/mongo/db/query/util/memory_util.h"
+        - "mongo/db/query/util/memory_util.h"
 
 imports:
     - "mongo/db/basic_types.idl"

src/mongo/db/validate_api_parameters.h

@@ -30,14 +30,13 @@
 #pragma once
 
 #include "mongo/bson/bsonobj.h"
+#include "mongo/db/api_parameters.h"
 #include "mongo/db/api_parameters_gen.h"
 #include "mongo/db/commands.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/platform/compiler.h"
 #include "mongo/util/assert_util.h"
 
-#include "api_parameters.h"
-
 namespace mongo {
 
 class BSONObj;

src/mongo/db/version_context_test.cpp

@@ -29,9 +29,9 @@
 #include "mongo/db/version_context.h"
 
 #include "mongo/base/string_data.h"
+#include "mongo/bson/bsonmisc.h"
 #include "mongo/unittest/unittest.h"
 
-#include "src/mongo/bson/bsonmisc.h"
 #include <fmt/format.h>
 
 namespace mongo {

src/mongo/embedded/stitch_support/stitch_support.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "stitch_support/stitch_support.h"
+#include "mongo/embedded/stitch_support/stitch_support.h"
 
 #include "mongo/base/error_codes.h"
 #include "mongo/base/initializer.h"
@@ -59,6 +59,7 @@
 #include "mongo/db/query/write_ops/write_ops_parsers.h"
 #include "mongo/db/service_context.h"
 #include "mongo/db/update/update_driver.h"
+#include "mongo/embedded/api_common.h"
 #include "mongo/stdx/type_traits.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/intrusive_counter.h"
@@ -75,8 +76,6 @@
 #include <utility>
 #include <vector>
 
-#include "api_common.h"
-
 #include <boost/smart_ptr/intrusive_ptr.hpp>
 
 #if defined(_WIN32)

src/mongo/embedded/stitch_support/stitch_support_test.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "stitch_support/stitch_support.h"
+#include "mongo/embedded/stitch_support/stitch_support.h"
 
 #include "mongo/base/initializer.h"
 #include "mongo/base/status.h"

src/mongo/executor/executor_integration_test_connection_stats.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "src/mongo/executor/executor_integration_test_connection_stats.h"
+#include "mongo/executor/executor_integration_test_connection_stats.h"
 
 #include "mongo/base/string_data.h"
 #include "mongo/bson/bsonobj.h"

src/mongo/executor/pinned_connection_task_executor.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "pinned_connection_task_executor.h"
+#include "mongo/executor/pinned_connection_task_executor.h"
 
 // IWYU pragma: no_include "cxxabi.h"
 #include "mongo/base/error_codes.h"

src/mongo/executor/pinned_connection_task_executor_test.cpp

@@ -38,6 +38,7 @@
 #include "mongo/bson/bsonobj.h"
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/executor/network_interface_mock.h"
+#include "mongo/executor/pinned_connection_task_executor_test_fixture.h"
 #include "mongo/executor/remote_command_request.h"
 #include "mongo/executor/task_executor.h"
 #include "mongo/platform/atomic_word.h"
@@ -61,8 +62,6 @@
 #include <utility>
 #include <vector>
 
-#include "pinned_connection_task_executor_test_fixture.h"
-
 #include <boost/move/utility_core.hpp>
 #include <boost/smart_ptr.hpp>
 

src/mongo/logv2/log_domain_global.cpp

@@ -28,7 +28,7 @@
  */
 
 
-#include "log_domain_global.h"
+#include "mongo/logv2/log_domain_global.h"
 
 #include <cstdint>
 #include <iosfwd>

src/mongo/logv2/log_domain_internal.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "log_domain_internal.h"
+#include "mongo/logv2/log_domain_internal.h"
 
 namespace mongo::logv2 {
 

src/mongo/rpc/metadata/audit_client_attrs.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "audit_client_attrs.h"
+#include "mongo/rpc/metadata/audit_client_attrs.h"
 
 namespace mongo::rpc {
 namespace {

src/mongo/rpc/metadata/audit_user_attrs_client_observer.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "audit_user_attrs_client_observer.h"
+#include "mongo/rpc/metadata/audit_user_attrs_client_observer.h"
 
 #include "mongo/db/auth/authorization_session.h"
 #include "mongo/db/client.h"

src/mongo/rpc/metadata/audit_user_attrs_client_observer_test.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "audit_user_attrs_client_observer.h"
+#include "mongo/rpc/metadata/audit_user_attrs_client_observer.h"
 
 #include "mongo/db/auth/authorization_session_test_fixture.h"
 #include "mongo/db/auth/sasl_options.h"

src/mongo/shell/kms.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "kms.h"
+#include "mongo/shell/kms.h"
 
 #include "mongo/idl/idl_parser.h"
 #include "mongo/shell/kms_gen.h"

src/mongo/shell/kms_test.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "kms.h"
+#include "mongo/shell/kms.h"
 
 #include "mongo/base/data_range.h"
 #include "mongo/bson/bsonmisc.h"

src/mongo/util/boost_assert_shim.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "boost_assert_shim.h"
+#include "mongo/util/boost_assert_shim.h"
 
 #if defined(BOOST_ENABLE_ASSERT_DEBUG_HANDLER) && !defined(NDEBUG)
 

src/mongo/util/cryptd/cryptd_options_init.cpp

@@ -29,6 +29,7 @@
 #include "mongo/base/status.h"
 #include "mongo/db/server_options.h"
 #include "mongo/util/assert_util.h"
+#include "mongo/util/cryptd/cryptd_options.h"
 #include "mongo/util/exit_code.h"
 #include "mongo/util/options_parser/startup_option_init.h"
 #include "mongo/util/options_parser/startup_options.h"
@@ -36,8 +37,6 @@
 
 #include <iostream>
 
-#include "cryptd_options.h"
-
 #include <boost/filesystem.hpp>
 
 namespace mongo {

src/mongo/util/processinfo_linux.cpp

@@ -35,6 +35,8 @@
 #include <boost/optional/optional.hpp>
 #include <fmt/format.h>
 // IWYU pragma: no_include "bits/types/struct_rusage.h"
+#include "mongo/util/processinfo.h"
+
 #include <algorithm>
 #include <climits>
 #include <compare>
@@ -54,8 +56,6 @@
 #include <type_traits>
 #include <utility>
 #include <vector>
-
-#include "processinfo.h"
 // IWYU pragma: no_include "boost/system/detail/error_code.hpp"
 
 #ifndef _WIN32

src/mongo/util/signal_handlers_asynchronous_test.cpp

@@ -44,8 +44,6 @@
 #include <cstdlib>
 #include <string>
 
-#include "signal_handlers.h"
-
 #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kTest
 
 namespace mongo {

src/mongo/util/signal_handlers_synchronous.cpp

@@ -41,8 +41,6 @@
 #include <string>
 #include <typeinfo>
 
-#include "signal_handlers_synchronous.h"
-
 #include <boost/exception/diagnostic_information.hpp>
 #include <boost/exception/exception.hpp>
 #include <fmt/format.h>

src/mongo/util/stacktrace_libunwind_test_functions.cpp

@@ -32,7 +32,7 @@
  * functions appear in backtraces, see unwind_test.cpp.
  */
 
-#include "stacktrace_libunwind_test_functions.h"
+#include "mongo/util/stacktrace_libunwind_test_functions.h"
 
 #include "mongo/platform/compiler.h"
 #include "mongo/util/stacktrace.h"

src/mongo/util/summation.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "summation.h"
+#include "mongo/util/summation.h"
 
 #include "mongo/base/error_codes.h"
 #include "mongo/util/assert_util.h"

src/mongo/util/tracing_profiler/internal/cycleclock.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "cycleclock.h"
+#include "mongo/util/tracing_profiler/internal/cycleclock.h"
 namespace mongo::tracing_profiler::internal {
 
 SystemCycleClock& SystemCycleClock::get() {