10 files changed, 22 insertions, 11 deletions
diff --git a/src/mongo/db/repl/collection_cloner.cpp b/src/mongo/db/repl/collection_cloner.cpp
index 81b40c366c2..2980833ef86 100644
--- a/src/mongo/db/repl/collection_cloner.cpp
+++ b/src/mongo/db/repl/collection_cloner.cpp
@@ -40,6 +40,7 @@
 #include "mongo/db/repl/collection_cloner.h"
 #include "mongo/db/repl/database_cloner_gen.h"
 #include "mongo/db/repl/repl_server_parameters_gen.h"
+#include "mongo/db/server_feature_flags_gen.h"
 #include "mongo/db/wire_version.h"
 #include "mongo/logv2/log.h"
 #include "mongo/rpc/get_status_from_command_result.h"
diff --git a/src/mongo/db/repl/database_cloner.cpp b/src/mongo/db/repl/database_cloner.cpp
index fc7867f2ad9..209223478c0 100644
--- a/src/mongo/db/repl/database_cloner.cpp
+++ b/src/mongo/db/repl/database_cloner.cpp
@@ -35,6 +35,7 @@
 #include "mongo/db/repl/database_cloner.h"
 #include "mongo/db/repl/database_cloner_common.h"
 #include "mongo/db/repl/database_cloner_gen.h"
+#include "mongo/db/server_feature_flags_gen.h"
 #include "mongo/logv2/log.h"
 #include "mongo/util/assert_util.h"
 
diff --git a/src/mongo/db/repl/oplog_applier_utils.cpp b/src/mongo/db/repl/oplog_applier_utils.cpp
index bb2ef4d74ef..b7fcfeb76d9 100644
--- a/src/mongo/db/repl/oplog_applier_utils.cpp
+++ b/src/mongo/db/repl/oplog_applier_utils.cpp
@@ -41,6 +41,7 @@
 #include "mongo/db/namespace_string.h"
 #include "mongo/db/repl/oplog_applier_utils.h"
 #include "mongo/db/repl/repl_server_parameters_gen.h"
+#include "mongo/db/server_feature_flags_gen.h"
 #include "mongo/db/stats/counters.h"
 #include "mongo/util/fail_point.h"
 
diff --git a/src/mongo/db/repl/oplog_entry.cpp b/src/mongo/db/repl/oplog_entry.cpp
index da59fba3ed5..0c9f66b11d5 100644
--- a/src/mongo/db/repl/oplog_entry.cpp
+++ b/src/mongo/db/repl/oplog_entry.cpp
@@ -221,6 +221,12 @@ void ReplOperation::extractPrePostImageForTransaction(boost::optional<ImageBundl
     }
 }
 
