aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@polymtl.ca>2024-04-23 15:22:44 -0400
committerSimon Marchi <simon.marchi@efficios.com>2024-04-25 12:59:02 -0400
commit5b9707eb872ad4cb50c98d396d16f110070a44ca (patch)
tree6a7cb1a70adadf11c1a5e6a52243701970a805c0
parent1863e6a54b31a5cda9b34537b40708232a90416c (diff)
downloadgdb-5b9707eb872ad4cb50c98d396d16f110070a44ca.zip
gdb-5b9707eb872ad4cb50c98d396d16f110070a44ca.tar.gz
gdb-5b9707eb872ad4cb50c98d396d16f110070a44ca.tar.bz2
gdb: 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 Approved-By: Tom Tromey <tom@tromey.com>
-rw-r--r--gdb/Makefile.in1
-rw-r--r--gdb/aarch64-linux-nat.c2
-rw-r--r--gdb/aarch64-tdep.c2
-rw-r--r--gdb/ada-lang.c2
-rw-r--r--gdb/ada-tasks.c2
-rw-r--r--gdb/agent.c2
-rw-r--r--gdb/aix-thread.c2
-rw-r--r--gdb/alpha-tdep.c2
-rw-r--r--gdb/amd64-tdep.c2
-rw-r--r--gdb/arc-tdep.c2
-rw-r--r--gdb/arch-utils.c2
-rw-r--r--gdb/arm-tdep.c2
-rw-r--r--gdb/auto-load.c1
-rw-r--r--gdb/avr-tdep.c2
-rw-r--r--gdb/ax-gdb.c2
-rw-r--r--gdb/blockframe.c2
-rw-r--r--gdb/bpf-tdep.c2
-rw-r--r--gdb/break-catch-sig.c2
-rw-r--r--gdb/break-catch-syscall.c2
-rw-r--r--gdb/break-catch-throw.c2
-rw-r--r--gdb/breakpoint.c2
-rw-r--r--gdb/bt-utils.c2
-rw-r--r--gdb/btrace.c2
-rw-r--r--gdb/charset.c2
-rw-r--r--gdb/cli/cli-cmds.c1
-rw-r--r--gdb/cli/cli-logging.c2
-rw-r--r--gdb/cli/cli-script.c1
-rw-r--r--gdb/coff-pe-read.c2
-rw-r--r--gdb/compile/compile-cplus-symbols.c2
-rw-r--r--gdb/compile/compile-cplus-types.c2
-rw-r--r--gdb/compile/compile-object-load.c2
-rw-r--r--gdb/compile/compile.c2
-rw-r--r--gdb/complaints.c2
-rw-r--r--gdb/completer.c2
-rw-r--r--gdb/copying.awk2
-rw-r--r--gdb/copying.c2
-rw-r--r--gdb/corefile.c2
-rw-r--r--gdb/corelow.c2
-rw-r--r--gdb/cp-abi.c2
-rw-r--r--gdb/cp-support.c2
-rw-r--r--gdb/cp-valprint.c2
-rw-r--r--gdb/cris-tdep.c2
-rw-r--r--gdb/csky-tdep.c2
-rw-r--r--gdb/darwin-nat-info.c2
-rw-r--r--gdb/darwin-nat.c2
-rw-r--r--gdb/dcache.c2
-rw-r--r--gdb/disasm.c2
-rw-r--r--gdb/dummy-frame.c2
-rw-r--r--gdb/dwarf2/index-write.c2
-rw-r--r--gdb/dwarf2/loc.c2
-rw-r--r--gdb/dwarf2/read.c2
-rw-r--r--gdb/event-top.c2
-rw-r--r--gdb/exec.c2
-rw-r--r--gdb/f-lang.c2
-rw-r--r--gdb/fbsd-nat.c2
-rw-r--r--gdb/filesystem.c2
-rw-r--r--gdb/findcmd.c2
-rw-r--r--gdb/fork-child.c2
-rw-r--r--gdb/frame.c2
-rw-r--r--gdb/ft32-tdep.c2
-rw-r--r--gdb/gdb-demangle.c2
-rw-r--r--gdb/gdb_bfd.c2
-rw-r--r--gdb/gdbcmd.h32
-rw-r--r--gdb/gdbtypes.c2
-rw-r--r--gdb/gnu-nat.c2
-rw-r--r--gdb/go32-nat.c2
-rw-r--r--gdb/guile/guile.c1
-rw-r--r--gdb/guile/scm-auto-load.c1
-rw-r--r--gdb/guile/scm-breakpoint.c2
-rw-r--r--gdb/guile/scm-cmd.c2
-rw-r--r--gdb/guile/scm-param.c2
-rw-r--r--gdb/hppa-tdep.c2
-rw-r--r--gdb/i386-darwin-nat.c2
-rw-r--r--gdb/i386-tdep.c2
-rw-r--r--gdb/infcall.c2
-rw-r--r--gdb/infcmd.c2
-rw-r--r--gdb/inferior.c2
-rw-r--r--gdb/inflow.c2
-rw-r--r--gdb/interps.c2
-rw-r--r--gdb/jit.c2
-rw-r--r--gdb/language.c2
-rw-r--r--gdb/linux-fork.c2
-rw-r--r--gdb/linux-nat.c2
-rw-r--r--gdb/linux-tdep.c2
-rw-r--r--gdb/linux-thread-db.c2
-rw-r--r--gdb/m32r-tdep.c2
-rw-r--r--gdb/m68hc11-tdep.c2
-rw-r--r--gdb/machoread.c2
-rw-r--r--gdb/macrocmd.c2
-rw-r--r--gdb/maint-test-options.c2
-rw-r--r--gdb/maint-test-settings.c2
-rw-r--r--gdb/maint.c1
-rw-r--r--gdb/memattr.c2
-rw-r--r--gdb/mep-tdep.c2
-rw-r--r--gdb/mi/mi-main.c2
-rw-r--r--gdb/microblaze-linux-tdep.c2
-rw-r--r--gdb/microblaze-tdep.c2
-rw-r--r--gdb/mips-linux-nat.c2
-rw-r--r--gdb/mips-tdep.c2
-rw-r--r--gdb/moxie-tdep.c2
-rw-r--r--gdb/nios2-tdep.c2
-rw-r--r--gdb/objc-lang.c2
-rw-r--r--gdb/observable.c2
-rw-r--r--gdb/or1k-tdep.c2
-rw-r--r--gdb/osabi.c2
-rw-r--r--gdb/osdata.c2
-rw-r--r--gdb/p-valprint.c2
-rw-r--r--gdb/parse.c2
-rw-r--r--gdb/ppc-linux-tdep.c2
-rw-r--r--gdb/printcmd.c2
-rw-r--r--gdb/proc-api.c2
-rw-r--r--gdb/procfs.c2
-rw-r--r--gdb/progspace.c2
-rw-r--r--gdb/psymtab.c2
-rw-r--r--gdb/python/py-auto-load.c2
-rw-r--r--gdb/python/py-breakpoint.c2
-rw-r--r--gdb/python/py-cmd.c2
-rw-r--r--gdb/python/py-function.c2
-rw-r--r--gdb/python/py-param.c2
-rw-r--r--gdb/python/py-record-btrace.c2
-rw-r--r--gdb/python/py-unwind.c2
-rw-r--r--gdb/python/python.c2
-rw-r--r--gdb/ravenscar-thread.c2
-rw-r--r--gdb/record-btrace.c2
-rw-r--r--gdb/record-full.c2
-rw-r--r--gdb/record.c2
-rw-r--r--gdb/regcache-dump.c2
-rw-r--r--gdb/regcache.c1
-rw-r--r--gdb/reggroups.c2
-rw-r--r--gdb/remote-fileio.c2
-rw-r--r--gdb/remote-notif.c2
-rw-r--r--gdb/remote.c2
-rw-r--r--gdb/riscv-tdep.c2
-rw-r--r--gdb/rs6000-tdep.c2
-rw-r--r--gdb/s12z-tdep.c2
-rw-r--r--gdb/s390-linux-nat.c2
-rw-r--r--gdb/ser-go32.c2
-rw-r--r--gdb/ser-tcp.c2
-rw-r--r--gdb/ser-unix.c2
-rw-r--r--gdb/serial.c2
-rw-r--r--gdb/sh-tdep.c2
-rw-r--r--gdb/skip.c2
-rw-r--r--gdb/sol-thread.c2
-rw-r--r--gdb/source.c2
-rw-r--r--gdb/sparc64-tdep.c2
-rw-r--r--gdb/stack.c2
-rw-r--r--gdb/stap-probe.c2
-rw-r--r--gdb/symfile-debug.c2
-rw-r--r--gdb/symfile-mem.c2
-rw-r--r--gdb/symfile.c2
-rw-r--r--gdb/symmisc.c2
-rw-r--r--gdb/symtab.c1
-rw-r--r--gdb/target-dcache.c1
-rw-r--r--gdb/target-descriptions.c2
-rw-r--r--gdb/target.c2
-rw-r--r--gdb/thread.c2
-rw-r--r--gdb/tic6x-tdep.c2
-rw-r--r--gdb/tilegx-tdep.c2
-rw-r--r--gdb/top.c1
-rw-r--r--gdb/tracepoint.c2
-rw-r--r--gdb/tui/tui-regs.c2
-rw-r--r--gdb/tui/tui-win.c1
-rw-r--r--gdb/tui/tui.c2
-rw-r--r--gdb/typeprint.c2
-rw-r--r--gdb/utils.c2
-rw-r--r--gdb/valops.c2
-rw-r--r--gdb/valprint.c2
-rw-r--r--gdb/value.c2
-rw-r--r--gdb/varobj.c2
-rw-r--r--gdb/windows-nat.c2
-rw-r--r--gdb/windows-tdep.c2
-rw-r--r--gdb/x86-nat.c2
-rw-r--r--gdb/xml-support.c2
-rw-r--r--gdb/xstormy16-tdep.c2
-rw-r--r--gdb/xtensa-tdep.c2
-rw-r--r--gdb/z80-tdep.c2
176 files changed, 163 insertions, 207 deletions
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 618c5bb..cb19de6 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 297f56c..4b2a0ba 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 a01ae39..8d0553f 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 e33a746..0b43042 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 547395d..83059d7 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 00e7545..7a2a8e5 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 0fe87b2..a14173b 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 ada8afd..fa042b2 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 053067e..df6b882 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 f35f4c4..9491107 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 b8a18a5..7814565 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 97728d9..f36ce63 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 db6d6ae..afc98eb 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 68b2646..1e39f85 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 ae0992a..ab5e800 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 b7c7513..55e82fb 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 098a08a..79a4420 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 f077fa2..72a5ebc 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 a0e6e67..52ae60b 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 ce614ac..9a35ede 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 03e073d..b321bae 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 cbca4a9..f658ce0 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 04ae3fd..66f20ee 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 17a9ca8..35e700a 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 3afe217..476138a 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 2b35728..2c54cea 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 03e0a2e..329f780 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 43700d9..0da4f12 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 c95c86f..9b95cdd 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 212db68..8d14114 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 d1b5d59..08e30be 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 2d97a1b..88531a2 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 7dd5205..debafde 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 171d1ca..f1f4410 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 0babd83..7a450d4 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 bc45fe0..af465e5 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 8caf3bf..044c084 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 bdda742..a710b07f 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 a813b4a..3167b74 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 5fd5309..4f8a6f2 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 ae28882..2634c1e 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 8ca9fbc..4c8ae77 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 49aa1f6..1b6c08e 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 3d3e47c..121c3a5 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 33896a8..c70cd44 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 ae08f35..2f40d27 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 e54b852..16736e5 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 7d72fe0..9f540d0 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 3f81228..aeb688b 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 23c57bd..9db5fc1 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 501d6c0..7eacafc 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 2fcbad6..0425bcf 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 98ad81f..3d392b1 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 5eeb228..58f35bf 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 2d1bb5a..6da32a4 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 4e05b04..564bc1c 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 2915c70..a802efe 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 e089129..539b116 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 0232bdb..43efac0 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 8f7aa51..647c584 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 7779beb..ed5aca2 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 6e97b21..6d7b7fa 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 a2e2566..0000000
--- 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 1e1a7e9..5b3c5ac 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 92b2858..198fc42 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 1d8c16f..386c73c 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 f540659..dbbb96e 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 90c4eed..57550fa 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 a32862b..b8a5d82 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 d75d2b6..2a55076 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 018bd14..3a1e158 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 be8ea57..c15a9fc 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 acfa46a..5965599 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 4b1c60e..f1f909e 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 86f5004..23d5652 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 10a964a..0309658 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 5621ea4..0522cb5 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 ac71e26..773ac0b 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 36d96ee..94a982e 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 92cac0d..797be95 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 e43e0fe..be6a1e8 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 867cb18..319a13f 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 55cab41..c357ca3 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 b967580..8e6ac87 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 65bf4a7..81a9c0d 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 e212940..f2f8602 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 e117d8e..e58e44b 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 b65694e..be68e45 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 ddabfed..bf7e43a 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 f671771..48b68f9 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 6145691..1aaacc2 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 6a5a55a..d091634 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 062611e..735068e 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 7d87d64..913889e 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 7f8a34b..a758b68 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 999a3bc..49cdfc6 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 8d045c6..3d768d7 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 97ec72e..3d072ea 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 0abac41..ae58d7c 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 3bfde1be..29ad1f2 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 956eb02..130c015 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 b368168..61b444d 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 0527cc6..7816d21 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 db74b59..290f748 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 016c203..d494d89 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 6dea100..e4d9b0b 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 87c0c35..bdb9524 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 fecaa81..0a2b2a5 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 e70eb2e..e100045 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 25e391b..1d6a492 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 0d3f389..55e3919 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 d613404..b5bda4d 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 c3a9909..0deca3f 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 8edadf3..20822c3 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 8a3327b..9548973 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 cd9ef30..da74d69 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 f18a8e8..f83b45d 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 077396c..2bbfb9d 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 ba83756..621f85d 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 8c34add..36454fc 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 58bcf40..a86ccd2 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 a6875af..8121e5d 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 55d54f4..1957f3c 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 aac59ee..9fec611 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 d288eb9..c51aadf 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 2059fb7..b254457 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 33205a4..bc665dc 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 0e754ec..f04354d 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 8fb21bd..b2ac62c 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 bdb3c22..b158246 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 9acf3f8..d16f8d7 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 cfb54de..c1a6c13 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 8909168..d592d2d 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 e069892..2edb823 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 29d4ef3..c24c756 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 6bb84b2..6b2b6f1 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 ae71f73..2802a44 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 6efc245..18d9123 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 db1464f..02845aa 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 aeab7eb..f96668a 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 efbe156..0a3b507 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 9b8a56c..4dff5c5 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 7c17601..77740fe 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 432301e..24a8769 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 0eaaf50..7d44b1e 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 fae1fce..c2323e1 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 8646f87..9558351 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 bc70447..86c7010 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 87fcc07..ec50ec4 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 883f1c0..7ebb07d 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 7043599..f5f4865 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 6d3732a..58648a8 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 7c6bcd8..6a51bc6 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 8aca5cf..4f21044 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 091dc4c..a5c92a8 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 43c28be..4ee4693 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 ac6e291..6732478 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 70a9561..92f2be0 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 ee45f48..b93ef0a 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 0c0a945..e9bcbfd 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 88e1c5a..8db2691 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 ced7e25..8f4c7ec 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 01e8d7c..cb21d68 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 4d0e764..ccc621f 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 8d7ef7e..17498e0 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 8eae7cf..a0e945c 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 21265ad..db8affe 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 4df19fd..e71f38b 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 8ce3cbd..0cd0bd0 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 a53b6a6..325c4d1 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 af5ccd1..8a29a33 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 5826716..84c835f 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 583e101..b60b2c5 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 a0f6c31..766d1d1 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 9dcd3ef..840768b 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 530139d..23cdb68 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"