gdb: remove gdbcmd.husers/simark/try-remove-gdbcmd.h

Most files including gdbcmd.h currently rely on it to access things
actually declared in cli/cli-cmds.h (setlist, showlist, etc).  To make
things easy, replace all includes of gdbcmd.h with includes of
cli/cli-cmds.h.  This might lead to some unused includes of
cli/cli-cmds.h, but it's harmless, and much faster than going through
the 170 or so files by hand.

Change-Id: I11f884d4d616c12c05f395c98bbc2892950fb00f

176 files changed, 163 insertions, 207 deletions

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 618c5bbb339..cb19de69372 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1384,7 +1384,6 @@ HFILES_NO_SRCDIR = \
 	gdb_vfork.h \
 	gdb_wchar.h \
 	gdbarch.h \
-	gdbcmd.h \
 	gdbcore.h \
 	gdbthread.h \
 	gdbtypes.h \
diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c
index 297f56cdbf1..4b2a0ba9f7b 100644
--- a/gdb/aarch64-linux-nat.c
+++ b/gdb/aarch64-linux-nat.c
@@ -25,7 +25,7 @@
 #include "linux-nat.h"
 #include "target-descriptions.h"
 #include "auxv.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "aarch64-nat.h"
 #include "aarch64-tdep.h"
 #include "aarch64-linux-tdep.h"
diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index a01ae39d25c..8d0553f3d7c 100644
--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -22,7 +22,7 @@
 #include "extract-store-integer.h"
 #include "frame.h"
 #include "language.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbcore.h"
 #include "dis-asm.h"
 #include "regcache.h"
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index e33a746da9e..0b430428fb4 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -25,7 +25,7 @@
 #include "frame.h"
 #include "symtab.h"
 #include "gdbtypes.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "expression.h"
 #include "parser-defs.h"
 #include "language.h"
diff --git a/gdb/ada-tasks.c b/gdb/ada-tasks.c
index 547395d36d6..83059d72070 100644
--- a/gdb/ada-tasks.c
+++ b/gdb/ada-tasks.c
@@ -17,7 +17,7 @@
 
 #include "extract-store-integer.h"
 #include "observable.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "target.h"
 #include "ada-lang.h"
 #include "gdbcore.h"
diff --git a/gdb/agent.c b/gdb/agent.c
index 00e75458a79..7a2a8e56d28 100644
--- a/gdb/agent.c
+++ b/gdb/agent.c
@@ -16,7 +16,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "target.h"
 #include "gdbsupport/agent.h"
 #include "observable.h"
diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c
index 0fe87b2b080..a14173b373d 100644
--- a/gdb/aix-thread.c
+++ b/gdb/aix-thread.c
@@ -43,7 +43,7 @@
 #include "target.h"
 #include "inferior.h"
 #include "regcache.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "ppc-tdep.h"
 #include "observable.h"
 #include "objfiles.h"
diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
index ada8afd3725..fa042b252b0 100644
--- a/gdb/alpha-tdep.c
+++ b/gdb/alpha-tdep.c
@@ -25,7 +25,7 @@
 #include "inferior.h"
 #include "symtab.h"
 #include "value.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbcore.h"
 #include "dis-asm.h"
 #include "symfile.h"
diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
index 053067e2cf2..df6b882a3fb 100644
--- a/gdb/amd64-tdep.c
+++ b/gdb/amd64-tdep.c
@@ -30,7 +30,7 @@
 #include "frame-unwind.h"
 #include "inferior.h"
 #include "infrun.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbcore.h"
 #include "objfiles.h"
 #include "regcache.h"
diff --git a/gdb/arc-tdep.c b/gdb/arc-tdep.c
index f35f4c4be74..9491107ecff 100644
--- a/gdb/arc-tdep.c
+++ b/gdb/arc-tdep.c
@@ -29,7 +29,7 @@
 #include "gdbcore.h"
 #include "inferior.h"
 #include "reggroups.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "objfiles.h"
 #include "osabi.h"
 #include "prologue-value.h"
diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index b8a18a58af2..78145656b8d 100644
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -20,7 +20,7 @@
 
 #include "arch-utils.h"
 #include "extract-store-integer.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "inferior.h"
 #include "infrun.h"
 #include "regcache.h"
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 97728d9100c..f36ce631a08 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -25,7 +25,7 @@
 #include "language.h"
 #include "inferior.h"
 #include "infrun.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbcore.h"
 #include "dis-asm.h"
 #include "disasm.h"
diff --git a/gdb/auto-load.c b/gdb/auto-load.c
index db6d6ae0f73..afc98eb1f58 100644
--- a/gdb/auto-load.c
+++ b/gdb/auto-load.c
@@ -27,7 +27,6 @@
 #include "observable.h"
 #include "objfiles.h"
 #include "cli/cli-script.h"
-#include "gdbcmd.h"
 #include "cli/cli-cmds.h"
 #include "cli/cli-decode.h"
 #include "cli/cli-setshow.h"
diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
index 68b2646d202..1e39f851bac 100644
--- a/gdb/avr-tdep.c
+++ b/gdb/avr-tdep.c
@@ -27,7 +27,7 @@
 #include "frame-unwind.h"
 #include "frame-base.h"
 #include "trad-frame.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbcore.h"
 #include "gdbtypes.h"
 #include "inferior.h"
diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c
index ae0992a298a..ab5e80029e2 100644
--- a/gdb/ax-gdb.c
+++ b/gdb/ax-gdb.c
@@ -24,7 +24,7 @@
 #include "value.h"
 #include "expression.h"
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "frame.h"
 #include "target.h"
 #include "ax.h"
diff --git a/gdb/blockframe.c b/gdb/blockframe.c
index b7c751300cb..55e82fb4b19 100644
--- a/gdb/blockframe.c
+++ b/gdb/blockframe.c
@@ -30,7 +30,7 @@
 #include "regcache.h"
 #include "dummy-frame.h"
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "block.h"
 #include "inline-frame.h"
 
diff --git a/gdb/bpf-tdep.c b/gdb/bpf-tdep.c
index 098a08aa7e7..79a442068b5 100644
--- a/gdb/bpf-tdep.c
+++ b/gdb/bpf-tdep.c
@@ -24,7 +24,7 @@
 #include "trad-frame.h"
 #include "symtab.h"
 #include "value.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "breakpoint.h"
 #include "inferior.h"
 #include "regcache.h"
diff --git a/gdb/break-catch-sig.c b/gdb/break-catch-sig.c
index f077fa29a0c..72a5ebcdddb 100644
--- a/gdb/break-catch-sig.c
+++ b/gdb/break-catch-sig.c
@@ -20,7 +20,7 @@
 #include "arch-utils.h"
 #include <ctype.h>
 #include "breakpoint.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "inferior.h"
 #include "infrun.h"
 #include "annotate.h"
diff --git a/gdb/break-catch-syscall.c b/gdb/break-catch-syscall.c
index a0e6e6788fe..52ae60b65fb 100644
--- a/gdb/break-catch-syscall.c
+++ b/gdb/break-catch-syscall.c
@@ -19,7 +19,7 @@
 
 #include <ctype.h>
 #include "breakpoint.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "inferior.h"
 #include "cli/cli-utils.h"
 #include "annotate.h"
diff --git a/gdb/break-catch-throw.c b/gdb/break-catch-throw.c
index ce614ac8fe3..9a35ede1df6 100644
--- a/gdb/break-catch-throw.c
+++ b/gdb/break-catch-throw.c
@@ -20,7 +20,7 @@
 #include "arch-utils.h"
 #include <ctype.h>
 #include "breakpoint.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "inferior.h"
 #include "annotate.h"
 #include "valprint.h"
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 03e073d7879..b321baeb3be 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -28,7 +28,7 @@
 #include "gdbtypes.h"
 #include "expression.h"
 #include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "value.h"
 #include "command.h"
 #include "inferior.h"
