21 files changed, 130 insertions, 175 deletions
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index f5b34330968..cb2ba8fe93c 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -112,13 +112,13 @@ env.Library(
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/catalog/clustered_collection_options',
         '$BUILD_DIR/mongo/db/catalog/collection_crud',
-        '$BUILD_DIR/mongo/db/catalog_raii',
         '$BUILD_DIR/mongo/db/concurrency/exception_util',
         '$BUILD_DIR/mongo/db/curop',
         '$BUILD_DIR/mongo/db/session/logical_session_id_helpers',
         '$BUILD_DIR/mongo/db/storage/key_string',
         '$BUILD_DIR/mongo/db/transaction/transaction',
-        "index_builds_coordinator_interface",
+        'index_builds_coordinator_interface',
+        'shard_role',
     ],
 )
 
@@ -564,15 +564,14 @@ env.Library(
         '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
         '$BUILD_DIR/mongo/db/catalog/clustered_collection_options',
         '$BUILD_DIR/mongo/db/catalog/collection_crud',
-        '$BUILD_DIR/mongo/db/catalog_raii',
-        '$BUILD_DIR/mongo/db/change_stream_options_manager',
         '$BUILD_DIR/mongo/db/concurrency/exception_util',
-        '$BUILD_DIR/mongo/db/curop',
-        '$BUILD_DIR/mongo/db/db_raii',
-        '$BUILD_DIR/mongo/db/query_exec',
-        '$BUILD_DIR/mongo/db/record_id_helpers',
         '$BUILD_DIR/mongo/db/repl/storage_interface',
+        'change_stream_options_manager',
+        'curop',
+        'query_exec',
+        'record_id_helpers',
         'server_base',
+        'shard_role',
     ],
 )
 
@@ -802,17 +801,24 @@ env.Library(
 )
 
 env.Library(
-    target='db_raii',
+    target='shard_role',
     source=[
+        'catalog_raii.cpp',
+        'catalog/catalog_helper.cpp',
         'db_raii.cpp',
     ],
     LIBDEPS=[
-        'catalog_raii',
+        'catalog/collection',
+        'catalog/collection_catalog',
+        'catalog/database_holder',
+        'concurrency/lock_manager',
         's/sharding_api_d',
         'stats/top',
+        'storage/write_unit_of_work',
+        'views/views',
     ],
     LIBDEPS_PRIVATE=[
-        'catalog/database_holder',
+        '$BUILD_DIR/mongo/db/catalog/local_oplog_info',
         'curop',
         'multitenancy',
         'server_base',
@@ -833,27 +839,6 @@ env.Library(
 )
 
 env.Library(
-    target='catalog_raii',
-    source=[
-        'catalog/catalog_helper.cpp',
-        'catalog_raii.cpp',
-    ],
-    LIBDEPS=[
-        'catalog/collection',
-        'catalog/collection_catalog',
-        'concurrency/lock_manager',
-        'views/views',
-    ],
-    LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/catalog/database_holder',
-        '$BUILD_DIR/mongo/db/catalog/local_oplog_info',
-        '$BUILD_DIR/mongo/db/s/sharding_api_d',
-        'multitenancy',
-        'server_base',
-    ],
-)
-
-env.Library(
     target='fle_crud',
     source=[
         'fle_crud.cpp',
@@ -952,7 +937,6 @@ env.Library(
         'dbhelpers.cpp',
     ],
     LIBDEPS=[
-        'db_raii',
         'index/index_access_method',
         'query_exec',
     ],
@@ -960,6 +944,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/commands/server_status_core',
         '$BUILD_DIR/mongo/db/ops/write_ops',
         'record_id_helpers',
+        'shard_role',
     ],
 )
 
@@ -971,8 +956,8 @@ env.Library(
     LIBDEPS=[
         'catalog/index_key_validate',
         'catalog/multi_index_block',
-        'db_raii',
         'index_builds_coordinator_interface',
+        'shard_role',
     ],
 )
 
@@ -1073,13 +1058,13 @@ env.Library(
 )
 
 env.Library(
-    target="index_builds_coordinator_mongod",
+    target='index_builds_coordinator_mongod',
     source=[
-        "index_builds_coordinator_mongod.cpp",
+        'index_builds_coordinator_mongod.cpp',
     ],
     LIBDEPS=[
-        "$BUILD_DIR/mongo/util/concurrency/thread_pool",
-        "index_builds_coordinator_interface",
+        '$BUILD_DIR/mongo/util/concurrency/thread_pool',
+        'index_builds_coordinator_interface',
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/catalog/collection_catalog',
@@ -1089,24 +1074,22 @@ env.Library(
         '$BUILD_DIR/mongo/db/storage/two_phase_index_build_knobs_idl',
         '$BUILD_DIR/mongo/executor/task_executor_interface',
         'curop',
-        'db_raii',
         'index_build_entry_helpers',
         'resumable_index_builds_idl',
+        'shard_role',
     ],
 )
 
 env.Library(
-    target="index_builds_coordinator_interface",
+    target='index_builds_coordinator_interface',
     source=[
-        "index_builds_coordinator.cpp",
-        "repl_index_build_state.cpp",
-        "active_index_builds.cpp",
+        'index_builds_coordinator.cpp',
+        'repl_index_build_state.cpp',
+        'active_index_builds.cpp',
     ],
     LIBDEPS=[
-        "$BUILD_DIR/mongo/base",
-        "$BUILD_DIR/mongo/db/catalog/commit_quorum_options",
-        "$BUILD_DIR/mongo/db/catalog/index_builds_manager",
-        '$BUILD_DIR/mongo/db/catalog_raii',
+        '$BUILD_DIR/mongo/db/catalog/commit_quorum_options',
+        '$BUILD_DIR/mongo/db/catalog/index_builds_manager',
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/catalog/collection',
@@ -1122,17 +1105,16 @@ env.Library(
         '$BUILD_DIR/mongo/db/repl/replica_set_messages',
         '$BUILD_DIR/mongo/db/repl/tenant_migration_access_blocker',
         '$BUILD_DIR/mongo/db/repl/timestamp_block',
-        '$BUILD_DIR/mongo/db/s/sharding_api_d',
+        '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/storage/encryption_hooks',
         '$BUILD_DIR/mongo/db/storage/storage_util',
         '$BUILD_DIR/mongo/db/storage/two_phase_index_build_knobs_idl',
-        "$BUILD_DIR/mongo/executor/task_executor_interface",
+        '$BUILD_DIR/mongo/executor/task_executor_interface',
         '$BUILD_DIR/mongo/util/fail_point',
-        'catalog/database_holder',
-        'db_raii',
         'index_build_entry_helpers',
         'resumable_index_builds_idl',
         'server_options_core',
+        'shard_role',
     ],
 )
 
@@ -1149,11 +1131,10 @@ env.Library(
         '$BUILD_DIR/mongo/db/catalog/local_oplog_info',
         '$BUILD_DIR/mongo/db/concurrency/exception_util',
         '$BUILD_DIR/mongo/db/storage/write_unit_of_work',
-        'catalog_raii',
-        'db_raii',
         'dbhelpers',
         'server_base',
         'service_context',
+        'shard_role',
     ],
 )
 
@@ -1163,23 +1144,20 @@ env.Library(
         'cloner.cpp',
         'cloner.idl',
     ],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/db/catalog/collection_options',
-        '$BUILD_DIR/mongo/db/catalog/multi_index_block',
-        'dbdirectclient',
-        'repl/isself',
-    ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/client/authentication',
         'catalog/collection_crud',
-        'catalog/database_holder',
+        'catalog/collection_options',
+        'catalog/multi_index_block',
         'commands/list_collections_filter',
         'concurrency/exception_util',
+        'dbdirectclient',
         'index_builds_coordinator_interface',
         'multitenancy',
         'ops/write_ops',
-        's/sharding_api_d',
+        'repl/isself',
+        'server_base',
+        'shard_role',
     ],
 )
 
