Patchwork [2/3] Normalize includes to use common/

login
register
mail settings
Submitter Tom Tromey
Date Jan. 23, 2019, 5:29 p.m.
Message ID <20190123172954.24421-3-tom@tromey.com>
Download mbox | patch
Permalink /patch/31198/
State New
Headers show

Comments

Tom Tromey - Jan. 23, 2019, 5:29 p.m.
This changes all includes to use the form "common/filename.h" rather
than just "filename.h".  This was written by a script.

gdb/ChangeLog
2019-01-23  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.

gdb/gdbserver/ChangeLog
2019-01-23  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.
---
 gdb/ChangeLog                                 | 216 ++++++++++++++++++
 gdb/aarch64-tdep.c                            |   4 +-
 gdb/ada-lang.c                                |   4 +-
 gdb/ada-lang.h                                |   2 +-
 gdb/agent.c                                   |   2 +-
 gdb/amd64-darwin-tdep.c                       |   2 +-
 gdb/amd64-dicos-tdep.c                        |   2 +-
 gdb/amd64-fbsd-nat.c                          |   2 +-
 gdb/amd64-fbsd-tdep.c                         |   2 +-
 gdb/amd64-linux-nat.c                         |   2 +-
 gdb/amd64-linux-tdep.c                        |   2 +-
 gdb/amd64-nbsd-tdep.c                         |   2 +-
 gdb/amd64-obsd-tdep.c                         |   2 +-
 gdb/amd64-sol2-tdep.c                         |   2 +-
 gdb/amd64-tdep.c                              |   2 +-
 gdb/amd64-windows-tdep.c                      |   2 +-
 gdb/arch-utils.c                              |   2 +-
 gdb/arch/aarch64-insn.c                       |   2 +-
 gdb/arch/aarch64.c                            |   2 +-
 gdb/arch/amd64.c                              |   4 +-
 gdb/arch/arm-get-next-pcs.c                   |   6 +-
 gdb/arch/arm-linux.c                          |   4 +-
 gdb/arch/arm.c                                |   4 +-
 gdb/arch/i386.c                               |   4 +-
 gdb/arch/ppc-linux-common.c                   |   2 +-
 gdb/arch/riscv.c                              |   2 +-
 gdb/arm-tdep.c                                |   4 +-
 gdb/auto-load.c                               |   2 +-
 gdb/auxv.c                                    |   2 +-
 gdb/ax-gdb.c                                  |   2 +-
 gdb/ax-general.c                              |   2 +-
 gdb/ax.h                                      |   4 +-
 gdb/breakpoint.c                              |   2 +-
 gdb/breakpoint.h                              |   4 +-
 gdb/btrace.c                                  |   2 +-
 gdb/btrace.h                                  |   2 +-
 gdb/build-id.c                                |   2 +-
 gdb/charset.c                                 |   8 +-
 gdb/cli/cli-cmds.c                            |   4 +-
 gdb/cli/cli-dump.c                            |   2 +-
 gdb/command.h                                 |   2 +-
 gdb/compile/compile-cplus-symbols.c           |   2 +-
 gdb/compile/compile-cplus-types.c             |   2 +-
 gdb/compile/compile-loc2c.c                   |   2 +-
 gdb/compile/compile.c                         |   4 +-
 gdb/completer.c                               |   2 +-
 gdb/completer.h                               |   2 +-
 gdb/corelow.c                                 |   2 +-
 gdb/cp-support.c                              |   4 +-
 gdb/cp-support.h                              |   4 +-
 gdb/cp-valprint.c                             |   2 +-
 gdb/csky-tdep.c                               |   2 +-
 gdb/defs.h                                    |   4 +-
 gdb/disasm-selftests.c                        |   2 +-
 gdb/dtrace-probe.c                            |   2 +-
 gdb/dwarf-index-cache.c                       |   2 +-
 gdb/dwarf2-frame.c                            |   2 +-
 gdb/dwarf2loc.c                               |   2 +-
 gdb/dwarf2read.c                              |   6 +-
 gdb/event-loop.c                              |   4 +-
 gdb/event-top.c                               |   2 +-
 gdb/fbsd-nat.c                                |   6 +-
 gdb/findvar.c                                 |   2 +-
 gdb/fork-child.c                              |   4 +-
 gdb/gcore.c                                   |   2 +-
 gdb/gdb_bfd.c                                 |   4 +-
 gdb/gdb_select.h                              |   2 +-
 gdb/gdb_usleep.c                              |   2 +-
 gdb/gdbarch-selftests.c                       |   2 +-
 gdb/gdbserver/ChangeLog                       |  33 +++
 gdb/gdbserver/ax.c                            |  10 +-
 gdb/gdbserver/event-loop.c                    |   2 +-
 gdb/gdbserver/fork-child.c                    |   2 +-
 gdb/gdbserver/gdbreplay.c                     |   6 +-
 gdb/gdbserver/gdbthread.h                     |   2 +-
 gdb/gdbserver/hostio-errno.c                  |   2 +-
 gdb/gdbserver/hostio.c                        |   2 +-
 gdb/gdbserver/i387-fp.c                       |   2 +-
 gdb/gdbserver/inferiors.h                     |   2 +-
 gdb/gdbserver/linux-low.c                     |  16 +-
 gdb/gdbserver/linux-x86-low.c                 |   4 +-
 gdb/gdbserver/linux-x86-tdesc-selftest.c      |   2 +-
 gdb/gdbserver/lynx-i386-low.c                 |   2 +-
 gdb/gdbserver/lynx-low.c                      |   6 +-
 gdb/gdbserver/mem-break.h                     |   2 +-
 gdb/gdbserver/notif.h                         |   2 +-
 gdb/gdbserver/nto-x86-low.c                   |   2 +-
 gdb/gdbserver/regcache.c                      |   2 +-
 gdb/gdbserver/regcache.h                      |   2 +-
 gdb/gdbserver/remote-utils.c                  |   8 +-
 gdb/gdbserver/server.c                        |  22 +-
 gdb/gdbserver/server.h                        |  14 +-
 gdb/gdbserver/spu-low.c                       |   4 +-
 gdb/gdbserver/symbol.c                        |   2 +-
 gdb/gdbserver/target.h                        |   2 +-
 gdb/gdbserver/thread-db.c                     |   2 +-
 gdb/gdbserver/tracepoint.c                    |   4 +-
 gdb/gdbserver/win32-i386-low.c                |   2 +-
 gdb/gdbserver/win32-low.c                     |   4 +-
 gdb/gdbthread.h                               |   2 +-
 gdb/gnu-nat.c                                 |   2 +-
 gdb/go32-nat.c                                |   2 +-
 gdb/guile/guile.c                             |   2 +-
 gdb/guile/scm-type.c                          |   2 +-
 gdb/i386-fbsd-nat.c                           |   2 +-
 gdb/i386-fbsd-tdep.c                          |   2 +-
 gdb/i386-go32-tdep.c                          |   2 +-
 gdb/i386-linux-nat.c                          |   2 +-
 gdb/i386-linux-tdep.c                         |   2 +-
 gdb/i386-tdep.c                               |   2 +-
 gdb/i387-tdep.c                               |   2 +-
 gdb/ia64-linux-nat.c                          |   2 +-
 gdb/inf-child.c                               |   8 +-
 gdb/inf-ptrace.c                              |   2 +-
 gdb/infcmd.c                                  |   2 +-
 gdb/inferior.c                                |   2 +-
 gdb/inferior.h                                |   4 +-
 gdb/inflow.c                                  |   2 +-
 gdb/infrun.c                                  |   2 +-
 gdb/inline-frame.c                            |   2 +-
 gdb/linux-fork.c                              |   2 +-
 gdb/linux-nat.c                               |  10 +-
 gdb/linux-thread-db.c                         |   2 +-
 gdb/location.c                                |   2 +-
 gdb/machoread.c                               |   2 +-
 gdb/main.c                                    |   4 +-
 gdb/maint.c                                   |   2 +-
 gdb/maint.h                                   |   2 +-
 gdb/memattr.c                                 |   2 +-
 gdb/memrange.h                                |   2 +-
 gdb/mi/mi-cmd-env.c                           |   2 +-
 gdb/mi/mi-main.c                              |   2 +-
 gdb/mi/mi-parse.h                             |   2 +-
 gdb/minsyms.c                                 |   2 +-
 gdb/mips-linux-tdep.c                         |   2 +-
 gdb/namespace.h                               |   4 +-
 gdb/nat/aarch64-linux-hw-point.c              |   6 +-
 gdb/nat/aarch64-linux-hw-point.h              |   2 +-
 gdb/nat/aarch64-linux.c                       |   4 +-
 gdb/nat/aarch64-sve-linux-ptrace.c            |   4 +-
 gdb/nat/amd64-linux-siginfo.c                 |   2 +-
 gdb/nat/fork-inferior.c                       |  12 +-
 gdb/nat/linux-btrace.c                        |   8 +-
 gdb/nat/linux-btrace.h                        |   4 +-
 gdb/nat/linux-namespaces.c                    |   6 +-
 gdb/nat/linux-osdata.c                        |   8 +-
 gdb/nat/linux-personality.c                   |   2 +-
 gdb/nat/linux-procfs.c                        |   4 +-
 gdb/nat/linux-ptrace.c                        |   4 +-
 gdb/nat/linux-ptrace.h                        |   2 +-
 gdb/nat/linux-waitpid.c                       |   4 +-
 gdb/nat/mips-linux-watch.c                    |   2 +-
 gdb/nat/mips-linux-watch.h                    |   2 +-
 gdb/nat/ppc-linux.c                           |   2 +-
 gdb/nat/x86-dregs.c                           |   4 +-
 gdb/nat/x86-dregs.h                           |   2 +-
 gdb/nat/x86-linux-dregs.c                     |   2 +-
 gdb/nat/x86-linux.c                           |   2 +-
 gdb/obsd-nat.c                                |   2 +-
 gdb/osdata.c                                  |   2 +-
 gdb/parser-defs.h                             |   2 +-
 gdb/ppc-linux-nat.c                           |   2 +-
 gdb/printcmd.c                                |   2 +-
 gdb/proc-api.c                                |   2 +-
 gdb/procfs.c                                  |   4 +-
 gdb/producer.c                                |   2 +-
 gdb/progspace.h                               |   4 +-
 gdb/python/py-inferior.c                      |   2 +-
 gdb/python/py-type.c                          |   2 +-
 gdb/python/python.c                           |   2 +-
 gdb/record-btrace.c                           |   2 +-
 gdb/regcache.c                                |   2 +-
 gdb/regcache.h                                |   2 +-
 gdb/remote-fileio.c                           |   6 +-
 gdb/remote-fileio.h                           |   2 +-
 gdb/remote-notif.h                            |   2 +-
 gdb/remote.c                                  |  10 +-
 gdb/riscv-tdep.c                              |   2 +-
 gdb/rs6000-aix-tdep.c                         |   2 +-
 gdb/rust-exp.y                                |   4 +-
 gdb/s12z-tdep.c                               |   2 +-
 gdb/selftest-arch.c                           |   2 +-
 gdb/ser-base.c                                |   2 +-
 gdb/ser-pipe.c                                |   4 +-
 gdb/ser-tcp.c                                 |   6 +-
 gdb/ser-unix.c                                |   4 +-
 gdb/solib-target.c                            |   2 +-
 gdb/solib.c                                   |   4 +-
 gdb/source.c                                  |   2 +-
 gdb/sparc-nat.c                               |   2 +-
 gdb/spu-linux-nat.c                           |   2 +-
 gdb/stap-probe.c                              |   2 +-
 gdb/symfile.c                                 |   2 +-
 gdb/symtab.h                                  |   2 +-
 gdb/target-descriptions.c                     |   2 +-
 gdb/target-memory.c                           |   4 +-
 gdb/target.c                                  |   4 +-
 gdb/target.h                                  |   6 +-
 gdb/target/waitstatus.c                       |   2 +-
 gdb/target/waitstatus.h                       |   2 +-
 gdb/thread.c                                  |   2 +-
 gdb/top.c                                     |   6 +-
 gdb/top.h                                     |   2 +-
 gdb/tracefile-tfile.c                         |   6 +-
 gdb/tracepoint.c                              |   4 +-
 gdb/tracepoint.h                              |   2 +-
 gdb/tui/tui-io.c                              |   2 +-
 gdb/ui-file.c                                 |   2 +-
 gdb/unittests/array-view-selftests.c          |   2 +-
 gdb/unittests/cli-utils-selftests.c           |   2 +-
 gdb/unittests/common-utils-selftests.c        |   4 +-
 gdb/unittests/copy_bitwise-selftests.c        |   2 +-
 gdb/unittests/environ-selftests.c             |   2 +-
 gdb/unittests/function-view-selftests.c       |   2 +-
 gdb/unittests/lookup_name_info-selftests.c    |   2 +-
 gdb/unittests/memory-map-selftests.c          |   2 +-
 gdb/unittests/memrange-selftests.c            |   2 +-
 gdb/unittests/mkdir-recursive-selftests.c     |   2 +-
 gdb/unittests/observable-selftests.c          |   2 +-
 gdb/unittests/offset-type-selftests.c         |   2 +-
 gdb/unittests/optional-selftests.c            |   2 +-
 .../parse-connection-spec-selftests.c         |   2 +-
 gdb/unittests/rsp-low-selftests.c             |   2 +-
 gdb/unittests/scoped_fd-selftests.c           |   2 +-
 gdb/unittests/scoped_mmap-selftests.c         |   2 +-
 gdb/unittests/scoped_restore-selftests.c      |   2 +-
 gdb/unittests/string_view-selftests.c         |   2 +-
 gdb/unittests/style-selftests.c               |   2 +-
 gdb/unittests/tracepoint-selftests.c          |   2 +-
 gdb/unittests/unpack-selftests.c              |   2 +-
 gdb/unittests/utils-selftests.c               |   2 +-
 gdb/unittests/xml-utils-selftests.c           |   4 +-
 gdb/utils.c                                   |   4 +-
 gdb/valops.c                                  |   2 +-
 gdb/value.c                                   |   2 +-
 gdb/varobj.c                                  |   2 +-
 gdb/varobj.h                                  |   2 +-
 gdb/windows-nat.c                             |   2 +-
 gdb/x86-linux-nat.c                           |   2 +-
 gdb/xml-support.c                             |   2 +-
 gdb/xml-support.h                             |   4 +-
 gdb/xtensa-linux-nat.c                        |   2 +-
 242 files changed, 612 insertions(+), 363 deletions(-)

