diff --git a/modules_poc/modules.yaml b/modules_poc/modules.yaml
index 87164087159..7a5f3e21f0c 100644
--- a/modules_poc/modules.yaml
+++ b/modules_poc/modules.yaml
@@ -323,6 +323,7 @@ catalog_and_routing.topology:
       consistency level.
     slack: server-catalog-and-routing
     jira: Catalog and Routing
+    fully_marked: true
   files:
     - src/mongo/db/topology/**
 
@@ -503,6 +504,7 @@ catalog_and_routing.topology.causal_consistency:
   meta:
     slack: server-sharding
     jira: Cluster Scalability
+    fully_marked: true
   files:
     - src/mongo/db/keys_collection*
     - src/mongo/db/key_generator*
diff --git a/src/mongo/db/commands/rwc_defaults_commands.idl b/src/mongo/db/commands/rwc_defaults_commands.idl
index 29c0d5c10ae..68c62418e48 100644
--- a/src/mongo/db/commands/rwc_defaults_commands.idl
+++ b/src/mongo/db/commands/rwc_defaults_commands.idl
@@ -27,6 +27,7 @@
 #
 global:
     cpp_namespace: "mongo"
+    mod_visibility: needs_replacement
 
 imports:
     - "mongo/db/basic_types.idl"
diff --git a/src/mongo/db/s/replica_set_endpoint_feature_flag.h b/src/mongo/db/s/replica_set_endpoint_feature_flag.h
index 9f3f9c3f193..d4061934b95 100644
--- a/src/mongo/db/s/replica_set_endpoint_feature_flag.h
+++ b/src/mongo/db/s/replica_set_endpoint_feature_flag.h
@@ -30,19 +30,20 @@
 #pragma once
 
 #include "mongo/db/version_context.h"
+#include "mongo/util/modules.h"
 namespace mongo {
 namespace replica_set_endpoint {
 
 /**
  * Returns true if the feature flag is enabled, not ignoring the feature compatibility version.
  */
-bool isFeatureFlagEnabled(const VersionContext& vCtx);
+MONGO_MOD_NEEDS_REPLACEMENT bool isFeatureFlagEnabled(const VersionContext& vCtx);
 
 /**
  * Returns true if the feature flag is enabled, ignoring the feature compatibility version.
  * To be used only by the machinery for maintaining the ReplicaSetEndpointShardingState.
  */
-bool isFeatureFlagEnabledIgnoreFCV();
+MONGO_MOD_NEEDS_REPLACEMENT bool isFeatureFlagEnabledIgnoreFCV();
 
 }  // namespace replica_set_endpoint
 }  // namespace mongo
diff --git a/src/mongo/db/topology/cluster_parameters/cluster_server_parameter.idl b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter.idl
index 72c2c6598aa..ebd9b7c6ad4 100644
--- a/src/mongo/db/topology/cluster_parameters/cluster_server_parameter.idl
+++ b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter.idl
@@ -28,6 +28,7 @@
 
 global:
     cpp_namespace: "mongo"
+    mod_visibility: needs_replacement
 
 imports:
     - "mongo/db/basic_types.idl"
diff --git a/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_cmds.idl b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_cmds.idl
index 2a962b909ab..38f99794947 100644
--- a/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_cmds.idl
+++ b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_cmds.idl
@@ -28,6 +28,7 @@
 
 global:
     cpp_namespace: "mongo"
+    mod_visibility: needs_replacement
 
 imports:
     - "mongo/db/basic_types.idl"
diff --git a/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_initializer.h b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_initializer.h
index 46b8e0b4e06..30348ae2b19 100644
--- a/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_initializer.h
+++ b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_initializer.h
@@ -33,6 +33,7 @@
 #include "mongo/db/repl/replica_set_aware_service.h"
 #include "mongo/db/service_context.h"
 #include "mongo/db/shard_role/shard_catalog/db_raii.h"
+#include "mongo/util/modules.h"
 
 #include <string>
 
