+2019-01-25  Tom Tromey  <tom@tromey.com>
+
+       * xtensa-linux-nat.c: Fix common/ includes.
+       * xml-support.h: Fix common/ includes.
+       * xml-support.c: Fix common/ includes.
+       * x86-linux-nat.c: Fix common/ includes.
+       * windows-nat.c: Fix common/ includes.
+       * varobj.h: Fix common/ includes.
+       * varobj.c: Fix common/ includes.
+       * value.c: Fix common/ includes.
+       * valops.c: Fix common/ includes.
+       * utils.c: Fix common/ includes.
+       * unittests/xml-utils-selftests.c: Fix common/ includes.
+       * unittests/utils-selftests.c: Fix common/ includes.
+       * unittests/unpack-selftests.c: Fix common/ includes.
+       * unittests/tracepoint-selftests.c: Fix common/ includes.
+       * unittests/style-selftests.c: Fix common/ includes.
+       * unittests/string_view-selftests.c: Fix common/ includes.
+       * unittests/scoped_restore-selftests.c: Fix common/ includes.
+       * unittests/scoped_mmap-selftests.c: Fix common/ includes.
+       * unittests/scoped_fd-selftests.c: Fix common/ includes.
+       * unittests/rsp-low-selftests.c: Fix common/ includes.
+       * unittests/parse-connection-spec-selftests.c: Fix common/
+       includes.
+       * unittests/optional-selftests.c: Fix common/ includes.
+       * unittests/offset-type-selftests.c: Fix common/ includes.
+       * unittests/observable-selftests.c: Fix common/ includes.
+       * unittests/mkdir-recursive-selftests.c: Fix common/ includes.
+       * unittests/memrange-selftests.c: Fix common/ includes.
+       * unittests/memory-map-selftests.c: Fix common/ includes.
+       * unittests/lookup_name_info-selftests.c: Fix common/ includes.
+       * unittests/function-view-selftests.c: Fix common/ includes.
+       * unittests/environ-selftests.c: Fix common/ includes.
+       * unittests/copy_bitwise-selftests.c: Fix common/ includes.
+       * unittests/common-utils-selftests.c: Fix common/ includes.
+       * unittests/cli-utils-selftests.c: Fix common/ includes.
+       * unittests/array-view-selftests.c: Fix common/ includes.
+       * ui-file.c: Fix common/ includes.
+       * tui/tui-io.c: Fix common/ includes.
+       * tracepoint.h: Fix common/ includes.
+       * tracepoint.c: Fix common/ includes.
+       * tracefile-tfile.c: Fix common/ includes.
+       * top.h: Fix common/ includes.
+       * top.c: Fix common/ includes.
+       * thread.c: Fix common/ includes.
+       * target/waitstatus.h: Fix common/ includes.
+       * target/waitstatus.c: Fix common/ includes.
+       * target.h: Fix common/ includes.
+       * target.c: Fix common/ includes.
+       * target-memory.c: Fix common/ includes.
+       * target-descriptions.c: Fix common/ includes.
+       * symtab.h: Fix common/ includes.
+       * symfile.c: Fix common/ includes.
+       * stap-probe.c: Fix common/ includes.
+       * spu-linux-nat.c: Fix common/ includes.
+       * sparc-nat.c: Fix common/ includes.
+       * source.c: Fix common/ includes.
+       * solib.c: Fix common/ includes.
+       * solib-target.c: Fix common/ includes.
+       * ser-unix.c: Fix common/ includes.
+       * ser-tcp.c: Fix common/ includes.
+       * ser-pipe.c: Fix common/ includes.
+       * ser-base.c: Fix common/ includes.
+       * selftest-arch.c: Fix common/ includes.
+       * s12z-tdep.c: Fix common/ includes.
+       * rust-exp.y: Fix common/ includes.
+       * rs6000-aix-tdep.c: Fix common/ includes.
+       * riscv-tdep.c: Fix common/ includes.
+       * remote.c: Fix common/ includes.
+       * remote-notif.h: Fix common/ includes.
+       * remote-fileio.h: Fix common/ includes.
+       * remote-fileio.c: Fix common/ includes.
+       * regcache.h: Fix common/ includes.
+       * regcache.c: Fix common/ includes.
+       * record-btrace.c: Fix common/ includes.
+       * python/python.c: Fix common/ includes.
+       * python/py-type.c: Fix common/ includes.
+       * python/py-inferior.c: Fix common/ includes.
+       * progspace.h: Fix common/ includes.
+       * producer.c: Fix common/ includes.
+       * procfs.c: Fix common/ includes.
+       * proc-api.c: Fix common/ includes.
+       * printcmd.c: Fix common/ includes.
+       * ppc-linux-nat.c: Fix common/ includes.
+       * parser-defs.h: Fix common/ includes.
+       * osdata.c: Fix common/ includes.
+       * obsd-nat.c: Fix common/ includes.
+       * nat/x86-linux.c: Fix common/ includes.
+       * nat/x86-linux-dregs.c: Fix common/ includes.
+       * nat/x86-dregs.h: Fix common/ includes.
+       * nat/x86-dregs.c: Fix common/ includes.
+       * nat/ppc-linux.c: Fix common/ includes.
+       * nat/mips-linux-watch.h: Fix common/ includes.
+       * nat/mips-linux-watch.c: Fix common/ includes.
+       * nat/linux-waitpid.c: Fix common/ includes.
+       * nat/linux-ptrace.h: Fix common/ includes.
+       * nat/linux-ptrace.c: Fix common/ includes.
+       * nat/linux-procfs.c: Fix common/ includes.
+       * nat/linux-personality.c: Fix common/ includes.
+       * nat/linux-osdata.c: Fix common/ includes.
+       * nat/linux-namespaces.c: Fix common/ includes.
+       * nat/linux-btrace.h: Fix common/ includes.
+       * nat/linux-btrace.c: Fix common/ includes.
+       * nat/fork-inferior.c: Fix common/ includes.
+       * nat/amd64-linux-siginfo.c: Fix common/ includes.
+       * nat/aarch64-sve-linux-ptrace.c: Fix common/ includes.
+       * nat/aarch64-linux.c: Fix common/ includes.
+       * nat/aarch64-linux-hw-point.h: Fix common/ includes.
+       * nat/aarch64-linux-hw-point.c: Fix common/ includes.
+       * namespace.h: Fix common/ includes.
+       * mips-linux-tdep.c: Fix common/ includes.
+       * minsyms.c: Fix common/ includes.
+       * mi/mi-parse.h: Fix common/ includes.
+       * mi/mi-main.c: Fix common/ includes.
+       * mi/mi-cmd-env.c: Fix common/ includes.
+       * memrange.h: Fix common/ includes.
+       * memattr.c: Fix common/ includes.
+       * maint.h: Fix common/ includes.
+       * maint.c: Fix common/ includes.
+       * main.c: Fix common/ includes.
+       * machoread.c: Fix common/ includes.
+       * location.c: Fix common/ includes.
+       * linux-thread-db.c: Fix common/ includes.
+       * linux-nat.c: Fix common/ includes.
+       * linux-fork.c: Fix common/ includes.
+       * inline-frame.c: Fix common/ includes.
+       * infrun.c: Fix common/ includes.
+       * inflow.c: Fix common/ includes.
+       * inferior.h: Fix common/ includes.
+       * inferior.c: Fix common/ includes.
+       * infcmd.c: Fix common/ includes.
+       * inf-ptrace.c: Fix common/ includes.
+       * inf-child.c: Fix common/ includes.
+       * ia64-linux-nat.c: Fix common/ includes.
+       * i387-tdep.c: Fix common/ includes.
+       * i386-tdep.c: Fix common/ includes.
+       * i386-linux-tdep.c: Fix common/ includes.
+       * i386-linux-nat.c: Fix common/ includes.
+       * i386-go32-tdep.c: Fix common/ includes.
+       * i386-fbsd-tdep.c: Fix common/ includes.
+       * i386-fbsd-nat.c: Fix common/ includes.
+       * guile/scm-type.c: Fix common/ includes.
+       * guile/guile.c: Fix common/ includes.
+       * go32-nat.c: Fix common/ includes.
+       * gnu-nat.c: Fix common/ includes.
+       * gdbthread.h: Fix common/ includes.
+       * gdbarch-selftests.c: Fix common/ includes.
+       * gdb_usleep.c: Fix common/ includes.
+       * gdb_select.h: Fix common/ includes.
+       * gdb_bfd.c: Fix common/ includes.
+       * gcore.c: Fix common/ includes.
+       * fork-child.c: Fix common/ includes.
+       * findvar.c: Fix common/ includes.
+       * fbsd-nat.c: Fix common/ includes.
+       * event-top.c: Fix common/ includes.
+       * event-loop.c: Fix common/ includes.
+       * dwarf2read.c: Fix common/ includes.
+       * dwarf2loc.c: Fix common/ includes.
+       * dwarf2-frame.c: Fix common/ includes.
+       * dwarf-index-cache.c: Fix common/ includes.
+       * dtrace-probe.c: Fix common/ includes.
+       * disasm-selftests.c: Fix common/ includes.
+       * defs.h: Fix common/ includes.
+       * csky-tdep.c: Fix common/ includes.
+       * cp-valprint.c: Fix common/ includes.
+       * cp-support.h: Fix common/ includes.
+       * cp-support.c: Fix common/ includes.
+       * corelow.c: Fix common/ includes.
+       * completer.h: Fix common/ includes.
+       * completer.c: Fix common/ includes.
+       * compile/compile.c: Fix common/ includes.
+       * compile/compile-loc2c.c: Fix common/ includes.
+       * compile/compile-cplus-types.c: Fix common/ includes.
+       * compile/compile-cplus-symbols.c: Fix common/ includes.
+       * command.h: Fix common/ includes.
+       * cli/cli-dump.c: Fix common/ includes.
+       * cli/cli-cmds.c: Fix common/ includes.
+       * charset.c: Fix common/ includes.
+       * build-id.c: Fix common/ includes.
+       * btrace.h: Fix common/ includes.
+       * btrace.c: Fix common/ includes.
+       * breakpoint.h: Fix common/ includes.
+       * breakpoint.c: Fix common/ includes.
+       * ax.h: 
+       (enum agent_op): Fix common/ includes.
+       * ax-general.c (struct aop_map): Fix common/ includes.
+       * ax-gdb.c: Fix common/ includes.
+       * auxv.c: Fix common/ includes.
+       * auto-load.c: Fix common/ includes.
+       * arm-tdep.c: Fix common/ includes.
+       * arch/riscv.c: Fix common/ includes.
+       * arch/ppc-linux-common.c: Fix common/ includes.
+       * arch/i386.c: Fix common/ includes.
+       * arch/arm.c: Fix common/ includes.
+       * arch/arm-linux.c: Fix common/ includes.
+       * arch/arm-get-next-pcs.c: Fix common/ includes.
+       * arch/amd64.c: Fix common/ includes.
+       * arch/aarch64.c: Fix common/ includes.
+       * arch/aarch64-insn.c: Fix common/ includes.
+       * arch-utils.c: Fix common/ includes.
+       * amd64-windows-tdep.c: Fix common/ includes.
+       * amd64-tdep.c: Fix common/ includes.
+       * amd64-sol2-tdep.c: Fix common/ includes.
+       * amd64-obsd-tdep.c: Fix common/ includes.
+       * amd64-nbsd-tdep.c: Fix common/ includes.
+       * amd64-linux-tdep.c: Fix common/ includes.
+       * amd64-linux-nat.c: Fix common/ includes.
+       * amd64-fbsd-tdep.c: Fix common/ includes.
+       * amd64-fbsd-nat.c: Fix common/ includes.
+       * amd64-dicos-tdep.c: Fix common/ includes.
+       * amd64-darwin-tdep.c: Fix common/ includes.
+       * agent.c: Fix common/ includes.
+       * ada-lang.h: Fix common/ includes.
+       * ada-lang.c: Fix common/ includes.
+       * aarch64-tdep.c: Fix common/ includes.
+
 2019-01-25  Tom Tromey  <tom@tromey.com>
 
        * common/create-version.sh: Use common/version.h.
 
 #include "infcall.h"
 #include "ax.h"
 #include "ax-gdb.h"