Patch

diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index 7c5d74858d..dc2cbefd05 100644
--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -43,7 +43,7 @@ 
 #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"
@@ -51,7 +51,7 @@ 
 #include "elf-bfd.h"
 #include "elf/aarch64.h"
 
-#include "vec.h"
+#include "common/vec.h"
 
 #include "record.h"
 #include "record-full.h"
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 944a729bc4..a878d4d1af 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -49,9 +49,9 @@ 
 #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"
 
diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h
index bba79e16cb..14470d5d43 100644
--- a/gdb/ada-lang.h
+++ b/gdb/ada-lang.h
@@ -28,7 +28,7 @@  struct parser_state;
 #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.
diff --git a/gdb/agent.c b/gdb/agent.c
index fe3dcb555a..8b777d0b3b 100644
--- a/gdb/agent.c
+++ b/gdb/agent.c
@@ -19,7 +19,7 @@ 
 #include "command.h"
 #include "gdbcmd.h"
 #include "target.h"
-#include "agent.h"
+#include "common/agent.h"
 
 /* Enum strings for "set|show agent".  */
 
diff --git a/gdb/amd64-darwin-tdep.c b/gdb/amd64-darwin-tdep.c
index 12e1259c0a..46867f40a3 100644
--- a/gdb/amd64-darwin-tdep.c
+++ b/gdb/amd64-darwin-tdep.c
@@ -28,7 +28,7 @@ 
 #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"
diff --git a/gdb/amd64-dicos-tdep.c b/gdb/amd64-dicos-tdep.c
index 9c023eaa38..8ca838e3c8 100644
--- a/gdb/amd64-dicos-tdep.c
+++ b/gdb/amd64-dicos-tdep.c
@@ -20,7 +20,7 @@ 
 #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
diff --git a/gdb/amd64-fbsd-nat.c b/gdb/amd64-fbsd-nat.c
index 6d8e12b033..74ef240766 100644
--- a/gdb/amd64-fbsd-nat.c
+++ b/gdb/amd64-fbsd-nat.c
@@ -34,7 +34,7 @@ 
 #include "amd64-nat.h"
 #include "amd64-bsd-nat.h"
 #include "x86-nat.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 
 
 class amd64_fbsd_nat_target final
diff --git a/gdb/amd64-fbsd-tdep.c b/gdb/amd64-fbsd-tdep.c
index 628d42f7a0..403e65022d 100644
--- a/gdb/amd64-fbsd-tdep.c
+++ b/gdb/amd64-fbsd-tdep.c
@@ -25,7 +25,7 @@ 
 #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"
diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c
index c2f189d8bd..a0bb105f5a 100644
--- a/gdb/amd64-linux-nat.c
+++ b/gdb/amd64-linux-nat.c
@@ -33,7 +33,7 @@ 
 #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"
diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
index fc7389e615..21fc3461ec 100644
--- a/gdb/amd64-linux-tdep.c
+++ b/gdb/amd64-linux-tdep.c
@@ -33,7 +33,7 @@ 
 #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"
diff --git a/gdb/amd64-nbsd-tdep.c b/gdb/amd64-nbsd-tdep.c
index 7dfff661b3..06905d65df 100644
--- a/gdb/amd64-nbsd-tdep.c
+++ b/gdb/amd64-nbsd-tdep.c
@@ -25,7 +25,7 @@ 
 #include "symtab.h"
 
 #include "amd64-tdep.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 #include "nbsd-tdep.h"
 #include "solib-svr4.h"
 
diff --git a/gdb/amd64-obsd-tdep.c b/gdb/amd64-obsd-tdep.c
index 5ff0c6e080..cd1a1c31b8 100644
--- a/gdb/amd64-obsd-tdep.c
+++ b/gdb/amd64-obsd-tdep.c
@@ -32,7 +32,7 @@ 
 #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"
 
diff --git a/gdb/amd64-sol2-tdep.c b/gdb/amd64-sol2-tdep.c
index 22cf5a6690..56d2e22582 100644
--- a/gdb/amd64-sol2-tdep.c
+++ b/gdb/amd64-sol2-tdep.c
@@ -28,7 +28,7 @@ 
 
 #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
diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
index d4143ae155..3f61997d66 100644
--- a/gdb/amd64-tdep.c
+++ b/gdb/amd64-tdep.c
@@ -39,7 +39,7 @@ 
 #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"
diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c
index 47feab98b0..65c05c645a 100644
--- a/gdb/amd64-windows-tdep.c
+++ b/gdb/amd64-windows-tdep.c
@@ -18,7 +18,7 @@ 
 #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"
diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index 20d4274cde..d2e27d9555 100644
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -32,7 +32,7 @@ 
 #include "language.h"
 #include "symtab.h"
 
-#include "version.h"
+#include "common/version.h"
 
 #include "floatformat.h"
 
diff --git a/gdb/arch/aarch64-insn.c b/gdb/arch/aarch64-insn.c
index a25fc9c161..cf6e669f99 100644
--- a/gdb/arch/aarch64-insn.c
+++ b/gdb/arch/aarch64-insn.c
@@ -16,7 +16,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 "common-defs.h"
+#include "common/common-defs.h"
 #include "aarch64-insn.h"
 
 /* Toggle this file's internal debugging dump.  */
diff --git a/gdb/arch/aarch64.c b/gdb/arch/aarch64.c
index f8c4813902..d36ed9d19e 100644
--- a/gdb/arch/aarch64.c
+++ b/gdb/arch/aarch64.c
@@ -15,7 +15,7 @@ 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
+#include "common/common-defs.h"
 #include "aarch64.h"
 #include <stdlib.h>
 
diff --git a/gdb/arch/amd64.c b/gdb/arch/amd64.c
index 1110e6a054..b7e6332d77 100644
--- a/gdb/arch/amd64.c
+++ b/gdb/arch/amd64.c
@@ -15,9 +15,9 @@ 
    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"
diff --git a/gdb/arch/arm-get-next-pcs.c b/gdb/arch/arm-get-next-pcs.c
index 4b5e030d96..06b3f2c992 100644
--- a/gdb/arch/arm-get-next-pcs.c
+++ b/gdb/arch/arm-get-next-pcs.c
@@ -17,9 +17,9 @@ 
    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"
 
diff --git a/gdb/arch/arm-linux.c b/gdb/arch/arm-linux.c
index 238e6815e1..a399f3e71c 100644
--- a/gdb/arch/arm-linux.c
+++ b/gdb/arch/arm-linux.c
@@ -17,8 +17,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-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"
diff --git a/gdb/arch/arm.c b/gdb/arch/arm.c
index bf71237464..93738f0a0f 100644
--- a/gdb/arch/arm.c
+++ b/gdb/arch/arm.c
@@ -17,8 +17,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-regcache.h"
+#include "common/common-defs.h"
+#include "common/common-regcache.h"
 #include "arm.h"
 
 /* See arm.h.  */
diff --git a/gdb/arch/i386.c b/gdb/arch/i386.c
index 73987da97b..7d2901333b 100644
--- a/gdb/arch/i386.c
+++ b/gdb/arch/i386.c
@@ -15,10 +15,10 @@ 
    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"
diff --git a/gdb/arch/ppc-linux-common.c b/gdb/arch/ppc-linux-common.c
index 179a0d905a..6badd2f7d2 100644
--- a/gdb/arch/ppc-linux-common.c
+++ b/gdb/arch/ppc-linux-common.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 "common-defs.h"
+#include "common/common-defs.h"
 #include "arch/ppc-linux-common.h"
 #include "arch/ppc-linux-tdesc.h"
 
diff --git a/gdb/arch/riscv.c b/gdb/arch/riscv.c
index 8b51a36e3c..5ed1d47ac5 100644
--- a/gdb/arch/riscv.c
+++ b/gdb/arch/riscv.c
@@ -15,7 +15,7 @@ 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
+#include "common/common-defs.h"
 #include "riscv.h"
 #include <stdlib.h>
 #include <unordered_map>
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 98da305145..c0c20c55b9 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -55,7 +55,7 @@ 
 #include "coff/internal.h"
 #include "elf/arm.h"
 
-#include "vec.h"
+#include "common/vec.h"
 
 #include "record.h"
 #include "record-full.h"
@@ -70,7 +70,7 @@ 
 #include "features/arm/arm-with-neon.c"
 
 #if GDB_SELF_TEST
-#include "selftest.h"
+#include "common/selftest.h"
 #endif
 
 static int arm_debug;