diff --git a/gdb/bt-utils.c b/gdb/bt-utils.c
index cbca4a9b7b8..f658ce0d4bc 100644
--- a/gdb/bt-utils.c
+++ b/gdb/bt-utils.c
@@ -17,7 +17,7 @@
 
 #include "bt-utils.h"
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "ui.h"
 #include "cli/cli-decode.h"
 
diff --git a/gdb/btrace.c b/gdb/btrace.c
index 04ae3fd0b5e..66f20ee3fad 100644
--- a/gdb/btrace.c
+++ b/gdb/btrace.c
@@ -30,7 +30,7 @@
 #include "filenames.h"
 #include "regcache.h"
 #include "gdbsupport/rsp-low.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "cli/cli-utils.h"
 #include "gdbarch.h"
 
diff --git a/gdb/charset.c b/gdb/charset.c
index 4c1debef614..2ad83d7241b 100644
--- a/gdb/charset.c
+++ b/gdb/charset.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "charset.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbsupport/gdb_obstack.h"
 #include "gdbsupport/gdb_wait.h"
 #include "charset-list.h"
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 3afe2178199..476138a9747 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -22,7 +22,6 @@
 #include "completer.h"
 #include "target.h"
 #include "gdbsupport/gdb_wait.h"
-#include "gdbcmd.h"
 #include "gdbsupport/gdb_regex.h"
 #include "gdb_vfork.h"
 #include "linespec.h"
diff --git a/gdb/cli/cli-logging.c b/gdb/cli/cli-logging.c
index 2b357288585..2c54ceafb3e 100644
--- a/gdb/cli/cli-logging.c
+++ b/gdb/cli/cli-logging.c
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "ui-out.h"
 #include "interps.h"
 #include "cli/cli-style.h"
diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c
index 03e0a2e43e3..329f780f916 100644
--- a/gdb/cli/cli-script.c
+++ b/gdb/cli/cli-script.c
@@ -30,7 +30,6 @@
 #include "cli/cli-decode.h"
 #include "cli/cli-script.h"
 #include "cli/cli-style.h"
-#include "gdbcmd.h"
 
 #include "extension.h"
 #include "interps.h"
diff --git a/gdb/coff-pe-read.c b/gdb/coff-pe-read.c
index 43700d96ec3..0da4f12f04f 100644
--- a/gdb/coff-pe-read.c
+++ b/gdb/coff-pe-read.c
@@ -28,7 +28,7 @@
 #include "gdbtypes.h"
 
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "symtab.h"
 #include "symfile.h"
 #include "objfiles.h"
diff --git a/gdb/compile/compile-cplus-symbols.c b/gdb/compile/compile-cplus-symbols.c
index c95c86f3775..9b95cddbf24 100644
--- a/gdb/compile/compile-cplus-symbols.c
+++ b/gdb/compile/compile-cplus-symbols.c
@@ -31,7 +31,7 @@
 #include "gdbtypes.h"
 #include "dwarf2/loc.h"
 #include "cp-support.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "compile-c.h"
 #include "inferior.h"
 
diff --git a/gdb/compile/compile-cplus-types.c b/gdb/compile/compile-cplus-types.c
index 212db680482..8d14114372a 100644
--- a/gdb/compile/compile-cplus-types.c
+++ b/gdb/compile/compile-cplus-types.c
@@ -29,7 +29,7 @@
 #include "cp-abi.h"
 #include "objfiles.h"
 #include "block.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "c-lang.h"
 #include "compile-c.h"
 #include <algorithm>
diff --git a/gdb/compile/compile-object-load.c b/gdb/compile/compile-object-load.c
index d1b5d5947a6..08e30be9d31 100644
--- a/gdb/compile/compile-object-load.c
+++ b/gdb/compile/compile-object-load.c
@@ -24,7 +24,7 @@
 #include "gdbcore.h"
 #include "readline/tilde.h"
 #include "bfdlink.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "regcache.h"
 #include "inferior.h"
 #include "gdbthread.h"
diff --git a/gdb/compile/compile.c b/gdb/compile/compile.c
index 2d97a1b2005..88531a21781 100644
--- a/gdb/compile/compile.c
+++ b/gdb/compile/compile.c
@@ -24,7 +24,7 @@
 #include "cli/cli-utils.h"
 #include "cli/cli-option.h"
 #include "completer.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "compile.h"
 #include "compile-internal.h"
 #include "compile-object-load.h"
diff --git a/gdb/complaints.c b/gdb/complaints.c
index 7dd5205adf8..debafde794b 100644
--- a/gdb/complaints.c
+++ b/gdb/complaints.c
@@ -19,7 +19,7 @@
 
 #include "complaints.h"
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "run-on-main-thread.h"
 #include "top.h"
 #include "gdbsupport/selftest.h"
diff --git a/gdb/completer.c b/gdb/completer.c
index 171d1ca8c0e..f1f44109bdc 100644
--- a/gdb/completer.c
+++ b/gdb/completer.c
@@ -34,7 +34,7 @@
 
 /* FIXME: This is needed because of lookup_cmd_1 ().  We should be
    calling a hook instead so we eliminate the CLI dependency.  */
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 
 /* Needed for rl_completer_word_break_characters and for
    rl_filename_completion_function.  */