-#include "selftest.h"
+#include "common/selftest.h"
 
 #include "aarch64-tdep.h"
 #include "aarch64-ravenscar-thread.h"
 #include "elf-bfd.h"
 #include "elf/aarch64.h"
 
-#include "vec.h"
+#include "common/vec.h"
 
 #include "record.h"
 #include "record-full.h"
 
 #include "valprint.h"
 #include "source.h"
 #include "observable.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "stack.h"
-#include "gdb_vecs.h"
+#include "common/gdb_vecs.h"
 #include "typeprint.h"
 #include "namespace.h"
 
 
 #include "value.h"
 #include "gdbtypes.h"
 #include "breakpoint.h"
-#include "vec.h"
+#include "common/vec.h"
 
 /* Names of specific files known to be part of the runtime
    system and that might consider (confusing) debugging information.
 
 #include "command.h"
 #include "gdbcmd.h"
 #include "target.h"
-#include "agent.h"
+#include "common/agent.h"
 
 /* Enum strings for "set|show agent".  */
 
 
 #include "objfiles.h"
 
 #include "i387-tdep.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 #include "amd64-tdep.h"
 #include "osabi.h"
 #include "ui-out.h"
 
 #include "defs.h"
 #include "osabi.h"
 #include "amd64-tdep.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 #include "dicos-tdep.h"
 
 static void
 
 #include "amd64-nat.h"
 #include "amd64-bsd-nat.h"
 #include "x86-nat.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 \f
 
 class amd64_fbsd_nat_target final
 
 #include "osabi.h"
 #include "regset.h"
 #include "i386-fbsd-tdep.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 
 #include "amd64-tdep.h"
 #include "fbsd-tdep.h"
 
 #include "amd64-tdep.h"
 #include "amd64-linux-tdep.h"
 #include "i386-linux-tdep.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 
 #include "x86-linux-nat.h"
 #include "nat/linux-ptrace.h"
 
 #include "amd64-linux-tdep.h"
 #include "i386-linux-tdep.h"
 #include "linux-tdep.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 
 #include "amd64-tdep.h"
 #include "solib-svr4.h"
 
 #include "symtab.h"
 
 #include "amd64-tdep.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 #include "nbsd-tdep.h"
 #include "solib-svr4.h"
 
 
 #include "obsd-tdep.h"
 #include "amd64-tdep.h"
 #include "i387-tdep.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 #include "solib-svr4.h"
 #include "bsd-uthread.h"
 
 
 
 #include "sol2-tdep.h"
 #include "amd64-tdep.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 #include "solib-svr4.h"
 
 /* Mapping between the general-purpose registers in gregset_t format
 
 #include "disasm.h"
 #include "amd64-tdep.h"
 #include "i387-tdep.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 #include <algorithm>
 #include "target-descriptions.h"
 #include "arch/amd64.h"
 
 #include "defs.h"
 #include "osabi.h"
 #include "amd64-tdep.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 #include "gdbtypes.h"
 #include "gdbcore.h"
 #include "regcache.h"
 
 #include "language.h"
 #include "symtab.h"
 
-#include "version.h"
+#include "common/version.h"
 
 #include "floatformat.h"
 
 
    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 "common-defs.h"
+#include "common/common-defs.h"
 #include "aarch64-insn.h"
 
 /* Toggle this file's internal debugging dump.  */
 
    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 "common-defs.h"
+#include "common/common-defs.h"
 #include "aarch64.h"
 #include <stdlib.h>
 
 
    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 "common-defs.h"
+#include "common/common-defs.h"
 #include "amd64.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 #include <stdlib.h>
 
 #include "../features/i386/64bit-avx.c"
 
    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 "common-defs.h"
-#include "gdb_vecs.h"
-#include "common-regcache.h"
+#include "common/common-defs.h"
+#include "common/gdb_vecs.h"
+#include "common/common-regcache.h"
 #include "arm.h"
 #include "arm-get-next-pcs.h"
 
 
    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 "common-defs.h"
-#include "common-regcache.h"
+#include "common/common-defs.h"
+#include "common/common-regcache.h"
 #include "arch/arm.h"
 #include "arm-linux.h"
 #include "arch/arm-get-next-pcs.h"
 
    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 "common-defs.h"
-#include "common-regcache.h"
+#include "common/common-defs.h"
+#include "common/common-regcache.h"
 #include "arm.h"
 
 /* See arm.h.  */
 
    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 "common-defs.h"
+#include "common/common-defs.h"
 #include "i386.h"
 #include "common/tdesc.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 #include <stdlib.h>
 
 #include "../features/i386/32bit-core.c"
 
    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 "common-defs.h"
+#include "common/common-defs.h"
 #include "arch/ppc-linux-common.h"
 #include "arch/ppc-linux-tdesc.h"
 
 
    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 "common-defs.h"
+#include "common/common-defs.h"
 #include "riscv.h"
 #include <stdlib.h>
 #include <unordered_map>
 
 #include "coff/internal.h"
 #include "elf/arm.h"
 
-#include "vec.h"
+#include "common/vec.h"
 
 #include "record.h"
 #include "record-full.h"
 #include "features/arm/arm-with-neon.c"
 
 #if GDB_SELF_TEST
-#include "selftest.h"
+#include "common/selftest.h"
 #endif
 
 static int arm_debug;
 
 #include "completer.h"
 #include "fnmatch.h"
 #include "top.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 #include "extension.h"
 #include "gdb/section-scripts.h"
 #include <algorithm>
 
 #include "valprint.h"
 #include "gdbcore.h"
 #include "observable.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 #include "objfiles.h"
 
 #include "auxv.h"
 
 #include "valprint.h"
 #include "c-lang.h"
 
