6 files changed, 16 insertions, 11 deletions
diff --git a/src/mongo/db/exec/delete.h b/src/mongo/db/exec/delete.h
index b36067d0bd1..139239d9de0 100644
--- a/src/mongo/db/exec/delete.h
+++ b/src/mongo/db/exec/delete.h
@@ -95,7 +95,8 @@ struct DeleteStageParams {
  * had the replication coordinator approve the write).
  */
 class DeleteStage final : public RequiresMutableCollectionStage {
-    MONGO_DISALLOW_COPYING(DeleteStage);
+    DeleteStage(const DeleteStage&) = delete;
+    DeleteStage& operator=(const DeleteStage&) = delete;
 
 public:
     DeleteStage(OperationContext* opCtx,
diff --git a/src/mongo/db/exec/plan_stats.h b/src/mongo/db/exec/plan_stats.h
index fb66bd4431e..da1f5b998d1 100644
--- a/src/mongo/db/exec/plan_stats.h
+++ b/src/mongo/db/exec/plan_stats.h
@@ -34,7 +34,6 @@
 #include <string>
 #include <vector>
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/db/index/multikey_paths.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/query/stage_types.h"
@@ -133,7 +132,8 @@ struct PlanStageStats {
     std::vector<std::unique_ptr<PlanStageStats>> children;
 
 private:
-    MONGO_DISALLOW_COPYING(PlanStageStats);
+    PlanStageStats(const PlanStageStats&) = delete;
+    PlanStageStats& operator=(const PlanStageStats&) = delete;
 };
 
 struct AndHashStats : public SpecificStats {
diff --git a/src/mongo/db/exec/scoped_timer.h b/src/mongo/db/exec/scoped_timer.h
index 660bb8d7daa..33ddb192873 100644
--- a/src/mongo/db/exec/scoped_timer.h
+++ b/src/mongo/db/exec/scoped_timer.h
@@ -29,7 +29,6 @@
 
 #pragma once
 
-#include "mongo/base/disallow_copying.h"
 
 #include "mongo/util/time_support.h"
 
@@ -42,7 +41,8 @@ class ClockSource;
  * construction when it goes out of scope.
  */
 class ScopedTimer {
-    MONGO_DISALLOW_COPYING(ScopedTimer);
+    ScopedTimer(const ScopedTimer&) = delete;
+    ScopedTimer& operator=(const ScopedTimer&) = delete;
 
 public:
     ScopedTimer(ClockSource* cs, long long* counter);
diff --git a/src/mongo/db/exec/subplan.h b/src/mongo/db/exec/subplan.h
index 62ac89d6644..f07d8f5815c 100644
--- a/src/mongo/db/exec/subplan.h
+++ b/src/mongo/db/exec/subplan.h
@@ -132,7 +132,8 @@ private:
      * a particular $or branch.
      */
     struct BranchPlanningResult {
-        MONGO_DISALLOW_COPYING(BranchPlanningResult);
+        BranchPlanningResult(const BranchPlanningResult&) = delete;
+        BranchPlanningResult& operator=(const BranchPlanningResult&) = delete;
 
     public:
         BranchPlanningResult() {}
diff --git a/src/mongo/db/exec/update_stage.h b/src/mongo/db/exec/update_stage.h
index 1a37554bee2..457e9e550d0 100644
--- a/src/mongo/db/exec/update_stage.h
+++ b/src/mongo/db/exec/update_stage.h
@@ -77,7 +77,8 @@ private:
  * Callers of doWork() must be holding a write lock.
  */
 class UpdateStage final : public RequiresMutableCollectionStage {
-    MONGO_DISALLOW_COPYING(UpdateStage);
+    UpdateStage(const UpdateStage&) = delete;
+    UpdateStage& operator=(const UpdateStage&) = delete;
 
 public:
     UpdateStage(OperationContext* opCtx,
diff --git a/src/mongo/db/exec/working_set.h b/src/mongo/db/exec/working_set.h
index 248ab944517..fc6a228036d 100644
--- a/src/mongo/db/exec/working_set.h
+++ b/src/mongo/db/exec/working_set.h
@@ -32,7 +32,6 @@
 #include "boost/optional.hpp"
 #include <vector>
 
-#include "mongo/base/disallow_copying.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/record_id.h"
 #include "mongo/db/storage/snapshot.h"
@@ -51,7 +50,8 @@ typedef size_t WorkingSetID;
  * from the working set, or mutate elements in the working set.
  */
 class WorkingSet {
-    MONGO_DISALLOW_COPYING(WorkingSet);
+    WorkingSet(const WorkingSet&) = delete;
+    WorkingSet& operator=(const WorkingSet&) = delete;
 
 public:
     static const WorkingSetID INVALID_ID = WorkingSetID(-1);
@@ -208,7 +208,8 @@ enum WorkingSetComputedDataType {
  * Data that is a computed function of a WSM.
  */
 class WorkingSetComputedData {
-    MONGO_DISALLOW_COPYING(WorkingSetComputedData);
+    WorkingSetComputedData(const WorkingSetComputedData&) = delete;
+    WorkingSetComputedData& operator=(const WorkingSetComputedData&) = delete;
 
 public:
     WorkingSetComputedData(const WorkingSetComputedDataType type) : _type(type) {}
@@ -234,7 +235,8 @@ private:
  * A WorkingSetMember may have any of the data above.
  */
 class WorkingSetMember {
-    MONGO_DISALLOW_COPYING(WorkingSetMember);
+    WorkingSetMember(const WorkingSetMember&) = delete;
+    WorkingSetMember& operator=(const WorkingSetMember&) = delete;
 
 public:
     WorkingSetMember();