@@ -1204,7 +1182,7 @@ env.Library(
         "$BUILD_DIR/mongo/db/catalog/collection_options",
         "$BUILD_DIR/mongo/db/concurrency/exception_util",
         "$BUILD_DIR/mongo/db/stats/resource_consumption_metrics",
-        "db_raii",
+        "shard_role",
     ],
 )
 
@@ -1241,7 +1219,6 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/s/grid',
-        'catalog_raii',
         'concurrency/exception_util',
         'curop',
         'repl/repl_coordinator_interface',
@@ -1249,6 +1226,7 @@ env.Library(
         'repl/tenant_migration_access_blocker',
         's/sharding_api_d',
         'server_base',
+        'shard_role',
     ],
 )
 
@@ -1257,12 +1235,11 @@ env.Library(
     source=[
         'rebuild_indexes.cpp',
     ],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/db/catalog/collection',
-    ],
     LIBDEPS_PRIVATE=[
         'catalog/index_key_validate',
         'index_builds_coordinator_interface',
+        'server_base',
+        'storage/write_unit_of_work',
     ],
 )
 
@@ -1271,12 +1248,8 @@ env.Library(
     source=[
         'repair.cpp',
     ],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/db/catalog/collection',
-        'rw_concern_d',
-        'vector_clock',
-    ],
     LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/db/catalog/collection',
         '$BUILD_DIR/mongo/db/catalog/collection_validation',
         '$BUILD_DIR/mongo/db/catalog/database_holder',
         '$BUILD_DIR/mongo/db/catalog/document_validation',
@@ -1288,6 +1261,8 @@ env.Library(
         'index_builds_coordinator_interface',
         'multitenancy',
         'rebuild_indexes',
+        'rw_concern_d',
+        'vector_clock',
     ],
 )
 
@@ -1297,23 +1272,20 @@ env.Library(
         'ttl.cpp',
         'ttl.idl',
     ],
-    LIBDEPS=[
-        'db_raii',
-        'query_exec',
-        'ttl_collection_cache',
-    ],
     LIBDEPS_PRIVATE=[
         'catalog/catalog_helpers',
-        'catalog/database_holder',
         'commands/fsync_locked',
         'commands/server_status_core',
         'ops/write_ops',
+        'query_exec',
         'record_id_helpers',
         'repl/replica_set_aware_service',
         'repl/tenant_migration_access_blocker',
         's/sharding_runtime_d',
         'server_base',
         'service_context',
+        'shard_role',
+        'ttl_collection_cache',
     ],
 )
 