-#include "format.h"
+#include "common/format.h"
 
 /* To make sense of this file, you should read doc/agentexpr.texi.
    Then look at the types and enums in ax-gdb.h.  For the code itself,
 
   {0, 0, 0, 0, 0}
 #define DEFOP(NAME, SIZE, DATA_SIZE, CONSUMED, PRODUCED, VALUE) \
   , { # NAME, SIZE, DATA_SIZE, CONSUMED, PRODUCED }
-#include "ax.def"
+#include "common/ax.def"
 #undef DEFOP
 };
 
 
 #ifndef AGENTEXPR_H
 #define AGENTEXPR_H
 
-#include "vec.h"
+#include "common/vec.h"
 
 /* It's sometimes useful to be able to debug programs that you can't
    really stop for more than a fraction of a second.  To this end, the
   {
 #define DEFOP(NAME, SIZE, DATA_SIZE, CONSUMED, PRODUCED, VALUE)  \
     aop_ ## NAME = VALUE,
-#include "ax.def"
+#include "common/ax.def"
 #undef DEFOP
     aop_last
   };
 
 #include "ax-gdb.h"
 #include "dummy-frame.h"
 #include "interps.h"
-#include "format.h"
+#include "common/format.h"
 #include "thread-fsm.h"
 #include "tid-parse.h"
 #include "cli/cli-style.h"
 
 
 #include "frame.h"
 #include "value.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "ax.h"
 #include "command.h"
-#include "break-common.h"
+#include "common/break-common.h"
 #include "probe.h"
 #include "location.h"
 #include <vector>
 
 #include "filenames.h"
 #include "xml-support.h"
 #include "regcache.h"
-#include "rsp-low.h"
+#include "common/rsp-low.h"
 #include "gdbcmd.h"
 #include "cli/cli-utils.h"
 
 
    inferior.  For presentation purposes, the branch trace is represented as a
    list of sequential control-flow blocks, one such list per thread.  */
 
-#include "btrace-common.h"
+#include "common/btrace-common.h"
 #include "target/waitstatus.h" /* For enum target_stop_reason.  */
 #include "common/enum-flags.h"
 
 
 #include "bfd.h"
 #include "gdb_bfd.h"
 #include "build-id.h"
-#include "gdb_vecs.h"
+#include "common/gdb_vecs.h"
 #include "symfile.h"
 #include "objfiles.h"
 #include "filenames.h"
 
 #include "charset.h"
 #include "gdbcmd.h"
 #include "gdb_obstack.h"
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 #include "charset-list.h"
-#include "vec.h"
-#include "environ.h"
+#include "common/vec.h"
+#include "common/environ.h"
 #include "arch-utils.h"
-#include "gdb_vecs.h"
+#include "common/gdb_vecs.h"
 #include <ctype.h>
 
 #ifdef USE_WIN32API
 
 #include "readline/tilde.h"
 #include "completer.h"
 #include "target.h"    /* For baud_rate, remote_debug and remote_timeout.  */
-#include "gdb_wait.h"  /* For shell escape implementation.  */
+#include "common/gdb_wait.h"   /* For shell escape implementation.  */
 #include "gdb_regex.h" /* Used by apropos_command.  */
 #include "gdb_vfork.h"
 #include "linespec.h"
 #include "source.h"
 #include "disasm.h"
 #include "tracepoint.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 #include "location.h"
 #include "block.h"
 
 
 #include "gdbcore.h"
 #include "cli/cli-utils.h"
 #include "gdb_bfd.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 #include "common/byte-vector.h"
 
 static gdb::unique_xmalloc_ptr<char>
 
 #if !defined (COMMAND_H)
 #define COMMAND_H 1
 
-#include "gdb_vecs.h"
+#include "common/gdb_vecs.h"
 #include "common/scoped_restore.h"
 
 struct completion_tracker;
 
 #include "defs.h"
 #include "compile-internal.h"
 #include "compile-cplus.h"
-#include "gdb_assert.h"
+#include "common/gdb_assert.h"
 #include "symtab.h"
 #include "parser-defs.h"
 #include "block.h"
 
 #include "gdbtypes.h"
 #include "compile-internal.h"
 #include "compile-cplus.h"
-#include "gdb_assert.h"
+#include "common/gdb_assert.h"
 #include "symtab.h"
 #include "source.h"
 #include "cp-support.h"
 
 #include "compile.h"
 #include "block.h"
 #include "dwarf2-frame.h"
-#include "gdb_vecs.h"
+#include "common/gdb_vecs.h"
 #include "value.h"
 
 \f
 
 #include "source.h"
 #include "block.h"
 #include "arch-utils.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 #include "target.h"
 #include "osabi.h"
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 #include "valprint.h"
 #include "common/gdb_optional.h"
 #include "common/gdb_unlinker.h"
 
 #include "expression.h"
 #include "filenames.h"         /* For DOSish file names.  */
 #include "language.h"
-#include "gdb_signals.h"
+#include "common/gdb_signals.h"
 #include "target.h"
 #include "reggroups.h"
 #include "user-regs.h"
 
 #if !defined (COMPLETER_H)
 #define COMPLETER_H 1
 
-#include "gdb_vecs.h"
+#include "common/gdb_vecs.h"
 #include "command.h"
 
 /* Types of functions in struct match_list_displayer.  */
 
 #include "objfiles.h"
 #include "gdb_bfd.h"
 #include "completer.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 
 #ifndef O_LARGEFILE
 #define O_LARGEFILE 0
 
 #include "cp-abi.h"
 #include "namespace.h"
 #include <signal.h>
-#include "gdb_setjmp.h"
+#include "common/gdb_setjmp.h"
 #include "safe-ctype.h"
-#include "selftest.h"
+#include "common/selftest.h"
 
 #define d_left(dc) (dc)->u.s_binary.left
 #define d_right(dc) (dc)->u.s_binary.right
 
 /* We need this for 'domain_enum', alas...  */
 
 #include "symtab.h"
-#include "vec.h"
-#include "gdb_vecs.h"
+#include "common/vec.h"
+#include "common/gdb_vecs.h"
 #include "gdb_obstack.h"
 #include "common/array-view.h"
 #include <vector>
 
 #include "language.h"
 #include "extension.h"
 #include "typeprint.h"
-#include "byte-vector.h"
+#include "common/byte-vector.h"
 
 /* Controls printing of vtbl's.  */
 static void
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_assert.h"
+#include "common/gdb_assert.h"
 #include "frame.h"
 #include "inferior.h"
 #include "symtab.h"
 
 #  error gdbserver should not include gdb/defs.h
 #endif
 
-#include "common-defs.h"
+#include "common/common-defs.h"
 
 #include <sys/types.h>
 #include <limits.h>
 
 #include "ui-file.h"
 
-#include "host-defs.h"
+#include "common/host-defs.h"
 #include "common/enum-flags.h"
 
 /* Scope types enumerator.  List the types of scopes the compiler will
 
 #include "disasm.h"
 
 #if GDB_SELF_TEST
-#include "selftest.h"
+#include "common/selftest.h"
 #include "selftest-arch.h"
 
 namespace selftests {
 
 
 #include "defs.h"
 #include "probe.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "elf-bfd.h"
 #include "gdbtypes.h"
 #include "obstack.h"
 
 #include "dwarf-index-write.h"
 #include "dwarf2read.h"
 #include "objfiles.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include <string>
 #include <stdlib.h>
 
 
 #include "dwarf2loc.h"
 #include "dwarf2-frame-tailcall.h"
 #if GDB_SELF_TEST
-#include "selftest.h"
+#include "common/selftest.h"
 #include "selftest-arch.h"
 #endif
 
 
 #include "dwarf2loc.h"
 #include "dwarf2-frame.h"
 #include "compile/compile.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include <algorithm>
 #include <vector>
 #include <unordered_set>
 
 #include "psympriv.h"
 #include <sys/stat.h>
 #include "completer.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "c-lang.h"
 #include "go-lang.h"
 #include "valprint.h"
 #include "gdb_bfd.h"
 #include "f-lang.h"
 #include "source.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 #include "build-id.h"
 #include "namespace.h"
 #include "common/gdb_unlinker.h"
 #include <algorithm>
 #include <unordered_set>
 #include <unordered_map>
-#include "selftest.h"
+#include "common/selftest.h"
 #include <cmath>
 #include <set>
 #include <forward_list>
 
 #include "defs.h"
 #include "event-loop.h"
 #include "event-top.h"
-#include "queue.h"
+#include "common/queue.h"
 #include "ser-event.h"
 
 #ifdef HAVE_POLL
 #endif
 
 #include <sys/types.h>
-#include "gdb_sys_time.h"
+#include "common/gdb_sys_time.h"
 #include "gdb_select.h"
 #include "observable.h"
 #include "top.h"
 
 #include "gdbcmd.h"            /* for dont_repeat() */
 #include "annotate.h"
 #include "maint.h"
-#include "buffer.h"
+#include "common/buffer.h"
 #include "ser-event.h"
 #include "gdb_select.h"
 
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "byte-vector.h"
+#include "common/byte-vector.h"
 #include "gdbcore.h"
 #include "inferior.h"
 #include "regcache.h"
 #include "regset.h"
 #include "gdbcmd.h"
 #include "gdbthread.h"
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 #include "inf-ptrace.h"
 #include <sys/types.h>
 #include <sys/procfs.h>
 #include <libutil.h>
 #endif
 #if !defined(HAVE_KINFO_GETVMMAP)
-#include "filestuff.h"
+#include "common/filestuff.h"
 #endif
 
 #include "elf-bfd.h"
 
 #include "objfiles.h"
 #include "language.h"
 #include "dwarf2loc.h"