diff --git a/gdb/auto-load.c b/gdb/auto-load.c
index e3925acf1e..00869fe0b1 100644
--- a/gdb/auto-load.c
+++ b/gdb/auto-load.c
@@ -36,7 +36,7 @@ 
 #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>
diff --git a/gdb/auxv.c b/gdb/auxv.c
index 369e85ba6d..13caa93665 100644
--- a/gdb/auxv.c
+++ b/gdb/auxv.c
@@ -25,7 +25,7 @@ 
 #include "valprint.h"
 #include "gdbcore.h"
 #include "observable.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 #include "objfiles.h"
 
 #include "auxv.h"
diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c
index 88e9b4331f..778e89515b 100644
--- a/gdb/ax-gdb.c
+++ b/gdb/ax-gdb.c
@@ -46,7 +46,7 @@ 
 #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,
diff --git a/gdb/ax-general.c b/gdb/ax-general.c
index 9ee4a2b439..f956dfc2f5 100644
--- a/gdb/ax-general.c
+++ b/gdb/ax-general.c
@@ -353,7 +353,7 @@  struct aop_map aop_map[] =
   {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
 };
 
diff --git a/gdb/ax.h b/gdb/ax.h
index 6c3d9cb84a..e203a4b8f8 100644
--- a/gdb/ax.h
+++ b/gdb/ax.h
@@ -19,7 +19,7 @@ 
 #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
@@ -164,7 +164,7 @@  enum agent_op
   {
 #define DEFOP(NAME, SIZE, DATA_SIZE, CONSUMED, PRODUCED, VALUE)  \
     aop_ ## NAME = VALUE,
-#include "ax.def"
+#include "common/ax.def"
 #undef DEFOP
     aop_last
   };
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 3166fa0129..8b09c67802 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -65,7 +65,7 @@ 
 #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"
diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 97b6f3fbc6..8c8c66a815 100644
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -21,10 +21,10 @@ 
 
 #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>
diff --git a/gdb/btrace.c b/gdb/btrace.c
index 84d80b73e8..000db4260e 100644
--- a/gdb/btrace.c
+++ b/gdb/btrace.c
@@ -31,7 +31,7 @@ 
 #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"
 
diff --git a/gdb/btrace.h b/gdb/btrace.h
index fe9e01acc9..7b38b14ac0 100644
--- a/gdb/btrace.h
+++ b/gdb/btrace.h
@@ -26,7 +26,7 @@ 
    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"
 
diff --git a/gdb/build-id.c b/gdb/build-id.c
index 5e2dccc85f..e0c35579cd 100644
--- a/gdb/build-id.c
+++ b/gdb/build-id.c
@@ -21,7 +21,7 @@ 
 #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"
diff --git a/gdb/charset.c b/gdb/charset.c
index d06c4dea44..5d8a996603 100644
--- a/gdb/charset.c
+++ b/gdb/charset.c
@@ -21,12 +21,12 @@ 
 #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
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 57cfad441c..fa99503b0c 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -23,7 +23,7 @@ 
 #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"
@@ -36,7 +36,7 @@ 
 #include "source.h"
 #include "disasm.h"
 #include "tracepoint.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 #include "location.h"
 #include "block.h"
 
diff --git a/gdb/cli/cli-dump.c b/gdb/cli/cli-dump.c
index 4dcaa3a46d..8f0d8bfa8c 100644
--- a/gdb/cli/cli-dump.c
+++ b/gdb/cli/cli-dump.c
@@ -30,7 +30,7 @@ 
 #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>
diff --git a/gdb/command.h b/gdb/command.h
index bac59e7e03..4a239a7196 100644
--- a/gdb/command.h
+++ b/gdb/command.h
@@ -18,7 +18,7 @@ 
 #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;
diff --git a/gdb/compile/compile-cplus-symbols.c b/gdb/compile/compile-cplus-symbols.c
index de77d5aca1..0979784466 100644
--- a/gdb/compile/compile-cplus-symbols.c
+++ b/gdb/compile/compile-cplus-symbols.c
@@ -21,7 +21,7 @@ 
 #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"
diff --git a/gdb/compile/compile-cplus-types.c b/gdb/compile/compile-cplus-types.c
index 330589c796..ee3bb438a3 100644
--- a/gdb/compile/compile-cplus-types.c
+++ b/gdb/compile/compile-cplus-types.c
@@ -23,7 +23,7 @@ 
 #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"
diff --git a/gdb/compile/compile-loc2c.c b/gdb/compile/compile-loc2c.c
index 7a60925d51..b5682d80a5 100644
--- a/gdb/compile/compile-loc2c.c
+++ b/gdb/compile/compile-loc2c.c
@@ -28,7 +28,7 @@ 
 #include "compile.h"
 #include "block.h"
 #include "dwarf2-frame.h"
-#include "gdb_vecs.h"
+#include "common/gdb_vecs.h"
 #include "value.h"
 
 
diff --git a/gdb/compile/compile.c b/gdb/compile/compile.c
index b11df7ddf6..72920642d1 100644
--- a/gdb/compile/compile.c
+++ b/gdb/compile/compile.c
@@ -34,10 +34,10 @@ 
 #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"
diff --git a/gdb/completer.c b/gdb/completer.c
index fed815a53c..d7cf4fd120 100644
--- a/gdb/completer.c
+++ b/gdb/completer.c
@@ -22,7 +22,7 @@ 
 #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"
diff --git a/gdb/completer.h b/gdb/completer.h
index e81243a721..52f8d7dff4 100644
--- a/gdb/completer.h
+++ b/gdb/completer.h
@@ -17,7 +17,7 @@ 
 #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.  */
diff --git a/gdb/corelow.c b/gdb/corelow.c
index 462103a80b..52d6d95b3c 100644
--- a/gdb/corelow.c
+++ b/gdb/corelow.c
@@ -42,7 +42,7 @@ 
 #include "objfiles.h"
 #include "gdb_bfd.h"
 #include "completer.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 
 #ifndef O_LARGEFILE
 #define O_LARGEFILE 0
diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index bc5e8047ae..e3d6112f23 100644
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -34,9 +34,9 @@ 
 #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
diff --git a/gdb/cp-support.h b/gdb/cp-support.h
index 2677e1bfca..3df4cb9e4b 100644
--- a/gdb/cp-support.h
+++ b/gdb/cp-support.h
@@ -25,8 +25,8 @@ 
 /* 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>
diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index 70b96970be..7124da42ec 100644
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -35,7 +35,7 @@ 
 #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
diff --git a/gdb/csky-tdep.c b/gdb/csky-tdep.c
index 1259ccaeb1..ee17961efc 100644
--- a/gdb/csky-tdep.c
+++ b/gdb/csky-tdep.c
@@ -20,7 +20,7 @@ 
    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"
diff --git a/gdb/defs.h b/gdb/defs.h
index 25681c0677..a44e186907 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -25,7 +25,7 @@ 
 #  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>
@@ -52,7 +52,7 @@ 
 
 #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
diff --git a/gdb/disasm-selftests.c b/gdb/disasm-selftests.c
index 552fa81157..48b466baf1 100644
--- a/gdb/disasm-selftests.c
+++ b/gdb/disasm-selftests.c
@@ -21,7 +21,7 @@ 
 #include "disasm.h"
 
 #if GDB_SELF_TEST
-#include "selftest.h"
+#include "common/selftest.h"
 #include "selftest-arch.h"
 
 namespace selftests {
diff --git a/gdb/dtrace-probe.c b/gdb/dtrace-probe.c
index b832f65d0f..527e0f0cd5 100644
--- a/gdb/dtrace-probe.c
+++ b/gdb/dtrace-probe.c
@@ -21,7 +21,7 @@ 
 
 #include "defs.h"
 #include "probe.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "elf-bfd.h"
 #include "gdbtypes.h"
 #include "obstack.h"
diff --git a/gdb/dwarf-index-cache.c b/gdb/dwarf-index-cache.c
index 96c7b8609e..445f8b199e 100644
--- a/gdb/dwarf-index-cache.c
+++ b/gdb/dwarf-index-cache.c
@@ -28,7 +28,7 @@ 
 #include "dwarf-index-write.h"
 #include "dwarf2read.h"
 #include "objfiles.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include <string>
 #include <stdlib.h>
 
diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c
index b3a2e627b0..178ac44ecb 100644
--- a/gdb/dwarf2-frame.c
+++ b/gdb/dwarf2-frame.c
@@ -40,7 +40,7 @@ 
 #include "dwarf2loc.h"
 #include "dwarf2-frame-tailcall.h"
 #if GDB_SELF_TEST
-#include "selftest.h"
+#include "common/selftest.h"
 #include "selftest-arch.h"
 #endif
 
diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index 0080d004f1..9c974a1113 100644
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -38,7 +38,7 @@ 
 #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>
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index f6aedfc636..98f46e0416 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -59,7 +59,7 @@ 
 #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"
@@ -69,7 +69,7 @@ 
 #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"
@@ -85,7 +85,7 @@ 
 #include <algorithm>
 #include <unordered_set>
 #include <unordered_map>
-#include "selftest.h"
+#include "common/selftest.h"
 #include <cmath>
 #include <set>
 #include <forward_list>
diff --git a/gdb/event-loop.c b/gdb/event-loop.c
index 3f4456c3e5..28e81646fb 100644
--- a/gdb/event-loop.c
+++ b/gdb/event-loop.c
@@ -20,7 +20,7 @@ 
 #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
@@ -32,7 +32,7 @@ 
 #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"
diff --git a/gdb/event-top.c b/gdb/event-top.c
index 920b47f7e3..fb5d51c6e1 100644
--- a/gdb/event-top.c
+++ b/gdb/event-top.c
@@ -37,7 +37,7 @@ 
 #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"
 
diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c
index b54240ae9c..712f9d3b7b 100644
--- a/gdb/fbsd-nat.c
+++ b/gdb/fbsd-nat.c
@@ -18,14 +18,14 @@ 
    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>
@@ -37,7 +37,7 @@ 
 #include <libutil.h>
 #endif
 #if !defined(HAVE_KINFO_GETVMMAP)
-#include "filestuff.h"
+#include "common/filestuff.h"
 #endif
 
 #include "elf-bfd.h"
diff --git a/gdb/findvar.c b/gdb/findvar.c
index 19467f127b..e89ee37ffc 100644
--- a/gdb/findvar.c
+++ b/gdb/findvar.c
@@ -32,7 +32,7 @@ 
 #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
diff --git a/gdb/fork-child.c b/gdb/fork-child.c
index 3dead5f83e..4c49848830 100644
--- a/gdb/fork-child.c
+++ b/gdb/fork-child.c
@@ -25,8 +25,8 @@ 
 #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"
 
diff --git a/gdb/gcore.c b/gdb/gcore.c
index aca3be9858..d47b2baec4 100644
--- a/gdb/gcore.c
+++ b/gdb/gcore.c
@@ -36,7 +36,7 @@ 
 #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
diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c
index 04be0a03f7..b0824ad210 100644
--- a/gdb/gdb_bfd.c
+++ b/gdb/gdb_bfd.c
@@ -22,8 +22,8 @@ 
 #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
diff --git a/gdb/gdb_select.h b/gdb/gdb_select.h
index b3cb8203a8..ec4547bde2 100644
--- a/gdb/gdb_select.h
+++ b/gdb/gdb_select.h
@@ -23,7 +23,7 @@ 
 #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
diff --git a/gdb/gdb_usleep.c b/gdb/gdb_usleep.c
index c7f1a79c1d..25cc8e1b16 100644
--- a/gdb/gdb_usleep.c
+++ b/gdb/gdb_usleep.c
@@ -18,7 +18,7 @@ 
 #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)
diff --git a/gdb/gdbarch-selftests.c b/gdb/gdbarch-selftests.c
index 50062abe8a..5137624dec 100644
--- a/gdb/gdbarch-selftests.c
+++ b/gdb/gdbarch-selftests.c
@@ -19,7 +19,7 @@ 
 
 #include "defs.h"
 #if GDB_SELF_TEST
-#include "selftest.h"
+#include "common/selftest.h"
 #include "selftest-arch.h"
 #include "inferior.h"
 #include "gdbthread.h"
diff --git a/gdb/gdbserver/ax.c b/gdb/gdbserver/ax.c
index bdba4cd4da..a16fba1ccd 100644
--- a/gdb/gdbserver/ax.c
+++ b/gdb/gdbserver/ax.c
@@ -18,9 +18,9 @@ 
 
 #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);
 
@@ -56,7 +56,7 @@  enum gdb_agent_op
   {
 #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
   };
@@ -65,7 +65,7 @@  static const char *gdb_agent_op_names [gdb_agent_op_last] =
   {
     "?undef?"
 #define DEFOP(NAME, SIZE, DATA_SIZE, CONSUMED, PRODUCED, VALUE)  , # NAME
-#include "ax.def"
+#include "common/ax.def"
 #undef DEFOP
   };
 
@@ -74,7 +74,7 @@  static const unsigned char gdb_agent_op_sizes [gdb_agent_op_last] =
   {
     0
 #define DEFOP(NAME, SIZE, DATA_SIZE, CONSUMED, PRODUCED, VALUE)  , SIZE
-#include "ax.def"
+#include "common/ax.def"
 #undef DEFOP
   };
 #endif
diff --git a/gdb/gdbserver/event-loop.c b/gdb/gdbserver/event-loop.c
index 3ffd099648..0442680c23 100644
--- a/gdb/gdbserver/event-loop.c
+++ b/gdb/gdbserver/event-loop.c
@@ -21,7 +21,7 @@ 
 #include "server.h"
 
 #include <sys/types.h>
-#include "gdb_sys_time.h"
+#include "common/gdb_sys_time.h"
 
 #ifdef USE_WIN32API
 #include <windows.h>
diff --git a/gdb/gdbserver/fork-child.c b/gdb/gdbserver/fork-child.c
index 8b792b5b80..a8bd040378 100644
--- a/gdb/gdbserver/fork-child.c
+++ b/gdb/gdbserver/fork-child.c
@@ -17,7 +17,7 @@ 
    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>
diff --git a/gdb/gdbserver/gdbreplay.c b/gdb/gdbserver/gdbreplay.c
index 7596122fb9..26a55533ff 100644
--- a/gdb/gdbserver/gdbreplay.c
+++ b/gdb/gdbserver/gdbreplay.c
@@ -17,8 +17,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 "version.h"
+#include "common/common-defs.h"
+#include "common/version.h"
 
 #if HAVE_SYS_FILE_H
 #include <sys/file.h>
@@ -49,7 +49,7 @@ 
 #include <wspiapi.h>
 #endif
 
-#include "netstuff.h"
+#include "common/netstuff.h"
 
 #ifndef HAVE_SOCKLEN_T
 typedef int socklen_t;
diff --git a/gdb/gdbserver/gdbthread.h b/gdb/gdbserver/gdbthread.h
index 2e1a844276..fcd02029e7 100644
--- a/gdb/gdbserver/gdbthread.h
+++ b/gdb/gdbserver/gdbthread.h
@@ -19,7 +19,7 @@ 
 #ifndef GDB_THREAD_H
 #define GDB_THREAD_H
 
-#include "common-gdbthread.h"
+#include "common/common-gdbthread.h"
 #include "inferiors.h"
 
 #include <list>
diff --git a/gdb/gdbserver/hostio-errno.c b/gdb/gdbserver/hostio-errno.c
index 5f228cc62e..6325fee3ff 100644
--- a/gdb/gdbserver/hostio-errno.c
+++ b/gdb/gdbserver/hostio-errno.c
@@ -22,7 +22,7 @@ 
    on top of errno.  */
 
 #include "server.h"