@@ -42,7 +43,7 @@ namespace mongo {
  * An interface that provides methods to manipulate in-memory cluster server parameter values in
  * response to on-disk changes, specifically in a replica set context.
  */
-class ClusterServerParameterInitializer
+class MONGO_MOD_NEEDS_REPLACEMENT ClusterServerParameterInitializer
     : public ReplicaSetAwareService<ClusterServerParameterInitializer> {
     ClusterServerParameterInitializer(const ClusterServerParameterInitializer&) = delete;
     ClusterServerParameterInitializer& operator=(const ClusterServerParameterInitializer&) = delete;
diff --git a/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_op_observer.h b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_op_observer.h
index 6ff3a97c710..6148a692eab 100644
--- a/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_op_observer.h
+++ b/src/mongo/db/topology/cluster_parameters/cluster_server_parameter_op_observer.h
@@ -39,6 +39,7 @@
 #include "mongo/db/repl/optime.h"
 #include "mongo/db/session/logical_session_id.h"
 #include "mongo/db/shard_role/shard_catalog/collection.h"
+#include "mongo/util/modules.h"
 #include "mongo/util/uuid.h"
 
 #include <cstdint>
@@ -49,7 +50,7 @@ namespace mongo {
 /**
  * Update in-memory cluster server parameters on insert/update/remove.
  */
-class ClusterServerParameterOpObserver final : public OpObserverNoop {
+class MONGO_MOD_NEEDS_REPLACEMENT ClusterServerParameterOpObserver final : public OpObserverNoop {
 public:
     NamespaceFilters getNamespaceFilters() const final {
         return {NamespaceFilter::kConfig, NamespaceFilter::kConfig};
diff --git a/src/mongo/db/topology/cluster_parameters/migration_blocking_operation_cluster_parameters.idl b/src/mongo/db/topology/cluster_parameters/migration_blocking_operation_cluster_parameters.idl
index 7a94e943850..852ad079066 100644
--- a/src/mongo/db/topology/cluster_parameters/migration_blocking_operation_cluster_parameters.idl
+++ b/src/mongo/db/topology/cluster_parameters/migration_blocking_operation_cluster_parameters.idl
@@ -30,6 +30,7 @@ imports:
 
 global:
     cpp_namespace: mongo::migration_blocking_operation
+    mod_visibility: needs_replacement
 
 structs:
     PauseMigrationsDuringMultiUpdatesParam:
diff --git a/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator_document.idl b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator_document.idl
index fc978f4337c..ba12db0dfba 100644
--- a/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator_document.idl
+++ b/src/mongo/db/topology/cluster_parameters/set_cluster_parameter_coordinator_document.idl
@@ -28,6 +28,7 @@
 
 global:
     cpp_namespace: "mongo"
+    mod_visibility: needs_replacement
 
 imports:
     - "mongo/db/global_catalog/ddl/configsvr_coordinator.idl"
diff --git a/src/mongo/db/topology/cluster_parameters/sharding_cluster_parameters.idl b/src/mongo/db/topology/cluster_parameters/sharding_cluster_parameters.idl
index 311285782fe..92e77dba7a1 100644
--- a/src/mongo/db/topology/cluster_parameters/sharding_cluster_parameters.idl
+++ b/src/mongo/db/topology/cluster_parameters/sharding_cluster_parameters.idl
@@ -30,6 +30,7 @@ imports:
 
 global:
     cpp_namespace: mongo
+    mod_visibility: needs_replacement
 
 structs:
     ShardedClusterCardinalityParam:
diff --git a/src/mongo/db/topology/cluster_role.h b/src/mongo/db/topology/cluster_role.h
index d74a82fac6f..54b5fd79217 100644
--- a/src/mongo/db/topology/cluster_role.h
+++ b/src/mongo/db/topology/cluster_role.h
@@ -32,6 +32,7 @@
 #include "mongo/base/string_data.h"
 #include "mongo/bson/bsontypes.h"
 #include "mongo/logv2/log_service.h"
+#include "mongo/util/modules.h"
 
 #include <array>
 #include <cstdint>
@@ -53,7 +54,7 @@ namespace mongo {
  *  - { RouterServer }
  * For a cluster that is not sharded, the cluster role of each node is { None }.
  */
-class ClusterRole {
+class MONGO_MOD_NEEDS_REPLACEMENT ClusterRole {
 public:
     enum Value : uint8_t {
         /**
@@ -136,11 +137,11 @@ private:
  */
 BSONArray toBSON(ClusterRole role);
 
-std::ostream& operator<<(std::ostream& os, ClusterRole r);
+MONGO_MOD_NEEDS_REPLACEMENT std::ostream& operator<<(std::ostream& os, ClusterRole r);
 
 StringBuilder& operator<<(StringBuilder& s, ClusterRole r);
 
-inline std::string toString(ClusterRole r) {
+MONGO_MOD_NEEDS_REPLACEMENT inline std::string toString(ClusterRole r) {
     std::ostringstream os;
     os << r;
     return os.str();
@@ -150,7 +151,7 @@ inline std::string toString(ClusterRole r) {
  * Returns the LogService corresponding to `role`.
  * `role` must be None, ShardService, or RouterService.
  */
-inline logv2::LogService toLogService(ClusterRole role) {
+MONGO_MOD_NEEDS_REPLACEMENT inline logv2::LogService toLogService(ClusterRole role) {
     if (role.hasExclusively(ClusterRole::ShardServer))
         return logv2::LogService::shard;
     if (role.hasExclusively(ClusterRole::RouterServer))
diff --git a/src/mongo/db/topology/mongos_topology_coordinator.h b/src/mongo/db/topology/mongos_topology_coordinator.h
index 91e3f29985c..e0e3515deda 100644
--- a/src/mongo/db/topology/mongos_topology_coordinator.h
+++ b/src/mongo/db/topology/mongos_topology_coordinator.h
@@ -38,6 +38,7 @@
 #include "mongo/util/duration.h"
 #include "mongo/util/future.h"
 #include "mongo/util/future_impl.h"
+#include "mongo/util/modules.h"
 #include "mongo/util/time_support.h"
 
 #include <memory>
@@ -48,7 +49,7 @@
 
 namespace mongo {
 
-class MongosTopologyCoordinator {
+class MONGO_MOD_NEEDS_REPLACEMENT MongosTopologyCoordinator {
 public:
     static MongosTopologyCoordinator* get(OperationContext* opCtx);
 
diff --git a/src/mongo/db/topology/periodic_replica_set_configshard_maintenance_mode_checker.h b/src/mongo/db/topology/periodic_replica_set_configshard_maintenance_mode_checker.h
index dded420f9d2..07f46dc8acf 100644
--- a/src/mongo/db/topology/periodic_replica_set_configshard_maintenance_mode_checker.h
+++ b/src/mongo/db/topology/periodic_replica_set_configshard_maintenance_mode_checker.h
@@ -30,11 +30,12 @@
 #pragma once
 
 #include "mongo/db/service_context.h"
+#include "mongo/util/modules.h"
 #include "mongo/util/periodic_runner.h"
 
 namespace mongo {
 
-class PeriodicReplicaSetConfigShardMaintenanceModeChecker {
+class MONGO_MOD_NEEDS_REPLACEMENT PeriodicReplicaSetConfigShardMaintenanceModeChecker {
 public:
     static PeriodicReplicaSetConfigShardMaintenanceModeChecker& get(ServiceContext* serviceContext);
 
diff --git a/src/mongo/db/topology/remove_shard_draining_progress.idl b/src/mongo/db/topology/remove_shard_draining_progress.idl
index 9e6d7582ff4..a83361b2c6d 100644
--- a/src/mongo/db/topology/remove_shard_draining_progress.idl
+++ b/src/mongo/db/topology/remove_shard_draining_progress.idl
@@ -28,6 +28,7 @@
 
 global:
     cpp_namespace: "mongo"
+    mod_visibility: needs_replacement
 
 imports:
     - "mongo/db/basic_types.idl"
diff --git a/src/mongo/db/topology/remove_shard_exception.h b/src/mongo/db/topology/remove_shard_exception.h
index 5ef9854df96..f135f04fb22 100644
--- a/src/mongo/db/topology/remove_shard_exception.h
+++ b/src/mongo/db/topology/remove_shard_exception.h
@@ -33,11 +33,12 @@
 #include "mongo/base/error_extra_info.h"
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/db/topology/remove_shard_draining_progress_gen.h"
+#include "mongo/util/modules.h"
 #include "mongo/util/namespace_string_util.h"
 
 namespace mongo {
 
-class RemoveShardDrainingInfo final : public ErrorExtraInfo {
+class MONGO_MOD_NEEDS_REPLACEMENT RemoveShardDrainingInfo final : public ErrorExtraInfo {
 public:
     static constexpr auto code = ErrorCodes::RemoveShardDrainingInProgress;
 
diff --git a/src/mongo/db/topology/sharding_state.h b/src/mongo/db/topology/sharding_state.h
index 40d2af94bc6..0ad5a30b794 100644
--- a/src/mongo/db/topology/sharding_state.h
+++ b/src/mongo/db/topology/sharding_state.h
@@ -37,6 +37,7 @@
 #include "mongo/db/topology/cluster_role.h"
 #include "mongo/logv2/log_severity_suppressor.h"
 #include "mongo/stdx/mutex.h"
+#include "mongo/util/modules.h"
 
 #include <string>
 
@@ -56,7 +57,7 @@ namespace mongo {
  * synchronisation. Initialisation is driven from outside (specifically
  * ShardingInitializationMongoD, which should be its only caller).
  */
-class ShardingState {
+class MONGO_MOD_NEEDS_REPLACEMENT ShardingState {
     ShardingState(const ShardingState&) = delete;
     ShardingState& operator=(const ShardingState&) = delete;
 
diff --git a/src/mongo/db/topology/user_write_block/global_user_write_block_state.h b/src/mongo/db/topology/user_write_block/global_user_write_block_state.h
index 33a7d28fd93..6e0874b3e4f 100644
--- a/src/mongo/db/topology/user_write_block/global_user_write_block_state.h
+++ b/src/mongo/db/topology/user_write_block/global_user_write_block_state.h
@@ -35,12 +35,13 @@
 #include "mongo/db/service_context.h"
 #include "mongo/db/topology/user_write_block/user_writes_block_reason_gen.h"
 #include "mongo/platform/atomic_word.h"
+#include "mongo/util/modules.h"
 
 #include <array>
 
 namespace mongo {
 
-class GlobalUserWriteBlockState {
+class MONGO_MOD_NEEDS_REPLACEMENT GlobalUserWriteBlockState {
 public:
     GlobalUserWriteBlockState() = default;
 
diff --git a/src/mongo/db/topology/user_write_block/set_user_write_block_mode.idl b/src/mongo/db/topology/user_write_block/set_user_write_block_mode.idl
index 49c2f1a9330..40449f6c9f2 100644
--- a/src/mongo/db/topology/user_write_block/set_user_write_block_mode.idl
+++ b/src/mongo/db/topology/user_write_block/set_user_write_block_mode.idl
@@ -28,6 +28,7 @@
 
 global:
     cpp_namespace: "mongo"
+    mod_visibility: needs_replacement
 
 imports:
     - "mongo/db/basic_types.idl"
diff --git a/src/mongo/db/topology/user_write_block/set_user_write_block_mode_coordinator_document.idl b/src/mongo/db/topology/user_write_block/set_user_write_block_mode_coordinator_document.idl
index bebb7d523b0..3205ade4d14 100644
--- a/src/mongo/db/topology/user_write_block/set_user_write_block_mode_coordinator_document.idl
+++ b/src/mongo/db/topology/user_write_block/set_user_write_block_mode_coordinator_document.idl
@@ -28,6 +28,7 @@
 
 global:
     cpp_namespace: "mongo"
+    mod_visibility: needs_replacement
 
 imports:
     - "mongo/db/global_catalog/ddl/configsvr_coordinator.idl"
diff --git a/src/mongo/db/topology/user_write_block/user_write_block_mode_op_observer.h b/src/mongo/db/topology/user_write_block/user_write_block_mode_op_observer.h
index b99019c2959..e3ca4e06bb9 100644
--- a/src/mongo/db/topology/user_write_block/user_write_block_mode_op_observer.h
+++ b/src/mongo/db/topology/user_write_block/user_write_block_mode_op_observer.h
@@ -40,6 +40,7 @@
 #include "mongo/db/session/logical_session_id.h"
 #include "mongo/db/shard_role/shard_catalog/collection.h"
 #include "mongo/db/shard_role/shard_catalog/collection_options.h"
+#include "mongo/util/modules.h"
 #include "mongo/util/uuid.h"
 
 #include <cstdint>
@@ -54,7 +55,7 @@ namespace mongo {
  * OpObserver for user write blocking. On write operations, checks whether the current global user
  * write blocking state allows the write, and uasserts if not.
  */
-class UserWriteBlockModeOpObserver final : public OpObserverNoop {
+class MONGO_MOD_NEEDS_REPLACEMENT UserWriteBlockModeOpObserver final : public OpObserverNoop {
     UserWriteBlockModeOpObserver(const UserWriteBlockModeOpObserver&) = delete;
     UserWriteBlockModeOpObserver& operator=(const UserWriteBlockModeOpObserver&) = delete;
 
diff --git a/src/mongo/db/topology/user_write_block/user_writes_block_reason.idl b/src/mongo/db/topology/user_write_block/user_writes_block_reason.idl
index 137128d06cc..4d0dfbcbc23 100644
--- a/src/mongo/db/topology/user_write_block/user_writes_block_reason.idl
+++ b/src/mongo/db/topology/user_write_block/user_writes_block_reason.idl
@@ -28,6 +28,7 @@
 
 global:
     cpp_namespace: "mongo"
+    mod_visibility: needs_replacement
 
 imports:
     - "mongo/db/basic_types.idl"
diff --git a/src/mongo/db/topology/user_write_block/write_block_bypass.h b/src/mongo/db/topology/user_write_block/write_block_bypass.h
index d0934ddfae4..b9b5cd5cba6 100644
--- a/src/mongo/db/topology/user_write_block/write_block_bypass.h
+++ b/src/mongo/db/topology/user_write_block/write_block_bypass.h
@@ -33,9 +33,10 @@
 #include "mongo/bson/bsonelement.h"
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/db/operation_context.h"
+#include "mongo/util/modules.h"
 
 namespace mongo {
-class WriteBlockBypass {
+class MONGO_MOD_NEEDS_REPLACEMENT WriteBlockBypass {
 public:
     static WriteBlockBypass& get(OperationContext* opCtx);
 
diff --git a/src/mongo/db/topology/vector_clock/vector_clock.h b/src/mongo/db/topology/vector_clock/vector_clock.h
index 0a6a7609ab2..3a4514efa73 100644
--- a/src/mongo/db/topology/vector_clock/vector_clock.h
+++ b/src/mongo/db/topology/vector_clock/vector_clock.h
@@ -37,6 +37,7 @@
 #include "mongo/db/topology/vector_clock/vector_clock_gen.h"
 #include "mongo/stdx/mutex.h"
 #include "mongo/util/assert_util.h"
+#include "mongo/util/modules.h"
 #include "mongo/util/observable_mutex.h"
 
 #include <array>
@@ -53,7 +54,7 @@ namespace mongo {
  * The VectorClock service provides a collection of cluster-wide logical clocks (including the
  * clusterTime), that are used to provide causal-consistency to various other services.
  */
-class VectorClock {
+class MONGO_MOD_NEEDS_REPLACEMENT VectorClock {
 protected:
     enum class Component : uint8_t {
         ClusterTime = 0,
diff --git a/src/mongo/db/topology/vector_clock/vector_clock.idl b/src/mongo/db/topology/vector_clock/vector_clock.idl
index 2b3a25c3f7e..b369610a570 100644
--- a/src/mongo/db/topology/vector_clock/vector_clock.idl
+++ b/src/mongo/db/topology/vector_clock/vector_clock.idl
@@ -28,6 +28,7 @@
 
 global:
     cpp_namespace: "mongo"
+    mod_visibility: needs_replacement
 
 imports:
     - "mongo/db/basic_types.idl"
diff --git a/src/mongo/db/topology/vector_clock/vector_clock_metadata_hook.h b/src/mongo/db/topology/vector_clock/vector_clock_metadata_hook.h
index 6bb89b9ceeb..9a8927feac5 100644
--- a/src/mongo/db/topology/vector_clock/vector_clock_metadata_hook.h
+++ b/src/mongo/db/topology/vector_clock/vector_clock_metadata_hook.h
@@ -30,6 +30,7 @@
 #pragma once
 
 #include "mongo/rpc/metadata/metadata_hook.h"
+#include "mongo/util/modules.h"
 
 #include <memory>
 #include <vector>
@@ -45,7 +46,7 @@ class Status;
 
 namespace rpc {
 
-class VectorClockMetadataHook : public EgressMetadataHook {
+class MONGO_MOD_NEEDS_REPLACEMENT VectorClockMetadataHook : public EgressMetadataHook {
 public:
     explicit VectorClockMetadataHook(ServiceContext* service);
 
diff --git a/src/mongo/db/topology/vector_clock/vector_clock_mutable.h b/src/mongo/db/topology/vector_clock/vector_clock_mutable.h
index c952de28905..e2926e390fb 100644
--- a/src/mongo/db/topology/vector_clock/vector_clock_mutable.h
+++ b/src/mongo/db/topology/vector_clock/vector_clock_mutable.h
@@ -34,6 +34,7 @@
 #include "mongo/db/service_context.h"
 #include "mongo/db/topology/vector_clock/vector_clock.h"
 #include "mongo/util/future.h"
+#include "mongo/util/modules.h"
 
 #include <cstdint>
 
@@ -44,7 +45,7 @@ namespace mongo {
  *
  * Only linked in contexts where ticking is allowed, ie. mongod, embedded, mongod-based unittests.
  */
-class VectorClockMutable : public VectorClock {
+class MONGO_MOD_NEEDS_REPLACEMENT VectorClockMutable : public VectorClock {
 public:
     // Decorate ServiceContext with VectorClockMutable*, that will resolve to the mutable vector
     // clock implementation.
diff --git a/src/mongo/db/version_context.h b/src/mongo/db/version_context.h
index a8543078f7d..d3e47b947fc 100644
--- a/src/mongo/db/version_context.h
+++ b/src/mongo/db/version_context.h
@@ -31,6 +31,7 @@
 
 #include "mongo/db/server_options.h"
 #include "mongo/db/version_context_metadata_gen.h"
+#include "mongo/util/modules.h"
 
 #include <variant>
 
@@ -55,7 +56,7 @@ class ClientLock;
  * operations for now. Our plans are to expand this to more operations in a future project
  * (SPM-4227).
  */
-class VersionContext {
+class MONGO_MOD_NEEDS_REPLACEMENT VersionContext {
 public:
     using FCV = multiversion::FeatureCompatibilityVersion;
     using FCVSnapshot = ServerGlobalParams::FCVSnapshot;
@@ -196,14 +197,16 @@ private:
 /**
  * Use this when running outside of an operation (for example, during startup, or in unit tests).
  */
-inline const VersionContext kNoVersionContext{VersionContext::OutsideOperationTag{}};
+MONGO_MOD_NEEDS_REPLACEMENT inline const VersionContext kNoVersionContext{
+    VersionContext::OutsideOperationTag{}};
 
 /**
  * Use this if you want to deliberately bypass Operation FCV and make feature flag checks against
  * the node's local FCV only. This should be used with a lot of care, only if you can ensure none
  * of your current or future callers acts incorrectly due to ignoring their Operation FCV.
  */
-inline const VersionContext kVersionContextIgnored_UNSAFE{VersionContext::IgnoreOFCVTag{}};
+MONGO_MOD_NEEDS_REPLACEMENT inline const VersionContext kVersionContextIgnored_UNSAFE{
+    VersionContext::IgnoreOFCVTag{}};
 
 /**
  * Synchronously wait for all operations associated with a stale version context to drain.
@@ -216,8 +219,7 @@ inline const VersionContext kVersionContextIgnored_UNSAFE{VersionContext::Ignore
  * - Associated with a stale version context, but that have been already killed
  *
  */
-void waitForOperationsNotMatchingVersionContextToComplete(OperationContext* opCtx,
-                                                          const VersionContext& vCtx,
-                                                          Date_t deadline = Date_t::max());
+MONGO_MOD_NEEDS_REPLACEMENT void waitForOperationsNotMatchingVersionContextToComplete(
+    OperationContext* opCtx, const VersionContext& vCtx, Date_t deadline = Date_t::max());
 
 }  // namespace mongo
diff --git a/src/mongo/db/version_context_feature_flags.idl b/src/mongo/db/version_context_feature_flags.idl
index 7e19a763615..c29747d50cc 100644
--- a/src/mongo/db/version_context_feature_flags.idl
+++ b/src/mongo/db/version_context_feature_flags.idl
@@ -28,6 +28,7 @@
 
 global:
     cpp_namespace: "mongo"
+    mod_visibility: needs_replacement
 
 feature_flags:
     # TODO (SERVER-110309): remove this feature flag
diff --git a/src/mongo/s/change_streams/change_stream_reader_builder_impl.h b/src/mongo/s/change_streams/change_stream_reader_builder_impl.h
index 41bc2c12886..643da4bbe78 100644
--- a/src/mongo/s/change_streams/change_stream_reader_builder_impl.h
+++ b/src/mongo/s/change_streams/change_stream_reader_builder_impl.h
@@ -30,10 +30,11 @@
 #pragma once
 
 #include "mongo/db/pipeline/change_stream_reader_builder.h"
+#include "mongo/util/modules.h"
 
 namespace mongo {
 
-class ChangeStreamReaderBuilderImpl : public ChangeStreamReaderBuilder {
+class MONGO_MOD_NEEDS_REPLACEMENT ChangeStreamReaderBuilderImpl : public ChangeStreamReaderBuilder {
 public:
     /**
      * Builds CollectionChangeStreamShardTargeterImpl, DatabaseChangeStreamShardTargeterImpl or
diff --git a/src/mongo/s/read_write_concern_defaults_cache_lookup_mongos.h b/src/mongo/s/read_write_concern_defaults_cache_lookup_mongos.h
index 52a29cb2b0b..9de627a9dd4 100644
--- a/src/mongo/s/read_write_concern_defaults_cache_lookup_mongos.h
+++ b/src/mongo/s/read_write_concern_defaults_cache_lookup_mongos.h
@@ -32,6 +32,7 @@
 #include "mongo/db/operation_context.h"
 #include "mongo/db/read_write_concern_defaults.h"
 #include "mongo/db/read_write_concern_defaults_gen.h"
+#include "mongo/util/modules.h"
 
 #include <boost/optional/optional.hpp>
 
@@ -40,7 +41,7 @@ namespace mongo {
 /**
  * A function which handles looking up RWConcernDefault values from config servers.
  */
-boost::optional<RWConcernDefault> readWriteConcernDefaultsCacheLookupMongoS(
-    OperationContext* opCtx);
+MONGO_MOD_NEEDS_REPLACEMENT boost::optional<RWConcernDefault>
+readWriteConcernDefaultsCacheLookupMongoS(OperationContext* opCtx);
 
 }  // namespace mongo