6 files changed, 14 insertions, 12 deletions
diff --git a/src/mongo/rpc/metadata/client_metadata.h b/src/mongo/rpc/metadata/client_metadata.h
index c0efab46319..eb467caab6a 100644
--- a/src/mongo/rpc/metadata/client_metadata.h
+++ b/src/mongo/rpc/metadata/client_metadata.h
@@ -31,7 +31,6 @@
 
 #include <string>
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/base/status.h"
 #include "mongo/base/status_with.h"
 #include "mongo/base/string_data.h"
@@ -84,7 +83,8 @@ constexpr auto kMetadataDocumentName = "client"_sd;
  * See Driver Specification: "MongoDB Handshake" for more information.
  */
 class ClientMetadata {
-    MONGO_DISALLOW_COPYING(ClientMetadata);
+    ClientMetadata(const ClientMetadata&) = delete;
+    ClientMetadata& operator=(const ClientMetadata&) = delete;
 
 public:
     ClientMetadata(ClientMetadata&&) = default;
diff --git a/src/mongo/rpc/metadata/client_metadata_ismaster.h b/src/mongo/rpc/metadata/client_metadata_ismaster.h
index 27c81a3a5e5..91214a8ccab 100644
--- a/src/mongo/rpc/metadata/client_metadata_ismaster.h
+++ b/src/mongo/rpc/metadata/client_metadata_ismaster.h
@@ -33,7 +33,6 @@
 #include <memory>
 #include <string>
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/rpc/metadata/client_metadata.h"
 
 namespace mongo {
@@ -45,7 +44,8 @@ class Client;
  * been received by the specified Client object.
  */
 class ClientMetadataIsMasterState {
-    MONGO_DISALLOW_COPYING(ClientMetadataIsMasterState);
+    ClientMetadataIsMasterState(const ClientMetadataIsMasterState&) = delete;
+    ClientMetadataIsMasterState& operator=(const ClientMetadataIsMasterState&) = delete;
 
 public:
     ClientMetadataIsMasterState() = default;
diff --git a/src/mongo/rpc/op_msg.h b/src/mongo/rpc/op_msg.h
index 763b674ec50..86bfa8d130e 100644
--- a/src/mongo/rpc/op_msg.h
+++ b/src/mongo/rpc/op_msg.h
@@ -160,7 +160,8 @@ struct OpMsgRequest : public OpMsg {
  * sent.
  */
 class OpMsgBuilder {
-    MONGO_DISALLOW_COPYING(OpMsgBuilder);
+    OpMsgBuilder(const OpMsgBuilder&) = delete;
+    OpMsgBuilder& operator=(const OpMsgBuilder&) = delete;
 
 public:
     OpMsgBuilder() {
@@ -282,7 +283,8 @@ private:
  * docSeq.done(); // Or just let it go out of scope.
  */
 class OpMsgBuilder::DocSequenceBuilder {
-    MONGO_DISALLOW_COPYING(DocSequenceBuilder);
+    DocSequenceBuilder(const DocSequenceBuilder&) = delete;
+    DocSequenceBuilder& operator=(const DocSequenceBuilder&) = delete;
 
 public:
     DocSequenceBuilder(DocSequenceBuilder&& other)
diff --git a/src/mongo/rpc/reply_builder_interface.h b/src/mongo/rpc/reply_builder_interface.h
index 8cc520cb24d..d7eb747fa30 100644
--- a/src/mongo/rpc/reply_builder_interface.h
+++ b/src/mongo/rpc/reply_builder_interface.h
@@ -31,7 +31,6 @@
 
 #include <memory>
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/base/status.h"
 #include "mongo/bson/util/builder.h"
 #include "mongo/rpc/op_msg.h"
@@ -48,7 +47,8 @@ namespace rpc {
  * Constructs an RPC Reply.
  */
 class ReplyBuilderInterface {
-    MONGO_DISALLOW_COPYING(ReplyBuilderInterface);
+    ReplyBuilderInterface(const ReplyBuilderInterface&) = delete;
+    ReplyBuilderInterface& operator=(const ReplyBuilderInterface&) = delete;
 
 public:
     virtual ~ReplyBuilderInterface() = default;
diff --git a/src/mongo/rpc/reply_interface.h b/src/mongo/rpc/reply_interface.h
index d4d7c650756..13380051d9b 100644
--- a/src/mongo/rpc/reply_interface.h
+++ b/src/mongo/rpc/reply_interface.h
@@ -29,7 +29,6 @@
 
 #pragma once
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/rpc/protocol.h"
 
 namespace mongo {
@@ -42,7 +41,8 @@ namespace rpc {
  * An immutable view of an RPC Reply.
  */
 class ReplyInterface {
-    MONGO_DISALLOW_COPYING(ReplyInterface);
+    ReplyInterface(const ReplyInterface&) = delete;
+    ReplyInterface& operator=(const ReplyInterface&) = delete;
 
 public:
     virtual ~ReplyInterface() = default;
diff --git a/src/mongo/rpc/unique_message.h b/src/mongo/rpc/unique_message.h
index e9245e1dc84..8cc59bddae2 100644
--- a/src/mongo/rpc/unique_message.h
+++ b/src/mongo/rpc/unique_message.h
@@ -32,7 +32,6 @@
 #include <memory>
 #include <utility>
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/rpc/message.h"
 #include "mongo/rpc/reply_interface.h"
 
@@ -44,7 +43,8 @@ namespace rpc {
  */
 template <typename MessageViewType>
 class UniqueMessage {
-    MONGO_DISALLOW_COPYING(UniqueMessage);
+    UniqueMessage(const UniqueMessage&) = delete;
+    UniqueMessage& operator=(const UniqueMessage&) = delete;
 
 public:
     UniqueMessage(Message message, std::unique_ptr<MessageViewType> view)