-#include "fileio.h"
+#include "common/fileio.h"
 
 void
 hostio_last_error_from_errno (char *buf)
diff --git a/gdb/gdbserver/hostio.c b/gdb/gdbserver/hostio.c
index 7214b5e8e2..cf75de0c00 100644
--- a/gdb/gdbserver/hostio.c
+++ b/gdb/gdbserver/hostio.c
@@ -27,7 +27,7 @@ 
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "fileio.h"
+#include "common/fileio.h"
 
 extern int remote_debug;
 
diff --git a/gdb/gdbserver/i387-fp.c b/gdb/gdbserver/i387-fp.c
index c33ab115b7..7dde85a61e 100644
--- a/gdb/gdbserver/i387-fp.c
+++ b/gdb/gdbserver/i387-fp.c
@@ -18,7 +18,7 @@ 
 
 #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;
diff --git a/gdb/gdbserver/inferiors.h b/gdb/gdbserver/inferiors.h
index 843d4dac7a..b2a1866335 100644
--- a/gdb/gdbserver/inferiors.h
+++ b/gdb/gdbserver/inferiors.h
@@ -19,7 +19,7 @@ 
 #ifndef INFERIORS_H
 #define INFERIORS_H
 
-#include "gdb_vecs.h"
+#include "common/gdb_vecs.h"
 #include <list>
 
 struct thread_info;
diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index 17cce24d76..44016d2310 100644
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -19,13 +19,13 @@ 
 #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"
@@ -43,13 +43,13 @@ 
 #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
@@ -101,7 +101,7 @@ 
 
 #ifdef HAVE_LINUX_BTRACE
 # include "nat/linux-btrace.h"
-# include "btrace-common.h"
+# include "common/btrace-common.h"
 #endif
 
 #ifndef HAVE_ELF32_AUXV_T
diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c
index 056d060046..029796e361 100644
--- a/gdb/gdbserver/linux-x86-low.c
+++ b/gdb/gdbserver/linux-x86-low.c
@@ -24,7 +24,7 @@ 
 #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__
@@ -38,7 +38,7 @@ 
 #include "elf/common.h"
 #endif
 
-#include "agent.h"
+#include "common/agent.h"
 #include "tdesc.h"
 #include "tracepoint.h"
 #include "ax.h"
diff --git a/gdb/gdbserver/linux-x86-tdesc-selftest.c b/gdb/gdbserver/linux-x86-tdesc-selftest.c
index 4871c9d491..50474b3668 100644
--- a/gdb/gdbserver/linux-x86-tdesc-selftest.c
+++ b/gdb/gdbserver/linux-x86-tdesc-selftest.c
@@ -19,7 +19,7 @@ 
 #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);
diff --git a/gdb/gdbserver/lynx-i386-low.c b/gdb/gdbserver/lynx-i386-low.c
index 0731d2a73d..bc1027dc52 100644
--- a/gdb/gdbserver/lynx-i386-low.c
+++ b/gdb/gdbserver/lynx-i386-low.c
@@ -19,7 +19,7 @@ 
 #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"
 
diff --git a/gdb/gdbserver/lynx-low.c b/gdb/gdbserver/lynx-low.c
index 00e327224f..4f6314669e 100644
--- a/gdb/gdbserver/lynx-low.c
+++ b/gdb/gdbserver/lynx-low.c
@@ -25,10 +25,10 @@ 
 #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;
diff --git a/gdb/gdbserver/mem-break.h b/gdb/gdbserver/mem-break.h
index b13ad947fc..49cdfeaa25 100644
--- a/gdb/gdbserver/mem-break.h
+++ b/gdb/gdbserver/mem-break.h
@@ -21,7 +21,7 @@ 
 #ifndef MEM_BREAK_H
 #define MEM_BREAK_H
 
-#include "break-common.h"
+#include "common/break-common.h"
 
 /* Breakpoints are opaque.  */
 struct breakpoint;
diff --git a/gdb/gdbserver/notif.h b/gdb/gdbserver/notif.h
index 75a9da6000..add55360dd 100644
--- a/gdb/gdbserver/notif.h
+++ b/gdb/gdbserver/notif.h
@@ -17,7 +17,7 @@ 
    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
diff --git a/gdb/gdbserver/nto-x86-low.c b/gdb/gdbserver/nto-x86-low.c
index 19c9acf42b..1b00f7f6cc 100644
--- a/gdb/gdbserver/nto-x86-low.c
+++ b/gdb/gdbserver/nto-x86-low.c
@@ -23,7 +23,7 @@ 
 #include "regcache.h"
 
 #include <x86/context.h>
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 #include "arch/i386.h"
 #include "x86-tdesc.h"
 
diff --git a/gdb/gdbserver/regcache.c b/gdb/gdbserver/regcache.c
index 16db43e80c..a56b580654 100644
--- a/gdb/gdbserver/regcache.c
+++ b/gdb/gdbserver/regcache.c
@@ -20,7 +20,7 @@ 
 #include "regdef.h"
 #include "gdbthread.h"
 #include "tdesc.h"
-#include "rsp-low.h"
+#include "common/rsp-low.h"
 #ifndef IN_PROCESS_AGENT
 
 struct regcache *
diff --git a/gdb/gdbserver/regcache.h b/gdb/gdbserver/regcache.h
index 27a834b6eb..98c3131624 100644
--- a/gdb/gdbserver/regcache.h
+++ b/gdb/gdbserver/regcache.h
@@ -19,7 +19,7 @@ 
 #ifndef REGCACHE_H
 #define REGCACHE_H
 
-#include "common-regcache.h"
+#include "common/common-regcache.h"
 
 struct thread_info;
 struct target_desc;
diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c
index e7a2170bbd..ad0228db99 100644
--- a/gdb/gdbserver/remote-utils.c
+++ b/gdb/gdbserver/remote-utils.c
@@ -24,9 +24,9 @@ 
 #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>
@@ -55,7 +55,7 @@ 
 #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>
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index 291a4b1dda..f9bfdd7307 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -18,29 +18,29 @@ 
 
 #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"
 
diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index 4aaa19f0b7..26d0dfb0eb 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -19,7 +19,7 @@ 
 #ifndef SERVER_H
 #define SERVER_H
 
-#include "common-defs.h"
+#include "common/common-defs.h"
 
 gdb_static_assert (sizeof (CORE_ADDR) >= sizeof (void *));
 
@@ -27,7 +27,7 @@  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
@@ -54,13 +54,13 @@  int vsnprintf(char *str, size_t size, const char *format, va_list ap);
 #  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 */
 
@@ -104,7 +104,7 @@  extern int in_queued_stop_replies (ptid_t ptid);
 
 #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).  */
diff --git a/gdb/gdbserver/spu-low.c b/gdb/gdbserver/spu-low.c
index c3a60a9a50..97f985ae8f 100644
--- a/gdb/gdbserver/spu-low.c
+++ b/gdb/gdbserver/spu-low.c
@@ -20,12 +20,12 @@ 
 
 #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"
 
diff --git a/gdb/gdbserver/symbol.c b/gdb/gdbserver/symbol.c
index b3c462ca25..20eb492f6b 100644
--- a/gdb/gdbserver/symbol.c
+++ b/gdb/gdbserver/symbol.c
@@ -18,7 +18,7 @@ 
    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.  */
 
