SERVER-113358 Move ownership of util/namespace_string* and util/database_name* to CAR (#49760)

GitOrigin-RevId: 523211f84e7e8dca85eddc89431f177b3cff7985

modules_poc/modules.yaml

@@ -276,8 +276,6 @@ catalog_and_routing:
     - src/mongo/db/database_name[._]*
     - src/mongo/db/namespace_string[._]*
     - src/mongo/db/stats/system_buckets_metrics*
-    - src/mongo/util/namespace_string[._]*
-    - src/mongo/util/database_name[._]*
 
 catalog_and_routing.shard_role:
   meta:

src/mongo/client/dbclient_base.cpp

@@ -45,9 +45,11 @@
 #include "mongo/db/api_parameters_gen.h"
 #include "mongo/db/auth/user_name.h"
 #include "mongo/db/client.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/dbmessage.h"
 #include "mongo/db/logical_time.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/query/client_cursor/cursor_id.h"
 #include "mongo/db/query/client_cursor/kill_cursors_gen.h"
@@ -65,10 +67,8 @@
 #include "mongo/rpc/protocol.h"
 #include "mongo/rpc/reply_interface.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/future.h"
 #include "mongo/util/future_impl.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/net/hostandport.h"
 #include "mongo/util/str.h"
 #include "mongo/util/uuid.h"

src/mongo/client/dbclient_connection.cpp

@@ -46,6 +46,7 @@
 #include "mongo/db/auth/sasl_command_constants.h"
 #include "mongo/db/auth/user_name.h"
 #include "mongo/db/commands/test_commands_enabled.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/server_options.h"
 #include "mongo/db/service_context.h"
 #include "mongo/db/tenant_id.h"
@@ -61,7 +62,6 @@
 #include "mongo/transport/transport_layer_manager.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/clock_source.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/fail_point.h"
 #include "mongo/util/future.h"
 #include "mongo/util/net/socket_exception.h"

src/mongo/client/dbclient_session.cpp

@@ -50,6 +50,7 @@
 #include "mongo/db/auth/sasl_command_constants.h"
 #include "mongo/db/auth/user_name.h"
 #include "mongo/db/commands/test_commands_enabled.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/server_options.h"
 #include "mongo/db/service_context.h"
 #include "mongo/db/stats/counters.h"
@@ -63,7 +64,6 @@
 #include "mongo/transport/transport_layer.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/clock_source.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/fail_point.h"
 #include "mongo/util/future.h"
 #include "mongo/util/net/socket_exception.h"

src/mongo/db/BUILD.bazel

@@ -1317,6 +1317,7 @@ mongo_cc_library(
 mongo_cc_library(
     name = "server_base",
     srcs = [
+        "database_name_util.cpp",
         "feature_compatibility_version_parser.cpp",
         "feature_flag.cpp",
         "feature_flag_server_parameter.cpp",
@@ -1325,6 +1326,7 @@ mongo_cc_library(
         "index_names.cpp",
         "keypattern.cpp",
         "mirror_maestro_feature_flags_gen",
+        "namespace_string_util.cpp",
         "read_write_concern_provenance.cpp",
         "server_options.cpp",
         "shutdown_in_progress_quiesce_info.cpp",
@@ -1373,9 +1375,7 @@ mongo_cc_library(
         "//src/mongo/idl:generic_argument.cpp",
         "//src/mongo/idl:generic_argument_gen",
         "//src/mongo/rpc/metadata:audit_metadata_gen",
-        "//src/mongo/util:database_name_util.cpp",
         "//src/mongo/util:fail_point_server_parameter_gen",
-        "//src/mongo/util:namespace_string_util.cpp",
     ],
     deps = [
         ":cluster_role",
@@ -2937,8 +2937,8 @@ mongo_cc_unit_test(
 mongo_cc_unit_test(
     name = "server_base_test",
     srcs = [
-        "//src/mongo/util:database_name_util_test.cpp",
-        "//src/mongo/util:namespace_string_util_test.cpp",
+        "database_name_util_test.cpp",
+        "namespace_string_util_test.cpp",
     ],
     tags = ["mongo_unittest_sixth_group"],
     deps = [

src/mongo/db/auth/auth_op_observer.cpp

@@ -35,6 +35,7 @@
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/db/audit.h"
 #include "mongo/db/auth/authorization_manager.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/op_observer/op_observer_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/repl/oplog_entry.h"
@@ -42,7 +43,6 @@
 #include "mongo/db/shard_role/shard_catalog/collection_options.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/decorable.h"
-#include "mongo/util/namespace_string_util.h"
 
 #include <set>
 #include <utility>

src/mongo/db/auth/authorization_checks.cpp

@@ -39,6 +39,7 @@
 #include "mongo/db/auth/resource_pattern.h"
 #include "mongo/db/auth/validated_tenancy_scope.h"
 #include "mongo/db/database_name.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/pipeline/aggregation_request_helper.h"
 #include "mongo/db/pipeline/lite_parsed_document_source.h"
 #include "mongo/db/server_feature_flags_gen.h"
@@ -48,7 +49,6 @@
 #include "mongo/platform/compiler.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/decorable.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/str.h"
 
 #include <memory>

src/mongo/db/auth/builtin_roles_test.cpp

@@ -38,9 +38,9 @@
 #include "mongo/db/auth/action_type.h"
 #include "mongo/db/auth/auth_name.h"
 #include "mongo/db/auth/resource_pattern.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/unittest/unittest.h"
-#include "mongo/util/database_name_util.h"
 
 #include <vector>
 

src/mongo/db/auth/resource_pattern.cpp

@@ -29,7 +29,7 @@
 
 #include "mongo/db/auth/resource_pattern.h"
 
-#include "mongo/util/namespace_string_util.h"
+#include "mongo/db/namespace_string_util.h"
 
 
 namespace mongo {

src/mongo/db/auth/resource_pattern_search_list.h

@@ -32,9 +32,9 @@
 #include "mongo/base/string_data.h"
 #include "mongo/db/auth/resource_pattern.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/modules.h"
-#include "mongo/util/namespace_string_util.h"
 
 #include <array>
 #include <cstddef>

src/mongo/db/auth/sasl_commands.cpp

@@ -47,6 +47,7 @@
 #include "mongo/db/auth/sasl_options.h"
 #include "mongo/db/auth/sasl_payload.h"
 #include "mongo/db/commands.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/service_context.h"
@@ -55,7 +56,6 @@
 #include "mongo/platform/atomic_word.h"
 #include "mongo/rpc/op_msg.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/duration.h"
 #include "mongo/util/time_support.h"
 

src/mongo/db/basic_types.idl

@@ -32,8 +32,8 @@ global:
     cpp_includes:
         - "mongo/client/connection_string.h"
         - "mongo/db/basic_types.h"
-        - "mongo/util/database_name_util.h"
-        - "mongo/util/namespace_string_util.h"
+        - "mongo/db/database_name_util.h"
+        - "mongo/db/namespace_string_util.h"
         - "mongo/db/namespace_string.h"
         - "mongo/db/logical_time.h"
         - "mongo/db/tenant_id.h"

src/mongo/db/cleanup_structured_encryption_data_coordinator.cpp

@@ -40,6 +40,7 @@
 #include "mongo/db/generic_argument_util.h"
 #include "mongo/db/global_catalog/ddl/sharding_coordinator_gen.h"
 #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/router_role/router_role.h"
 #include "mongo/db/router_role/routing_cache/catalog_cache.h"
 #include "mongo/db/server_parameter.h"
@@ -61,7 +62,6 @@
 #include "mongo/rpc/reply_interface.h"
 #include "mongo/util/fail_point.h"
 #include "mongo/util/future_impl.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/str.h"
 #include "mongo/util/uuid.h"
 

src/mongo/db/cloner.cpp

@@ -46,6 +46,7 @@
 #include "mongo/db/collection_crud/collection_write_path.h"
 #include "mongo/db/curop.h"
 #include "mongo/db/database_name.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/index/index_constants.h"
 #include "mongo/db/index_builds/index_builds_coordinator.h"
 #include "mongo/db/namespace_string.h"
@@ -80,7 +81,6 @@
 #include "mongo/platform/atomic_word.h"
 #include "mongo/platform/compiler.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/debug_util.h"
 #include "mongo/util/fail_point.h"
 #include "mongo/util/net/hostandport.h"

src/mongo/db/collection_crud/collection_write_path.cpp

@@ -41,6 +41,7 @@
 #include "mongo/db/exec/document_value/document.h"
 #include "mongo/db/exec/write_stage_common.h"
 #include "mongo/db/feature_flag.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/op_observer/op_observer.h"
 #include "mongo/db/op_observer/op_observer_util.h"
 #include "mongo/db/record_id_helpers.h"
@@ -72,7 +73,6 @@
 #include "mongo/util/assert_util.h"
 #include "mongo/util/decorable.h"
 #include "mongo/util/fail_point.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/str.h"
 
 #include <cstddef>

src/mongo/db/commands.cpp

@@ -45,6 +45,7 @@
 #include "mongo/db/exec/mutable_bson/document.h"
 #include "mongo/db/generic_argument_util.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/tenant_id.h"
 #include "mongo/db/topology/cluster_role.h"
 #include "mongo/db/version_context.h"
@@ -62,7 +63,6 @@
 #include "mongo/util/decorable.h"
 #include "mongo/util/duration.h"
 #include "mongo/util/fail_point.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/static_immortal.h"
 #include "mongo/util/str.h"
 #include "mongo/util/string_map.h"

src/mongo/db/commands/authentication_commands.cpp

@@ -52,6 +52,7 @@
 #include "mongo/db/commands/authentication_commands_gen.h"
 #include "mongo/db/commands/test_commands_enabled.h"
 #include "mongo/db/database_name.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/server_feature_flags_gen.h"
@@ -62,7 +63,6 @@
 #include "mongo/rpc/op_msg.h"
 #include "mongo/transport/session.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/decorable.h"
 #include "mongo/util/time_support.h"
 

src/mongo/db/commands/collection_to_capped.cpp

@@ -41,6 +41,7 @@
 #include "mongo/db/commands.h"
 #include "mongo/db/database_name.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/repl/replication_coordinator.h"
 #include "mongo/db/service_context.h"
@@ -50,7 +51,6 @@
 #include "mongo/db/shard_role/shard_catalog/operation_sharding_state.h"
 #include "mongo/db/shard_role/shard_role.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/str.h"
 
 #include <string>

src/mongo/db/commands/dbcheck_command.h

@@ -29,6 +29,7 @@
 #pragma once
 
 #include "mongo/bson/bsonobj.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/repl/dbcheck/dbcheck.h"
 #include "mongo/db/repl/dbcheck/dbcheck_gen.h"
 #include "mongo/db/repl/dbcheck/dbcheck_idl.h"
@@ -37,7 +38,6 @@
 #include "mongo/db/write_concern_options.h"
 #include "mongo/util/background.h"
 #include "mongo/util/modules.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/uuid.h"
 
 namespace mongo {

src/mongo/db/commands/dbcommands.cpp

@@ -52,6 +52,7 @@
 #include "mongo/db/global_catalog/type_collection.h"
 #include "mongo/db/keypattern.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/profile_settings.h"
 #include "mongo/db/query/explain_verbosity_gen.h"
@@ -94,7 +95,6 @@
 #include "mongo/util/decorable.h"
 #include "mongo/util/fail_point.h"
 #include "mongo/util/future.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/serialization_context.h"
 #include "mongo/util/str.h"
 #include "mongo/util/timer.h"

src/mongo/db/commands/filemd5_cmd.cpp

@@ -40,6 +40,7 @@
 #include "mongo/db/database_name.h"
 #include "mongo/db/dbdirectclient.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/pipeline/expression_context_builder.h"
 #include "mongo/db/profile_collection.h"
@@ -57,7 +58,6 @@
 #include "mongo/util/assert_util.h"
 #include "mongo/util/fail_point.h"
 #include "mongo/util/md5.h"
-#include "mongo/util/namespace_string_util.h"
 
 #include <memory>
 #include <string>

src/mongo/db/commands/oplog_application_checks.cpp

@@ -42,7 +42,9 @@
 #include "mongo/db/auth/validated_tenancy_scope_factory.h"
 #include "mongo/db/commands.h"
 #include "mongo/db/database_name.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/query/write_ops/write_ops_parsers.h"
 #include "mongo/db/shard_role/shard_catalog/collection_catalog.h"
@@ -51,8 +53,6 @@
 #include "mongo/db/tenant_id.h"
 #include "mongo/rpc/op_msg.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/database_name_util.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/str.h"
 
 #include <memory>

src/mongo/db/commands/profile_common.cpp

@@ -35,6 +35,7 @@
 #include "mongo/db/auth/authorization_session.h"
 #include "mongo/db/auth/resource_pattern.h"
 #include "mongo/db/commands/profile_gen.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/profile_filter.h"
 #include "mongo/db/profile_settings.h"
 #include "mongo/db/server_options.h"
@@ -43,7 +44,6 @@
 #include "mongo/logv2/log.h"
 #include "mongo/platform/atomic_word.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/namespace_string_util.h"
 
 #include <memory>
 

src/mongo/db/commands/query_cmd/current_op_common.cpp

@@ -34,10 +34,10 @@
 #include "mongo/bson/bsonelement.h"
 #include "mongo/db/auth/validated_tenancy_scope.h"
 #include "mongo/db/commands/test_commands_enabled.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/idl/command_generic_argument.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/serialization_context.h"
 #include "mongo/util/string_map.h"
 

src/mongo/db/commands/query_cmd/explain_cmd.cpp

@@ -38,6 +38,7 @@
 #include "mongo/db/commands/query_cmd/explain_cmd_helpers.h"
 #include "mongo/db/commands/query_cmd/explain_gen.h"
 #include "mongo/db/database_name.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/pipeline/aggregation_request_helper.h"
@@ -46,7 +47,6 @@
 #include "mongo/rpc/op_msg.h"
 #include "mongo/rpc/reply_builder_interface.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/str.h"
 
 #include <memory>

src/mongo/db/commands/query_cmd/find_cmd.cpp

@@ -52,6 +52,7 @@
 #include "mongo/db/curop.h"
 #include "mongo/db/curop_failpoint_helpers.h"
 #include "mongo/db/database_name.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/exec/classic/projection.h"
 #include "mongo/db/exec/disk_use_options_gen.h"
 #include "mongo/db/exec/shard_filterer_impl.h"
@@ -131,7 +132,6 @@
 #include "mongo/transport/session.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/concurrency/admission_context.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/decorable.h"
 #include "mongo/util/fail_point.h"
 #include "mongo/util/future.h"

src/mongo/db/commands/query_cmd/getmore_cmd.cpp

@@ -47,6 +47,7 @@
 #include "mongo/db/cursor_in_use_info.h"
 #include "mongo/db/logical_time.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/pipeline/change_stream_invalidation_info.h"
 #include "mongo/db/query/canonical_query.h"
@@ -89,7 +90,6 @@
 #include "mongo/util/decorable.h"
 #include "mongo/util/duration.h"
 #include "mongo/util/fail_point.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/scopeguard.h"
 #include "mongo/util/serialization_context.h"
 #include "mongo/util/str.h"

src/mongo/db/commands/query_cmd/map_reduce_command_base.h

@@ -31,8 +31,8 @@
 
 #include "mongo/db/commands.h"
 #include "mongo/db/commands/query_cmd/mr_common.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/repl/replication_coordinator.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/modules.h"
 
 namespace mongo {

src/mongo/db/commands/query_cmd/map_reduce_out_options.cpp

@@ -34,10 +34,10 @@
 #include "mongo/bson/bsonobj.h"
 #include "mongo/bson/bsontypes.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/logv2/log.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/debug_util.h"
-#include "mongo/util/namespace_string_util.h"
 
 #include <string>
 #include <utility>

src/mongo/db/commands/query_cmd/pipeline_command.cpp

@@ -39,6 +39,7 @@
 #include "mongo/db/commands/query_cmd/extension_metrics.h"
 #include "mongo/db/commands/query_cmd/run_aggregate.h"
 #include "mongo/db/database_name.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/pipeline/aggregate_command_gen.h"
@@ -62,7 +63,6 @@
 #include "mongo/rpc/reply_builder_interface.h"
 #include "mongo/stdx/unordered_set.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/decorable.h"
 #include "mongo/util/serialization_context.h"
 

src/mongo/db/commands/query_cmd/write_commands.cpp

@@ -48,6 +48,7 @@
 #include "mongo/db/fle_crud.h"
 #include "mongo/db/local_executor.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/not_primary_error_tracker.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/pipeline/variables.h"
@@ -90,7 +91,6 @@
 #include "mongo/util/concurrency/admission_context.h"
 #include "mongo/util/decorable.h"
 #include "mongo/util/fail_point.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/serialization_context.h"
 #include "mongo/util/str.h"
 

src/mongo/db/commands/set_feature_compatibility_version_command.cpp

@@ -67,6 +67,7 @@
 #include "mongo/db/index_names.h"
 #include "mongo/db/logical_time.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/persistent_task_store.h"
 #include "mongo/db/pipeline/aggregate_command_gen.h"
@@ -118,7 +119,6 @@
 #include "mongo/s/migration_blocking_operation/migration_blocking_operation_feature_flags_gen.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/fail_point.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/scopeguard.h"
 #include "mongo/util/str.h"
 #include "mongo/util/uuid.h"

src/mongo/db/commands/user_management_commands.cpp

@@ -71,10 +71,12 @@
 #include "mongo/db/commands/user_management_commands_common.h"
 #include "mongo/db/commands/user_management_commands_gen.h"
 #include "mongo/db/database_name.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/dbdirectclient.h"
 #include "mongo/db/dbmessage.h"
 #include "mongo/db/local_executor.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/pipeline/aggregate_command_gen.h"
 #include "mongo/db/pipeline/aggregation_request_helper.h"
@@ -107,13 +109,11 @@
 #include "mongo/transport/service_entry_point.h"
 #include "mongo/transport/session.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/decorable.h"
 #include "mongo/util/duration.h"
 #include "mongo/util/fail_point.h"
 #include "mongo/util/future.h"
 #include "mongo/util/icu.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/net/ssl_manager.h"
 #include "mongo/util/net/ssl_options.h"
 #include "mongo/util/net/ssl_types.h"

src/mongo/db/commands/user_management_commands_common.cpp

@@ -46,13 +46,13 @@
 #include "mongo/db/auth/user_name.h"
 #include "mongo/db/commands/user_management_commands_common.h"
 #include "mongo/db/commands/user_management_commands_gen.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/multitenancy.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/tenant_id.h"
 #include "mongo/stdx/unordered_set.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/str.h"
 
 #include <cstddef>

src/mongo/db/compact_structured_encryption_data_coordinator.cpp

@@ -41,6 +41,7 @@
 #include "mongo/db/generic_argument_util.h"
 #include "mongo/db/global_catalog/ddl/sharding_coordinator_gen.h"
 #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/server_parameter.h"
 #include "mongo/db/server_parameter_with_storage.h"
 #include "mongo/db/shard_role/ddl/create_gen.h"
@@ -58,7 +59,6 @@
 #include "mongo/rpc/unique_message.h"
 #include "mongo/util/fail_point.h"
 #include "mongo/util/future_impl.h"
-#include "mongo/util/namespace_string_util.h"
 
 #include <string>
 #include <tuple>

src/mongo/db/curop.cpp

@@ -43,6 +43,8 @@
 #include "mongo/db/commands.h"
 #include "mongo/db/commands/server_status/server_status_metric.h"
 #include "mongo/db/curop_bson_helpers.h"
+#include "mongo/db/database_name_util.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context_options_gen.h"
 #include "mongo/db/profile_filter.h"
 #include "mongo/db/profile_settings.h"
@@ -65,11 +67,9 @@
 #include "mongo/util/assert_util.h"
 #include "mongo/util/clock_source.h"
 #include "mongo/util/concurrency/ticketholder_queue_stats.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/duration.h"
 #include "mongo/util/fail_point.h"
 #include "mongo/util/log_with_sampling.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/net/socket_utils.h"
 #include "mongo/util/str.h"
 #include "mongo/util/time_support.h"

src/mongo/db/curop_failpoint_helpers.cpp

@@ -35,10 +35,10 @@
 #include "mongo/bson/bsonobj.h"
 #include "mongo/db/client.h"
 #include "mongo/db/curop.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/platform/compiler.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/duration.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/time_support.h"
 
 #include <mutex>

src/mongo/db/database_name_util.cpp

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

src/mongo/db/database_name_util_test.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "mongo/util/database_name_util.h"
+#include "mongo/db/database_name_util.h"
 
 #include "mongo/bson/oid.h"
 #include "mongo/db/database_name.h"

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

@@ -34,10 +34,10 @@
 #include "mongo/db/admission/execution_control/execution_admission_context.h"
 #include "mongo/db/exec/agg/document_source_to_stage_registry.h"
 #include "mongo/db/exec/document_value/document.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/pipeline/document_source.h"
 #include "mongo/db/pipeline/document_source_coll_stats.h"
 #include "mongo/db/version_context.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/net/socket_utils.h"
 #include "mongo/util/serialization_context.h"
 #include "mongo/util/time_support.h"

src/mongo/db/exec/classic/batched_delete_stage.cpp

@@ -42,6 +42,7 @@
 #include "mongo/db/exec/document_value/document.h"
 #include "mongo/db/exec/write_stage_common.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/query/canonical_query.h"
 #include "mongo/db/query/plan_executor.h"
@@ -59,7 +60,6 @@
 #include "mongo/util/assert_util.h"
 #include "mongo/util/decorable.h"
 #include "mongo/util/fail_point.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/scopeguard.h"
 #include "mongo/util/str.h"
 

src/mongo/db/extension/host/catalog_context.h

@@ -28,12 +28,12 @@
  */
 #pragma once
 
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/extension/public/api.h"
 #include "mongo/db/extension/shared/byte_buf_utils.h"
 #include "mongo/db/extension/shared/explain_utils.h"
 #include "mongo/db/pipeline/expression_context.h"
 #include "mongo/db/pipeline/search/document_source_internal_search_id_lookup.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/modules.h"
 #include "mongo/util/uuid.h"
 

src/mongo/db/extension/host/document_source_extension_optimizable_test.cpp

@@ -42,6 +42,7 @@
 #include "mongo/db/extension/sdk/query_shape_opts_handle.h"
 #include "mongo/db/extension/sdk/tests/fruits_test_stage.h"
 #include "mongo/db/extension/sdk/tests/shared_test_stages.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/pipeline/aggregation_context_fixture.h"
 #include "mongo/db/pipeline/document_source_documents.h"
 #include "mongo/db/pipeline/lite_parsed_document_source.h"
@@ -51,7 +52,6 @@
 #include "mongo/idl/server_parameter_test_controller.h"
 #include "mongo/unittest/death_test.h"
 #include "mongo/unittest/unittest.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/serialization_context.h"
 
 namespace mongo::extension {

src/mongo/db/fle_crud.cpp

@@ -55,6 +55,7 @@
 #include "mongo/db/logical_time.h"
 #include "mongo/db/multitenancy_gen.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_time_tracker.h"
 #include "mongo/db/pipeline/expression_context_builder.h"
 #include "mongo/db/query/collation/collator_factory_interface.h"
@@ -84,7 +85,6 @@
 #include "mongo/util/assert_util.h"
 #include "mongo/util/fail_point.h"
 #include "mongo/util/future.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/out_of_line_executor.h"
 #include "mongo/util/str.h"
 #include "mongo/util/uuid.h"

src/mongo/db/global_catalog/ddl/cannot_implicitly_create_collection_info.cpp

@@ -32,7 +32,7 @@
 #include "mongo/base/init.h"  // IWYU pragma: keep
 #include "mongo/bson/bsonelement.h"
 #include "mongo/bson/bsonobjbuilder.h"
-#include "mongo/util/namespace_string_util.h"
+#include "mongo/db/namespace_string_util.h"
 
 namespace mongo {
 namespace {

src/mongo/db/global_catalog/ddl/cluster_collmod_cmd.cpp

@@ -43,6 +43,7 @@
 #include "mongo/db/client.h"
 #include "mongo/db/commands.h"
 #include "mongo/db/database_name.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/generic_argument_util.h"
 #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h"
 #include "mongo/db/namespace_string.h"
@@ -61,7 +62,6 @@
 #include "mongo/logv2/log.h"
 #include "mongo/s/async_requests_sender.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/read_through_cache.h"
 #include "mongo/util/str.h"
 #include "mongo/util/string_map.h"

src/mongo/db/global_catalog/ddl/cluster_create_cmd.cpp

@@ -33,6 +33,7 @@
 #include "mongo/db/auth/authorization_checks.h"
 #include "mongo/db/auth/authorization_session.h"
 #include "mongo/db/commands.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/global_catalog/ddl/cluster_ddl.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/operation_context.h"
@@ -49,7 +50,6 @@
 #include "mongo/rpc/op_msg.h"
 #include "mongo/s/async_requests_sender.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/database_name_util.h"
 
 #include <memory>
 #include <set>

src/mongo/db/global_catalog/ddl/cluster_create_indexes_cmd.cpp

@@ -41,6 +41,7 @@
 #include "mongo/db/basic_types_gen.h"
 #include "mongo/db/commands.h"
 #include "mongo/db/database_name.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/global_catalog/ddl/cluster_ddl.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/operation_context.h"
@@ -57,7 +58,6 @@
 #include "mongo/db/timeseries/timeseries_commands_conversion_helper.h"
 #include "mongo/idl/idl_parser.h"
 #include "mongo/logv2/log.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/string_map.h"
 
 #include <set>

src/mongo/db/global_catalog/ddl/cluster_drop_database_cmd.cpp

@@ -35,6 +35,7 @@
 #include "mongo/db/auth/authorization_session.h"
 #include "mongo/db/commands.h"
 #include "mongo/db/database_name.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/generic_argument_util.h"
 #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h"
 #include "mongo/db/namespace_string.h"
@@ -50,7 +51,6 @@
 #include "mongo/rpc/op_msg.h"
 #include "mongo/s/async_requests_sender.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/scopeguard.h"
 #include "mongo/util/str.h"
 

src/mongo/db/global_catalog/ddl/cluster_drop_indexes_cmd.cpp

@@ -39,6 +39,7 @@
 #include "mongo/db/auth/authorization_session.h"
 #include "mongo/db/commands.h"
 #include "mongo/db/database_name.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/generic_argument_util.h"
 #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h"
 #include "mongo/db/namespace_string.h"
@@ -55,7 +56,6 @@
 #include "mongo/logv2/log.h"
 #include "mongo/s/async_requests_sender.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/database_name_util.h"
 
 #include <set>
 #include <string>

src/mongo/db/global_catalog/ddl/cluster_enable_sharding_cmd.cpp

@@ -35,6 +35,7 @@
 #include "mongo/db/auth/resource_pattern.h"
 #include "mongo/db/commands.h"
 #include "mongo/db/database_name.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/generic_argument_util.h"
 #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h"
 #include "mongo/db/namespace_string.h"
@@ -50,7 +51,6 @@
 #include "mongo/idl/idl_parser.h"
 #include "mongo/rpc/op_msg.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/scopeguard.h"
 #include "mongo/util/str.h"
 

src/mongo/db/global_catalog/ddl/cluster_list_collections_cmd.cpp

@@ -45,6 +45,7 @@
 #include "mongo/db/commands.h"
 #include "mongo/db/commands/test_commands_enabled.h"
 #include "mongo/db/database_name.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/exec/mutable_bson/algorithm.h"
 #include "mongo/db/exec/mutable_bson/document.h"
 #include "mongo/db/exec/mutable_bson/element.h"
@@ -65,7 +66,6 @@
 #include "mongo/s/async_requests_sender.h"
 #include "mongo/s/query/exec/store_possible_cursor.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/decorable.h"
 #include "mongo/util/read_through_cache.h"
 #include "mongo/util/string_map.h"

src/mongo/db/global_catalog/ddl/cluster_list_databases_cmd.cpp

@@ -38,6 +38,7 @@
 #include "mongo/db/auth/resource_pattern.h"
 #include "mongo/db/commands.h"
 #include "mongo/db/database_name.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/router_role/cluster_commands_helpers.h"
@@ -50,7 +51,6 @@
 #include "mongo/db/topology/shard_registry.h"
 #include "mongo/rpc/op_msg.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/decorable.h"
 #include "mongo/util/str.h"
 

src/mongo/db/global_catalog/ddl/cluster_shard_collection_cmd.cpp

@@ -42,12 +42,12 @@
 #include "mongo/db/global_catalog/ddl/shard_collection_gen.h"
 #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/service_context.h"
 #include "mongo/db/timeseries/timeseries_gen.h"
 #include "mongo/idl/idl_parser.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/uuid.h"
 
 #include <cstdint>

src/mongo/db/global_catalog/ddl/configsvr_repair_sharded_collection_chunks_history_command.cpp

@@ -43,6 +43,7 @@
 #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h"
 #include "mongo/db/logical_time.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/repl/read_concern_args.h"
 #include "mongo/db/repl/read_concern_level.h"
@@ -53,7 +54,6 @@
 #include "mongo/db/topology/cluster_role.h"
 #include "mongo/db/topology/vector_clock/vector_clock.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/namespace_string_util.h"
 
 #include <string>
 

src/mongo/db/global_catalog/ddl/configsvr_run_restore_command.cpp

@@ -42,10 +42,12 @@
 #include "mongo/db/auth/resource_pattern.h"
 #include "mongo/db/commands.h"
 #include "mongo/db/database_name.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/dbdirectclient.h"
 #include "mongo/db/global_catalog/ddl/configsvr_run_restore_gen.h"
 #include "mongo/db/global_catalog/known_collections.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/query/find_command.h"
 #include "mongo/db/repl/repl_settings.h"
@@ -60,8 +62,6 @@
 #include "mongo/logv2/log.h"
 #include "mongo/stdx/unordered_map.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/database_name_util.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/str.h"
 #include "mongo/util/string_map.h"
 #include "mongo/util/testing_proctor.h"

src/mongo/db/global_catalog/ddl/configsvr_split_chunk_command.cpp

@@ -41,6 +41,7 @@
 #include "mongo/db/global_catalog/ddl/sharding_catalog_manager.h"
 #include "mongo/db/global_catalog/ddl/split_chunk_request_type.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/repl/read_concern_args.h"
 #include "mongo/db/repl/read_concern_level.h"
@@ -49,7 +50,6 @@
 #include "mongo/db/topology/cluster_role.h"
 #include "mongo/db/versioning_protocol/chunk_version.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/namespace_string_util.h"
 
 #include <string>
 

src/mongo/db/global_catalog/ddl/create_collection_coordinator.h

@@ -40,6 +40,7 @@
 #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator.h"
 #include "mongo/db/global_catalog/shard_key_pattern.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/query/write_ops/write_ops.h"
 #include "mongo/db/s/config/initial_split_policy.h"
@@ -52,7 +53,6 @@
 #include "mongo/util/cancellation.h"
 #include "mongo/util/future.h"
 #include "mongo/util/modules.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/uuid.h"
 
 #include <memory>

src/mongo/db/global_catalog/ddl/drop_collection_coordinator.h

@@ -39,6 +39,7 @@
 #include "mongo/db/global_catalog/ddl/sharding_coordinator_service.h"
 #include "mongo/db/global_catalog/ddl/sharding_ddl_coordinator.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/query/write_ops/write_ops.h"
 #include "mongo/db/shard_role/shard_catalog/drop_collection.h"
@@ -47,7 +48,6 @@
 #include "mongo/util/cancellation.h"
 #include "mongo/util/future.h"
 #include "mongo/util/modules.h"
-#include "mongo/util/namespace_string_util.h"
 
 #include <memory>
 #include <string>

src/mongo/db/global_catalog/ddl/drop_database_coordinator.cpp

@@ -35,6 +35,7 @@
 #include "mongo/db/client.h"
 #include "mongo/db/commands.h"
 #include "mongo/db/database_name.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/dbdirectclient.h"
 #include "mongo/db/generic_argument_util.h"
 #include "mongo/db/global_catalog/ddl/notify_sharding_event_gen.h"
@@ -47,6 +48,7 @@
 #include "mongo/db/global_catalog/type_database_gen.h"
 #include "mongo/db/global_catalog/type_namespace_placement_gen.h"
 #include "mongo/db/logical_time.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/query/query_feature_flags_gen.h"
 #include "mongo/db/query/write_ops/write_ops_gen.h"
 #include "mongo/db/repl/read_concern_level.h"
@@ -76,10 +78,8 @@
 #include "mongo/rpc/op_msg.h"
 #include "mongo/rpc/reply_interface.h"
 #include "mongo/s/write_ops/batched_command_response.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/duration.h"
 #include "mongo/util/future_impl.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/out_of_line_executor.h"
 #include "mongo/util/str.h"
 #include "mongo/util/uuid.h"

src/mongo/db/global_catalog/ddl/move_primary_coordinator.cpp

@@ -39,6 +39,7 @@
 #include "mongo/client/read_preference.h"
 #include "mongo/db/client.h"
 #include "mongo/db/commands.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/dbdirectclient.h"
 #include "mongo/db/generic_argument_util.h"
 #include "mongo/db/global_catalog/ddl/move_primary_gen.h"
@@ -47,6 +48,7 @@
 #include "mongo/db/global_catalog/ddl/shardsvr_commit_create_database_metadata_command.h"
 #include "mongo/db/global_catalog/sharding_catalog_client.h"
 #include "mongo/db/global_catalog/type_shard.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/repl/change_stream_oplog_notification.h"
 #include "mongo/db/repl/read_concern_level.h"
 #include "mongo/db/s/forwardable_operation_metadata.h"
@@ -76,11 +78,9 @@
 #include "mongo/platform/compiler.h"
 #include "mongo/rpc/get_status_from_command_result.h"
 #include "mongo/s/resharding/resharding_feature_flag_gen.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/duration.h"
 #include "mongo/util/fail_point.h"
 #include "mongo/util/future_impl.h"
-#include "mongo/util/namespace_string_util.h"
 
 #include <algorithm>
 #include <iterator>

src/mongo/db/global_catalog/ddl/placement_history_cleaner.cpp

@@ -42,6 +42,7 @@
 #include "mongo/db/global_catalog/sharding_catalog_client.h"
 #include "mongo/db/global_catalog/type_namespace_placement_gen.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/persistent_task_store.h"
 #include "mongo/db/sharding_environment/grid.h"
 #include "mongo/db/topology/shard_registry.h"
@@ -53,7 +54,6 @@
 #include "mongo/util/assert_util.h"
 #include "mongo/util/decorable.h"
 #include "mongo/util/duration.h"
-#include "mongo/util/namespace_string_util.h"
 
 #include <algorithm>
 #include <memory>

src/mongo/db/global_catalog/ddl/rename_collection_coordinator.cpp

@@ -50,6 +50,7 @@
 #include "mongo/db/global_catalog/type_collection.h"
 #include "mongo/db/global_catalog/type_tags.h"
 #include "mongo/db/logical_time.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/query/query_feature_flags_gen.h"
 #include "mongo/db/query/write_ops/write_ops_gen.h"
@@ -86,7 +87,6 @@
 #include "mongo/s/write_ops/batched_command_request.h"
 #include "mongo/s/write_ops/batched_command_response.h"
 #include "mongo/util/future_impl.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/out_of_line_executor.h"
 #include "mongo/util/str.h"
 #include "mongo/util/uuid.h"

src/mongo/db/global_catalog/ddl/rename_collection_participant_service.cpp

@@ -35,12 +35,14 @@
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/bson/simple_bsonobj_comparator.h"
 #include "mongo/db/client.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/generic_argument_util.h"
 #include "mongo/db/global_catalog/ddl/drop_collection_coordinator.h"
 #include "mongo/db/global_catalog/ddl/sharding_ddl_util.h"
 #include "mongo/db/global_catalog/ddl/sharding_recovery_service.h"
 #include "mongo/db/global_catalog/sharding_catalog_client.h"
 #include "mongo/db/global_catalog/type_database_gen.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/persistent_task_store.h"
 #include "mongo/db/repl/read_concern_level.h"
 #include "mongo/db/repl/replication_coordinator.h"
@@ -61,10 +63,8 @@
 #include "mongo/db/topology/sharding_state.h"
 #include "mongo/db/topology/vector_clock/vector_clock_mutable.h"
 #include "mongo/logv2/log.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/duration.h"
 #include "mongo/util/future_util.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/str.h"
 #include "mongo/util/time_support.h"
 

src/mongo/db/global_catalog/ddl/sessions_collection_config_server.cpp

@@ -45,6 +45,7 @@
 #include "mongo/db/global_catalog/type_collection.h"
 #include "mongo/db/global_catalog/type_collection_gen.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/pipeline/legacy_runtime_constants_gen.h"
 #include "mongo/db/repl/replication_coordinator.h"
@@ -62,7 +63,6 @@
 #include "mongo/rpc/get_status_from_command_result.h"
 #include "mongo/s/async_requests_sender.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/str.h"
 
 #include <cstdint>

src/mongo/db/global_catalog/ddl/set_allow_migrations_coordinator.cpp

@@ -40,6 +40,7 @@
 #include "mongo/db/global_catalog/type_collection.h"
 #include "mongo/db/global_catalog/type_collection_gen.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/query/write_ops/write_ops_gen.h"
 #include "mongo/db/query/write_ops/write_ops_parsers.h"
@@ -54,7 +55,6 @@
 #include "mongo/s/write_ops/batched_command_response.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/future_impl.h"
-#include "mongo/util/namespace_string_util.h"
 
 #include <string>
 #include <tuple>

src/mongo/db/global_catalog/ddl/shard_key_util.cpp

@@ -54,6 +54,7 @@
 #include "mongo/db/global_catalog/chunk_manager.h"
 #include "mongo/db/global_catalog/ddl/shard_key_index_util.h"
 #include "mongo/db/hasher.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/query/collation/collation_spec.h"
 #include "mongo/db/router_role/cluster_commands_helpers.h"
 #include "mongo/db/s/migration_destination_manager.h"
@@ -77,7 +78,6 @@
 #include "mongo/rpc/get_status_from_command_result.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/duration.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/str.h"
 #include "mongo/util/uuid.h"
 

src/mongo/db/global_catalog/ddl/shard_metadata_util.cpp

@@ -41,6 +41,7 @@
 #include "mongo/db/global_catalog/type_shard_database.h"
 #include "mongo/db/global_catalog/type_shard_database_gen.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/query/find_command.h"
 #include "mongo/db/query/write_ops/write_ops_exec.h"
@@ -56,7 +57,6 @@
 #include "mongo/s/write_ops/batched_command_response.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/duration.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/str.h"
 
 #include <algorithm>

src/mongo/db/global_catalog/ddl/shard_util.cpp

@@ -43,6 +43,7 @@
 #include "mongo/client/read_preference.h"
 #include "mongo/db/global_catalog/shard_key_pattern.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/sharding_environment/client/shard.h"
 #include "mongo/db/sharding_environment/grid.h"
 #include "mongo/db/topology/shard_registry.h"
@@ -51,7 +52,6 @@
 #include "mongo/s/request_types/auto_split_vector_gen.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/duration.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/str.h"
 
 #include <cstdint>

src/mongo/db/global_catalog/ddl/sharding_catalog_manager.cpp

@@ -52,6 +52,7 @@
 #include "mongo/db/global_catalog/type_shard.h"
 #include "mongo/db/global_catalog/type_tags.h"
 #include "mongo/db/logical_time.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/pipeline/aggregate_command_gen.h"
 #include "mongo/db/pipeline/expression_context.h"
@@ -95,7 +96,6 @@
 #include "mongo/util/future.h"
 #include "mongo/util/future_impl.h"
 #include "mongo/util/log_and_backoff.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/out_of_line_executor.h"
 #include "mongo/util/scopeguard.h"
 

src/mongo/db/global_catalog/ddl/sharding_catalog_manager_chunk_operations.cpp

@@ -64,6 +64,7 @@
 #include "mongo/db/global_catalog/type_tags.h"
 #include "mongo/db/logical_time.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/pipeline/aggregate_command_gen.h"
 #include "mongo/db/query/client_cursor/cursor_response.h"
@@ -108,7 +109,6 @@
 #include "mongo/util/future.h"
 #include "mongo/util/future_impl.h"
 #include "mongo/util/future_util.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/out_of_line_executor.h"
 #include "mongo/util/scopeguard.h"
 #include "mongo/util/str.h"

src/mongo/db/global_catalog/ddl/sharding_catalog_manager_collection_operations.cpp

@@ -54,6 +54,7 @@
 #include "mongo/db/global_catalog/type_tags.h"
 #include "mongo/db/logical_time.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/query/write_ops/write_ops.h"
 #include "mongo/db/query/write_ops/write_ops_gen.h"
@@ -85,7 +86,6 @@
 #include "mongo/util/fail_point.h"
 #include "mongo/util/future.h"
 #include "mongo/util/future_impl.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/out_of_line_executor.h"
 #include "mongo/util/scopeguard.h"
 #include "mongo/util/str.h"

src/mongo/db/global_catalog/ddl/sharding_catalog_manager_database_operations.cpp

@@ -36,6 +36,7 @@
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/client/read_preference.h"
 #include "mongo/db/database_name.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/dbdirectclient.h"
 #include "mongo/db/generic_argument_util.h"
 #include "mongo/db/global_catalog/ddl/create_database_util.h"
@@ -74,7 +75,6 @@
 #include "mongo/logv2/log.h"
 #include "mongo/s/write_ops/batched_command_response.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/decorable.h"
 #include "mongo/util/future.h"
 #include "mongo/util/future_impl.h"

src/mongo/db/global_catalog/ddl/sharding_catalog_manager_zone_operations.cpp

@@ -51,6 +51,7 @@
 #include "mongo/db/global_catalog/type_tags.h"
 #include "mongo/db/keypattern.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/repl/read_concern_level.h"
 #include "mongo/db/s/balancer/balancer_policy.h"
@@ -61,7 +62,6 @@
 #include "mongo/db/write_concern_options.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/duration.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/str.h"
 
 #include <memory>

src/mongo/db/global_catalog/ddl/sharding_coordinator.h

@@ -41,6 +41,7 @@
 #include "mongo/db/global_catalog/ddl/sharding_coordinator_service.h"
 #include "mongo/db/global_catalog/ddl/sharding_ddl_util.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/persistent_task_store.h"
 #include "mongo/db/pipeline/process_interface/mongo_process_interface.h"
@@ -66,7 +67,6 @@
 #include "mongo/util/future.h"
 #include "mongo/util/future_impl.h"
 #include "mongo/util/modules.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/version/releases.h"
 
 #include <memory>

src/mongo/db/global_catalog/ddl/sharding_ddl_util.cpp

@@ -55,6 +55,7 @@
 #include "mongo/db/global_catalog/type_tags.h"
 #include "mongo/db/logical_time.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/query/collation/collator_interface.h"
 #include "mongo/db/query/distinct_command_gen.h"
 #include "mongo/db/query/write_ops/write_ops_gen.h"
@@ -96,7 +97,6 @@
 #include "mongo/util/decorable.h"
 #include "mongo/util/duration.h"
 #include "mongo/util/future_impl.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/out_of_line_executor.h"
 #include "mongo/util/scopeguard.h"
 #include "mongo/util/str.h"

src/mongo/db/global_catalog/ddl/sharding_recovery_service.cpp

@@ -38,6 +38,7 @@
 #include "mongo/db/dbdirectclient.h"
 #include "mongo/db/exec/document_value/document.h"
 #include "mongo/db/global_catalog/type_database_gen.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/persistent_task_store.h"
 #include "mongo/db/pipeline/expression_context.h"
 #include "mongo/db/pipeline/pipeline.h"
@@ -65,7 +66,6 @@
 #include "mongo/s/write_ops/batched_command_response.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/decorable.h"
-#include "mongo/util/namespace_string_util.h"
 
 #include <algorithm>
 #include <array>

src/mongo/db/global_catalog/ddl/shardsvr_collmod_participant_command.cpp

@@ -47,6 +47,7 @@
 #include "mongo/db/global_catalog/sharding_catalog_client.h"
 #include "mongo/db/index_builds/index_builds_coordinator.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/service_context.h"
 #include "mongo/db/shard_role/ddl/coll_mod_gen.h"
@@ -64,7 +65,6 @@
 #include "mongo/idl/idl_parser.h"
 #include "mongo/rpc/op_msg.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/out_of_line_executor.h"
 
 #include <memory>

src/mongo/db/global_catalog/ddl/shardsvr_convert_to_capped_participant_command.cpp

@@ -45,12 +45,12 @@
 #include "mongo/db/dbdirectclient.h"
 #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/service_context.h"
 #include "mongo/db/shard_role/shard_catalog/catalog_raii.h"
 #include "mongo/db/transaction/transaction_participant.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/namespace_string_util.h"
 
 #include <string>
 

src/mongo/db/global_catalog/ddl/shardsvr_participant_block_command.cpp

@@ -43,6 +43,7 @@
 #include "mongo/db/global_catalog/ddl/sharding_recovery_service.h"
 #include "mongo/db/global_catalog/sharding_catalog_client.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/service_context.h"
 #include "mongo/db/shard_role/shard_catalog/collection_sharding_runtime.h"
@@ -53,7 +54,6 @@
 #include "mongo/executor/task_executor_pool.h"
 #include "mongo/rpc/op_msg.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/out_of_line_executor.h"
 
 #include <memory>

src/mongo/db/global_catalog/ddl/shardsvr_rename_collection_participant_command.cpp

@@ -42,6 +42,7 @@
 #include "mongo/db/global_catalog/ddl/rename_collection_participant_service.h"
 #include "mongo/db/global_catalog/ddl/sharded_rename_collection_gen.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/s/forwardable_operation_metadata.h"
 #include "mongo/db/service_context.h"
@@ -50,7 +51,6 @@
 #include "mongo/rpc/op_msg.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/future.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/str.h"
 #include "mongo/util/uuid.h"
 

src/mongo/db/global_catalog/ddl/shardsvr_split_chunk_command.cpp

@@ -44,9 +44,11 @@
 #include "mongo/db/auth/resource_pattern.h"
 #include "mongo/db/commands.h"
 #include "mongo/db/database_name.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/global_catalog/ddl/split_chunk.h"
 #include "mongo/db/global_catalog/type_chunk.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/s/chunk_operation_precondition_checks.h"
 #include "mongo/db/service_context.h"
@@ -57,8 +59,6 @@
 #include "mongo/db/versioning_protocol/chunk_version.h"
 #include "mongo/logv2/log.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/database_name_util.h"
-#include "mongo/util/namespace_string_util.h"
 
 #include <string>
 #include <utility>

src/mongo/db/global_catalog/ddl/split_chunk_request_type.cpp

@@ -35,8 +35,8 @@
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/bson/bsontypes.h"
 #include "mongo/bson/util/bson_extract.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/write_concern_options.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/str.h"
 
 #include <utility>

src/mongo/db/global_catalog/metadata_consistency_validation/check_sharding_index_command.cpp

@@ -38,13 +38,13 @@
 #include "mongo/db/database_name.h"
 #include "mongo/db/global_catalog/ddl/shard_key_index_util.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/profile_settings.h"
 #include "mongo/db/service_context.h"
 #include "mongo/db/shard_role/shard_catalog/db_raii.h"
 #include "mongo/db/shard_role/shard_role.h"
 #include "mongo/db/tenant_id.h"
-#include "mongo/util/namespace_string_util.h"
 
 #include <string>
 

src/mongo/db/global_catalog/metadata_consistency_validation/cluster_check_metadata_consistency_cmd.cpp

@@ -43,6 +43,7 @@
 #include "mongo/db/commands.h"
 #include "mongo/db/curop.h"
 #include "mongo/db/database_name.h"
+#include "mongo/db/database_name_util.h"
 #include "mongo/db/generic_argument_util.h"
 #include "mongo/db/global_catalog/ddl/sharded_ddl_commands_gen.h"
 #include "mongo/db/global_catalog/metadata_consistency_validation/check_metadata_consistency_gen.h"
@@ -77,7 +78,6 @@
 #include "mongo/s/query/exec/establish_cursors.h"
 #include "mongo/stdx/unordered_set.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/database_name_util.h"
 #include "mongo/util/decorable.h"
 #include "mongo/util/str.h"
 #include "mongo/util/uuid.h"

src/mongo/db/global_catalog/sharding_catalog_client_impl.cpp

@@ -52,6 +52,7 @@
 #include "mongo/db/global_catalog/type_shard.h"
 #include "mongo/db/global_catalog/type_tags.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/pipeline/aggregate_command_gen.h"
 #include "mongo/db/pipeline/document_source_group.h"
@@ -80,7 +81,6 @@
 #include "mongo/s/write_ops/batched_command_response.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/intrusive_counter.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/pcre_util.h"
 #include "mongo/util/str.h"
 #include "mongo/util/string_map.h"

src/mongo/db/global_catalog/type_changelog.cpp

@@ -37,8 +37,8 @@
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/bson/bsontypes.h"
 #include "mongo/bson/util/bson_extract.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/str.h"
 
 #include <boost/move/utility_core.hpp>

src/mongo/db/global_catalog/type_tags.cpp

@@ -36,8 +36,8 @@
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/bson/util/bson_extract.h"
 #include "mongo/db/global_catalog/type_chunk.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/str.h"
 
 #include <cstring>

src/mongo/db/index_builds/side_writes_tracker.cpp

@@ -42,6 +42,7 @@
 #include "mongo/db/index_builds/index_build_interceptor_gen.h"
 #include "mongo/db/index_builds/side_writes_tracker.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/service_context.h"
 #include "mongo/db/shard_role/lock_manager/exception_util.h"
@@ -59,7 +60,6 @@
 #include "mongo/otel/metrics/metrics_service.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/fail_point.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/progress_meter.h"
 #include "mongo/util/timer.h"
 

src/mongo/db/namespace_string_util.cpp

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

src/mongo/db/namespace_string_util_test.cpp

@@ -27,7 +27,7 @@
  *    it in the license file.
  */
 
-#include "mongo/util/namespace_string_util.h"
+#include "mongo/db/namespace_string_util.h"
 
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/bson/oid.h"

src/mongo/db/op_observer/fallback_op_observer.cpp

@@ -34,6 +34,7 @@
 #include "mongo/bson/timestamp.h"
 #include "mongo/db/keys_collection_document_gen.h"
 #include "mongo/db/logical_time_validator.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/op_observer/batched_write_context.h"
 #include "mongo/db/op_observer/op_observer_util.h"
 #include "mongo/db/read_write_concern_defaults.h"
@@ -52,7 +53,6 @@
 #include "mongo/scripting/engine.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/decorable.h"
-#include "mongo/util/namespace_string_util.h"
 
 #include <memory>
 #include <utility>

src/mongo/db/op_observer/op_observer_impl.cpp

@@ -43,6 +43,7 @@
 #include "mongo/db/logical_time_validator.h"
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/namespace_string_reserved.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/op_observer/batched_write_context.h"
 #include "mongo/db/op_observer/op_observer_util.h"
 #include "mongo/db/operation_context.h"
@@ -92,7 +93,6 @@
 #include "mongo/util/decorable.h"
 #include "mongo/util/duration.h"
 #include "mongo/util/fail_point.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/str.h"
 
 #include <algorithm>

src/mongo/db/pipeline/change_stream.cpp

@@ -30,8 +30,8 @@
 #include "mongo/db/pipeline/change_stream.h"
 
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/namespace_string_util.h"
 
 #include <iostream>
 

src/mongo/db/pipeline/change_stream_event_transform.cpp

@@ -34,6 +34,7 @@
 #include "mongo/db/database_name.h"
 #include "mongo/db/exec/document_value/document_metadata_fields.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/pipeline/change_stream.h"
 #include "mongo/db/pipeline/change_stream_document_diff_parser.h"
 #include "mongo/db/pipeline/change_stream_helpers.h"
@@ -48,7 +49,6 @@
 #include "mongo/idl/idl_parser.h"
 #include "mongo/logv2/log.h"
 #include "mongo/util/assert_util.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/str.h"
 
 #include <algorithm>

src/mongo/db/pipeline/document_source_graph_lookup.cpp

@@ -36,6 +36,7 @@
 #include "mongo/db/database_name.h"
 #include "mongo/db/exec/document_value/document.h"
 #include "mongo/db/exec/document_value/value.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/pipeline/expression.h"
 #include "mongo/db/pipeline/expression_context.h"
 #include "mongo/db/pipeline/expression_context_builder.h"
@@ -50,7 +51,6 @@
 #include "mongo/db/shard_role/shard_catalog/raw_data_operation.h"
 #include "mongo/db/stats/counters.h"
 #include "mongo/db/topology/sharding_state.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/str.h"
 
 #include <memory>

src/mongo/db/pipeline/document_source_lookup.cpp

@@ -44,6 +44,7 @@
 #include "mongo/db/matcher/expression.h"
 #include "mongo/db/matcher/expression_algo.h"
 #include "mongo/db/namespace_string.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/pipeline/aggregation_request_helper.h"
 #include "mongo/db/pipeline/document_path_support.h"
 #include "mongo/db/pipeline/document_source.h"
@@ -63,7 +64,6 @@
 #include "mongo/db/stats/counters.h"
 #include "mongo/db/topology/sharding_state.h"
 #include "mongo/idl/idl_parser.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/str.h"
 
 namespace mongo {

src/mongo/db/pipeline/document_source_merge.cpp

@@ -33,6 +33,7 @@
 #include "mongo/db/auth/action_type.h"
 #include "mongo/db/auth/resource_pattern.h"
 #include "mongo/db/database_name.h"
+#include "mongo/db/namespace_string_util.h"
 #include "mongo/db/operation_context.h"
 #include "mongo/db/pipeline/document_source_merge_gen.h"
 #include "mongo/db/pipeline/document_source_merge_spec.h"
@@ -48,7 +49,6 @@
 #include "mongo/logv2/log.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/fail_point.h"
-#include "mongo/util/namespace_string_util.h"
 #include "mongo/util/str.h"
 
 #include <algorithm>