@@ -1454,7 +1426,6 @@ env.Library(
         'curop',
         'curop_failpoint_helpers',
         'cursor_server_params',
-        'db_raii',
         'dbdirectclient',
         'exec/projection_executor',
         'exec/sbe/query_sbe_abt',
@@ -1476,6 +1447,7 @@ env.Library(
         'repl/repl_coordinator_interface',
         's/sharding_api_d',
         'session/logical_session_cache',
+        'shard_role',
         'shared_request_handling',
         'stats/serveronly_stats',
         'storage/remove_saver',
@@ -2199,7 +2171,6 @@ env.Library(
         'concurrency/lock_manager',
         'curop',
         'curop_metrics',
-        'db_raii',
         'dbdirectclient',
         'dbhelpers',
         'exec/working_set',
@@ -2242,6 +2213,7 @@ env.Library(
         'session/logical_session_cache_impl',
         'session/sessions_collection_rs',
         'session/sessions_collection_standalone',
+        'shard_role',
         'startup_warnings_mongod',
         'stats/change_collection_server_status',
         'stats/counters',
@@ -2592,7 +2564,6 @@ if wiredtiger:
             '$BUILD_DIR/mongo/util/net/network',
             '$BUILD_DIR/mongo/util/net/ssl_options_server',
             'batched_write_context',
-            'catalog_raii',
             'collection_index_usage_tracker',
             'commands',
             'common',
@@ -2623,6 +2594,7 @@ if wiredtiger:
             'service_context_devnull_test_fixture',
             'service_context_test_fixture',
             'service_liaison_mock',
+            'shard_role',
             'signed_logical_time',
             'snapshot_window_options',
             'startup_warnings_mongod',
diff --git a/src/mongo/db/auth/SConscript b/src/mongo/db/auth/SConscript
index 6735121f2be..77eee327fcb 100644
--- a/src/mongo/db/auth/SConscript
+++ b/src/mongo/db/auth/SConscript
@@ -111,10 +111,8 @@ env.Library(
         'auth_impl_internal',
     ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/catalog/collection_catalog',
-        '$BUILD_DIR/mongo/db/concurrency/lock_manager',
-        '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/multitenancy',
+        '$BUILD_DIR/mongo/db/shard_role',
         'auth_types',
     ],
 )
@@ -459,15 +457,14 @@ env.Library(
         'authz_session_external_state_d.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/db/db_raii',
-        '$BUILD_DIR/mongo/db/dbdirectclient',
-        '$BUILD_DIR/mongo/db/dbhelpers',
-        '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface',
         'auth_impl_internal_local',
         'authservercommon',
     ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/concurrency/lock_manager',
+        '$BUILD_DIR/mongo/db/dbdirectclient',
+        '$BUILD_DIR/mongo/db/dbhelpers',
+        '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface',
+        '$BUILD_DIR/mongo/db/shard_role',
     ],
 )
 
diff --git a/src/mongo/db/catalog/SConscript b/src/mongo/db/catalog/SConscript
index be099e1767e..43286e7e458 100644
--- a/src/mongo/db/catalog/SConscript
+++ b/src/mongo/db/catalog/SConscript
@@ -112,10 +112,10 @@ env.Library(
         'index_repair.cpp',
     ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/catalog_raii',
         '$BUILD_DIR/mongo/db/concurrency/exception_util',
         '$BUILD_DIR/mongo/db/curop',
         '$BUILD_DIR/mongo/db/index/index_access_method',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/db/storage/key_string',
         'collection_crud',
         'validate_state',
@@ -129,10 +129,10 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/db/catalog_raii',
         '$BUILD_DIR/mongo/db/concurrency/exception_util',
         '$BUILD_DIR/mongo/db/curop',
         '$BUILD_DIR/mongo/db/query/query_knobs',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/db/storage/record_store_base',
         '$BUILD_DIR/mongo/db/storage/storage_repair_observer',
         'index_repair',
@@ -262,7 +262,6 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/db/catalog_raii',
         '$BUILD_DIR/mongo/db/concurrency/exception_util',
         '$BUILD_DIR/mongo/db/curop',
         '$BUILD_DIR/mongo/db/index/index_access_method',
@@ -270,6 +269,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/resumable_index_builds_idl',
         '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/service_context',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/db/storage/storage_options',
         '$BUILD_DIR/mongo/db/storage/write_unit_of_work',
         '$BUILD_DIR/mongo/db/timeseries/timeseries_conversion_util',
@@ -341,23 +341,23 @@ env.Library(
 )
 
 env.Library(
-    target="validate_state",
+    target='validate_state',
     source=[
-        "validate_state.cpp",
+        'validate_state.cpp',
     ],
     LIBDEPS_PRIVATE=[
-        "$BUILD_DIR/mongo/base",
-        "$BUILD_DIR/mongo/db/catalog_raii",
-        "$BUILD_DIR/mongo/db/multitenancy",
+        '$BUILD_DIR/mongo/base',
+        '$BUILD_DIR/mongo/db/multitenancy',
         '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface',
         '$BUILD_DIR/mongo/db/server_options_core',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/db/storage/storage_options',
-        "$BUILD_DIR/mongo/db/views/views",
-        "$BUILD_DIR/mongo/util/fail_point",
-        "collection_catalog",
-        "database_holder",
-        "index_catalog",
-        "throttle_cursor",
+        '$BUILD_DIR/mongo/db/views/views',
+        '$BUILD_DIR/mongo/util/fail_point',
+        'collection_catalog',
+        'database_holder',
+        'index_catalog',
+        'throttle_cursor',
     ],
 )
 
@@ -377,7 +377,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/commands/server_status_core',
         '$BUILD_DIR/mongo/db/concurrency/lock_manager',
         '$BUILD_DIR/mongo/db/curop',
-        '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/dbcommands_idl',
         '$BUILD_DIR/mongo/db/index/index_access_method',
         '$BUILD_DIR/mongo/db/index/index_access_method_factory',
@@ -391,6 +390,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/repl/repl_settings',
         '$BUILD_DIR/mongo/db/server_options_core',
         '$BUILD_DIR/mongo/db/service_context',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/db/storage/durable_catalog_impl',
         '$BUILD_DIR/mongo/db/storage/execution_context',
         '$BUILD_DIR/mongo/db/storage/historical_ident_tracker',
@@ -409,11 +409,8 @@ env.Library(
         'catalog_helpers',
         'catalog_stats',
         'clustered_collection_options',
-        'collection',
-        'collection_catalog',
         'collection_crud',
         'collection_options',
-        'database_holder',
         'health_log',
         'index_build_block',
         'index_catalog',
@@ -434,9 +431,9 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/commands/server_status_core',
-        '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/multitenancy',
         '$BUILD_DIR/mongo/db/views/views',
+        'collection_catalog',
         'database_holder',
     ],
 )
@@ -452,12 +449,12 @@ env.Library(
         '$BUILD_DIR/mongo/bson/util/bson_column',
         '$BUILD_DIR/mongo/db/concurrency/exception_util',
         '$BUILD_DIR/mongo/db/curop',
-        '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/index/index_access_method',
         '$BUILD_DIR/mongo/db/multi_key_path_tracker',
         '$BUILD_DIR/mongo/db/record_id_helpers',
         '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/service_context',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/db/storage/execution_context',
         '$BUILD_DIR/mongo/db/storage/key_string',
         '$BUILD_DIR/mongo/db/storage/record_store_base',
@@ -522,7 +519,6 @@ env.Library(
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/catalog/collection_crud',
         '$BUILD_DIR/mongo/db/concurrency/exception_util',
-        '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/index/index_access_method',
         '$BUILD_DIR/mongo/db/index_builds_coordinator_interface',
         '$BUILD_DIR/mongo/db/index_commands_idl',
@@ -531,6 +527,8 @@ env.Library(
         '$BUILD_DIR/mongo/db/query_exec',
         '$BUILD_DIR/mongo/db/repl/drop_pending_collection_reaper',
         '$BUILD_DIR/mongo/db/server_options_core',
+        '$BUILD_DIR/mongo/db/shard_role',
+        '$BUILD_DIR/mongo/db/stats/top',
         '$BUILD_DIR/mongo/db/storage/index_entry_comparison',
         '$BUILD_DIR/mongo/db/storage/key_string',
         '$BUILD_DIR/mongo/db/timeseries/timeseries_conversion_util',
@@ -540,10 +538,8 @@ env.Library(
         '$BUILD_DIR/mongo/db/views/views',
         'cannot_convert_index_to_unique_info',
         'clustered_collection_options',
-        'collection',
         'collection_options',
         'collection_uuid_mismatch_info',
-        'database_holder',
         'index_catalog',
         'index_key_validate',
         'local_oplog_info',
@@ -667,8 +663,6 @@ if wiredtiger:
             '$BUILD_DIR/mongo/db/auth/authmocks',
             '$BUILD_DIR/mongo/db/catalog/collection_crud',
             '$BUILD_DIR/mongo/db/commands/test_commands_enabled',
-            '$BUILD_DIR/mongo/db/concurrency/lock_manager',
-            '$BUILD_DIR/mongo/db/db_raii',
             '$BUILD_DIR/mongo/db/index_builds_coordinator_mongod',
             '$BUILD_DIR/mongo/db/multitenancy',
             '$BUILD_DIR/mongo/db/op_observer/op_observer',
@@ -686,6 +680,7 @@ if wiredtiger:
             '$BUILD_DIR/mongo/db/service_context',
             '$BUILD_DIR/mongo/db/service_context_d_test_fixture',
             '$BUILD_DIR/mongo/db/service_context_test_fixture',
+            '$BUILD_DIR/mongo/db/shard_role',
             '$BUILD_DIR/mongo/db/storage/wiredtiger/storage_wiredtiger',
             '$BUILD_DIR/mongo/db/timeseries/timeseries_options',
             '$BUILD_DIR/mongo/unittest/unittest',
diff --git a/src/mongo/db/commands/SConscript b/src/mongo/db/commands/SConscript
index 26d90749257..6461f4dffc6 100644
--- a/src/mongo/db/commands/SConscript
+++ b/src/mongo/db/commands/SConscript
@@ -222,13 +222,13 @@ env.Library(
         'feature_compatibility_parsers',
     ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/catalog_raii',
         '$BUILD_DIR/mongo/db/commands',
         '$BUILD_DIR/mongo/db/dbdirectclient',
         '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface',
         '$BUILD_DIR/mongo/db/repl/repl_server_parameters',
         '$BUILD_DIR/mongo/db/repl/repl_settings',
         '$BUILD_DIR/mongo/db/server_base',
+        '$BUILD_DIR/mongo/db/shard_role',
     ],
 )
 
@@ -425,11 +425,11 @@ env.Library(
         '$BUILD_DIR/mongo/db/catalog/collection',
         '$BUILD_DIR/mongo/db/catalog/collection_crud',
         '$BUILD_DIR/mongo/db/commands',
-        '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/index_builds_coordinator_interface',
         '$BUILD_DIR/mongo/db/ops/write_ops',
         '$BUILD_DIR/mongo/db/ops/write_ops_exec',
         '$BUILD_DIR/mongo/db/query_exec',
+        '$BUILD_DIR/mongo/db/shard_role',
         'test_commands_enabled',
     ],
 )
@@ -732,12 +732,12 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/commands/servers',
-        '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/index/index_access_methods',
         '$BUILD_DIR/mongo/db/pipeline/process_interface/mongo_process_interface',
         '$BUILD_DIR/mongo/db/pipeline/process_interface/mongod_process_interface_factory',
         '$BUILD_DIR/mongo/db/query/map_reduce_output_format',
         '$BUILD_DIR/mongo/db/query_exec',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/idl/idl_parser',
         'map_reduce_parser',
     ],
diff --git a/src/mongo/db/concurrency/SConscript b/src/mongo/db/concurrency/SConscript
index 3b1f8e04de7..b902468ada9 100644
--- a/src/mongo/db/concurrency/SConscript
+++ b/src/mongo/db/concurrency/SConscript
@@ -9,15 +9,12 @@ env.Library(
     source=[
         'deferred_writer.cpp',
     ],
-    LIBDEPS=[
-        '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/db/catalog/collection',
-    ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
-        "$BUILD_DIR/mongo/db/catalog/collection_crud",
+        '$BUILD_DIR/mongo/db/catalog/collection_crud',
         '$BUILD_DIR/mongo/db/concurrency/exception_util',
-        '$BUILD_DIR/mongo/db/db_raii',
+        '$BUILD_DIR/mongo/db/server_base',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/util/concurrency/thread_pool',
     ],
 )
diff --git a/src/mongo/db/exec/sbe/SConscript b/src/mongo/db/exec/sbe/SConscript
index f133d855b28..42c826df249 100644
--- a/src/mongo/db/exec/sbe/SConscript
+++ b/src/mongo/db/exec/sbe/SConscript
@@ -124,8 +124,10 @@ env.Library(
         'stages/scan.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/db/db_raii', '$BUILD_DIR/mongo/db/index/index_access_method',
-        '$BUILD_DIR/mongo/db/storage/execution_context', 'query_sbe'
+        '$BUILD_DIR/mongo/db/index/index_access_method',
+        '$BUILD_DIR/mongo/db/shard_role',
+        '$BUILD_DIR/mongo/db/storage/execution_context',
+        'query_sbe',
     ],
 )
 
diff --git a/src/mongo/db/index/SConscript b/src/mongo/db/index/SConscript
index 13286acfd41..32a10b4eee7 100644
--- a/src/mongo/db/index/SConscript
+++ b/src/mongo/db/index/SConscript
@@ -179,7 +179,6 @@ indexTestEnv.CppUnitTest(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/catalog/catalog_test_fixture',
-        '$BUILD_DIR/mongo/db/catalog_raii',
         '$BUILD_DIR/mongo/db/exec/document_value/document_value_test_util',
         '$BUILD_DIR/mongo/db/exec/working_set',
         '$BUILD_DIR/mongo/db/index/index_access_method',
@@ -189,6 +188,7 @@ indexTestEnv.CppUnitTest(
         '$BUILD_DIR/mongo/db/query/sort_pattern',
         '$BUILD_DIR/mongo/db/query_expressions',
         '$BUILD_DIR/mongo/db/record_id_helpers',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/db/sorter/sorter_stats',
         'column_store_index',
         'expression_params',
diff --git a/src/mongo/db/matcher/SConscript b/src/mongo/db/matcher/SConscript
index b5e1d81d0f0..8a22c03c867 100644
--- a/src/mongo/db/matcher/SConscript
+++ b/src/mongo/db/matcher/SConscript
@@ -26,11 +26,11 @@ env.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/catalog/collection',
         '$BUILD_DIR/mongo/db/catalog/index_catalog',
-        '$BUILD_DIR/mongo/db/catalog_raii',
         '$BUILD_DIR/mongo/db/concurrency/lock_manager',
         '$BUILD_DIR/mongo/db/exec/js_function',
         '$BUILD_DIR/mongo/db/fts/base_fts',
         '$BUILD_DIR/mongo/db/query_expressions',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/scripting/scripting_server',
     ],
 )
diff --git a/src/mongo/db/ops/SConscript b/src/mongo/db/ops/SConscript
index 393b18209e9..be406be81d0 100644
--- a/src/mongo/db/ops/SConscript
+++ b/src/mongo/db/ops/SConscript
@@ -15,7 +15,6 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/db/catalog_raii',
         '$BUILD_DIR/mongo/db/concurrency/exception_util',
         '$BUILD_DIR/mongo/db/concurrency/lock_manager',
         '$BUILD_DIR/mongo/db/curop',
@@ -26,6 +25,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/repl/image_collection_entry',
         '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface',
         '$BUILD_DIR/mongo/db/service_context',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/db/update/update_driver',
     ],
 )