diff --git a/gdb/gdbserver/target.h b/gdb/gdbserver/target.h
index 6d04ff5d9b..225edd05df 100644
--- a/gdb/gdbserver/target.h
+++ b/gdb/gdbserver/target.h
@@ -27,7 +27,7 @@ 
 #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;
diff --git a/gdb/gdbserver/thread-db.c b/gdb/gdbserver/thread-db.c
index 973491a5dc..d4d4958c73 100644
--- a/gdb/gdbserver/thread-db.c
+++ b/gdb/gdbserver/thread-db.c
@@ -26,7 +26,7 @@  extern int debug_threads;
 
 #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"
 
diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c
index 5fb8a5134b..9577ab7f1e 100644
--- a/gdb/gdbserver/tracepoint.c
+++ b/gdb/gdbserver/tracepoint.c
@@ -19,7 +19,7 @@ 
 #include "server.h"
 #include "tracepoint.h"
 #include "gdbthread.h"
-#include "rsp-low.h"
+#include "common/rsp-low.h"
 
 #include <ctype.h>
 #include <fcntl.h>
@@ -30,7 +30,7 @@ 
 #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 */
 
diff --git a/gdb/gdbserver/win32-i386-low.c b/gdb/gdbserver/win32-i386-low.c
index 30f7af7553..3be75d2bf2 100644
--- a/gdb/gdbserver/win32-i386-low.c
+++ b/gdb/gdbserver/win32-i386-low.c
@@ -18,7 +18,7 @@ 
 #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
diff --git a/gdb/gdbserver/win32-low.c b/gdb/gdbserver/win32-low.c
index 54f0ebc9b1..1a50141c12 100644
--- a/gdb/gdbserver/win32-low.c
+++ b/gdb/gdbserver/win32-low.c
@@ -32,8 +32,8 @@ 
 #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>
diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h
index 95db69605e..24aa20e442 100644
--- a/gdb/gdbthread.h
+++ b/gdb/gdbthread.h
@@ -31,7 +31,7 @@  struct symtab;
 #include "target/waitstatus.h"
 #include "cli/cli-utils.h"
 #include "common/refcounted-object.h"
-#include "common-gdbthread.h"
+#include "common/common-gdbthread.h"
 
 struct inferior;
 
diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index a8e1464bf1..cb8331daaf 100644
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -60,7 +60,7 @@  extern "C"
 #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"
diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c
index 7da7096b45..27e236918f 100644
--- a/gdb/go32-nat.c
+++ b/gdb/go32-nat.c
@@ -89,7 +89,7 @@ 
 #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"
diff --git a/gdb/guile/guile.c b/gdb/guile/guile.c
index 6d1baa90a7..faf7f3326c 100644
--- a/gdb/guile/guile.c
+++ b/gdb/guile/guile.c
@@ -30,7 +30,7 @@ 
 #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"
diff --git a/gdb/guile/scm-type.c b/gdb/guile/scm-type.c
index a7ff4cc39c..2d2e3ddb3e 100644
--- a/gdb/guile/scm-type.c
+++ b/gdb/guile/scm-type.c
@@ -26,7 +26,7 @@ 
 #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"
diff --git a/gdb/i386-fbsd-nat.c b/gdb/i386-fbsd-nat.c
index 855572143b..2309b76506 100644
--- a/gdb/i386-fbsd-nat.c
+++ b/gdb/i386-fbsd-nat.c
@@ -30,7 +30,7 @@ 
 #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"
 
diff --git a/gdb/i386-fbsd-tdep.c b/gdb/i386-fbsd-tdep.c
index 82dfbd5c35..236edd692a 100644
--- a/gdb/i386-fbsd-tdep.c
+++ b/gdb/i386-fbsd-tdep.c
@@ -24,7 +24,7 @@ 
 #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"
diff --git a/gdb/i386-go32-tdep.c b/gdb/i386-go32-tdep.c
index 5a18f35f99..06833c346c 100644
--- a/gdb/i386-go32-tdep.c
+++ b/gdb/i386-go32-tdep.c
@@ -19,7 +19,7 @@ 
 
 #include "defs.h"
 #include "i386-tdep.h"
-#include "x86-xstate.h"
+#include "common/x86-xstate.h"
 #include "target-descriptions.h"
 #include "osabi.h"
 
diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c
index 622f9bc274..abcf72f898 100644
--- a/gdb/i386-linux-nat.c
+++ b/gdb/i386-linux-nat.c
@@ -31,7 +31,7 @@ 
 #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"
diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c
index 0f344b0710..da81715061 100644
--- a/gdb/i386-linux-tdep.c
+++ b/gdb/i386-linux-tdep.c
@@ -38,7 +38,7 @@ 
 #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"
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 8b2c72ac7b..663d510a91 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -46,7 +46,7 @@ 
 #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"
diff --git a/gdb/i387-tdep.c b/gdb/i387-tdep.c
index 678cf2e67b..25786619bf 100644
--- a/gdb/i387-tdep.c
+++ b/gdb/i387-tdep.c
@@ -28,7 +28,7 @@ 
 
 #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.  */
 
diff --git a/gdb/ia64-linux-nat.c b/gdb/ia64-linux-nat.c
index 2af87467e8..a77a86f490 100644
--- a/gdb/ia64-linux-nat.c
+++ b/gdb/ia64-linux-nat.c
@@ -28,7 +28,7 @@ 
 
 #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
diff --git a/gdb/inf-child.c b/gdb/inf-child.c
index 96ba72bf51..41e9e67252 100644
--- a/gdb/inf-child.c
+++ b/gdb/inf-child.c
@@ -30,10 +30,10 @@ 
 #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>
diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c
index 1fd788d7f8..0956094c6a 100644
--- a/gdb/inf-ptrace.c
+++ b/gdb/inf-ptrace.c
@@ -25,7 +25,7 @@ 
 #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"
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index 3c3add89ab..934b5a105d 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -25,7 +25,7 @@ 
 #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"
diff --git a/gdb/inferior.c b/gdb/inferior.c
index 01aaedee08..b13d8f3bff 100644
--- a/gdb/inferior.c
+++ b/gdb/inferior.c
@@ -29,7 +29,7 @@ 
 #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"
diff --git a/gdb/inferior.h b/gdb/inferior.h
index a82df1a52a..63ce6f41ed 100644
--- a/gdb/inferior.h
+++ b/gdb/inferior.h
@@ -44,7 +44,7 @@  struct thread_info;
 #include "frame.h"
 
 /* For gdb_environ.  */
-#include "environ.h"
+#include "common/environ.h"
 
 #include "progspace.h"
 #include "registry.h"
@@ -52,7 +52,7 @@  struct thread_info;
 #include "symfile-add-flags.h"
 #include "common/refcounted-object.h"
 
-#include "common-inferior.h"
+#include "common/common-inferior.h"
 #include "gdbthread.h"
 
 struct infcall_suspend_state;
diff --git a/gdb/inflow.c b/gdb/inflow.c
index 9fd3acfdd2..b71511308b 100644
--- a/gdb/inflow.c
+++ b/gdb/inflow.c
@@ -34,7 +34,7 @@ 
 #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>
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 150288264f..6528efa9ac 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -25,7 +25,7 @@ 
 #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"
diff --git a/gdb/inline-frame.c b/gdb/inline-frame.c
index d96b83ce08..a5e1f20ff7 100644
--- a/gdb/inline-frame.c
+++ b/gdb/inline-frame.c
@@ -27,7 +27,7 @@ 
 #include "gdbthread.h"
 #include "regcache.h"
 #include "symtab.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "frame.h"
 #include <algorithm>
 
diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c
index 96663a560e..b1b390c5c6 100644
--- a/gdb/linux-fork.c
+++ b/gdb/linux-fork.c
@@ -31,7 +31,7 @@ 
 #include "source.h"
 
 #include "nat/gdb_ptrace.h"
-#include "gdb_wait.h"
+#include "common/gdb_wait.h"
 #include <dirent.h>
 #include <ctype.h>
 
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index c0d5f8dc66..603295a503 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -23,7 +23,7 @@ 
 #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"
@@ -58,14 +58,14 @@ 
 #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"
 
 #ifndef SPUFS_MAGIC
 #define SPUFS_MAGIC 0x23c9b64e
diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c
index d2b013e2e3..fd67dcb17b 100644
--- a/gdb/linux-thread-db.c
+++ b/gdb/linux-thread-db.c
@@ -21,7 +21,7 @@ 
 #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"
diff --git a/gdb/location.c b/gdb/location.c
index c7e780c0a0..2b375872c7 100644
--- a/gdb/location.c
+++ b/gdb/location.c
@@ -17,7 +17,7 @@ 
    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"
diff --git a/gdb/machoread.c b/gdb/machoread.c
index 85353fc9d1..84e39fdf88 100644
--- a/gdb/machoread.c
+++ b/gdb/machoread.c
@@ -28,7 +28,7 @@ 
 #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"
diff --git a/gdb/main.c b/gdb/main.c
index ebfc38329e..a7283902fe 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -40,11 +40,11 @@ 
 #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"
 
diff --git a/gdb/maint.c b/gdb/maint.c
index ddd25a480c..8fc660eb93 100644
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -38,7 +38,7 @@ 
 #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"
diff --git a/gdb/maint.h b/gdb/maint.h
index 7312eaceb5..1d8d2cc557 100644
--- a/gdb/maint.h
+++ b/gdb/maint.h
@@ -19,7 +19,7 @@ 
 #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);
diff --git a/gdb/memattr.c b/gdb/memattr.c
index 83d708fed7..0769a80a06 100644
--- a/gdb/memattr.c
+++ b/gdb/memattr.c
@@ -25,7 +25,7 @@ 
 #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>
diff --git a/gdb/memrange.h b/gdb/memrange.h
index ecdaf209ca..d751d3cf23 100644
--- a/gdb/memrange.h
+++ b/gdb/memrange.h
@@ -20,7 +20,7 @@ 
 #ifndef MEMRANGE_H
 #define MEMRANGE_H
 
-#include "vec.h"
+#include "common/vec.h"
 
 /* Defines a [START, START + LENGTH) memory range.  */
 
diff --git a/gdb/mi/mi-cmd-env.c b/gdb/mi/mi-cmd-env.c
index 24744ac67b..fcc49b9eb3 100644
--- a/gdb/mi/mi-cmd-env.c
+++ b/gdb/mi/mi-cmd-env.c
@@ -26,7 +26,7 @@ 
 #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"
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 7176963845..46bc928d9f 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -56,7 +56,7 @@ 
 #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"
diff --git a/gdb/mi/mi-parse.h b/gdb/mi/mi-parse.h
index f8ba53d44f..d9d36fb501 100644
--- a/gdb/mi/mi-parse.h
+++ b/gdb/mi/mi-parse.h
@@ -20,7 +20,7 @@ 
 #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.  */
 
diff --git a/gdb/minsyms.c b/gdb/minsyms.c
index 7cd7ba9f67..0513cfe69f 100644
--- a/gdb/minsyms.c
+++ b/gdb/minsyms.c
@@ -50,7 +50,7 @@ 
 #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"
 
diff --git a/gdb/mips-linux-tdep.c b/gdb/mips-linux-tdep.c
index bf39cfc840..13c5e06675 100644
--- a/gdb/mips-linux-tdep.c
+++ b/gdb/mips-linux-tdep.c
@@ -38,7 +38,7 @@ 
 #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"
diff --git a/gdb/namespace.h b/gdb/namespace.h
index ba53eb084e..2d39580496 100644
--- a/gdb/namespace.h
+++ b/gdb/namespace.h
@@ -19,8 +19,8 @@ 
 #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