-#include "selftest.h"
+#include "common/selftest.h"
 
 /* Basic byte-swapping routines.  All 'extract' functions return a
    host-format integer from a target-format integer at ADDR which is
 
 #include "terminal.h"
 #include "gdbthread.h"
 #include "top.h"
-#include "job-control.h"
-#include "filestuff.h"
+#include "common/job-control.h"
+#include "common/filestuff.h"
 #include "nat/fork-inferior.h"
 #include "common/common-inferior.h"
 
 
 #include "readline/tilde.h"
 #include <algorithm>
 #include "common/gdb_unlinker.h"
-#include "byte-vector.h"
+#include "common/byte-vector.h"
 
 /* The largest amount of memory to read from the target at once.  We
    must throttle it to limit the amount of memory used by GDB during
 
 #include "ui-out.h"
 #include "gdbcmd.h"
 #include "hashtab.h"
-#include "filestuff.h"
-#include "vec.h"
+#include "common/filestuff.h"
+#include "common/vec.h"
 #ifdef HAVE_MMAP
 #include <sys/mman.h>
 #ifndef MAP_FAILED
 
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #else
-#include "gdb_sys_time.h"
+#include "common/gdb_sys_time.h"
 #endif
 
 #ifdef USE_WIN32API
 
 #include "defs.h"
 #include "gdb_usleep.h"
 #include "gdb_select.h"
-#include "gdb_sys_time.h"
+#include "common/gdb_sys_time.h"
 
 int
 gdb_usleep (int usec)
 
 
 #include "defs.h"
 #if GDB_SELF_TEST
-#include "selftest.h"
+#include "common/selftest.h"
 #include "selftest-arch.h"
 #include "inferior.h"
 #include "gdbthread.h"
 
+2019-01-25  Tom Tromey  <tom@tromey.com>
+
+       * win32-low.c: Fix common/ includes.
+       * win32-i386-low.c: Fix common/ includes.
+       * tracepoint.c: Fix common/ includes.
+       * thread-db.c: Fix common/ includes.
+       * target.h: Fix common/ includes.
+       * symbol.c: Fix common/ includes.
+       * spu-low.c: Fix common/ includes.
+       * server.h: Fix common/ includes.
+       * server.c: Fix common/ includes.
+       * remote-utils.c: Fix common/ includes.
+       * regcache.h: Fix common/ includes.
+       * regcache.c: Fix common/ includes.
+       * nto-x86-low.c: Fix common/ includes.
+       * notif.h: Fix common/ includes.
+       * mem-break.h: Fix common/ includes.
+       * lynx-low.c: Fix common/ includes.
+       * lynx-i386-low.c: Fix common/ includes.
+       * linux-x86-tdesc-selftest.c: Fix common/ includes.
+       * linux-x86-low.c: Fix common/ includes.
+       * linux-low.c: Fix common/ includes.
+       * inferiors.h: Fix common/ includes.
+       * i387-fp.c: Fix common/ includes.
+       * hostio.c: Fix common/ includes.
+       * hostio-errno.c: Fix common/ includes.
+       * gdbthread.h: Fix common/ includes.
+       * gdbreplay.c: Fix common/ includes.
+       * fork-child.c: Fix common/ includes.
+       * event-loop.c: Fix common/ includes.
+       * ax.c: 
+       (enum gdb_agent_op): Fix common/ includes.
+
 2019-01-21  Tom Tromey  <tom@tromey.com>
 
        * tracepoint.c: Fix includes.
 
 
 #include "server.h"
 #include "ax.h"
-#include "format.h"
+#include "common/format.h"
 #include "tracepoint.h"
-#include "rsp-low.h"
+#include "common/rsp-low.h"
 
 static void ax_vdebug (const char *, ...) ATTRIBUTE_PRINTF (1, 2);
 
   {
 #define DEFOP(NAME, SIZE, DATA_SIZE, CONSUMED, PRODUCED, VALUE)  \
     gdb_agent_op_ ## NAME = VALUE,
-#include "ax.def"
+#include "common/ax.def"
 #undef DEFOP
     gdb_agent_op_last
   };
   {
     "?undef?"
 #define DEFOP(NAME, SIZE, DATA_SIZE, CONSUMED, PRODUCED, VALUE)  , # NAME
-#include "ax.def"
+#include "common/ax.def"
 #undef DEFOP
   };
 
   {
     0
 #define DEFOP(NAME, SIZE, DATA_SIZE, CONSUMED, PRODUCED, VALUE)  , SIZE
-#include "ax.def"
+#include "common/ax.def"
 #undef DEFOP
   };
 #endif
 
 #include "server.h"
 
 #include <sys/types.h>
-#include "gdb_sys_time.h"
+#include "common/gdb_sys_time.h"
 
 #ifdef USE_WIN32API
 #include <windows.h>
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "server.h"
-#include "job-control.h"
+#include "common/job-control.h"
 #include "nat/fork-inferior.h"
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
 
    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 "common-defs.h"
-#include "version.h"
+#include "common/common-defs.h"
+#include "common/version.h"
 
 #if HAVE_SYS_FILE_H
 #include <sys/file.h>
 #include <wspiapi.h>
 #endif
 
-#include "netstuff.h"
+#include "common/netstuff.h"
 
 #ifndef HAVE_SOCKLEN_T
 typedef int socklen_t;
 
 #ifndef GDB_THREAD_H
 #define GDB_THREAD_H
 
-#include "common-gdbthread.h"
+#include "common/common-gdbthread.h"
 #include "inferiors.h"
 
 #include <list>
 
    on top of errno.  */
 
 #include "server.h"
-#include "fileio.h"
+#include "common/fileio.h"
 
 void
 hostio_last_error_from_errno (char *buf)
 
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "fileio.h"
+#include "common/fileio.h"
 
 extern int remote_debug;
 
 
 
 #include "server.h"
 #include "i387-fp.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 
 static const int num_mpx_bnd_registers = 4;
 static const int num_mpx_cfg_registers = 2;
 
 #ifndef INFERIORS_H
 #define INFERIORS_H
 
-#include "gdb_vecs.h"
+#include "common/gdb_vecs.h"
 #include <list>
 
 struct thread_info;
 
 #include "server.h"
 #include "linux-low.h"
 #include "nat/linux-osdata.h"
-#include "agent.h"
+#include "common/agent.h"
 #include "tdesc.h"
-#include "rsp-low.h"
-#include "signals-state-save-restore.h"
+#include "common/rsp-low.h"
+#include "common/signals-state-save-restore.h"
 #include "nat/linux-nat.h"
 #include "nat/linux-waitpid.h"
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 #include "nat/gdb_ptrace.h"
 #include "nat/linux-ptrace.h"
 #include "nat/linux-procfs.h"
 #include <sys/stat.h>
 #include <sys/vfs.h>
 #include <sys/uio.h>
-#include "filestuff.h"
+#include "common/filestuff.h"
 #include "tracepoint.h"
 #include "hostio.h"
 #include <inttypes.h>
-#include "common-inferior.h"
+#include "common/common-inferior.h"
 #include "nat/fork-inferior.h"
-#include "environ.h"
+#include "common/environ.h"
 #include "common/scoped_restore.h"
 #ifndef ELFMAG0
 /* Don't include <linux/elf.h> here.  If it got included by gdb_proc_service.h
 
 #ifdef HAVE_LINUX_BTRACE
 # include "nat/linux-btrace.h"
-# include "btrace-common.h"
+# include "common/btrace-common.h"
 #endif
 
 #ifndef HAVE_ELF32_AUXV_T
 
 #include "linux-low.h"
 #include "i387-fp.h"
 #include "x86-low.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 #include "nat/gdb_ptrace.h"
 
 #ifdef __x86_64__
 #include "elf/common.h"
 #endif
 
-#include "agent.h"
+#include "common/agent.h"
 #include "tdesc.h"
 #include "tracepoint.h"
 #include "ax.h"
 
 #include "linux-x86-tdesc.h"
 #include "tdesc.h"
 #include "common/selftest.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 
 /* Defined in auto-generated file i386-linux.c.  */
 void init_registers_i386_linux (void);
 
 #include "lynx-low.h"
 #include <limits.h>
 #include <sys/ptrace.h>
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 #include "arch/i386.h"
 #include "x86-tdesc.h"
 
 
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 #include <signal.h>
-#include "filestuff.h"
-#include "common-inferior.h"
+#include "common/filestuff.h"
+#include "common/common-inferior.h"
 #include "nat/fork-inferior.h"
 
 int using_threads = 1;
 
 #ifndef MEM_BREAK_H
 #define MEM_BREAK_H
 