+void ReplOperation::setTid(boost::optional<mongo::TenantId> value) & {
+    if (serverGlobalParams.featureCompatibility.isVersionInitialized() &&
+        gFeatureFlagRequireTenantID.isEnabled(serverGlobalParams.featureCompatibility))
+        DurableReplOperation::setTid(value);
+}
+
 // Static
 ReplOperation MutableOplogEntry::makeInsertOperation(const NamespaceString& nss,
                                                      UUID uuid,
@@ -357,6 +363,12 @@ StatusWith<MutableOplogEntry> MutableOplogEntry::parse(const BSONObj& object) {
     MONGO_UNREACHABLE;
 }
 
+void MutableOplogEntry::setTid(boost::optional<mongo::TenantId> value) & {
+    if (serverGlobalParams.featureCompatibility.isVersionInitialized() &&
+        gFeatureFlagRequireTenantID.isEnabled(serverGlobalParams.featureCompatibility))
+        getDurableReplOperation().setTid(std::move(value));
+}
+
 void MutableOplogEntry::setOpTime(const OpTime& opTime) & {
     setTimestamp(opTime.getTimestamp());
     if (opTime.getTerm() != OpTime::kUninitializedTerm)
diff --git a/src/mongo/db/repl/oplog_entry.h b/src/mongo/db/repl/oplog_entry.h
index 08925116582..55723e72823 100644
--- a/src/mongo/db/repl/oplog_entry.h
+++ b/src/mongo/db/repl/oplog_entry.h
@@ -35,7 +35,6 @@
 #include "mongo/db/repl/apply_ops_gen.h"
 #include "mongo/db/repl/oplog_entry_gen.h"
 #include "mongo/db/repl/optime.h"
-#include "mongo/db/server_feature_flags_gen.h"
 #include "mongo/db/session/logical_session_id.h"
 #include "mongo/util/overloaded_visitor.h"
 
@@ -190,11 +189,7 @@ public:
      * the FCV checks.  Once these are deprecated, we should remove this overridden function
      * entirely.
      */
-    void setTid(boost::optional<mongo::TenantId> value) & {
-        if (serverGlobalParams.featureCompatibility.isVersionInitialized() &&
-            gFeatureFlagRequireTenantID.isEnabled(serverGlobalParams.featureCompatibility))
-            DurableReplOperation::setTid(value);
-    }
+    void setTid(boost::optional<mongo::TenantId> value) &;
 
     /**
      * Exports pre/post image information, if present, for writing to the image collection.
@@ -305,11 +300,7 @@ public:
         getDurableReplOperation().setOpType(std::move(value));
     }
 
-    void setTid(boost::optional<mongo::TenantId> value) & {
-        if (serverGlobalParams.featureCompatibility.isVersionInitialized() &&
-            gFeatureFlagRequireTenantID.isEnabled(serverGlobalParams.featureCompatibility))
-            getDurableReplOperation().setTid(std::move(value));
-    }
+    void setTid(boost::optional<mongo::TenantId> value) &;
 
     void setNss(NamespaceString value) & {
         getDurableReplOperation().setNss(std::move(value));
diff --git a/src/mongo/db/s/sharding_server_status.cpp b/src/mongo/db/s/sharding_server_status.cpp
index 0312c84d85f..2182aa08683 100644
--- a/src/mongo/db/s/sharding_server_status.cpp
+++ b/src/mongo/db/s/sharding_server_status.cpp
@@ -38,6 +38,7 @@
 #include "mongo/db/s/sharding_data_transform_cumulative_metrics.h"
 #include "mongo/db/s/sharding_state.h"
 #include "mongo/db/s/sharding_statistics.h"
+#include "mongo/db/server_feature_flags_gen.h"
 #include "mongo/db/vector_clock.h"
 #include "mongo/s/balancer_configuration.h"
 #include "mongo/s/catalog_cache.h"
diff --git a/src/mongo/db/s/shardsvr_compact_structured_encryption_data_command.cpp b/src/mongo/db/s/shardsvr_compact_structured_encryption_data_command.cpp
index b07721e91fb..d8eb9e5801f 100644
--- a/src/mongo/db/s/shardsvr_compact_structured_encryption_data_command.cpp
+++ b/src/mongo/db/s/shardsvr_compact_structured_encryption_data_command.cpp
@@ -37,6 +37,7 @@
 #include "mongo/db/commands/fle2_compact_gen.h"
 #include "mongo/db/s/compact_structured_encryption_data_coordinator.h"
 #include "mongo/db/s/compact_structured_encryption_data_coordinator_gen.h"
+#include "mongo/db/server_feature_flags_gen.h"
 #include "mongo/logv2/log.h"
 #include "mongo/s/cluster_commands_helpers.h"
 
diff --git a/src/mongo/db/s/shardsvr_delete_global_index_key_command.cpp b/src/mongo/db/s/shardsvr_delete_global_index_key_command.cpp
index 8fc4d6cc25d..f543641b5bb 100644
--- a/src/mongo/db/s/shardsvr_delete_global_index_key_command.cpp
+++ b/src/mongo/db/s/shardsvr_delete_global_index_key_command.cpp
@@ -37,6 +37,7 @@
 #include "mongo/db/dbhelpers.h"
 #include "mongo/db/global_index.h"
 #include "mongo/db/s/global_index_crud_commands_gen.h"
+#include "mongo/db/server_feature_flags_gen.h"
 #include "mongo/logv2/log.h"
 
 namespace mongo {
diff --git a/src/mongo/db/s/shardsvr_insert_global_index_key_command.cpp b/src/mongo/db/s/shardsvr_insert_global_index_key_command.cpp
index 68528125b36..f4af6507281 100644
--- a/src/mongo/db/s/shardsvr_insert_global_index_key_command.cpp
+++ b/src/mongo/db/s/shardsvr_insert_global_index_key_command.cpp
@@ -37,6 +37,7 @@
 #include "mongo/db/dbhelpers.h"
 #include "mongo/db/global_index.h"
 #include "mongo/db/s/global_index_crud_commands_gen.h"
+#include "mongo/db/server_feature_flags_gen.h"
 #include "mongo/logv2/log.h"
 
 namespace mongo {
diff --git a/src/mongo/transport/session_asio.cpp b/src/mongo/transport/session_asio.cpp
index 0eb3e3eef44..aee83bd5799 100644
--- a/src/mongo/transport/session_asio.cpp
+++ b/src/mongo/transport/session_asio.cpp
@@ -32,6 +32,7 @@
 
 #include "mongo/config.h"
 #include "mongo/db/commands/server_status_metric.h"
+#include "mongo/db/server_feature_flags_gen.h"
 #include "mongo/logv2/log.h"
 #include "mongo/transport/asio_utils.h"
 #include "mongo/transport/proxy_protocol_header_parser.h"