diff --git a/gdb/nat/aarch64-linux-hw-point.c b/gdb/nat/aarch64-linux-hw-point.c
index dbb19ada12..eed060610e 100644
--- a/gdb/nat/aarch64-linux-hw-point.c
+++ b/gdb/nat/aarch64-linux-hw-point.c
@@ -16,9 +16,9 @@ 
    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"
 
diff --git a/gdb/nat/aarch64-linux-hw-point.h b/gdb/nat/aarch64-linux-hw-point.h
index f0b3451d49..a84058e67d 100644
--- a/gdb/nat/aarch64-linux-hw-point.h
+++ b/gdb/nat/aarch64-linux-hw-point.h
@@ -19,7 +19,7 @@ 
 #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
diff --git a/gdb/nat/aarch64-linux.c b/gdb/nat/aarch64-linux.c
index f9a95bb282..9c4c3ada71 100644
--- a/gdb/nat/aarch64-linux.c
+++ b/gdb/nat/aarch64-linux.c
@@ -16,8 +16,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 "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"
diff --git a/gdb/nat/aarch64-sve-linux-ptrace.c b/gdb/nat/aarch64-sve-linux-ptrace.c
index bc0d32fe87..30faab22bb 100644
--- a/gdb/nat/aarch64-sve-linux-ptrace.c
+++ b/gdb/nat/aarch64-sve-linux-ptrace.c
@@ -19,12 +19,12 @@ 
 
 #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;
diff --git a/gdb/nat/amd64-linux-siginfo.c b/gdb/nat/amd64-linux-siginfo.c
index 6a3c644575..dab52684ad 100644
--- a/gdb/nat/amd64-linux-siginfo.c
+++ b/gdb/nat/amd64-linux-siginfo.c
@@ -18,7 +18,7 @@ 
    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
diff --git a/gdb/nat/fork-inferior.c b/gdb/nat/fork-inferior.c
index fa121655e8..fe9360a503 100644
--- a/gdb/nat/fork-inferior.c
+++ b/gdb/nat/fork-inferior.c
@@ -17,16 +17,16 @@ 
    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;
diff --git a/gdb/nat/linux-btrace.c b/gdb/nat/linux-btrace.c
index fce2a67f21..b51e70fbaf 100644
--- a/gdb/nat/linux-btrace.c
+++ b/gdb/nat/linux-btrace.c
@@ -19,12 +19,12 @@ 
    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"
 
diff --git a/gdb/nat/linux-btrace.h b/gdb/nat/linux-btrace.h
index 77ce10bf5a..2876a8eb65 100644
--- a/gdb/nat/linux-btrace.h
+++ b/gdb/nat/linux-btrace.h
@@ -22,8 +22,8 @@ 
 #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
diff --git a/gdb/nat/linux-namespaces.c b/gdb/nat/linux-namespaces.c
index 2e2fe35013..812f8c1976 100644
--- a/gdb/nat/linux-namespaces.c
+++ b/gdb/nat/linux-namespaces.c
@@ -17,15 +17,15 @@ 
    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>
 
diff --git a/gdb/nat/linux-osdata.c b/gdb/nat/linux-osdata.c
index 548283b6d0..3599df7cbe 100644
--- a/gdb/nat/linux-osdata.c
+++ b/gdb/nat/linux-osdata.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 "common-defs.h"
+#include "common/common-defs.h"
 #include "linux-osdata.h"
 
 #include <sys/types.h>
@@ -32,11 +32,11 @@ 
 #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)
diff --git a/gdb/nat/linux-personality.c b/gdb/nat/linux-personality.c
index 3068170a6d..2ae84e51b0 100644
--- a/gdb/nat/linux-personality.c
+++ b/gdb/nat/linux-personality.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 "common-defs.h"
+#include "common/common-defs.h"
 #include "nat/linux-personality.h"
 
 #ifdef HAVE_PERSONALITY
diff --git a/gdb/nat/linux-procfs.c b/gdb/nat/linux-procfs.c
index 7788513a19..929bc137dc 100644
--- a/gdb/nat/linux-procfs.c
+++ b/gdb/nat/linux-procfs.c
@@ -16,9 +16,9 @@ 
    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>
 
diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
index 8f2f92c183..40919f77d7 100644
--- a/gdb/nat/linux-ptrace.c
+++ b/gdb/nat/linux-ptrace.c
@@ -16,11 +16,11 @@ 
    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
diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
index 3c58ed8bea..f18f5a5d8a 100644
--- a/gdb/nat/linux-ptrace.h
+++ b/gdb/nat/linux-ptrace.h
@@ -21,7 +21,7 @@ 
 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__))
diff --git a/gdb/nat/linux-waitpid.c b/gdb/nat/linux-waitpid.c
index 80303de273..e31c088f66 100644
--- a/gdb/nat/linux-waitpid.c
+++ b/gdb/nat/linux-waitpid.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 "common-defs.h"
+#include "common/common-defs.h"
 
 #ifdef GDBSERVER
 /* FIXME: server.h is required for the definition of debug_threads
@@ -29,7 +29,7 @@ 
 
 #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.  */
diff --git a/gdb/nat/mips-linux-watch.c b/gdb/nat/mips-linux-watch.c
index fa6ffb1600..8add09c00f 100644
--- a/gdb/nat/mips-linux-watch.c
+++ b/gdb/nat/mips-linux-watch.c
@@ -15,7 +15,7 @@ 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
+#include "common/common-defs.h"
 #include "nat/gdb_ptrace.h"
 #include "mips-linux-watch.h"
 
diff --git a/gdb/nat/mips-linux-watch.h b/gdb/nat/mips-linux-watch.h
index 8a0004056d..222b5cfd71 100644
--- a/gdb/nat/mips-linux-watch.h
+++ b/gdb/nat/mips-linux-watch.h
@@ -19,7 +19,7 @@ 
 #define MIPS_LINUX_WATCH_H 1
 
 #include <asm/ptrace.h>
-#include "break-common.h"
+#include "common/break-common.h"
 
 #define MAX_DEBUG_REGISTER 8
 
diff --git a/gdb/nat/ppc-linux.c b/gdb/nat/ppc-linux.c
index f27755fc15..27942fa2a5 100644
--- a/gdb/nat/ppc-linux.c
+++ b/gdb/nat/ppc-linux.c
@@ -15,7 +15,7 @@ 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
+#include "common/common-defs.h"
 #include "ppc-linux.h"
 #include "nat/gdb_ptrace.h"
 #include <elf.h>
diff --git a/gdb/nat/x86-dregs.c b/gdb/nat/x86-dregs.c
index 8c85a07a33..fb35178965 100644
--- a/gdb/nat/x86-dregs.c
+++ b/gdb/nat/x86-dregs.c
@@ -17,9 +17,9 @@ 
    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.
diff --git a/gdb/nat/x86-dregs.h b/gdb/nat/x86-dregs.h
index 588b20ae3f..67384a2e44 100644
--- a/gdb/nat/x86-dregs.h
+++ b/gdb/nat/x86-dregs.h
@@ -32,7 +32,7 @@ 
 #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.  */
 
diff --git a/gdb/nat/x86-linux-dregs.c b/gdb/nat/x86-linux-dregs.c
index 220e3b8001..33bbfa2d82 100644
--- a/gdb/nat/x86-linux-dregs.c
+++ b/gdb/nat/x86-linux-dregs.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 "common-defs.h"
+#include "common/common-defs.h"
 #include "nat/gdb_ptrace.h"
 #include <sys/user.h>
 #include "target/waitstatus.h"
diff --git a/gdb/nat/x86-linux.c b/gdb/nat/x86-linux.c
index f86c99af47..be00a3b560 100644
--- a/gdb/nat/x86-linux.c
+++ b/gdb/nat/x86-linux.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 "common-defs.h"
+#include "common/common-defs.h"
 #include "x86-linux.h"
 #include "x86-linux-dregs.h"
 
diff --git a/gdb/obsd-nat.c b/gdb/obsd-nat.c
index e4c0d97b23..2c8b2d4781 100644
--- a/gdb/obsd-nat.c
+++ b/gdb/obsd-nat.c
@@ -24,7 +24,7 @@ 
 
 #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"
diff --git a/gdb/osdata.c b/gdb/osdata.c
index 68ee226cb5..0ee13d8ffa 100644
--- a/gdb/osdata.c
+++ b/gdb/osdata.c
@@ -19,7 +19,7 @@ 
 
 #include "defs.h"
 #include "target.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "xml-support.h"
 #include "osdata.h"
 #include "ui-out.h"
diff --git a/gdb/parser-defs.h b/gdb/parser-defs.h
index 5b38477895..0d4bb820d7 100644
--- a/gdb/parser-defs.h
+++ b/gdb/parser-defs.h
@@ -23,7 +23,7 @@ 
 #if !defined (PARSER_DEFS_H)
 #define PARSER_DEFS_H 1
 
-#include "vec.h"
+#include "common/vec.h"
 #include "expression.h"
 
 struct block;
diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
index 461f4c2b1a..11394ef36d 100644
--- a/gdb/ppc-linux-nat.c
+++ b/gdb/ppc-linux-nat.c
@@ -32,7 +32,7 @@ 
 #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"
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index cd2e585235..03763d577a 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -47,7 +47,7 @@ 
 #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"
 
diff --git a/gdb/proc-api.c b/gdb/proc-api.c
index e68f22bdef..c7ce82d23a 100644
--- a/gdb/proc-api.c
+++ b/gdb/proc-api.c
@@ -35,7 +35,7 @@ 
 #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"
 
diff --git a/gdb/procfs.c b/gdb/procfs.c
index dd7534aa57..5a5dd5ce36 100644
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -31,14 +31,14 @@ 
 #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"
diff --git a/gdb/producer.c b/gdb/producer.c
index ef4a4ab9fa..362c5ef8b4 100644
--- a/gdb/producer.c
+++ b/gdb/producer.c
@@ -19,7 +19,7 @@ 
 
 #include "defs.h"
 #include "producer.h"
-#include "selftest.h"
+#include "common/selftest.h"
 
 /* See producer.h.  */
 
diff --git a/gdb/progspace.h b/gdb/progspace.h
index 472baeb9a1..039f555173 100644
--- a/gdb/progspace.h
+++ b/gdb/progspace.h
@@ -22,9 +22,9 @@ 
 #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"
diff --git a/gdb/python/py-inferior.c b/gdb/python/py-inferior.c
index 63b13d46ec..24fc5e69fe 100644
--- a/gdb/python/py-inferior.c
+++ b/gdb/python/py-inferior.c
@@ -26,7 +26,7 @@ 
 #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"
 
diff --git a/gdb/python/py-type.c b/gdb/python/py-type.c
index 18c1598173..7ad1a0c70e 100644
--- a/gdb/python/py-type.c
+++ b/gdb/python/py-type.c
@@ -26,7 +26,7 @@ 
 #include "demangle.h"
 #include "objfiles.h"
 #include "language.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "typeprint.h"
 
 typedef struct pyty_type_object
diff --git a/gdb/python/python.c b/gdb/python/python.c
index eafcc0414b..b23aede1cd 100644
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -93,7 +93,7 @@  const struct extension_language_defn extension_language_python =
 #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"
diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c
index 090e3617e4..dc26938f0b 100644
--- a/gdb/record-btrace.c
+++ b/gdb/record-btrace.c
@@ -38,7 +38,7 @@ 
 #include "infrun.h"
 #include "event-loop.h"
 #include "inf-loop.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "inferior.h"
 #include <algorithm>
 
