diff --git a/src/hotspot/share/asm/assembler.hpp b/src/hotspot/share/asm/assembler.hpp
index 202cba10c5d53..10fa79eb30a12 100644
--- a/src/hotspot/share/asm/assembler.hpp
+++ b/src/hotspot/share/asm/assembler.hpp
@@ -91,7 +91,7 @@ class Label {
   int _patch_index;
   GrowableArray<int>* _patch_overflow;
 
-  Label(const Label&) { ShouldNotReachHere(); }
+  NONCOPYABLE(Label);
  protected:
 
   // The label will be bound to a location near its users.
diff --git a/src/hotspot/share/classfile/stackMapTableFormat.hpp b/src/hotspot/share/classfile/stackMapTableFormat.hpp
index 59fa03cdeb440..eac9c8fd19c3f 100644
--- a/src/hotspot/share/classfile/stackMapTableFormat.hpp
+++ b/src/hotspot/share/classfile/stackMapTableFormat.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -41,11 +41,11 @@ class verification_type_info {
   address tag_addr() const { return (address)this; }
   address cpool_index_addr() const { return tag_addr() + sizeof(u1); }
   address bci_addr() const { return cpool_index_addr(); }
+  NONCOPYABLE(verification_type_info);
 
  protected:
   // No constructors  - should be 'private', but GCC issues a warning if it is
   verification_type_info() {}
-  verification_type_info(const verification_type_info&) {}
 
  public:
 
@@ -169,12 +169,13 @@ FOR_EACH_STACKMAP_FRAME_TYPE(SM_FORWARD_DECL, x, x)
 #undef SM_FORWARD_DECL
 
 class stack_map_frame {
+  NONCOPYABLE(stack_map_frame);
+
  protected:
   address frame_type_addr() const { return (address)this; }
 
   // No constructors  - should be 'private', but GCC issues a warning if it is
   stack_map_frame() {}
-  stack_map_frame(const stack_map_frame&) {}
 
  public:
 
@@ -901,11 +902,11 @@ class stack_map_table {
   address entries_addr() const {
     return number_of_entries_addr() + sizeof(u2);
   }
+  NONCOPYABLE(stack_map_table);
 
  protected:
   // No constructors  - should be 'private', but GCC issues a warning if it is
   stack_map_table() {}
-  stack_map_table(const stack_map_table&) {}
 
  public:
 
@@ -933,11 +934,11 @@ class stack_map_table_attribute {
       return name_index_addr() + sizeof(u2); }
   address stack_map_table_addr() const {
       return attribute_length_addr() + sizeof(u4); }
+  NONCOPYABLE(stack_map_table_attribute);
 
  protected:
   // No constructors  - should be 'private', but GCC issues a warning if it is
   stack_map_table_attribute() {}
-  stack_map_table_attribute(const stack_map_table_attribute&) {}
 
  public:
 
diff --git a/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.hpp b/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.hpp
index e88d710ab7984..b1c26972c2163 100644
--- a/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.hpp
+++ b/src/hotspot/share/gc/shenandoah/shenandoahReferenceProcessor.hpp
@@ -82,13 +82,11 @@ class ShenandoahRefProcThreadLocal : public CHeapObj<mtGC> {
   Counters _encountered_count;
   Counters _discovered_count;
   Counters _enqueued_count;
+  NONCOPYABLE(ShenandoahRefProcThreadLocal);
 
 public:
   ShenandoahRefProcThreadLocal();
 
-  ShenandoahRefProcThreadLocal(const ShenandoahRefProcThreadLocal&) = delete; // non construction-copyable
-  ShenandoahRefProcThreadLocal& operator=(const ShenandoahRefProcThreadLocal&) = delete; // non copyable
-
   void reset();
 
   ShenandoahMarkRefsSuperClosure* mark_closure() const {
diff --git a/src/hotspot/share/logging/logMessageBuffer.hpp b/src/hotspot/share/logging/logMessageBuffer.hpp
index 632f18b303b0b..a7f94ecf72d49 100644
--- a/src/hotspot/share/logging/logMessageBuffer.hpp
+++ b/src/hotspot/share/logging/logMessageBuffer.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,8 +54,7 @@ class LogMessageBuffer : public StackObj {
 
  private:
   // Forbid copy assignment and copy constructor.
-  void operator=(const LogMessageBuffer& ref) {}
-  LogMessageBuffer(const LogMessageBuffer& ref) {}
+  NONCOPYABLE(LogMessageBuffer);
 
  public:
   LogMessageBuffer();
diff --git a/src/hotspot/share/opto/node.hpp b/src/hotspot/share/opto/node.hpp
index 092614f18e704..5f4402157a19f 100644
--- a/src/hotspot/share/opto/node.hpp
+++ b/src/hotspot/share/opto/node.hpp
@@ -220,8 +220,7 @@ class Node {
   friend class VMStructs;
 
   // Lots of restrictions on cloning Nodes
-  Node(const Node&);            // not defined; linker error to use these
-  Node &operator=(const Node &rhs);
+  NONCOPYABLE(Node);
 
 public:
   friend class Compile;
diff --git a/src/hotspot/share/utilities/formatBuffer.hpp b/src/hotspot/share/utilities/formatBuffer.hpp
index f4b680fef0cc7..92ce9528457cb 100644
--- a/src/hotspot/share/utilities/formatBuffer.hpp
+++ b/src/hotspot/share/utilities/formatBuffer.hpp
@@ -62,7 +62,7 @@ class FormatBuffer : public FormatBufferBase {
   int size() { return bufsz; }
 
  private:
-  FormatBuffer(const FormatBuffer &); // prevent copies
+  NONCOPYABLE(FormatBuffer);
   char _buffer[bufsz];
 
  protected: