diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3c8379c50dd..8a9507223a5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2021-01-19  Lancelot SIX  <lsix@lancelotsix.com>
+
+	* top.h (switch_thru_all_uis): Use DISABLE_COPY_AND_ASSIGN.
+
 2021-01-19  Luis Machado  <luis.machado@linaro.org>
 
 	* trad-frame.h (trad_frame_saved_reg) <set_value_bytes>: Allocate
diff --git a/gdb/top.h b/gdb/top.h
index a31b19ae954..f58bebbb385 100644
--- a/gdb/top.h
+++ b/gdb/top.h
@@ -173,6 +173,8 @@ public:
     current_ui = ui_list;
   }
 
+  DISABLE_COPY_AND_ASSIGN (switch_thru_all_uis);
+
   /* If done iterating, return true; otherwise return false.  */
   bool done () const
   {
@@ -190,11 +192,6 @@ public:
 
  private:
 
-  /* No need for these.  They are intentionally not defined
-     anywhere.  */
-  switch_thru_all_uis &operator= (const switch_thru_all_uis &);
-  switch_thru_all_uis (const switch_thru_all_uis &);
-
   /* Used to iterate through the UIs.  */
   struct ui *m_iter;