diff --git a/gdb/copying.awk b/gdb/copying.awk
index 0babd834269..7a450d46c80 100644
--- a/gdb/copying.awk
+++ b/gdb/copying.awk
@@ -7,7 +7,7 @@ BEGIN	{
 	  print "   Modify copying.awk instead.  <== */";
 	  print ""
 	  print "#include \"command.h\""
-	  print "#include \"gdbcmd.h\""
+	  print "#include \"cli/cli-cmds.h\""
 	  print ""
 	  print "static void show_copying_command (const char *, int);"
 	  print ""
diff --git a/gdb/copying.c b/gdb/copying.c
index bc45fe0dc3a..af465e599d1 100644
--- a/gdb/copying.c
+++ b/gdb/copying.c
@@ -3,7 +3,7 @@
    Modify copying.awk instead.  <== */
 
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 
 static void show_copying_command (const char *, int);
 
diff --git a/gdb/corefile.c b/gdb/corefile.c
index 8caf3bff383..044c084ab6f 100644
--- a/gdb/corefile.c
+++ b/gdb/corefile.c
@@ -24,7 +24,7 @@
 #include "inferior.h"
 #include "symtab.h"
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "bfd.h"
 #include "target.h"
 #include "gdbcore.h"
diff --git a/gdb/corelow.c b/gdb/corelow.c
index bdda742ef59..a710b07f968 100644
--- a/gdb/corelow.c
+++ b/gdb/corelow.c
@@ -50,7 +50,7 @@
 #include "debuginfod-support.h"
 #include <unordered_map>
 #include <unordered_set>
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "xml-tdesc.h"
 #include "memtag.h"
 
diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c
index a813b4ad15c..3167b745b49 100644
--- a/gdb/cp-abi.c
+++ b/gdb/cp-abi.c
@@ -21,7 +21,7 @@
 #include "value.h"
 #include "cp-abi.h"
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "ui-out.h"
 static struct cp_abi_ops *find_cp_abi (const char *short_name);
 
diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index 5fd53094d05..4f8a6f25d53 100644
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -21,7 +21,7 @@
 #include "cp-support.h"
 #include "language.h"
 #include "demangle.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "dictionary.h"
 #include "objfiles.h"
 #include "frame.h"
diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index ae28882e178..2634c1e33a6 100644
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -25,7 +25,7 @@
 #include "expression.h"
 #include "value.h"
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "demangle.h"
 #include "annotate.h"
 #include "c-lang.h"
diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c
index 8ca9fbc5251..4c8ae77cc86 100644
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -30,7 +30,7 @@
 #include "inferior.h"
 #include "gdbtypes.h"
 #include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "target.h"
 #include "value.h"
 #include "opcode/cris.h"
diff --git a/gdb/csky-tdep.c b/gdb/csky-tdep.c
index 49aa1f68012..1b6c08eb730 100644
--- a/gdb/csky-tdep.c
+++ b/gdb/csky-tdep.c
@@ -25,7 +25,7 @@
 #include "inferior.h"
 #include "symtab.h"
 #include "value.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "language.h"
 #include "gdbcore.h"
 #include "symfile.h"
diff --git a/gdb/darwin-nat-info.c b/gdb/darwin-nat-info.c
index 3d3e47c998a..121c3a58388 100644
--- a/gdb/darwin-nat-info.c
+++ b/gdb/darwin-nat-info.c
@@ -31,7 +31,7 @@
 #include "gdbtypes.h"
 #include "gdbcore.h"
 #include "value.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "inferior.h"
 #include "gdbarch.h"
 
diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c
index 33896a88d2b..c70cd44bb7f 100644
--- a/gdb/darwin-nat.c
+++ b/gdb/darwin-nat.c
@@ -25,7 +25,7 @@
 #include "symfile.h"
 #include "symtab.h"
 #include "objfiles.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbcore.h"
 #include "gdbthread.h"
 #include "regcache.h"
diff --git a/gdb/dcache.c b/gdb/dcache.c
index ae08f3518c1..2f40d2721c8 100644
--- a/gdb/dcache.c
+++ b/gdb/dcache.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "dcache.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbcore.h"
 #include "target-dcache.h"
 #include "inferior.h"
diff --git a/gdb/disasm.c b/gdb/disasm.c
index e54b8521dde..16736e54997 100644
--- a/gdb/disasm.c
+++ b/gdb/disasm.c
@@ -24,7 +24,7 @@
 #include "ui-out.h"
 #include "disasm.h"
 #include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "dis-asm.h"
 #include "source.h"
 #include "gdbsupport/gdb-safe-ctype.h"
diff --git a/gdb/dummy-frame.c b/gdb/dummy-frame.c
index 7d72fe032ee..9f540d02f1a 100644
--- a/gdb/dummy-frame.c
+++ b/gdb/dummy-frame.c
@@ -24,7 +24,7 @@
 #include "inferior.h"
 #include "frame-unwind.h"
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "observable.h"
 #include "gdbthread.h"
 #include "infcall.h"
diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c
index 3f812285995..aeb688b13ee 100644
--- a/gdb/dwarf2/index-write.c
+++ b/gdb/dwarf2/index-write.c
@@ -34,7 +34,7 @@
 #include "dwarf2/read.h"
 #include "dwarf2/dwz.h"
 #include "gdb/gdb-index.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "objfiles.h"
 #include "ada-lang.h"
 #include "dwarf2/tag.h"
diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c
index 23c57bde939..9db5fc1492d 100644
--- a/gdb/dwarf2/loc.c
+++ b/gdb/dwarf2/loc.c
@@ -31,7 +31,7 @@
 #include "regcache.h"
 #include "objfiles.h"
 #include "block.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "complaints.h"
 #include "dwarf2.h"
 #include "dwarf2/expr.h"
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 501d6c0c992..7eacafc25b5 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -62,7 +62,7 @@
 #include "cp-support.h"
 #include "hashtab.h"
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "block.h"
 #include "addrmap.h"
 #include "typeprint.h"
diff --git a/gdb/event-top.c b/gdb/event-top.c
index 2fcbad6b937..0425bcf9f99 100644
--- a/gdb/event-top.c
+++ b/gdb/event-top.c
@@ -35,7 +35,7 @@
 #include "main.h"
 #include "gdbthread.h"
 #include "observable.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "annotate.h"
 #include "maint.h"
 #include "ser-event.h"
diff --git a/gdb/exec.c b/gdb/exec.c
index 98ad81fb99a..3d392b198a1 100644
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -20,7 +20,7 @@
 #include "frame.h"
 #include "inferior.h"
 #include "target.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "language.h"
 #include "filenames.h"
 #include "symfile.h"
diff --git a/gdb/f-lang.c b/gdb/f-lang.c
index 5eeb22806bb..58f35bf0f3f 100644
--- a/gdb/f-lang.c
+++ b/gdb/f-lang.c
@@ -35,7 +35,7 @@
 #include "c-lang.h"
 #include "target-float.h"
 #include "gdbarch.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "f-array-walker.h"
 #include "f-exp.h"
 
diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c
index 2d1bb5a3368..6da32a4a50b 100644
--- a/gdb/fbsd-nat.c
+++ b/gdb/fbsd-nat.c
@@ -25,7 +25,7 @@
 #include "regcache.h"
 #include "regset.h"
 #include "gdbarch.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbthread.h"
 #include "gdbsupport/buildargv.h"
 #include "gdbsupport/gdb_wait.h"
diff --git a/gdb/filesystem.c b/gdb/filesystem.c
index 4e05b0413a8..564bc1c6c2b 100644
--- a/gdb/filesystem.c
+++ b/gdb/filesystem.c
@@ -19,7 +19,7 @@
 
 #include "filesystem.h"
 #include "gdbarch.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "inferior.h"
 
 const char file_system_kind_auto[] = "auto";
diff --git a/gdb/findcmd.c b/gdb/findcmd.c
index 2915c706733..a802efe0005 100644
--- a/gdb/findcmd.c
+++ b/gdb/findcmd.c
@@ -19,7 +19,7 @@
 
 #include "arch-utils.h"
 #include <ctype.h>
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "value.h"
 #include "target.h"
 #include "cli/cli-utils.h"
diff --git a/gdb/fork-child.c b/gdb/fork-child.c
index e0891296f8c..539b11695d9 100644
--- a/gdb/fork-child.c
+++ b/gdb/fork-child.c
@@ -20,7 +20,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "inferior.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "terminal.h"
 #include "gdbthread.h"
 #include "ui.h"
diff --git a/gdb/frame.c b/gdb/frame.c
index 0232bdb6865..43efac07d95 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -34,7 +34,7 @@
 #include "frame-unwind.h"
 #include "frame-base.h"
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "observable.h"
 #include "objfiles.h"
 #include "gdbthread.h"
diff --git a/gdb/ft32-tdep.c b/gdb/ft32-tdep.c
index 8f7aa51b58a..647c5844151 100644
--- a/gdb/ft32-tdep.c
+++ b/gdb/ft32-tdep.c
@@ -23,7 +23,7 @@
 #include "frame-base.h"
 #include "symtab.h"
 #include "gdbtypes.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbcore.h"
 #include "value.h"
 #include "inferior.h"
diff --git a/gdb/gdb-demangle.c b/gdb/gdb-demangle.c
index 7779beb591d..ed5aca23701 100644
--- a/gdb/gdb-demangle.c
+++ b/gdb/gdb-demangle.c
@@ -25,7 +25,7 @@
 
 #include "cli/cli-utils.h"
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "demangle.h"
 #include "gdb-demangle.h"
 #include "language.h"
diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c
index 6e97b216813..6d7b7fa84e5 100644
--- a/gdb/gdb_bfd.c
+++ b/gdb/gdb_bfd.c
@@ -20,7 +20,7 @@
 #include "gdb_bfd.h"
 #include "event-top.h"
 #include "ui-out.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "hashtab.h"
 #include "gdbsupport/filestuff.h"
 #ifdef HAVE_MMAP
diff --git a/gdb/gdbcmd.h b/gdb/gdbcmd.h
deleted file mode 100644
index a2e256665b5..00000000000
--- a/gdb/gdbcmd.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ***DEPRECATED***  The gdblib files must not be calling/using things in any
-   of the possible command languages.  If necessary, a hook (that may be
-   present or not) must be used and set to the appropriate routine by any
-   command language that cares about it.  If you are having to include this
-   file you are possibly doing things the old way.  This file will disappear.
-   fnasser@redhat.com    */
-
-/* Header file for GDB-specific command-line stuff.
-   Copyright (C) 1986-2024 Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#if !defined (GDBCMD_H)
-#define GDBCMD_H 1
-
-#include "command.h"
-#include "ui-out.h"
-#include "cli/cli-script.h"
-#include "cli/cli-cmds.h"
-
-#endif /* !defined (GDBCMD_H) */
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 1e1a7e9ce61..5b3c5ac8a02 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -30,7 +30,7 @@
 #include "value.h"
 #include "demangle.h"
 #include "complaints.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "cp-abi.h"
 #include "hashtab.h"
 #include "cp-support.h"
diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index 92b2858bd9d..198fc42c217 100644
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -64,7 +64,7 @@ extern "C"
 #include "target.h"
 #include "gdbsupport/gdb_wait.h"
 #include "gdbarch.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbcore.h"
 #include "gdbthread.h"
 #include "gdbsupport/gdb_obstack.h"
diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c
index 1d8c16fa71c..386c73ce26b 100644
--- a/gdb/go32-nat.c
+++ b/gdb/go32-nat.c
@@ -91,7 +91,7 @@
 #include "gdbsupport/gdb_wait.h"
 #include "gdbcore.h"
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "floatformat.h"
 #include "buildsym-legacy.h"
 #include "i387-tdep.h"
diff --git a/gdb/guile/guile.c b/gdb/guile/guile.c
index f540659d647..dbbb96edfa8 100644
--- a/gdb/guile/guile.c
+++ b/gdb/guile/guile.c
@@ -25,7 +25,6 @@
 #include "cli/cli-script.h"
 #include "cli/cli-utils.h"
 #include "command.h"
-#include "gdbcmd.h"
 #include "top.h"
 #include "ui.h"
 #include "extension-priv.h"
diff --git a/gdb/guile/scm-auto-load.c b/gdb/guile/scm-auto-load.c
index 90c4eedb925..57550fa9239 100644
--- a/gdb/guile/scm-auto-load.c
+++ b/gdb/guile/scm-auto-load.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "top.h"
-#include "gdbcmd.h"
 #include "objfiles.h"
 #include "cli/cli-cmds.h"
 #include "auto-load.h"
diff --git a/gdb/guile/scm-breakpoint.c b/gdb/guile/scm-breakpoint.c
index a32862b0349..b8a5d82afa6 100644
--- a/gdb/guile/scm-breakpoint.c
+++ b/gdb/guile/scm-breakpoint.c
@@ -22,7 +22,7 @@
 
 #include "value.h"
 #include "breakpoint.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbthread.h"
 #include "observable.h"
 #include "cli/cli-script.h"
diff --git a/gdb/guile/scm-cmd.c b/gdb/guile/scm-cmd.c
index d75d2b63c8c..2a5507686b0 100644
--- a/gdb/guile/scm-cmd.c
+++ b/gdb/guile/scm-cmd.c
@@ -22,7 +22,7 @@
 
 #include <ctype.h>
 #include "charset.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "cli/cli-decode.h"
 #include "completer.h"
 #include "guile-internal.h"
diff --git a/gdb/guile/scm-param.c b/gdb/guile/scm-param.c
index 018bd1499c9..3a1e1583f54 100644
--- a/gdb/guile/scm-param.c
+++ b/gdb/guile/scm-param.c
@@ -19,7 +19,7 @@
 
 #include "value.h"
 #include "charset.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "cli/cli-decode.h"
 #include "completer.h"
 #include "language.h"
diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index be8ea579893..c15a9fcc03f 100644
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -35,7 +35,7 @@
 #include "frame-base.h"
 
 #include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbtypes.h"
 #include "objfiles.h"
 #include "hppa-tdep.h"
diff --git a/gdb/i386-darwin-nat.c b/gdb/i386-darwin-nat.c
index acfa46a8b7d..59655996565 100644
--- a/gdb/i386-darwin-nat.c
+++ b/gdb/i386-darwin-nat.c
@@ -24,7 +24,7 @@
 #include "symfile.h"
 #include "symtab.h"
 #include "objfiles.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "regcache.h"
 #include "i386-tdep.h"
 #include "i387-tdep.h"
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 4b1c60ee924..f1f909e1616 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -28,7 +28,7 @@
 #include "frame-unwind.h"
 #include "inferior.h"
 #include "infrun.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbcore.h"
 #include "gdbtypes.h"
 #include "objfiles.h"
diff --git a/gdb/infcall.c b/gdb/infcall.c
index 86f50044d6d..23d5652dd21 100644
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -28,7 +28,7 @@
 #include "gdbcore.h"
 #include "language.h"
 #include "objfiles.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "command.h"
 #include "dummy-frame.h"
 #include "ada-lang.h"
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 10a964a90d7..0309658690c 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -25,7 +25,7 @@
 #include "infrun.h"
 #include "gdbsupport/environ.h"
 #include "value.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "symfile.h"
 #include "gdbcore.h"
 #include "target.h"
diff --git a/gdb/inferior.c b/gdb/inferior.c
index 5621ea40a6d..0522cb5c14d 100644
--- a/gdb/inferior.c
+++ b/gdb/inferior.c
@@ -22,7 +22,7 @@
 #include "target.h"
 #include "command.h"
 #include "completer.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbthread.h"
 #include "ui-out.h"
 #include "observable.h"
diff --git a/gdb/inflow.c b/gdb/inflow.c
index ac71e262a1f..773ac0ba499 100644
--- a/gdb/inflow.c
+++ b/gdb/inflow.c
@@ -28,7 +28,7 @@
 #include <fcntl.h>
 #include "gdbsupport/gdb_select.h"
 
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
 #endif
diff --git a/gdb/interps.c b/gdb/interps.c
index 36d96eea514..94a982e97ab 100644
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -29,7 +29,7 @@
    the readline command interface, and it is probably simpler to just let
    them take over the input in their resume proc.  */
 
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "ui-out.h"
 #include "gdbsupport/event-loop.h"
 #include "event-top.h"
diff --git a/gdb/jit.c b/gdb/jit.c
index 92cac0d342a..797be95a8da 100644
--- a/gdb/jit.c
+++ b/gdb/jit.c
@@ -27,7 +27,7 @@
 #include "dictionary.h"
 #include "filenames.h"
 #include "frame-unwind.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbcore.h"
 #include "inferior.h"
 #include "observable.h"
diff --git a/gdb/language.c b/gdb/language.c
index e43e0fe7a17..be6a1e89fd3 100644
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -32,7 +32,7 @@
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "value.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "expression.h"
 #include "language.h"
 #include "varobj.h"
diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c
index 867cb187c8a..319a13fd480 100644
--- a/gdb/linux-fork.c
+++ b/gdb/linux-fork.c
@@ -22,7 +22,7 @@
 #include "inferior.h"
 #include "infrun.h"
 #include "regcache.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "infcall.h"
 #include "objfiles.h"
 #include "linux-fork.h"
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 55cab41bb61..c357ca3ab8b 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -32,7 +32,7 @@
 #include "nat/linux-personality.h"
 #include "linux-fork.h"
 #include "gdbthread.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "regcache.h"
 #include "regset.h"
 #include "inf-child.h"
diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c
index b967580a643..8e6ac87f5a1 100644
--- a/gdb/linux-tdep.c
+++ b/gdb/linux-tdep.c
@@ -34,7 +34,7 @@
 #include "observable.h"
 #include "objfiles.h"
 #include "infcall.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbsupport/gdb_regex.h"
 #include "gdbsupport/enum-flags.h"
 #include <optional>
diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c
index 65bf4a79fdf..81a9c0d22a7 100644
--- a/gdb/linux-thread-db.c
+++ b/gdb/linux-thread-db.c
@@ -23,7 +23,7 @@
 #include "gdbsupport/gdb_vecs.h"
 #include "bfd.h"
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbthread.h"
 #include "inferior.h"
 #include "infrun.h"
diff --git a/gdb/m32r-tdep.c b/gdb/m32r-tdep.c
index e2129409c19..f2f8602f23c 100644
--- a/gdb/m32r-tdep.c
+++ b/gdb/m32r-tdep.c
@@ -23,7 +23,7 @@
 #include "frame-base.h"
 #include "symtab.h"
 #include "gdbtypes.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbcore.h"
 #include "value.h"
 #include "inferior.h"
diff --git a/gdb/m68hc11-tdep.c b/gdb/m68hc11-tdep.c
index e117d8e2919..e58e44b7fd2 100644
--- a/gdb/m68hc11-tdep.c
+++ b/gdb/m68hc11-tdep.c
@@ -28,7 +28,7 @@
 #include "trad-frame.h"
 #include "symtab.h"
 #include "gdbtypes.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbcore.h"
 #include "value.h"
 #include "inferior.h"
diff --git a/gdb/machoread.c b/gdb/machoread.c
index b65694e697d..be68e454f64 100644
--- a/gdb/machoread.c
+++ b/gdb/machoread.c
@@ -23,7 +23,7 @@
 #include "bfd.h"
 #include "symfile.h"
 #include "objfiles.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbcore.h"
 #include "mach-o.h"
 #include "aout/stab_gnu.h"
diff --git a/gdb/macrocmd.c b/gdb/macrocmd.c
index ddabfede0f5..bf7e43a8530 100644
--- a/gdb/macrocmd.c
+++ b/gdb/macrocmd.c
@@ -24,7 +24,7 @@
 #include "cli/cli-style.h"
 #include "cli/cli-utils.h"
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "linespec.h"
 
 
diff --git a/gdb/maint-test-options.c b/gdb/maint-test-options.c
index f671771f3b3..48b68f91084 100644
--- a/gdb/maint-test-options.c
+++ b/gdb/maint-test-options.c
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "cli/cli-option.h"
 
 /* This file defines three "maintenance test-options" subcommands to
diff --git a/gdb/maint-test-settings.c b/gdb/maint-test-settings.c
index 61456911589..1aaacc22edb 100644
--- a/gdb/maint-test-settings.c
+++ b/gdb/maint-test-settings.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 
 /* Command list for "maint set test-settings".  */
 static cmd_list_element *maintenance_set_test_settings_list;
diff --git a/gdb/maint.c b/gdb/maint.c
index 6a5a55afebf..d0916347f94 100644
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -25,7 +25,6 @@
 #include <cmath>
 #include <signal.h>
 #include "command.h"
-#include "gdbcmd.h"
 #include "symtab.h"
 #include "block.h"
 #include "gdbtypes.h"
diff --git a/gdb/memattr.c b/gdb/memattr.c
index 062611e8ee6..735068e5a46 100644
--- a/gdb/memattr.c
+++ b/gdb/memattr.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "memattr.h"
 #include "target.h"
 #include "target-dcache.h"
diff --git a/gdb/mep-tdep.c b/gdb/mep-tdep.c
index 7d87d641008..913889ecfb2 100644
--- a/gdb/mep-tdep.c
+++ b/gdb/mep-tdep.c
@@ -25,7 +25,7 @@
 #include "frame-base.h"
 #include "symtab.h"
 #include "gdbtypes.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbcore.h"
 #include "value.h"
 #include "inferior.h"
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 7f8a34ba18f..a758b689ae7 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -50,7 +50,7 @@
 #include "ada-lang.h"
 #include "linespec.h"
 #include "extension.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "observable.h"
 #include <optional>
 #include "gdbsupport/byte-vector.h"
diff --git a/gdb/microblaze-linux-tdep.c b/gdb/microblaze-linux-tdep.c
index 999a3bc2712..49cdfc60134 100644
--- a/gdb/microblaze-linux-tdep.c
+++ b/gdb/microblaze-linux-tdep.c
@@ -22,7 +22,7 @@
 #include "symtab.h"
 #include "target.h"
 #include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "symfile.h"
 #include "objfiles.h"
 #include "regcache.h"
diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c
index 8d045c69c10..3d768d7e161 100644
--- a/gdb/microblaze-tdep.c
+++ b/gdb/microblaze-tdep.c
@@ -24,7 +24,7 @@
 #include "trad-frame.h"
 #include "symtab.h"
 #include "value.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "breakpoint.h"
 #include "inferior.h"
 #include "regcache.h"
diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
index 97ec72e5d73..3d072ea935c 100644
--- a/gdb/mips-linux-nat.c
+++ b/gdb/mips-linux-nat.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "inferior.h"
 #include "mips-tdep.h"
 #include "target.h"
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 0abac41e3f9..ae58d7c8720 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -25,7 +25,7 @@
 #include "inferior.h"
 #include "symtab.h"
 #include "value.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "language.h"
 #include "gdbcore.h"
 #include "symfile.h"
diff --git a/gdb/moxie-tdep.c b/gdb/moxie-tdep.c
index 3bfde1be665..29ad1f2bb2e 100644
--- a/gdb/moxie-tdep.c
+++ b/gdb/moxie-tdep.c
@@ -23,7 +23,7 @@
 #include "frame-base.h"
 #include "symtab.h"
 #include "gdbtypes.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbcore.h"
 #include "value.h"
 #include "inferior.h"
diff --git a/gdb/nios2-tdep.c b/gdb/nios2-tdep.c
index 956eb023eb9..130c0154a60 100644
--- a/gdb/nios2-tdep.c
+++ b/gdb/nios2-tdep.c
@@ -29,7 +29,7 @@
 #include "inferior.h"
 #include "gdbtypes.h"
 #include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "osabi.h"
 #include "target.h"
 #include "dis-asm.h"
diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c
index b36816898a5..61b444d4e17 100644
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -35,7 +35,7 @@
 #include "objfiles.h"
 #include "target.h"
 #include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "frame.h"
 #include "gdbsupport/gdb_regex.h"
 #include "regcache.h"
diff --git a/gdb/observable.c b/gdb/observable.c
index 0527cc68e2c..7816d214ad8 100644
--- a/gdb/observable.c
+++ b/gdb/observable.c
@@ -19,7 +19,7 @@
 
 #include "observable.h"
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 
 namespace gdb
 {
diff --git a/gdb/or1k-tdep.c b/gdb/or1k-tdep.c
index db74b590f18..290f748cc56 100644
--- a/gdb/or1k-tdep.c
+++ b/gdb/or1k-tdep.c
@@ -21,7 +21,7 @@
 #include "inferior.h"
 #include "symtab.h"
 #include "value.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "language.h"
 #include "gdbcore.h"
 #include "symfile.h"
diff --git a/gdb/osabi.c b/gdb/osabi.c
index 016c203f47f..d494d899623 100644
--- a/gdb/osabi.c
+++ b/gdb/osabi.c
@@ -20,7 +20,7 @@
 
 #include "osabi.h"
 #include "arch-utils.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "command.h"
 #include "gdb_bfd.h"
 
diff --git a/gdb/osdata.c b/gdb/osdata.c
index 6dea1003cd2..e4d9b0bef97 100644
--- a/gdb/osdata.c
+++ b/gdb/osdata.c
@@ -21,7 +21,7 @@
 #include "xml-support.h"
 #include "osdata.h"
 #include "ui-out.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 
 #if !defined(HAVE_LIBEXPAT)
 
diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
index 87c0c35cb99..bdb9524d969 100644
--- a/gdb/p-valprint.c
+++ b/gdb/p-valprint.c
@@ -26,7 +26,7 @@
 #include "expression.h"
 #include "value.h"
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbcore.h"
 #include "demangle.h"
 #include "valprint.h"
diff --git a/gdb/parse.c b/gdb/parse.c
index fecaa81c318..0a2b2a5b2ab 100644
--- a/gdb/parse.c
+++ b/gdb/parse.c
@@ -39,7 +39,7 @@
 #include "command.h"
 #include "language.h"
 #include "parser-defs.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "symfile.h"
 #include "inferior.h"
 #include "target-float.h"
diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c
index e70eb2e8b66..e1000452390 100644
--- a/gdb/ppc-linux-tdep.c
+++ b/gdb/ppc-linux-tdep.c
@@ -23,7 +23,7 @@
 #include "symtab.h"
 #include "target.h"
 #include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "symfile.h"
 #include "objfiles.h"
 #include "regcache.h"
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 25e391b15d5..1d6a4922b8e 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -28,7 +28,7 @@
 #include "c-lang.h"
 #include "expression.h"
 #include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "target.h"
 #include "breakpoint.h"
 #include "demangle.h"
diff --git a/gdb/proc-api.c b/gdb/proc-api.c
index 0d3f389afdb..55e3919b978 100644
--- a/gdb/proc-api.c
+++ b/gdb/proc-api.c
@@ -24,7 +24,7 @@
  * Pretty-print trace of api calls to the /proc api
  */
 
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "completer.h"
 
 #include <sys/types.h>
diff --git a/gdb/procfs.c b/gdb/procfs.c
index d61340420e7..b5bda4dfb85 100644
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -26,7 +26,7 @@
 #include "target.h"
 #include "gdbcore.h"
 #include "elf-bfd.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbthread.h"
 #include "regcache.h"
 #include "inf-child.h"
diff --git a/gdb/progspace.c b/gdb/progspace.c
index c3a9909dcd4..0deca3f2376 100644
--- a/gdb/progspace.c
+++ b/gdb/progspace.c
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "objfiles.h"
 #include "arch-utils.h"
 #include "gdbcore.h"
diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index 8edadf3a335..20822c3101e 100644
--- a/gdb/psymtab.c
+++ b/gdb/psymtab.c
@@ -32,7 +32,7 @@
 #include "dictionary.h"
 #include "language.h"
 #include "cp-support.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include <algorithm>
 #include <set>
 #include "gdbsupport/buildargv.h"
diff --git a/gdb/python/py-auto-load.c b/gdb/python/py-auto-load.c
index 8a3327b3722..9548973285c 100644
--- a/gdb/python/py-auto-load.c
+++ b/gdb/python/py-auto-load.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "top.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "objfiles.h"
 #include "python.h"
 #include "auto-load.h"
diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c
index cd9ef3093c1..da74d69d357 100644
--- a/gdb/python/py-breakpoint.c
+++ b/gdb/python/py-breakpoint.c
@@ -22,7 +22,7 @@
 #include "python.h"
 #include "charset.h"
 #include "breakpoint.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbthread.h"
 #include "observable.h"
 #include "cli/cli-script.h"
diff --git a/gdb/python/py-cmd.c b/gdb/python/py-cmd.c
index f18a8e8eaa9..f83b45dd210 100644
--- a/gdb/python/py-cmd.c
+++ b/gdb/python/py-cmd.c
@@ -22,7 +22,7 @@
 #include "value.h"
 #include "python-internal.h"
 #include "charset.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "cli/cli-decode.h"
 #include "completer.h"
 #include "language.h"
diff --git a/gdb/python/py-function.c b/gdb/python/py-function.c
index 077396cb93e..2bbfb9d3a6d 100644
--- a/gdb/python/py-function.c
+++ b/gdb/python/py-function.c
@@ -21,7 +21,7 @@
 #include "value.h"
 #include "python-internal.h"
 #include "charset.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "cli/cli-decode.h"
 #include "completer.h"
 #include "expression.h"
diff --git a/gdb/python/py-param.c b/gdb/python/py-param.c
index ba837566343..621f85da3f8 100644
--- a/gdb/python/py-param.c
+++ b/gdb/python/py-param.c
@@ -21,7 +21,7 @@
 #include "value.h"
 #include "python-internal.h"
 #include "charset.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "cli/cli-decode.h"
 #include "completer.h"
 #include "language.h"
diff --git a/gdb/python/py-record-btrace.c b/gdb/python/py-record-btrace.c
index 8c34add0d77..36454fc669f 100644
--- a/gdb/python/py-record-btrace.c
+++ b/gdb/python/py-record-btrace.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbthread.h"
 #include "btrace.h"
 #include "py-record.h"
diff --git a/gdb/python/py-unwind.c b/gdb/python/py-unwind.c
index 58bcf40e1c9..a86ccd2c94e 100644
--- a/gdb/python/py-unwind.c
+++ b/gdb/python/py-unwind.c
@@ -20,7 +20,7 @@
 #include "arch-utils.h"
 #include "frame-unwind.h"
 #include "gdbsupport/gdb_obstack.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "language.h"
 #include "observable.h"
 #include "python-internal.h"
diff --git a/gdb/python/python.c b/gdb/python/python.c
index a6875af63db..8121e5d6f2a 100644
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -21,7 +21,7 @@
 #include "command.h"
 #include "ui-out.h"
 #include "cli/cli-script.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "progspace.h"
 #include "objfiles.h"
 #include "value.h"
diff --git a/gdb/ravenscar-thread.c b/gdb/ravenscar-thread.c
index 55d54f4bdf1..1957f3ca2e3 100644
--- a/gdb/ravenscar-thread.c
+++ b/gdb/ravenscar-thread.c
@@ -26,7 +26,7 @@
 #include "command.h"
 #include "ravenscar-thread.h"
 #include "observable.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "top.h"
 #include "regcache.h"
 #include "objfiles.h"
diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c
index aac59ee6a6d..9fec6112755 100644
--- a/gdb/record-btrace.c
+++ b/gdb/record-btrace.c
@@ -23,7 +23,7 @@
 #include "record-btrace.h"
 #include "gdbthread.h"
 #include "target.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "disasm.h"
 #include "observable.h"
 #include "cli/cli-utils.h"
diff --git a/gdb/record-full.c b/gdb/record-full.c
index d288eb957fe..c51aadfef33 100644
--- a/gdb/record-full.c
+++ b/gdb/record-full.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "extract-store-integer.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "regcache.h"
 #include "gdbthread.h"
 #include "inferior.h"
diff --git a/gdb/record.c b/gdb/record.c
index 2059fb7ea0c..b25445713fd 100644
--- a/gdb/record.c
+++ b/gdb/record.c
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "completer.h"
 #include "record.h"
 #include "observable.h"
diff --git a/gdb/regcache-dump.c b/gdb/regcache-dump.c
index 33205a4241d..bc665dc08a6 100644
--- a/gdb/regcache-dump.c
+++ b/gdb/regcache-dump.c
@@ -15,7 +15,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "regcache.h"
 #include "gdbsupport/def-vector.h"
 #include "valprint.h"
diff --git a/gdb/regcache.c b/gdb/regcache.c
index 0e754ec5437..f04354d822f 100644
--- a/gdb/regcache.c
+++ b/gdb/regcache.c
@@ -24,7 +24,6 @@
 #include "test-target.h"
 #include "scoped-mock-context.h"
 #include "gdbarch.h"
-#include "gdbcmd.h"
 #include "regcache.h"
 #include "reggroups.h"
 #include "observable.h"
diff --git a/gdb/reggroups.c b/gdb/reggroups.c
index 8fb21bd7622..b2ac62c62b1 100644
--- a/gdb/reggroups.c
+++ b/gdb/reggroups.c
@@ -24,7 +24,7 @@
 #include "gdbtypes.h"
 #include "regcache.h"
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbsupport/gdb_obstack.h"
 
 /* See reggroups.h.  */
diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c
index bdb3c22b692..b15824637a9 100644
--- a/gdb/remote-fileio.c
+++ b/gdb/remote-fileio.c
@@ -21,7 +21,7 @@
 
 #include "event-top.h"
 #include "extract-store-integer.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "remote.h"
 #include "gdbsupport/gdb_wait.h"
 #include <sys/stat.h>
diff --git a/gdb/remote-notif.c b/gdb/remote-notif.c
index 9acf3f8dc78..d16f8d76dff 100644
--- a/gdb/remote-notif.c
+++ b/gdb/remote-notif.c
@@ -38,7 +38,7 @@
 #include "target.h"
 #include "inferior.h"
 #include "infrun.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "async-event.h"
 
 bool notif_debug = false;
diff --git a/gdb/remote.c b/gdb/remote.c
index cfb54de157d..c1a6c137dd4 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -27,7 +27,7 @@
 #include "symfile.h"
 #include "target.h"
 #include "process-stratum-target.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "objfiles.h"
 #include "gdbthread.h"
 #include "remote.h"
diff --git a/gdb/riscv-tdep.c b/gdb/riscv-tdep.c
index 89091689f6e..d592d2dc0c4 100644
--- a/gdb/riscv-tdep.c
+++ b/gdb/riscv-tdep.c
@@ -22,7 +22,7 @@
 #include "inferior.h"
 #include "symtab.h"
 #include "value.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "language.h"
 #include "gdbcore.h"
 #include "symfile.h"
diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index e0698928dc8..2edb8234e6b 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -24,7 +24,7 @@
 #include "symtab.h"
 #include "target.h"
 #include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "objfiles.h"
 #include "arch-utils.h"
 #include "regcache.h"
diff --git a/gdb/s12z-tdep.c b/gdb/s12z-tdep.c
index 29d4ef3b71c..c24c75665ed 100644
--- a/gdb/s12z-tdep.c
+++ b/gdb/s12z-tdep.c
@@ -24,7 +24,7 @@
 #include "gdbsupport/errors.h"
 #include "frame-unwind.h"
 #include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "inferior.h"
 #include "opcode/s12z.h"
 #include "trad-frame.h"
diff --git a/gdb/s390-linux-nat.c b/gdb/s390-linux-nat.c
index 6bb84b2ff69..6b2b6f1bf31 100644
--- a/gdb/s390-linux-nat.c
+++ b/gdb/s390-linux-nat.c
@@ -28,7 +28,7 @@
 #include "gregset.h"
 #include "regset.h"
 #include "nat/linux-ptrace.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbarch.h"
 
 #include "s390-tdep.h"
diff --git a/gdb/ser-go32.c b/gdb/ser-go32.c
index ae71f73cce9..2802a44241b 100644
--- a/gdb/ser-go32.c
+++ b/gdb/ser-go32.c
@@ -21,7 +21,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "serial.h"
 /*
  * NS16550 UART registers
diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c
index 6efc2457bdb..18d91232241 100644
--- a/gdb/ser-tcp.c
+++ b/gdb/ser-tcp.c
@@ -20,7 +20,7 @@
 #include "serial.h"
 #include "ser-base.h"
 #include "ser-tcp.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "cli/cli-decode.h"
 #include "cli/cli-setshow.h"
 #include "gdbsupport/filestuff.h"
diff --git a/gdb/ser-unix.c b/gdb/ser-unix.c
index db1464f8f6e..02845aa938b 100644
--- a/gdb/ser-unix.c
+++ b/gdb/ser-unix.c
@@ -28,7 +28,7 @@
 #include "gdbsupport/gdb_sys_time.h"
 
 #include "gdbsupport/gdb_select.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbsupport/filestuff.h"
 #include <termios.h>
 #include "gdbsupport/scoped_ignore_sigttou.h"
diff --git a/gdb/serial.c b/gdb/serial.c
index aeab7ebcfb0..f96668abacc 100644
--- a/gdb/serial.c
+++ b/gdb/serial.c
@@ -19,7 +19,7 @@
 
 #include <ctype.h>
 #include "serial.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "cli/cli-utils.h"
 
 /* Is serial being debugged?  */
diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
index efbe1564767..0a3b50702d9 100644
--- a/gdb/sh-tdep.c
+++ b/gdb/sh-tdep.c
@@ -27,7 +27,7 @@
 #include "dwarf2/frame.h"
 #include "symtab.h"
 #include "gdbtypes.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbcore.h"
 #include "value.h"
 #include "dis-asm.h"
diff --git a/gdb/skip.c b/gdb/skip.c
index 9b8a56cadef..4dff5c5a9e5 100644
--- a/gdb/skip.c
+++ b/gdb/skip.c
@@ -21,7 +21,7 @@
 #include "valprint.h"
 #include "ui-out.h"
 #include "symtab.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "command.h"
 #include "completer.h"
 #include "stack.h"
diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c
index 7c17601d560..77740fed5d9 100644
--- a/gdb/sol-thread.c
+++ b/gdb/sol-thread.c
@@ -57,7 +57,7 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <dlfcn.h>
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbcore.h"
 #include "regcache.h"
 #include "solib.h"
diff --git a/gdb/source.c b/gdb/source.c
index 432301e2a71..24a8769da91 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -22,7 +22,7 @@
 #include "language.h"
 #include "command.h"
 #include "source.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "frame.h"
 #include "value.h"
 #include "gdbsupport/filestuff.h"
diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c
index 0eaaf506b3c..7d44b1e16a0 100644
--- a/gdb/sparc64-tdep.c
+++ b/gdb/sparc64-tdep.c
@@ -67,7 +67,7 @@
 
 #include <algorithm>
 #include "cli/cli-utils.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "auxv.h"
 
 #define MAX_PROC_NAME_SIZE sizeof("/proc/99999/lwp/9999/adi/lstatus")
diff --git a/gdb/stack.c b/gdb/stack.c
index fae1fce1c39..c2323e1726d 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -26,7 +26,7 @@
 #include "expression.h"
 #include "language.h"
 #include "frame.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbcore.h"
 #include "target.h"
 #include "source.h"
diff --git a/gdb/stap-probe.c b/gdb/stap-probe.c
index 8646f874dcc..9558351f93d 100644
--- a/gdb/stap-probe.c
+++ b/gdb/stap-probe.c
@@ -24,7 +24,7 @@
 #include "objfiles.h"
 #include "arch-utils.h"
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "filenames.h"
 #include "value.h"
 #include "ax.h"
diff --git a/gdb/symfile-debug.c b/gdb/symfile-debug.c
index bc70447600e..86c7010b2d2 100644
--- a/gdb/symfile-debug.c
+++ b/gdb/symfile-debug.c
@@ -25,7 +25,7 @@
    and then if the function returns a result printing a message after it
    returns.  */
 
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "objfiles.h"
 #include "observable.h"
 #include "source.h"
diff --git a/gdb/symfile-mem.c b/gdb/symfile-mem.c
index 87fcc076986..ec50ec4e33c 100644
--- a/gdb/symfile-mem.c
+++ b/gdb/symfile-mem.c
@@ -44,7 +44,7 @@
 #include "symtab.h"
 #include "gdbcore.h"
 #include "objfiles.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "target.h"
 #include "value.h"
 #include "symfile.h"
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 883f1c0b050..7ebb07d5394 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -31,7 +31,7 @@
 #include "symfile.h"
 #include "objfiles.h"
 #include "source.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "breakpoint.h"
 #include "language.h"
 #include "complaints.h"
diff --git a/gdb/symmisc.c b/gdb/symmisc.c
index 70435996a8e..f5f4865cb62 100644
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -34,7 +34,7 @@
 #include <sys/stat.h>
 #include "dictionary.h"
 #include "typeprint.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "source.h"
 #include "readline/tilde.h"
 #include <cli/cli-style.h>
diff --git a/gdb/symtab.c b/gdb/symtab.c
index 63b780bb66e..aa27d446898 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -27,7 +27,6 @@
 #include "value.h"
 #include "symfile.h"
 #include "objfiles.h"
-#include "gdbcmd.h"
 #include "gdbsupport/gdb_regex.h"
 #include "expression.h"
 #include "language.h"
diff --git a/gdb/target-dcache.c b/gdb/target-dcache.c
index 7c6bcd8d18c..6a51bc6c8b1 100644
--- a/gdb/target-dcache.c
+++ b/gdb/target-dcache.c
@@ -16,7 +16,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "target-dcache.h"
-#include "gdbcmd.h"
 #include "progspace.h"
 #include "cli/cli-cmds.h"
 
diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c
index 8aca5cf719b..4f210441623 100644
--- a/gdb/target-descriptions.c
+++ b/gdb/target-descriptions.c
@@ -20,7 +20,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "arch-utils.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbtypes.h"
 #include "reggroups.h"
 #include "target.h"
diff --git a/gdb/target.c b/gdb/target.c
index 091dc4cc8ac..a5c92a8a511 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -22,7 +22,7 @@
 #include "target.h"
 #include "extract-store-integer.h"
 #include "target-dcache.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "symtab.h"
 #include "inferior.h"
 #include "infrun.h"
diff --git a/gdb/thread.c b/gdb/thread.c
index 43c28be384f..4ee46936861 100644
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -29,7 +29,7 @@
 #include "target.h"
 #include "gdbthread.h"
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "regcache.h"
 #include "btrace.h"
 
diff --git a/gdb/tic6x-tdep.c b/gdb/tic6x-tdep.c
index ac6e291bacc..6732478eb09 100644
--- a/gdb/tic6x-tdep.c
+++ b/gdb/tic6x-tdep.c
@@ -29,7 +29,7 @@
 #include "inferior.h"
 #include "gdbtypes.h"
 #include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "target.h"
 #include "dis-asm.h"
 #include "regcache.h"
diff --git a/gdb/tilegx-tdep.c b/gdb/tilegx-tdep.c
index 70a956139a3..92f2be0b208 100644
--- a/gdb/tilegx-tdep.c
+++ b/gdb/tilegx-tdep.c
@@ -25,7 +25,7 @@
 #include "trad-frame.h"
 #include "symtab.h"
 #include "gdbtypes.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbcore.h"
 #include "value.h"
 #include "dis-asm.h"
diff --git a/gdb/top.c b/gdb/top.c
index ee45f48b4fd..b93ef0a69b5 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbcmd.h"
 #include "cli/cli-cmds.h"
 #include "cli/cli-script.h"
 #include "cli/cli-setshow.h"
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 0c0a94573bb..e9bcbfdd5b3 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -23,7 +23,7 @@
 #include "frame.h"
 #include "gdbtypes.h"
 #include "expression.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "value.h"
 #include "target.h"
 #include "target-dcache.h"
diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index 88e1c5a3410..8db26918123 100644
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -24,7 +24,7 @@
 #include "tui/tui-data.h"
 #include "symtab.h"
 #include "gdbtypes.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "frame.h"
 #include "regcache.h"
 #include "inferior.h"
diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index ced7e254f50..8f4c7ecc595 100644
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -33,7 +33,6 @@
 #include "top.h"
 #include "source.h"
 #include "gdbsupport/event-loop.h"
-#include "gdbcmd.h"
 #include "async-event.h"
 #include "utils.h"
 
diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c
index 01e8d7cb926..cb21d68e9b6 100644
--- a/gdb/tui/tui.c
+++ b/gdb/tui/tui.c
@@ -20,7 +20,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "event-top.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "tui/tui.h"
 #include "tui/tui-hooks.h"
 #include "tui/tui-command.h"
diff --git a/gdb/typeprint.c b/gdb/typeprint.c
index 4d0e764274a..ccc621ffd54 100644
--- a/gdb/typeprint.c
+++ b/gdb/typeprint.c
@@ -25,7 +25,7 @@
 #include "value.h"
 #include "gdbcore.h"
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "target.h"
 #include "language.h"
 #include "cp-abi.h"
diff --git a/gdb/utils.c b/gdb/utils.c
index 8d7ef7e3ad0..17498e04312 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -37,7 +37,7 @@
 #endif
 
 #include <signal.h>
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "serial.h"
 #include "bfd.h"
 #include "target.h"
diff --git a/gdb/valops.c b/gdb/valops.c
index 8eae7cf7995..a0e945cf155 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -28,7 +28,7 @@
 #include "target.h"
 #include "demangle.h"
 #include "language.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "regcache.h"
 #include "cp-abi.h"
 #include "block.h"
diff --git a/gdb/valprint.c b/gdb/valprint.c
index 21265ada2dd..db8affeb47a 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -23,7 +23,7 @@
 #include "gdbtypes.h"
 #include "value.h"
 #include "gdbcore.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "target.h"
 #include "language.h"
 #include "annotate.h"
diff --git a/gdb/value.c b/gdb/value.c
index 4df19fde304..e71f38b0ce4 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -24,7 +24,7 @@
 #include "value.h"
 #include "gdbcore.h"
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "target.h"
 #include "language.h"
 #include "demangle.h"
diff --git a/gdb/varobj.c b/gdb/varobj.c
index 8ce3cbdd440..0cd0bd03b6e 100644
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -19,7 +19,7 @@
 #include "expression.h"
 #include "frame.h"
 #include "language.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "block.h"
 #include "valprint.h"
 #include "gdbsupport/gdb_regex.h"
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index a53b6a6e053..325c4d11ad8 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -50,7 +50,7 @@
 #include "gdb_bfd.h"
 #include "gdbsupport/gdb_obstack.h"
 #include "gdbthread.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include <unistd.h>
 #include "exec.h"
 #include "solist.h"
diff --git a/gdb/windows-tdep.c b/gdb/windows-tdep.c
index af5ccd1a629..8a29a33042f 100644
--- a/gdb/windows-tdep.c
+++ b/gdb/windows-tdep.c
@@ -24,7 +24,7 @@
 #include "value.h"
 #include "inferior.h"
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbthread.h"
 #include "objfiles.h"
 #include "symfile.h"
diff --git a/gdb/x86-nat.c b/gdb/x86-nat.c
index 5826716a1f8..84c835f8a30 100644
--- a/gdb/x86-nat.c
+++ b/gdb/x86-nat.c
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "x86-nat.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "inferior.h"
 
 #include <unordered_map>
diff --git a/gdb/xml-support.c b/gdb/xml-support.c
index 583e101c25f..b60b2c531a7 100644
--- a/gdb/xml-support.c
+++ b/gdb/xml-support.c
@@ -17,7 +17,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "xml-builtin.h"
 #include "xml-support.h"
 #include "gdbsupport/filestuff.h"
diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c
index a0f6c319b12..766d1d144be 100644
--- a/gdb/xstormy16-tdep.c
+++ b/gdb/xstormy16-tdep.c
@@ -24,7 +24,7 @@
 #include "dwarf2/frame.h"
 #include "symtab.h"
 #include "gdbtypes.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbcore.h"
 #include "value.h"
 #include "dis-asm.h"
diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
index 9dcd3ef06fa..840768b65c7 100644
--- a/gdb/xtensa-tdep.c
+++ b/gdb/xtensa-tdep.c
@@ -37,7 +37,7 @@
 #include "gdbarch.h"
 
 #include "command.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 
 #include "xtensa-isa.h"
 #include "xtensa-tdep.h"
diff --git a/gdb/z80-tdep.c b/gdb/z80-tdep.c
index 530139dbb61..23cdb68e190 100644
--- a/gdb/z80-tdep.c
+++ b/gdb/z80-tdep.c
@@ -24,7 +24,7 @@
 #include "frame-unwind.h"
 #include "frame-base.h"
 #include "trad-frame.h"
-#include "gdbcmd.h"
+#include "cli/cli-cmds.h"
 #include "gdbcore.h"
 #include "gdbtypes.h"
 #include "inferior.h"