-#include "break-common.h"
+#include "common/break-common.h"
 
 /* Breakpoints are opaque.  */
 struct breakpoint;
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "target.h"
-#include "queue.h"
+#include "common/queue.h"
 
 /* Structure holding information related to a single event.  We
    keep a queue of these to push to GDB.  It can be extended if
 
 #include "regcache.h"
 
 #include <x86/context.h>
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 #include "arch/i386.h"
 #include "x86-tdesc.h"
 
 
 #include "regdef.h"
 #include "gdbthread.h"
 #include "tdesc.h"
-#include "rsp-low.h"
+#include "common/rsp-low.h"
 #ifndef IN_PROCESS_AGENT
 
 struct regcache *
 
 #ifndef REGCACHE_H
 #define REGCACHE_H
 
-#include "common-regcache.h"
+#include "common/common-regcache.h"
 
 struct thread_info;
 struct target_desc;
 
 #include "gdbthread.h"
 #include "tdesc.h"
 #include "dll.h"
-#include "rsp-low.h"
-#include "netstuff.h"
-#include "filestuff.h"
+#include "common/rsp-low.h"
+#include "common/netstuff.h"
+#include "common/filestuff.h"
 #include <ctype.h>
 #if HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #if HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
-#include "gdb_sys_time.h"
+#include "common/gdb_sys_time.h"
 #include <unistd.h>
 #if HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 
 
 #include "server.h"
 #include "gdbthread.h"
-#include "agent.h"
+#include "common/agent.h"
 #include "notif.h"
 #include "tdesc.h"
-#include "rsp-low.h"
-#include "signals-state-save-restore.h"
+#include "common/rsp-low.h"
+#include "common/signals-state-save-restore.h"
 #include <ctype.h>
 #include <unistd.h>
 #if HAVE_SIGNAL_H
 #include <signal.h>
 #endif
-#include "gdb_vecs.h"
-#include "gdb_wait.h"
-#include "btrace-common.h"
-#include "filestuff.h"
+#include "common/gdb_vecs.h"
+#include "common/gdb_wait.h"
+#include "common/btrace-common.h"
+#include "common/filestuff.h"
 #include "tracepoint.h"
 #include "dll.h"
 #include "hostio.h"
 #include <vector>
-#include "common-inferior.h"
-#include "job-control.h"
-#include "environ.h"
+#include "common/common-inferior.h"
+#include "common/job-control.h"
+#include "common/environ.h"
 #include "filenames.h"
-#include "pathstuff.h"
+#include "common/pathstuff.h"
 
 #include "common/selftest.h"
 
 
 #ifndef SERVER_H
 #define SERVER_H
 
-#include "common-defs.h"
+#include "common/common-defs.h"
 
 gdb_static_assert (sizeof (CORE_ADDR) >= sizeof (void *));
 
 #include "wincecompat.h"
 #endif
 
-#include "version.h"
+#include "common/version.h"
 
 #if !HAVE_DECL_STRERROR
 #ifndef strerror
 #  define PROG "gdbserver"
 #endif
 
-#include "buffer.h"
-#include "xml-utils.h"
+#include "common/buffer.h"
+#include "common/xml-utils.h"
 #include "regcache.h"
-#include "gdb_signals.h"
+#include "common/gdb_signals.h"
 #include "target.h"
 #include "mem-break.h"
-#include "environ.h"
+#include "common/environ.h"
 
 /* Target-specific functions */
 
 
 #include "utils.h"
 #include "debug.h"
-#include "gdb_vecs.h"
+#include "common/gdb_vecs.h"
 
 /* Maximum number of bytes to read/write at once.  The value here
    is chosen to fill up a packet (the headers account for the 32).  */
 
 
 #include "server.h"
 
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 #include <sys/ptrace.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/syscall.h>
-#include "filestuff.h"
+#include "common/filestuff.h"
 #include "hostio.h"
 #include "nat/fork-inferior.h"
 
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "server.h"
-#include "symbol.h"
+#include "common/symbol.h"
 
 /* See common/symbol.h.  */
 
 
 #include "target/wait.h"
 #include "target/waitstatus.h"
 #include "mem-break.h"
-#include "btrace-common.h"
+#include "common/btrace-common.h"
 #include <vector>
 
 struct emit_ops;
 
 
 #include "gdb_proc_service.h"
 #include "nat/gdb_thread_db.h"
-#include "gdb_vecs.h"
+#include "common/gdb_vecs.h"
 #include "nat/linux-procfs.h"
 #include "common/scoped_restore.h"
 
 
 #include "server.h"
 #include "tracepoint.h"
 #include "gdbthread.h"
-#include "rsp-low.h"
+#include "common/rsp-low.h"
 
 #include <ctype.h>
 #include <fcntl.h>
 #include "tdesc.h"
 
 #define IPA_SYM_STRUCT_NAME ipa_sym_addresses
-#include "agent.h"
+#include "common/agent.h"
 
 #define DEFAULT_TRACE_BUFFER_SIZE 5242880 /* 5*1024*1024 */
 
 
 #include "server.h"
 #include "win32-low.h"
 #include "x86-low.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 #ifdef __x86_64__
 #include "arch/amd64.h"
 #endif
 
 #include <tlhelp32.h>
 #include <psapi.h>
 #include <process.h>
-#include "gdb_tilde_expand.h"
-#include "common-inferior.h"
+#include "common/gdb_tilde_expand.h"
+#include "common/common-inferior.h"
 
 #ifndef USE_WIN32API
 #include <sys/cygwin.h>
 
 #include "target/waitstatus.h"
 #include "cli/cli-utils.h"
 #include "common/refcounted-object.h"
-#include "common-gdbthread.h"
+#include "common/common-gdbthread.h"
 #include "common/forward-scope-exit.h"
 
 struct inferior;
 
 #include "value.h"
 #include "language.h"
 #include "target.h"
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
 #include "gdbthread.h"
 
 #include "inferior.h"
 #include "infrun.h"
 #include "gdbthread.h"
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 #include "gdbcore.h"
 #include "command.h"
 #include "gdbcmd.h"
 
 #include "top.h"
 #include "extension-priv.h"
 #include "utils.h"
-#include "version.h"
+#include "common/version.h"
 #ifdef HAVE_GUILE
 #include "guile.h"
 #include "guile-internal.h"
 
 #include "gdbtypes.h"
 #include "objfiles.h"
 #include "language.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "bcache.h"
 #include "dwarf2loc.h"
 #include "typeprint.h"
 
 #include "fbsd-nat.h"
 #include "i386-tdep.h"
 #include "x86-nat.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 #include "x86-bsd-nat.h"
 #include "i386-bsd-nat.h"
 
 
 #include "regcache.h"
 #include "regset.h"
 #include "i386-fbsd-tdep.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 
 #include "i386-tdep.h"
 #include "i387-tdep.h"
 
 
 #include "defs.h"
 #include "i386-tdep.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 #include "target-descriptions.h"
 #include "osabi.h"
 
 
 #include "i387-tdep.h"
 #include "i386-tdep.h"
 #include "i386-linux-tdep.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 
 #include "x86-linux-nat.h"
 #include "nat/linux-ptrace.h"
 
 #include "xml-syscall.h"
 
 #include "i387-tdep.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 
 /* The syscall's XML filename for i386.  */
 #define XML_SYSCALL_FILENAME_I386 "syscalls/i386-linux.xml"
 
 #include "remote.h"
 #include "i386-tdep.h"
 #include "i387-tdep.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 #include "x86-tdep.h"
 
 #include "record.h"
 
 
 #include "i386-tdep.h"
 #include "i387-tdep.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 
 /* Print the floating point number specified by RAW.  */
 
 
 
 #include <signal.h>
 #include "nat/gdb_ptrace.h"
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 #ifdef HAVE_SYS_REG_H
 #include <sys/reg.h>
 #endif
 
 #include "inferior.h"
 #include <sys/stat.h>
 #include "inf-child.h"
-#include "fileio.h"
-#include "agent.h"
-#include "gdb_wait.h"
-#include "filestuff.h"
+#include "common/fileio.h"
+#include "common/agent.h"
+#include "common/gdb_wait.h"
+#include "common/filestuff.h"
 
 #include <sys/types.h>
 #include <fcntl.h>
 
 #include "gdbcore.h"
 #include "regcache.h"
 #include "nat/gdb_ptrace.h"
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 #include <signal.h>
 
 #include "inf-ptrace.h"
 
 #include "frame.h"
 #include "inferior.h"
 #include "infrun.h"
-#include "environ.h"
+#include "common/environ.h"
 #include "value.h"
 #include "gdbcmd.h"
 #include "symfile.h"
 
 #include "observable.h"
 #include "gdbcore.h"
 #include "symfile.h"
-#include "environ.h"
+#include "common/environ.h"
 #include "cli/cli-utils.h"
 #include "continuations.h"
 #include "arch-utils.h"
 
 #include "frame.h"
 
 /* For gdb_environ.  */
-#include "environ.h"
+#include "common/environ.h"
 
 #include "progspace.h"
 #include "registry.h"
 #include "common/refcounted-object.h"
 #include "common/forward-scope-exit.h"
 
-#include "common-inferior.h"
+#include "common/common-inferior.h"
 #include "gdbthread.h"
 
 struct infcall_suspend_state;
 
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
 #endif
-#include "job-control.h"
+#include "common/job-control.h"
 
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 
 #include "frame.h"
 #include "inferior.h"
 #include "breakpoint.h"
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 #include "gdbcore.h"
 #include "gdbcmd.h"
 #include "cli/cli-script.h"
 
 #include "gdbthread.h"
 #include "regcache.h"
 #include "symtab.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "frame.h"
 #include <algorithm>
 
 
 #include "source.h"
 
 #include "nat/gdb_ptrace.h"
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 #include <dirent.h>
 #include <ctype.h>
 
 
 #include "target.h"
 #include "nat/linux-nat.h"
 #include "nat/linux-waitpid.h"
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 #include <unistd.h>
 #include <sys/syscall.h>
 #include "nat/gdb_ptrace.h"
 #include "nat/linux-osdata.h"
 #include "linux-tdep.h"
 #include "symfile.h"