@@ -40,7 +40,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
         '$BUILD_DIR/mongo/db/catalog/collection_crud',
         '$BUILD_DIR/mongo/db/catalog/collection_options',
-        '$BUILD_DIR/mongo/db/catalog_raii',
         '$BUILD_DIR/mongo/db/concurrency/exception_util',
         '$BUILD_DIR/mongo/db/curop',
         '$BUILD_DIR/mongo/db/curop_metrics',
@@ -49,8 +48,10 @@ env.Library(
         '$BUILD_DIR/mongo/db/record_id_helpers',
         '$BUILD_DIR/mongo/db/repl/oplog',
         '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/db/stats/counters',
         '$BUILD_DIR/mongo/db/stats/server_read_concern_write_concern_metrics',
+        '$BUILD_DIR/mongo/db/stats/top',
         '$BUILD_DIR/mongo/db/timeseries/timeseries_conversion_util',
         '$BUILD_DIR/mongo/db/transaction/transaction',
         '$BUILD_DIR/mongo/util/fail_point',
diff --git a/src/mongo/db/pipeline/SConscript b/src/mongo/db/pipeline/SConscript
index 4e60e1441b7..dd55e020bc7 100644
--- a/src/mongo/db/pipeline/SConscript
+++ b/src/mongo/db/pipeline/SConscript
@@ -466,7 +466,7 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/change_stream_pre_images_collection_manager',
-        '$BUILD_DIR/mongo/db/db_raii',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/util/periodic_runner',
     ],
 )
