diff --git a/src/hb-map-private.hh b/src/hb-map-private.hh
index 0baec0827e3dfc57a8058ef2447e937f528c5346..ef2ee4667a635cbe14f52cdb349dab23eed28dbd 100644
--- a/src/hb-map-private.hh
+++ b/src/hb-map-private.hh
@@ -251,7 +251,7 @@ struct hb_map_t
   }
 
   private:
-  HB_DISALLOW_COPY_AND_ASSIGN (hb_map_t);
+  HB_DISALLOW_ASSIGN (hb_map_t);
 };
 
 
diff --git a/src/hb-ot-shape-private.hh b/src/hb-ot-shape-private.hh
index c217af0c0e062f5f17aaae0500892691f19e7c82..a540e6afaf3e9398eeaa9958894e977445a5f068 100644
--- a/src/hb-ot-shape-private.hh
+++ b/src/hb-ot-shape-private.hh
@@ -99,7 +99,7 @@ struct hb_ot_shape_planner_t
   }
 
   private:
-  HB_DISALLOW_COPY_AND_ASSIGN (hb_ot_shape_planner_t);
+  HB_DISALLOW_ASSIGN (hb_ot_shape_planner_t);
 };
 
 
diff --git a/src/hb-private.hh b/src/hb-private.hh
index 985950352756ae64d655eea274bf8ae519ef8814..4a8f795e465bbdde5b6065aa42040e17a63e92b1 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -537,11 +537,7 @@ _hb_ceil_to_4 (unsigned int v)
  */
 
 #define HB_DISALLOW_ASSIGN(TypeName) \
-  void operator=(const TypeName&) = delete
-
-#define HB_DISALLOW_COPY_AND_ASSIGN(TypeName) \
-  TypeName(const TypeName&) = delete; \
-  void operator=(const TypeName&) = delete
+  void operator=(const TypeName&)
 
 /*
  * Static pools
diff --git a/src/hb-set-private.hh b/src/hb-set-private.hh
index 07f8a571ff0f6f7f95f20246959d70379f682649..84a76e69ccb2f128b2f7f09624d9680db0e70f61 100644
--- a/src/hb-set-private.hh
+++ b/src/hb-set-private.hh
@@ -677,7 +677,7 @@ struct hb_set_t
   inline hb_codepoint_t major_start (unsigned int major) const { return major * page_t::PAGE_BITS; }
 
   private:
-  HB_DISALLOW_COPY_AND_ASSIGN (hb_set_t);
+  HB_DISALLOW_ASSIGN (hb_set_t);
 };