-#include "agent.h"
+#include "common/agent.h"
 #include "tracepoint.h"
-#include "buffer.h"
+#include "common/buffer.h"
 #include "target-descriptions.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 #include "objfiles.h"
 #include "nat/linux-namespaces.h"
-#include "fileio.h"
+#include "common/fileio.h"
 #include "common/scope-exit.h"
 
 #ifndef SPUFS_MAGIC
 
 #include <dlfcn.h>
 #include "gdb_proc_service.h"
 #include "nat/gdb_thread_db.h"
-#include "gdb_vecs.h"
+#include "common/gdb_vecs.h"
 #include "bfd.h"
 #include "command.h"
 #include "gdbcmd.h"
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdb_assert.h"
+#include "common/gdb_assert.h"
 #include "location.h"
 #include "symtab.h"
 #include "language.h"
 
 #include "gdbcore.h"
 #include "mach-o.h"
 #include "aout/stab_gnu.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "psympriv.h"
 #include "complaints.h"
 #include "gdb_bfd.h"
 
 #include "maint.h"
 
 #include "filenames.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 #include <signal.h>
 #include "event-top.h"
 #include "infrun.h"
-#include "signals-state-save-restore.h"
+#include "common/signals-state-save-restore.h"
 #include <vector>
 #include "common/pathstuff.h"
 
 
 #include "value.h"
 #include "top.h"
 #include "maint.h"
-#include "selftest.h"
+#include "common/selftest.h"
 
 #include "cli/cli-decode.h"
 #include "cli/cli-utils.h"
 
 #ifndef MAINT_H
 #define MAINT_H
 
-#include "run-time-clock.h"
+#include "common/run-time-clock.h"
 #include <chrono>
 
 extern void set_per_command_time (int);
 
 #include "target-dcache.h"
 #include "value.h"
 #include "language.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "breakpoint.h"
 #include "cli/cli-utils.h"
 #include <algorithm>
 
 #ifndef MEMRANGE_H
 #define MEMRANGE_H
 
-#include "vec.h"
+#include "common/vec.h"
 
 /* Defines a [START, START + LENGTH) memory range.  */
 
 
 #include "mi-getopt.h"
 #include "symtab.h"
 #include "target.h"
-#include "environ.h"
+#include "common/environ.h"
 #include "command.h"
 #include "ui-out.h"
 #include "top.h"
 
 #include "common/byte-vector.h"
 
 #include <ctype.h>
-#include "run-time-clock.h"
+#include "common/run-time-clock.h"
 #include <chrono>
 #include "progspace-and-thread.h"
 #include "common/rsp-low.h"
 
 #ifndef MI_PARSE_H
 #define MI_PARSE_H
 
-#include "run-time-clock.h"
+#include "common/run-time-clock.h"
 #include <chrono>
 #include "mi-cmds.h"  /* For enum print_values.  */
 
 
 #include "cp-support.h"
 #include "language.h"
 #include "cli/cli-utils.h"
-#include "symbol.h"
+#include "common/symbol.h"
 #include <algorithm>
 #include "safe-ctype.h"
 
 
 #include "glibc-tdep.h"
 #include "linux-tdep.h"
 #include "xml-syscall.h"
-#include "gdb_signals.h"
+#include "common/gdb_signals.h"
 
 #include "features/mips-linux.c"
 #include "features/mips-dsp-linux.c"
 
 #ifndef NAMESPACE_H
 #define NAMESPACE_H
 
-#include "vec.h"
-#include "gdb_vecs.h"
+#include "common/vec.h"
+#include "common/gdb_vecs.h"
 #include "gdb_obstack.h"
 
 /* This struct is designed to store data from using directives.  It
 
    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 "common-defs.h"
-#include "break-common.h"
-#include "common-regcache.h"
+#include "common/common-defs.h"
+#include "common/break-common.h"
+#include "common/common-regcache.h"
 #include "nat/linux-nat.h"
 #include "aarch64-linux-hw-point.h"
 
 
 #ifndef AARCH64_LINUX_HW_POINT_H
 #define AARCH64_LINUX_HW_POINT_H 1
 
-#include "break-common.h" /* For enum target_hw_bp_type.  */
+#include "common/break-common.h" /* For enum target_hw_bp_type.  */
 
 /* Macro definitions, data structures, and code for the hardware
    breakpoint and hardware watchpoint support follow.  We use the
 
    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 "common-defs.h"
-#include "break-common.h"
+#include "common/common-defs.h"
+#include "common/break-common.h"
 #include "nat/linux-nat.h"
 #include "nat/aarch64-linux-hw-point.h"
 #include "nat/aarch64-linux.h"
 
 
 #include <sys/utsname.h>
 #include <sys/uio.h>
-#include "common-defs.h"
+#include "common/common-defs.h"
 #include "elf/external.h"
 #include "elf/common.h"
 #include "aarch64-sve-linux-ptrace.h"
 #include "arch/aarch64.h"
-#include "common-regcache.h"
+#include "common/common-regcache.h"
 #include "common/byte-vector.h"
 
 static bool vq_change_warned = false;
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <signal.h>
-#include "common-defs.h"
+#include "common/common-defs.h"
 #include "amd64-linux-siginfo.h"
 
 #define GDB_SI_SIZE 128
 
    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 "common-defs.h"
+#include "common/common-defs.h"
 #include "fork-inferior.h"
 #include "target/waitstatus.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 #include "target/target.h"
-#include "common-inferior.h"
-#include "common-gdbthread.h"
+#include "common/common-inferior.h"
+#include "common/common-gdbthread.h"
 #include "common/pathstuff.h"
-#include "signals-state-save-restore.h"
-#include "gdb_tilde_expand.h"
+#include "common/signals-state-save-restore.h"
+#include "common/gdb_tilde_expand.h"
 #include <vector>
 
 extern char **environ;
 
    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 "common-defs.h"
+#include "common/common-defs.h"
 #include "linux-btrace.h"
-#include "common-regcache.h"
-#include "gdb_wait.h"
+#include "common/common-regcache.h"
+#include "common/gdb_wait.h"
 #include "x86-cpuid.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 #include "common/scoped_fd.h"
 #include "common/scoped_mmap.h"
 
 
 #ifndef LINUX_BTRACE_H
 #define LINUX_BTRACE_H
 
-#include "btrace-common.h"
-#include "vec.h"
+#include "common/btrace-common.h"
+#include "common/vec.h"
 #if HAVE_LINUX_PERF_EVENT_H
 #  include <linux/perf_event.h>
 #endif
 
    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 "common-defs.h"
+#include "common/common-defs.h"
 #include "nat/linux-namespaces.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 #include <fcntl.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 #include <signal.h>
 #include <sched.h>
 
 
    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 "common-defs.h"
+#include "common/common-defs.h"
 #include "linux-osdata.h"
 
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "xml-utils.h"
-#include "buffer.h"
+#include "common/xml-utils.h"
+#include "common/buffer.h"
 #include <dirent.h>
 #include <sys/stat.h>
-#include "filestuff.h"
+#include "common/filestuff.h"
 #include <algorithm>
 
 #define NAMELEN(dirent) strlen ((dirent)->d_name)
 
    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 "common-defs.h"
+#include "common/common-defs.h"
 #include "nat/linux-personality.h"
 
 #ifdef HAVE_PERSONALITY
 
    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 "common-defs.h"
+#include "common/common-defs.h"
 #include "linux-procfs.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 #include <dirent.h>
 #include <sys/stat.h>
 
 
    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 "common-defs.h"
+#include "common/common-defs.h"
 #include "linux-ptrace.h"
 #include "linux-procfs.h"
 #include "linux-waitpid.h"
-#include "buffer.h"
+#include "common/buffer.h"
 #ifdef HAVE_SYS_PROCFS_H
 #include <sys/procfs.h>
 #endif
 
 struct buffer;
 
 #include "nat/gdb_ptrace.h"
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 
 #ifdef __UCLIBC__
 #if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__))
 
    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 "common-defs.h"
+#include "common/common-defs.h"
 
 #ifdef GDBSERVER
 /* FIXME: server.h is required for the definition of debug_threads
 
 #include "linux-nat.h"
 #include "linux-waitpid.h"
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 
 /* Print debugging output based on the format string FORMAT and
    its parameters.  */
 
    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 "common-defs.h"
+#include "common/common-defs.h"
 #include "nat/gdb_ptrace.h"
 #include "mips-linux-watch.h"
 
 
 #define MIPS_LINUX_WATCH_H 1
 
 #include <asm/ptrace.h>
-#include "break-common.h"
+#include "common/break-common.h"
 
 #define MAX_DEBUG_REGISTER 8
 
 
    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 "common-defs.h"
+#include "common/common-defs.h"
 #include "ppc-linux.h"
 #include "nat/gdb_ptrace.h"
 #include <elf.h>
 
    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 "common-defs.h"
+#include "common/common-defs.h"
 #include "x86-dregs.h"