diff --git a/gdb/regcache.c b/gdb/regcache.c
index 4a68390c5f..52c1b146b0 100644
--- a/gdb/regcache.c
+++ b/gdb/regcache.c
@@ -1417,7 +1417,7 @@  register_dump::dump (ui_file *file)
 }
 
 #if GDB_SELF_TEST
-#include "selftest.h"
+#include "common/selftest.h"
 #include "selftest-arch.h"
 #include "target-float.h"
 
diff --git a/gdb/regcache.h b/gdb/regcache.h
index 16faf0c851..2b703ea4a4 100644
--- a/gdb/regcache.h
+++ b/gdb/regcache.h
@@ -20,7 +20,7 @@ 
 #ifndef REGCACHE_H
 #define REGCACHE_H
 
-#include "common-regcache.h"
+#include "common/common-regcache.h"
 #include <forward_list>
 
 struct regcache;
diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c
index be2ac82414..91caa2b072 100644
--- a/gdb/remote-fileio.c
+++ b/gdb/remote-fileio.c
@@ -22,16 +22,16 @@ 
 #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
diff --git a/gdb/remote-fileio.h b/gdb/remote-fileio.h
index 4b3b2b2bf9..184d2054dc 100644
--- a/gdb/remote-fileio.h
+++ b/gdb/remote-fileio.h
@@ -22,7 +22,7 @@ 
 #ifndef REMOTE_FILEIO_H
 #define REMOTE_FILEIO_H
 
-#include "fileio.h"
+#include "common/fileio.h"
 
 struct cmd_list_element;
 struct remote_target;
diff --git a/gdb/remote-notif.h b/gdb/remote-notif.h
index 7973ad7fa0..d7663274a4 100644
--- a/gdb/remote-notif.h
+++ b/gdb/remote-notif.h
@@ -20,7 +20,7 @@ 
 #ifndef REMOTE_NOTIF_H
 #define REMOTE_NOTIF_H
 
-#include "queue.h"
+#include "common/queue.h"
 
 /* An event of a type of async remote notification.  */
 
diff --git a/gdb/remote.c b/gdb/remote.c
index 4b3f2907b4..7ad3cb71f4 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -42,12 +42,12 @@ 
 #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"
@@ -68,12 +68,12 @@ 
 #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>
 
diff --git a/gdb/riscv-tdep.c b/gdb/riscv-tdep.c
index 7a21efc60e..fb5e2c59e0 100644
--- a/gdb/riscv-tdep.c
+++ b/gdb/riscv-tdep.c
@@ -50,7 +50,7 @@ 
 #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"
diff --git a/gdb/rs6000-aix-tdep.c b/gdb/rs6000-aix-tdep.c
index cccd3995cd..2a5271cd53 100644
--- a/gdb/rs6000-aix-tdep.c
+++ b/gdb/rs6000-aix-tdep.c
@@ -37,7 +37,7 @@ 
 #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"
 
diff --git a/gdb/rust-exp.y b/gdb/rust-exp.y
index d9200f7b9f..9b9735a5d0 100644
--- a/gdb/rust-exp.y
+++ b/gdb/rust-exp.y
@@ -38,9 +38,9 @@ 
 #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"
diff --git a/gdb/s12z-tdep.c b/gdb/s12z-tdep.c
index 277dd78119..ea14992b1c 100644
--- a/gdb/s12z-tdep.c
+++ b/gdb/s12z-tdep.c
@@ -22,7 +22,7 @@ 
 
 #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"
diff --git a/gdb/selftest-arch.c b/gdb/selftest-arch.c
index bcdd38d771..7a64295efa 100644
--- a/gdb/selftest-arch.c
+++ b/gdb/selftest-arch.c
@@ -19,7 +19,7 @@ 
 #include "defs.h"
 
 #if GDB_SELF_TEST
-#include "selftest.h"
+#include "common/selftest.h"
 #include "selftest-arch.h"
 #include "arch-utils.h"
 
diff --git a/gdb/ser-base.c b/gdb/ser-base.c
index 55cb128d55..683d3f4252 100644
--- a/gdb/ser-base.c
+++ b/gdb/ser-base.c
@@ -23,7 +23,7 @@ 
 #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
diff --git a/gdb/ser-pipe.c b/gdb/ser-pipe.c
index 75fc95232f..702d97c551 100644
--- a/gdb/ser-pipe.c
+++ b/gdb/ser-pipe.c
@@ -27,9 +27,9 @@ 
 
 #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>
 
diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c
index d3e1b40681..f484e59f19 100644
--- a/gdb/ser-tcp.c
+++ b/gdb/ser-tcp.c
@@ -24,8 +24,8 @@ 
 #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>
 
@@ -36,7 +36,7 @@ 
 #include <sys/ioctl.h>  /* For FIONBIO.  */
 #endif
 
-#include "gdb_sys_time.h"
+#include "common/gdb_sys_time.h"
 
 #ifdef USE_WIN32API
 #include <winsock2.h>
diff --git a/gdb/ser-unix.c b/gdb/ser-unix.c
index de4c936f14..5a9965bf74 100644
--- a/gdb/ser-unix.c
+++ b/gdb/ser-unix.c
@@ -26,11 +26,11 @@ 
 #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
diff --git a/gdb/solib-target.c b/gdb/solib-target.c
index 51cb6ca155..a1cf94c42e 100644
--- a/gdb/solib-target.c
+++ b/gdb/solib-target.c
@@ -23,7 +23,7 @@ 
 #include "symtab.h"
 #include "symfile.h"
 #include "target.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "solib-target.h"
 #include <vector>
 
diff --git a/gdb/solib.c b/gdb/solib.c
index 3a6db5e12d..791b94bc93 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -31,7 +31,7 @@ 
 #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"
@@ -45,7 +45,7 @@ 
 #include "interps.h"
 #include "filesystem.h"
 #include "gdb_bfd.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 #include "source.h"
 
 /* Architecture-specific operations.  */
diff --git a/gdb/source.c b/gdb/source.c
index d070958e85..c32b7c66b1 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -26,7 +26,7 @@ 
 #include "gdbcmd.h"
 #include "frame.h"
 #include "value.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 
 #include <sys/types.h>
 #include <fcntl.h>
diff --git a/gdb/sparc-nat.c b/gdb/sparc-nat.c
index 7876926c0b..173fd0b639 100644
--- a/gdb/sparc-nat.c
+++ b/gdb/sparc-nat.c
@@ -24,7 +24,7 @@ 
 
 #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
diff --git a/gdb/spu-linux-nat.c b/gdb/spu-linux-nat.c
index 2dae80555b..90a9f00284 100644
--- a/gdb/spu-linux-nat.c
+++ b/gdb/spu-linux-nat.c
@@ -26,7 +26,7 @@ 
 #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"
 
diff --git a/gdb/stap-probe.c b/gdb/stap-probe.c
index d811b0489a..a53c04d94b 100644
--- a/gdb/stap-probe.c
+++ b/gdb/stap-probe.c
@@ -20,7 +20,7 @@ 
 #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"
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 7f800add8c..428d9b4cff 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -57,7 +57,7 @@ 
 #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 <sys/types.h>
diff --git a/gdb/symtab.h b/gdb/symtab.h
index 57ed2c0948..72c91643e4 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -23,7 +23,7 @@ 
 #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"
diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c
index f04b8fc316..96d453527c 100644
--- a/gdb/target-descriptions.c
+++ b/gdb/target-descriptions.c
@@ -26,7 +26,7 @@ 
 #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"
diff --git a/gdb/target-memory.c b/gdb/target-memory.c
index b8a969d841..d04363c2a5 100644
--- a/gdb/target-memory.c
+++ b/gdb/target-memory.c
@@ -19,11 +19,11 @@ 
    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
diff --git a/gdb/target.c b/gdb/target.c
index ad7eba3fa3..f7e3cc3fa0 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -40,13 +40,13 @@ 
 #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>
 
