diff --git a/src/hb-map-private.hh b/src/hb-map-private.hh
index 0baec0827..ef2ee4667 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 c217af0c0..a540e6afa 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 985950352..4a8f795e4 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 07f8a571f..84a76e69c 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);
 };