diff --git a/src/mongo/db/query/ce/SConscript b/src/mongo/db/query/ce/SConscript
index ae0e61a8f92..6d8917f1d6b 100644
--- a/src/mongo/db/query/ce/SConscript
+++ b/src/mongo/db/query/ce/SConscript
@@ -92,8 +92,6 @@ env.CppUnitTest(
         '$BUILD_DIR/mongo/db/auth/authmocks',
         '$BUILD_DIR/mongo/db/catalog/collection_crud',
         '$BUILD_DIR/mongo/db/commands/test_commands_enabled',
-        '$BUILD_DIR/mongo/db/concurrency/lock_manager',
-        '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/index_builds_coordinator_mongod',
         '$BUILD_DIR/mongo/db/multitenancy',
         '$BUILD_DIR/mongo/db/op_observer/op_observer',
@@ -111,6 +109,7 @@ env.CppUnitTest(
         '$BUILD_DIR/mongo/db/service_context',
         '$BUILD_DIR/mongo/db/service_context_d_test_fixture',
         '$BUILD_DIR/mongo/db/service_context_test_fixture',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/db/storage/wiredtiger/storage_wiredtiger',
         '$BUILD_DIR/mongo/db/timeseries/timeseries_options',
         '$BUILD_DIR/mongo/unittest/unittest',
diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript
index 950d66d2d79..f27a9f26e57 100644
--- a/src/mongo/db/repl/SConscript
+++ b/src/mongo/db/repl/SConscript
@@ -69,7 +69,6 @@ env.Library(
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
         '$BUILD_DIR/mongo/db/catalog/collection_crud',
-        '$BUILD_DIR/mongo/db/catalog/database_holder',
         '$BUILD_DIR/mongo/db/catalog/import_collection_oplog_entry',
         '$BUILD_DIR/mongo/db/catalog/index_build_oplog_entry',
         '$BUILD_DIR/mongo/db/catalog/local_oplog_info',
@@ -79,7 +78,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/commands/feature_compatibility_parsers',
         '$BUILD_DIR/mongo/db/commands/txn_cmd_request',
         '$BUILD_DIR/mongo/db/concurrency/exception_util',
-        '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/dbdirectclient',
         '$BUILD_DIR/mongo/db/dbhelpers',
         '$BUILD_DIR/mongo/db/global_index',
@@ -90,6 +88,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/ops/write_ops',
         '$BUILD_DIR/mongo/db/pipeline/change_stream_preimage',
         '$BUILD_DIR/mongo/db/session/session_catalog_mongod',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/db/stats/counters',
         '$BUILD_DIR/mongo/db/stats/server_read_concern_write_concern_metrics',
         '$BUILD_DIR/mongo/db/transaction/transaction',
@@ -135,11 +134,10 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/db/concurrency/lock_manager',
-        '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/dbhelpers',
         '$BUILD_DIR/mongo/db/index/index_descriptor',
         '$BUILD_DIR/mongo/db/query_exec',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/util/fail_point',
         'oplog',
         'oplog_interface_remote',
@@ -208,19 +206,19 @@ env.Library(
     target='dbcheck',
     source=[
         'dbcheck.cpp',
-        "dbcheck_idl.cpp",
+        'dbcheck_idl.cpp',
         'dbcheck.idl',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/catalog/health_log',
-        '$BUILD_DIR/mongo/db/db_raii',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/idl/idl_parser',
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/catalog/collection_options',
         '$BUILD_DIR/mongo/db/query_exec',
         '$BUILD_DIR/mongo/db/record_id_helpers',
+        '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/util/md5',
     ],
 )
@@ -306,7 +304,7 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/catalog/collection_options',
-        '$BUILD_DIR/mongo/db/catalog_raii',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/db/storage/journal_flusher',
     ],
 )
@@ -386,9 +384,9 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/catalog/collection_options',
-        '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/dbdirectclient',
         '$BUILD_DIR/mongo/db/service_context',
+        '$BUILD_DIR/mongo/db/shard_role',
         'storage_interface',
     ],
     LIBDEPS_PRIVATE=[
@@ -413,8 +411,8 @@ env.Library(
         'oplog_interface_local.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/query_exec',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/db/transaction/transaction',
     ],
 )