-#include "break-common.h"
+#include "common/break-common.h"
 
 /* Support for hardware watchpoints and breakpoints using the x86
    debug registers.
 
 #ifndef X86_DREGS_H
 #define X86_DREGS_H 1
 
-#include "break-common.h" /* target_hw_bp_type */
+#include "common/break-common.h" /* target_hw_bp_type */
 
 /* Low-level function vector.  */
 
 
    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 "common-defs.h"
+#include "common/common-defs.h"
 #include "nat/gdb_ptrace.h"
 #include <sys/user.h>
 #include "target/waitstatus.h"
 
    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 "common-defs.h"
+#include "common/common-defs.h"
 #include "x86-linux.h"
 #include "x86-linux-dregs.h"
 
 
 
 #include <sys/types.h>
 #include <sys/ptrace.h>
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 
 #include "inf-child.h"
 #include "obsd-nat.h"
 
 
 #include "defs.h"
 #include "target.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "xml-support.h"
 #include "osdata.h"
 #include "ui-out.h"
 
 #if !defined (PARSER_DEFS_H)
 #define PARSER_DEFS_H 1
 
-#include "vec.h"
+#include "common/vec.h"
 #include "expression.h"
 
 struct block;
 
 #include <sys/user.h>
 #include <sys/ioctl.h>
 #include <sys/uio.h>
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 #include <fcntl.h>
 #include <sys/procfs.h>
 #include "nat/gdb_ptrace.h"
 
 #include "cli/cli-utils.h"
 #include "cli/cli-script.h"
 #include "cli/cli-style.h"
-#include "format.h"
+#include "common/format.h"
 #include "source.h"
 #include "common/byte-vector.h"
 
 
 #include <sys/proc.h>  /* for struct proc */
 #include <sys/user.h>  /* for struct user */
 #include <fcntl.h>     /* for O_RDWR etc.  */
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 
 #include "proc-utils.h"
 
 
 #include "regcache.h"
 #include "inf-child.h"
 #include "nat/fork-inferior.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 
 #define _STRUCTURED_PROC 1     /* Should be done by configure script.  */
 
 #include <sys/procfs.h>
 #include <sys/fault.h>
 #include <sys/syscall.h>
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 #include <signal.h>
 #include <ctype.h>
 #include "gdb_bfd.h"
 
 
 #include "defs.h"
 #include "producer.h"
-#include "selftest.h"
+#include "common/selftest.h"
 
 /* See producer.h.  */
 
 
 #define PROGSPACE_H
 
 #include "target.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "gdb_bfd.h"
-#include "gdb_vecs.h"
+#include "common/gdb_vecs.h"
 #include "registry.h"
 #include "common/next-iterator.h"
 #include "common/safe-iterator.h"
 
 #include "python-internal.h"
 #include "arch-utils.h"
 #include "language.h"
-#include "gdb_signals.h"
+#include "common/gdb_signals.h"
 #include "py-event.h"
 #include "py-stopevent.h"
 
 
 #include "demangle.h"
 #include "objfiles.h"
 #include "language.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "typeprint.h"
 
 typedef struct pyty_type_object
 
 #include "python-internal.h"
 #include "linespec.h"
 #include "source.h"
-#include "version.h"
+#include "common/version.h"
 #include "target.h"
 #include "gdbthread.h"
 #include "interps.h"
 
 #include "infrun.h"
 #include "event-loop.h"
 #include "inf-loop.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "inferior.h"
 #include <algorithm>
 
 
 }
 
 #if GDB_SELF_TEST
-#include "selftest.h"
+#include "common/selftest.h"
 #include "selftest-arch.h"
 #include "target-float.h"
 
 
 #ifndef REGCACHE_H
 #define REGCACHE_H
 
-#include "common-regcache.h"
+#include "common/common-regcache.h"
 #include <forward_list>
 
 struct regcache;
 
 #include "defs.h"
 #include "gdbcmd.h"
 #include "remote.h"
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 #include <sys/stat.h>
 #include "remote-fileio.h"
 #include "event-loop.h"
 #include "target.h"
 #include "filenames.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 
 #include <fcntl.h>
-#include "gdb_sys_time.h"
+#include "common/gdb_sys_time.h"
 #ifdef __CYGWIN__
 #include <sys/cygwin.h>                /* For cygwin_conv_path.  */
 #endif
 
 #ifndef REMOTE_FILEIO_H
 #define REMOTE_FILEIO_H
 
-#include "fileio.h"
+#include "common/fileio.h"
 
 struct cmd_list_element;
 struct remote_target;
 
 #ifndef REMOTE_NOTIF_H
 #define REMOTE_NOTIF_H
 
-#include "queue.h"
+#include "common/queue.h"
 
 /* An event of a type of async remote notification.  */
 
 
 #include "cli/cli-setshow.h"
 #include "target-descriptions.h"
 #include "gdb_bfd.h"
-#include "filestuff.h"
-#include "rsp-low.h"
+#include "common/filestuff.h"
+#include "common/rsp-low.h"
 #include "disasm.h"
 #include "location.h"
 
-#include "gdb_sys_time.h"
+#include "common/gdb_sys_time.h"
 
 #include "event-loop.h"
 #include "event-top.h"
 #include "tracepoint.h"
 #include "ax.h"
 #include "ax-gdb.h"
-#include "agent.h"
+#include "common/agent.h"
 #include "btrace.h"
 #include "record-btrace.h"
 #include <algorithm>
 #include "common/scoped_restore.h"
-#include "environ.h"
+#include "common/environ.h"
 #include "common/byte-vector.h"
 #include <unordered_map>
 
 
 #include "dwarf2-frame.h"
 #include "user-regs.h"
 #include "valprint.h"
-#include "common-defs.h"
+#include "common/common-defs.h"
 #include "opcode/riscv-opc.h"
 #include "cli/cli-decode.h"
 #include "observable.h"
 
 #include "solib.h"
 #include "solib-aix.h"
 #include "target-float.h"
-#include "xml-utils.h"
+#include "common/xml-utils.h"
 #include "trad-frame.h"
 #include "frame-unwind.h"
 
 
 #include "gdb_regex.h"
 #include "rust-lang.h"
 #include "parser-defs.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include "value.h"
-#include "vec.h"
+#include "common/vec.h"
 
 #define GDB_YY_REMAP_PREFIX rust
 #include "yy-remap.h"
 
 
 #include "arch-utils.h"
 #include "dwarf2-frame.h"
-#include "errors.h"
+#include "common/errors.h"
 #include "frame-unwind.h"
 #include "gdbcore.h"
 #include "gdbcmd.h"
 
 #include "defs.h"
 
 #if GDB_SELF_TEST
-#include "selftest.h"
+#include "common/selftest.h"
 #include "selftest-arch.h"
 #include "arch-utils.h"
 
 
 #include "event-loop.h"
 
 #include "gdb_select.h"
-#include "gdb_sys_time.h"
+#include "common/gdb_sys_time.h"
 #ifdef USE_WIN32API
 #include <winsock2.h>
 #endif
 
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include "gdb_sys_time.h"
+#include "common/gdb_sys_time.h"
 #include <fcntl.h>
-#include "filestuff.h"
+#include "common/filestuff.h"
 
 #include <signal.h>
 
 
 #include "gdbcmd.h"
 #include "cli/cli-decode.h"
 #include "cli/cli-setshow.h"
-#include "filestuff.h"
-#include "netstuff.h"
+#include "common/filestuff.h"
+#include "common/netstuff.h"
 
 #include <sys/types.h>
 
 #include <sys/ioctl.h>  /* For FIONBIO.  */
 #endif
 
-#include "gdb_sys_time.h"
+#include "common/gdb_sys_time.h"
 
 #ifdef USE_WIN32API
 #include <winsock2.h>
 
 #include <sys/types.h>
 #include "terminal.h"
 #include <sys/socket.h>
-#include "gdb_sys_time.h"
+#include "common/gdb_sys_time.h"
 
 #include "gdb_select.h"
 #include "gdbcmd.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 #include <termios.h>
 
 struct hardwire_ttystate
 
 #include "symtab.h"
 #include "symfile.h"
 #include "target.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "solib-target.h"
 #include <vector>
 
 
 #include "frame.h"
 #include "gdb_regex.h"
 #include "inferior.h"
-#include "environ.h"
+#include "common/environ.h"
 #include "language.h"
 #include "gdbcmd.h"
 #include "completer.h"
 #include "interps.h"
 #include "filesystem.h"
 #include "gdb_bfd.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 #include "source.h"
 
 /* Architecture-specific operations.  */
 
 #include "gdbcmd.h"
 #include "frame.h"
 #include "value.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 
 #include <sys/types.h>
 #include <fcntl.h>
 
 
 #include <signal.h>
 #include <sys/ptrace.h>
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 #ifdef HAVE_MACHINE_REG_H
 #include <machine/reg.h>
 #endif
 
 #include "inf-ptrace.h"
 #include "regcache.h"
 #include "symfile.h"
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 #include "gdbthread.h"
 #include "gdb_bfd.h"
 
 
 #include "defs.h"
 #include "stap-probe.h"
 #include "probe.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "ui-out.h"
 #include "objfiles.h"
 #include "arch-utils.h"
 
 #include "gdb_bfd.h"
 #include "cli/cli-utils.h"
 #include "common/byte-vector.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include "cli/cli-style.h"
 #include "common/forward-scope-exit.h"
 
 
 #include <array>
 #include <vector>
 #include <string>