diff --git a/gdb/target.h b/gdb/target.h
index 14ec07fc0e..d1ee5bb2f2 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -74,15 +74,15 @@  struct inferior;
 #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
   {
diff --git a/gdb/target/waitstatus.c b/gdb/target/waitstatus.c
index 05d99402a6..4ac98e50f4 100644
--- a/gdb/target/waitstatus.c
+++ b/gdb/target/waitstatus.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 "common-defs.h"
+#include "common/common-defs.h"
 #include "waitstatus.h"
 
 /* Return a pretty printed form of target_waitstatus.
diff --git a/gdb/target/waitstatus.h b/gdb/target/waitstatus.h
index ff54ccbf53..5563b0b649 100644
--- a/gdb/target/waitstatus.h
+++ b/gdb/target/waitstatus.h
@@ -20,7 +20,7 @@ 
 #ifndef WAITSTATUS_H
 #define WAITSTATUS_H
 
-#include "gdb_signals.h"
+#include "common/gdb_signals.h"
 
 /* Stuff for target_wait.  */
 
diff --git a/gdb/thread.c b/gdb/thread.c
index a9105f5d7e..258fb478b8 100644
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -23,7 +23,7 @@ 
 #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"
diff --git a/gdb/top.c b/gdb/top.c
index 900e78aaec..dd5b35e5c5 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -35,11 +35,11 @@ 
 #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"
@@ -50,7 +50,7 @@ 
 #include "maint.h"
 #include "filenames.h"
 #include "frame.h"
-#include "buffer.h"
+#include "common/buffer.h"
 #include "gdb_select.h"
 
 /* readline include files.  */
diff --git a/gdb/top.h b/gdb/top.h
index a1a4045fbb..1d860188c6 100644
--- a/gdb/top.h
+++ b/gdb/top.h
@@ -20,7 +20,7 @@ 
 #ifndef TOP_H
 #define TOP_H
 
-#include "buffer.h"
+#include "common/buffer.h"
 #include "event-loop.h"
 #include "value.h"
 
diff --git a/gdb/tracefile-tfile.c b/gdb/tracefile-tfile.c
index 831f162df7..020a6be69b 100644
--- a/gdb/tracefile-tfile.c
+++ b/gdb/tracefile-tfile.c
@@ -20,8 +20,8 @@ 
 #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"
@@ -31,7 +31,7 @@ 
 #include "remote.h"
 #include "xml-tdesc.h"
 #include "target-descriptions.h"
-#include "buffer.h"
+#include "common/buffer.h"
 #include <algorithm>
 
 #ifndef O_LARGEFILE
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index bed35bdfd6..8cdda7aeed 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -52,8 +52,8 @@ 
 #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>
diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h
index 62abb7cdc1..ca9d2a7794 100644
--- a/gdb/tracepoint.h
+++ b/gdb/tracepoint.h
@@ -21,7 +21,7 @@ 
 
 #include "breakpoint.h"
 #include "memrange.h"
-#include "gdb_vecs.h"
+#include "common/gdb_vecs.h"
 
 #include <vector>
 #include <string>
diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c
index 9191ccae7e..d006e41cab 100644
--- a/gdb/tui/tui-io.c
+++ b/gdb/tui/tui-io.c
@@ -37,7 +37,7 @@ 
 #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>
diff --git a/gdb/ui-file.c b/gdb/ui-file.c
index d77554cc9e..690fc62ed6 100644
--- a/gdb/ui-file.c
+++ b/gdb/ui-file.c
@@ -23,7 +23,7 @@ 
 #include "ui-file.h"
 #include "gdb_obstack.h"
 #include "gdb_select.h"
-#include "filestuff.h"
+#include "common/filestuff.h"
 
 null_file null_stream;
 
diff --git a/gdb/unittests/array-view-selftests.c b/gdb/unittests/array-view-selftests.c
index 987538b118..d0d1128cd2 100644
--- a/gdb/unittests/array-view-selftests.c
+++ b/gdb/unittests/array-view-selftests.c
@@ -18,7 +18,7 @@ 
    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>
 
diff --git a/gdb/unittests/cli-utils-selftests.c b/gdb/unittests/cli-utils-selftests.c
index 039aa300fc..dd4a7a0f0f 100644
--- a/gdb/unittests/cli-utils-selftests.c
+++ b/gdb/unittests/cli-utils-selftests.c
@@ -19,7 +19,7 @@ 
 
 #include "defs.h"
 #include "cli/cli-utils.h"
-#include "selftest.h"
+#include "common/selftest.h"
 
 namespace selftests {
 namespace cli_utils {
diff --git a/gdb/unittests/common-utils-selftests.c b/gdb/unittests/common-utils-selftests.c
index 531eda68ad..996ab5e82d 100644
--- a/gdb/unittests/common-utils-selftests.c
+++ b/gdb/unittests/common-utils-selftests.c
@@ -17,8 +17,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 "selftest.h"
+#include "common/common-defs.h"
+#include "common/selftest.h"
 
 namespace selftests {
 
diff --git a/gdb/unittests/copy_bitwise-selftests.c b/gdb/unittests/copy_bitwise-selftests.c
index d09acf1b60..9dd9aeac00 100644
--- a/gdb/unittests/copy_bitwise-selftests.c
+++ b/gdb/unittests/copy_bitwise-selftests.c
@@ -18,7 +18,7 @@ 
    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 {
diff --git a/gdb/unittests/environ-selftests.c b/gdb/unittests/environ-selftests.c
index 64c3acdbb4..2bbff7039e 100644
--- a/gdb/unittests/environ-selftests.c
+++ b/gdb/unittests/environ-selftests.c
@@ -18,7 +18,7 @@ 
    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"
 
diff --git a/gdb/unittests/function-view-selftests.c b/gdb/unittests/function-view-selftests.c
index cd6fe70976..2abaa1f991 100644
--- a/gdb/unittests/function-view-selftests.c
+++ b/gdb/unittests/function-view-selftests.c
@@ -18,7 +18,7 @@ 
    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 {
diff --git a/gdb/unittests/lookup_name_info-selftests.c b/gdb/unittests/lookup_name_info-selftests.c
index 55dc16e341..04fcd7e0b5 100644
--- a/gdb/unittests/lookup_name_info-selftests.c
+++ b/gdb/unittests/lookup_name_info-selftests.c
@@ -18,7 +18,7 @@ 
    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 {
diff --git a/gdb/unittests/memory-map-selftests.c b/gdb/unittests/memory-map-selftests.c
index 61c861d3c6..fc6f0fe573 100644
--- a/gdb/unittests/memory-map-selftests.c
+++ b/gdb/unittests/memory-map-selftests.c
@@ -18,7 +18,7 @@ 
    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)
diff --git a/gdb/unittests/memrange-selftests.c b/gdb/unittests/memrange-selftests.c
index b99020096b..ada8e3e434 100644
--- a/gdb/unittests/memrange-selftests.c
+++ b/gdb/unittests/memrange-selftests.c
@@ -18,7 +18,7 @@ 
    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 {
diff --git a/gdb/unittests/mkdir-recursive-selftests.c b/gdb/unittests/mkdir-recursive-selftests.c
index 0a56c40c0f..a8b571f38c 100644
--- a/gdb/unittests/mkdir-recursive-selftests.c
+++ b/gdb/unittests/mkdir-recursive-selftests.c
@@ -20,7 +20,7 @@ 
 #include "defs.h"
 
 #include "common/filestuff.h"
-#include "selftest.h"
+#include "common/selftest.h"
 #include "common/byte-vector.h"
 #include "common/pathstuff.h"
 
diff --git a/gdb/unittests/observable-selftests.c b/gdb/unittests/observable-selftests.c
index e834434743..2a51a99956 100644
--- a/gdb/unittests/observable-selftests.c
+++ b/gdb/unittests/observable-selftests.c
@@ -18,7 +18,7 @@ 
    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 {
diff --git a/gdb/unittests/offset-type-selftests.c b/gdb/unittests/offset-type-selftests.c
index c84f10fa3a..8222a94ad0 100644
--- a/gdb/unittests/offset-type-selftests.c
+++ b/gdb/unittests/offset-type-selftests.c
@@ -18,7 +18,7 @@ 
    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"
diff --git a/gdb/unittests/optional-selftests.c b/gdb/unittests/optional-selftests.c
index 6633200fa0..fdd4437b16 100644
--- a/gdb/unittests/optional-selftests.c
+++ b/gdb/unittests/optional-selftests.c
@@ -18,7 +18,7 @@ 
    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
diff --git a/gdb/unittests/parse-connection-spec-selftests.c b/gdb/unittests/parse-connection-spec-selftests.c
index 615aaa3439..ac7cd41e21 100644
--- a/gdb/unittests/parse-connection-spec-selftests.c
+++ b/gdb/unittests/parse-connection-spec-selftests.c
@@ -18,7 +18,7 @@ 
    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
diff --git a/gdb/unittests/rsp-low-selftests.c b/gdb/unittests/rsp-low-selftests.c
index 0e89d3c8f5..dc3e8f5205 100644
--- a/gdb/unittests/rsp-low-selftests.c
+++ b/gdb/unittests/rsp-low-selftests.c
@@ -18,7 +18,7 @@ 
    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 {
diff --git a/gdb/unittests/scoped_fd-selftests.c b/gdb/unittests/scoped_fd-selftests.c
index 2e4f8a4362..886ff261ac 100644
--- a/gdb/unittests/scoped_fd-selftests.c
+++ b/gdb/unittests/scoped_fd-selftests.c
@@ -22,7 +22,7 @@ 
 #include "common/filestuff.h"
 #include "common/scoped_fd.h"
 #include "config.h"
-#include "selftest.h"
+#include "common/selftest.h"
 
 namespace selftests {
 namespace scoped_fd {
diff --git a/gdb/unittests/scoped_mmap-selftests.c b/gdb/unittests/scoped_mmap-selftests.c
index 80435bebfe..a3d2040b62 100644
--- a/gdb/unittests/scoped_mmap-selftests.c
+++ b/gdb/unittests/scoped_mmap-selftests.c
@@ -25,7 +25,7 @@ 
 
 #if defined(HAVE_SYS_MMAN_H)
 
-#include "selftest.h"
+#include "common/selftest.h"
 #include "common/gdb_unlinker.h"
 
 #include <unistd.h>
diff --git a/gdb/unittests/scoped_restore-selftests.c b/gdb/unittests/scoped_restore-selftests.c
index db13fa3e26..564ca07a92 100644
--- a/gdb/unittests/scoped_restore-selftests.c
+++ b/gdb/unittests/scoped_restore-selftests.c
@@ -18,7 +18,7 @@ 
    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 {
diff --git a/gdb/unittests/string_view-selftests.c b/gdb/unittests/string_view-selftests.c
index 261a46b62b..21a10e65af 100644
--- a/gdb/unittests/string_view-selftests.c
+++ b/gdb/unittests/string_view-selftests.c
@@ -24,7 +24,7 @@ 
 #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
diff --git a/gdb/unittests/style-selftests.c b/gdb/unittests/style-selftests.c
index 8b483ddc2f..9682724b86 100644
--- a/gdb/unittests/style-selftests.c
+++ b/gdb/unittests/style-selftests.c
@@ -18,7 +18,7 @@ 
    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 {
diff --git a/gdb/unittests/tracepoint-selftests.c b/gdb/unittests/tracepoint-selftests.c
index 4d9f9ad3a6..1e2618453b 100644
--- a/gdb/unittests/tracepoint-selftests.c
+++ b/gdb/unittests/tracepoint-selftests.c
@@ -18,7 +18,7 @@ 
    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 {
diff --git a/gdb/unittests/unpack-selftests.c b/gdb/unittests/unpack-selftests.c
index f1cd280a8b..e85aa2180b 100644
--- a/gdb/unittests/unpack-selftests.c
+++ b/gdb/unittests/unpack-selftests.c
@@ -18,7 +18,7 @@ 
    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"
diff --git a/gdb/unittests/utils-selftests.c b/gdb/unittests/utils-selftests.c
index 18234574eb..c874de3e18 100644
--- a/gdb/unittests/utils-selftests.c
+++ b/gdb/unittests/utils-selftests.c
@@ -19,7 +19,7 @@ 
 
 #include "defs.h"
 #include "utils.h"
-#include "selftest.h"
+#include "common/selftest.h"
 
 namespace selftests {
 namespace utils {
diff --git a/gdb/unittests/xml-utils-selftests.c b/gdb/unittests/xml-utils-selftests.c
index b4cab91407..2c24056aac 100644
--- a/gdb/unittests/xml-utils-selftests.c
+++ b/gdb/unittests/xml-utils-selftests.c
@@ -18,8 +18,8 @@ 
    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 {
diff --git a/gdb/utils.c b/gdb/utils.c
index ed8d60fa7b..0d017947c2 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -19,7 +19,7 @@ 
 
 #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"
@@ -65,7 +65,7 @@ 
 #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"
diff --git a/gdb/valops.c b/gdb/valops.c
index 2f5a4c815f..3d1f39f8c9 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -39,7 +39,7 @@ 
 #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.  */
diff --git a/gdb/value.c b/gdb/value.c
index d1e2623458..95b6a56f32 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -41,7 +41,7 @@ 
 #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.  */
diff --git a/gdb/varobj.c b/gdb/varobj.c
index ca43a8f0c1..b03307068f 100644
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -26,7 +26,7 @@ 
 #include "gdb_regex.h"
 
 #include "varobj.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "gdbthread.h"
 #include "inferior.h"
 #include "varobj-iter.h"
diff --git a/gdb/varobj.h b/gdb/varobj.h
index 0476534c8e..5d8c6876dd 100644
--- a/gdb/varobj.h
+++ b/gdb/varobj.h
@@ -19,7 +19,7 @@ 
 
 #include "symtab.h"
 #include "gdbtypes.h"
-#include "vec.h"
+#include "common/vec.h"
 #include "value.h"
 
 /* Enumeration for the format types */
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 57a59b8635..2894b208f5 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -67,7 +67,7 @@ 
 #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
diff --git a/gdb/x86-linux-nat.c b/gdb/x86-linux-nat.c
index beadf96d3b..fd15dc9b87 100644
--- a/gdb/x86-linux-nat.c
+++ b/gdb/x86-linux-nat.c
@@ -35,7 +35,7 @@ 
 #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"
diff --git a/gdb/xml-support.c b/gdb/xml-support.c
index 6c71b1fe70..2b19a00047 100644
--- a/gdb/xml-support.c
+++ b/gdb/xml-support.c
@@ -20,7 +20,7 @@ 
 #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>
diff --git a/gdb/xml-support.h b/gdb/xml-support.h
index 970ab81291..c5cf617050 100644
--- a/gdb/xml-support.h
+++ b/gdb/xml-support.h
@@ -22,8 +22,8 @@ 
 #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;
diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c
index adacb8088b..13904069b3 100644
--- a/gdb/xtensa-linux-nat.c
+++ b/gdb/xtensa-linux-nat.c
@@ -28,7 +28,7 @@ 
 #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"