SERVER-39339 Remove `stdx/memory.h`

18 files changed, 67 insertions, 61 deletions

diff --git a/src/mongo/transport/message_compressor_manager_test.cpp b/src/mongo/transport/message_compressor_manager_test.cpp
index bffde5f9c29..7e0868ff2c2 100644
--- a/src/mongo/transport/message_compressor_manager_test.cpp
+++ b/src/mongo/transport/message_compressor_manager_test.cpp
@@ -31,9 +31,12 @@
 
 #include "mongo/platform/basic.h"
 
+#include <memory>
+#include <string>
+#include <vector>
+
 #include "mongo/bson/bsonobjbuilder.h"
 #include "mongo/rpc/message.h"
-#include "mongo/stdx/memory.h"
 #include "mongo/transport/message_compressor_manager.h"
 #include "mongo/transport/message_compressor_noop.h"
 #include "mongo/transport/message_compressor_registry.h"
@@ -43,9 +46,6 @@
 #include "mongo/unittest/unittest.h"
 #include "mongo/util/log.h"
 
-#include <string>
-#include <vector>
-
 namespace mongo {
 namespace {
 
@@ -56,7 +56,7 @@ const auto assertOk = [](auto&& sw) {
 
 MessageCompressorRegistry buildRegistry() {
     MessageCompressorRegistry ret;
-    auto compressor = stdx::make_unique<NoopMessageCompressor>();
+    auto compressor = std::make_unique<NoopMessageCompressor>();
 
     std::vector<std::string> compressorList = {compressor->getName()};
     ret.setSupportedCompressors(std::move(compressorList));
@@ -222,34 +222,34 @@ TEST(MessageCompressorManager, FullNormalCompression) {
 
 TEST(NoopMessageCompressor, Fidelity) {
     auto testMessage = buildMessage();
-    checkFidelity(testMessage, stdx::make_unique<NoopMessageCompressor>());
+    checkFidelity(testMessage, std::make_unique<NoopMessageCompressor>());
 }
 
 TEST(SnappyMessageCompressor, Fidelity) {
     auto testMessage = buildMessage();
-    checkFidelity(testMessage, stdx::make_unique<SnappyMessageCompressor>());
+    checkFidelity(testMessage, std::make_unique<SnappyMessageCompressor>());
 }
 
 TEST(ZlibMessageCompressor, Fidelity) {
     auto testMessage = buildMessage();
-    checkFidelity(testMessage, stdx::make_unique<ZlibMessageCompressor>());
+    checkFidelity(testMessage, std::make_unique<ZlibMessageCompressor>());
 }
 
 TEST(ZstdMessageCompressor, Fidelity) {
     auto testMessage = buildMessage();
-    checkFidelity(testMessage, stdx::make_unique<ZstdMessageCompressor>());
+    checkFidelity(testMessage, std::make_unique<ZstdMessageCompressor>());
 }
 
 TEST(SnappyMessageCompressor, Overflow) {
-    checkOverflow(stdx::make_unique<SnappyMessageCompressor>());
+    checkOverflow(std::make_unique<SnappyMessageCompressor>());
 }
 
 TEST(ZlibMessageCompressor, Overflow) {
-    checkOverflow(stdx::make_unique<ZlibMessageCompressor>());
+    checkOverflow(std::make_unique<ZlibMessageCompressor>());
 }
 
 TEST(ZstdMessageCompressor, Overflow) {
-    checkOverflow(stdx::make_unique<ZstdMessageCompressor>());
+    checkOverflow(std::make_unique<ZstdMessageCompressor>());
 }
 
 TEST(MessageCompressorManager, SERVER_28008) {
@@ -258,15 +258,15 @@ TEST(MessageCompressorManager, SERVER_28008) {
     // but with a different ordering for the preferred compressor.
 
     std::unique_ptr<MessageCompressorBase> zstdCompressor =
-        stdx::make_unique<ZstdMessageCompressor>();
+        std::make_unique<ZstdMessageCompressor>();
     const auto zstdId = zstdCompressor->getId();
 
     std::unique_ptr<MessageCompressorBase> zlibCompressor =
-        stdx::make_unique<ZlibMessageCompressor>();
+        std::make_unique<ZlibMessageCompressor>();
     const auto zlibId = zlibCompressor->getId();
 
     std::unique_ptr<MessageCompressorBase> snappyCompressor =
-        stdx::make_unique<SnappyMessageCompressor>();
+        std::make_unique<SnappyMessageCompressor>();
     const auto snappyId = snappyCompressor->getId();
 
     MessageCompressorRegistry registry;
diff --git a/src/mongo/transport/message_compressor_registry.cpp b/src/mongo/transport/message_compressor_registry.cpp
index 50b5bc70e48..90a89855048 100644
--- a/src/mongo/transport/message_compressor_registry.cpp
+++ b/src/mongo/transport/message_compressor_registry.cpp
@@ -31,17 +31,17 @@
 
 #include "mongo/transport/message_compressor_registry.h"
 
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <memory>
+
 #include "mongo/base/init.h"
-#include "mongo/stdx/memory.h"
 #include "mongo/transport/message_compressor_noop.h"
 #include "mongo/transport/message_compressor_snappy.h"
 #include "mongo/transport/message_compressor_zlib.h"
 #include "mongo/transport/message_compressor_zstd.h"
 #include "mongo/util/options_parser/option_section.h"
 
-#include <boost/algorithm/string/classification.hpp>
-#include <boost/algorithm/string/split.hpp>
-
 namespace mongo {
 namespace {
 constexpr auto kDisabledConfigValue = "disabled"_sd;
@@ -133,7 +133,7 @@ MONGO_INITIALIZER_GENERAL(NoopMessageCompressorInit,
                           ("AllCompressorsRegistered"))
 (InitializerContext* context) {
     auto& compressorRegistry = MessageCompressorRegistry::get();
-    compressorRegistry.registerImplementation(stdx::make_unique<NoopMessageCompressor>());
+    compressorRegistry.registerImplementation(std::make_unique<NoopMessageCompressor>());
     return Status::OK();
 }
 
diff --git a/src/mongo/transport/message_compressor_registry_test.cpp b/src/mongo/transport/message_compressor_registry_test.cpp
index d1fe3e62a6d..84b78fe877b 100644
--- a/src/mongo/transport/message_compressor_registry_test.cpp
+++ b/src/mongo/transport/message_compressor_registry_test.cpp
@@ -29,7 +29,8 @@
 
 #include "mongo/platform/basic.h"
 
-#include "mongo/stdx/memory.h"
+#include <memory>
+
 #include "mongo/transport/message_compressor_noop.h"
 #include "mongo/transport/message_compressor_registry.h"
 #include "mongo/unittest/unittest.h"
@@ -46,7 +47,7 @@ namespace mongo {
 namespace {
 TEST(MessageCompressorRegistry, RegularTest) {
     MessageCompressorRegistry registry;
-    auto compressor = stdx::make_unique<NoopMessageCompressor>();
+    auto compressor = std::make_unique<NoopMessageCompressor>();
     auto compressorPtr = compressor.get();
 
     std::vector<std::string> compressorList = {compressorPtr->getName()};
@@ -73,7 +74,7 @@ TEST(MessageCompressorRegistry, NothingRegistered) {
 
 TEST(MessageCompressorRegistry, SetSupported) {
     MessageCompressorRegistry registry;
-    auto compressor = stdx::make_unique<NoopMessageCompressor>();
+    auto compressor = std::make_unique<NoopMessageCompressor>();
     auto compressorId = compressor->getId();
     auto compressorName = compressor->getName();
 
diff --git a/src/mongo/transport/message_compressor_snappy.cpp b/src/mongo/transport/message_compressor_snappy.cpp
index 70e9644e218..58712aee596 100644
--- a/src/mongo/transport/message_compressor_snappy.cpp
+++ b/src/mongo/transport/message_compressor_snappy.cpp
@@ -31,9 +31,10 @@
 
 #include "mongo/platform/basic.h"
 
+#include <memory>
+
 #include "mongo/base/data_range_cursor.h"
 #include "mongo/base/init.h"
-#include "mongo/stdx/memory.h"
 #include "mongo/transport/message_compressor_registry.h"
 #include "mongo/transport/message_compressor_snappy.h"
 
@@ -82,7 +83,7 @@ MONGO_INITIALIZER_GENERAL(SnappyMessageCompressorInit,
                           ("AllCompressorsRegistered"))
 (InitializerContext* context) {
     auto& compressorRegistry = MessageCompressorRegistry::get();
-    compressorRegistry.registerImplementation(stdx::make_unique<SnappyMessageCompressor>());
+    compressorRegistry.registerImplementation(std::make_unique<SnappyMessageCompressor>());
     return Status::OK();
 }
 }  // namespace mongo
diff --git a/src/mongo/transport/message_compressor_zlib.cpp b/src/mongo/transport/message_compressor_zlib.cpp
index e67358c2fa5..8676c03eacc 100644
--- a/src/mongo/transport/message_compressor_zlib.cpp
+++ b/src/mongo/transport/message_compressor_zlib.cpp
@@ -31,8 +31,9 @@
 
 #include "mongo/platform/basic.h"
 
+#include <memory>
+
 #include "mongo/base/init.h"
-#include "mongo/stdx/memory.h"
 #include "mongo/transport/message_compressor_registry.h"
 #include "mongo/transport/message_compressor_zlib.h"
 
@@ -84,7 +85,7 @@ MONGO_INITIALIZER_GENERAL(ZlibMessageCompressorInit,
                           ("AllCompressorsRegistered"))
 (InitializerContext* context) {
     auto& compressorRegistry = MessageCompressorRegistry::get();
-    compressorRegistry.registerImplementation(stdx::make_unique<ZlibMessageCompressor>());
+    compressorRegistry.registerImplementation(std::make_unique<ZlibMessageCompressor>());
     return Status::OK();
 }
 }  // namespace mongo
diff --git a/src/mongo/transport/message_compressor_zstd.cpp b/src/mongo/transport/message_compressor_zstd.cpp
index 88e165f92d7..b98b4835fba 100644
--- a/src/mongo/transport/message_compressor_zstd.cpp
+++ b/src/mongo/transport/message_compressor_zstd.cpp
@@ -31,10 +31,11 @@
 
 #include "mongo/platform/basic.h"
 
+#include <memory>
+
 #include <zstd.h>
 
 #include "mongo/base/init.h"
-#include "mongo/stdx/memory.h"
 #include "mongo/transport/message_compressor_registry.h"
 #include "mongo/transport/message_compressor_zstd.h"
 
@@ -82,7 +83,7 @@ MONGO_INITIALIZER_GENERAL(ZstdMessageCompressorInit,
                           ("AllCompressorsRegistered"))
 (InitializerContext* context) {
     auto& compressorRegistry = MessageCompressorRegistry::get();
-    compressorRegistry.registerImplementation(stdx::make_unique<ZstdMessageCompressor>());
+    compressorRegistry.registerImplementation(std::make_unique<ZstdMessageCompressor>());
     return Status::OK();
 }
 }  // namespace mongo
diff --git a/src/mongo/transport/service_entry_point_impl.cpp b/src/mongo/transport/service_entry_point_impl.cpp
index a01401f936d..64d4cef9c80 100644
--- a/src/mongo/transport/service_entry_point_impl.cpp
+++ b/src/mongo/transport/service_entry_point_impl.cpp
@@ -124,7 +124,7 @@ void ServiceEntryPointImpl::startSession(transport::SessionHandle session) {
     const auto& remoteAddr = session->remoteAddr();
     const auto& localAddr = session->localAddr();
     invariant(remoteAddr.isValid() && localAddr.isValid());
-    auto restrictionEnvironment = stdx::make_unique<RestrictionEnvironment>(remoteAddr, localAddr);
+    auto restrictionEnvironment = std::make_unique<RestrictionEnvironment>(remoteAddr, localAddr);
     RestrictionEnvironment::set(session, std::move(restrictionEnvironment));
 
     SSMListIterator ssmIt;
diff --git a/src/mongo/transport/service_entry_point_utils.cpp b/src/mongo/transport/service_entry_point_utils.cpp
index ab30f3c9563..73b71beafc7 100644
--- a/src/mongo/transport/service_entry_point_utils.cpp
+++ b/src/mongo/transport/service_entry_point_utils.cpp
@@ -34,8 +34,8 @@
 #include "mongo/transport/service_entry_point_utils.h"
 
 #include <functional>
+#include <memory>
 
-#include "mongo/stdx/memory.h"
 #include "mongo/stdx/thread.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/debug_util.h"
@@ -91,7 +91,7 @@ Status launchServiceWorkerThread(std::function<void()> task) {
         }
 
         pthread_t thread;
-        auto ctx = stdx::make_unique<std::function<void()>>(std::move(task));
+        auto ctx = std::make_unique<std::function<void()>>(std::move(task));
         int failed = pthread_create(&thread, &attrs, runFunc, ctx.get());
 
         pthread_attr_destroy(&attrs);
diff --git a/src/mongo/transport/service_executor_adaptive.cpp b/src/mongo/transport/service_executor_adaptive.cpp
index a62f057e7b3..e6f79d50b09 100644
--- a/src/mongo/transport/service_executor_adaptive.cpp
+++ b/src/mongo/transport/service_executor_adaptive.cpp
@@ -125,8 +125,8 @@ thread_local ServiceExecutorAdaptive::ThreadState* ServiceExecutorAdaptive::_loc
     nullptr;
 
 ServiceExecutorAdaptive::ServiceExecutorAdaptive(ServiceContext* ctx, ReactorHandle reactor)
-    : ServiceExecutorAdaptive(
-          ctx, std::move(reactor), stdx::make_unique<ServerParameterOptions>()) {}
+    : ServiceExecutorAdaptive(ctx, std::move(reactor), std::make_unique<ServerParameterOptions>()) {
+}
 
 ServiceExecutorAdaptive::ServiceExecutorAdaptive(ServiceContext* ctx,
                                                  ReactorHandle reactor,
diff --git a/src/mongo/transport/service_executor_adaptive_test.cpp b/src/mongo/transport/service_executor_adaptive_test.cpp
index b2a7c471bbe..70d234ad356 100644
--- a/src/mongo/transport/service_executor_adaptive_test.cpp
+++ b/src/mongo/transport/service_executor_adaptive_test.cpp
@@ -140,9 +140,9 @@ protected:
 
     template <class Options>
     std::unique_ptr<ServiceExecutorAdaptive> makeAndStartExecutor() {
-        auto configOwned = stdx::make_unique<Options>();
+        auto configOwned = std::make_unique<Options>();
         config = configOwned.get();
-        auto exec = stdx::make_unique<ServiceExecutorAdaptive>(
+        auto exec = std::make_unique<ServiceExecutorAdaptive>(
             getGlobalServiceContext(), asioIoCtx, std::move(configOwned));
 
         ASSERT_OK(exec->start());
diff --git a/src/mongo/transport/service_executor_test.cpp b/src/mongo/transport/service_executor_test.cpp
index 2c52deafb69..b6674f6b2c7 100644
--- a/src/mongo/transport/service_executor_test.cpp
+++ b/src/mongo/transport/service_executor_test.cpp
@@ -153,9 +153,9 @@ protected:
         auto scOwned = ServiceContext::make();
         setGlobalServiceContext(std::move(scOwned));
 
-        auto configOwned = stdx::make_unique<TestOptions>();
+        auto configOwned = std::make_unique<TestOptions>();
         executorConfig = configOwned.get();
-        executor = stdx::make_unique<ServiceExecutorAdaptive>(
+        executor = std::make_unique<ServiceExecutorAdaptive>(
             getGlobalServiceContext(), std::make_shared<ASIOReactor>(), std::move(configOwned));
     }
 
@@ -170,7 +170,7 @@ protected:
         auto scOwned = ServiceContext::make();
         setGlobalServiceContext(std::move(scOwned));
 
-        executor = stdx::make_unique<ServiceExecutorSynchronous>(getGlobalServiceContext());
+        executor = std::make_unique<ServiceExecutorSynchronous>(getGlobalServiceContext());
     }
 
     std::unique_ptr<ServiceExecutorSynchronous> executor;
diff --git a/src/mongo/transport/service_state_machine.cpp b/src/mongo/transport/service_state_machine.cpp
index 47467d871ff..4e073280d00 100644
--- a/src/mongo/transport/service_state_machine.cpp
+++ b/src/mongo/transport/service_state_machine.cpp
@@ -33,6 +33,8 @@
 
 #include "mongo/transport/service_state_machine.h"
 
+#include <memory>
+
 #include "mongo/config.h"
 #include "mongo/db/client.h"
 #include "mongo/db/dbmessage.h"
@@ -40,7 +42,6 @@
 #include "mongo/db/traffic_recorder.h"
 #include "mongo/rpc/message.h"
 #include "mongo/rpc/op_msg.h"
-#include "mongo/stdx/memory.h"
 #include "mongo/transport/message_compressor_manager.h"
 #include "mongo/transport/service_entry_point.h"
 #include "mongo/transport/service_executor_task_names.h"
diff --git a/src/mongo/transport/service_state_machine.h b/src/mongo/transport/service_state_machine.h
index 59b8dbd2823..08e6ee15ee6 100644
--- a/src/mongo/transport/service_state_machine.h
+++ b/src/mongo/transport/service_state_machine.h
@@ -31,12 +31,12 @@
 
 #include <atomic>
 #include <functional>
+#include <memory>
 
 #include "mongo/base/status.h"
 #include "mongo/config.h"
 #include "mongo/db/service_context.h"
 #include "mongo/platform/atomic_word.h"
-#include "mongo/stdx/memory.h"
 #include "mongo/stdx/mutex.h"
 #include "mongo/stdx/thread.h"
 #include "mongo/transport/message_compressor_base.h"
diff --git a/src/mongo/transport/service_state_machine_test.cpp b/src/mongo/transport/service_state_machine_test.cpp
index 12f9120074a..c132d39d548 100644
--- a/src/mongo/transport/service_state_machine_test.cpp
+++ b/src/mongo/transport/service_state_machine_test.cpp
@@ -31,6 +31,8 @@
 
 #include "mongo/platform/basic.h"
 
+#include <memory>
+
 #include "mongo/base/checked_cast.h"
 #include "mongo/bson/bsonobj.h"
 #include "mongo/bson/bsonobjbuilder.h"
@@ -38,7 +40,6 @@
 #include "mongo/db/dbmessage.h"
 #include "mongo/db/service_context.h"
 #include "mongo/rpc/op_msg.h"
-#include "mongo/stdx/memory.h"
 #include "mongo/transport/mock_session.h"
 #include "mongo/transport/service_entry_point.h"
 #include "mongo/transport/service_executor.h"
@@ -296,18 +297,18 @@ protected:
         auto sc = scOwned.get();
         setGlobalServiceContext(std::move(scOwned));
 
-        sc->setTickSource(stdx::make_unique<TickSourceMock<>>());
-        sc->setFastClockSource(stdx::make_unique<ClockSourceMock>());
+        sc->setTickSource(std::make_unique<TickSourceMock<>>());
+        sc->setFastClockSource(std::make_unique<ClockSourceMock>());
 
-        auto sep = stdx::make_unique<MockSEP>();
+        auto sep = std::make_unique<MockSEP>();
         _sep = sep.get();
         sc->setServiceEntryPoint(std::move(sep));
 
-        auto se = stdx::make_unique<MockServiceExecutor>(sc);
+        auto se = std::make_unique<MockServiceExecutor>(sc);
         _sexec = se.get();
         sc->setServiceExecutor(std::move(se));
 
-        auto tl = stdx::make_unique<MockTL>();
+        auto tl = std::make_unique<MockTL>();
         _tl = tl.get();
         sc->setTransportLayer(std::move(tl));
         _tl->start().transitional_ignore();
diff --git a/src/mongo/transport/transport_layer_asio.cpp b/src/mongo/transport/transport_layer_asio.cpp
index 3a17975ea85..41f00e9b677 100644
--- a/src/mongo/transport/transport_layer_asio.cpp
+++ b/src/mongo/transport/transport_layer_asio.cpp
@@ -751,7 +751,7 @@ Status TransportLayerASIO::setup() {
     const auto& sslParams = getSSLGlobalParams();
 
     if (_sslMode() != SSLParams::SSLMode_disabled && _listenerOptions.isIngress()) {
-        _ingressSSLContext = stdx::make_unique<asio::ssl::context>(asio::ssl::context::sslv23);
+        _ingressSSLContext = std::make_unique<asio::ssl::context>(asio::ssl::context::sslv23);
 
         Status status =
             getSSLManager()->initSSLContext(_ingressSSLContext->native_handle(),
@@ -763,7 +763,7 @@ Status TransportLayerASIO::setup() {
     }
 
     if (_listenerOptions.isEgress() && getSSLManager()) {
-        _egressSSLContext = stdx::make_unique<asio::ssl::context>(asio::ssl::context::sslv23);
+        _egressSSLContext = std::make_unique<asio::ssl::context>(asio::ssl::context::sslv23);
         Status status =
             getSSLManager()->initSSLContext(_egressSSLContext->native_handle(),
                                             sslParams,
diff --git a/src/mongo/transport/transport_layer_asio.h b/src/mongo/transport/transport_layer_asio.h
index e37f72c40aa..c0e14452adf 100644
--- a/src/mongo/transport/transport_layer_asio.h
+++ b/src/mongo/transport/transport_layer_asio.h
@@ -30,13 +30,13 @@
 #pragma once
 
 #include <functional>
+#include <memory>
 #include <string>
 
 #include "mongo/base/status_with.h"
 #include "mongo/config.h"
 #include "mongo/db/server_options.h"
 #include "mongo/stdx/condition_variable.h"
-#include "mongo/stdx/memory.h"
 #include "mongo/stdx/mutex.h"
 #include "mongo/stdx/thread.h"
 #include "mongo/transport/transport_layer.h"
diff --git a/src/mongo/transport/transport_layer_manager.cpp b/src/mongo/transport/transport_layer_manager.cpp
index 97a44e104f4..dcc91cf3e3d 100644
--- a/src/mongo/transport/transport_layer_manager.cpp
+++ b/src/mongo/transport/transport_layer_manager.cpp
@@ -31,19 +31,19 @@
 
 #include "mongo/transport/transport_layer_manager.h"
 
+#include <iostream>
+#include <limits>
+#include <memory>
+
 #include "mongo/base/status.h"
 #include "mongo/db/server_options.h"
 #include "mongo/db/service_context.h"
-#include "mongo/stdx/memory.h"
 #include "mongo/transport/service_executor_adaptive.h"
 #include "mongo/transport/service_executor_synchronous.h"
 #include "mongo/transport/session.h"
 #include "mongo/transport/transport_layer_asio.h"
 #include "mongo/util/net/ssl_types.h"
 #include "mongo/util/time_support.h"
-#include <limits>
-
-#include <iostream>
 
 namespace mongo {
 namespace transport {
@@ -122,7 +122,7 @@ std::unique_ptr<TransportLayer> TransportLayerManager::makeAndStartDefaultEgress
     opts.mode = transport::TransportLayerASIO::Options::kEgress;
     opts.ipList.clear();
 
-    auto ret = stdx::make_unique<transport::TransportLayerASIO>(opts, nullptr);
+    auto ret = std::make_unique<transport::TransportLayerASIO>(opts, nullptr);
     uassertStatusOK(ret->setup());
     uassertStatusOK(ret->start());
     return std::unique_ptr<TransportLayer>(std::move(ret));
@@ -142,20 +142,19 @@ std::unique_ptr<TransportLayer> TransportLayerManager::createWithConfig(
         MONGO_UNREACHABLE;
     }
 
-    auto transportLayerASIO = stdx::make_unique<transport::TransportLayerASIO>(opts, sep);
+    auto transportLayerASIO = std::make_unique<transport::TransportLayerASIO>(opts, sep);
 
     if (config->serviceExecutor == "adaptive") {
         auto reactor = transportLayerASIO->getReactor(TransportLayer::kIngress);
-        ctx->setServiceExecutor(
-            stdx::make_unique<ServiceExecutorAdaptive>(ctx, std::move(reactor)));
+        ctx->setServiceExecutor(std::make_unique<ServiceExecutorAdaptive>(ctx, std::move(reactor)));
     } else if (config->serviceExecutor == "synchronous") {
-        ctx->setServiceExecutor(stdx::make_unique<ServiceExecutorSynchronous>(ctx));
+        ctx->setServiceExecutor(std::make_unique<ServiceExecutorSynchronous>(ctx));
     }
     transportLayer = std::move(transportLayerASIO);
 
     std::vector<std::unique_ptr<TransportLayer>> retVector;
     retVector.emplace_back(std::move(transportLayer));
-    return stdx::make_unique<TransportLayerManager>(std::move(retVector));
+    return std::make_unique<TransportLayerManager>(std::move(retVector));
 }
 
 }  // namespace transport
diff --git a/src/mongo/transport/transport_layer_mock.cpp b/src/mongo/transport/transport_layer_mock.cpp
index ed3365a67e7..bbc61010991 100644
--- a/src/mongo/transport/transport_layer_mock.cpp
+++ b/src/mongo/transport/transport_layer_mock.cpp
@@ -31,8 +31,9 @@
 
 #include "mongo/transport/transport_layer_mock.h"
 
+#include <memory>
+
 #include "mongo/base/status.h"
-#include "mongo/stdx/memory.h"
 #include "mongo/transport/mock_session.h"
 #include "mongo/transport/transport_layer.h"
 #include "mongo/util/time_support.h"