-#include "gdb_vecs.h"
+#include "common/gdb_vecs.h"
 #include "gdbtypes.h"
 #include "gdb_regex.h"
 #include "common/enum-flags.h"
 
 #include "reggroups.h"
 #include "target.h"
 #include "target-descriptions.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "xml-support.h"
 #include "xml-tdesc.h"
 #include "osabi.h"
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "target.h"
 #include "memory-map.h"
 
-#include "gdb_sys_time.h"
+#include "common/gdb_sys_time.h"
 #include <algorithm>
 
 static bool
 
 #include "inline-frame.h"
 #include "tracepoint.h"
 #include "gdb/fileio.h"
-#include "agent.h"
+#include "common/agent.h"
 #include "auxv.h"
 #include "target-debug.h"
 #include "top.h"
 #include "event-top.h"
 #include <algorithm>
-#include "byte-vector.h"
+#include "common/byte-vector.h"
 #include "terminal.h"
 #include <unordered_map>
 
 
 #include "bfd.h"
 #include "symtab.h"
 #include "memattr.h"
-#include "vec.h"
-#include "gdb_signals.h"
+#include "common/vec.h"
+#include "common/gdb_signals.h"
 #include "btrace.h"
 #include "record.h"
 #include "command.h"
 #include "disasm.h"
 #include "tracepoint.h"
 
-#include "break-common.h" /* For enum target_hw_bp_type.  */
+#include "common/break-common.h" /* For enum target_hw_bp_type.  */
 
 enum strata
   {
 
    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 "common-defs.h"
+#include "common/common-defs.h"
 #include "waitstatus.h"
 
 /* Return a pretty printed form of target_waitstatus.
 
 #ifndef WAITSTATUS_H
 #define WAITSTATUS_H
 
-#include "gdb_signals.h"
+#include "common/gdb_signals.h"
 
 /* Stuff for target_wait.  */
 
 
 #include "symtab.h"
 #include "frame.h"
 #include "inferior.h"
-#include "environ.h"
+#include "common/environ.h"
 #include "value.h"
 #include "target.h"
 #include "gdbthread.h"
 
 #include "value.h"
 #include "language.h"
 #include "terminal.h"          /* For job_control.  */
-#include "job-control.h"
+#include "common/job-control.h"
 #include "annotate.h"
 #include "completer.h"
 #include "top.h"
-#include "version.h"
+#include "common/version.h"
 #include "serial.h"
 #include "main.h"
 #include "event-loop.h"
 #include "maint.h"
 #include "filenames.h"
 #include "frame.h"
-#include "buffer.h"
+#include "common/buffer.h"
 #include "gdb_select.h"
 #include "common/scope-exit.h"
 
 
 #ifndef TOP_H
 #define TOP_H
 
-#include "buffer.h"
+#include "common/buffer.h"
 #include "event-loop.h"
 #include "value.h"
 
 
 #include "defs.h"
 #include "tracefile.h"
 #include "readline/tilde.h"
-#include "filestuff.h"
-#include "rsp-low.h" /* bin2hex */
+#include "common/filestuff.h"
+#include "common/rsp-low.h" /* bin2hex */
 #include "regcache.h"
 #include "inferior.h"
 #include "gdbthread.h"
 #include "remote.h"
 #include "xml-tdesc.h"
 #include "target-descriptions.h"
-#include "buffer.h"
+#include "common/buffer.h"
 #include <algorithm>
 
 #ifndef O_LARGEFILE
 
 #include "cli/cli-utils.h"
 #include "probe.h"
 #include "ctf.h"
-#include "filestuff.h"
-#include "rsp-low.h"
+#include "common/filestuff.h"
+#include "common/rsp-low.h"
 #include "tracefile.h"
 #include "location.h"
 #include <algorithm>
 
 
 #include "breakpoint.h"
 #include "memrange.h"
-#include "gdb_vecs.h"
+#include "common/gdb_vecs.h"
 
 #include <vector>
 #include <string>
 
 #include "cli-out.h"
 #include <fcntl.h>
 #include <signal.h>
-#include "filestuff.h"
+#include "common/filestuff.h"
 #include "completer.h"
 #include "gdb_curses.h"
 #include <map>
 
 #include "ui-file.h"
 #include "gdb_obstack.h"
 #include "gdb_select.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 
 null_file null_stream;
 
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include "common/array-view.h"
 #include <array>
 
 
 
 #include "defs.h"
 #include "cli/cli-utils.h"
-#include "selftest.h"
+#include "common/selftest.h"
 
 namespace selftests {
 namespace cli_utils {
 
    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 "common-defs.h"
-#include "selftest.h"
+#include "common/common-defs.h"
+#include "common/selftest.h"
 
 namespace selftests {
 
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include "utils.h"
 
 namespace selftests {
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include "common/environ.h"
 #include "diagnostics.h"
 
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include "common/function-view.h"
 
 namespace selftests {
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include "symtab.h"
 
 namespace selftests {
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include "memory-map.h"
 
 #if defined(HAVE_LIBEXPAT)
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include "memrange.h"
 
 namespace selftests {
 
 #include "defs.h"
 
 #include "common/filestuff.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include "common/byte-vector.h"
 #include "common/pathstuff.h"
 
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include "common/observable.h"
 
 namespace selftests {
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include "common/offset-type.h"
 #include "common/underlying.h"
 #include "common/valid-expr.h"
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include "common/gdb_optional.h"
 
 /* Used by the included .cc files below.  Included here because the
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include "common/netstuff.h"
 #include "diagnostics.h"
 #ifdef USE_WIN32API
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include "common/rsp-low.h"
 
 namespace selftests {
 
 #include "common/filestuff.h"
 #include "common/scoped_fd.h"
 #include "config.h"
-#include "selftest.h"
+#include "common/selftest.h"
 
 namespace selftests {
 namespace scoped_fd {
 
 
 #if defined(HAVE_SYS_MMAN_H)
 
-#include "selftest.h"
+#include "common/selftest.h"
 #include "common/gdb_unlinker.h"
 
 #include <unistd.h>
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include "common/scoped_restore.h"
 
 namespace selftests {
 
 #define GNULIB_NAMESPACE gnulib
 
 #include "defs.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include "common/gdb_string_view.h"
 
 /* Used by the included .cc files below.  Included here because the
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include "ui-style.h"
 
 namespace selftests {
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include "tracepoint.h"
 
 namespace selftests {
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include "selftest-arch.h"
 #include "value.h"
 #include "gdbtypes.h"
 
 
 #include "defs.h"
 #include "utils.h"
-#include "selftest.h"
+#include "common/selftest.h"
 
 namespace selftests {
 namespace utils {
 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "xml-utils.h"
-#include "selftest.h"
+#include "common/xml-utils.h"
+#include "common/selftest.h"
 
 namespace selftests {
 namespace xml_utils {
 
 
 #include "defs.h"
 #include <ctype.h>
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 #include "event-top.h"
 #include "gdbthread.h"
 #include "fnmatch.h"
 #include "gdb_usleep.h"
 #include "interps.h"
 #include "gdb_regex.h"
-#include "job-control.h"
+#include "common/job-control.h"
 #include "common/selftest.h"
 #include "common/gdb_optional.h"
 #include "cp-support.h"
 
 #include "observable.h"
 #include "objfiles.h"
 #include "extension.h"
-#include "byte-vector.h"
+#include "common/byte-vector.h"
 
 extern unsigned int overload_debug;
 /* Local functions.  */
 
 #include "user-regs.h"
 #include <algorithm>
 #include "completer.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include "common/array-view.h"
 
 /* Definition of a user function.  */
 
 #include "gdb_regex.h"
 
 #include "varobj.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "gdbthread.h"
 #include "inferior.h"
 #include "varobj-iter.h"
 
 
 #include "symtab.h"
 #include "gdbtypes.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "value.h"
 
 /* Enumeration for the format types */
 
 #include "x86-nat.h"
 #include "complaints.h"
 #include "inf-child.h"
-#include "gdb_tilde_expand.h"
+#include "common/gdb_tilde_expand.h"
 #include "common/pathstuff.h"
 
 #define AdjustTokenPrivileges          dyn_AdjustTokenPrivileges
 
 #ifdef __x86_64__
 #include "amd64-linux-tdep.h"
 #endif
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 #include "nat/linux-btrace.h"
 #include "nat/linux-nat.h"
 #include "nat/x86-linux.h"
 
 #include "defs.h"
 #include "gdbcmd.h"
 #include "xml-support.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 #include "safe-ctype.h"
 #include <vector>
 #include <string>
 
 #define XML_SUPPORT_H
 
 #include "gdb_obstack.h"
-#include "vec.h"
-#include "xml-utils.h"
+#include "common/vec.h"
+#include "common/xml-utils.h"
 #include "common/byte-vector.h"
 
 struct gdb_xml_parser;
 
 #include <signal.h>
 #include <sys/user.h>
 #include <sys/ioctl.h>
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 #include <fcntl.h>
 #include <sys/procfs.h>
 #include "nat/gdb_ptrace.h"