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>

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 \

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"
 

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"
 

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"

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"

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"

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"

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"

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"
 

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>

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"

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"

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"

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.  */

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 ""

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);
 

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"

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"
 

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);
 

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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";

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"

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"

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"

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"

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"

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

gdb/gdbcmd.h

@@ -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) */

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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

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"

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"

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"

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"

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"

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>

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"

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"

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"

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"

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"
 
 

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

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;

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"

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"

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"

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"

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"

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"

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"

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"

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"