@@ -594,7 +592,6 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/auth/authorization_manager_global',
-        '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/executor/task_executor_interface',
         '$BUILD_DIR/mongo/util/concurrency/thread_pool',
@@ -602,6 +599,8 @@ env.Library(
         'oplog_entry',
     ],
     LIBDEPS_PRIVATE=[
+        '$BUILD_DIR/mongo/db/concurrency/lock_manager',
+        'repl_coordinator_interface',
         'repl_server_parameters',
     ],
 )
@@ -1377,12 +1376,12 @@ env.Library(
         'wait_for_majority_service',
     ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/catalog_raii',
         '$BUILD_DIR/mongo/db/concurrency/exception_util',
         '$BUILD_DIR/mongo/db/dbhelpers',
         '$BUILD_DIR/mongo/db/ops/write_ops',
         '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/service_context',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/db/storage/write_unit_of_work',
         'tenant_migration_state_machine_idl',
     ],
@@ -1402,7 +1401,6 @@ env.Library(
         '$BUILD_DIR/mongo/client/read_preference',
         '$BUILD_DIR/mongo/db/catalog/commit_quorum_options',
         '$BUILD_DIR/mongo/db/vector_clock_mutable',
-        'primary_only_service',
         'tenant_migration_access_blocker',
         'tenant_migration_statistics',
         'tenant_migration_utils',
@@ -1424,7 +1422,9 @@ env.Library(
         'oplog_entry',
         'oplog_fetcher',
         'oplog_interface_local',
+        'primary_only_service',
         'repl_server_parameters',
+        'replica_set_aware_service',
         'replication_auth',
         'tenant_migration_cloners',
         'tenant_migration_state_machine_idl',
@@ -1444,13 +1444,13 @@ env.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/client/remote_command_targeter',
-        '$BUILD_DIR/mongo/db/catalog_raii',
         '$BUILD_DIR/mongo/db/commands/server_status_core',
         '$BUILD_DIR/mongo/db/commands/tenant_migration_cmds_request',
         '$BUILD_DIR/mongo/db/dbhelpers',
         '$BUILD_DIR/mongo/db/rw_concern_d',
         '$BUILD_DIR/mongo/db/serverless/shard_split_state_machine',
         '$BUILD_DIR/mongo/db/service_context',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/executor/network_interface_factory',
         '$BUILD_DIR/mongo/executor/thread_pool_task_executor',
         '$BUILD_DIR/mongo/util/future_util',
@@ -1553,9 +1553,9 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/catalog/collection_crud',
-        '$BUILD_DIR/mongo/db/catalog_raii',
         '$BUILD_DIR/mongo/db/dbdirectclient',
         '$BUILD_DIR/mongo/db/service_context_d_test_fixture',
+        '$BUILD_DIR/mongo/db/shard_role',
         'drop_pending_collection_reaper',
         'oplog',
         'oplog_entry',
@@ -1707,7 +1707,6 @@ if wiredtiger:
             '$BUILD_DIR/mongo/db/auth/authmocks',
             '$BUILD_DIR/mongo/db/auth/authorization_manager_global',
             '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
-            '$BUILD_DIR/mongo/db/catalog_raii',
             '$BUILD_DIR/mongo/db/change_stream_pre_images_collection_manager',
             '$BUILD_DIR/mongo/db/commands/feature_compatibility_parsers',
             '$BUILD_DIR/mongo/db/commands/mongod_fcv',
@@ -1726,6 +1725,7 @@ if wiredtiger:
             '$BUILD_DIR/mongo/db/service_context_d_test_fixture',
             '$BUILD_DIR/mongo/db/service_context_test_fixture',
             '$BUILD_DIR/mongo/db/session/logical_session_id_helpers',
+            '$BUILD_DIR/mongo/db/shard_role',
             '$BUILD_DIR/mongo/db/stats/counters',
             '$BUILD_DIR/mongo/db/storage/storage_control',
             '$BUILD_DIR/mongo/db/transaction/transaction',
@@ -1968,14 +1968,13 @@ env.Library(
         'primary_only_service_op_observer.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/executor/task_executor_interface',
-        'replica_set_aware_service',
     ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/dbdirectclient',
         '$BUILD_DIR/mongo/db/logical_time_metadata_hook',
+        '$BUILD_DIR/mongo/db/server_base',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/executor/connection_pool_executor',
         '$BUILD_DIR/mongo/executor/network_interface',
         '$BUILD_DIR/mongo/executor/network_interface_factory',
@@ -1985,6 +1984,7 @@ env.Library(
         '$BUILD_DIR/mongo/executor/thread_pool_task_executor',
         '$BUILD_DIR/mongo/util/concurrency/thread_pool',
         'repl_coordinator_interface',
+        'replica_set_aware_service',
         'wait_for_majority_service',
     ],
 )
diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript
index e3c6975d2a3..0ea097e9e61 100644
--- a/src/mongo/db/s/SConscript
+++ b/src/mongo/db/s/SConscript
@@ -165,7 +165,6 @@ env.Library(
         '$BUILD_DIR/mongo/db/client_metadata_propagation_egress_hook',
         '$BUILD_DIR/mongo/db/commands/mongod_fcv',
         '$BUILD_DIR/mongo/db/concurrency/exception_util',
-        '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/dbhelpers',
         '$BUILD_DIR/mongo/db/op_observer/op_observer_impl',
         '$BUILD_DIR/mongo/db/ops/write_ops_exec',
@@ -174,6 +173,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/repl/change_stream_oplog_notification',
         '$BUILD_DIR/mongo/db/repl/oplog',
         '$BUILD_DIR/mongo/db/rw_concern_d',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/db/transaction/transaction',
         '$BUILD_DIR/mongo/db/vector_clock_mongod',
         '$BUILD_DIR/mongo/s/query/cluster_aggregate',
@@ -195,6 +195,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/ops/write_ops',
         '$BUILD_DIR/mongo/db/repl/image_collection_entry',
         '$BUILD_DIR/mongo/db/repl/primary_only_service',
+        '$BUILD_DIR/mongo/db/repl/replica_set_aware_service',
         '$BUILD_DIR/mongo/db/repl/wait_for_majority_service',
         '$BUILD_DIR/mongo/db/rs_local_client',
         '$BUILD_DIR/mongo/db/server_base',
@@ -313,7 +314,6 @@ env.Library(
         '$BUILD_DIR/mongo/client/fetcher',
         '$BUILD_DIR/mongo/db/audit',
         '$BUILD_DIR/mongo/db/catalog/collection_options',
-        '$BUILD_DIR/mongo/db/catalog_raii',
         '$BUILD_DIR/mongo/db/commands/cluster_server_parameter_commands_invocation',
         '$BUILD_DIR/mongo/db/commands/mongod_fcv',
         '$BUILD_DIR/mongo/db/commands/set_feature_compatibility_version_idl',
@@ -330,6 +330,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/repl/replica_set_aware_service',
         '$BUILD_DIR/mongo/db/rw_concern_d',
         '$BUILD_DIR/mongo/db/server_feature_flags',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/db/snapshot_window_options',
         '$BUILD_DIR/mongo/db/timeseries/timeseries_options',
         '$BUILD_DIR/mongo/db/transaction/transaction',
diff --git a/src/mongo/db/serverless/SConscript b/src/mongo/db/serverless/SConscript
index b60edcd2064..3ccfd8ea7f7 100644
--- a/src/mongo/db/serverless/SConscript
+++ b/src/mongo/db/serverless/SConscript
@@ -70,13 +70,13 @@ env.Library(
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/catalog/local_oplog_info',
         '$BUILD_DIR/mongo/db/concurrency/exception_util',
-        '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/dbhelpers',
         '$BUILD_DIR/mongo/db/index_builds_coordinator_interface',
         '$BUILD_DIR/mongo/db/repl/oplog',
         '$BUILD_DIR/mongo/db/repl/replica_set_messages',
         '$BUILD_DIR/mongo/db/repl/tenant_migration_access_blocker',
         '$BUILD_DIR/mongo/db/server_base',
+        '$BUILD_DIR/mongo/db/shard_role',
         'shard_split_utils',
     ],
 )
diff --git a/src/mongo/db/session/SConscript b/src/mongo/db/session/SConscript
index 555eabdf7e1..9862c8a660b 100644
--- a/src/mongo/db/session/SConscript
+++ b/src/mongo/db/session/SConscript
@@ -184,8 +184,6 @@ env.Library(
     ],
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/db/catalog/collection',
-        '$BUILD_DIR/mongo/db/catalog_raii',
         '$BUILD_DIR/mongo/db/dbdirectclient',
         '$BUILD_DIR/mongo/db/index_builds_coordinator_interface',
         '$BUILD_DIR/mongo/db/index_commands_idl',
@@ -195,6 +193,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/repl/storage_interface',
         '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/service_context',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/util/concurrency/thread_pool',
         'kill_sessions',
         'logical_session_id',
diff --git a/src/mongo/db/stats/SConscript b/src/mongo/db/stats/SConscript
index eb6ff375190..01242257d02 100644
--- a/src/mongo/db/stats/SConscript
+++ b/src/mongo/db/stats/SConscript
@@ -125,13 +125,12 @@ env.Library(
         'storage_stats.cpp',
     ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/db/catalog/database_holder',
         '$BUILD_DIR/mongo/db/catalog/index_catalog',
         '$BUILD_DIR/mongo/db/commands/server_status_core',
-        '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/index/index_access_method',
         '$BUILD_DIR/mongo/db/pipeline/document_sources_idl',
+        '$BUILD_DIR/mongo/db/server_base',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/db/timeseries/bucket_catalog',
         '$BUILD_DIR/mongo/db/timeseries/timeseries_stats',
         'fill_locker_info',
diff --git a/src/mongo/db/storage/SConscript b/src/mongo/db/storage/SConscript
index 7f1f11055a6..d34e87bcc22 100644
--- a/src/mongo/db/storage/SConscript
+++ b/src/mongo/db/storage/SConscript
@@ -151,13 +151,12 @@ env.Library(
         'oplog_cap_maintainer_thread.cpp',
     ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/catalog/collection',
         '$BUILD_DIR/mongo/db/catalog/collection_catalog',
         '$BUILD_DIR/mongo/db/catalog/database_holder',
-        '$BUILD_DIR/mongo/db/catalog_raii',
         '$BUILD_DIR/mongo/db/concurrency/lock_manager',
         '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/service_context',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/util/background_job',
     ],
 )
@@ -493,7 +492,6 @@ env.CppUnitTest(
         '$BUILD_DIR/mongo/db/catalog/catalog_impl',
         '$BUILD_DIR/mongo/db/catalog/catalog_test_fixture',
         '$BUILD_DIR/mongo/db/catalog/collection_options',
-        '$BUILD_DIR/mongo/db/catalog_raii',
         '$BUILD_DIR/mongo/db/concurrency/flow_control_ticketholder',
         '$BUILD_DIR/mongo/db/dbhelpers',
         '$BUILD_DIR/mongo/db/multitenancy',
@@ -501,6 +499,7 @@ env.CppUnitTest(
         '$BUILD_DIR/mongo/db/repl/topology_coordinator',
         '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/service_context_d_test_fixture',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/db/storage/devnull/storage_devnull_core',
         '$BUILD_DIR/mongo/db/storage/durable_catalog_impl',
         '$BUILD_DIR/mongo/db/storage/storage_control',
@@ -603,8 +602,8 @@ env.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/db/catalog/catalog_control',
-        '$BUILD_DIR/mongo/db/catalog_raii',
         '$BUILD_DIR/mongo/db/server_options_core',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/db/storage/durable_catalog_impl',
         '$BUILD_DIR/mongo/db/storage/kv/kv_drop_pending_ident_reaper',
         '$BUILD_DIR/mongo/db/storage/storage_options',
diff --git a/src/mongo/db/storage/wiredtiger/SConscript b/src/mongo/db/storage/wiredtiger/SConscript
index 9aa5c224d48..2ad320fae8e 100644
--- a/src/mongo/db/storage/wiredtiger/SConscript
+++ b/src/mongo/db/storage/wiredtiger/SConscript
@@ -49,7 +49,6 @@ wtEnv.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/bson/dotted_path_support',
-        '$BUILD_DIR/mongo/db/catalog/collection',
         '$BUILD_DIR/mongo/db/catalog/collection_options',
         '$BUILD_DIR/mongo/db/concurrency/lock_manager',
         '$BUILD_DIR/mongo/db/curop',
@@ -57,7 +56,6 @@ wtEnv.Library(
         '$BUILD_DIR/mongo/db/index/index_descriptor',
         '$BUILD_DIR/mongo/db/prepare_conflict_tracker',
         '$BUILD_DIR/mongo/db/record_id_helpers',
-        '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface',
         '$BUILD_DIR/mongo/db/repl/repl_settings',
         '$BUILD_DIR/mongo/db/server_options_core',
         '$BUILD_DIR/mongo/db/server_options_servers',
@@ -77,13 +75,12 @@ wtEnv.Library(
         'storage_wiredtiger_customization_hooks',
     ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/catalog/database_holder',
         '$BUILD_DIR/mongo/db/commands/server_status_core',
         '$BUILD_DIR/mongo/db/concurrency/exception_util',
-        '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/mongod_options',
         '$BUILD_DIR/mongo/db/multitenancy',
         '$BUILD_DIR/mongo/db/server_base',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/db/snapshot_window_options',
         '$BUILD_DIR/mongo/db/storage/backup_block',
         '$BUILD_DIR/mongo/db/storage/storage_engine_parameters',
@@ -103,7 +100,7 @@ wtEnv.Library(
         'wiredtiger_global_options.idl',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/db/db_raii',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/db/storage/storage_engine_impl',
         '$BUILD_DIR/mongo/db/storage/storage_engine_lock_file',
         '$BUILD_DIR/mongo/db/storage/storage_engine_metadata',
@@ -113,7 +110,6 @@ wtEnv.Library(
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/catalog/database_holder',
         '$BUILD_DIR/mongo/db/commands/server_status_core',
-        '$BUILD_DIR/mongo/db/concurrency/lock_manager',
         '$BUILD_DIR/mongo/db/storage/storage_engine_common',
         '$BUILD_DIR/mongo/util/options_parser/options_parser',
     ],
@@ -202,8 +198,8 @@ wtEnv.Library(
         'wiredtiger_import.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/repl/oplog',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/db/storage/bson_collection_catalog_entry',
         'storage_wiredtiger_core',
     ],
diff --git a/src/mongo/db/timeseries/SConscript b/src/mongo/db/timeseries/SConscript
index 80704b8ea45..560eeddbc98 100644
--- a/src/mongo/db/timeseries/SConscript
+++ b/src/mongo/db/timeseries/SConscript
@@ -147,7 +147,7 @@ env.CppUnitTest(
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/catalog/catalog_test_fixture',
         '$BUILD_DIR/mongo/db/catalog/collection_crud',
-        '$BUILD_DIR/mongo/db/catalog_raii',
+        '$BUILD_DIR/mongo/db/shard_role',
         'bucket_catalog',
         'bucket_compression',
         'timeseries_conversion_util',
diff --git a/src/mongo/db/transaction/SConscript b/src/mongo/db/transaction/SConscript
index 697a9d6cf26..2c09b2904bb 100644
--- a/src/mongo/db/transaction/SConscript
+++ b/src/mongo/db/transaction/SConscript
@@ -20,11 +20,8 @@ env.Library(
         'transactions_stats.idl',
     ],
     LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/catalog/collection_catalog',
         '$BUILD_DIR/mongo/db/catalog/collection_crud',
-        '$BUILD_DIR/mongo/db/catalog/database_holder',
         '$BUILD_DIR/mongo/db/catalog/local_oplog_info',
-        '$BUILD_DIR/mongo/db/catalog_raii',
         '$BUILD_DIR/mongo/db/commands/server_status_core',
         '$BUILD_DIR/mongo/db/commands/test_commands_enabled',
         '$BUILD_DIR/mongo/db/commands/txn_cmd_request',
@@ -44,6 +41,7 @@ env.Library(
         '$BUILD_DIR/mongo/db/server_base',
         '$BUILD_DIR/mongo/db/session/session_catalog',
         '$BUILD_DIR/mongo/db/session/session_catalog_mongod',
+        '$BUILD_DIR/mongo/db/shard_role',
         '$BUILD_DIR/mongo/db/stats/fill_locker_info',
         '$BUILD_DIR/mongo/db/stats/top',
         '$BUILD_DIR/mongo/db/stats/transaction_stats',
diff --git a/src/mongo/dbtests/SConscript b/src/mongo/dbtests/SConscript
index 1e768ab3622..f73a0e83832 100644
--- a/src/mongo/dbtests/SConscript
+++ b/src/mongo/dbtests/SConscript
@@ -136,7 +136,6 @@ env.Program(
         "$BUILD_DIR/mongo/db/catalog/collection_validation",
         "$BUILD_DIR/mongo/db/catalog/index_key_validate",
         "$BUILD_DIR/mongo/db/catalog/multi_index_block",
-        "$BUILD_DIR/mongo/db/catalog_raii",
         "$BUILD_DIR/mongo/db/commands/mongod",
         "$BUILD_DIR/mongo/db/commands/test_commands_enabled",
         "$BUILD_DIR/mongo/db/concurrency/deferred_writer",
@@ -164,6 +163,7 @@ env.Program(
         "$BUILD_DIR/mongo/db/repl/storage_interface_impl",
         "$BUILD_DIR/mongo/db/server_options_core",
         "$BUILD_DIR/mongo/db/session/sessions_collection_standalone",
+        "$BUILD_DIR/mongo/db/shard_role",
         "$BUILD_DIR/mongo/db/storage/durable_catalog_impl",
         "$BUILD_DIR/mongo/db/storage/storage_engine_impl",
         "$BUILD_DIR/mongo/db/traffic_reader",