diff mbox

Rename common to gdbsupport

Message ID 20190614201920.32641-1-tom@tromey.com
State New
Headers show

Commit Message

Tom Tromey June 14, 2019, 8:19 p.m. UTC
This is the next patch in the ongoing series to move gdbsever to the
top level.

This patch just renames the "common" directory.  The idea is to do
this move in two parts: first rename the directory (this patch), then
move the directory to the top.  This approach makes the patches a bit
more tractable.

I chose the name "gdbsupport" for the directory.  However, as this
patch was largely written by sed, we could pick a new name without too
much difficulty.

Tested by the buildbot.

gdb/ChangeLog
2019-06-14  Tom Tromey  <tom@tromey.com>

	* contrib/ari/gdb_ari.sh: Change common to gdbsupport.
	* configure: Rebuild.
	* configure.ac: Change common to gdbsupport.
	* gdbsupport: Rename from common.
	* acinclude.m4: Change common to gdbsupport.
	* Makefile.in (CONFIG_SRC_SUBDIR, COMMON_SFILES)
	(HFILES_NO_SRCDIR, stamp-version, ALLDEPFILES): Change common to
	gdbsupport.
	* aarch64-tdep.c, ada-lang.c, ada-lang.h, agent.c, alloc.c,
	amd64-darwin-tdep.c, amd64-dicos-tdep.c, amd64-fbsd-nat.c,
	amd64-fbsd-tdep.c, amd64-linux-nat.c, amd64-linux-tdep.c,
	amd64-nbsd-tdep.c, amd64-obsd-tdep.c, amd64-sol2-tdep.c,
	amd64-tdep.c, amd64-windows-tdep.c, arch-utils.c,
	arch/aarch64-insn.c, arch/aarch64.c, arch/aarch64.h, arch/amd64.c,
	arch/amd64.h, arch/arm-get-next-pcs.c, arch/arm-linux.c,
	arch/arm.c, arch/i386.c, arch/i386.h, arch/ppc-linux-common.c,
	arch/riscv.c, arch/riscv.h, arch/tic6x.c, arm-tdep.c, auto-load.c,
	auxv.c, ax-gdb.c, ax-general.c, ax.h, breakpoint.c, breakpoint.h,
	btrace.c, btrace.h, build-id.c, build-id.h, c-lang.h, charset.c,
	charset.h, cli/cli-cmds.c, cli/cli-cmds.h, cli/cli-decode.c,
	cli/cli-dump.c, cli/cli-option.h, cli/cli-script.c,
	coff-pe-read.c, command.h, compile/compile-c-support.c,
	compile/compile-c.h, compile/compile-cplus-symbols.c,
	compile/compile-cplus-types.c, compile/compile-cplus.h,
	compile/compile-loc2c.c, compile/compile.c, completer.c,
	completer.h, contrib/ari/gdb_ari.sh, corefile.c, corelow.c,
	cp-support.c, cp-support.h, cp-valprint.c, csky-tdep.c, ctf.c,
	darwin-nat.c, debug.c, defs.h, disasm-selftests.c, disasm.c,
	disasm.h, dtrace-probe.c, dwarf-index-cache.c,
	dwarf-index-cache.h, dwarf-index-write.c, dwarf2-frame.c,
	dwarf2expr.c, dwarf2loc.c, dwarf2read.c, event-loop.c,
	event-top.c, exceptions.c, exec.c, extension.h, fbsd-nat.c,
	features/aarch64-core.c, features/aarch64-fpu.c,
	features/aarch64-pauth.c, features/aarch64-sve.c,
	features/i386/32bit-avx.c, features/i386/32bit-avx512.c,
	features/i386/32bit-core.c, features/i386/32bit-linux.c,
	features/i386/32bit-mpx.c, features/i386/32bit-pkeys.c,
	features/i386/32bit-segments.c, features/i386/32bit-sse.c,
	features/i386/64bit-avx.c, features/i386/64bit-avx512.c,
	features/i386/64bit-core.c, features/i386/64bit-linux.c,
	features/i386/64bit-mpx.c, features/i386/64bit-pkeys.c,
	features/i386/64bit-segments.c, features/i386/64bit-sse.c,
	features/i386/x32-core.c, features/riscv/32bit-cpu.c,
	features/riscv/32bit-csr.c, features/riscv/32bit-fpu.c,
	features/riscv/64bit-cpu.c, features/riscv/64bit-csr.c,
	features/riscv/64bit-fpu.c, features/tic6x-c6xp.c,
	features/tic6x-core.c, features/tic6x-gp.c, filename-seen-cache.h,
	findcmd.c, findvar.c, fork-child.c, gcore.c, gdb_bfd.c, gdb_bfd.h,
	gdb_proc_service.h, gdb_regex.c, gdb_select.h, gdb_usleep.c,
	gdbarch-selftests.c, gdbthread.h, gdbtypes.h, gnu-nat.c,
	go32-nat.c, guile/guile.c, guile/scm-ports.c,
	guile/scm-safe-call.c, guile/scm-type.c, i386-fbsd-nat.c,
	i386-fbsd-tdep.c, i386-go32-tdep.c, i386-linux-nat.c,
	i386-linux-tdep.c, i386-tdep.c, i387-tdep.c,
	ia64-libunwind-tdep.c, ia64-linux-nat.c, inf-child.c,
	inf-ptrace.c, infcall.c, infcall.h, infcmd.c, inferior-iter.h,
	inferior.c, inferior.h, inflow.c, inflow.h, infrun.c, infrun.h,
	inline-frame.c, language.h, linespec.c, linux-fork.c, linux-nat.c,
	linux-tdep.c, linux-thread-db.c, location.c, machoread.c,
	macrotab.h, main.c, maint.c, maint.h, memattr.c, memrange.h,
	mi/mi-cmd-break.h, mi/mi-cmd-env.c, mi/mi-cmd-stack.c,
	mi/mi-cmd-var.c, mi/mi-interp.c, mi/mi-main.c, mi/mi-parse.h,
	minsyms.c, mips-linux-tdep.c, namespace.h,
	nat/aarch64-linux-hw-point.c, nat/aarch64-linux-hw-point.h,
	nat/aarch64-linux.c, nat/aarch64-sve-linux-ptrace.c,
	nat/amd64-linux-siginfo.c, nat/fork-inferior.c,
	nat/linux-btrace.c, nat/linux-btrace.h, nat/linux-namespaces.c,
	nat/linux-nat.h, nat/linux-osdata.c, nat/linux-personality.c,
	nat/linux-procfs.c, nat/linux-ptrace.c, nat/linux-ptrace.h,
	nat/linux-waitpid.c, nat/mips-linux-watch.c,
	nat/mips-linux-watch.h, nat/ppc-linux.c, nat/x86-dregs.c,
	nat/x86-dregs.h, nat/x86-linux-dregs.c, nat/x86-linux.c,
	nto-procfs.c, nto-tdep.c, objfile-flags.h, objfiles.c, objfiles.h,
	obsd-nat.c, observable.h, osdata.c, p-valprint.c, parse.c,
	parser-defs.h, ppc-linux-nat.c, printcmd.c, probe.c, proc-api.c,
	procfs.c, producer.c, progspace.h, psymtab.h,
	python/py-framefilter.c, python/py-inferior.c, python/py-ref.h,
	python/py-type.c, python/python.c, record-btrace.c, record-full.c,
	record.c, record.h, regcache-dump.c, regcache.c, regcache.h,
	remote-fileio.c, remote-fileio.h, remote-sim.c, remote.c,
	riscv-tdep.c, rs6000-aix-tdep.c, rust-exp.y, s12z-tdep.c,
	selftest-arch.c, ser-base.c, ser-event.c, ser-pipe.c, ser-tcp.c,
	ser-unix.c, skip.c, solib-aix.c, solib-target.c, solib.c,
	source-cache.c, source.c, source.h, sparc-nat.c, spu-linux-nat.c,
	stack.c, stap-probe.c, symfile-add-flags.h, symfile.c, symfile.h,
	symtab.c, symtab.h, target-descriptions.c, target-descriptions.h,
	target-memory.c, target.c, target.h, target/waitstatus.c,
	target/waitstatus.h, thread-iter.h, thread.c, tilegx-tdep.c,
	top.c, top.h, tracefile-tfile.c, tracefile.c, tracepoint.c,
	tracepoint.h, tui/tui-io.c, ui-file.c, ui-out.h,
	unittests/array-view-selftests.c,
	unittests/child-path-selftests.c, unittests/cli-utils-selftests.c,
	unittests/common-utils-selftests.c,
	unittests/copy_bitwise-selftests.c, unittests/environ-selftests.c,
	unittests/format_pieces-selftests.c,
	unittests/function-view-selftests.c,
	unittests/lookup_name_info-selftests.c,
	unittests/memory-map-selftests.c, unittests/memrange-selftests.c,
	unittests/mkdir-recursive-selftests.c,
	unittests/observable-selftests.c,
	unittests/offset-type-selftests.c, unittests/optional-selftests.c,
	unittests/parse-connection-spec-selftests.c,
	unittests/ptid-selftests.c, unittests/rsp-low-selftests.c,
	unittests/scoped_fd-selftests.c,
	unittests/scoped_mmap-selftests.c,
	unittests/scoped_restore-selftests.c,
	unittests/string_view-selftests.c, unittests/style-selftests.c,
	unittests/tracepoint-selftests.c, unittests/unpack-selftests.c,
	unittests/utils-selftests.c, unittests/xml-utils-selftests.c,
	utils.c, utils.h, valarith.c, valops.c, valprint.c, value.c,
	value.h, varobj.c, varobj.h, windows-nat.c, x86-linux-nat.c,
	xml-support.c, xml-support.h, xml-tdesc.h, xstormy16-tdep.c,
	xtensa-linux-nat.c: Change common to gdbsupport.

gdb/gdbserver/ChangeLog
2019-06-14  Tom Tromey  <tom@tromey.com>

	* configure: Rebuild.
	* configure.ac: Change common to gdbsupport.
	* acinclude.m4: Change common to gdbsupport.
	* Makefile.in (SFILES, OBS, GDBREPLAY_OBS, IPA_OBJS)
	(version-generated.c, gdbsupport/%-ipa.o, gdbsupport/%.o): Change
	common to gdbsupport.
	* ax.c, event-loop.c, fork-child.c, gdb_proc_service.h,
	gdbreplay.c, gdbthread.h, hostio-errno.c, hostio.c, i387-fp.c,
	inferiors.c, inferiors.h, linux-aarch64-tdesc-selftest.c,
	linux-amd64-ipa.c, linux-i386-ipa.c, linux-low.c,
	linux-tic6x-low.c, linux-x86-low.c, linux-x86-tdesc-selftest.c,
	linux-x86-tdesc.c, lynx-i386-low.c, lynx-low.c, mem-break.h,
	nto-x86-low.c, regcache.c, regcache.h, remote-utils.c, server.c,
	server.h, spu-low.c, symbol.c, target.h, tdesc.c, tdesc.h,
	thread-db.c, tracepoint.c, win32-i386-low.c, win32-low.c: Change
	common to gdbsupport.
---
 gdb/ChangeLog                                 | 116 ++++++++++++++
 gdb/Makefile.in                               | 146 +++++++++---------
 gdb/aarch64-tdep.c                            |   4 +-
 gdb/acinclude.m4                              |   2 +-
 gdb/ada-lang.c                                |   8 +-
 gdb/ada-lang.h                                |   2 +-
 gdb/agent.c                                   |   2 +-
 gdb/alloc.c                                   |   4 +-
 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                              |   4 +-
 gdb/amd64-windows-tdep.c                      |   2 +-
 gdb/arch-utils.c                              |   2 +-
 gdb/arch/aarch64-insn.c                       |   2 +-
 gdb/arch/aarch64.c                            |   2 +-
 gdb/arch/aarch64.h                            |   2 +-
 gdb/arch/amd64.c                              |   4 +-
 gdb/arch/amd64.h                              |   2 +-
 gdb/arch/arm-get-next-pcs.c                   |   6 +-
 gdb/arch/arm-linux.c                          |   4 +-
 gdb/arch/arm.c                                |   4 +-
 gdb/arch/i386.c                               |   6 +-
 gdb/arch/i386.h                               |   2 +-
 gdb/arch/ppc-linux-common.c                   |   2 +-
 gdb/arch/riscv.c                              |   2 +-
 gdb/arch/riscv.h                              |   2 +-
 gdb/arch/tic6x.c                              |   4 +-
 gdb/arm-tdep.c                                |   4 +-
 gdb/auto-load.c                               |   4 +-
 gdb/auxv.c                                    |   2 +-
 gdb/ax-gdb.c                                  |   2 +-
 gdb/ax-general.c                              |   2 +-
 gdb/ax.h                                      |   4 +-
 gdb/breakpoint.c                              |   6 +-
 gdb/breakpoint.h                              |   6 +-
 gdb/btrace.c                                  |   4 +-
 gdb/btrace.h                                  |   4 +-
 gdb/build-id.c                                |   2 +-
 gdb/build-id.h                                |   2 +-
 gdb/c-lang.h                                  |   2 +-
 gdb/charset.c                                 |   8 +-
 gdb/charset.h                                 |   2 +-
 gdb/cli/cli-cmds.c                            |   6 +-
 gdb/cli/cli-cmds.h                            |   4 +-
 gdb/cli/cli-decode.c                          |   2 +-
 gdb/cli/cli-dump.c                            |   4 +-
 gdb/cli/cli-option.h                          |   4 +-
 gdb/cli/cli-script.c                          |   2 +-
 gdb/coff-pe-read.c                            |   2 +-
 gdb/command.h                                 |   4 +-
 gdb/compile/compile-c-support.c               |   4 +-
 gdb/compile/compile-c.h                       |   2 +-
 gdb/compile/compile-cplus-symbols.c           |   2 +-
 gdb/compile/compile-cplus-types.c             |   4 +-
 gdb/compile/compile-cplus.h                   |   2 +-
 gdb/compile/compile-loc2c.c                   |   2 +-
 gdb/compile/compile.c                         |  10 +-
 gdb/completer.c                               |   2 +-
 gdb/completer.h                               |   2 +-
 gdb/configure                                 |   6 +-
 gdb/configure.ac                              |   6 +-
 gdb/contrib/ari/gdb_ari.sh                    |  10 +-
 gdb/corefile.c                                |   2 +-
 gdb/corelow.c                                 |   2 +-
 gdb/cp-support.c                              |   4 +-
 gdb/cp-support.h                              |   6 +-
 gdb/cp-valprint.c                             |   2 +-
 gdb/csky-tdep.c                               |   2 +-
 gdb/ctf.c                                     |   2 +-
 gdb/darwin-nat.c                              |   8 +-
 gdb/debug.c                                   |   2 +-
 gdb/defs.h                                    |   6 +-
 gdb/disasm-selftests.c                        |   2 +-
 gdb/disasm.c                                  |   2 +-
 gdb/disasm.h                                  |   2 +-
 gdb/dtrace-probe.c                            |   2 +-
 gdb/dwarf-index-cache.c                       |   6 +-
 gdb/dwarf-index-cache.h                       |   2 +-
 gdb/dwarf-index-write.c                       |  10 +-
 gdb/dwarf2-frame.c                            |   2 +-
 gdb/dwarf2expr.c                              |   2 +-
 gdb/dwarf2loc.c                               |   6 +-
 gdb/dwarf2read.c                              |  20 +--
 gdb/event-loop.c                              |   2 +-
 gdb/event-top.c                               |   2 +-
 gdb/exceptions.c                              |   2 +-
 gdb/exec.c                                    |   2 +-
 gdb/extension.h                               |   4 +-
 gdb/fbsd-nat.c                                |   6 +-
 gdb/features/aarch64-core.c                   |   2 +-
 gdb/features/aarch64-fpu.c                    |   2 +-
 gdb/features/aarch64-pauth.c                  |   2 +-
 gdb/features/aarch64-sve.c                    |   2 +-
 gdb/features/i386/32bit-avx.c                 |   2 +-
 gdb/features/i386/32bit-avx512.c              |   2 +-
 gdb/features/i386/32bit-core.c                |   2 +-
 gdb/features/i386/32bit-linux.c               |   2 +-
 gdb/features/i386/32bit-mpx.c                 |   2 +-
 gdb/features/i386/32bit-pkeys.c               |   2 +-
 gdb/features/i386/32bit-segments.c            |   2 +-
 gdb/features/i386/32bit-sse.c                 |   2 +-
 gdb/features/i386/64bit-avx.c                 |   2 +-
 gdb/features/i386/64bit-avx512.c              |   2 +-
 gdb/features/i386/64bit-core.c                |   2 +-
 gdb/features/i386/64bit-linux.c               |   2 +-
 gdb/features/i386/64bit-mpx.c                 |   2 +-
 gdb/features/i386/64bit-pkeys.c               |   2 +-
 gdb/features/i386/64bit-segments.c            |   2 +-
 gdb/features/i386/64bit-sse.c                 |   2 +-
 gdb/features/i386/x32-core.c                  |   2 +-
 gdb/features/riscv/32bit-cpu.c                |   2 +-
 gdb/features/riscv/32bit-csr.c                |   2 +-
 gdb/features/riscv/32bit-fpu.c                |   2 +-
 gdb/features/riscv/64bit-cpu.c                |   2 +-
 gdb/features/riscv/64bit-csr.c                |   2 +-
 gdb/features/riscv/64bit-fpu.c                |   2 +-
 gdb/features/tic6x-c6xp.c                     |   2 +-
 gdb/features/tic6x-core.c                     |   2 +-
 gdb/features/tic6x-gp.c                       |   2 +-
 gdb/filename-seen-cache.h                     |   2 +-
 gdb/findcmd.c                                 |   2 +-
 gdb/findvar.c                                 |   2 +-
 gdb/fork-child.c                              |   8 +-
 gdb/gcore.c                                   |   6 +-
 gdb/gdb_bfd.c                                 |   4 +-
 gdb/gdb_bfd.h                                 |   2 +-
 gdb/gdb_proc_service.h                        |   2 +-
 gdb/gdb_regex.c                               |   2 +-
 gdb/gdb_select.h                              |   2 +-
 gdb/gdb_usleep.c                              |   2 +-
 gdb/gdbarch-selftests.c                       |   4 +-
 gdb/gdbserver/ChangeLog                       |  19 +++
 gdb/gdbserver/Makefile.in                     | 136 ++++++++--------
 gdb/gdbserver/acinclude.m4                    |   2 +-
 gdb/gdbserver/ax.c                            |  10 +-
 gdb/gdbserver/configure                       |   6 +-
 gdb/gdbserver/configure.ac                    |   6 +-
 gdb/gdbserver/event-loop.c                    |   2 +-
 gdb/gdbserver/fork-child.c                    |   2 +-
 gdb/gdbserver/gdb_proc_service.h              |   2 +-
 gdb/gdbserver/gdbreplay.c                     |   8 +-
 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.c                     |   6 +-
 gdb/gdbserver/inferiors.h                     |   2 +-
 gdb/gdbserver/linux-aarch64-tdesc-selftest.c  |   2 +-
 gdb/gdbserver/linux-amd64-ipa.c               |   2 +-
 gdb/gdbserver/linux-i386-ipa.c                |   2 +-
 gdb/gdbserver/linux-low.c                     |  20 +--
 gdb/gdbserver/linux-tic6x-low.c               |   2 +-
 gdb/gdbserver/linux-x86-low.c                 |   4 +-
 gdb/gdbserver/linux-x86-tdesc-selftest.c      |   4 +-
 gdb/gdbserver/linux-x86-tdesc.c               |   2 +-
 gdb/gdbserver/lynx-i386-low.c                 |   2 +-
 gdb/gdbserver/lynx-low.c                      |   6 +-
 gdb/gdbserver/mem-break.h                     |   2 +-
 gdb/gdbserver/nto-x86-low.c                   |   2 +-
 gdb/gdbserver/regcache.c                      |  14 +-
 gdb/gdbserver/regcache.h                      |  12 +-
 gdb/gdbserver/remote-utils.c                  |   8 +-
 gdb/gdbserver/server.c                        |  30 ++--
 gdb/gdbserver/server.h                        |  14 +-
 gdb/gdbserver/spu-low.c                       |   4 +-
 gdb/gdbserver/symbol.c                        |   4 +-
 gdb/gdbserver/target.h                        |   2 +-
 gdb/gdbserver/tdesc.c                         |  12 +-
 gdb/gdbserver/tdesc.h                         |   2 +-
 gdb/gdbserver/thread-db.c                     |   4 +-
 gdb/gdbserver/tracepoint.c                    |   4 +-
 gdb/gdbserver/win32-i386-low.c                |   2 +-
 gdb/gdbserver/win32-low.c                     |   4 +-
 gdb/{common => gdbsupport}/agent.c            |   2 +-
 gdb/{common => gdbsupport}/agent.h            |   4 +-
 gdb/{common => gdbsupport}/array-view.h       |   0
 gdb/{common => gdbsupport}/ax.def             |   0
 gdb/{common => gdbsupport}/break-common.h     |   0
 gdb/{common => gdbsupport}/btrace-common.c    |   0
 gdb/{common => gdbsupport}/btrace-common.h    |   0
 gdb/{common => gdbsupport}/buffer.c           |   0
 gdb/{common => gdbsupport}/buffer.h           |   0
 gdb/{common => gdbsupport}/byte-vector.h      |   2 +-
 gdb/{common => gdbsupport}/cleanups.c         |   0
 gdb/{common => gdbsupport}/cleanups.h         |   0
 gdb/{common => gdbsupport}/common-debug.c     |   4 +-
 gdb/{common => gdbsupport}/common-debug.h     |   0
 gdb/{common => gdbsupport}/common-defs.h      |   4 +-
 .../common-exceptions.c                       |   0
 .../common-exceptions.h                       |   0
 gdb/{common => gdbsupport}/common-gdbthread.h |   0
 gdb/{common => gdbsupport}/common-inferior.h  |   0
 gdb/{common => gdbsupport}/common-regcache.c  |   0
 gdb/{common => gdbsupport}/common-regcache.h  |   0
 gdb/{common => gdbsupport}/common-types.h     |   0
 gdb/{common => gdbsupport}/common-utils.c     |   8 +-
 gdb/{common => gdbsupport}/common-utils.h     |   0
 gdb/{common => gdbsupport}/common.host        |   4 +-
 gdb/{common => gdbsupport}/common.m4          |   0
 gdb/{common => gdbsupport}/create-version.sh  |   2 +-
 gdb/{common => gdbsupport}/def-vector.h       |   2 +-
 .../default-init-alloc.h                      |   0
 gdb/{common => gdbsupport}/enum-flags.h       |   0
 gdb/{common => gdbsupport}/environ.c          |  18 +--
 gdb/{common => gdbsupport}/environ.h          |   0
 gdb/{common => gdbsupport}/errors.c           |   8 +-
 gdb/{common => gdbsupport}/errors.h           |   0
 gdb/{common => gdbsupport}/fileio.c           |   0
 gdb/{common => gdbsupport}/fileio.h           |   0
 gdb/{common => gdbsupport}/filestuff.c        |   4 +-
 gdb/{common => gdbsupport}/filestuff.h        |   0
 .../filtered-iterator.h                       |   0
 gdb/{common => gdbsupport}/format.c           |   0
 gdb/{common => gdbsupport}/format.h           |   2 +-
 .../forward-scope-exit.h                      |   2 +-
 gdb/{common => gdbsupport}/function-view.h    |   0
 gdb/{common => gdbsupport}/gdb_assert.h       |   0
 gdb/{common => gdbsupport}/gdb_locale.h       |   0
 gdb/{common => gdbsupport}/gdb_optional.h     |   2 +-
 gdb/{common => gdbsupport}/gdb_proc_service.h |   0
 gdb/{common => gdbsupport}/gdb_ref_ptr.h      |   0
 gdb/{common => gdbsupport}/gdb_setjmp.h       |   0
 gdb/{common => gdbsupport}/gdb_signals.h      |   0
 gdb/{common => gdbsupport}/gdb_splay_tree.h   |   0
 gdb/{common => gdbsupport}/gdb_string_view.h  |   0
 .../gdb_string_view.tcc                       |   0
 gdb/{common => gdbsupport}/gdb_sys_time.h     |   0
 gdb/{common => gdbsupport}/gdb_tilde_expand.c |   4 +-
 gdb/{common => gdbsupport}/gdb_tilde_expand.h |   0
 gdb/{common => gdbsupport}/gdb_unique_ptr.h   |   0
 gdb/{common => gdbsupport}/gdb_unlinker.h     |   0
 gdb/{common => gdbsupport}/gdb_vecs.c         |   0
 gdb/{common => gdbsupport}/gdb_vecs.h         |   0
 gdb/{common => gdbsupport}/gdb_wait.h         |   0
 gdb/{common => gdbsupport}/hash_enum.h        |   0
 gdb/{common => gdbsupport}/host-defs.h        |   0
 gdb/{common => gdbsupport}/job-control.c      |   2 +-
 gdb/{common => gdbsupport}/job-control.h      |   2 +-
 gdb/{common => gdbsupport}/mingw-strerror.c   |   0
 gdb/{common => gdbsupport}/netstuff.c         |   6 +-
 gdb/{common => gdbsupport}/netstuff.h         |   0
 gdb/{common => gdbsupport}/new-op.c           |   0
 gdb/{common => gdbsupport}/next-iterator.h    |   0
 gdb/{common => gdbsupport}/observable.h       |   0
 gdb/{common => gdbsupport}/offset-type.h      |   0
 gdb/{common => gdbsupport}/pathstuff.c        |  18 +--
 gdb/{common => gdbsupport}/pathstuff.h        |   2 +-
 gdb/{common => gdbsupport}/poison.h           |   0
 gdb/{common => gdbsupport}/posix-strerror.c   |   0
 gdb/{common => gdbsupport}/preprocessor.h     |   0
 gdb/{common => gdbsupport}/print-utils.c      |   0
 gdb/{common => gdbsupport}/print-utils.h      |   0
 gdb/{common => gdbsupport}/ptid.c             |   0
 gdb/{common => gdbsupport}/ptid.h             |   0
 .../refcounted-object.h                       |   0
 gdb/{common => gdbsupport}/rsp-low.c          |   0
 gdb/{common => gdbsupport}/rsp-low.h          |   2 +-
 gdb/{common => gdbsupport}/run-time-clock.c   |   0
 gdb/{common => gdbsupport}/run-time-clock.h   |   0
 gdb/{common => gdbsupport}/safe-iterator.h    |   0
 gdb/{common => gdbsupport}/scope-exit.h       |   2 +-
 gdb/{common => gdbsupport}/scoped_fd.h        |   0
 gdb/{common => gdbsupport}/scoped_mmap.c      |   2 +-
 gdb/{common => gdbsupport}/scoped_mmap.h      |   0
 gdb/{common => gdbsupport}/scoped_restore.h   |   0
 gdb/{common => gdbsupport}/selftest.c         |   0
 gdb/{common => gdbsupport}/selftest.h         |   0
 .../signals-state-save-restore.c              |   0
 .../signals-state-save-restore.h              |   0
 gdb/{common => gdbsupport}/signals.c          |   0
 gdb/{common => gdbsupport}/symbol.h           |   0
 gdb/{common => gdbsupport}/tdesc.c            |  28 ++--
 gdb/{common => gdbsupport}/tdesc.h            |   0
 gdb/{common => gdbsupport}/traits.h           |   0
 gdb/{common => gdbsupport}/underlying.h       |   0
 gdb/{common => gdbsupport}/valid-expr.h       |   4 +-
 gdb/{common => gdbsupport}/vec.c              |   0
 gdb/{common => gdbsupport}/vec.h              |   0
 gdb/{common => gdbsupport}/version.h          |   0
 gdb/{common => gdbsupport}/x86-xstate.h       |   0
 gdb/{common => gdbsupport}/xml-utils.c        |   0
 gdb/{common => gdbsupport}/xml-utils.h        |   0
 gdb/gdbthread.h                               |   8 +-
 gdb/gdbtypes.h                                |  10 +-
 gdb/gnu-nat.c                                 |   2 +-
 gdb/go32-nat.c                                |   2 +-
 gdb/guile/guile.c                             |   2 +-
 gdb/guile/scm-ports.c                         |   2 +-
 gdb/guile/scm-safe-call.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-libunwind-tdep.c                     |   2 +-
 gdb/ia64-linux-nat.c                          |   2 +-
 gdb/inf-child.c                               |   8 +-
 gdb/inf-ptrace.c                              |   2 +-
 gdb/infcall.c                                 |   2 +-
 gdb/infcall.h                                 |   2 +-
 gdb/infcmd.c                                  |   8 +-
 gdb/inferior-iter.h                           |   4 +-
 gdb/inferior.c                                |   2 +-
 gdb/inferior.h                                |   8 +-
 gdb/inflow.c                                  |   2 +-
 gdb/inflow.h                                  |   2 +-
 gdb/infrun.c                                  |  10 +-
 gdb/infrun.h                                  |   2 +-
 gdb/inline-frame.c                            |   2 +-
 gdb/language.h                                |   2 +-
 gdb/linespec.c                                |   4 +-
 gdb/linux-fork.c                              |   2 +-
 gdb/linux-nat.c                               |  12 +-
 gdb/linux-tdep.c                              |   4 +-
 gdb/linux-thread-db.c                         |   4 +-
 gdb/location.c                                |   2 +-
 gdb/machoread.c                               |   2 +-
 gdb/macrotab.h                                |   2 +-
 gdb/main.c                                    |   6 +-
 gdb/maint.c                                   |   2 +-
 gdb/maint.h                                   |   2 +-
 gdb/memattr.c                                 |   2 +-
 gdb/memrange.h                                |   2 +-
 gdb/mi/mi-cmd-break.h                         |   2 +-
 gdb/mi/mi-cmd-env.c                           |   2 +-
 gdb/mi/mi-cmd-stack.c                         |   2 +-
 gdb/mi/mi-cmd-var.c                           |   2 +-
 gdb/mi/mi-interp.c                            |   2 +-
 gdb/mi/mi-main.c                              |  10 +-
 gdb/mi/mi-parse.h                             |   2 +-
 gdb/minsyms.c                                 |   4 +-
 gdb/mips-linux-tdep.c                         |   4 +-
 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            |   6 +-
 gdb/nat/amd64-linux-siginfo.c                 |   2 +-
 gdb/nat/fork-inferior.c                       |  14 +-
 gdb/nat/linux-btrace.c                        |  12 +-
 gdb/nat/linux-btrace.h                        |   4 +-
 gdb/nat/linux-namespaces.c                    |   8 +-
 gdb/nat/linux-nat.h                           |   2 +-
 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/nto-procfs.c                              |   4 +-
 gdb/nto-tdep.c                                |   2 +-
 gdb/objfile-flags.h                           |   2 +-
 gdb/objfiles.c                                |   2 +-
 gdb/objfiles.h                                |   4 +-
 gdb/obsd-nat.c                                |   2 +-
 gdb/observable.h                              |   2 +-
 gdb/osdata.c                                  |   2 +-
 gdb/p-valprint.c                              |   2 +-
 gdb/parse.c                                   |   2 +-
 gdb/parser-defs.h                             |   2 +-
 gdb/ppc-linux-nat.c                           |   2 +-
 gdb/printcmd.c                                |   6 +-
 gdb/probe.c                                   |   2 +-
 gdb/proc-api.c                                |   2 +-
 gdb/procfs.c                                  |   8 +-
 gdb/producer.c                                |   2 +-
 gdb/progspace.h                               |   8 +-
 gdb/psymtab.h                                 |   2 +-
 gdb/python/py-framefilter.c                   |   2 +-
 gdb/python/py-inferior.c                      |   2 +-
 gdb/python/py-ref.h                           |   2 +-
 gdb/python/py-type.c                          |   2 +-
 gdb/python/python.c                           |   2 +-
 gdb/record-btrace.c                           |   2 +-
 gdb/record-full.c                             |   4 +-
 gdb/record.c                                  |   2 +-
 gdb/record.h                                  |   2 +-
 gdb/regcache-dump.c                           |   2 +-
 gdb/regcache.c                                |  14 +-
 gdb/regcache.h                                |  12 +-
 gdb/remote-fileio.c                           |   6 +-
 gdb/remote-fileio.h                           |   2 +-
 gdb/remote-sim.c                              |   2 +-
 gdb/remote.c                                  |  14 +-
 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-event.c                               |   2 +-
 gdb/ser-pipe.c                                |   4 +-
 gdb/ser-tcp.c                                 |   6 +-
 gdb/ser-unix.c                                |   4 +-
 gdb/skip.c                                    |   2 +-
 gdb/solib-aix.c                               |   2 +-
 gdb/solib-target.c                            |   2 +-
 gdb/solib.c                                   |   4 +-
 gdb/source-cache.c                            |   2 +-
 gdb/source.c                                  |   8 +-
 gdb/source.h                                  |   2 +-
 gdb/sparc-nat.c                               |   2 +-
 gdb/spu-linux-nat.c                           |   2 +-
 gdb/stack.c                                   |   2 +-
 gdb/stap-probe.c                              |   2 +-
 gdb/symfile-add-flags.h                       |   2 +-
 gdb/symfile.c                                 |   8 +-
 gdb/symfile.h                                 |   2 +-
 gdb/symtab.c                                  |   4 +-
 gdb/symtab.h                                  |  10 +-
 gdb/target-descriptions.c                     |  16 +-
 gdb/target-descriptions.h                     |   2 +-
 gdb/target-memory.c                           |   4 +-
 gdb/target.c                                  |   4 +-
 gdb/target.h                                  |   8 +-
 gdb/target/waitstatus.c                       |   2 +-
 gdb/target/waitstatus.h                       |   2 +-
 gdb/thread-iter.h                             |   6 +-
 gdb/thread.c                                  |   6 +-
 gdb/tilegx-tdep.c                             |   2 +-
 gdb/top.c                                     |   8 +-
 gdb/top.h                                     |   2 +-
 gdb/tracefile-tfile.c                         |   6 +-
 gdb/tracefile.c                               |   2 +-
 gdb/tracepoint.c                              |   4 +-
 gdb/tracepoint.h                              |   2 +-
 gdb/tui/tui-io.c                              |   2 +-
 gdb/ui-file.c                                 |   2 +-
 gdb/ui-out.h                                  |   2 +-
 gdb/unittests/array-view-selftests.c          |   4 +-
 gdb/unittests/child-path-selftests.c          |   4 +-
 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             |   4 +-
 gdb/unittests/format_pieces-selftests.c       |   4 +-
 gdb/unittests/function-view-selftests.c       |   4 +-
 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     |   8 +-
 gdb/unittests/observable-selftests.c          |   4 +-
 gdb/unittests/offset-type-selftests.c         |   8 +-
 gdb/unittests/optional-selftests.c            |   4 +-
 .../parse-connection-spec-selftests.c         |   4 +-
 gdb/unittests/ptid-selftests.c                |   2 +-
 gdb/unittests/rsp-low-selftests.c             |   4 +-
 gdb/unittests/scoped_fd-selftests.c           |   6 +-
 gdb/unittests/scoped_mmap-selftests.c         |   8 +-
 gdb/unittests/scoped_restore-selftests.c      |   4 +-
 gdb/unittests/string_view-selftests.c         |   4 +-
 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                                   |  12 +-
 gdb/utils.h                                   |   2 +-
 gdb/valarith.c                                |   2 +-
 gdb/valops.c                                  |   2 +-
 gdb/valprint.c                                |   2 +-
 gdb/value.c                                   |   4 +-
 gdb/value.h                                   |   2 +-
 gdb/varobj.c                                  |   2 +-
 gdb/varobj.h                                  |   2 +-
 gdb/windows-nat.c                             |   4 +-
 gdb/x86-linux-nat.c                           |   2 +-
 gdb/xml-support.c                             |   2 +-
 gdb/xml-support.h                             |   6 +-
 gdb/xml-tdesc.h                               |   2 +-
 gdb/xstormy16-tdep.c                          |   2 +-
 gdb/xtensa-linux-nat.c                        |   2 +-
 489 files changed, 1040 insertions(+), 905 deletions(-)
 rename gdb/{common => gdbsupport}/agent.c (99%)
 rename gdb/{common => gdbsupport}/agent.h (97%)
 rename gdb/{common => gdbsupport}/array-view.h (100%)
 rename gdb/{common => gdbsupport}/ax.def (100%)
 rename gdb/{common => gdbsupport}/break-common.h (100%)
 rename gdb/{common => gdbsupport}/btrace-common.c (100%)
 rename gdb/{common => gdbsupport}/btrace-common.h (100%)
 rename gdb/{common => gdbsupport}/buffer.c (100%)
 rename gdb/{common => gdbsupport}/buffer.h (100%)
 rename gdb/{common => gdbsupport}/byte-vector.h (98%)
 rename gdb/{common => gdbsupport}/cleanups.c (100%)
 rename gdb/{common => gdbsupport}/cleanups.h (100%)
 rename gdb/{common => gdbsupport}/common-debug.c (92%)
 rename gdb/{common => gdbsupport}/common-debug.h (100%)
 rename gdb/{common => gdbsupport}/common-defs.h (98%)
 rename gdb/{common => gdbsupport}/common-exceptions.c (100%)
 rename gdb/{common => gdbsupport}/common-exceptions.h (100%)
 rename gdb/{common => gdbsupport}/common-gdbthread.h (100%)
 rename gdb/{common => gdbsupport}/common-inferior.h (100%)
 rename gdb/{common => gdbsupport}/common-regcache.c (100%)
 rename gdb/{common => gdbsupport}/common-regcache.h (100%)
 rename gdb/{common => gdbsupport}/common-types.h (100%)
 rename gdb/{common => gdbsupport}/common-utils.c (97%)
 rename gdb/{common => gdbsupport}/common-utils.h (100%)
 rename gdb/{common => gdbsupport}/common.host (91%)
 rename gdb/{common => gdbsupport}/common.m4 (100%)
 rename gdb/{common => gdbsupport}/create-version.sh (96%)
 rename gdb/{common => gdbsupport}/def-vector.h (96%)
 rename gdb/{common => gdbsupport}/default-init-alloc.h (100%)
 rename gdb/{common => gdbsupport}/enum-flags.h (100%)
 rename gdb/{common => gdbsupport}/environ.c (93%)
 rename gdb/{common => gdbsupport}/environ.h (100%)
 rename gdb/{common => gdbsupport}/errors.c (91%)
 rename gdb/{common => gdbsupport}/errors.h (100%)
 rename gdb/{common => gdbsupport}/fileio.c (100%)
 rename gdb/{common => gdbsupport}/fileio.h (100%)
 rename gdb/{common => gdbsupport}/filestuff.c (99%)
 rename gdb/{common => gdbsupport}/filestuff.h (100%)
 rename gdb/{common => gdbsupport}/filtered-iterator.h (100%)
 rename gdb/{common => gdbsupport}/format.c (100%)
 rename gdb/{common => gdbsupport}/format.h (98%)
 rename gdb/{common => gdbsupport}/forward-scope-exit.h (99%)
 rename gdb/{common => gdbsupport}/function-view.h (100%)
 rename gdb/{common => gdbsupport}/gdb_assert.h (100%)
 rename gdb/{common => gdbsupport}/gdb_locale.h (100%)
 rename gdb/{common => gdbsupport}/gdb_optional.h (99%)
 rename gdb/{common => gdbsupport}/gdb_proc_service.h (100%)
 rename gdb/{common => gdbsupport}/gdb_ref_ptr.h (100%)
 rename gdb/{common => gdbsupport}/gdb_setjmp.h (100%)
 rename gdb/{common => gdbsupport}/gdb_signals.h (100%)
 rename gdb/{common => gdbsupport}/gdb_splay_tree.h (100%)
 rename gdb/{common => gdbsupport}/gdb_string_view.h (100%)
 rename gdb/{common => gdbsupport}/gdb_string_view.tcc (100%)
 rename gdb/{common => gdbsupport}/gdb_sys_time.h (100%)
 rename gdb/{common => gdbsupport}/gdb_tilde_expand.c (96%)
 rename gdb/{common => gdbsupport}/gdb_tilde_expand.h (100%)
 rename gdb/{common => gdbsupport}/gdb_unique_ptr.h (100%)
 rename gdb/{common => gdbsupport}/gdb_unlinker.h (100%)
 rename gdb/{common => gdbsupport}/gdb_vecs.c (100%)
 rename gdb/{common => gdbsupport}/gdb_vecs.h (100%)
 rename gdb/{common => gdbsupport}/gdb_wait.h (100%)
 rename gdb/{common => gdbsupport}/hash_enum.h (100%)
 rename gdb/{common => gdbsupport}/host-defs.h (100%)
 rename gdb/{common => gdbsupport}/job-control.c (98%)
 rename gdb/{common => gdbsupport}/job-control.h (97%)
 rename gdb/{common => gdbsupport}/mingw-strerror.c (100%)
 rename gdb/{common => gdbsupport}/netstuff.c (97%)
 rename gdb/{common => gdbsupport}/netstuff.h (100%)
 rename gdb/{common => gdbsupport}/new-op.c (100%)
 rename gdb/{common => gdbsupport}/next-iterator.h (100%)
 rename gdb/{common => gdbsupport}/observable.h (100%)
 rename gdb/{common => gdbsupport}/offset-type.h (100%)
 rename gdb/{common => gdbsupport}/pathstuff.c (96%)
 rename gdb/{common => gdbsupport}/pathstuff.h (98%)
 rename gdb/{common => gdbsupport}/poison.h (100%)
 rename gdb/{common => gdbsupport}/posix-strerror.c (100%)
 rename gdb/{common => gdbsupport}/preprocessor.h (100%)
 rename gdb/{common => gdbsupport}/print-utils.c (100%)
 rename gdb/{common => gdbsupport}/print-utils.h (100%)
 rename gdb/{common => gdbsupport}/ptid.c (100%)
 rename gdb/{common => gdbsupport}/ptid.h (100%)
 rename gdb/{common => gdbsupport}/refcounted-object.h (100%)
 rename gdb/{common => gdbsupport}/rsp-low.c (100%)
 rename gdb/{common => gdbsupport}/rsp-low.h (99%)
 rename gdb/{common => gdbsupport}/run-time-clock.c (100%)
 rename gdb/{common => gdbsupport}/run-time-clock.h (100%)
 rename gdb/{common => gdbsupport}/safe-iterator.h (100%)
 rename gdb/{common => gdbsupport}/scope-exit.h (99%)
 rename gdb/{common => gdbsupport}/scoped_fd.h (100%)
 rename gdb/{common => gdbsupport}/scoped_mmap.c (97%)
 rename gdb/{common => gdbsupport}/scoped_mmap.h (100%)
 rename gdb/{common => gdbsupport}/scoped_restore.h (100%)
 rename gdb/{common => gdbsupport}/selftest.c (100%)
 rename gdb/{common => gdbsupport}/selftest.h (100%)
 rename gdb/{common => gdbsupport}/signals-state-save-restore.c (100%)
 rename gdb/{common => gdbsupport}/signals-state-save-restore.h (100%)
 rename gdb/{common => gdbsupport}/signals.c (100%)
 rename gdb/{common => gdbsupport}/symbol.h (100%)
 rename gdb/{common => gdbsupport}/tdesc.c (96%)
 rename gdb/{common => gdbsupport}/tdesc.h (100%)
 rename gdb/{common => gdbsupport}/traits.h (100%)
 rename gdb/{common => gdbsupport}/underlying.h (100%)
 rename gdb/{common => gdbsupport}/valid-expr.h (98%)
 rename gdb/{common => gdbsupport}/vec.c (100%)
 rename gdb/{common => gdbsupport}/vec.h (100%)
 rename gdb/{common => gdbsupport}/version.h (100%)
 rename gdb/{common => gdbsupport}/x86-xstate.h (100%)
 rename gdb/{common => gdbsupport}/xml-utils.c (100%)
 rename gdb/{common => gdbsupport}/xml-utils.h (100%)

Comments

Pedro Alves July 2, 2019, 3:10 p.m. UTC | #1
On 6/14/19 9:19 PM, Tom Tromey wrote:
> This is the next patch in the ongoing series to move gdbsever to the
> top level.
> 
> This patch just renames the "common" directory.  The idea is to do
> this move in two parts: first rename the directory (this patch), then
> move the directory to the top.  This approach makes the patches a bit
> more tractable.
> 
> I chose the name "gdbsupport" for the directory.  However, as this
> patch was largely written by sed, we could pick a new name without too
> much difficulty.
> 

Seems fine to me.  I never liked the "common" moniker much anyway.

Do you plan to rename the "common-*" files and adjust the COMMON in
include guards?  More like OOC, since leaving it as is is fine
with me too.  There are also a number of wiki references to common/,
those would be nice to fix.

Thanks,
Pedro Alves
Tom Tromey July 2, 2019, 5:24 p.m. UTC | #2
Pedro> Do you plan to rename the "common-*" files and adjust the COMMON in
Pedro> include guards?  More like OOC, since leaving it as is is fine
Pedro> with me too.  There are also a number of wiki references to common/,
Pedro> those would be nice to fix.

I haven't done any of those in my current series, but I can put it on my
to-do list.

Tom
Tom Tromey July 8, 2019, 9 p.m. UTC | #3
>>>>> "Pedro" == Pedro Alves <palves@redhat.com> writes:

>> I chose the name "gdbsupport" for the directory.  However, as this
>> patch was largely written by sed, we could pick a new name without too
>> much difficulty.

Pedro> Seems fine to me.  I never liked the "common" moniker much anyway.

I'm going to check this in tomorrow.  I rebased it today and it only
needed one trivial touchup.

Tom
diff mbox

Patch

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 7308ea57674..b6680b9afd3 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -529,7 +529,7 @@  CONFIG_INSTALL = @CONFIG_INSTALL@
 CONFIG_UNINSTALL = @CONFIG_UNINSTALL@
 HAVE_NATIVE_GCORE_TARGET = @HAVE_NATIVE_GCORE_TARGET@
 
-CONFIG_SRC_SUBDIR = arch cli mi common compile tui unittests guile python \
+CONFIG_SRC_SUBDIR = arch cli mi gdbsupport compile tui unittests guile python \
 	target nat
 CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR))
 
@@ -948,35 +948,35 @@  COMMON_SFILES = \
 	cli-out.c \
 	coff-pe-read.c \
 	coffread.c \
-	common/agent.c \
-	common/btrace-common.c \
-	common/buffer.c \
-	common/cleanups.c \
-	common/common-debug.c \
-	common/common-exceptions.c \
-	common/common-regcache.c \
-	common/common-utils.c \
-	common/errors.c \
-	common/environ.c \
-	common/fileio.c \
-	common/filestuff.c \
-	common/format.c \
-	common/job-control.c \
-	common/gdb_tilde_expand.c \
-	common/gdb_vecs.c \
-	common/netstuff.c \
-	common/new-op.c \
-	common/pathstuff.c \
-	common/print-utils.c \
-	common/ptid.c \
-	common/rsp-low.c \
-	common/run-time-clock.c \
-	common/scoped_mmap.c \
-	common/signals.c \
-	common/signals-state-save-restore.c \
-	common/tdesc.c \
-	common/vec.c \
-	common/xml-utils.c \
+	gdbsupport/agent.c \
+	gdbsupport/btrace-common.c \
+	gdbsupport/buffer.c \
+	gdbsupport/cleanups.c \
+	gdbsupport/common-debug.c \
+	gdbsupport/common-exceptions.c \
+	gdbsupport/common-regcache.c \
+	gdbsupport/common-utils.c \
+	gdbsupport/errors.c \
+	gdbsupport/environ.c \
+	gdbsupport/fileio.c \
+	gdbsupport/filestuff.c \
+	gdbsupport/format.c \
+	gdbsupport/job-control.c \
+	gdbsupport/gdb_tilde_expand.c \
+	gdbsupport/gdb_vecs.c \
+	gdbsupport/netstuff.c \
+	gdbsupport/new-op.c \
+	gdbsupport/pathstuff.c \
+	gdbsupport/print-utils.c \
+	gdbsupport/ptid.c \
+	gdbsupport/rsp-low.c \
+	gdbsupport/run-time-clock.c \
+	gdbsupport/scoped_mmap.c \
+	gdbsupport/signals.c \
+	gdbsupport/signals-state-save-restore.c \
+	gdbsupport/tdesc.c \
+	gdbsupport/vec.c \
+	gdbsupport/xml-utils.c \
 	complaints.c \
 	completer.c \
 	continuations.c \
@@ -1442,45 +1442,45 @@  HFILES_NO_SRCDIR = \
 	cli/cli-setshow.h \
 	cli/cli-style.h \
 	cli/cli-utils.h \
-	common/buffer.h \
-	common/cleanups.h \
-	common/common-debug.h \
-	common/common-defs.h \
-	common/common-exceptions.h \
-	common/common-gdbthread.h \
-	common/common-regcache.h \
-	common/common-types.h \
-	common/common-utils.h \
-	common/job-control.h \
-	common/errors.h \
-	common/environ.h \
-	common/fileio.h \
-	common/format.h \
-	common/gdb_assert.h \
-	common/gdb_tilde_expand.h \
-	common/gdb_locale.h \
-	common/gdb_proc_service.h \
-	common/gdb_setjmp.h \
-	common/gdb_signals.h \
-	common/gdb_sys_time.h \
-	common/gdb_vecs.h \
-	common/gdb_wait.h \
-	common/common-inferior.h \
-	common/netstuff.h \
-	common/host-defs.h \
-	common/pathstuff.h \
-	common/print-utils.h \
-	common/ptid.h \
-	common/queue.h \
-	common/rsp-low.h \
-	common/run-time-clock.h \
-	common/signals-state-save-restore.h \
-	common/symbol.h \
-	common/tdesc.h \
-	common/vec.h \
-	common/version.h \
-	common/x86-xstate.h \
-	common/xml-utils.h \
+	gdbsupport/buffer.h \
+	gdbsupport/cleanups.h \
+	gdbsupport/common-debug.h \
+	gdbsupport/common-defs.h \
+	gdbsupport/common-exceptions.h \
+	gdbsupport/common-gdbthread.h \
+	gdbsupport/common-regcache.h \
+	gdbsupport/common-types.h \
+	gdbsupport/common-utils.h \
+	gdbsupport/job-control.h \
+	gdbsupport/errors.h \
+	gdbsupport/environ.h \
+	gdbsupport/fileio.h \
+	gdbsupport/format.h \
+	gdbsupport/gdb_assert.h \
+	gdbsupport/gdb_tilde_expand.h \
+	gdbsupport/gdb_locale.h \
+	gdbsupport/gdb_proc_service.h \
+	gdbsupport/gdb_setjmp.h \
+	gdbsupport/gdb_signals.h \
+	gdbsupport/gdb_sys_time.h \
+	gdbsupport/gdb_vecs.h \
+	gdbsupport/gdb_wait.h \
+	gdbsupport/common-inferior.h \
+	gdbsupport/netstuff.h \
+	gdbsupport/host-defs.h \
+	gdbsupport/pathstuff.h \
+	gdbsupport/print-utils.h \
+	gdbsupport/ptid.h \
+	gdbsupport/queue.h \
+	gdbsupport/rsp-low.h \
+	gdbsupport/run-time-clock.h \
+	gdbsupport/signals-state-save-restore.h \
+	gdbsupport/symbol.h \
+	gdbsupport/tdesc.h \
+	gdbsupport/vec.h \
+	gdbsupport/version.h \
+	gdbsupport/x86-xstate.h \
+	gdbsupport/xml-utils.h \
 	compile/compile.h \
 	compile/compile-c.h \
 	compile/compile-cplus.h \
@@ -2109,8 +2109,8 @@  $(srcdir)/copying.c: @MAINTAINER_MODE_TRUE@ $(srcdir)/../COPYING3 $(srcdir)/copy
 version.c: stamp-version; @true
 # Note that the obvious names for the temp file are taken by
 # create-version.sh.
-stamp-version: Makefile version.in $(srcdir)/../bfd/version.h $(srcdir)/common/create-version.sh
-	$(ECHO_GEN) $(SHELL) $(srcdir)/common/create-version.sh $(srcdir) \
+stamp-version: Makefile version.in $(srcdir)/../bfd/version.h $(srcdir)/gdbsupport/create-version.sh
+	$(ECHO_GEN) $(SHELL) $(srcdir)/gdbsupport/create-version.sh $(srcdir) \
 	    $(host_alias) $(target_alias) version-t.t
 	@$(SHELL) $(srcdir)/../move-if-change version-t.t version.c
 	@echo stamp > stamp-version
@@ -2344,8 +2344,8 @@  ALLDEPFILES = \
 	xtensa-linux-tdep.c \
 	xtensa-tdep.c \
 	xtensa-xtregs.c \
-	common/mingw-strerror.c \
-	common/posix-strerror.c
+	gdbsupport/mingw-strerror.c \
+	gdbsupport/posix-strerror.c
 
 # Some files need explicit build rules (due to -Werror problems) or due
 # to sub-directory fun 'n' games.
diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index 96ebce4c352..4290fae1631 100644
--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -44,7 +44,7 @@ 
 #include "infcall.h"
 #include "ax.h"
 #include "ax-gdb.h"
-#include "common/selftest.h"
+#include "gdbsupport/selftest.h"
 
 #include "aarch64-tdep.h"
 #include "aarch64-ravenscar-thread.h"
@@ -52,7 +52,7 @@ 
 #include "elf-bfd.h"
 #include "elf/aarch64.h"
 
-#include "common/vec.h"
+#include "gdbsupport/vec.h"
 
 #include "record.h"
 #include "record-full.h"
diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4
index 0719d422a71..b32dcf58c25 100644
--- a/gdb/acinclude.m4
+++ b/gdb/acinclude.m4
@@ -66,7 +66,7 @@  sinclude([../config/iconv.m4])
 
 sinclude([../config/zlib.m4])
 
-m4_include([common/common.m4])
+m4_include([gdbsupport/common.m4])
 
 dnl For libiberty_INIT.
 m4_include(libiberty.m4)
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 1b5f18316fa..fe3b9162d52 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 "common/vec.h"
+#include "gdbsupport/vec.h"
 #include "stack.h"
-#include "common/gdb_vecs.h"
+#include "gdbsupport/gdb_vecs.h"
 #include "typeprint.h"
 #include "namespace.h"
 
@@ -60,8 +60,8 @@ 
 #include "mi/mi-common.h"
 #include "arch-utils.h"
 #include "cli/cli-utils.h"
-#include "common/function-view.h"
-#include "common/byte-vector.h"
+#include "gdbsupport/function-view.h"
+#include "gdbsupport/byte-vector.h"
 #include <algorithm>
 #include <map>
 
diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h
index ff6c3399eaf..d9c8fca0623 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 "common/vec.h"
+#include "gdbsupport/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 8b777d0b3b7..bc71860864a 100644
--- a/gdb/agent.c
+++ b/gdb/agent.c
@@ -19,7 +19,7 @@ 
 #include "command.h"
 #include "gdbcmd.h"
 #include "target.h"
-#include "common/agent.h"
+#include "gdbsupport/agent.h"
 
 /* Enum strings for "set|show agent".  */
 
diff --git a/gdb/alloc.c b/gdb/alloc.c
index 95488a72cf2..8323dd6dd4a 100644
--- a/gdb/alloc.c
+++ b/gdb/alloc.c
@@ -34,9 +34,9 @@ 
    GDBSERVER define when possible, and for this file it seemed
    simple to do so.  */
 
-#include "common/common-defs.h"
+#include "gdbsupport/common-defs.h"
 #include "libiberty.h"
-#include "common/errors.h"
+#include "gdbsupport/errors.h"
 
 /* The xmalloc() (libiberty.h) family of memory management routines.
 
diff --git a/gdb/amd64-darwin-tdep.c b/gdb/amd64-darwin-tdep.c
index 46867f40a38..f1aa72a3b5d 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 "common/x86-xstate.h"
+#include "gdbsupport/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 8ca838e3c83..e797843bc9f 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 "common/x86-xstate.h"
+#include "gdbsupport/x86-xstate.h"
 #include "dicos-tdep.h"
 
 static void
diff --git a/gdb/amd64-fbsd-nat.c b/gdb/amd64-fbsd-nat.c
index cc676d3214f..718ebd9ac1d 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 "common/x86-xstate.h"
+#include "gdbsupport/x86-xstate.h"
 
 
 class amd64_fbsd_nat_target final
diff --git a/gdb/amd64-fbsd-tdep.c b/gdb/amd64-fbsd-tdep.c
index 7e2e9edf21d..493e630974d 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 "common/x86-xstate.h"
+#include "gdbsupport/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 8d0e8eb35cd..4f1c98a0d1e 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 "common/x86-xstate.h"
+#include "gdbsupport/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 5475cf629f3..e7bf05a5fa2 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 "common/x86-xstate.h"
+#include "gdbsupport/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 06905d65dfd..331cb8a73f9 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 "common/x86-xstate.h"
+#include "gdbsupport/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 cd1a1c31b88..67f9f88f522 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 "common/x86-xstate.h"
+#include "gdbsupport/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 56d2e225822..74358d88f43 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 "common/x86-xstate.h"
+#include "gdbsupport/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 31791f9a9f1..e083862d7f3 100644
--- a/gdb/amd64-tdep.c
+++ b/gdb/amd64-tdep.c
@@ -39,14 +39,14 @@ 
 #include "disasm.h"
 #include "amd64-tdep.h"
 #include "i387-tdep.h"
-#include "common/x86-xstate.h"
+#include "gdbsupport/x86-xstate.h"
 #include <algorithm>
 #include "target-descriptions.h"
 #include "arch/amd64.h"
 #include "producer.h"
 #include "ax.h"
 #include "ax-gdb.h"
-#include "common/byte-vector.h"
+#include "gdbsupport/byte-vector.h"
 #include "osabi.h"
 #include "x86-tdep.h"
 
diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c
index 922da9e48bc..3eb1f1493cd 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 "common/x86-xstate.h"
+#include "gdbsupport/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 43f5834b383..bfcb58207a7 100644
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -32,7 +32,7 @@ 
 #include "language.h"
 #include "symtab.h"
 
-#include "common/version.h"
+#include "gdbsupport/version.h"
 
 #include "floatformat.h"
 
diff --git a/gdb/arch/aarch64-insn.c b/gdb/arch/aarch64-insn.c
index cf6e669f99c..e04ad87fefb 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/common-defs.h"
+#include "gdbsupport/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 11a15dd94cb..30c5f8ad066 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/common-defs.h"
+#include "gdbsupport/common-defs.h"
 #include "aarch64.h"
 #include <stdlib.h>
 
diff --git a/gdb/arch/aarch64.h b/gdb/arch/aarch64.h
index 309fe75273e..aed10353ad8 100644
--- a/gdb/arch/aarch64.h
+++ b/gdb/arch/aarch64.h
@@ -20,7 +20,7 @@ 
 #ifndef ARCH_AARCH64_H
 #define ARCH_AARCH64_H
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 /* Create the aarch64 target description.  A non zero VQ value indicates both
    the presence of SVE and the Vector Quotient - the number of 128bit chunks in
diff --git a/gdb/arch/amd64.c b/gdb/arch/amd64.c
index b7e6332d773..3158ab5c0d8 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/common-defs.h"
+#include "gdbsupport/common-defs.h"
 #include "amd64.h"
-#include "common/x86-xstate.h"
+#include "gdbsupport/x86-xstate.h"
 #include <stdlib.h>
 
 #include "../features/i386/64bit-avx.c"
diff --git a/gdb/arch/amd64.h b/gdb/arch/amd64.h
index 1e02c5235f1..96b52a9ace6 100644
--- a/gdb/arch/amd64.h
+++ b/gdb/arch/amd64.h
@@ -18,7 +18,7 @@ 
 #ifndef ARCH_AMD64_H
 #define ARCH_AMD64_H
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 #include <stdint.h>
 
 target_desc *amd64_create_target_description (uint64_t xcr0, bool is_x32,
diff --git a/gdb/arch/arm-get-next-pcs.c b/gdb/arch/arm-get-next-pcs.c
index 06b3f2c9926..ffeeac60af1 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/common-defs.h"
-#include "common/gdb_vecs.h"
-#include "common/common-regcache.h"
+#include "gdbsupport/common-defs.h"
+#include "gdbsupport/gdb_vecs.h"
+#include "gdbsupport/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 a399f3e71c1..9b3f2ea529d 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/common-defs.h"
-#include "common/common-regcache.h"
+#include "gdbsupport/common-defs.h"
+#include "gdbsupport/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 93738f0a0f8..860ce028587 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/common-defs.h"
-#include "common/common-regcache.h"
+#include "gdbsupport/common-defs.h"
+#include "gdbsupport/common-regcache.h"
 #include "arm.h"
 
 /* See arm.h.  */
diff --git a/gdb/arch/i386.c b/gdb/arch/i386.c
index ab24cf71cb5..d08ac6a5e86 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/common-defs.h"
+#include "gdbsupport/common-defs.h"
 #include "i386.h"
-#include "common/tdesc.h"
-#include "common/x86-xstate.h"
+#include "gdbsupport/tdesc.h"
+#include "gdbsupport/x86-xstate.h"
 #include <stdlib.h>
 
 #include "../features/i386/32bit-core.c"
diff --git a/gdb/arch/i386.h b/gdb/arch/i386.h
index 9a831cea300..1caa0ae2eec 100644
--- a/gdb/arch/i386.h
+++ b/gdb/arch/i386.h
@@ -18,7 +18,7 @@ 
 #ifndef ARCH_I386_H
 #define ARCH_I386_H
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 #include <stdint.h>
 
 target_desc *i386_create_target_description (uint64_t xcr0, bool is_linux,
diff --git a/gdb/arch/ppc-linux-common.c b/gdb/arch/ppc-linux-common.c
index 6badd2f7d26..8af30e3cd42 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/common-defs.h"
+#include "gdbsupport/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 5ed1d47ac51..68ff711bace 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/common-defs.h"
+#include "gdbsupport/common-defs.h"
 #include "riscv.h"
 #include <stdlib.h>
 #include <unordered_map>
diff --git a/gdb/arch/riscv.h b/gdb/arch/riscv.h
index 05c19054dce..7917bdf4b4c 100644
--- a/gdb/arch/riscv.h
+++ b/gdb/arch/riscv.h
@@ -20,7 +20,7 @@ 
 #ifndef ARCH_RISCV_H
 #define ARCH_RISCV_H
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 /* The set of RISC-V architectural features that we track that impact how
    we configure the actual gdbarch instance.  We hold one of these in the
diff --git a/gdb/arch/tic6x.c b/gdb/arch/tic6x.c
index dd2257c97a4..03aacfaf480 100644
--- a/gdb/arch/tic6x.c
+++ b/gdb/arch/tic6x.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/tdesc.h"
+#include "gdbsupport/tdesc.h"
 #include "tic6x.h"
-#include "common/common-defs.h"
+#include "gdbsupport/common-defs.h"
 
 #include "../features/tic6x-core.c"
 #include "../features/tic6x-gp.c"
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 742bfa57069..644ec68f06f 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -55,7 +55,7 @@ 
 #include "coff/internal.h"
 #include "elf/arm.h"
 
-#include "common/vec.h"
+#include "gdbsupport/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 "common/selftest.h"
+#include "gdbsupport/selftest.h"
 #endif
 
 static int arm_debug;
diff --git a/gdb/auto-load.c b/gdb/auto-load.c
index 6833c21323a..7e417994e8f 100644
--- a/gdb/auto-load.c
+++ b/gdb/auto-load.c
@@ -36,11 +36,11 @@ 
 #include "completer.h"
 #include "fnmatch.h"
 #include "top.h"
-#include "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 #include "extension.h"
 #include "gdb/section-scripts.h"
 #include <algorithm>
-#include "common/pathstuff.h"
+#include "gdbsupport/pathstuff.h"
 
 /* The section to look in for auto-loaded scripts (in file formats that
    support sections).
diff --git a/gdb/auxv.c b/gdb/auxv.c
index 5e0ff26ab1a..53958011c81 100644
--- a/gdb/auxv.c
+++ b/gdb/auxv.c
@@ -25,7 +25,7 @@ 
 #include "valprint.h"
 #include "gdbcore.h"
 #include "observable.h"
-#include "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 #include "objfiles.h"
 
 #include "auxv.h"
diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c
index 5872bec4777..e074671786c 100644
--- a/gdb/ax-gdb.c
+++ b/gdb/ax-gdb.c
@@ -46,7 +46,7 @@ 
 #include "valprint.h"
 #include "c-lang.h"
 
-#include "common/format.h"
+#include "gdbsupport/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 f956dfc2f53..d0fdc621f88 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 "common/ax.def"
+#include "gdbsupport/ax.def"
 #undef DEFOP
 };
 
diff --git a/gdb/ax.h b/gdb/ax.h
index d16098b8c9c..112c21b6217 100644
--- a/gdb/ax.h
+++ b/gdb/ax.h
@@ -19,7 +19,7 @@ 
 #ifndef AX_H
 #define AX_H
 
-#include "common/vec.h"
+#include "gdbsupport/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 "common/ax.def"
+#include "gdbsupport/ax.def"
 #undef DEFOP
     aop_last
   };
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index dce8a0f33f2..a2e7dd5e925 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 "common/format.h"
+#include "gdbsupport/format.h"
 #include "thread-fsm.h"
 #include "tid-parse.h"
 #include "cli/cli-style.h"
@@ -82,8 +82,8 @@ 
 #include "extension.h"
 #include <algorithm>
 #include "progspace-and-thread.h"
-#include "common/array-view.h"
-#include "common/gdb_optional.h"
+#include "gdbsupport/array-view.h"
+#include "gdbsupport/gdb_optional.h"
 
 /* Enums for exception-handling support.  */
 enum exception_event_kind
diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 3646ea63cb8..19cc16d86c8 100644
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -21,14 +21,14 @@ 
 
 #include "frame.h"
 #include "value.h"
-#include "common/vec.h"
+#include "gdbsupport/vec.h"
 #include "ax.h"
 #include "command.h"
-#include "common/break-common.h"
+#include "gdbsupport/break-common.h"
 #include "probe.h"
 #include "location.h"
 #include <vector>
-#include "common/array-view.h"
+#include "gdbsupport/array-view.h"
 #include "cli/cli-script.h"
 
 struct block;
diff --git a/gdb/btrace.c b/gdb/btrace.c
index 2806b8c69d5..08096adeb1d 100644
--- a/gdb/btrace.c
+++ b/gdb/btrace.c
@@ -31,7 +31,7 @@ 
 #include "filenames.h"
 #include "xml-support.h"
 #include "regcache.h"
-#include "common/rsp-low.h"
+#include "gdbsupport/rsp-low.h"
 #include "gdbcmd.h"
 #include "cli/cli-utils.h"
 
@@ -2074,7 +2074,7 @@  parse_xml_raw (struct gdb_xml_parser *parser, const char *body_text,
   gdb::unique_xmalloc_ptr<gdb_byte> data ((gdb_byte *) xmalloc (size));
   bin = data.get ();
 
-  /* We use hex encoding - see common/rsp-low.h.  */
+  /* We use hex encoding - see gdbsupport/rsp-low.h.  */
   while (len > 0)
     {
       char hi, lo;
diff --git a/gdb/btrace.h b/gdb/btrace.h
index 7b38b14ac01..ba8d27c879c 100644
--- a/gdb/btrace.h
+++ b/gdb/btrace.h
@@ -26,9 +26,9 @@ 
    inferior.  For presentation purposes, the branch trace is represented as a
    list of sequential control-flow blocks, one such list per thread.  */
 
-#include "common/btrace-common.h"
+#include "gdbsupport/btrace-common.h"
 #include "target/waitstatus.h" /* For enum target_stop_reason.  */
-#include "common/enum-flags.h"
+#include "gdbsupport/enum-flags.h"
 
 #if defined (HAVE_LIBIPT)
 #  include <intel-pt.h>
diff --git a/gdb/build-id.c b/gdb/build-id.c
index 27f29cd0442..048da2af86f 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 "common/gdb_vecs.h"
+#include "gdbsupport/gdb_vecs.h"
 #include "symfile.h"
 #include "objfiles.h"
 #include "filenames.h"
diff --git a/gdb/build-id.h b/gdb/build-id.h
index b8b033e62aa..2835a760fae 100644
--- a/gdb/build-id.h
+++ b/gdb/build-id.h
@@ -21,7 +21,7 @@ 
 #define BUILD_ID_H
 
 #include "gdb_bfd.h"
-#include "common/rsp-low.h"
+#include "gdbsupport/rsp-low.h"
 
 /* Locate NT_GNU_BUILD_ID from ABFD and return its content.  */
 
diff --git a/gdb/c-lang.h b/gdb/c-lang.h
index 70a95eadbf8..d95df54c83e 100644
--- a/gdb/c-lang.h
+++ b/gdb/c-lang.h
@@ -29,7 +29,7 @@  struct parser_state;
 #include "value.h"
 #include "macroexp.h"
 #include "parser-defs.h"
-#include "common/enum-flags.h"
+#include "gdbsupport/enum-flags.h"
 
 
 /* The various kinds of C string and character.  Note that these
diff --git a/gdb/charset.c b/gdb/charset.c
index 5d8a9966031..9df46c0c74d 100644
--- a/gdb/charset.c
+++ b/gdb/charset.c
@@ -21,12 +21,12 @@ 
 #include "charset.h"
 #include "gdbcmd.h"
 #include "gdb_obstack.h"
-#include "common/gdb_wait.h"
+#include "gdbsupport/gdb_wait.h"
 #include "charset-list.h"
-#include "common/vec.h"
-#include "common/environ.h"
+#include "gdbsupport/vec.h"
+#include "gdbsupport/environ.h"
 #include "arch-utils.h"
-#include "common/gdb_vecs.h"
+#include "gdbsupport/gdb_vecs.h"
 #include <ctype.h>
 
 #ifdef USE_WIN32API
diff --git a/gdb/charset.h b/gdb/charset.h
index d7cf247db71..623a40a955f 100644
--- a/gdb/charset.h
+++ b/gdb/charset.h
@@ -19,7 +19,7 @@ 
 #ifndef CHARSET_H
 #define CHARSET_H
 
-#include "common/def-vector.h"
+#include "gdbsupport/def-vector.h"
 
 /* If the target program uses a different character set than the host,
    GDB has some support for translating between the two; GDB converts
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index 62f4d7f0c5e..251a1ab2a8a 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 "common/gdb_wait.h"	/* For shell escape implementation.  */
+#include "gdbsupport/gdb_wait.h"	/* For shell escape implementation.  */
 #include "gdbcmd.h"
 #include "gdb_regex.h"	/* Used by apropos_command.  */
 #include "gdb_vfork.h"
@@ -37,7 +37,7 @@ 
 #include "source.h"
 #include "disasm.h"
 #include "tracepoint.h"
-#include "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 #include "location.h"
 #include "block.h"
 
@@ -52,7 +52,7 @@ 
 #include "cli/cli-utils.h"
 
 #include "extension.h"
-#include "common/pathstuff.h"
+#include "gdbsupport/pathstuff.h"
 
 #ifdef TUI
 #include "tui/tui.h"	/* For tui_active et.al.  */
diff --git a/gdb/cli/cli-cmds.h b/gdb/cli/cli-cmds.h
index 63b8c4018ce..20f678c9ee6 100644
--- a/gdb/cli/cli-cmds.h
+++ b/gdb/cli/cli-cmds.h
@@ -17,8 +17,8 @@ 
 #ifndef CLI_CLI_CMDS_H
 #define CLI_CLI_CMDS_H
 
-#include "common/filestuff.h"
-#include "common/gdb_optional.h"
+#include "gdbsupport/filestuff.h"
+#include "gdbsupport/gdb_optional.h"
 
 /* Chain containing all defined commands.  */
 
diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index a6ddd8cc6d8..edea3ad021e 100644
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -24,7 +24,7 @@ 
 #include "cli/cli-cmds.h"
 #include "cli/cli-decode.h"
 #include "cli/cli-style.h"
-#include "common/gdb_optional.h"
+#include "gdbsupport/gdb_optional.h"
 
 /* Prototypes for local functions.  */
 
diff --git a/gdb/cli/cli-dump.c b/gdb/cli/cli-dump.c
index 621bc9373ff..1910ca27659 100644
--- a/gdb/cli/cli-dump.c
+++ b/gdb/cli/cli-dump.c
@@ -30,8 +30,8 @@ 
 #include "gdbcore.h"
 #include "cli/cli-utils.h"
 #include "gdb_bfd.h"
-#include "common/filestuff.h"
-#include "common/byte-vector.h"
+#include "gdbsupport/filestuff.h"
+#include "gdbsupport/byte-vector.h"
 
 static gdb::unique_xmalloc_ptr<char>
 scan_expression (const char **cmd, const char *def)
diff --git a/gdb/cli/cli-option.h b/gdb/cli/cli-option.h
index 1bfbfce1ce5..86e3d999a7b 100644
--- a/gdb/cli/cli-option.h
+++ b/gdb/cli/cli-option.h
@@ -20,8 +20,8 @@ 
 #ifndef CLI_OPTION_H
 #define CLI_OPTION_H 1
 
-#include "common/gdb_optional.h"
-#include "common/array-view.h"
+#include "gdbsupport/gdb_optional.h"
+#include "gdbsupport/array-view.h"
 #include "completer.h"
 #include <string>
 #include "command.h"
diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c
index 361ead47250..4fc9c70259c 100644
--- a/gdb/cli/cli-script.c
+++ b/gdb/cli/cli-script.c
@@ -33,7 +33,7 @@ 
 #include "extension.h"
 #include "interps.h"
 #include "compile/compile.h"
-#include "common/gdb_string_view.h"
+#include "gdbsupport/gdb_string_view.h"
 #include "python/python.h"
 #include "guile/guile.h"
 
diff --git a/gdb/coff-pe-read.c b/gdb/coff-pe-read.c
index f5721382f4c..9f7384bc146 100644
--- a/gdb/coff-pe-read.c
+++ b/gdb/coff-pe-read.c
@@ -33,7 +33,7 @@ 
 #include "symtab.h"
 #include "symfile.h"
 #include "objfiles.h"
-#include "common/common-utils.h"
+#include "gdbsupport/common-utils.h"
 #include "coff/internal.h"
 
 #include <ctype.h>
diff --git a/gdb/command.h b/gdb/command.h
index 4d52f00de51..e2a0dc64bee 100644
--- a/gdb/command.h
+++ b/gdb/command.h
@@ -18,8 +18,8 @@ 
 #if !defined (COMMAND_H)
 #define COMMAND_H 1
 
-#include "common/gdb_vecs.h"
-#include "common/scoped_restore.h"
+#include "gdbsupport/gdb_vecs.h"
+#include "gdbsupport/scoped_restore.h"
 
 struct completion_tracker;
 
diff --git a/gdb/compile/compile-c-support.c b/gdb/compile/compile-c-support.c
index d1947da6570..0f50c091038 100644
--- a/gdb/compile/compile-c-support.c
+++ b/gdb/compile/compile-c-support.c
@@ -27,8 +27,8 @@ 
 #include "macrotab.h"
 #include "macroscope.h"
 #include "regcache.h"
-#include "common/function-view.h"
-#include "common/preprocessor.h"
+#include "gdbsupport/function-view.h"
+#include "gdbsupport/preprocessor.h"
 
 /* See compile-internal.h.  */
 
diff --git a/gdb/compile/compile-c.h b/gdb/compile/compile-c.h
index b5a2194dbbb..4b65d46d5c6 100644
--- a/gdb/compile/compile-c.h
+++ b/gdb/compile/compile-c.h
@@ -17,7 +17,7 @@ 
 #ifndef COMPILE_COMPILE_C_H
 #define COMPILE_COMPILE_C_H
 
-#include "common/enum-flags.h"
+#include "gdbsupport/enum-flags.h"
 #include "gcc-c-plugin.h"
 
 /* enum-flags wrapper.  */
diff --git a/gdb/compile/compile-cplus-symbols.c b/gdb/compile/compile-cplus-symbols.c
index 98133afd7cd..201c4479f09 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 "common/gdb_assert.h"
+#include "gdbsupport/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 d7aef265cf8..3a7c8b01f7d 100644
--- a/gdb/compile/compile-cplus-types.c
+++ b/gdb/compile/compile-cplus-types.c
@@ -19,11 +19,11 @@ 
 
 
 #include "defs.h"
-#include "common/preprocessor.h"
+#include "gdbsupport/preprocessor.h"
 #include "gdbtypes.h"
 #include "compile-internal.h"
 #include "compile-cplus.h"
-#include "common/gdb_assert.h"
+#include "gdbsupport/gdb_assert.h"
 #include "symtab.h"
 #include "source.h"
 #include "cp-support.h"
diff --git a/gdb/compile/compile-cplus.h b/gdb/compile/compile-cplus.h
index e5ea7d7c81a..d58e030b5a2 100644
--- a/gdb/compile/compile-cplus.h
+++ b/gdb/compile/compile-cplus.h
@@ -17,7 +17,7 @@ 
 #ifndef COMPILE_COMPILE_CPLUS_H
 #define COMPILE_COMPILE_CPLUS_H
 
-#include "common/enum-flags.h"
+#include "gdbsupport/enum-flags.h"
 #include "gcc-cp-plugin.h"
 
 struct type;
diff --git a/gdb/compile/compile-loc2c.c b/gdb/compile/compile-loc2c.c
index b5682d80a55..9ca10b77210 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 "common/gdb_vecs.h"
+#include "gdbsupport/gdb_vecs.h"
 #include "value.h"
 
 
diff --git a/gdb/compile/compile.c b/gdb/compile/compile.c
index 25d0bfe6022..4c0721daa67 100644
--- a/gdb/compile/compile.c
+++ b/gdb/compile/compile.c
@@ -35,14 +35,14 @@ 
 #include "source.h"
 #include "block.h"
 #include "arch-utils.h"
-#include "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 #include "target.h"
 #include "osabi.h"
-#include "common/gdb_wait.h"
+#include "gdbsupport/gdb_wait.h"
 #include "valprint.h"
-#include "common/gdb_optional.h"
-#include "common/gdb_unlinker.h"
-#include "common/pathstuff.h"
+#include "gdbsupport/gdb_optional.h"
+#include "gdbsupport/gdb_unlinker.h"
+#include "gdbsupport/pathstuff.h"
 
 
 
diff --git a/gdb/completer.c b/gdb/completer.c
index 6892a62bb91..07facfb012c 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 "common/gdb_signals.h"
+#include "gdbsupport/gdb_signals.h"
 #include "target.h"
 #include "reggroups.h"
 #include "user-regs.h"
diff --git a/gdb/completer.h b/gdb/completer.h
index 9f8ec47c9f1..313010fce22 100644
--- a/gdb/completer.h
+++ b/gdb/completer.h
@@ -17,7 +17,7 @@ 
 #if !defined (COMPLETER_H)
 #define COMPLETER_H 1
 
-#include "common/gdb_vecs.h"
+#include "gdbsupport/gdb_vecs.h"
 #include "command.h"
 
 /* Types of functions in struct match_list_displayer.  */
diff --git a/gdb/configure b/gdb/configure
index 361f3cc95bb..12954d1f74a 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -6545,7 +6545,7 @@  fi
 . $srcdir/configure.host
 
 # Add in the common host objects.
-. $srcdir/common/common.host
+. $srcdir/gdbsupport/common.host
 gdb_host_obs="$gdb_host_obs $common_host_obs"
 
 # Accumulate some settings from configure.tgt over all enabled targets
@@ -17715,8 +17715,8 @@  if $enable_unittests; then
 $as_echo "#define GDB_SELF_TEST 1" >>confdefs.h
 
 
-  CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_UNITTESTS_OBS) common/selftest.o selftest-arch.o"
-  CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_UNITTESTS_SRCS) common/selftest.c selftest-arch.c"
+  CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_UNITTESTS_OBS) gdbsupport/selftest.o selftest-arch.o"
+  CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_UNITTESTS_SRCS) gdbsupport/selftest.c selftest-arch.c"
 
 fi
 
diff --git a/gdb/configure.ac b/gdb/configure.ac
index 275f08d2a70..2a43d12df76 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -178,7 +178,7 @@  fi
 . $srcdir/configure.host
 
 # Add in the common host objects.
-. $srcdir/common/common.host
+. $srcdir/gdbsupport/common.host
 gdb_host_obs="$gdb_host_obs $common_host_obs"
 
 # Accumulate some settings from configure.tgt over all enabled targets
@@ -2256,8 +2256,8 @@  AC_DEFINE(GDB_DEFAULT_HOST_CHARSET, "UTF-8",
           [Define to be a string naming the default host character set.])
 
 GDB_AC_SELFTEST([
-  CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_UNITTESTS_OBS) common/selftest.o selftest-arch.o"
-  CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_UNITTESTS_SRCS) common/selftest.c selftest-arch.c"
+  CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_UNITTESTS_OBS) gdbsupport/selftest.o selftest-arch.o"
+  CONFIG_SRCS="$CONFIG_SRCS \$(SUBDIR_UNITTESTS_SRCS) gdbsupport/selftest.c selftest-arch.c"
 ])
 
 GDB_AC_TRANSFORM([gdb], [GDB_TRANSFORM_NAME])
diff --git a/gdb/contrib/ari/gdb_ari.sh b/gdb/contrib/ari/gdb_ari.sh
index 597d08849e5..895654150b3 100755
--- a/gdb/contrib/ari/gdb_ari.sh
+++ b/gdb/contrib/ari/gdb_ari.sh
@@ -334,7 +334,7 @@  Do not include gnu-regex.h, instead include gdb_regex.h"
 
 BEGIN { doc["wait.h"] = "\
 Do not include wait.h or sys/wait.h, instead include gdb_wait.h"
-    fix("wait.h", "common/gdb_wait.h", 2);
+    fix("wait.h", "gdbsupport/gdb_wait.h", 2);
     category["wait.h"] = ari_regression
 }
 /^#[[:space:]]*include[[:space:]]*.wait\.h./ \
@@ -446,7 +446,7 @@  Do not use PARAMS(), ISO C 90 implies prototypes"
 BEGIN { doc["__func__"] = "\
 Do not use __func__, ISO C 90 does not support this macro"
     category["__func__"] = ari_regression
-    fix("__func__", "common/gdb_assert.h", 1)
+    fix("__func__", "gdbsupport/gdb_assert.h", 1)
 }
 /(^|[^_[:alnum:]])__func__([^_[:alnum:]]|$)/ {
     fail("__func__")
@@ -593,8 +593,8 @@  BEGIN { doc["strerror"] = "\
 Do not use strerror(), instead use safe_strerror()"
     category["strerror"] = ari_regression
     fix("strerror", "gdb/gdb_string.h", 1)
-    fix("strerror", "gdb/common/mingw-strerror.c", 1)
-    fix("strerror", "gdb/common/posix-strerror.c", 1)
+    fix("strerror", "gdb/gdbsupport/mingw-strerror.c", 1)
+    fix("strerror", "gdb/gdbsupport/posix-strerror.c", 1)
 }
 /(^|[^_[:alnum:]])strerror[[:space:]]*\(/ {
     fail("strerror")
@@ -1080,7 +1080,7 @@  Do not use asprintf(), instead use xstrprintf()"
 
 BEGIN { doc["vasprintf"] = "\
 Do not use vasprintf(), instead use xstrvprintf"
-    fix("vasprintf", "common/common-utils.c", 1)
+    fix("vasprintf", "gdbsupport/common-utils.c", 1)
     category["vasprintf"] = ari_regression
 }
 /(^|[^_[:alnum:]])vasprintf[[:space:]]*\(/ {
diff --git a/gdb/corefile.c b/gdb/corefile.c
index bf859fbbb8d..4fe8606a22d 100644
--- a/gdb/corefile.c
+++ b/gdb/corefile.c
@@ -138,7 +138,7 @@  validate_files (void)
     }
 }
 
-/* See common/common-inferior.h.  */
+/* See gdbsupport/common-inferior.h.  */
 
 char *
 get_exec_file (int err)
diff --git a/gdb/corelow.c b/gdb/corelow.c
index 9fcc2d23727..c0e5ad12eab 100644
--- a/gdb/corelow.c
+++ b/gdb/corelow.c
@@ -42,7 +42,7 @@ 
 #include "objfiles.h"
 #include "gdb_bfd.h"
 #include "completer.h"
-#include "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 
 #ifndef O_LARGEFILE
 #define O_LARGEFILE 0
diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index 9ba6ee3ede5..562c6f155c7 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 "common/gdb_setjmp.h"
+#include "gdbsupport/gdb_setjmp.h"
 #include "safe-ctype.h"
-#include "common/selftest.h"
+#include "gdbsupport/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 c2e63ea0de3..987850730ac 100644
--- a/gdb/cp-support.h
+++ b/gdb/cp-support.h
@@ -25,10 +25,10 @@ 
 /* We need this for 'domain_enum', alas...  */
 
 #include "symtab.h"
-#include "common/vec.h"
-#include "common/gdb_vecs.h"
+#include "gdbsupport/vec.h"
+#include "gdbsupport/gdb_vecs.h"
 #include "gdb_obstack.h"
-#include "common/array-view.h"
+#include "gdbsupport/array-view.h"
 #include <vector>
 
 /* Opaque declarations.  */
diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index 5781d7ab561..9cec72449dd 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 "common/byte-vector.h"
+#include "gdbsupport/byte-vector.h"
 
 static struct obstack dont_print_vb_obstack;
 static struct obstack dont_print_statmem_obstack;
diff --git a/gdb/csky-tdep.c b/gdb/csky-tdep.c
index cd7d8c5a0b1..54b856af067 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 "common/gdb_assert.h"
+#include "gdbsupport/gdb_assert.h"
 #include "frame.h"
 #include "inferior.h"
 #include "symtab.h"
diff --git a/gdb/ctf.c b/gdb/ctf.c
index 7a95df78152..cc714f00e2c 100644
--- a/gdb/ctf.c
+++ b/gdb/ctf.c
@@ -31,7 +31,7 @@ 
 #include "tracefile.h"
 #include <ctype.h>
 #include <algorithm>
-#include "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 
 /* The CTF target.  */
 
diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c
index d2cb683c572..f890e13944c 100644
--- a/gdb/darwin-nat.c
+++ b/gdb/darwin-nat.c
@@ -63,10 +63,10 @@ 
 
 #include "darwin-nat.h"
 #include "filenames.h"
-#include "common/filestuff.h"
-#include "common/gdb_unlinker.h"
-#include "common/pathstuff.h"
-#include "common/scoped_fd.h"
+#include "gdbsupport/filestuff.h"
+#include "gdbsupport/gdb_unlinker.h"
+#include "gdbsupport/pathstuff.h"
+#include "gdbsupport/scoped_fd.h"
 #include "nat/fork-inferior.h"
 
 /* Quick overview.
diff --git a/gdb/debug.c b/gdb/debug.c
index 5926503e742..5907ed15104 100644
--- a/gdb/debug.c
+++ b/gdb/debug.c
@@ -19,7 +19,7 @@ 
 
 #include "defs.h"
 
-/* See common/common-debug.h.  */
+/* See gdbsupport/common-debug.h.  */
 
 void
 debug_vprintf (const char *fmt, va_list ap)
diff --git a/gdb/defs.h b/gdb/defs.h
index e95d0d43480..2e52d2b271f 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -25,7 +25,7 @@ 
 #  error gdbserver should not include gdb/defs.h
 #endif
 
-#include "common/common-defs.h"
+#include "gdbsupport/common-defs.h"
 
 #include <sys/types.h>
 #include <limits.h>
@@ -52,8 +52,8 @@ 
 
 #include "ui-file.h"
 
-#include "common/host-defs.h"
-#include "common/enum-flags.h"
+#include "gdbsupport/host-defs.h"
+#include "gdbsupport/enum-flags.h"
 
 /* Scope types enumerator.  List the types of scopes the compiler will
    accept.  */
diff --git a/gdb/disasm-selftests.c b/gdb/disasm-selftests.c
index e0d84d981ee..9991796cc0a 100644
--- a/gdb/disasm-selftests.c
+++ b/gdb/disasm-selftests.c
@@ -21,7 +21,7 @@ 
 #include "disasm.h"
 
 #if GDB_SELF_TEST
-#include "common/selftest.h"
+#include "gdbsupport/selftest.h"
 #include "selftest-arch.h"
 
 namespace selftests {
diff --git a/gdb/disasm.c b/gdb/disasm.c
index 4e58cb67f93..4e51bc5f6f6 100644
--- a/gdb/disasm.c
+++ b/gdb/disasm.c
@@ -29,7 +29,7 @@ 
 #include "source.h"
 #include "safe-ctype.h"
 #include <algorithm>
-#include "common/gdb_optional.h"
+#include "gdbsupport/gdb_optional.h"
 #include "valprint.h"
 
 /* Disassemble functions.
diff --git a/gdb/disasm.h b/gdb/disasm.h
index d3cc6312093..a9cfb21f872 100644
--- a/gdb/disasm.h
+++ b/gdb/disasm.h
@@ -20,7 +20,7 @@ 
 #define DISASM_H
 
 #include "dis-asm.h"
-#include "common/enum-flags.h"
+#include "gdbsupport/enum-flags.h"
 
 enum gdb_disassembly_flag
   {
diff --git a/gdb/dtrace-probe.c b/gdb/dtrace-probe.c
index 52973784e9a..c97f3df201a 100644
--- a/gdb/dtrace-probe.c
+++ b/gdb/dtrace-probe.c
@@ -21,7 +21,7 @@ 
 
 #include "defs.h"
 #include "probe.h"
-#include "common/vec.h"
+#include "gdbsupport/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 7222f0528d7..64234115db9 100644
--- a/gdb/dwarf-index-cache.c
+++ b/gdb/dwarf-index-cache.c
@@ -23,12 +23,12 @@ 
 #include "build-id.h"
 #include "cli/cli-cmds.h"
 #include "command.h"
-#include "common/scoped_mmap.h"
-#include "common/pathstuff.h"
+#include "gdbsupport/scoped_mmap.h"
+#include "gdbsupport/pathstuff.h"
 #include "dwarf-index-write.h"
 #include "dwarf2read.h"
 #include "objfiles.h"
-#include "common/selftest.h"
+#include "gdbsupport/selftest.h"
 #include <string>
 #include <stdlib.h>
 
diff --git a/gdb/dwarf-index-cache.h b/gdb/dwarf-index-cache.h
index 2f267632141..5ff09ff551c 100644
--- a/gdb/dwarf-index-cache.h
+++ b/gdb/dwarf-index-cache.h
@@ -21,7 +21,7 @@ 
 #define DWARF_INDEX_CACHE_H
 
 #include "dwarf-index-common.h"
-#include "common/array-view.h"
+#include "gdbsupport/array-view.h"
 #include "symfile.h"
 
 /* Base of the classes used to hold the resources of the indices loaded from
diff --git a/gdb/dwarf-index-write.c b/gdb/dwarf-index-write.c
index 8734f99212d..5de0c1e5f6c 100644
--- a/gdb/dwarf-index-write.c
+++ b/gdb/dwarf-index-write.c
@@ -21,11 +21,11 @@ 
 
 #include "addrmap.h"
 #include "cli/cli-decode.h"
-#include "common/byte-vector.h"
-#include "common/filestuff.h"
-#include "common/gdb_unlinker.h"
-#include "common/pathstuff.h"
-#include "common/scoped_fd.h"
+#include "gdbsupport/byte-vector.h"
+#include "gdbsupport/filestuff.h"
+#include "gdbsupport/gdb_unlinker.h"
+#include "gdbsupport/pathstuff.h"
+#include "gdbsupport/scoped_fd.h"
 #include "complaints.h"
 #include "dwarf-index-common.h"
 #include "dwarf2.h"
diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c
index 0f2502b4c68..cad6b7b0ce0 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 "common/selftest.h"
+#include "gdbsupport/selftest.h"
 #include "selftest-arch.h"
 #endif
 
diff --git a/gdb/dwarf2expr.c b/gdb/dwarf2expr.c
index 3bd9abc4401..6d919600e84 100644
--- a/gdb/dwarf2expr.c
+++ b/gdb/dwarf2expr.c
@@ -27,7 +27,7 @@ 
 #include "dwarf2.h"
 #include "dwarf2expr.h"
 #include "dwarf2loc.h"
-#include "common/underlying.h"
+#include "gdbsupport/underlying.h"
 
 /* Cookie for gdbarch data.  */
 
diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index 37cda40ecf3..83ff1f45d5a 100644
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -39,12 +39,12 @@ 
 #include "dwarf2read.h"
 #include "dwarf2-frame.h"
 #include "compile/compile.h"
-#include "common/selftest.h"
+#include "gdbsupport/selftest.h"
 #include <algorithm>
 #include <vector>
 #include <unordered_set>
-#include "common/underlying.h"
-#include "common/byte-vector.h"
+#include "gdbsupport/underlying.h"
+#include "gdbsupport/byte-vector.h"
 
 extern int dwarf_always_disassemble;
 
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 4cf9fcfa218..c5c844eae36 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -58,7 +58,7 @@ 
 #include "psympriv.h"
 #include <sys/stat.h>
 #include "completer.h"
-#include "common/vec.h"
+#include "gdbsupport/vec.h"
 #include "c-lang.h"
 #include "go-lang.h"
 #include "valprint.h"
@@ -68,15 +68,15 @@ 
 #include "gdb_bfd.h"
 #include "f-lang.h"
 #include "source.h"
-#include "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 #include "build-id.h"
 #include "namespace.h"
-#include "common/gdb_unlinker.h"
-#include "common/function-view.h"
-#include "common/gdb_optional.h"
-#include "common/underlying.h"
-#include "common/byte-vector.h"
-#include "common/hash_enum.h"
+#include "gdbsupport/gdb_unlinker.h"
+#include "gdbsupport/function-view.h"
+#include "gdbsupport/gdb_optional.h"
+#include "gdbsupport/underlying.h"
+#include "gdbsupport/byte-vector.h"
+#include "gdbsupport/hash_enum.h"
 #include "filename-seen-cache.h"
 #include "producer.h"
 #include <fcntl.h>
@@ -84,12 +84,12 @@ 
 #include <algorithm>
 #include <unordered_set>
 #include <unordered_map>
-#include "common/selftest.h"
+#include "gdbsupport/selftest.h"
 #include <cmath>
 #include <set>
 #include <forward_list>
 #include "rust-lang.h"
-#include "common/pathstuff.h"
+#include "gdbsupport/pathstuff.h"
 
 /* When == 1, print basic high level tracing messages.
    When > 1, be more verbose.
diff --git a/gdb/event-loop.c b/gdb/event-loop.c
index caeb5f38d9b..affa00b4aa9 100644
--- a/gdb/event-loop.c
+++ b/gdb/event-loop.c
@@ -31,7 +31,7 @@ 
 #endif
 
 #include <sys/types.h>
-#include "common/gdb_sys_time.h"
+#include "gdbsupport/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 3facb38aae8..2132fb550dc 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 "common/buffer.h"
+#include "gdbsupport/buffer.h"
 #include "ser-event.h"
 #include "gdb_select.h"
 
diff --git a/gdb/exceptions.c b/gdb/exceptions.c
index ebdc71d98d4..a4059472574 100644
--- a/gdb/exceptions.c
+++ b/gdb/exceptions.c
@@ -27,7 +27,7 @@ 
 #include "serial.h"
 #include "gdbthread.h"
 #include "top.h"
-#include "common/gdb_optional.h"
+#include "gdbsupport/gdb_optional.h"
 
 static void
 print_flush (void)
diff --git a/gdb/exec.c b/gdb/exec.c
index 7de92347f2e..3098fcaadd5 100644
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -45,7 +45,7 @@ 
 #include <sys/stat.h>
 #include "solist.h"
 #include <algorithm>
-#include "common/pathstuff.h"
+#include "gdbsupport/pathstuff.h"
 
 void (*deprecated_file_changed_hook) (const char *);
 
diff --git a/gdb/extension.h b/gdb/extension.h
index 2f1b71851c6..5e914f5d011 100644
--- a/gdb/extension.h
+++ b/gdb/extension.h
@@ -21,8 +21,8 @@ 
 #define EXTENSION_H
 
 #include "mi/mi-cmds.h" /* For PRINT_NO_VALUES, etc.  */
-#include "common/vec.h"
-#include "common/array-view.h"
+#include "gdbsupport/vec.h"
+#include "gdbsupport/array-view.h"
 
 struct breakpoint;
 struct command_line;
diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c
index d4f4c8cf359..b5be0b7a3df 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 "common/byte-vector.h"
+#include "gdbsupport/byte-vector.h"
 #include "gdbcore.h"
 #include "inferior.h"
 #include "regcache.h"
 #include "regset.h"
 #include "gdbcmd.h"
 #include "gdbthread.h"
-#include "common/gdb_wait.h"
+#include "gdbsupport/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 "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 #endif
 
 #include "elf-bfd.h"
diff --git a/gdb/features/aarch64-core.c b/gdb/features/aarch64-core.c
index cd3de02cbc1..e1ba0991d7c 100644
--- a/gdb/features/aarch64-core.c
+++ b/gdb/features/aarch64-core.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: aarch64-core.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_aarch64_core (struct target_desc *result, long regnum)
diff --git a/gdb/features/aarch64-fpu.c b/gdb/features/aarch64-fpu.c
index b73d12ebe48..87e394656fc 100644
--- a/gdb/features/aarch64-fpu.c
+++ b/gdb/features/aarch64-fpu.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: aarch64-fpu.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_aarch64_fpu (struct target_desc *result, long regnum)
diff --git a/gdb/features/aarch64-pauth.c b/gdb/features/aarch64-pauth.c
index e4b84ffb552..931e6cb2841 100644
--- a/gdb/features/aarch64-pauth.c
+++ b/gdb/features/aarch64-pauth.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: aarch64-pauth.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_aarch64_pauth (struct target_desc *result, long regnum)
diff --git a/gdb/features/aarch64-sve.c b/gdb/features/aarch64-sve.c
index ae292d2f3da..9c7f56d80d8 100644
--- a/gdb/features/aarch64-sve.c
+++ b/gdb/features/aarch64-sve.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/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 /* This function is NOT auto generated from xml.  Create the aarch64 with SVE
    feature into RESULT, where SCALE is the number of 128 bit chunks in a Z
diff --git a/gdb/features/i386/32bit-avx.c b/gdb/features/i386/32bit-avx.c
index b9feac377cf..32ca7a0f078 100644
--- a/gdb/features/i386/32bit-avx.c
+++ b/gdb/features/i386/32bit-avx.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: 32bit-avx.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_i386_32bit_avx (struct target_desc *result, long regnum)
diff --git a/gdb/features/i386/32bit-avx512.c b/gdb/features/i386/32bit-avx512.c
index 51a403259db..96d0e068bd2 100644
--- a/gdb/features/i386/32bit-avx512.c
+++ b/gdb/features/i386/32bit-avx512.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: 32bit-avx512.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_i386_32bit_avx512 (struct target_desc *result, long regnum)
diff --git a/gdb/features/i386/32bit-core.c b/gdb/features/i386/32bit-core.c
index 098c2ca31c6..8f9fbad717b 100644
--- a/gdb/features/i386/32bit-core.c
+++ b/gdb/features/i386/32bit-core.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: 32bit-core.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_i386_32bit_core (struct target_desc *result, long regnum)
diff --git a/gdb/features/i386/32bit-linux.c b/gdb/features/i386/32bit-linux.c
index 3bc593739c9..3289f07d332 100644
--- a/gdb/features/i386/32bit-linux.c
+++ b/gdb/features/i386/32bit-linux.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: 32bit-linux.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_i386_32bit_linux (struct target_desc *result, long regnum)
diff --git a/gdb/features/i386/32bit-mpx.c b/gdb/features/i386/32bit-mpx.c
index 8288e9d758f..40b34ed73b7 100644
--- a/gdb/features/i386/32bit-mpx.c
+++ b/gdb/features/i386/32bit-mpx.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: 32bit-mpx.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_i386_32bit_mpx (struct target_desc *result, long regnum)
diff --git a/gdb/features/i386/32bit-pkeys.c b/gdb/features/i386/32bit-pkeys.c
index a2a72f40a31..5e9087e4303 100644
--- a/gdb/features/i386/32bit-pkeys.c
+++ b/gdb/features/i386/32bit-pkeys.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: 32bit-pkeys.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_i386_32bit_pkeys (struct target_desc *result, long regnum)
diff --git a/gdb/features/i386/32bit-segments.c b/gdb/features/i386/32bit-segments.c
index c22c3dfbc3c..209d434ba87 100644
--- a/gdb/features/i386/32bit-segments.c
+++ b/gdb/features/i386/32bit-segments.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: 32bit-segments.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_i386_32bit_segments (struct target_desc *result, long regnum)
diff --git a/gdb/features/i386/32bit-sse.c b/gdb/features/i386/32bit-sse.c
index 68fbab06a40..e5eaf8feb59 100644
--- a/gdb/features/i386/32bit-sse.c
+++ b/gdb/features/i386/32bit-sse.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: 32bit-sse.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_i386_32bit_sse (struct target_desc *result, long regnum)
diff --git a/gdb/features/i386/64bit-avx.c b/gdb/features/i386/64bit-avx.c
index 7e45c980dbc..f44af9ffed6 100644
--- a/gdb/features/i386/64bit-avx.c
+++ b/gdb/features/i386/64bit-avx.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: 64bit-avx.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_i386_64bit_avx (struct target_desc *result, long regnum)
diff --git a/gdb/features/i386/64bit-avx512.c b/gdb/features/i386/64bit-avx512.c
index acc07a3628b..d12234c41ce 100644
--- a/gdb/features/i386/64bit-avx512.c
+++ b/gdb/features/i386/64bit-avx512.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: 64bit-avx512.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_i386_64bit_avx512 (struct target_desc *result, long regnum)
diff --git a/gdb/features/i386/64bit-core.c b/gdb/features/i386/64bit-core.c
index 617425da217..2418fe54e80 100644
--- a/gdb/features/i386/64bit-core.c
+++ b/gdb/features/i386/64bit-core.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: 64bit-core.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_i386_64bit_core (struct target_desc *result, long regnum)
diff --git a/gdb/features/i386/64bit-linux.c b/gdb/features/i386/64bit-linux.c
index 68de9d27e8b..661ce6b8833 100644
--- a/gdb/features/i386/64bit-linux.c
+++ b/gdb/features/i386/64bit-linux.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: 64bit-linux.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_i386_64bit_linux (struct target_desc *result, long regnum)
diff --git a/gdb/features/i386/64bit-mpx.c b/gdb/features/i386/64bit-mpx.c
index ce4d611d9c1..3eabc9d33c5 100644
--- a/gdb/features/i386/64bit-mpx.c
+++ b/gdb/features/i386/64bit-mpx.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: 64bit-mpx.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_i386_64bit_mpx (struct target_desc *result, long regnum)
diff --git a/gdb/features/i386/64bit-pkeys.c b/gdb/features/i386/64bit-pkeys.c
index 70b88cf74db..83001d4a876 100644
--- a/gdb/features/i386/64bit-pkeys.c
+++ b/gdb/features/i386/64bit-pkeys.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: 64bit-pkeys.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_i386_64bit_pkeys (struct target_desc *result, long regnum)
diff --git a/gdb/features/i386/64bit-segments.c b/gdb/features/i386/64bit-segments.c
index b06d40fbda3..d85717046d4 100644
--- a/gdb/features/i386/64bit-segments.c
+++ b/gdb/features/i386/64bit-segments.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: 64bit-segments.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_i386_64bit_segments (struct target_desc *result, long regnum)
diff --git a/gdb/features/i386/64bit-sse.c b/gdb/features/i386/64bit-sse.c
index e0830937411..48b5aa09793 100644
--- a/gdb/features/i386/64bit-sse.c
+++ b/gdb/features/i386/64bit-sse.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: 64bit-sse.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_i386_64bit_sse (struct target_desc *result, long regnum)
diff --git a/gdb/features/i386/x32-core.c b/gdb/features/i386/x32-core.c
index dd6e1a2ed6a..740eb658a5f 100644
--- a/gdb/features/i386/x32-core.c
+++ b/gdb/features/i386/x32-core.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: x32-core.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_i386_x32_core (struct target_desc *result, long regnum)
diff --git a/gdb/features/riscv/32bit-cpu.c b/gdb/features/riscv/32bit-cpu.c
index 64686db5cdd..26e6dc1b322 100644
--- a/gdb/features/riscv/32bit-cpu.c
+++ b/gdb/features/riscv/32bit-cpu.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: 32bit-cpu.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_riscv_32bit_cpu (struct target_desc *result, long regnum)
diff --git a/gdb/features/riscv/32bit-csr.c b/gdb/features/riscv/32bit-csr.c
index 711e958ddae..d306bc8d293 100644
--- a/gdb/features/riscv/32bit-csr.c
+++ b/gdb/features/riscv/32bit-csr.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: 32bit-csr.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_riscv_32bit_csr (struct target_desc *result, long regnum)
diff --git a/gdb/features/riscv/32bit-fpu.c b/gdb/features/riscv/32bit-fpu.c
index a19780aab0c..d92407fb9e0 100644
--- a/gdb/features/riscv/32bit-fpu.c
+++ b/gdb/features/riscv/32bit-fpu.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: 32bit-fpu.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_riscv_32bit_fpu (struct target_desc *result, long regnum)
diff --git a/gdb/features/riscv/64bit-cpu.c b/gdb/features/riscv/64bit-cpu.c
index 910089805ee..96ecce08962 100644
--- a/gdb/features/riscv/64bit-cpu.c
+++ b/gdb/features/riscv/64bit-cpu.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: 64bit-cpu.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_riscv_64bit_cpu (struct target_desc *result, long regnum)
diff --git a/gdb/features/riscv/64bit-csr.c b/gdb/features/riscv/64bit-csr.c
index 7c777406254..e46a77f3051 100644
--- a/gdb/features/riscv/64bit-csr.c
+++ b/gdb/features/riscv/64bit-csr.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: 64bit-csr.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_riscv_64bit_csr (struct target_desc *result, long regnum)
diff --git a/gdb/features/riscv/64bit-fpu.c b/gdb/features/riscv/64bit-fpu.c
index b93cb4ec03b..4fd8ee1e41b 100644
--- a/gdb/features/riscv/64bit-fpu.c
+++ b/gdb/features/riscv/64bit-fpu.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: 64bit-fpu.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_riscv_64bit_fpu (struct target_desc *result, long regnum)
diff --git a/gdb/features/tic6x-c6xp.c b/gdb/features/tic6x-c6xp.c
index bfd69d7fd52..c295051cfac 100644
--- a/gdb/features/tic6x-c6xp.c
+++ b/gdb/features/tic6x-c6xp.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: tic6x-c6xp.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_tic6x_c6xp (struct target_desc *result, long regnum)
diff --git a/gdb/features/tic6x-core.c b/gdb/features/tic6x-core.c
index 0415209275a..2dc96553236 100644
--- a/gdb/features/tic6x-core.c
+++ b/gdb/features/tic6x-core.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: tic6x-core.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_tic6x_core (struct target_desc *result, long regnum)
diff --git a/gdb/features/tic6x-gp.c b/gdb/features/tic6x-gp.c
index 4a0734c04a4..fcc4cbc345a 100644
--- a/gdb/features/tic6x-gp.c
+++ b/gdb/features/tic6x-gp.c
@@ -1,7 +1,7 @@ 
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: tic6x-gp.xml */
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 static int
 create_feature_tic6x_gp (struct target_desc *result, long regnum)
diff --git a/gdb/filename-seen-cache.h b/gdb/filename-seen-cache.h
index 824245e77e6..90bd564e57c 100644
--- a/gdb/filename-seen-cache.h
+++ b/gdb/filename-seen-cache.h
@@ -21,7 +21,7 @@ 
 #define FILENAME_SEEN_CACHE_H
 
 #include "defs.h"
-#include "common/function-view.h"
+#include "gdbsupport/function-view.h"
 
 /* Cache to watch for file names already seen.  */
 
diff --git a/gdb/findcmd.c b/gdb/findcmd.c
index 52f8f80aaae..5a1fa89938a 100644
--- a/gdb/findcmd.c
+++ b/gdb/findcmd.c
@@ -25,7 +25,7 @@ 
 #include "target.h"
 #include "cli/cli-utils.h"
 #include <algorithm>
-#include "common/byte-vector.h"
+#include "gdbsupport/byte-vector.h"
 
 /* Copied from bfd_put_bits.  */
 
diff --git a/gdb/findvar.c b/gdb/findvar.c
index e89ee37ffc7..e52ec8d7c92 100644
--- a/gdb/findvar.c
+++ b/gdb/findvar.c
@@ -32,7 +32,7 @@ 
 #include "objfiles.h"
 #include "language.h"
 #include "dwarf2loc.h"
-#include "common/selftest.h"
+#include "gdbsupport/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 4c49848830a..edfb6a3c5a1 100644
--- a/gdb/fork-child.c
+++ b/gdb/fork-child.c
@@ -25,17 +25,17 @@ 
 #include "terminal.h"
 #include "gdbthread.h"
 #include "top.h"
-#include "common/job-control.h"
-#include "common/filestuff.h"
+#include "gdbsupport/job-control.h"
+#include "gdbsupport/filestuff.h"
 #include "nat/fork-inferior.h"
-#include "common/common-inferior.h"
+#include "gdbsupport/common-inferior.h"
 
 /* The exec-wrapper, if any, that will be used when starting the
    inferior.  */
 
 static char *exec_wrapper = NULL;
 
-/* See common/common-inferior.h.  */
+/* See gdbsupport/common-inferior.h.  */
 
 const char *
 get_exec_wrapper ()
diff --git a/gdb/gcore.c b/gdb/gcore.c
index 21d9ee88671..eb108feb790 100644
--- a/gdb/gcore.c
+++ b/gdb/gcore.c
@@ -35,9 +35,9 @@ 
 #include "gdb_bfd.h"
 #include "readline/tilde.h"
 #include <algorithm>
-#include "common/gdb_unlinker.h"
-#include "common/byte-vector.h"
-#include "common/scope-exit.h"
+#include "gdbsupport/gdb_unlinker.h"
+#include "gdbsupport/byte-vector.h"
+#include "gdbsupport/scope-exit.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 5c6bbef551d..1257e01e17e 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 "common/filestuff.h"
-#include "common/vec.h"
+#include "gdbsupport/filestuff.h"
+#include "gdbsupport/vec.h"
 #ifdef HAVE_MMAP
 #include <sys/mman.h>
 #ifndef MAP_FAILED
diff --git a/gdb/gdb_bfd.h b/gdb/gdb_bfd.h
index 87b48f51f7c..aa67fc0a140 100644
--- a/gdb/gdb_bfd.h
+++ b/gdb/gdb_bfd.h
@@ -21,7 +21,7 @@ 
 #define GDB_BFD_H
 
 #include "registry.h"
-#include "common/gdb_ref_ptr.h"
+#include "gdbsupport/gdb_ref_ptr.h"
 
 DECLARE_REGISTRY (bfd);
 
diff --git a/gdb/gdb_proc_service.h b/gdb/gdb_proc_service.h
index ad69e1dde00..24e2463fc62 100644
--- a/gdb/gdb_proc_service.h
+++ b/gdb/gdb_proc_service.h
@@ -19,7 +19,7 @@ 
 #ifndef GDB_PROC_SERVICE_H
 #define GDB_PROC_SERVICE_H
 
-#include "common/gdb_proc_service.h"
+#include "gdbsupport/gdb_proc_service.h"
 
 struct thread_info;
 
diff --git a/gdb/gdb_regex.c b/gdb/gdb_regex.c
index 711f121c1dc..ce8444361ce 100644
--- a/gdb/gdb_regex.c
+++ b/gdb/gdb_regex.c
@@ -17,7 +17,7 @@ 
 
 #include "defs.h"
 #include "gdb_regex.h"
-#include "common/def-vector.h"
+#include "gdbsupport/def-vector.h"
 
 compiled_regex::compiled_regex (const char *regex, int cflags,
 				const char *message)
diff --git a/gdb/gdb_select.h b/gdb/gdb_select.h
index ec4547bde2a..00a972ec84c 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 "common/gdb_sys_time.h"
+#include "gdbsupport/gdb_sys_time.h"
 #endif
 
 #ifdef USE_WIN32API
diff --git a/gdb/gdb_usleep.c b/gdb/gdb_usleep.c
index 25cc8e1b16c..9a92ced34a8 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 "common/gdb_sys_time.h"
+#include "gdbsupport/gdb_sys_time.h"
 
 int
 gdb_usleep (int usec)
diff --git a/gdb/gdbarch-selftests.c b/gdb/gdbarch-selftests.c
index 0efd4bc1305..bc8d9bda7aa 100644
--- a/gdb/gdbarch-selftests.c
+++ b/gdb/gdbarch-selftests.c
@@ -19,14 +19,14 @@ 
 
 #include "defs.h"
 #if GDB_SELF_TEST
-#include "common/selftest.h"
+#include "gdbsupport/selftest.h"
 #include "selftest-arch.h"
 #include "inferior.h"
 #include "gdbthread.h"
 #include "target.h"
 #include "test-target.h"
 #include "target-float.h"
-#include "common/def-vector.h"
+#include "gdbsupport/def-vector.h"
 
 namespace selftests {
 
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index b9df2be9df1..ba0356b1d5b 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -198,29 +198,29 @@  SFILES = \
 	$(srcdir)/arch/arm-linux.c \
 	$(srcdir)/arch/ppc-linux-common.c \
 	$(srcdir)/../alloc.c \
-	$(srcdir)/common/btrace-common.c \
-	$(srcdir)/common/buffer.c \
-	$(srcdir)/common/cleanups.c \
-	$(srcdir)/common/common-debug.c \
-	$(srcdir)/common/common-exceptions.c \
-	$(srcdir)/common/common-regcache.c \
-	$(srcdir)/common/common-utils.c \
-	$(srcdir)/common/errors.c \
-	$(srcdir)/common/environ.c \
-	$(srcdir)/common/fileio.c \
-	$(srcdir)/common/filestuff.c \
-	$(srcdir)/common/job-control.c \
-	$(srcdir)/common/gdb_tilde_expand.c \
-	$(srcdir)/common/gdb_vecs.c \
-	$(srcdir)/common/netstuff.c \
-	$(srcdir)/common/new-op.c \
-	$(srcdir)/common/pathstuff.c \
-	$(srcdir)/common/print-utils.c \
-	$(srcdir)/common/ptid.c \
-	$(srcdir)/common/rsp-low.c \
-	$(srcdir)/common/tdesc.c \
-	$(srcdir)/common/vec.c \
-	$(srcdir)/common/xml-utils.c \
+	$(srcdir)/gdbsupport/btrace-common.c \
+	$(srcdir)/gdbsupport/buffer.c \
+	$(srcdir)/gdbsupport/cleanups.c \
+	$(srcdir)/gdbsupport/common-debug.c \
+	$(srcdir)/gdbsupport/common-exceptions.c \
+	$(srcdir)/gdbsupport/common-regcache.c \
+	$(srcdir)/gdbsupport/common-utils.c \
+	$(srcdir)/gdbsupport/errors.c \
+	$(srcdir)/gdbsupport/environ.c \
+	$(srcdir)/gdbsupport/fileio.c \
+	$(srcdir)/gdbsupport/filestuff.c \
+	$(srcdir)/gdbsupport/job-control.c \
+	$(srcdir)/gdbsupport/gdb_tilde_expand.c \
+	$(srcdir)/gdbsupport/gdb_vecs.c \
+	$(srcdir)/gdbsupport/netstuff.c \
+	$(srcdir)/gdbsupport/new-op.c \
+	$(srcdir)/gdbsupport/pathstuff.c \
+	$(srcdir)/gdbsupport/print-utils.c \
+	$(srcdir)/gdbsupport/ptid.c \
+	$(srcdir)/gdbsupport/rsp-low.c \
+	$(srcdir)/gdbsupport/tdesc.c \
+	$(srcdir)/gdbsupport/vec.c \
+	$(srcdir)/gdbsupport/xml-utils.c \
 	$(srcdir)/nat/aarch64-sve-linux-ptrace.c \
 	$(srcdir)/nat/linux-btrace.c \
 	$(srcdir)/nat/linux-namespaces.c \
@@ -241,33 +241,33 @@  TAGFILES = $(SOURCES) ${HFILES} ${ALLPARAM} ${POSSLIBS}
 OBS = \
 	alloc.o \
 	ax.o \
-	common/agent.o \
-	common/btrace-common.o \
-	common/buffer.o \
-	common/cleanups.o \
-	common/common-debug.o \
-	common/common-exceptions.o \
-	common/job-control.o \
-	common/common-regcache.o \
-	common/common-utils.o \
-	common/errors.o \
-	common/environ.o \
-	common/fileio.o \
-	common/filestuff.o \
-	common/format.o \
-	common/gdb_tilde_expand.o \
-	common/gdb_vecs.o \
-	common/netstuff.o \
-	common/new-op.o \
-	common/pathstuff.o \
-	common/print-utils.o \
-	common/ptid.o \
-	common/rsp-low.o \
-	common/signals.o \
-	common/signals-state-save-restore.o \
-	common/tdesc.o \
-	common/vec.o \
-	common/xml-utils.o \
+	gdbsupport/agent.o \
+	gdbsupport/btrace-common.o \
+	gdbsupport/buffer.o \
+	gdbsupport/cleanups.o \
+	gdbsupport/common-debug.o \
+	gdbsupport/common-exceptions.o \
+	gdbsupport/job-control.o \
+	gdbsupport/common-regcache.o \
+	gdbsupport/common-utils.o \
+	gdbsupport/errors.o \
+	gdbsupport/environ.o \
+	gdbsupport/fileio.o \
+	gdbsupport/filestuff.o \
+	gdbsupport/format.o \
+	gdbsupport/gdb_tilde_expand.o \
+	gdbsupport/gdb_vecs.o \
+	gdbsupport/netstuff.o \
+	gdbsupport/new-op.o \
+	gdbsupport/pathstuff.o \
+	gdbsupport/print-utils.o \
+	gdbsupport/ptid.o \
+	gdbsupport/rsp-low.o \
+	gdbsupport/signals.o \
+	gdbsupport/signals-state-save-restore.o \
+	gdbsupport/tdesc.o \
+	gdbsupport/vec.o \
+	gdbsupport/xml-utils.o \
 	debug.o \
 	dll.o \
 	event-loop.o \
@@ -290,13 +290,13 @@  OBS = \
 	$(XML_BUILTIN)
 
 GDBREPLAY_OBS = \
-	common/cleanups.o \
-	common/common-exceptions.o \
-	common/common-utils.o \
-	common/rsp-low.o \
-	common/errors.o \
-	common/netstuff.o \
-	common/print-utils.o \
+	gdbsupport/cleanups.o \
+	gdbsupport/common-exceptions.o \
+	gdbsupport/common-utils.o \
+	gdbsupport/rsp-low.o \
+	gdbsupport/errors.o \
+	gdbsupport/netstuff.o \
+	gdbsupport/print-utils.o \
 	gdbreplay.o \
 	utils.o \
 	version.o
@@ -418,13 +418,13 @@  gdbreplay$(EXEEXT): $(sort $(GDBREPLAY_OBS)) $(LIBGNU) $(LIBIBERTY)
 IPA_OBJS = \
 	alloc-ipa.o \
 	ax-ipa.o \
-	common/common-utils-ipa.o \
-	common/errors-ipa.o \
-	common/format-ipa.o \
-	common/print-utils-ipa.o \
-	common/rsp-low-ipa.o \
-	common/tdesc-ipa.o \
-	common/vec-ipa.o \
+	gdbsupport/common-utils-ipa.o \
+	gdbsupport/errors-ipa.o \
+	gdbsupport/format-ipa.o \
+	gdbsupport/print-utils-ipa.o \
+	gdbsupport/rsp-low-ipa.o \
+	gdbsupport/tdesc-ipa.o \
+	gdbsupport/vec-ipa.o \
 	regcache-ipa.o \
 	remote-utils-ipa.o \
 	tdesc-ipa.o \
@@ -519,8 +519,8 @@  am--refresh:
 
 force:
 
-version-generated.c: Makefile $(srcdir)/../version.in $(srcdir)/../../bfd/version.h $(srcdir)/../common/create-version.sh
-	$(ECHO_GEN) $(SHELL) $(srcdir)/../common/create-version.sh $(srcdir)/.. \
+version-generated.c: Makefile $(srcdir)/../version.in $(srcdir)/../../bfd/version.h $(srcdir)/../gdbsupport/create-version.sh
+	$(ECHO_GEN) $(SHELL) $(srcdir)/../gdbsupport/create-version.sh $(srcdir)/.. \
 		$(host_alias) $(target_alias) $@
 
 xml-builtin-generated.c: stamp-xml; @true
@@ -582,7 +582,7 @@  arch/%-ipa.o: ../arch/%.c
 	$(IPAGENT_COMPILE) $<
 	$(POSTCOMPILE)
 
-common/%-ipa.o: ../common/%.c
+gdbsupport/%-ipa.o: ../gdbsupport/%.c
 	$(IPAGENT_COMPILE) $<
 	$(POSTCOMPILE)
 
@@ -611,7 +611,7 @@  arch/%.o: ../arch/%.c
 	$(COMPILE) $<
 	$(POSTCOMPILE)
 
-common/%.o: ../common/%.c
+gdbsupport/%.o: ../gdbsupport/%.c
 	$(COMPILE) $<
 	$(POSTCOMPILE)
 
diff --git a/gdb/gdbserver/acinclude.m4 b/gdb/gdbserver/acinclude.m4
index fc3e344a611..96ded3d7d39 100644
--- a/gdb/gdbserver/acinclude.m4
+++ b/gdb/gdbserver/acinclude.m4
@@ -21,7 +21,7 @@  m4_include(../../config/lead-dot.m4)
 dnl codeset.m4 is needed for common.m4, but not for
 dnl anything else in gdbserver.
 m4_include(../../config/codeset.m4)
-m4_include(../common/common.m4)
+m4_include(../gdbsupport/common.m4)
 
 dnl For libiberty_INIT.
 m4_include(../libiberty.m4)
diff --git a/gdb/gdbserver/ax.c b/gdb/gdbserver/ax.c
index 7b8df917492..2c096ef0cff 100644
--- a/gdb/gdbserver/ax.c
+++ b/gdb/gdbserver/ax.c
@@ -18,9 +18,9 @@ 
 
 #include "server.h"
 #include "ax.h"
-#include "common/format.h"
+#include "gdbsupport/format.h"
 #include "tracepoint.h"
-#include "common/rsp-low.h"
+#include "gdbsupport/rsp-low.h"
 
 static void ax_vdebug (const char *, ...) ATTRIBUTE_PRINTF (1, 2);
 
@@ -60,7 +60,7 @@  enum gdb_agent_op
   {
 #define DEFOP(NAME, SIZE, DATA_SIZE, CONSUMED, PRODUCED, VALUE)  \
     gdb_agent_op_ ## NAME = VALUE,
-#include "common/ax.def"
+#include "gdbsupport/ax.def"
 #undef DEFOP
     gdb_agent_op_last
   };
@@ -69,7 +69,7 @@  static const char *gdb_agent_op_names [gdb_agent_op_last] =
   {
     "?undef?"
 #define DEFOP(NAME, SIZE, DATA_SIZE, CONSUMED, PRODUCED, VALUE)  , # NAME
-#include "common/ax.def"
+#include "gdbsupport/ax.def"
 #undef DEFOP
   };
 
@@ -78,7 +78,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 "common/ax.def"
+#include "gdbsupport/ax.def"
 #undef DEFOP
   };
 #endif
diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
index e89f2d06c14..0c04fcc8ae6 100755
--- a/gdb/gdbserver/configure
+++ b/gdb/gdbserver/configure
@@ -5916,7 +5916,7 @@  if $enable_unittests; then
 $as_echo "#define GDB_SELF_TEST 1" >>confdefs.h
 
 
-  srv_selftest_objs="common/selftest.o"
+  srv_selftest_objs="gdbsupport/selftest.o"
 
 fi
 
@@ -5958,7 +5958,7 @@  ac_config_commands="$ac_config_commands depdir"
 
 
 # Create sub-directories for objects and dependencies.
-CONFIG_SRC_SUBDIR="arch common"
+CONFIG_SRC_SUBDIR="arch gdbsupport"
 
 
 ac_config_commands="$ac_config_commands gdbdepdir"
@@ -7892,7 +7892,7 @@  esac
 . ${srcdir}/configure.srv
 
 # Add in the common host objects.
-. ${srcdir}/../common/common.host
+. ${srcdir}/../gdbsupport/common.host
 srv_host_obs="$common_host_obs"
 
 if test "${srv_mingwce}" = "yes"; then
diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac
index d943269377b..574b7c5b287 100644
--- a/gdb/gdbserver/configure.ac
+++ b/gdb/gdbserver/configure.ac
@@ -55,7 +55,7 @@  fi
 GDB_AC_LIBMCHECK(${libmcheck_default})
 
 GDB_AC_SELFTEST([
-  srv_selftest_objs="common/selftest.o"
+  srv_selftest_objs="gdbsupport/selftest.o"
 ])
 
 ACX_NONCANONICAL_TARGET
@@ -65,7 +65,7 @@  ACX_NONCANONICAL_HOST
 ZW_CREATE_DEPDIR
 
 # Create sub-directories for objects and dependencies.
-CONFIG_SRC_SUBDIR="arch common"
+CONFIG_SRC_SUBDIR="arch gdbsupport"
 AC_SUBST(CONFIG_SRC_SUBDIR)
 
 AC_CONFIG_COMMANDS([gdbdepdir],[
@@ -255,7 +255,7 @@  esac
 . ${srcdir}/configure.srv
 
 # Add in the common host objects.
-. ${srcdir}/../common/common.host
+. ${srcdir}/../gdbsupport/common.host
 srv_host_obs="$common_host_obs"
 
 if test "${srv_mingwce}" = "yes"; then
diff --git a/gdb/gdbserver/event-loop.c b/gdb/gdbserver/event-loop.c
index 0442680c237..bcc496eee0f 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 "common/gdb_sys_time.h"
+#include "gdbsupport/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 a8bd0403780..ddd73094e6c 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 "common/job-control.h"
+#include "gdbsupport/job-control.h"
 #include "nat/fork-inferior.h"
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
diff --git a/gdb/gdbserver/gdb_proc_service.h b/gdb/gdbserver/gdb_proc_service.h
index 626bc164fe3..f0d0c1b189d 100644
--- a/gdb/gdbserver/gdb_proc_service.h
+++ b/gdb/gdbserver/gdb_proc_service.h
@@ -19,7 +19,7 @@ 
 #ifndef GDBSERVER_GDB_PROC_SERVICE_H
 #define GDBSERVER_GDB_PROC_SERVICE_H
 
-#include "common/gdb_proc_service.h"
+#include "gdbsupport/gdb_proc_service.h"
 
 /* Structure that identifies the target process.  */
 struct ps_prochandle
diff --git a/gdb/gdbserver/gdbreplay.c b/gdb/gdbserver/gdbreplay.c
index f4fd5686ef7..32529147939 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/common-defs.h"
-#include "common/version.h"
+#include "gdbsupport/common-defs.h"
+#include "gdbsupport/version.h"
 
 #if HAVE_SYS_FILE_H
 #include <sys/file.h>
@@ -48,8 +48,8 @@ 
 #include <ws2tcpip.h>
 #endif
 
-#include "common/netstuff.h"
-#include "common/rsp-low.h"
+#include "gdbsupport/netstuff.h"
+#include "gdbsupport/rsp-low.h"
 
 #ifndef HAVE_SOCKLEN_T
 typedef int socklen_t;
diff --git a/gdb/gdbserver/gdbthread.h b/gdb/gdbserver/gdbthread.h
index 44ed3c4723c..825a7f6b510 100644
--- a/gdb/gdbserver/gdbthread.h
+++ b/gdb/gdbserver/gdbthread.h
@@ -19,7 +19,7 @@ 
 #ifndef GDBSERVER_GDBTHREAD_H
 #define GDBSERVER_GDBTHREAD_H
 
-#include "common/common-gdbthread.h"
+#include "gdbsupport/common-gdbthread.h"
 #include "inferiors.h"
 
 #include <list>
diff --git a/gdb/gdbserver/hostio-errno.c b/gdb/gdbserver/hostio-errno.c
index 6325fee3ffd..737331bbfcd 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 "common/fileio.h"
+#include "gdbsupport/fileio.h"
 
 void
 hostio_last_error_from_errno (char *buf)
diff --git a/gdb/gdbserver/hostio.c b/gdb/gdbserver/hostio.c
index eedf6d9fe72..e35a2249be9 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 "common/fileio.h"
+#include "gdbsupport/fileio.h"
 
 struct fd_list
 {
diff --git a/gdb/gdbserver/i387-fp.c b/gdb/gdbserver/i387-fp.c
index 7dde85a61e5..3b92feedb39 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 "common/x86-xstate.h"
+#include "gdbsupport/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.c b/gdb/gdbserver/inferiors.c
index 17bfd1f6ec8..e35186bda14 100644
--- a/gdb/gdbserver/inferiors.c
+++ b/gdb/gdbserver/inferiors.c
@@ -213,7 +213,7 @@  current_process (void)
   return get_thread_process (current_thread);
 }
 
-/* See common/common-gdbthread.h.  */
+/* See gdbsupport/common-gdbthread.h.  */
 
 void
 switch_to_thread (ptid_t ptid)
@@ -222,7 +222,7 @@  switch_to_thread (ptid_t ptid)
   current_thread = find_thread_ptid (ptid);
 }
 
-/* See common/common-inferior.h.  */
+/* See gdbsupport/common-inferior.h.  */
 
 const char *
 get_inferior_cwd ()
@@ -230,7 +230,7 @@  get_inferior_cwd ()
   return current_inferior_cwd;
 }
 
-/* See common/common-inferior.h.  */
+/* See gdbsupport/common-inferior.h.  */
 
 void
 set_inferior_cwd (const char *cwd)
diff --git a/gdb/gdbserver/inferiors.h b/gdb/gdbserver/inferiors.h
index cf284b807bb..f4ab9fddb54 100644
--- a/gdb/gdbserver/inferiors.h
+++ b/gdb/gdbserver/inferiors.h
@@ -19,7 +19,7 @@ 
 #ifndef GDBSERVER_INFERIORS_H
 #define GDBSERVER_INFERIORS_H
 
-#include "common/gdb_vecs.h"
+#include "gdbsupport/gdb_vecs.h"
 #include <list>
 
 struct thread_info;
diff --git a/gdb/gdbserver/linux-aarch64-tdesc-selftest.c b/gdb/gdbserver/linux-aarch64-tdesc-selftest.c
index bf24a27c598..06232b2a173 100644
--- a/gdb/gdbserver/linux-aarch64-tdesc-selftest.c
+++ b/gdb/gdbserver/linux-aarch64-tdesc-selftest.c
@@ -17,7 +17,7 @@ 
 
 #include "server.h"
 #include "tdesc.h"
-#include "common/selftest.h"
+#include "gdbsupport/selftest.h"
 #include "linux-aarch64-tdesc.h"
 
 /* Defined in auto-generated file features/aarch64.c.  */
diff --git a/gdb/gdbserver/linux-amd64-ipa.c b/gdb/gdbserver/linux-amd64-ipa.c
index 99206536ca8..6bab392bbbb 100644
--- a/gdb/gdbserver/linux-amd64-ipa.c
+++ b/gdb/gdbserver/linux-amd64-ipa.c
@@ -22,7 +22,7 @@ 
 #include <sys/mman.h>
 #include "tracepoint.h"
 #include "linux-x86-tdesc.h"
-#include "common/x86-xstate.h"
+#include "gdbsupport/x86-xstate.h"
 
 /* Defined in auto-generated file amd64-linux.c.  */
 void init_registers_amd64_linux (void);
diff --git a/gdb/gdbserver/linux-i386-ipa.c b/gdb/gdbserver/linux-i386-ipa.c
index f5fd227505a..2e3d1ac7fee 100644
--- a/gdb/gdbserver/linux-i386-ipa.c
+++ b/gdb/gdbserver/linux-i386-ipa.c
@@ -22,7 +22,7 @@ 
 #include <sys/mman.h>
 #include "tracepoint.h"
 #include "linux-x86-tdesc.h"
-#include "common/x86-xstate.h"
+#include "gdbsupport/x86-xstate.h"
 
 /* GDB register numbers.  */
 
diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index 917b1c290bc..3113017ae67 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 "common/agent.h"
+#include "gdbsupport/agent.h"
 #include "tdesc.h"
-#include "common/rsp-low.h"
-#include "common/signals-state-save-restore.h"
+#include "gdbsupport/rsp-low.h"
+#include "gdbsupport/signals-state-save-restore.h"
 #include "nat/linux-nat.h"
 #include "nat/linux-waitpid.h"
-#include "common/gdb_wait.h"
+#include "gdbsupport/gdb_wait.h"
 #include "nat/gdb_ptrace.h"
 #include "nat/linux-ptrace.h"
 #include "nat/linux-procfs.h"
@@ -43,14 +43,14 @@ 
 #include <sys/stat.h>
 #include <sys/vfs.h>
 #include <sys/uio.h>
-#include "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 #include "tracepoint.h"
 #include "hostio.h"
 #include <inttypes.h>
-#include "common/common-inferior.h"
+#include "gdbsupport/common-inferior.h"
 #include "nat/fork-inferior.h"
-#include "common/environ.h"
-#include "common/scoped_restore.h"
+#include "gdbsupport/environ.h"
+#include "gdbsupport/scoped_restore.h"
 #ifndef ELFMAG0
 /* Don't include <linux/elf.h> here.  If it got included by gdb_proc_service.h
    then ELFMAG0 will have been defined.  If it didn't get included by
@@ -105,7 +105,7 @@ 
 
 #ifdef HAVE_LINUX_BTRACE
 # include "nat/linux-btrace.h"
-# include "common/btrace-common.h"
+# include "gdbsupport/btrace-common.h"
 #endif
 
 #ifndef HAVE_ELF32_AUXV_T
@@ -7189,7 +7189,7 @@  linux_low_encode_raw (struct buffer *buffer, const gdb_byte *data,
   if (size == 0)
     return;
 
-  /* We use hex encoding - see common/rsp-low.h.  */
+  /* We use hex encoding - see gdbsupport/rsp-low.h.  */
   buffer_grow_str (buffer, "<raw>\n");
 
   while (size-- > 0)
diff --git a/gdb/gdbserver/linux-tic6x-low.c b/gdb/gdbserver/linux-tic6x-low.c
index 7eecdeb7986..6682e1bda40 100644
--- a/gdb/gdbserver/linux-tic6x-low.c
+++ b/gdb/gdbserver/linux-tic6x-low.c
@@ -424,7 +424,7 @@  struct linux_target_ops the_low_target = {
 };
 
 #if GDB_SELF_TEST
-#include "common/selftest.h"
+#include "gdbsupport/selftest.h"
 
 namespace selftests {
 namespace tdesc {
diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c
index e84e7a1793c..894f8dadf22 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 "common/x86-xstate.h"
+#include "gdbsupport/x86-xstate.h"
 #include "nat/gdb_ptrace.h"
 
 #ifdef __x86_64__
@@ -38,7 +38,7 @@ 
 #include "elf/common.h"
 #endif
 
-#include "common/agent.h"
+#include "gdbsupport/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 50474b3668c..c55bc57b890 100644
--- a/gdb/gdbserver/linux-x86-tdesc-selftest.c
+++ b/gdb/gdbserver/linux-x86-tdesc-selftest.c
@@ -18,8 +18,8 @@ 
 #include "server.h"
 #include "linux-x86-tdesc.h"
 #include "tdesc.h"
-#include "common/selftest.h"
-#include "common/x86-xstate.h"
+#include "gdbsupport/selftest.h"
+#include "gdbsupport/x86-xstate.h"
 
 /* Defined in auto-generated file i386-linux.c.  */
 void init_registers_i386_linux (void);
diff --git a/gdb/gdbserver/linux-x86-tdesc.c b/gdb/gdbserver/linux-x86-tdesc.c
index 8f24a3d72d1..b39ed53549b 100644
--- a/gdb/gdbserver/linux-x86-tdesc.c
+++ b/gdb/gdbserver/linux-x86-tdesc.c
@@ -21,7 +21,7 @@ 
 #include "tdesc.h"
 #include "linux-x86-tdesc.h"
 #include "arch/i386.h"
-#include "common/x86-xstate.h"
+#include "gdbsupport/x86-xstate.h"
 #ifdef __x86_64__
 #include "arch/amd64.h"
 #endif
diff --git a/gdb/gdbserver/lynx-i386-low.c b/gdb/gdbserver/lynx-i386-low.c
index e47f6b92f63..ca707acf43b 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 "common/x86-xstate.h"
+#include "gdbsupport/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 4f6314669eb..0a8b258e87d 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 "common/gdb_wait.h"
+#include "gdbsupport/gdb_wait.h"
 #include <signal.h>
-#include "common/filestuff.h"
-#include "common/common-inferior.h"
+#include "gdbsupport/filestuff.h"
+#include "gdbsupport/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 d2d75104f33..4984a555d54 100644
--- a/gdb/gdbserver/mem-break.h
+++ b/gdb/gdbserver/mem-break.h
@@ -21,7 +21,7 @@ 
 #ifndef GDBSERVER_MEM_BREAK_H
 #define GDBSERVER_MEM_BREAK_H
 
-#include "common/break-common.h"
+#include "gdbsupport/break-common.h"
 
 /* Breakpoints are opaque.  */
 struct breakpoint;
diff --git a/gdb/gdbserver/nto-x86-low.c b/gdb/gdbserver/nto-x86-low.c
index cfbe7ba6d81..b51f424fb46 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 "common/x86-xstate.h"
+#include "gdbsupport/x86-xstate.h"
 #include "arch/i386.h"
 #include "x86-tdesc.h"
 
diff --git a/gdb/gdbserver/regcache.c b/gdb/gdbserver/regcache.c
index a56b580654d..98c7511c682 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 "common/rsp-low.h"
+#include "gdbsupport/rsp-low.h"
 #ifndef IN_PROCESS_AGENT
 
 struct regcache *
@@ -63,7 +63,7 @@  get_thread_regcache (struct thread_info *thread, int fetch)
   return regcache;
 }
 
-/* See common/common-regcache.h.  */
+/* See gdbsupport/common-regcache.h.  */
 
 struct regcache *
 get_thread_regcache_for_ptid (ptid_t ptid)
@@ -291,7 +291,7 @@  register_size (const struct target_desc *tdesc, int n)
   return find_register_by_number (tdesc, n).size / 8;
 }
 
-/* See common/common-regcache.h.  */
+/* See gdbsupport/common-regcache.h.  */
 
 int
 regcache_register_size (const struct regcache *regcache, int n)
@@ -312,7 +312,7 @@  supply_register (struct regcache *regcache, int n, const void *buf)
   return regcache->raw_supply (n, buf);
 }
 
-/* See common/common-regcache.h.  */
+/* See gdbsupport/common-regcache.h.  */
 
 void
 regcache::raw_supply (int n, const void *buf)
@@ -415,7 +415,7 @@  collect_register (struct regcache *regcache, int n, void *buf)
   regcache->raw_collect (n, buf);
 }
 
-/* See common/common-regcache.h.  */
+/* See gdbsupport/common-regcache.h.  */
 
 void
 regcache::raw_collect (int n, void *buf) const
@@ -500,7 +500,7 @@  regcache_write_pc (struct regcache *regcache, CORE_ADDR pc)
 
 #endif
 
-/* See common/common-regcache.h.  */
+/* See gdbsupport/common-regcache.h.  */
 
 enum register_status
 regcache::get_register_status (int regnum) const
@@ -513,7 +513,7 @@  regcache::get_register_status (int regnum) const
 #endif
 }
 
-/* See common/common-regcache.h.  */
+/* See gdbsupport/common-regcache.h.  */
 
 bool
 regcache::raw_compare (int regnum, const void *buf, int offset) const
diff --git a/gdb/gdbserver/regcache.h b/gdb/gdbserver/regcache.h
index 5ee44788dcd..d3a350aff97 100644
--- a/gdb/gdbserver/regcache.h
+++ b/gdb/gdbserver/regcache.h
@@ -19,7 +19,7 @@ 
 #ifndef GDBSERVER_REGCACHE_H
 #define GDBSERVER_REGCACHE_H
 
-#include "common/common-regcache.h"
+#include "gdbsupport/common-regcache.h"
 
 struct thread_info;
 struct target_desc;
@@ -46,16 +46,16 @@  struct regcache : public reg_buffer_common
   unsigned char *register_status = nullptr;
 #endif
 
-  /* See common/common-regcache.h.  */
+  /* See gdbsupport/common-regcache.h.  */
   enum register_status get_register_status (int regnum) const override;
 
-  /* See common/common-regcache.h.  */
+  /* See gdbsupport/common-regcache.h.  */
   void raw_supply (int regnum, const void *buf) override;
 
-  /* See common/common-regcache.h.  */
+  /* See gdbsupport/common-regcache.h.  */
   void raw_collect (int regnum, void *buf) const override;
 
-  /* See common/common-regcache.h.  */
+  /* See gdbsupport/common-regcache.h.  */
   bool raw_compare (int regnum, const void *buf, int offset) const override;
 };
 
@@ -102,7 +102,7 @@  void registers_to_string (struct regcache *regcache, char *buf);
 
 void registers_from_string (struct regcache *regcache, char *buf);
 
-/* For regcache_read_pc see common/common-regcache.h.  */
+/* For regcache_read_pc see gdbsupport/common-regcache.h.  */
 
 void regcache_write_pc (struct regcache *regcache, CORE_ADDR pc);
 
diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c
index 7c495beb7cd..d965b6fe644 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 "common/rsp-low.h"
-#include "common/netstuff.h"
-#include "common/filestuff.h"
+#include "gdbsupport/rsp-low.h"
+#include "gdbsupport/netstuff.h"
+#include "gdbsupport/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 "common/gdb_sys_time.h"
+#include "gdbsupport/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 5e93a58fd6b..5b14883f7a8 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -18,32 +18,32 @@ 
 
 #include "server.h"
 #include "gdbthread.h"
-#include "common/agent.h"
+#include "gdbsupport/agent.h"
 #include "notif.h"
 #include "tdesc.h"
-#include "common/rsp-low.h"
-#include "common/signals-state-save-restore.h"
+#include "gdbsupport/rsp-low.h"
+#include "gdbsupport/signals-state-save-restore.h"
 #include <ctype.h>
 #include <unistd.h>
 #if HAVE_SIGNAL_H
 #include <signal.h>
 #endif
-#include "common/gdb_vecs.h"
-#include "common/gdb_wait.h"
-#include "common/btrace-common.h"
-#include "common/filestuff.h"
+#include "gdbsupport/gdb_vecs.h"
+#include "gdbsupport/gdb_wait.h"
+#include "gdbsupport/btrace-common.h"
+#include "gdbsupport/filestuff.h"
 #include "tracepoint.h"
 #include "dll.h"
 #include "hostio.h"
 #include <vector>
-#include "common/common-inferior.h"
-#include "common/job-control.h"
-#include "common/environ.h"
+#include "gdbsupport/common-inferior.h"
+#include "gdbsupport/job-control.h"
+#include "gdbsupport/environ.h"
 #include "filenames.h"
-#include "common/pathstuff.h"
+#include "gdbsupport/pathstuff.h"
 
-#include "common/selftest.h"
-#include "common/scope-exit.h"
+#include "gdbsupport/selftest.h"
+#include "gdbsupport/scope-exit.h"
 
 #define require_running_or_return(BUF)		\
   if (!target_running ())			\
@@ -258,7 +258,7 @@  target_running (void)
   return get_first_thread () != NULL;
 }
 
-/* See common/common-inferior.h.  */
+/* See gdbsupport/common-inferior.h.  */
 
 const char *
 get_exec_wrapper ()
@@ -266,7 +266,7 @@  get_exec_wrapper ()
   return !wrapper_argv.empty () ? wrapper_argv.c_str () : NULL;
 }
 
-/* See common/common-inferior.h.  */
+/* See gdbsupport/common-inferior.h.  */
 
 char *
 get_exec_file (int err)
diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index 400001addd3..520969453ac 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -19,7 +19,7 @@ 
 #ifndef GDBSERVER_SERVER_H
 #define GDBSERVER_SERVER_H
 
-#include "common/common-defs.h"
+#include "gdbsupport/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 "common/version.h"
+#include "gdbsupport/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 "common/buffer.h"
-#include "common/xml-utils.h"
+#include "gdbsupport/buffer.h"
+#include "gdbsupport/xml-utils.h"
 #include "regcache.h"
-#include "common/gdb_signals.h"
+#include "gdbsupport/gdb_signals.h"
 #include "target.h"
 #include "mem-break.h"
-#include "common/environ.h"
+#include "gdbsupport/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 "common/gdb_vecs.h"
+#include "gdbsupport/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 97f985ae8f8..4930c59d730 100644
--- a/gdb/gdbserver/spu-low.c
+++ b/gdb/gdbserver/spu-low.c
@@ -20,12 +20,12 @@ 
 
 #include "server.h"
 
-#include "common/gdb_wait.h"
+#include "gdbsupport/gdb_wait.h"
 #include <sys/ptrace.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/syscall.h>
-#include "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 #include "hostio.h"
 #include "nat/fork-inferior.h"
 
diff --git a/gdb/gdbserver/symbol.c b/gdb/gdbserver/symbol.c
index 20eb492f6be..56a5d3e753d 100644
--- a/gdb/gdbserver/symbol.c
+++ b/gdb/gdbserver/symbol.c
@@ -18,9 +18,9 @@ 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "server.h"
-#include "common/symbol.h"
+#include "gdbsupport/symbol.h"
 
-/* See common/symbol.h.  */
+/* See gdbsupport/symbol.h.  */
 
 int
 find_minimal_symbol_address (const char *name, CORE_ADDR *addr,
diff --git a/gdb/gdbserver/target.h b/gdb/gdbserver/target.h
index a4c9ad49106..434bfa9f3cb 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 "common/btrace-common.h"
+#include "gdbsupport/btrace-common.h"
 #include <vector>
 
 struct emit_ops;
diff --git a/gdb/gdbserver/tdesc.c b/gdb/gdbserver/tdesc.c
index 04c702fa033..92a0a6005f3 100644
--- a/gdb/gdbserver/tdesc.c
+++ b/gdb/gdbserver/tdesc.c
@@ -122,7 +122,7 @@  current_target_desc (void)
   return current_process ()->tdesc;
 }
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 const char *
 tdesc_architecture_name (const struct target_desc *target_desc)
@@ -130,7 +130,7 @@  tdesc_architecture_name (const struct target_desc *target_desc)
   return target_desc->arch;
 }
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 void
 set_tdesc_architecture (struct target_desc *target_desc,
@@ -139,7 +139,7 @@  set_tdesc_architecture (struct target_desc *target_desc,
   target_desc->arch = xstrdup (name);
 }
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 const char *
 tdesc_osabi_name (const struct target_desc *target_desc)
@@ -147,7 +147,7 @@  tdesc_osabi_name (const struct target_desc *target_desc)
   return target_desc->osabi;
 }
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 void
 set_tdesc_osabi (struct target_desc *target_desc, const char *name)
@@ -155,7 +155,7 @@  set_tdesc_osabi (struct target_desc *target_desc, const char *name)
   target_desc->osabi = xstrdup (name);
 }
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 const char *
 tdesc_get_features_xml (const target_desc *tdesc)
@@ -177,7 +177,7 @@  tdesc_get_features_xml (const target_desc *tdesc)
 }
 #endif
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 struct tdesc_feature *
 tdesc_create_feature (struct target_desc *tdesc, const char *name)
diff --git a/gdb/gdbserver/tdesc.h b/gdb/gdbserver/tdesc.h
index 8ccacbb7ed4..b93f53c8d44 100644
--- a/gdb/gdbserver/tdesc.h
+++ b/gdb/gdbserver/tdesc.h
@@ -19,7 +19,7 @@ 
 #ifndef GDBSERVER_TDESC_H
 #define GDBSERVER_TDESC_H
 
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 #include "regdef.h"
 #include <vector>
diff --git a/gdb/gdbserver/thread-db.c b/gdb/gdbserver/thread-db.c
index 387f22f487e..b2791b0513a 100644
--- a/gdb/gdbserver/thread-db.c
+++ b/gdb/gdbserver/thread-db.c
@@ -26,9 +26,9 @@  extern int debug_threads;
 
 #include "gdb_proc_service.h"
 #include "nat/gdb_thread_db.h"
-#include "common/gdb_vecs.h"
+#include "gdbsupport/gdb_vecs.h"
 #include "nat/linux-procfs.h"
-#include "common/scoped_restore.h"
+#include "gdbsupport/scoped_restore.h"
 
 #ifndef USE_LIBTHREAD_DB_DIRECTLY
 #include <dlfcn.h>
diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c
index 98d28e9bb28..09e7d5f8fec 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 "common/rsp-low.h"
+#include "gdbsupport/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 "common/agent.h"
+#include "gdbsupport/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 7b187d3bea3..399520c11dc 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 "common/x86-xstate.h"
+#include "gdbsupport/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 1a50141c123..49c6cf1b7c9 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 "common/gdb_tilde_expand.h"
-#include "common/common-inferior.h"
+#include "gdbsupport/gdb_tilde_expand.h"
+#include "gdbsupport/common-inferior.h"
 
 #ifndef USE_WIN32API
 #include <sys/cygwin.h>
diff --git a/gdb/common/agent.c b/gdb/gdbsupport/agent.c
similarity index 99%
rename from gdb/common/agent.c
rename to gdb/gdbsupport/agent.c
index ae495a86b81..02cad463699 100644
--- a/gdb/common/agent.c
+++ b/gdb/gdbsupport/agent.c
@@ -19,7 +19,7 @@ 
 
 #include "common-defs.h"
 #include "target/target.h"
-#include "common/symbol.h"
+#include "gdbsupport/symbol.h"
 #include <unistd.h>
 #include "filestuff.h"
 
diff --git a/gdb/common/agent.h b/gdb/gdbsupport/agent.h
similarity index 97%
rename from gdb/common/agent.h
rename to gdb/gdbsupport/agent.h
index 0927faaaf30..4f054987dd0 100644
--- a/gdb/common/agent.h
+++ b/gdb/gdbsupport/agent.h
@@ -20,7 +20,7 @@ 
 #ifndef COMMON_AGENT_H
 #define COMMON_AGENT_H
 
-#include "common/preprocessor.h"
+#include "gdbsupport/preprocessor.h"
 
 int agent_run_command (int pid, const char *cmd, int len);
 
@@ -31,7 +31,7 @@  int agent_look_up_symbols (void *);
 /* Define an entry in an IPA symbol list array.  If IPA_SYM is used, the macro
    IPA_SYM_STRUCT_NAME must be defined to the structure name holding the IPA
    symbol addresses in that particular file, before including
-   common/agent.h.  */
+   gdbsupport/agent.h.  */
 #define IPA_SYM(SYM)                                   \
   {                                                    \
     STRINGIFY (IPA_SYM_EXPORTED_NAME (SYM)),           \
diff --git a/gdb/common/array-view.h b/gdb/gdbsupport/array-view.h
similarity index 100%
rename from gdb/common/array-view.h
rename to gdb/gdbsupport/array-view.h
diff --git a/gdb/common/ax.def b/gdb/gdbsupport/ax.def
similarity index 100%
rename from gdb/common/ax.def
rename to gdb/gdbsupport/ax.def
diff --git a/gdb/common/break-common.h b/gdb/gdbsupport/break-common.h
similarity index 100%
rename from gdb/common/break-common.h
rename to gdb/gdbsupport/break-common.h
diff --git a/gdb/common/btrace-common.c b/gdb/gdbsupport/btrace-common.c
similarity index 100%
rename from gdb/common/btrace-common.c
rename to gdb/gdbsupport/btrace-common.c
diff --git a/gdb/common/btrace-common.h b/gdb/gdbsupport/btrace-common.h
similarity index 100%
rename from gdb/common/btrace-common.h
rename to gdb/gdbsupport/btrace-common.h
diff --git a/gdb/common/buffer.c b/gdb/gdbsupport/buffer.c
similarity index 100%
rename from gdb/common/buffer.c
rename to gdb/gdbsupport/buffer.c
diff --git a/gdb/common/buffer.h b/gdb/gdbsupport/buffer.h
similarity index 100%
rename from gdb/common/buffer.h
rename to gdb/gdbsupport/buffer.h
diff --git a/gdb/common/byte-vector.h b/gdb/gdbsupport/byte-vector.h
similarity index 98%
rename from gdb/common/byte-vector.h
rename to gdb/gdbsupport/byte-vector.h
index bc18c0475eb..5dec3017c20 100644
--- a/gdb/common/byte-vector.h
+++ b/gdb/gdbsupport/byte-vector.h
@@ -18,7 +18,7 @@ 
 #ifndef COMMON_BYTE_VECTOR_H
 #define COMMON_BYTE_VECTOR_H
 
-#include "common/def-vector.h"
+#include "gdbsupport/def-vector.h"
 
 namespace gdb {
 
diff --git a/gdb/common/cleanups.c b/gdb/gdbsupport/cleanups.c
similarity index 100%
rename from gdb/common/cleanups.c
rename to gdb/gdbsupport/cleanups.c
diff --git a/gdb/common/cleanups.h b/gdb/gdbsupport/cleanups.h
similarity index 100%
rename from gdb/common/cleanups.h
rename to gdb/gdbsupport/cleanups.h
diff --git a/gdb/common/common-debug.c b/gdb/gdbsupport/common-debug.c
similarity index 92%
rename from gdb/common/common-debug.c
rename to gdb/gdbsupport/common-debug.c
index 11aee3ad5e3..97c90032ebd 100644
--- a/gdb/common/common-debug.c
+++ b/gdb/gdbsupport/common-debug.c
@@ -20,11 +20,11 @@ 
 #include "common-defs.h"
 #include "common-debug.h"
 
-/* See common/common-debug.h.  */
+/* See gdbsupport/common-debug.h.  */
 
 int show_debug_regs;
 
-/* See common/common-debug.h.  */
+/* See gdbsupport/common-debug.h.  */
 
 void
 debug_printf (const char *fmt, ...)
diff --git a/gdb/common/common-debug.h b/gdb/gdbsupport/common-debug.h
similarity index 100%
rename from gdb/common/common-debug.h
rename to gdb/gdbsupport/common-debug.h
diff --git a/gdb/common/common-defs.h b/gdb/gdbsupport/common-defs.h
similarity index 98%
rename from gdb/common/common-defs.h
rename to gdb/gdbsupport/common-defs.h
index 92badd56bd3..203bd8972da 100644
--- a/gdb/common/common-defs.h
+++ b/gdb/gdbsupport/common-defs.h
@@ -126,14 +126,14 @@ 
 #include "common-debug.h"
 #include "cleanups.h"
 #include "common-exceptions.h"
-#include "common/poison.h"
+#include "gdbsupport/poison.h"
 
 #define EXTERN_C extern "C"
 #define EXTERN_C_PUSH extern "C" {
 #define EXTERN_C_POP }
 
 /* Pull in gdb::unique_xmalloc_ptr.  */
-#include "common/gdb_unique_ptr.h"
+#include "gdbsupport/gdb_unique_ptr.h"
 
 /* String containing the current directory (what getwd would return).  */
 extern char *current_directory;
diff --git a/gdb/common/common-exceptions.c b/gdb/gdbsupport/common-exceptions.c
similarity index 100%
rename from gdb/common/common-exceptions.c
rename to gdb/gdbsupport/common-exceptions.c
diff --git a/gdb/common/common-exceptions.h b/gdb/gdbsupport/common-exceptions.h
similarity index 100%
rename from gdb/common/common-exceptions.h
rename to gdb/gdbsupport/common-exceptions.h
diff --git a/gdb/common/common-gdbthread.h b/gdb/gdbsupport/common-gdbthread.h
similarity index 100%
rename from gdb/common/common-gdbthread.h
rename to gdb/gdbsupport/common-gdbthread.h
diff --git a/gdb/common/common-inferior.h b/gdb/gdbsupport/common-inferior.h
similarity index 100%
rename from gdb/common/common-inferior.h
rename to gdb/gdbsupport/common-inferior.h
diff --git a/gdb/common/common-regcache.c b/gdb/gdbsupport/common-regcache.c
similarity index 100%
rename from gdb/common/common-regcache.c
rename to gdb/gdbsupport/common-regcache.c
diff --git a/gdb/common/common-regcache.h b/gdb/gdbsupport/common-regcache.h
similarity index 100%
rename from gdb/common/common-regcache.h
rename to gdb/gdbsupport/common-regcache.h
diff --git a/gdb/common/common-types.h b/gdb/gdbsupport/common-types.h
similarity index 100%
rename from gdb/common/common-types.h
rename to gdb/gdbsupport/common-types.h
diff --git a/gdb/common/common-utils.c b/gdb/gdbsupport/common-utils.c
similarity index 97%
rename from gdb/common/common-utils.c
rename to gdb/gdbsupport/common-utils.c
index dd839a0d4d1..384029db70a 100644
--- a/gdb/common/common-utils.c
+++ b/gdb/gdbsupport/common-utils.c
@@ -303,7 +303,7 @@  skip_to_space (char *chp)
   return (char *) skip_to_space ((const char *) chp);
 }
 
-/* See common/common-utils.h.  */
+/* See gdbsupport/common-utils.h.  */
 
 void
 free_vector_argv (std::vector<char *> &v)
@@ -314,7 +314,7 @@  free_vector_argv (std::vector<char *> &v)
   v.clear ();
 }
 
-/* See common/common-utils.h.  */
+/* See gdbsupport/common-utils.h.  */
 
 std::string
 stringify_argv (const std::vector<char *> &args)
@@ -337,7 +337,7 @@  stringify_argv (const std::vector<char *> &args)
   return ret;
 }
 
-/* See common/common-utils.h.  */
+/* See gdbsupport/common-utils.h.  */
 
 ULONGEST
 align_up (ULONGEST v, int n)
@@ -347,7 +347,7 @@  align_up (ULONGEST v, int n)
   return (v + n - 1) & -n;
 }
 
-/* See common/common-utils.h.  */
+/* See gdbsupport/common-utils.h.  */
 
 ULONGEST
 align_down (ULONGEST v, int n)
diff --git a/gdb/common/common-utils.h b/gdb/gdbsupport/common-utils.h
similarity index 100%
rename from gdb/common/common-utils.h
rename to gdb/gdbsupport/common-utils.h
diff --git a/gdb/common/common.host b/gdb/gdbsupport/common.host
similarity index 91%
rename from gdb/common/common.host
rename to gdb/gdbsupport/common.host
index 83fa1842db2..4839059e610 100644
--- a/gdb/common/common.host
+++ b/gdb/gdbsupport/common.host
@@ -27,10 +27,10 @@ 
 
 case "${host}" in
 
-*-mingw*)	common_host_obs=common/mingw-strerror.o
+*-mingw*)	common_host_obs=gdbsupport/mingw-strerror.o
 		;;
 *)
-		common_host_obs=common/posix-strerror.o
+		common_host_obs=gdbsupport/posix-strerror.o
 		;;
 
 esac
diff --git a/gdb/common/common.m4 b/gdb/gdbsupport/common.m4
similarity index 100%
rename from gdb/common/common.m4
rename to gdb/gdbsupport/common.m4
diff --git a/gdb/common/create-version.sh b/gdb/gdbsupport/create-version.sh
similarity index 96%
rename from gdb/common/create-version.sh
rename to gdb/gdbsupport/create-version.sh
index 6e67a613570..30525babb5a 100755
--- a/gdb/common/create-version.sh
+++ b/gdb/gdbsupport/create-version.sh
@@ -30,7 +30,7 @@  output="$4"
 rm -f version.c-tmp $output version.tmp
 date=`sed -n -e 's/^.* BFD_VERSION_DATE \(.*\)$/\1/p' $srcdir/../bfd/version.h`
 sed -e "s/DATE/$date/" < $srcdir/version.in > version.tmp
-echo '#include "common/version.h"' >> version.c-tmp
+echo '#include "gdbsupport/version.h"' >> version.c-tmp
 echo 'const char version[] = "'"`sed q version.tmp`"'";' >> version.c-tmp
 echo 'const char host_name[] = "'"$host_alias"'";' >> version.c-tmp
 echo 'const char target_name[] = "'"$target_alias"'";' >> version.c-tmp
diff --git a/gdb/common/def-vector.h b/gdb/gdbsupport/def-vector.h
similarity index 96%
rename from gdb/common/def-vector.h
rename to gdb/gdbsupport/def-vector.h
index 90c9ff577a7..fb933b8308d 100644
--- a/gdb/common/def-vector.h
+++ b/gdb/gdbsupport/def-vector.h
@@ -19,7 +19,7 @@ 
 #define COMMON_DEF_VECTOR_H
 
 #include <vector>
-#include "common/default-init-alloc.h"
+#include "gdbsupport/default-init-alloc.h"
 
 namespace gdb {
 
diff --git a/gdb/common/default-init-alloc.h b/gdb/gdbsupport/default-init-alloc.h
similarity index 100%
rename from gdb/common/default-init-alloc.h
rename to gdb/gdbsupport/default-init-alloc.h
diff --git a/gdb/common/enum-flags.h b/gdb/gdbsupport/enum-flags.h
similarity index 100%
rename from gdb/common/enum-flags.h
rename to gdb/gdbsupport/enum-flags.h
diff --git a/gdb/common/environ.c b/gdb/gdbsupport/environ.c
similarity index 93%
rename from gdb/common/environ.c
rename to gdb/gdbsupport/environ.c
index 0c4106cbf6e..006d80afdce 100644
--- a/gdb/common/environ.c
+++ b/gdb/gdbsupport/environ.c
@@ -20,7 +20,7 @@ 
 #include <algorithm>
 #include <utility>
 
-/* See common/environ.h.  */
+/* See gdbsupport/environ.h.  */
 
 gdb_environ &
 gdb_environ::operator= (gdb_environ &&e)
@@ -39,7 +39,7 @@  gdb_environ::operator= (gdb_environ &&e)
   return *this;
 }
 
-/* See common/environ.h.  */
+/* See gdbsupport/environ.h.  */
 
 gdb_environ gdb_environ::from_host_environ ()
 {
@@ -59,7 +59,7 @@  gdb_environ gdb_environ::from_host_environ ()
   return e;
 }
 
-/* See common/environ.h.  */
+/* See gdbsupport/environ.h.  */
 
 void
 gdb_environ::clear ()
@@ -86,7 +86,7 @@  match_var_in_string (const char *string, const char *var, size_t var_len)
   return false;
 }
 
-/* See common/environ.h.  */
+/* See gdbsupport/environ.h.  */
 
 const char *
 gdb_environ::get (const char *var) const
@@ -100,7 +100,7 @@  gdb_environ::get (const char *var) const
   return NULL;
 }
 
-/* See common/environ.h.  */
+/* See gdbsupport/environ.h.  */
 
 void
 gdb_environ::set (const char *var, const char *value)
@@ -124,7 +124,7 @@  gdb_environ::set (const char *var, const char *value)
   m_user_unset_env.erase (std::string (var));
 }
 
-/* See common/environ.h.  */
+/* See gdbsupport/environ.h.  */
 
 void
 gdb_environ::unset (const char *var, bool update_unset_list)
@@ -152,7 +152,7 @@  gdb_environ::unset (const char *var, bool update_unset_list)
     m_user_unset_env.insert (std::string (var));
 }
 
-/* See common/environ.h.  */
+/* See gdbsupport/environ.h.  */
 
 void
 gdb_environ::unset (const char *var)
@@ -160,7 +160,7 @@  gdb_environ::unset (const char *var)
   unset (var, true);
 }
 
-/* See common/environ.h.  */
+/* See gdbsupport/environ.h.  */
 
 char **
 gdb_environ::envp () const
@@ -168,7 +168,7 @@  gdb_environ::envp () const
   return const_cast<char **> (&m_environ_vector[0]);
 }
 
-/* See common/environ.h.  */
+/* See gdbsupport/environ.h.  */
 
 const std::set<std::string> &
 gdb_environ::user_set_env () const
diff --git a/gdb/common/environ.h b/gdb/gdbsupport/environ.h
similarity index 100%
rename from gdb/common/environ.h
rename to gdb/gdbsupport/environ.h
diff --git a/gdb/common/errors.c b/gdb/gdbsupport/errors.c
similarity index 91%
rename from gdb/common/errors.c
rename to gdb/gdbsupport/errors.c
index 22080124d4b..96be0381850 100644
--- a/gdb/common/errors.c
+++ b/gdb/gdbsupport/errors.c
@@ -20,7 +20,7 @@ 
 #include "common-defs.h"
 #include "errors.h"
 
-/* See common/errors.h.  */
+/* See gdbsupport/errors.h.  */
 
 void
 warning (const char *fmt, ...)
@@ -32,7 +32,7 @@  warning (const char *fmt, ...)
   va_end (ap);
 }
 
-/* See common/errors.h.  */
+/* See gdbsupport/errors.h.  */
 
 void
 error (const char *fmt, ...)
@@ -44,7 +44,7 @@  error (const char *fmt, ...)
   va_end (ap);
 }
 
-/* See common/errors.h.  */
+/* See gdbsupport/errors.h.  */
 
 void
 internal_error (const char *file, int line, const char *fmt, ...)
@@ -56,7 +56,7 @@  internal_error (const char *file, int line, const char *fmt, ...)
   va_end (ap);
 }
 
-/* See common/errors.h.  */
+/* See gdbsupport/errors.h.  */
 
 void
 internal_warning (const char *file, int line, const char *fmt, ...)
diff --git a/gdb/common/errors.h b/gdb/gdbsupport/errors.h
similarity index 100%
rename from gdb/common/errors.h
rename to gdb/gdbsupport/errors.h
diff --git a/gdb/common/fileio.c b/gdb/gdbsupport/fileio.c
similarity index 100%
rename from gdb/common/fileio.c
rename to gdb/gdbsupport/fileio.c
diff --git a/gdb/common/fileio.h b/gdb/gdbsupport/fileio.h
similarity index 100%
rename from gdb/common/fileio.h
rename to gdb/gdbsupport/fileio.h
diff --git a/gdb/common/filestuff.c b/gdb/gdbsupport/filestuff.c
similarity index 99%
rename from gdb/common/filestuff.c
rename to gdb/gdbsupport/filestuff.c
index c7b8c694055..b8fca1552a4 100644
--- a/gdb/common/filestuff.c
+++ b/gdb/gdbsupport/filestuff.c
@@ -426,7 +426,7 @@  gdb_pipe_cloexec (int filedes[2])
   return result;
 }
 
-/* See common/filestuff.h.  */
+/* See gdbsupport/filestuff.h.  */
 
 bool
 is_regular_file (const char *name, int *errno_ptr)
@@ -457,7 +457,7 @@  is_regular_file (const char *name, int *errno_ptr)
   return false;
 }
 
-/* See common/filestuff.h.  */
+/* See gdbsupport/filestuff.h.  */
 
 bool
 mkdir_recursive (const char *dir)
diff --git a/gdb/common/filestuff.h b/gdb/gdbsupport/filestuff.h
similarity index 100%
rename from gdb/common/filestuff.h
rename to gdb/gdbsupport/filestuff.h
diff --git a/gdb/common/filtered-iterator.h b/gdb/gdbsupport/filtered-iterator.h
similarity index 100%
rename from gdb/common/filtered-iterator.h
rename to gdb/gdbsupport/filtered-iterator.h
diff --git a/gdb/common/format.c b/gdb/gdbsupport/format.c
similarity index 100%
rename from gdb/common/format.c
rename to gdb/gdbsupport/format.c
diff --git a/gdb/common/format.h b/gdb/gdbsupport/format.h
similarity index 98%
rename from gdb/common/format.h
rename to gdb/gdbsupport/format.h
index 058844cec7b..08ef66a7602 100644
--- a/gdb/common/format.h
+++ b/gdb/gdbsupport/format.h
@@ -20,7 +20,7 @@ 
 #ifndef COMMON_FORMAT_H
 #define COMMON_FORMAT_H
 
-#include "common/gdb_string_view.h"
+#include "gdbsupport/gdb_string_view.h"
 
 #if defined(__MINGW32__) && !defined(PRINTF_HAS_LONG_LONG)
 # define USE_PRINTF_I64 1
diff --git a/gdb/common/forward-scope-exit.h b/gdb/gdbsupport/forward-scope-exit.h
similarity index 99%
rename from gdb/common/forward-scope-exit.h
rename to gdb/gdbsupport/forward-scope-exit.h
index bffc6e683ba..bba4027aa5a 100644
--- a/gdb/common/forward-scope-exit.h
+++ b/gdb/gdbsupport/forward-scope-exit.h
@@ -18,7 +18,7 @@ 
 #ifndef COMMON_FORWARD_SCOPE_EXIT_H
 #define COMMON_FORWARD_SCOPE_EXIT_H
 
-#include "common/scope-exit.h"
+#include "gdbsupport/scope-exit.h"
 #include <functional>
 
 /* A forward_scope_exit is like scope_exit, but instead of giving it a
diff --git a/gdb/common/function-view.h b/gdb/gdbsupport/function-view.h
similarity index 100%
rename from gdb/common/function-view.h
rename to gdb/gdbsupport/function-view.h
diff --git a/gdb/common/gdb_assert.h b/gdb/gdbsupport/gdb_assert.h
similarity index 100%
rename from gdb/common/gdb_assert.h
rename to gdb/gdbsupport/gdb_assert.h
diff --git a/gdb/common/gdb_locale.h b/gdb/gdbsupport/gdb_locale.h
similarity index 100%
rename from gdb/common/gdb_locale.h
rename to gdb/gdbsupport/gdb_locale.h
diff --git a/gdb/common/gdb_optional.h b/gdb/gdbsupport/gdb_optional.h
similarity index 99%
rename from gdb/common/gdb_optional.h
rename to gdb/gdbsupport/gdb_optional.h
index 7ca5725636e..94300e48d6a 100644
--- a/gdb/common/gdb_optional.h
+++ b/gdb/gdbsupport/gdb_optional.h
@@ -20,7 +20,7 @@ 
 #ifndef COMMON_GDB_OPTIONAL_H
 #define COMMON_GDB_OPTIONAL_H
 
-#include "common/traits.h"
+#include "gdbsupport/traits.h"
 
 namespace gdb
 {
diff --git a/gdb/common/gdb_proc_service.h b/gdb/gdbsupport/gdb_proc_service.h
similarity index 100%
rename from gdb/common/gdb_proc_service.h
rename to gdb/gdbsupport/gdb_proc_service.h
diff --git a/gdb/common/gdb_ref_ptr.h b/gdb/gdbsupport/gdb_ref_ptr.h
similarity index 100%
rename from gdb/common/gdb_ref_ptr.h
rename to gdb/gdbsupport/gdb_ref_ptr.h
diff --git a/gdb/common/gdb_setjmp.h b/gdb/gdbsupport/gdb_setjmp.h
similarity index 100%
rename from gdb/common/gdb_setjmp.h
rename to gdb/gdbsupport/gdb_setjmp.h
diff --git a/gdb/common/gdb_signals.h b/gdb/gdbsupport/gdb_signals.h
similarity index 100%
rename from gdb/common/gdb_signals.h
rename to gdb/gdbsupport/gdb_signals.h
diff --git a/gdb/common/gdb_splay_tree.h b/gdb/gdbsupport/gdb_splay_tree.h
similarity index 100%
rename from gdb/common/gdb_splay_tree.h
rename to gdb/gdbsupport/gdb_splay_tree.h
diff --git a/gdb/common/gdb_string_view.h b/gdb/gdbsupport/gdb_string_view.h
similarity index 100%
rename from gdb/common/gdb_string_view.h
rename to gdb/gdbsupport/gdb_string_view.h
diff --git a/gdb/common/gdb_string_view.tcc b/gdb/gdbsupport/gdb_string_view.tcc
similarity index 100%
rename from gdb/common/gdb_string_view.tcc
rename to gdb/gdbsupport/gdb_string_view.tcc
diff --git a/gdb/common/gdb_sys_time.h b/gdb/gdbsupport/gdb_sys_time.h
similarity index 100%
rename from gdb/common/gdb_sys_time.h
rename to gdb/gdbsupport/gdb_sys_time.h
diff --git a/gdb/common/gdb_tilde_expand.c b/gdb/gdbsupport/gdb_tilde_expand.c
similarity index 96%
rename from gdb/common/gdb_tilde_expand.c
rename to gdb/gdbsupport/gdb_tilde_expand.c
index 326df8f6aa9..7e4b06da0e6 100644
--- a/gdb/common/gdb_tilde_expand.c
+++ b/gdb/gdbsupport/gdb_tilde_expand.c
@@ -66,7 +66,7 @@  private:
   glob_t m_glob;
 };
 
-/* See common/gdb_tilde_expand.h.  */
+/* See gdbsupport/gdb_tilde_expand.h.  */
 
 std::string
 gdb_tilde_expand (const char *dir)
@@ -81,7 +81,7 @@  gdb_tilde_expand (const char *dir)
   return expanded_dir;
 }
 
-/* See common/gdb_tilde_expand.h.  */
+/* See gdbsupport/gdb_tilde_expand.h.  */
 
 gdb::unique_xmalloc_ptr<char>
 gdb_tilde_expand_up (const char *dir)
diff --git a/gdb/common/gdb_tilde_expand.h b/gdb/gdbsupport/gdb_tilde_expand.h
similarity index 100%
rename from gdb/common/gdb_tilde_expand.h
rename to gdb/gdbsupport/gdb_tilde_expand.h
diff --git a/gdb/common/gdb_unique_ptr.h b/gdb/gdbsupport/gdb_unique_ptr.h
similarity index 100%
rename from gdb/common/gdb_unique_ptr.h
rename to gdb/gdbsupport/gdb_unique_ptr.h
diff --git a/gdb/common/gdb_unlinker.h b/gdb/gdbsupport/gdb_unlinker.h
similarity index 100%
rename from gdb/common/gdb_unlinker.h
rename to gdb/gdbsupport/gdb_unlinker.h
diff --git a/gdb/common/gdb_vecs.c b/gdb/gdbsupport/gdb_vecs.c
similarity index 100%
rename from gdb/common/gdb_vecs.c
rename to gdb/gdbsupport/gdb_vecs.c
diff --git a/gdb/common/gdb_vecs.h b/gdb/gdbsupport/gdb_vecs.h
similarity index 100%
rename from gdb/common/gdb_vecs.h
rename to gdb/gdbsupport/gdb_vecs.h
diff --git a/gdb/common/gdb_wait.h b/gdb/gdbsupport/gdb_wait.h
similarity index 100%
rename from gdb/common/gdb_wait.h
rename to gdb/gdbsupport/gdb_wait.h
diff --git a/gdb/common/hash_enum.h b/gdb/gdbsupport/hash_enum.h
similarity index 100%
rename from gdb/common/hash_enum.h
rename to gdb/gdbsupport/hash_enum.h
diff --git a/gdb/common/host-defs.h b/gdb/gdbsupport/host-defs.h
similarity index 100%
rename from gdb/common/host-defs.h
rename to gdb/gdbsupport/host-defs.h
diff --git a/gdb/common/job-control.c b/gdb/gdbsupport/job-control.c
similarity index 98%
rename from gdb/common/job-control.c
rename to gdb/gdbsupport/job-control.c
index fc3de684904..cd3dde12fbf 100644
--- a/gdb/common/job-control.c
+++ b/gdb/gdbsupport/job-control.c
@@ -63,7 +63,7 @@  gdb_setpgid ()
   return retval;
 }
 
-/* See common/common-terminal.h.  */
+/* See gdbsupport/common-terminal.h.  */
 
 void
 have_job_control ()
diff --git a/gdb/common/job-control.h b/gdb/gdbsupport/job-control.h
similarity index 97%
rename from gdb/common/job-control.h
rename to gdb/gdbsupport/job-control.h
index 56eba97b9ee..e4660ae50cb 100644
--- a/gdb/common/job-control.h
+++ b/gdb/gdbsupport/job-control.h
@@ -23,7 +23,7 @@ 
 
 /* Do we have job control?  Can be assumed to always be the same
    within a given run of GDB.  Use in gdb/inflow.c and
-   common/common-inflow.c.  */
+   gdbsupport/common-inflow.c.  */
 extern int job_control;
 
 /* Set the process group of the caller to its own pid, or do nothing
diff --git a/gdb/common/mingw-strerror.c b/gdb/gdbsupport/mingw-strerror.c
similarity index 100%
rename from gdb/common/mingw-strerror.c
rename to gdb/gdbsupport/mingw-strerror.c
diff --git a/gdb/common/netstuff.c b/gdb/gdbsupport/netstuff.c
similarity index 97%
rename from gdb/common/netstuff.c
rename to gdb/gdbsupport/netstuff.c
index b192de7060f..a7dc3465913 100644
--- a/gdb/common/netstuff.c
+++ b/gdb/gdbsupport/netstuff.c
@@ -30,14 +30,14 @@ 
 #include <netinet/tcp.h>
 #endif
 
-/* See common/netstuff.h.  */
+/* See gdbsupport/netstuff.h.  */
 
 scoped_free_addrinfo::~scoped_free_addrinfo ()
 {
   freeaddrinfo (m_res);
 }
 
-/* See common/netstuff.h.  */
+/* See gdbsupport/netstuff.h.  */
 
 parsed_connection_spec
 parse_connection_spec_without_prefix (std::string spec, struct addrinfo *hint)
@@ -111,7 +111,7 @@  parse_connection_spec_without_prefix (std::string spec, struct addrinfo *hint)
   return ret;
 }
 
-/* See common/netstuff.h.  */
+/* See gdbsupport/netstuff.h.  */
 
 parsed_connection_spec
 parse_connection_spec (const char *spec, struct addrinfo *hint)
diff --git a/gdb/common/netstuff.h b/gdb/gdbsupport/netstuff.h
similarity index 100%
rename from gdb/common/netstuff.h
rename to gdb/gdbsupport/netstuff.h
diff --git a/gdb/common/new-op.c b/gdb/gdbsupport/new-op.c
similarity index 100%
rename from gdb/common/new-op.c
rename to gdb/gdbsupport/new-op.c
diff --git a/gdb/common/next-iterator.h b/gdb/gdbsupport/next-iterator.h
similarity index 100%
rename from gdb/common/next-iterator.h
rename to gdb/gdbsupport/next-iterator.h
diff --git a/gdb/common/observable.h b/gdb/gdbsupport/observable.h
similarity index 100%
rename from gdb/common/observable.h
rename to gdb/gdbsupport/observable.h
diff --git a/gdb/common/offset-type.h b/gdb/gdbsupport/offset-type.h
similarity index 100%
rename from gdb/common/offset-type.h
rename to gdb/gdbsupport/offset-type.h
diff --git a/gdb/common/pathstuff.c b/gdb/gdbsupport/pathstuff.c
similarity index 96%
rename from gdb/common/pathstuff.c
rename to gdb/gdbsupport/pathstuff.c
index e0e048d6654..653f5c231c2 100644
--- a/gdb/common/pathstuff.c
+++ b/gdb/gdbsupport/pathstuff.c
@@ -27,7 +27,7 @@ 
 #include <windows.h>
 #endif
 
-/* See common/pathstuff.h.  */
+/* See gdbsupport/pathstuff.h.  */
 
 gdb::unique_xmalloc_ptr<char>
 gdb_realpath (const char *filename)
@@ -80,7 +80,7 @@  gdb_realpath (const char *filename)
   return make_unique_xstrdup (filename);
 }
 
-/* See common/pathstuff.h.  */
+/* See gdbsupport/pathstuff.h.  */
 
 gdb::unique_xmalloc_ptr<char>
 gdb_realpath_keepfile (const char *filename)
@@ -124,7 +124,7 @@  gdb_realpath_keepfile (const char *filename)
   return gdb::unique_xmalloc_ptr<char> (result);
 }
 
-/* See common/pathstuff.h.  */
+/* See gdbsupport/pathstuff.h.  */
 
 gdb::unique_xmalloc_ptr<char>
 gdb_abspath (const char *path)
@@ -145,7 +145,7 @@  gdb_abspath (const char *path)
 	     path, (char *) NULL));
 }
 
-/* See common/pathstuff.h.  */
+/* See gdbsupport/pathstuff.h.  */
 
 const char *
 child_path (const char *parent, const char *child)
@@ -195,7 +195,7 @@  child_path (const char *parent, const char *child)
   return NULL;
 }
 
-/* See common/pathstuff.h.  */
+/* See gdbsupport/pathstuff.h.  */
 
 bool
 contains_dir_separator (const char *path)
@@ -209,7 +209,7 @@  contains_dir_separator (const char *path)
   return false;
 }
 
-/* See common/pathstuff.h.  */
+/* See gdbsupport/pathstuff.h.  */
 
 std::string
 get_standard_cache_dir ()
@@ -241,7 +241,7 @@  get_standard_cache_dir ()
   return {};
 }
 
-/* See common/pathstuff.h.  */
+/* See gdbsupport/pathstuff.h.  */
 
 std::string
 get_standard_temp_dir ()
@@ -266,7 +266,7 @@  get_standard_temp_dir ()
 #endif
 }
 
-/* See common/pathstuff.h.  */
+/* See gdbsupport/pathstuff.h.  */
 
 const char *
 get_shell ()
@@ -278,7 +278,7 @@  get_shell ()
   return ret;
 }
 
-/* See common/pathstuff.h.  */
+/* See gdbsupport/pathstuff.h.  */
 
 gdb::char_vector
 make_temp_filename (const std::string &f)
diff --git a/gdb/common/pathstuff.h b/gdb/gdbsupport/pathstuff.h
similarity index 98%
rename from gdb/common/pathstuff.h
rename to gdb/gdbsupport/pathstuff.h
index 67072a40e73..7d7c8cd0281 100644
--- a/gdb/common/pathstuff.h
+++ b/gdb/gdbsupport/pathstuff.h
@@ -20,7 +20,7 @@ 
 #ifndef COMMON_PATHSTUFF_H
 #define COMMON_PATHSTUFF_H
 
-#include "common/byte-vector.h"
+#include "gdbsupport/byte-vector.h"
 
 /* Path utilities.  */
 
diff --git a/gdb/common/poison.h b/gdb/gdbsupport/poison.h
similarity index 100%
rename from gdb/common/poison.h
rename to gdb/gdbsupport/poison.h
diff --git a/gdb/common/posix-strerror.c b/gdb/gdbsupport/posix-strerror.c
similarity index 100%
rename from gdb/common/posix-strerror.c
rename to gdb/gdbsupport/posix-strerror.c
diff --git a/gdb/common/preprocessor.h b/gdb/gdbsupport/preprocessor.h
similarity index 100%
rename from gdb/common/preprocessor.h
rename to gdb/gdbsupport/preprocessor.h
diff --git a/gdb/common/print-utils.c b/gdb/gdbsupport/print-utils.c
similarity index 100%
rename from gdb/common/print-utils.c
rename to gdb/gdbsupport/print-utils.c
diff --git a/gdb/common/print-utils.h b/gdb/gdbsupport/print-utils.h
similarity index 100%
rename from gdb/common/print-utils.h
rename to gdb/gdbsupport/print-utils.h
diff --git a/gdb/common/ptid.c b/gdb/gdbsupport/ptid.c
similarity index 100%
rename from gdb/common/ptid.c
rename to gdb/gdbsupport/ptid.c
diff --git a/gdb/common/ptid.h b/gdb/gdbsupport/ptid.h
similarity index 100%
rename from gdb/common/ptid.h
rename to gdb/gdbsupport/ptid.h
diff --git a/gdb/common/refcounted-object.h b/gdb/gdbsupport/refcounted-object.h
similarity index 100%
rename from gdb/common/refcounted-object.h
rename to gdb/gdbsupport/refcounted-object.h
diff --git a/gdb/common/rsp-low.c b/gdb/gdbsupport/rsp-low.c
similarity index 100%
rename from gdb/common/rsp-low.c
rename to gdb/gdbsupport/rsp-low.c
diff --git a/gdb/common/rsp-low.h b/gdb/gdbsupport/rsp-low.h
similarity index 99%
rename from gdb/common/rsp-low.h
rename to gdb/gdbsupport/rsp-low.h
index 979b32632bd..b2b62c9e5b8 100644
--- a/gdb/common/rsp-low.h
+++ b/gdb/gdbsupport/rsp-low.h
@@ -20,7 +20,7 @@ 
 #ifndef COMMON_RSP_LOW_H
 #define COMMON_RSP_LOW_H
 
-#include "common/byte-vector.h"
+#include "gdbsupport/byte-vector.h"
 
 /* Convert hex digit A to a number, or throw an exception.  */
 
diff --git a/gdb/common/run-time-clock.c b/gdb/gdbsupport/run-time-clock.c
similarity index 100%
rename from gdb/common/run-time-clock.c
rename to gdb/gdbsupport/run-time-clock.c
diff --git a/gdb/common/run-time-clock.h b/gdb/gdbsupport/run-time-clock.h
similarity index 100%
rename from gdb/common/run-time-clock.h
rename to gdb/gdbsupport/run-time-clock.h
diff --git a/gdb/common/safe-iterator.h b/gdb/gdbsupport/safe-iterator.h
similarity index 100%
rename from gdb/common/safe-iterator.h
rename to gdb/gdbsupport/safe-iterator.h
diff --git a/gdb/common/scope-exit.h b/gdb/gdbsupport/scope-exit.h
similarity index 99%
rename from gdb/common/scope-exit.h
rename to gdb/gdbsupport/scope-exit.h
index 8cdbec305ac..e2e6818295e 100644
--- a/gdb/common/scope-exit.h
+++ b/gdb/gdbsupport/scope-exit.h
@@ -20,7 +20,7 @@ 
 
 #include <functional>
 #include <type_traits>
-#include "common/preprocessor.h"
+#include "gdbsupport/preprocessor.h"
 
 /* scope_exit is a general-purpose scope guard that calls its exit
    function at the end of the current scope.  A scope_exit may be
diff --git a/gdb/common/scoped_fd.h b/gdb/gdbsupport/scoped_fd.h
similarity index 100%
rename from gdb/common/scoped_fd.h
rename to gdb/gdbsupport/scoped_fd.h
diff --git a/gdb/common/scoped_mmap.c b/gdb/gdbsupport/scoped_mmap.c
similarity index 97%
rename from gdb/common/scoped_mmap.c
rename to gdb/gdbsupport/scoped_mmap.c
index 19175e4a919..9e0af57e4c9 100644
--- a/gdb/common/scoped_mmap.c
+++ b/gdb/gdbsupport/scoped_mmap.c
@@ -20,7 +20,7 @@ 
 #include "common-defs.h"
 #include "scoped_mmap.h"
 #include "scoped_fd.h"
-#include "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 
 #ifdef HAVE_SYS_MMAN_H
 
diff --git a/gdb/common/scoped_mmap.h b/gdb/gdbsupport/scoped_mmap.h
similarity index 100%
rename from gdb/common/scoped_mmap.h
rename to gdb/gdbsupport/scoped_mmap.h
diff --git a/gdb/common/scoped_restore.h b/gdb/gdbsupport/scoped_restore.h
similarity index 100%
rename from gdb/common/scoped_restore.h
rename to gdb/gdbsupport/scoped_restore.h
diff --git a/gdb/common/selftest.c b/gdb/gdbsupport/selftest.c
similarity index 100%
rename from gdb/common/selftest.c
rename to gdb/gdbsupport/selftest.c
diff --git a/gdb/common/selftest.h b/gdb/gdbsupport/selftest.h
similarity index 100%
rename from gdb/common/selftest.h
rename to gdb/gdbsupport/selftest.h
diff --git a/gdb/common/signals-state-save-restore.c b/gdb/gdbsupport/signals-state-save-restore.c
similarity index 100%
rename from gdb/common/signals-state-save-restore.c
rename to gdb/gdbsupport/signals-state-save-restore.c
diff --git a/gdb/common/signals-state-save-restore.h b/gdb/gdbsupport/signals-state-save-restore.h
similarity index 100%
rename from gdb/common/signals-state-save-restore.h
rename to gdb/gdbsupport/signals-state-save-restore.h
diff --git a/gdb/common/signals.c b/gdb/gdbsupport/signals.c
similarity index 100%
rename from gdb/common/signals.c
rename to gdb/gdbsupport/signals.c
diff --git a/gdb/common/symbol.h b/gdb/gdbsupport/symbol.h
similarity index 100%
rename from gdb/common/symbol.h
rename to gdb/gdbsupport/symbol.h
diff --git a/gdb/common/tdesc.c b/gdb/gdbsupport/tdesc.c
similarity index 96%
rename from gdb/common/tdesc.c
rename to gdb/gdbsupport/tdesc.c
index f946a53c7f3..1e2a3148132 100644
--- a/gdb/common/tdesc.c
+++ b/gdb/gdbsupport/tdesc.c
@@ -18,7 +18,7 @@ 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "common-defs.h"
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 tdesc_reg::tdesc_reg (struct tdesc_feature *feature, const std::string &name_,
 		      int regnum, int save_restore_, const char *group_,
@@ -114,7 +114,7 @@  tdesc_predefined_type (enum tdesc_type_kind kind)
   gdb_assert_not_reached ("bad predefined tdesc type");
 }
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 struct tdesc_type *
 tdesc_named_type (const struct tdesc_feature *feature, const char *id)
@@ -132,7 +132,7 @@  tdesc_named_type (const struct tdesc_feature *feature, const char *id)
   return NULL;
 }
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 void
 tdesc_create_reg (struct tdesc_feature *feature, const char *name,
@@ -145,7 +145,7 @@  tdesc_create_reg (struct tdesc_feature *feature, const char *name,
   feature->registers.emplace_back (reg);
 }
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 struct tdesc_type *
 tdesc_create_vector (struct tdesc_feature *feature, const char *name,
@@ -157,7 +157,7 @@  tdesc_create_vector (struct tdesc_feature *feature, const char *name,
   return type;
 }
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 tdesc_type_with_fields *
 tdesc_create_struct (struct tdesc_feature *feature, const char *name)
@@ -169,7 +169,7 @@  tdesc_create_struct (struct tdesc_feature *feature, const char *name)
   return type;
 }
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 void
 tdesc_set_struct_size (tdesc_type_with_fields *type, int size)
@@ -179,7 +179,7 @@  tdesc_set_struct_size (tdesc_type_with_fields *type, int size)
   type->size = size;
 }
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 tdesc_type_with_fields *
 tdesc_create_union (struct tdesc_feature *feature, const char *name)
@@ -191,7 +191,7 @@  tdesc_create_union (struct tdesc_feature *feature, const char *name)
   return type;
 }
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 tdesc_type_with_fields *
 tdesc_create_flags (struct tdesc_feature *feature, const char *name,
@@ -206,7 +206,7 @@  tdesc_create_flags (struct tdesc_feature *feature, const char *name,
   return type;
 }
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 tdesc_type_with_fields *
 tdesc_create_enum (struct tdesc_feature *feature, const char *name,
@@ -221,7 +221,7 @@  tdesc_create_enum (struct tdesc_feature *feature, const char *name,
   return type;
 }
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 void
 tdesc_add_field (tdesc_type_with_fields *type, const char *field_name,
@@ -235,7 +235,7 @@  tdesc_add_field (tdesc_type_with_fields *type, const char *field_name,
   type->fields.emplace_back (field_name, field_type, -1, -1);
 }
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 void
 tdesc_add_typed_bitfield (tdesc_type_with_fields *type, const char *field_name,
@@ -248,7 +248,7 @@  tdesc_add_typed_bitfield (tdesc_type_with_fields *type, const char *field_name,
   type->fields.emplace_back (field_name, field_type, start, end);
 }
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 void
 tdesc_add_bitfield (tdesc_type_with_fields *type, const char *field_name,
@@ -266,7 +266,7 @@  tdesc_add_bitfield (tdesc_type_with_fields *type, const char *field_name,
   tdesc_add_typed_bitfield (type, field_name, start, end, field_type);
 }
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 void
 tdesc_add_flag (tdesc_type_with_fields *type, int start,
@@ -280,7 +280,7 @@  tdesc_add_flag (tdesc_type_with_fields *type, int start,
 			     start, start);
 }
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 void
 tdesc_add_enum_value (tdesc_type_with_fields *type, int value,
diff --git a/gdb/common/tdesc.h b/gdb/gdbsupport/tdesc.h
similarity index 100%
rename from gdb/common/tdesc.h
rename to gdb/gdbsupport/tdesc.h
diff --git a/gdb/common/traits.h b/gdb/gdbsupport/traits.h
similarity index 100%
rename from gdb/common/traits.h
rename to gdb/gdbsupport/traits.h
diff --git a/gdb/common/underlying.h b/gdb/gdbsupport/underlying.h
similarity index 100%
rename from gdb/common/underlying.h
rename to gdb/gdbsupport/underlying.h
diff --git a/gdb/common/valid-expr.h b/gdb/gdbsupport/valid-expr.h
similarity index 98%
rename from gdb/common/valid-expr.h
rename to gdb/gdbsupport/valid-expr.h
index 603c76e8f13..c622d3546e3 100644
--- a/gdb/common/valid-expr.h
+++ b/gdb/gdbsupport/valid-expr.h
@@ -26,8 +26,8 @@ 
 #ifndef COMMON_VALID_EXPR_H
 #define COMMON_VALID_EXPR_H
 
-#include "common/preprocessor.h"
-#include "common/traits.h"
+#include "gdbsupport/preprocessor.h"
+#include "gdbsupport/traits.h"
 
 /* Macro that uses SFINAE magic to detect whether the EXPR expression
    is either valid or ill-formed, at compile time, without actually
diff --git a/gdb/common/vec.c b/gdb/gdbsupport/vec.c
similarity index 100%
rename from gdb/common/vec.c
rename to gdb/gdbsupport/vec.c
diff --git a/gdb/common/vec.h b/gdb/gdbsupport/vec.h
similarity index 100%
rename from gdb/common/vec.h
rename to gdb/gdbsupport/vec.h
diff --git a/gdb/common/version.h b/gdb/gdbsupport/version.h
similarity index 100%
rename from gdb/common/version.h
rename to gdb/gdbsupport/version.h
diff --git a/gdb/common/x86-xstate.h b/gdb/gdbsupport/x86-xstate.h
similarity index 100%
rename from gdb/common/x86-xstate.h
rename to gdb/gdbsupport/x86-xstate.h
diff --git a/gdb/common/xml-utils.c b/gdb/gdbsupport/xml-utils.c
similarity index 100%
rename from gdb/common/xml-utils.c
rename to gdb/gdbsupport/xml-utils.c
diff --git a/gdb/common/xml-utils.h b/gdb/gdbsupport/xml-utils.h
similarity index 100%
rename from gdb/common/xml-utils.h
rename to gdb/gdbsupport/xml-utils.h
diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h
index ffd4bf5c822..04230d3c170 100644
--- a/gdb/gdbthread.h
+++ b/gdb/gdbthread.h
@@ -27,12 +27,12 @@  struct symtab;
 #include "frame.h"
 #include "ui-out.h"
 #include "btrace.h"
-#include "common/vec.h"
+#include "gdbsupport/vec.h"
 #include "target/waitstatus.h"
 #include "cli/cli-utils.h"
-#include "common/refcounted-object.h"
-#include "common/common-gdbthread.h"
-#include "common/forward-scope-exit.h"
+#include "gdbsupport/refcounted-object.h"
+#include "gdbsupport/common-gdbthread.h"
+#include "gdbsupport/forward-scope-exit.h"
 
 struct inferior;
 
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 49653ffcaf7..1a131e2279c 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -45,11 +45,11 @@ 
  */
 
 #include "hashtab.h"
-#include "common/array-view.h"
-#include "common/offset-type.h"
-#include "common/enum-flags.h"
-#include "common/underlying.h"
-#include "common/print-utils.h"
+#include "gdbsupport/array-view.h"
+#include "gdbsupport/offset-type.h"
+#include "gdbsupport/enum-flags.h"
+#include "gdbsupport/underlying.h"
+#include "gdbsupport/print-utils.h"
 #include "gdbarch.h"
 
 /* Forward declarations for prototypes.  */
diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index 5eeac9270a9..9229f72a096 100644
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -63,7 +63,7 @@  extern "C"
 #include "value.h"
 #include "language.h"
 #include "target.h"
-#include "common/gdb_wait.h"
+#include "gdbsupport/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 ea0872363d3..6a58565fef1 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 "common/gdb_wait.h"
+#include "gdbsupport/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 a426c3c640b..39bec8724f4 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 "common/version.h"
+#include "gdbsupport/version.h"
 #ifdef HAVE_GUILE
 #include "guile.h"
 #include "guile-internal.h"
diff --git a/gdb/guile/scm-ports.c b/gdb/guile/scm-ports.c
index 114b35846ed..f0bb2444ca4 100644
--- a/gdb/guile/scm-ports.c
+++ b/gdb/guile/scm-ports.c
@@ -26,7 +26,7 @@ 
 #include "top.h"
 #include "target.h"
 #include "guile-internal.h"
-#include "common/gdb_optional.h"
+#include "gdbsupport/gdb_optional.h"
 
 #ifdef HAVE_POLL
 #if defined (HAVE_POLL_H)
diff --git a/gdb/guile/scm-safe-call.c b/gdb/guile/scm-safe-call.c
index 14eace5f9cd..fc5668fb52e 100644
--- a/gdb/guile/scm-safe-call.c
+++ b/gdb/guile/scm-safe-call.c
@@ -23,7 +23,7 @@ 
 #include "defs.h"
 #include "filenames.h"
 #include "guile-internal.h"
-#include "common/pathstuff.h"
+#include "gdbsupport/pathstuff.h"
 
 /* Struct to marshall args to scscm_safe_call_body.  */
 
diff --git a/gdb/guile/scm-type.c b/gdb/guile/scm-type.c
index 5b99da70e6e..b32ec4fad29 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 "common/vec.h"
+#include "gdbsupport/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 be5d4c67be7..15a30a4c2a9 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 "common/x86-xstate.h"
+#include "gdbsupport/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 f274847174c..3848bf890d4 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 "common/x86-xstate.h"
+#include "gdbsupport/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 30db72d880e..7a04a9647fa 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 "common/x86-xstate.h"
+#include "gdbsupport/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 abcf72f8989..dd8f141f23b 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 "common/x86-xstate.h"
+#include "gdbsupport/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 74f429b49af..88f99938cad 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 "common/x86-xstate.h"
+#include "gdbsupport/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 c542edf28ad..65af9ebe913 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 "common/x86-xstate.h"
+#include "gdbsupport/x86-xstate.h"
 #include "x86-tdep.h"
 
 #include "record.h"
diff --git a/gdb/i387-tdep.c b/gdb/i387-tdep.c
index 25786619bfa..6c3763d037f 100644
--- a/gdb/i387-tdep.c
+++ b/gdb/i387-tdep.c
@@ -28,7 +28,7 @@ 
 
 #include "i386-tdep.h"
 #include "i387-tdep.h"
-#include "common/x86-xstate.h"
+#include "gdbsupport/x86-xstate.h"
 
 /* Print the floating point number specified by RAW.  */
 
diff --git a/gdb/ia64-libunwind-tdep.c b/gdb/ia64-libunwind-tdep.c
index 00ebf638f4d..0f890261a06 100644
--- a/gdb/ia64-libunwind-tdep.c
+++ b/gdb/ia64-libunwind-tdep.c
@@ -36,7 +36,7 @@ 
 #include "ia64-libunwind-tdep.h"
 
 #include "complaints.h"
-#include "common/preprocessor.h"
+#include "gdbsupport/preprocessor.h"
 
 /* IA-64 is the only target that currently uses ia64-libunwind-tdep.
    Note how UNW_TARGET, UNW_OBJ, etc. are compile time constants below.
diff --git a/gdb/ia64-linux-nat.c b/gdb/ia64-linux-nat.c
index a77a86f490c..7faa0b63086 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 "common/gdb_wait.h"
+#include "gdbsupport/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 41e9e67252b..0a73965a0bf 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 "common/fileio.h"
-#include "common/agent.h"
-#include "common/gdb_wait.h"
-#include "common/filestuff.h"
+#include "gdbsupport/fileio.h"
+#include "gdbsupport/agent.h"
+#include "gdbsupport/gdb_wait.h"
+#include "gdbsupport/filestuff.h"
 
 #include <sys/types.h>
 #include <fcntl.h>
diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c
index e1acd8dc9df..32c433e3eaf 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 "common/gdb_wait.h"
+#include "gdbsupport/gdb_wait.h"
 #include <signal.h>
 
 #include "inf-ptrace.h"
diff --git a/gdb/infcall.c b/gdb/infcall.c
index 84092d37e64..b2f8ed21dc9 100644
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -41,7 +41,7 @@ 
 #include "interps.h"
 #include "thread-fsm.h"
 #include <algorithm>
-#include "common/scope-exit.h"
+#include "gdbsupport/scope-exit.h"
 
 /* If we can't find a function's name from its address,
    we print this instead.  */
diff --git a/gdb/infcall.h b/gdb/infcall.h
index 330fc921593..9966fc671fb 100644
--- a/gdb/infcall.h
+++ b/gdb/infcall.h
@@ -21,7 +21,7 @@ 
 #define INFCALL_H
 
 #include "dummy-frame.h"
-#include "common/array-view.h"
+#include "gdbsupport/array-view.h"
 
 struct value;
 struct type;
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index afd7bb5a541..b511616e1f1 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -25,7 +25,7 @@ 
 #include "frame.h"
 #include "inferior.h"
 #include "infrun.h"
-#include "common/environ.h"
+#include "gdbsupport/environ.h"
 #include "value.h"
 #include "gdbcmd.h"
 #include "symfile.h"
@@ -58,7 +58,7 @@ 
 #include "thread-fsm.h"
 #include "top.h"
 #include "interps.h"
-#include "common/gdb_optional.h"
+#include "gdbsupport/gdb_optional.h"
 #include "source.h"
 
 /* Local functions: */
@@ -213,7 +213,7 @@  show_args_command (struct ui_file *file, int from_tty,
   deprecated_show_value_hack (file, from_tty, c, get_inferior_args ());
 }
 
-/* See common/common-inferior.h.  */
+/* See gdbsupport/common-inferior.h.  */
 
 void
 set_inferior_cwd (const char *cwd)
@@ -228,7 +228,7 @@  set_inferior_cwd (const char *cwd)
     inf->cwd.reset (xstrdup (cwd));
 }
 
-/* See common/common-inferior.h.  */
+/* See gdbsupport/common-inferior.h.  */
 
 const char *
 get_inferior_cwd ()
diff --git a/gdb/inferior-iter.h b/gdb/inferior-iter.h
index f3c0fd811fa..b1b595735b8 100644
--- a/gdb/inferior-iter.h
+++ b/gdb/inferior-iter.h
@@ -20,8 +20,8 @@ 
 #ifndef INFERIOR_ITER_H
 #define INFERIOR_ITER_H
 
-#include "common/filtered-iterator.h"
-#include "common/safe-iterator.h"
+#include "gdbsupport/filtered-iterator.h"
+#include "gdbsupport/safe-iterator.h"
 
 /* A forward iterator that iterates over all inferiors.  */
 
diff --git a/gdb/inferior.c b/gdb/inferior.c
index abfef700c38..1415670b261 100644
--- a/gdb/inferior.c
+++ b/gdb/inferior.c
@@ -29,7 +29,7 @@ 
 #include "observable.h"
 #include "gdbcore.h"
 #include "symfile.h"
-#include "common/environ.h"
+#include "gdbsupport/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 9e0e3b30e88..9cfb03cdbb3 100644
--- a/gdb/inferior.h
+++ b/gdb/inferior.h
@@ -44,16 +44,16 @@  struct thread_info;
 #include "frame.h"
 
 /* For gdb_environ.  */
-#include "common/environ.h"
+#include "gdbsupport/environ.h"
 
 #include "progspace.h"
 #include "registry.h"
 
 #include "symfile-add-flags.h"
-#include "common/refcounted-object.h"
-#include "common/forward-scope-exit.h"
+#include "gdbsupport/refcounted-object.h"
+#include "gdbsupport/forward-scope-exit.h"
 
-#include "common/common-inferior.h"
+#include "gdbsupport/common-inferior.h"
 #include "gdbthread.h"
 
 struct infcall_suspend_state;
diff --git a/gdb/inflow.c b/gdb/inflow.c
index 621f69aa40f..6d645d291a7 100644
--- a/gdb/inflow.c
+++ b/gdb/inflow.c
@@ -34,7 +34,7 @@ 
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
 #endif
-#include "common/job-control.h"
+#include "gdbsupport/job-control.h"
 
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
diff --git a/gdb/inflow.h b/gdb/inflow.h
index 5dd5c37bd2b..73b1b01a27b 100644
--- a/gdb/inflow.h
+++ b/gdb/inflow.h
@@ -22,7 +22,7 @@ 
 
 #include <unistd.h>
 #include <signal.h>
-#include "common/job-control.h"
+#include "gdbsupport/job-control.h"
 
 /* RAII class used to ignore SIGTTOU in a scope.  */
 
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 4fd92f1bac2..c60ed306bd1 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -25,7 +25,7 @@ 
 #include "frame.h"
 #include "inferior.h"
 #include "breakpoint.h"
-#include "common/gdb_wait.h"
+#include "gdbsupport/gdb_wait.h"
 #include "gdbcore.h"
 #include "gdbcmd.h"
 #include "cli/cli-script.h"
@@ -63,12 +63,12 @@ 
 #include "solist.h"
 #include "event-loop.h"
 #include "thread-fsm.h"
-#include "common/enum-flags.h"
+#include "gdbsupport/enum-flags.h"
 #include "progspace-and-thread.h"
-#include "common/gdb_optional.h"
+#include "gdbsupport/gdb_optional.h"
 #include "arch-utils.h"
-#include "common/scope-exit.h"
-#include "common/forward-scope-exit.h"
+#include "gdbsupport/scope-exit.h"
+#include "gdbsupport/forward-scope-exit.h"
 
 /* Prototypes for local functions */
 
diff --git a/gdb/infrun.h b/gdb/infrun.h
index e53fd81e716..30374ee51c4 100644
--- a/gdb/infrun.h
+++ b/gdb/infrun.h
@@ -19,7 +19,7 @@ 
 #define INFRUN_H 1
 
 #include "symtab.h"
-#include "common/byte-vector.h"
+#include "gdbsupport/byte-vector.h"
 
 struct target_waitstatus;
 struct frame_info;
diff --git a/gdb/inline-frame.c b/gdb/inline-frame.c
index 214cb824976..b039ab8fa23 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 "common/vec.h"
+#include "gdbsupport/vec.h"
 #include "frame.h"
 #include <algorithm>
 
diff --git a/gdb/language.h b/gdb/language.h
index e7446efa07f..2a100b04917 100644
--- a/gdb/language.h
+++ b/gdb/language.h
@@ -24,7 +24,7 @@ 
 #define LANGUAGE_H 1
 
 #include "symtab.h"
-#include "common/function-view.h"
+#include "gdbsupport/function-view.h"
 #include "expression.h"
 
 /* Forward decls for prototypes.  */
diff --git a/gdb/linespec.c b/gdb/linespec.c
index 94400f3f336..87e194741a1 100644
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -44,8 +44,8 @@ 
 #include "ada-lang.h"
 #include "stack.h"
 #include "location.h"
-#include "common/function-view.h"
-#include "common/def-vector.h"
+#include "gdbsupport/function-view.h"
+#include "gdbsupport/def-vector.h"
 #include <algorithm>
 
 /* An enumeration of the various things a user might attempt to
diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c
index d323a716e39..fd79345fac1 100644
--- a/gdb/linux-fork.c
+++ b/gdb/linux-fork.c
@@ -31,7 +31,7 @@ 
 #include "source.h"
 
 #include "nat/gdb_ptrace.h"
-#include "common/gdb_wait.h"
+#include "gdbsupport/gdb_wait.h"
 #include <dirent.h>
 #include <ctype.h>
 
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 65165a2d46b..7b25ab96a15 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 "common/gdb_wait.h"
+#include "gdbsupport/gdb_wait.h"
 #include <unistd.h>
 #include <sys/syscall.h>
 #include "nat/gdb_ptrace.h"
@@ -58,15 +58,15 @@ 
 #include "nat/linux-osdata.h"
 #include "linux-tdep.h"
 #include "symfile.h"
-#include "common/agent.h"
+#include "gdbsupport/agent.h"
 #include "tracepoint.h"
-#include "common/buffer.h"
+#include "gdbsupport/buffer.h"
 #include "target-descriptions.h"
-#include "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 #include "objfiles.h"
 #include "nat/linux-namespaces.h"
-#include "common/fileio.h"
-#include "common/scope-exit.h"
+#include "gdbsupport/fileio.h"
+#include "gdbsupport/scope-exit.h"
 
 #ifndef SPUFS_MAGIC
 #define SPUFS_MAGIC 0x23c9b64e
diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c
index f32631f4acb..7d0c3e9fc95 100644
--- a/gdb/linux-tdep.c
+++ b/gdb/linux-tdep.c
@@ -37,8 +37,8 @@ 
 #include "infcall.h"
 #include "gdbcmd.h"
 #include "gdb_regex.h"
-#include "common/enum-flags.h"
-#include "common/gdb_optional.h"
+#include "gdbsupport/enum-flags.h"
+#include "gdbsupport/gdb_optional.h"
 
 #include <ctype.h>
 
diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c
index 5c8b76c9a76..950be9ca5a9 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 "common/gdb_vecs.h"
+#include "gdbsupport/gdb_vecs.h"
 #include "bfd.h"
 #include "command.h"
 #include "gdbcmd.h"
@@ -46,7 +46,7 @@ 
 #include <ctype.h>
 #include "nat/linux-namespaces.h"
 #include <algorithm>
-#include "common/pathstuff.h"
+#include "gdbsupport/pathstuff.h"
 #include "valprint.h"
 
 /* GNU/Linux libthread_db support.
diff --git a/gdb/location.c b/gdb/location.c
index 2b375872c77..0af53995f92 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 "common/gdb_assert.h"
+#include "gdbsupport/gdb_assert.h"
 #include "location.h"
 #include "symtab.h"
 #include "language.h"
diff --git a/gdb/machoread.c b/gdb/machoread.c
index 84e39fdf885..d7471e9572c 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 "common/vec.h"
+#include "gdbsupport/vec.h"
 #include "psympriv.h"
 #include "complaints.h"
 #include "gdb_bfd.h"
diff --git a/gdb/macrotab.h b/gdb/macrotab.h
index d1e14537bd3..045d1625a19 100644
--- a/gdb/macrotab.h
+++ b/gdb/macrotab.h
@@ -20,7 +20,7 @@ 
 #ifndef MACROTAB_H
 #define MACROTAB_H
 
-#include "common/function-view.h"
+#include "gdbsupport/function-view.h"
 
 struct obstack;
 struct bcache;
diff --git a/gdb/main.c b/gdb/main.c
index ef9bfe8fc69..540738e543d 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -40,13 +40,13 @@ 
 #include "maint.h"
 
 #include "filenames.h"
-#include "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 #include <signal.h>
 #include "event-top.h"
 #include "infrun.h"
-#include "common/signals-state-save-restore.h"
+#include "gdbsupport/signals-state-save-restore.h"
 #include <vector>
-#include "common/pathstuff.h"
+#include "gdbsupport/pathstuff.h"
 #include "cli/cli-style.h"
 
 /* The selected interpreter.  This will be used as a set command
diff --git a/gdb/maint.c b/gdb/maint.c
index aaabb352249..23254780a4d 100644
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -38,7 +38,7 @@ 
 #include "value.h"
 #include "top.h"
 #include "maint.h"
-#include "common/selftest.h"
+#include "gdbsupport/selftest.h"
 
 #include "cli/cli-decode.h"
 #include "cli/cli-utils.h"
diff --git a/gdb/maint.h b/gdb/maint.h
index 57f350ade8c..827964d8253 100644
--- a/gdb/maint.h
+++ b/gdb/maint.h
@@ -19,7 +19,7 @@ 
 #ifndef MAINT_H
 #define MAINT_H
 
-#include "common/run-time-clock.h"
+#include "gdbsupport/run-time-clock.h"
 #include <chrono>
 
 extern void set_per_command_time (int);
diff --git a/gdb/memattr.c b/gdb/memattr.c
index 858a41abfb4..4bfab9c021d 100644
--- a/gdb/memattr.c
+++ b/gdb/memattr.c
@@ -25,7 +25,7 @@ 
 #include "target-dcache.h"
 #include "value.h"
 #include "language.h"
-#include "common/vec.h"
+#include "gdbsupport/vec.h"
 #include "breakpoint.h"
 #include "cli/cli-utils.h"
 #include <algorithm>
diff --git a/gdb/memrange.h b/gdb/memrange.h
index d751d3cf230..f2fd66461ce 100644
--- a/gdb/memrange.h
+++ b/gdb/memrange.h
@@ -20,7 +20,7 @@ 
 #ifndef MEMRANGE_H
 #define MEMRANGE_H
 
-#include "common/vec.h"
+#include "gdbsupport/vec.h"
 
 /* Defines a [START, START + LENGTH) memory range.  */
 
diff --git a/gdb/mi/mi-cmd-break.h b/gdb/mi/mi-cmd-break.h
index a68080d580b..1fe930cc6fd 100644
--- a/gdb/mi/mi-cmd-break.h
+++ b/gdb/mi/mi-cmd-break.h
@@ -21,7 +21,7 @@ 
 #ifndef MI_MI_CMD_BREAK_H
 #define MI_MI_CMD_BREAK_H
 
-#include "common/scoped_restore.h"
+#include "gdbsupport/scoped_restore.h"
 
 /* Setup the reporting of the insertion of a new breakpoint or
    catchpoint.  */
diff --git a/gdb/mi/mi-cmd-env.c b/gdb/mi/mi-cmd-env.c
index fcc49b9eb36..ee01afa4c9c 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 "common/environ.h"
+#include "gdbsupport/environ.h"
 #include "command.h"
 #include "ui-out.h"
 #include "top.h"
diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c
index 80bc7a1968e..c8a4ce73c97 100644
--- a/gdb/mi/mi-cmd-stack.c
+++ b/gdb/mi/mi-cmd-stack.c
@@ -34,7 +34,7 @@ 
 #include "extension.h"
 #include <ctype.h>
 #include "mi-parse.h"
-#include "common/gdb_optional.h"
+#include "gdbsupport/gdb_optional.h"
 #include "safe-ctype.h"
 
 enum what_to_list { locals, arguments, all };
diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c
index 0c2e0c3b7bf..662ffa3f4d9 100644
--- a/gdb/mi/mi-cmd-var.c
+++ b/gdb/mi/mi-cmd-var.c
@@ -30,7 +30,7 @@ 
 #include "mi-getopt.h"
 #include "gdbthread.h"
 #include "mi-parse.h"
-#include "common/gdb_optional.h"
+#include "gdbsupport/gdb_optional.h"
 #include "inferior.h"
 
 extern unsigned int varobjdebug;		/* defined in varobj.c.  */
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index ad1a06cae0b..ab1f9138876 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -38,7 +38,7 @@ 
 #include "cli-out.h"
 #include "thread-fsm.h"
 #include "cli/cli-interp.h"
-#include "common/scope-exit.h"
+#include "gdbsupport/scope-exit.h"
 
 /* These are the interpreter setup, etc. functions for the MI
    interpreter.  */
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 13c310d494c..da8c81f9e22 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -44,7 +44,7 @@ 
 #include "language.h"
 #include "valprint.h"
 #include "osdata.h"
-#include "common/gdb_splay_tree.h"
+#include "gdbsupport/gdb_splay_tree.h"
 #include "tracepoint.h"
 #include "ctf.h"
 #include "ada-lang.h"
@@ -52,14 +52,14 @@ 
 #include "extension.h"
 #include "gdbcmd.h"
 #include "observable.h"
-#include "common/gdb_optional.h"
-#include "common/byte-vector.h"
+#include "gdbsupport/gdb_optional.h"
+#include "gdbsupport/byte-vector.h"
 
 #include <ctype.h>
-#include "common/run-time-clock.h"
+#include "gdbsupport/run-time-clock.h"
 #include <chrono>
 #include "progspace-and-thread.h"
-#include "common/rsp-low.h"
+#include "gdbsupport/rsp-low.h"
 #include <algorithm>
 #include <set>
 #include <map>
diff --git a/gdb/mi/mi-parse.h b/gdb/mi/mi-parse.h
index 2262ff56f96..6ee08b9a184 100644
--- a/gdb/mi/mi-parse.h
+++ b/gdb/mi/mi-parse.h
@@ -20,7 +20,7 @@ 
 #ifndef MI_MI_PARSE_H
 #define MI_MI_PARSE_H
 
-#include "common/run-time-clock.h"
+#include "gdbsupport/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 9d29d880aab..ac478719be3 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 "common/symbol.h"
+#include "gdbsupport/symbol.h"
 #include <algorithm>
 #include "safe-ctype.h"
 
@@ -433,7 +433,7 @@  lookup_bound_minimal_symbol (const char *name)
   return lookup_minimal_symbol (name, NULL, NULL);
 }
 
-/* See common/symbol.h.  */
+/* See gdbsupport/symbol.h.  */
 
 int
 find_minimal_symbol_address (const char *name, CORE_ADDR *addr,
diff --git a/gdb/mips-linux-tdep.c b/gdb/mips-linux-tdep.c
index 13c5e06675f..08d027917d8 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 "common/gdb_signals.h"
+#include "gdbsupport/gdb_signals.h"
 
 #include "features/mips-linux.c"
 #include "features/mips-dsp-linux.c"
@@ -1437,7 +1437,7 @@  mips_gdb_signal_to_target (struct gdbarch *gdbarch,
 }
 
 /* Translate signals based on MIPS signal values.
-   Adapted from gdb/common/signals.c.  */
+   Adapted from gdb/gdbsupport/signals.c.  */
 
 static enum gdb_signal
 mips_gdb_signal_from_target (struct gdbarch *gdbarch, int signal)
diff --git a/gdb/namespace.h b/gdb/namespace.h
index 2d395804961..740d5b0d97c 100644
--- a/gdb/namespace.h
+++ b/gdb/namespace.h
@@ -19,8 +19,8 @@ 
 #ifndef NAMESPACE_H
 #define NAMESPACE_H
 
-#include "common/vec.h"
-#include "common/gdb_vecs.h"
+#include "gdbsupport/vec.h"
+#include "gdbsupport/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 1efec9a268c..9f5a0f045e9 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/common-defs.h"
-#include "common/break-common.h"
-#include "common/common-regcache.h"
+#include "gdbsupport/common-defs.h"
+#include "gdbsupport/break-common.h"
+#include "gdbsupport/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 5d9c2a1c80b..10b5e69515a 100644
--- a/gdb/nat/aarch64-linux-hw-point.h
+++ b/gdb/nat/aarch64-linux-hw-point.h
@@ -19,7 +19,7 @@ 
 #ifndef NAT_AARCH64_LINUX_HW_POINT_H
 #define NAT_AARCH64_LINUX_HW_POINT_H
 
-#include "common/break-common.h" /* For enum target_hw_bp_type.  */
+#include "gdbsupport/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 9c4c3ada719..94e07128834 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/common-defs.h"
-#include "common/break-common.h"
+#include "gdbsupport/common-defs.h"
+#include "gdbsupport/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 635b4c9d68a..1383d4688c0 100644
--- a/gdb/nat/aarch64-sve-linux-ptrace.c
+++ b/gdb/nat/aarch64-sve-linux-ptrace.c
@@ -19,13 +19,13 @@ 
 
 #include <sys/utsname.h>
 #include <sys/uio.h>
-#include "common/common-defs.h"
+#include "gdbsupport/common-defs.h"
 #include "elf/external.h"
 #include "elf/common.h"
 #include "aarch64-sve-linux-ptrace.h"
 #include "arch/aarch64.h"
-#include "common/common-regcache.h"
-#include "common/byte-vector.h"
+#include "gdbsupport/common-regcache.h"
+#include "gdbsupport/byte-vector.h"
 
 /* See nat/aarch64-sve-linux-ptrace.h.  */
 
diff --git a/gdb/nat/amd64-linux-siginfo.c b/gdb/nat/amd64-linux-siginfo.c
index dab52684ad0..91460c02ca9 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/common-defs.h"
+#include "gdbsupport/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 1179d01c04f..68b51aa8146 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/common-defs.h"
+#include "gdbsupport/common-defs.h"
 #include "fork-inferior.h"
 #include "target/waitstatus.h"
-#include "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 #include "target/target.h"
-#include "common/common-inferior.h"
-#include "common/common-gdbthread.h"
-#include "common/pathstuff.h"
-#include "common/signals-state-save-restore.h"
-#include "common/gdb_tilde_expand.h"
+#include "gdbsupport/common-inferior.h"
+#include "gdbsupport/common-gdbthread.h"
+#include "gdbsupport/pathstuff.h"
+#include "gdbsupport/signals-state-save-restore.h"
+#include "gdbsupport/gdb_tilde_expand.h"
 #include <vector>
 
 extern char **environ;
diff --git a/gdb/nat/linux-btrace.c b/gdb/nat/linux-btrace.c
index ef291ec2310..8625291cce9 100644
--- a/gdb/nat/linux-btrace.c
+++ b/gdb/nat/linux-btrace.c
@@ -19,14 +19,14 @@ 
    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/common-defs.h"
+#include "gdbsupport/common-defs.h"
 #include "linux-btrace.h"
-#include "common/common-regcache.h"
-#include "common/gdb_wait.h"
+#include "gdbsupport/common-regcache.h"
+#include "gdbsupport/gdb_wait.h"
 #include "x86-cpuid.h"
-#include "common/filestuff.h"
-#include "common/scoped_fd.h"
-#include "common/scoped_mmap.h"
+#include "gdbsupport/filestuff.h"
+#include "gdbsupport/scoped_fd.h"
+#include "gdbsupport/scoped_mmap.h"
 
 #include <inttypes.h>
 
diff --git a/gdb/nat/linux-btrace.h b/gdb/nat/linux-btrace.h
index df7b0d27c7e..1d5c7457ee4 100644
--- a/gdb/nat/linux-btrace.h
+++ b/gdb/nat/linux-btrace.h
@@ -22,8 +22,8 @@ 
 #ifndef NAT_LINUX_BTRACE_H
 #define NAT_LINUX_BTRACE_H
 
-#include "common/btrace-common.h"
-#include "common/vec.h"
+#include "gdbsupport/btrace-common.h"
+#include "gdbsupport/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 c0f326b9a1e..503f755903c 100644
--- a/gdb/nat/linux-namespaces.c
+++ b/gdb/nat/linux-namespaces.c
@@ -17,18 +17,18 @@ 
    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/common-defs.h"
+#include "gdbsupport/common-defs.h"
 #include "nat/linux-namespaces.h"
-#include "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 #include <fcntl.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
-#include "common/gdb_wait.h"
+#include "gdbsupport/gdb_wait.h"
 #include <signal.h>
 #include <sched.h>
-#include "common/scope-exit.h"
+#include "gdbsupport/scope-exit.h"
 
 /* See nat/linux-namespaces.h.  */
 int debug_linux_namespaces;
diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h
index 29f43d8dfa5..13af2484855 100644
--- a/gdb/nat/linux-nat.h
+++ b/gdb/nat/linux-nat.h
@@ -20,7 +20,7 @@ 
 #ifndef NAT_LINUX_NAT_H
 #define NAT_LINUX_NAT_H
 
-#include "common/function-view.h"
+#include "gdbsupport/function-view.h"
 #include "target/waitstatus.h"
 
 struct lwp_info;
diff --git a/gdb/nat/linux-osdata.c b/gdb/nat/linux-osdata.c
index 3599df7cbeb..67f9f3a4251 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/common-defs.h"
+#include "gdbsupport/common-defs.h"
 #include "linux-osdata.h"
 
 #include <sys/types.h>
@@ -32,11 +32,11 @@ 
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "common/xml-utils.h"
-#include "common/buffer.h"
+#include "gdbsupport/xml-utils.h"
+#include "gdbsupport/buffer.h"
 #include <dirent.h>
 #include <sys/stat.h>
-#include "common/filestuff.h"
+#include "gdbsupport/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 2ae84e51b0b..6d209ae50a1 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/common-defs.h"
+#include "gdbsupport/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 929bc137dce..2afc53d27aa 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/common-defs.h"
+#include "gdbsupport/common-defs.h"
 #include "linux-procfs.h"
-#include "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 #include <dirent.h>
 #include <sys/stat.h>
 
diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
index 40919f77d72..c1ebc0a032d 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/common-defs.h"
+#include "gdbsupport/common-defs.h"
 #include "linux-ptrace.h"
 #include "linux-procfs.h"
 #include "linux-waitpid.h"
-#include "common/buffer.h"
+#include "gdbsupport/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 cfb12178a42..fd2f12a342c 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 "common/gdb_wait.h"
+#include "gdbsupport/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 298032dff9a..4d3fe25fd31 100644
--- a/gdb/nat/linux-waitpid.c
+++ b/gdb/nat/linux-waitpid.c
@@ -17,11 +17,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/common-defs.h"
+#include "gdbsupport/common-defs.h"
 
 #include "linux-nat.h"
 #include "linux-waitpid.h"
-#include "common/gdb_wait.h"
+#include "gdbsupport/gdb_wait.h"
 
 /* Convert wait status STATUS to a string.  Used for printing debug
    messages only.  */
diff --git a/gdb/nat/mips-linux-watch.c b/gdb/nat/mips-linux-watch.c
index 8add09c00fc..124752f7c2f 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/common-defs.h"
+#include "gdbsupport/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 35e8d9d461e..7d255c89e47 100644
--- a/gdb/nat/mips-linux-watch.h
+++ b/gdb/nat/mips-linux-watch.h
@@ -19,7 +19,7 @@ 
 #define NAT_MIPS_LINUX_WATCH_H
 
 #include <asm/ptrace.h>
-#include "common/break-common.h"
+#include "gdbsupport/break-common.h"
 
 #define MAX_DEBUG_REGISTER 8
 
diff --git a/gdb/nat/ppc-linux.c b/gdb/nat/ppc-linux.c
index 27942fa2a5d..11f2a43122f 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/common-defs.h"
+#include "gdbsupport/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 fb35178965d..69cc47d4dd7 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/common-defs.h"
+#include "gdbsupport/common-defs.h"
 #include "x86-dregs.h"
-#include "common/break-common.h"
+#include "gdbsupport/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 e8a2e0099e8..4d0602429b2 100644
--- a/gdb/nat/x86-dregs.h
+++ b/gdb/nat/x86-dregs.h
@@ -33,7 +33,7 @@ 
    (32 bytes on 64 bit hosts).  */
 
 
-#include "common/break-common.h" /* target_hw_bp_type */
+#include "gdbsupport/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 29b4ee16b60..271e630a3f3 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/common-defs.h"
+#include "gdbsupport/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 be00a3b560a..55ff58118cf 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/common-defs.h"
+#include "gdbsupport/common-defs.h"
 #include "x86-linux.h"
 #include "x86-linux-dregs.h"
 
diff --git a/gdb/nto-procfs.c b/gdb/nto-procfs.c
index 9dd35a4c8aa..b9866c22591 100644
--- a/gdb/nto-procfs.c
+++ b/gdb/nto-procfs.c
@@ -42,8 +42,8 @@ 
 #include "regcache.h"
 #include "solib.h"
 #include "inf-child.h"
-#include "common/filestuff.h"
-#include "common/scoped_fd.h"
+#include "gdbsupport/filestuff.h"
+#include "gdbsupport/scoped_fd.h"
 
 #define NULL_PID		0
 #define _DEBUG_FLAG_TRACE	(_DEBUG_FLAG_TRACE_EXEC|_DEBUG_FLAG_TRACE_RD|\
diff --git a/gdb/nto-tdep.c b/gdb/nto-tdep.c
index 48e731acd05..0c610d28419 100644
--- a/gdb/nto-tdep.c
+++ b/gdb/nto-tdep.c
@@ -32,7 +32,7 @@ 
 #include "gdbcore.h"
 #include "objfiles.h"
 #include "source.h"
-#include "common/pathstuff.h"
+#include "gdbsupport/pathstuff.h"
 
 #define QNX_NOTE_NAME	"QNX"
 #define QNX_INFO_SECT_NAME "QNX_info"
diff --git a/gdb/objfile-flags.h b/gdb/objfile-flags.h
index 38128ea6211..45c86a3ac09 100644
--- a/gdb/objfile-flags.h
+++ b/gdb/objfile-flags.h
@@ -20,7 +20,7 @@ 
 #if !defined (OBJFILE_FLAGS_H)
 #define OBJFILE_FLAGS_H
 
-#include "common/enum-flags.h"
+#include "gdbsupport/enum-flags.h"
 
 /* Defines for the objfile flags field.  Defined in a separate file to
    break circular header dependencies.  */
diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index b59db591d9f..84d9681bf4e 100644
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -52,7 +52,7 @@ 
 #include "solist.h"
 #include "gdb_bfd.h"
 #include "btrace.h"
-#include "common/pathstuff.h"
+#include "gdbsupport/pathstuff.h"
 
 #include <vector>
 
diff --git a/gdb/objfiles.h b/gdb/objfiles.h
index e0ff8343439..3a7a8ba940b 100644
--- a/gdb/objfiles.h
+++ b/gdb/objfiles.h
@@ -30,8 +30,8 @@ 
 #include "psymtab.h"
 #include <bitset>
 #include <vector>
-#include "common/next-iterator.h"
-#include "common/safe-iterator.h"
+#include "gdbsupport/next-iterator.h"
+#include "gdbsupport/safe-iterator.h"
 #include "bcache.h"
 
 struct htab;
diff --git a/gdb/obsd-nat.c b/gdb/obsd-nat.c
index 0a99bd021df..88c01df2a1e 100644
--- a/gdb/obsd-nat.c
+++ b/gdb/obsd-nat.c
@@ -24,7 +24,7 @@ 
 
 #include <sys/types.h>
 #include <sys/ptrace.h>
-#include "common/gdb_wait.h"
+#include "gdbsupport/gdb_wait.h"
 
 #include "inf-child.h"
 #include "obsd-nat.h"
diff --git a/gdb/observable.h b/gdb/observable.h
index edd1fffae0a..b58966ea90b 100644
--- a/gdb/observable.h
+++ b/gdb/observable.h
@@ -20,7 +20,7 @@ 
 #ifndef OBSERVABLE_H
 #define OBSERVABLE_H
 
-#include "common/observable.h"
+#include "gdbsupport/observable.h"
 
 struct bpstats;
 struct so_list;
diff --git a/gdb/osdata.c b/gdb/osdata.c
index 0ee13d8ffa5..ea3b7dce43b 100644
--- a/gdb/osdata.c
+++ b/gdb/osdata.c
@@ -19,7 +19,7 @@ 
 
 #include "defs.h"
 #include "target.h"
-#include "common/vec.h"
+#include "gdbsupport/vec.h"
 #include "xml-support.h"
 #include "osdata.h"
 #include "ui-out.h"
diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
index 62679ac4445..a3738a9252d 100644
--- a/gdb/p-valprint.c
+++ b/gdb/p-valprint.c
@@ -38,7 +38,7 @@ 
 #include "cp-abi.h"
 #include "cp-support.h"
 #include "objfiles.h"
-#include "common/byte-vector.h"
+#include "gdbsupport/byte-vector.h"
 
 
 /* Decorations for Pascal.  */
diff --git a/gdb/parse.c b/gdb/parse.c
index 6f777e6ed73..a1ab75297a1 100644
--- a/gdb/parse.c
+++ b/gdb/parse.c
@@ -50,7 +50,7 @@ 
 #include "objfiles.h"
 #include "user-regs.h"
 #include <algorithm>
-#include "common/gdb_optional.h"
+#include "gdbsupport/gdb_optional.h"
 
 /* Standard set of definitions for printing, dumping, prefixifying,
  * and evaluating expressions.  */
diff --git a/gdb/parser-defs.h b/gdb/parser-defs.h
index 4254ef60e62..9c0341b556e 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 "common/vec.h"
+#include "gdbsupport/vec.h"
 #include "expression.h"
 
 struct block;
diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
index 70e2962c99e..deb31d49890 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 "common/gdb_wait.h"
+#include "gdbsupport/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 0509360581e..2ed95669150 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -48,10 +48,10 @@ 
 #include "cli/cli-option.h"
 #include "cli/cli-script.h"
 #include "cli/cli-style.h"
-#include "common/format.h"
+#include "gdbsupport/format.h"
 #include "source.h"
-#include "common/byte-vector.h"
-#include "common/gdb_optional.h"
+#include "gdbsupport/byte-vector.h"
+#include "gdbsupport/gdb_optional.h"
 
 /* Last specified output format.  */
 
diff --git a/gdb/probe.c b/gdb/probe.c
index 7bc75d8e879..cdc6e021d2e 100644
--- a/gdb/probe.c
+++ b/gdb/probe.c
@@ -36,7 +36,7 @@ 
 #include "location.h"
 #include <ctype.h>
 #include <algorithm>
-#include "common/gdb_optional.h"
+#include "gdbsupport/gdb_optional.h"
 
 /* Class that implements the static probe methods for "any" probe.  */
 
diff --git a/gdb/proc-api.c b/gdb/proc-api.c
index c7ce82d23af..cb2eaf8cb19 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 "common/gdb_wait.h"
+#include "gdbsupport/gdb_wait.h"
 
 #include "proc-utils.h"
 
diff --git a/gdb/procfs.c b/gdb/procfs.c
index 020336e5ba4..50e3e928425 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 "common/filestuff.h"
+#include "gdbsupport/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 "common/gdb_wait.h"
+#include "gdbsupport/gdb_wait.h"
 #include <signal.h>
 #include <ctype.h>
 #include "gdb_bfd.h"
@@ -46,8 +46,8 @@ 
 #include "auxv.h"
 #include "procfs.h"
 #include "observable.h"
-#include "common/scoped_fd.h"
-#include "common/pathstuff.h"
+#include "gdbsupport/scoped_fd.h"
+#include "gdbsupport/pathstuff.h"
 
 /* This module provides the interface between GDB and the
    /proc file system, which is used on many versions of Unix
diff --git a/gdb/producer.c b/gdb/producer.c
index 362c5ef8b4f..63ec2acb0d5 100644
--- a/gdb/producer.c
+++ b/gdb/producer.c
@@ -19,7 +19,7 @@ 
 
 #include "defs.h"
 #include "producer.h"
-#include "common/selftest.h"
+#include "gdbsupport/selftest.h"
 
 /* See producer.h.  */
 
diff --git a/gdb/progspace.h b/gdb/progspace.h
index 039f5551730..073da1fbc06 100644
--- a/gdb/progspace.h
+++ b/gdb/progspace.h
@@ -22,12 +22,12 @@ 
 #define PROGSPACE_H
 
 #include "target.h"
-#include "common/vec.h"
+#include "gdbsupport/vec.h"
 #include "gdb_bfd.h"
-#include "common/gdb_vecs.h"
+#include "gdbsupport/gdb_vecs.h"
 #include "registry.h"
-#include "common/next-iterator.h"
-#include "common/safe-iterator.h"
+#include "gdbsupport/next-iterator.h"
+#include "gdbsupport/safe-iterator.h"
 
 struct target_ops;
 struct bfd;
diff --git a/gdb/psymtab.h b/gdb/psymtab.h
index c761fa72222..aed686258d4 100644
--- a/gdb/psymtab.h
+++ b/gdb/psymtab.h
@@ -22,7 +22,7 @@ 
 
 #include "gdb_obstack.h"
 #include "symfile.h"
-#include "common/next-iterator.h"
+#include "gdbsupport/next-iterator.h"
 #include "bcache.h"
 
 struct partial_symbol;
diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c
index 95ad410f23f..a351ac5aec8 100644
--- a/gdb/python/py-framefilter.c
+++ b/gdb/python/py-framefilter.c
@@ -30,7 +30,7 @@ 
 #include "demangle.h"
 #include "mi/mi-cmds.h"
 #include "python-internal.h"
-#include "common/gdb_optional.h"
+#include "gdbsupport/gdb_optional.h"
 
 enum mi_print_types
 {
diff --git a/gdb/python/py-inferior.c b/gdb/python/py-inferior.c
index 7e7d518c557..161e6dcf343 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 "common/gdb_signals.h"
+#include "gdbsupport/gdb_signals.h"
 #include "py-event.h"
 #include "py-stopevent.h"
 
diff --git a/gdb/python/py-ref.h b/gdb/python/py-ref.h
index 15280f6fbf5..3f5514ee011 100644
--- a/gdb/python/py-ref.h
+++ b/gdb/python/py-ref.h
@@ -20,7 +20,7 @@ 
 #ifndef PYTHON_PY_REF_H
 #define PYTHON_PY_REF_H
 
-#include "common/gdb_ref_ptr.h"
+#include "gdbsupport/gdb_ref_ptr.h"
 
 /* A policy class for gdb::ref_ptr for Python reference counting.  */
 template<typename T>
diff --git a/gdb/python/py-type.c b/gdb/python/py-type.c
index 7b99beacae0..e8af6f60e1e 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 "common/vec.h"
+#include "gdbsupport/vec.h"
 #include "typeprint.h"
 
 typedef struct pyty_type_object
diff --git a/gdb/python/python.c b/gdb/python/python.c
index 128bfc75880..d51970558d0 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 "common/version.h"
+#include "gdbsupport/version.h"
 #include "target.h"
 #include "gdbthread.h"
 #include "interps.h"
diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c
index 21085d5c62c..ec06145585f 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 "common/vec.h"
+#include "gdbsupport/vec.h"
 #include "inferior.h"
 #include <algorithm>
 
diff --git a/gdb/record-full.c b/gdb/record-full.c
index 95a0353d754..2fc6a2ef776 100644
--- a/gdb/record-full.c
+++ b/gdb/record-full.c
@@ -36,8 +36,8 @@ 
 #include "gdb_bfd.h"
 #include "observable.h"
 #include "infrun.h"
-#include "common/gdb_unlinker.h"
-#include "common/byte-vector.h"
+#include "gdbsupport/gdb_unlinker.h"
+#include "gdbsupport/byte-vector.h"
 
 #include <signal.h>
 
diff --git a/gdb/record.c b/gdb/record.c
index 828c19968a3..7d46bf1617c 100644
--- a/gdb/record.c
+++ b/gdb/record.c
@@ -23,7 +23,7 @@ 
 #include "record.h"
 #include "observable.h"
 #include "inferior.h"
-#include "common/common-utils.h"
+#include "gdbsupport/common-utils.h"
 #include "cli/cli-utils.h"
 #include "disasm.h"
 
diff --git a/gdb/record.h b/gdb/record.h
index 03f96e8ab78..f371b7f7cc1 100644
--- a/gdb/record.h
+++ b/gdb/record.h
@@ -21,7 +21,7 @@ 
 #define RECORD_H
 
 #include "target/waitstatus.h" /* For enum target_stop_reason.  */
-#include "common/enum-flags.h"
+#include "gdbsupport/enum-flags.h"
 
 struct cmd_list_element;
 struct inferior;
diff --git a/gdb/regcache-dump.c b/gdb/regcache-dump.c
index 1bcf9c3d17a..52ecbbe1387 100644
--- a/gdb/regcache-dump.c
+++ b/gdb/regcache-dump.c
@@ -18,7 +18,7 @@ 
 #include "defs.h"
 #include "gdbcmd.h"
 #include "regcache.h"
-#include "common/def-vector.h"
+#include "gdbsupport/def-vector.h"
 #include "valprint.h"
 #include "remote.h"
 #include "reggroups.h"
diff --git a/gdb/regcache.c b/gdb/regcache.c
index 323f0f5ab4e..bcced338fba 100644
--- a/gdb/regcache.c
+++ b/gdb/regcache.c
@@ -168,7 +168,7 @@  register_size (struct gdbarch *gdbarch, int regnum)
   return size;
 }
 
-/* See common/common-regcache.h.  */
+/* See gdbsupport/common-regcache.h.  */
 
 int
 regcache_register_size (const struct regcache *regcache, int n)
@@ -284,7 +284,7 @@  regcache::restore (readonly_detached_regcache *src)
     }
 }
 
-/* See common/common-regcache.h.  */
+/* See gdbsupport/common-regcache.h.  */
 
 enum register_status
 reg_buffer::get_register_status (int regnum) const
@@ -372,7 +372,7 @@  get_current_regcache (void)
   return get_thread_regcache (inferior_thread ());
 }
 
-/* See common/common-regcache.h.  */
+/* See gdbsupport/common-regcache.h.  */
 
 struct regcache *
 get_thread_regcache_for_ptid (ptid_t ptid)
@@ -931,7 +931,7 @@  regcache::cooked_write_part (int regnum, int offset, int len,
   write_part (regnum, offset, len, buf, false);
 }
 
-/* See common/common-regcache.h.  */
+/* See gdbsupport/common-regcache.h.  */
 
 void
 reg_buffer::raw_supply (int regnum, const void *buf)
@@ -996,7 +996,7 @@  reg_buffer::raw_supply_zeroed (int regnum)
   m_register_status[regnum] = REG_VALID;
 }
 
-/* See common/common-regcache.h.  */
+/* See gdbsupport/common-regcache.h.  */
 
 void
 reg_buffer::raw_collect (int regnum, void *buf) const
@@ -1148,7 +1148,7 @@  regcache::collect_regset (const struct regset *regset,
   transfer_regset (regset, nullptr, regnum, nullptr, (gdb_byte *) buf, size);
 }
 
-/* See common/common-regcache.h.  */
+/* See gdbsupport/common-regcache.h.  */
 
 bool
 reg_buffer::raw_compare (int regnum, const void *buf, int offset) const
@@ -1380,7 +1380,7 @@  register_dump::dump (ui_file *file)
 }
 
 #if GDB_SELF_TEST
-#include "common/selftest.h"
+#include "gdbsupport/selftest.h"
 #include "selftest-arch.h"
 #include "target-float.h"
 
diff --git a/gdb/regcache.h b/gdb/regcache.h
index 2b703ea4a4b..8d0c302ac3e 100644
--- a/gdb/regcache.h
+++ b/gdb/regcache.h
@@ -20,7 +20,7 @@ 
 #ifndef REGCACHE_H
 #define REGCACHE_H
 
-#include "common/common-regcache.h"
+#include "gdbsupport/common-regcache.h"
 #include <forward_list>
 
 struct regcache;
@@ -68,7 +68,7 @@  extern void regcache_cooked_write_unsigned (struct regcache *regcache,
 
 /* Special routines to read/write the PC.  */
 
-/* For regcache_read_pc see common/common-regcache.h.  */
+/* For regcache_read_pc see gdbsupport/common-regcache.h.  */
 extern void regcache_write_pc (struct regcache *regcache, CORE_ADDR pc);
 
 /* Mapping between register numbers and offsets in a buffer, for use
@@ -181,10 +181,10 @@  public:
   /* Return regcache's architecture.  */
   gdbarch *arch () const;
 
-  /* See common/common-regcache.h.  */
+  /* See gdbsupport/common-regcache.h.  */
   enum register_status get_register_status (int regnum) const override;
 
-  /* See common/common-regcache.h.  */
+  /* See gdbsupport/common-regcache.h.  */
   void raw_collect (int regnum, void *buf) const override;
 
   /* Collect register REGNUM from REGCACHE.  Store collected value as an integer
@@ -199,7 +199,7 @@  public:
      reading only LEN.  */
   void raw_collect_part (int regnum, int offset, int len, gdb_byte *out) const;
 
-  /* See common/common-regcache.h.  */
+  /* See gdbsupport/common-regcache.h.  */
   void raw_supply (int regnum, const void *buf) override;
 
   void raw_supply (int regnum, const reg_buffer &src)
@@ -228,7 +228,7 @@  public:
 
   virtual ~reg_buffer () = default;
 
-  /* See common/common-regcache.h.  */
+  /* See gdbsupport/common-regcache.h.  */
   bool raw_compare (int regnum, const void *buf, int offset) const override;
 
 protected:
diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c
index 2f7ecf366c3..11c141e42c4 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 "common/gdb_wait.h"
+#include "gdbsupport/gdb_wait.h"
 #include <sys/stat.h>
 #include "remote-fileio.h"
 #include "event-loop.h"
 #include "target.h"
 #include "filenames.h"
-#include "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 
 #include <fcntl.h>
-#include "common/gdb_sys_time.h"
+#include "gdbsupport/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 184d2054dc1..779b63ee291 100644
--- a/gdb/remote-fileio.h
+++ b/gdb/remote-fileio.h
@@ -22,7 +22,7 @@ 
 #ifndef REMOTE_FILEIO_H
 #define REMOTE_FILEIO_H
 
-#include "common/fileio.h"
+#include "gdbsupport/fileio.h"
 
 struct cmd_list_element;
 struct remote_target;
diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index 8a6cb6b18e3..a22a59ed399 100644
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -41,7 +41,7 @@ 
 #include "arch-utils.h"
 #include "readline/readline.h"
 #include "gdbthread.h"
-#include "common/byte-vector.h"
+#include "gdbsupport/byte-vector.h"
 
 /* Prototypes */
 
diff --git a/gdb/remote.c b/gdb/remote.c
index 124d254478e..42c730e48fb 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 "common/filestuff.h"
-#include "common/rsp-low.h"
+#include "gdbsupport/filestuff.h"
+#include "gdbsupport/rsp-low.h"
 #include "disasm.h"
 #include "location.h"
 
-#include "common/gdb_sys_time.h"
+#include "gdbsupport/gdb_sys_time.h"
 
 #include "event-loop.h"
 #include "event-top.h"
@@ -68,13 +68,13 @@ 
 #include "tracepoint.h"
 #include "ax.h"
 #include "ax-gdb.h"
-#include "common/agent.h"
+#include "gdbsupport/agent.h"
 #include "btrace.h"
 #include "record-btrace.h"
 #include <algorithm>
-#include "common/scoped_restore.h"
-#include "common/environ.h"
-#include "common/byte-vector.h"
+#include "gdbsupport/scoped_restore.h"
+#include "gdbsupport/environ.h"
+#include "gdbsupport/byte-vector.h"
 #include <unordered_map>
 
 /* The remote target.  */
diff --git a/gdb/riscv-tdep.c b/gdb/riscv-tdep.c
index bae987cf66b..27698445e17 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/common-defs.h"
+#include "gdbsupport/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 e99865682fd..4964f591a5a 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 "common/xml-utils.h"
+#include "gdbsupport/xml-utils.h"
 #include "trad-frame.h"
 #include "frame-unwind.h"
 
diff --git a/gdb/rust-exp.y b/gdb/rust-exp.y
index 15932638397..ddbf1d4bba3 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 "common/selftest.h"
+#include "gdbsupport/selftest.h"
 #include "value.h"
-#include "common/vec.h"
+#include "gdbsupport/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 fa27b58e56e..a9d20e809c1 100644
--- a/gdb/s12z-tdep.c
+++ b/gdb/s12z-tdep.c
@@ -22,7 +22,7 @@ 
 
 #include "arch-utils.h"
 #include "dwarf2-frame.h"
-#include "common/errors.h"
+#include "gdbsupport/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 38cd6248d04..e440a300d4e 100644
--- a/gdb/selftest-arch.c
+++ b/gdb/selftest-arch.c
@@ -19,7 +19,7 @@ 
 #include "defs.h"
 
 #if GDB_SELF_TEST
-#include "common/selftest.h"
+#include "gdbsupport/selftest.h"
 #include "selftest-arch.h"
 #include "arch-utils.h"
 
diff --git a/gdb/ser-base.c b/gdb/ser-base.c
index 683d3f42528..85429b68cbb 100644
--- a/gdb/ser-base.c
+++ b/gdb/ser-base.c
@@ -23,7 +23,7 @@ 
 #include "event-loop.h"
 
 #include "gdb_select.h"
-#include "common/gdb_sys_time.h"
+#include "gdbsupport/gdb_sys_time.h"
 #ifdef USE_WIN32API
 #include <winsock2.h>
 #endif
diff --git a/gdb/ser-event.c b/gdb/ser-event.c
index d3956346246..a65a186526f 100644
--- a/gdb/ser-event.c
+++ b/gdb/ser-event.c
@@ -19,7 +19,7 @@ 
 #include "defs.h"
 #include "ser-event.h"
 #include "serial.h"
-#include "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 
 /* On POSIX hosts, a serial_event is basically an abstraction for the
    classical self-pipe trick.
diff --git a/gdb/ser-pipe.c b/gdb/ser-pipe.c
index 702d97c5513..61d5708ea09 100644
--- a/gdb/ser-pipe.c
+++ b/gdb/ser-pipe.c
@@ -27,9 +27,9 @@ 
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include "common/gdb_sys_time.h"
+#include "gdbsupport/gdb_sys_time.h"
 #include <fcntl.h>
-#include "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 
 #include <signal.h>
 
diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c
index 5aa7105dc2c..cc96a52dc3e 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 "common/filestuff.h"
-#include "common/netstuff.h"
+#include "gdbsupport/filestuff.h"
+#include "gdbsupport/netstuff.h"
 
 #include <sys/types.h>
 
@@ -36,7 +36,7 @@ 
 #include <sys/ioctl.h>  /* For FIONBIO.  */
 #endif
 
-#include "common/gdb_sys_time.h"
+#include "gdbsupport/gdb_sys_time.h"
 
 #ifdef USE_WIN32API
 #include <ws2tcpip.h>
diff --git a/gdb/ser-unix.c b/gdb/ser-unix.c
index 3492619f2d6..049dfd5261f 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 "common/gdb_sys_time.h"
+#include "gdbsupport/gdb_sys_time.h"
 
 #include "gdb_select.h"
 #include "gdbcmd.h"
-#include "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 #include <termios.h>
 #include "inflow.h"
 
diff --git a/gdb/skip.c b/gdb/skip.c
index 127b11dc443..039d50cb117 100644
--- a/gdb/skip.c
+++ b/gdb/skip.c
@@ -34,7 +34,7 @@ 
 #include "filenames.h"
 #include "fnmatch.h"
 #include "gdb_regex.h"
-#include "common/gdb_optional.h"
+#include "gdbsupport/gdb_optional.h"
 #include <list>
 
 /* True if we want to print debug printouts related to file/function
diff --git a/gdb/solib-aix.c b/gdb/solib-aix.c
index ab4f3626290..bf2f30d01cd 100644
--- a/gdb/solib-aix.c
+++ b/gdb/solib-aix.c
@@ -26,7 +26,7 @@ 
 #include "xcoffread.h"
 #include "observable.h"
 #include "gdbcmd.h"
-#include "common/scope-exit.h"
+#include "gdbsupport/scope-exit.h"
 
 /* Variable controlling the output of the debugging traces for
    this module.  */
diff --git a/gdb/solib-target.c b/gdb/solib-target.c
index a1cf94c42e6..1ccbc27b2bc 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 "common/vec.h"
+#include "gdbsupport/vec.h"
 #include "solib-target.h"
 #include <vector>
 
diff --git a/gdb/solib.c b/gdb/solib.c
index e0b1a921f82..29a17ad5d49 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -31,7 +31,7 @@ 
 #include "frame.h"
 #include "gdb_regex.h"
 #include "inferior.h"
-#include "common/environ.h"
+#include "gdbsupport/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 "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 #include "source.h"
 
 /* Architecture-specific operations.  */
diff --git a/gdb/source-cache.c b/gdb/source-cache.c
index d2fb4b81b71..9aaaa901f4a 100644
--- a/gdb/source-cache.c
+++ b/gdb/source-cache.c
@@ -18,7 +18,7 @@ 
 
 #include "defs.h"
 #include "source-cache.h"
-#include "common/scoped_fd.h"
+#include "gdbsupport/scoped_fd.h"
 #include "source.h"
 #include "cli/cli-style.h"
 
diff --git a/gdb/source.c b/gdb/source.c
index 02df15a1ae6..886779d8118 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -26,7 +26,7 @@ 
 #include "gdbcmd.h"
 #include "frame.h"
 #include "value.h"
-#include "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 
 #include <sys/types.h>
 #include <fcntl.h>
@@ -41,10 +41,10 @@ 
 #include "completer.h"
 #include "ui-out.h"
 #include "readline/readline.h"
-#include "common/enum-flags.h"
-#include "common/scoped_fd.h"
+#include "gdbsupport/enum-flags.h"
+#include "gdbsupport/scoped_fd.h"
 #include <algorithm>
-#include "common/pathstuff.h"
+#include "gdbsupport/pathstuff.h"
 #include "source-cache.h"
 
 #define OPEN_MODE (O_RDONLY | O_BINARY)
diff --git a/gdb/source.h b/gdb/source.h
index f1b5f6e8f7f..40e57c09e04 100644
--- a/gdb/source.h
+++ b/gdb/source.h
@@ -19,7 +19,7 @@ 
 #ifndef SOURCE_H
 #define SOURCE_H
 
-#include "common/scoped_fd.h"
+#include "gdbsupport/scoped_fd.h"
 
 struct symtab;
 
diff --git a/gdb/sparc-nat.c b/gdb/sparc-nat.c
index 173fd0b6397..3685e5af410 100644
--- a/gdb/sparc-nat.c
+++ b/gdb/sparc-nat.c
@@ -24,7 +24,7 @@ 
 
 #include <signal.h>
 #include <sys/ptrace.h>
-#include "common/gdb_wait.h"
+#include "gdbsupport/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 90a9f002848..2f4b4d69464 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 "common/gdb_wait.h"
+#include "gdbsupport/gdb_wait.h"
 #include "gdbthread.h"
 #include "gdb_bfd.h"
 
diff --git a/gdb/stack.c b/gdb/stack.c
index 547e82bbfb2..efb394a406e 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -51,7 +51,7 @@ 
 #include "symfile.h"
 #include "extension.h"
 #include "observable.h"
-#include "common/def-vector.h"
+#include "gdbsupport/def-vector.h"
 #include "cli/cli-option.h"
 
 /* The possible choices of "set print frame-arguments", and the value
diff --git a/gdb/stap-probe.c b/gdb/stap-probe.c
index e5a901b4bf6..8228a603ddf 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 "common/vec.h"
+#include "gdbsupport/vec.h"
 #include "ui-out.h"
 #include "objfiles.h"
 #include "arch-utils.h"
diff --git a/gdb/symfile-add-flags.h b/gdb/symfile-add-flags.h
index b29baa15e39..9c6564d57c0 100644
--- a/gdb/symfile-add-flags.h
+++ b/gdb/symfile-add-flags.h
@@ -20,7 +20,7 @@ 
 #if !defined (SYMFILE_ADD_FLAGS_H)
 #define SYMFILE_ADD_FLAGS_H
 
-#include "common/enum-flags.h"
+#include "gdbsupport/enum-flags.h"
 
 /* This enum encodes bit-flags passed as ADD_FLAGS parameter to
    symbol_file_add, etc.  Defined in a separate file to break circular
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 6f9c81c8b94..4d9c3b99fa8 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -56,11 +56,11 @@ 
 #include "stack.h"
 #include "gdb_bfd.h"
 #include "cli/cli-utils.h"
-#include "common/byte-vector.h"
-#include "common/pathstuff.h"
-#include "common/selftest.h"
+#include "gdbsupport/byte-vector.h"
+#include "gdbsupport/pathstuff.h"
+#include "gdbsupport/selftest.h"
 #include "cli/cli-style.h"
-#include "common/forward-scope-exit.h"
+#include "gdbsupport/forward-scope-exit.h"
 
 #include <sys/types.h>
 #include <fcntl.h>
diff --git a/gdb/symfile.h b/gdb/symfile.h
index daddd2e21ab..9da92807b41 100644
--- a/gdb/symfile.h
+++ b/gdb/symfile.h
@@ -26,7 +26,7 @@ 
 #include "symfile-add-flags.h"
 #include "objfile-flags.h"
 #include "gdb_bfd.h"
-#include "common/function-view.h"
+#include "gdbsupport/function-view.h"
 
 /* Opaque declarations.  */
 struct target_section;
diff --git a/gdb/symtab.c b/gdb/symtab.c
index 4920d94a247..4e6a5896f3f 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -64,11 +64,11 @@ 
 #include "parser-defs.h"
 #include "completer.h"
 #include "progspace-and-thread.h"
-#include "common/gdb_optional.h"
+#include "gdbsupport/gdb_optional.h"
 #include "filename-seen-cache.h"
 #include "arch-utils.h"
 #include <algorithm>
-#include "common/pathstuff.h"
+#include "gdbsupport/pathstuff.h"
 
 /* Forward declarations for local functions.  */
 
diff --git a/gdb/symtab.h b/gdb/symtab.h
index e4ee7271a15..6780fa37be1 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -23,13 +23,13 @@ 
 #include <array>
 #include <vector>
 #include <string>
-#include "common/gdb_vecs.h"
+#include "gdbsupport/gdb_vecs.h"
 #include "gdbtypes.h"
 #include "gdb_regex.h"
-#include "common/enum-flags.h"
-#include "common/function-view.h"
-#include "common/gdb_optional.h"
-#include "common/next-iterator.h"
+#include "gdbsupport/enum-flags.h"
+#include "gdbsupport/function-view.h"
+#include "gdbsupport/gdb_optional.h"
+#include "gdbsupport/next-iterator.h"
 #include "completer.h"
 
 /* Opaque declarations.  */
diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c
index bd33091ba9e..f422f2c14c2 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 "common/vec.h"
+#include "gdbsupport/vec.h"
 #include "xml-support.h"
 #include "xml-tdesc.h"
 #include "osabi.h"
@@ -635,7 +635,7 @@  tdesc_architecture (const struct target_desc *target_desc)
   return target_desc->arch;
 }
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 const char *
 tdesc_architecture_name (const struct target_desc *target_desc)
@@ -652,7 +652,7 @@  tdesc_osabi (const struct target_desc *target_desc)
   return target_desc->osabi;
 }
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 const char *
 tdesc_osabi_name (const struct target_desc *target_desc)
@@ -1125,7 +1125,7 @@  tdesc_use_registers (struct gdbarch *gdbarch,
   set_gdbarch_register_reggroup_p (gdbarch, tdesc_register_reggroup_p);
 }
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 struct tdesc_feature *
 tdesc_create_feature (struct target_desc *tdesc, const char *name)
@@ -1182,7 +1182,7 @@  set_tdesc_property (struct target_desc *target_desc,
   target_desc->properties.emplace_back (key, value);
 }
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 void
 set_tdesc_architecture (struct target_desc *target_desc,
@@ -1198,7 +1198,7 @@  set_tdesc_architecture (struct target_desc *target_desc,
   target_desc->arch = arch;
 }
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 void
 set_tdesc_osabi (struct target_desc *target_desc, const char *name)
@@ -1563,7 +1563,7 @@  public:
     printf_unfiltered ("  Original: %s */\n\n",
 		       lbasename (m_filename_after_features.c_str ()));
 
-    printf_unfiltered ("#include \"common/tdesc.h\"\n");
+    printf_unfiltered ("#include \"gdbsupport/tdesc.h\"\n");
     printf_unfiltered ("\n");
   }
 
@@ -1658,7 +1658,7 @@  private:
   int m_next_regnum = 0;
 };
 
-/* See common/tdesc.h.  */
+/* See gdbsupport/tdesc.h.  */
 
 const char *
 tdesc_get_features_xml (const target_desc *tdesc)
diff --git a/gdb/target-descriptions.h b/gdb/target-descriptions.h
index fe07d425a5f..5f27eed06db 100644
--- a/gdb/target-descriptions.h
+++ b/gdb/target-descriptions.h
@@ -21,7 +21,7 @@ 
 
 #ifndef TARGET_DESCRIPTIONS_H
 #define TARGET_DESCRIPTIONS_H 1
-#include "common/tdesc.h"
+#include "gdbsupport/tdesc.h"
 
 struct tdesc_arch_data;
 struct target_ops;
diff --git a/gdb/target-memory.c b/gdb/target-memory.c
index d04363c2a56..ce964babaac 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 "common/vec.h"
+#include "gdbsupport/vec.h"
 #include "target.h"
 #include "memory-map.h"
 
-#include "common/gdb_sys_time.h"
+#include "gdbsupport/gdb_sys_time.h"
 #include <algorithm>
 
 static bool
diff --git a/gdb/target.c b/gdb/target.c
index 1c04095fd63..de3706d75dc 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 "common/agent.h"
+#include "gdbsupport/agent.h"
 #include "auxv.h"
 #include "target-debug.h"
 #include "top.h"
 #include "event-top.h"
 #include <algorithm>
-#include "common/byte-vector.h"
+#include "gdbsupport/byte-vector.h"
 #include "terminal.h"
 #include <unordered_map>
 
diff --git a/gdb/target.h b/gdb/target.h
index 323357ca550..4e2e75cb806 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -42,7 +42,7 @@  struct inferior;
 
 #include "infrun.h" /* For enum exec_direction_kind.  */
 #include "breakpoint.h" /* For enum bptype.  */
-#include "common/scoped_restore.h"
+#include "gdbsupport/scoped_restore.h"
 
 /* This include file defines the interface between the main part
    of the debugger, and the part which is target-specific, or
@@ -74,15 +74,15 @@  struct inferior;
 #include "bfd.h"
 #include "symtab.h"
 #include "memattr.h"
-#include "common/vec.h"
-#include "common/gdb_signals.h"
+#include "gdbsupport/vec.h"
+#include "gdbsupport/gdb_signals.h"
 #include "btrace.h"
 #include "record.h"
 #include "command.h"
 #include "disasm.h"
 #include "tracepoint.h"
 
-#include "common/break-common.h" /* For enum target_hw_bp_type.  */
+#include "gdbsupport/break-common.h" /* For enum target_hw_bp_type.  */
 
 enum strata
   {
diff --git a/gdb/target/waitstatus.c b/gdb/target/waitstatus.c
index f86ce223739..0b74f788b74 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/common-defs.h"
+#include "gdbsupport/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 8f48599e9e8..ec1abed7b40 100644
--- a/gdb/target/waitstatus.h
+++ b/gdb/target/waitstatus.h
@@ -20,7 +20,7 @@ 
 #ifndef TARGET_WAITSTATUS_H
 #define TARGET_WAITSTATUS_H
 
-#include "common/gdb_signals.h"
+#include "gdbsupport/gdb_signals.h"
 
 /* Stuff for target_wait.  */
 
diff --git a/gdb/thread-iter.h b/gdb/thread-iter.h
index be6ab73c686..72ee9ddcb84 100644
--- a/gdb/thread-iter.h
+++ b/gdb/thread-iter.h
@@ -19,9 +19,9 @@ 
 #ifndef THREAD_ITER_H
 #define THREAD_ITER_H
 
-#include "common/filtered-iterator.h"
-#include "common/next-iterator.h"
-#include "common/safe-iterator.h"
+#include "gdbsupport/filtered-iterator.h"
+#include "gdbsupport/next-iterator.h"
+#include "gdbsupport/safe-iterator.h"
 
 /* A forward iterator that iterates over a given inferior's
    threads.  */
diff --git a/gdb/thread.c b/gdb/thread.c
index 695572f3fb9..2a5e641a8b5 100644
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -23,7 +23,7 @@ 
 #include "symtab.h"
 #include "frame.h"
 #include "inferior.h"
-#include "common/environ.h"
+#include "gdbsupport/environ.h"
 #include "value.h"
 #include "target.h"
 #include "gdbthread.h"
@@ -45,7 +45,7 @@ 
 #include "thread-fsm.h"
 #include "tid-parse.h"
 #include <algorithm>
-#include "common/gdb_optional.h"
+#include "gdbsupport/gdb_optional.h"
 #include "inline-frame.h"
 #include "stack.h"
 
@@ -1260,7 +1260,7 @@  switch_to_thread (thread_info *thr)
   reinit_frame_cache ();
 }
 
-/* See common/common-gdbthread.h.  */
+/* See gdbsupport/common-gdbthread.h.  */
 
 void
 switch_to_thread (ptid_t ptid)
diff --git a/gdb/tilegx-tdep.c b/gdb/tilegx-tdep.c
index a5f05ef1515..aa2681e2127 100644
--- a/gdb/tilegx-tdep.c
+++ b/gdb/tilegx-tdep.c
@@ -40,7 +40,7 @@ 
 #include "tilegx-tdep.h"
 #include "opcode/tilegx.h"
 #include <algorithm>
-#include "common/byte-vector.h"
+#include "gdbsupport/byte-vector.h"
 
 struct tilegx_frame_cache
 {
diff --git a/gdb/top.c b/gdb/top.c
index 857207c3767..37c85350a00 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -35,11 +35,11 @@ 
 #include "value.h"
 #include "language.h"
 #include "terminal.h"
-#include "common/job-control.h"
+#include "gdbsupport/job-control.h"
 #include "annotate.h"
 #include "completer.h"
 #include "top.h"
-#include "common/version.h"
+#include "gdbsupport/version.h"
 #include "serial.h"
 #include "main.h"
 #include "event-loop.h"
@@ -50,9 +50,9 @@ 
 #include "maint.h"
 #include "filenames.h"
 #include "frame.h"
-#include "common/buffer.h"
+#include "gdbsupport/buffer.h"
 #include "gdb_select.h"
-#include "common/scope-exit.h"
+#include "gdbsupport/scope-exit.h"
 
 /* readline include files.  */
 #include "readline/readline.h"
diff --git a/gdb/top.h b/gdb/top.h
index aab03c13d69..e7659b65ffe 100644
--- a/gdb/top.h
+++ b/gdb/top.h
@@ -20,7 +20,7 @@ 
 #ifndef TOP_H
 #define TOP_H
 
-#include "common/buffer.h"
+#include "gdbsupport/buffer.h"
 #include "event-loop.h"
 #include "value.h"
 
diff --git a/gdb/tracefile-tfile.c b/gdb/tracefile-tfile.c
index 593556a8ba8..2e61d834090 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 "common/filestuff.h"
-#include "common/rsp-low.h" /* bin2hex */
+#include "gdbsupport/filestuff.h"
+#include "gdbsupport/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 "common/buffer.h"
+#include "gdbsupport/buffer.h"
 #include <algorithm>
 
 #ifndef O_LARGEFILE
diff --git a/gdb/tracefile.c b/gdb/tracefile.c
index bf886e06521..7ed2fc08e49 100644
--- a/gdb/tracefile.c
+++ b/gdb/tracefile.c
@@ -22,7 +22,7 @@ 
 #include "ctf.h"
 #include "exec.h"
 #include "regcache.h"
-#include "common/byte-vector.h"
+#include "gdbsupport/byte-vector.h"
 
 /* Helper macros.  */
 
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index af5dcd1e339..5674400776a 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 "common/filestuff.h"
-#include "common/rsp-low.h"
+#include "gdbsupport/filestuff.h"
+#include "gdbsupport/rsp-low.h"
 #include "tracefile.h"
 #include "location.h"
 #include <algorithm>
diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h
index ca9d2a77943..440effb39d6 100644
--- a/gdb/tracepoint.h
+++ b/gdb/tracepoint.h
@@ -21,7 +21,7 @@ 
 
 #include "breakpoint.h"
 #include "memrange.h"
-#include "common/gdb_vecs.h"
+#include "gdbsupport/gdb_vecs.h"
 
 #include <vector>
 #include <string>
diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c
index ad47c8205f3..4b33f68e553 100644
--- a/gdb/tui/tui-io.c
+++ b/gdb/tui/tui-io.c
@@ -40,7 +40,7 @@ 
 #ifdef __MINGW32__
 #include <windows.h>
 #endif
-#include "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 #include "completer.h"
 #include "gdb_curses.h"
 #include <map>
diff --git a/gdb/ui-file.c b/gdb/ui-file.c
index 24c914f442a..382038ac9e6 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 "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 
 null_file null_stream;
 
diff --git a/gdb/ui-out.h b/gdb/ui-out.h
index 9eba70eedac..8574204b92a 100644
--- a/gdb/ui-out.h
+++ b/gdb/ui-out.h
@@ -25,7 +25,7 @@ 
 
 #include <vector>
 
-#include "common/enum-flags.h"
+#include "gdbsupport/enum-flags.h"
 
 class ui_out_level;
 class ui_out_table;
diff --git a/gdb/unittests/array-view-selftests.c b/gdb/unittests/array-view-selftests.c
index d0d1128cd2a..95a4cc799f0 100644
--- a/gdb/unittests/array-view-selftests.c
+++ b/gdb/unittests/array-view-selftests.c
@@ -18,8 +18,8 @@ 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "common/selftest.h"
-#include "common/array-view.h"
+#include "gdbsupport/selftest.h"
+#include "gdbsupport/array-view.h"
 #include <array>
 
 namespace selftests {
diff --git a/gdb/unittests/child-path-selftests.c b/gdb/unittests/child-path-selftests.c
index 4c436efa969..2ed83faed66 100644
--- a/gdb/unittests/child-path-selftests.c
+++ b/gdb/unittests/child-path-selftests.c
@@ -18,8 +18,8 @@ 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "common/pathstuff.h"
-#include "common/selftest.h"
+#include "gdbsupport/pathstuff.h"
+#include "gdbsupport/selftest.h"
 
 namespace selftests {
 namespace child_path {
diff --git a/gdb/unittests/cli-utils-selftests.c b/gdb/unittests/cli-utils-selftests.c
index a251a8e58f8..6d8928fd6bc 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 "common/selftest.h"
+#include "gdbsupport/selftest.h"
 
 namespace selftests {
 namespace cli_utils {
diff --git a/gdb/unittests/common-utils-selftests.c b/gdb/unittests/common-utils-selftests.c
index 996ab5e82d1..3d4211da86d 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/common-defs.h"
-#include "common/selftest.h"
+#include "gdbsupport/common-defs.h"
+#include "gdbsupport/selftest.h"
 
 namespace selftests {
 
diff --git a/gdb/unittests/copy_bitwise-selftests.c b/gdb/unittests/copy_bitwise-selftests.c
index 9dd9aeac00c..aad4614ecf5 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 "common/selftest.h"
+#include "gdbsupport/selftest.h"
 #include "utils.h"
 
 namespace selftests {
diff --git a/gdb/unittests/environ-selftests.c b/gdb/unittests/environ-selftests.c
index 2bbff7039e6..c499f01cfae 100644
--- a/gdb/unittests/environ-selftests.c
+++ b/gdb/unittests/environ-selftests.c
@@ -18,8 +18,8 @@ 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "common/selftest.h"
-#include "common/environ.h"
+#include "gdbsupport/selftest.h"
+#include "gdbsupport/environ.h"
 #include "diagnostics.h"
 
 static const char gdb_selftest_env_var[] = "GDB_SELFTEST_ENVIRON";
diff --git a/gdb/unittests/format_pieces-selftests.c b/gdb/unittests/format_pieces-selftests.c
index 976af3d2fcd..7d31b3cb93f 100644
--- a/gdb/unittests/format_pieces-selftests.c
+++ b/gdb/unittests/format_pieces-selftests.c
@@ -18,8 +18,8 @@ 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "common/format.h"
-#include "common/selftest.h"
+#include "gdbsupport/format.h"
+#include "gdbsupport/selftest.h"
 
 namespace selftests {
 namespace format_pieces {
diff --git a/gdb/unittests/function-view-selftests.c b/gdb/unittests/function-view-selftests.c
index 2abaa1f9917..f0d58d8778b 100644
--- a/gdb/unittests/function-view-selftests.c
+++ b/gdb/unittests/function-view-selftests.c
@@ -18,8 +18,8 @@ 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "common/selftest.h"
-#include "common/function-view.h"
+#include "gdbsupport/selftest.h"
+#include "gdbsupport/function-view.h"
 
 namespace selftests {
 namespace function_view {
diff --git a/gdb/unittests/lookup_name_info-selftests.c b/gdb/unittests/lookup_name_info-selftests.c
index 04fcd7e0b5a..747728158d8 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 "common/selftest.h"
+#include "gdbsupport/selftest.h"
 #include "symtab.h"
 
 namespace selftests {
diff --git a/gdb/unittests/memory-map-selftests.c b/gdb/unittests/memory-map-selftests.c
index fc6f0fe5730..f64f0501335 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 "common/selftest.h"
+#include "gdbsupport/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 ada8e3e4342..6fe1fe622f5 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 "common/selftest.h"
+#include "gdbsupport/selftest.h"
 #include "memrange.h"
 
 namespace selftests {
diff --git a/gdb/unittests/mkdir-recursive-selftests.c b/gdb/unittests/mkdir-recursive-selftests.c
index a8b571f38c7..8be4a922f71 100644
--- a/gdb/unittests/mkdir-recursive-selftests.c
+++ b/gdb/unittests/mkdir-recursive-selftests.c
@@ -19,10 +19,10 @@ 
 
 #include "defs.h"
 
-#include "common/filestuff.h"
-#include "common/selftest.h"
-#include "common/byte-vector.h"
-#include "common/pathstuff.h"
+#include "gdbsupport/filestuff.h"
+#include "gdbsupport/selftest.h"
+#include "gdbsupport/byte-vector.h"
+#include "gdbsupport/pathstuff.h"
 
 namespace selftests {
 namespace mkdir_recursive {
diff --git a/gdb/unittests/observable-selftests.c b/gdb/unittests/observable-selftests.c
index 2a51a999561..f7a8e9606ae 100644
--- a/gdb/unittests/observable-selftests.c
+++ b/gdb/unittests/observable-selftests.c
@@ -18,8 +18,8 @@ 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "common/selftest.h"
-#include "common/observable.h"
+#include "gdbsupport/selftest.h"
+#include "gdbsupport/observable.h"
 
 namespace selftests {
 namespace observers {
diff --git a/gdb/unittests/offset-type-selftests.c b/gdb/unittests/offset-type-selftests.c
index 8222a94ad02..57a1a27d133 100644
--- a/gdb/unittests/offset-type-selftests.c
+++ b/gdb/unittests/offset-type-selftests.c
@@ -18,10 +18,10 @@ 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "common/selftest.h"
-#include "common/offset-type.h"
-#include "common/underlying.h"
-#include "common/valid-expr.h"
+#include "gdbsupport/selftest.h"
+#include "gdbsupport/offset-type.h"
+#include "gdbsupport/underlying.h"
+#include "gdbsupport/valid-expr.h"
 
 namespace selftests {
 namespace offset_type {
diff --git a/gdb/unittests/optional-selftests.c b/gdb/unittests/optional-selftests.c
index fdd4437b16e..828b0e8577a 100644
--- a/gdb/unittests/optional-selftests.c
+++ b/gdb/unittests/optional-selftests.c
@@ -18,8 +18,8 @@ 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "common/selftest.h"
-#include "common/gdb_optional.h"
+#include "gdbsupport/selftest.h"
+#include "gdbsupport/gdb_optional.h"
 
 /* Used by the included .cc files below.  Included here because the
    included test files are wrapped in a namespace.  */
diff --git a/gdb/unittests/parse-connection-spec-selftests.c b/gdb/unittests/parse-connection-spec-selftests.c
index 915aa669f42..b86ab4343f2 100644
--- a/gdb/unittests/parse-connection-spec-selftests.c
+++ b/gdb/unittests/parse-connection-spec-selftests.c
@@ -18,8 +18,8 @@ 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "common/selftest.h"
-#include "common/netstuff.h"
+#include "gdbsupport/selftest.h"
+#include "gdbsupport/netstuff.h"
 #include "diagnostics.h"
 #ifdef USE_WIN32API
 #include <ws2tcpip.h>
diff --git a/gdb/unittests/ptid-selftests.c b/gdb/unittests/ptid-selftests.c
index 0194d9a229f..1deb738e1bf 100644
--- a/gdb/unittests/ptid-selftests.c
+++ b/gdb/unittests/ptid-selftests.c
@@ -18,7 +18,7 @@ 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "common/ptid.h"
+#include "gdbsupport/ptid.h"
 #include <type_traits>
 
 namespace selftests {
diff --git a/gdb/unittests/rsp-low-selftests.c b/gdb/unittests/rsp-low-selftests.c
index dc3e8f52054..e316a22c74c 100644
--- a/gdb/unittests/rsp-low-selftests.c
+++ b/gdb/unittests/rsp-low-selftests.c
@@ -18,8 +18,8 @@ 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "common/selftest.h"
-#include "common/rsp-low.h"
+#include "gdbsupport/selftest.h"
+#include "gdbsupport/rsp-low.h"
 
 namespace selftests {
 namespace rsp_low {
diff --git a/gdb/unittests/scoped_fd-selftests.c b/gdb/unittests/scoped_fd-selftests.c
index 886ff261acb..c3d17102cd5 100644
--- a/gdb/unittests/scoped_fd-selftests.c
+++ b/gdb/unittests/scoped_fd-selftests.c
@@ -19,10 +19,10 @@ 
 
 #include "defs.h"
 
-#include "common/filestuff.h"
-#include "common/scoped_fd.h"
+#include "gdbsupport/filestuff.h"
+#include "gdbsupport/scoped_fd.h"
 #include "config.h"
-#include "common/selftest.h"
+#include "gdbsupport/selftest.h"
 
 namespace selftests {
 namespace scoped_fd {
diff --git a/gdb/unittests/scoped_mmap-selftests.c b/gdb/unittests/scoped_mmap-selftests.c
index a3d2040b62a..37d91ae1f25 100644
--- a/gdb/unittests/scoped_mmap-selftests.c
+++ b/gdb/unittests/scoped_mmap-selftests.c
@@ -19,14 +19,14 @@ 
 
 #include "defs.h"
 
-#include "common/filestuff.h"
-#include "common/scoped_mmap.h"
+#include "gdbsupport/filestuff.h"
+#include "gdbsupport/scoped_mmap.h"
 #include "config.h"
 
 #if defined(HAVE_SYS_MMAN_H)
 
-#include "common/selftest.h"
-#include "common/gdb_unlinker.h"
+#include "gdbsupport/selftest.h"
+#include "gdbsupport/gdb_unlinker.h"
 
 #include <unistd.h>
 
diff --git a/gdb/unittests/scoped_restore-selftests.c b/gdb/unittests/scoped_restore-selftests.c
index 564ca07a920..c05cccf0468 100644
--- a/gdb/unittests/scoped_restore-selftests.c
+++ b/gdb/unittests/scoped_restore-selftests.c
@@ -18,8 +18,8 @@ 
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "common/selftest.h"
-#include "common/scoped_restore.h"
+#include "gdbsupport/selftest.h"
+#include "gdbsupport/scoped_restore.h"
 
 namespace selftests {
 namespace scoped_restore_tests {
diff --git a/gdb/unittests/string_view-selftests.c b/gdb/unittests/string_view-selftests.c
index b2a2bf7f2e9..910f6588d7b 100644
--- a/gdb/unittests/string_view-selftests.c
+++ b/gdb/unittests/string_view-selftests.c
@@ -24,8 +24,8 @@ 
 #define GNULIB_NAMESPACE gnulib
 
 #include "defs.h"
-#include "common/selftest.h"
-#include "common/gdb_string_view.h"
+#include "gdbsupport/selftest.h"
+#include "gdbsupport/gdb_string_view.h"
 
 /* Used by the included .cc files below.  Included here because the
    included test files are wrapped in a namespace.  */
diff --git a/gdb/unittests/style-selftests.c b/gdb/unittests/style-selftests.c
index 9682724b86f..fc7f144c235 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 "common/selftest.h"
+#include "gdbsupport/selftest.h"
 #include "ui-style.h"
 
 namespace selftests {
diff --git a/gdb/unittests/tracepoint-selftests.c b/gdb/unittests/tracepoint-selftests.c
index 1e2618453b4..1f04c7cea24 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 "common/selftest.h"
+#include "gdbsupport/selftest.h"
 #include "tracepoint.h"
 
 namespace selftests {
diff --git a/gdb/unittests/unpack-selftests.c b/gdb/unittests/unpack-selftests.c
index e85aa2180b7..ffb6238445b 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 "common/selftest.h"
+#include "gdbsupport/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 c874de3e181..ec81124001f 100644
--- a/gdb/unittests/utils-selftests.c
+++ b/gdb/unittests/utils-selftests.c
@@ -19,7 +19,7 @@ 
 
 #include "defs.h"
 #include "utils.h"
-#include "common/selftest.h"
+#include "gdbsupport/selftest.h"
 
 namespace selftests {
 namespace utils {
diff --git a/gdb/unittests/xml-utils-selftests.c b/gdb/unittests/xml-utils-selftests.c
index 2c24056aacd..99c431b2360 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 "common/xml-utils.h"
-#include "common/selftest.h"
+#include "gdbsupport/xml-utils.h"
+#include "gdbsupport/selftest.h"
 
 namespace selftests {
 namespace xml_utils {
diff --git a/gdb/utils.c b/gdb/utils.c
index f55661287eb..5d887c4b8c8 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -19,7 +19,7 @@ 
 
 #include "defs.h"
 #include <ctype.h>
-#include "common/gdb_wait.h"
+#include "gdbsupport/gdb_wait.h"
 #include "event-top.h"
 #include "gdbthread.h"
 #include "fnmatch.h"
@@ -65,14 +65,14 @@ 
 #include "gdb_usleep.h"
 #include "interps.h"
 #include "gdb_regex.h"
-#include "common/job-control.h"
-#include "common/selftest.h"
-#include "common/gdb_optional.h"
+#include "gdbsupport/job-control.h"
+#include "gdbsupport/selftest.h"
+#include "gdbsupport/gdb_optional.h"
 #include "cp-support.h"
 #include <algorithm>
-#include "common/pathstuff.h"
+#include "gdbsupport/pathstuff.h"
 #include "cli/cli-style.h"
-#include "common/scope-exit.h"
+#include "gdbsupport/scope-exit.h"
 
 void (*deprecated_error_begin_hook) (void);
 
diff --git a/gdb/utils.h b/gdb/utils.h
index 58b4a283447..3c0aee73eda 100644
--- a/gdb/utils.h
+++ b/gdb/utils.h
@@ -22,7 +22,7 @@ 
 #define UTILS_H
 
 #include "exceptions.h"
-#include "common/scoped_restore.h"
+#include "gdbsupport/scoped_restore.h"
 #include <chrono>
 
 extern void initialize_utils (void);
diff --git a/gdb/valarith.c b/gdb/valarith.c
index 8d310b504a2..e730e5c55d5 100644
--- a/gdb/valarith.c
+++ b/gdb/valarith.c
@@ -26,7 +26,7 @@ 
 #include "language.h"
 #include "target-float.h"
 #include "infcall.h"
-#include "common/byte-vector.h"
+#include "gdbsupport/byte-vector.h"
 
 /* Define whether or not the C operator '/' truncates towards zero for
    differently signed operands (truncation direction is undefined in C).  */
diff --git a/gdb/valops.c b/gdb/valops.c
index cbf2eccde3e..a484b79d3f0 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -39,7 +39,7 @@ 
 #include "observable.h"
 #include "objfiles.h"
 #include "extension.h"
-#include "common/byte-vector.h"
+#include "gdbsupport/byte-vector.h"
 
 extern unsigned int overload_debug;
 /* Local functions.  */
diff --git a/gdb/valprint.c b/gdb/valprint.c
index 6f9b47da80c..7b2b79b5396 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -35,7 +35,7 @@ 
 #include "typeprint.h"
 #include <ctype.h>
 #include <algorithm>
-#include "common/byte-vector.h"
+#include "gdbsupport/byte-vector.h"
 #include "cli/cli-option.h"
 
 /* Maximum number of wchars returned from wchar_iterate.  */
diff --git a/gdb/value.c b/gdb/value.c
index 71030efed07..7d69c4be520 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -41,8 +41,8 @@ 
 #include "user-regs.h"
 #include <algorithm>
 #include "completer.h"
-#include "common/selftest.h"
-#include "common/array-view.h"
+#include "gdbsupport/selftest.h"
+#include "gdbsupport/array-view.h"
 
 /* Definition of a user function.  */
 struct internal_function
diff --git a/gdb/value.h b/gdb/value.h
index 0756d13b6d7..f96b095941a 100644
--- a/gdb/value.h
+++ b/gdb/value.h
@@ -22,7 +22,7 @@ 
 
 #include "frame.h"		/* For struct frame_id.  */
 #include "extension.h"
-#include "common/gdb_ref_ptr.h"
+#include "gdbsupport/gdb_ref_ptr.h"
 
 struct block;
 struct expression;
diff --git a/gdb/varobj.c b/gdb/varobj.c
index 8ec8298a12c..17f4ae06d8c 100644
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -26,7 +26,7 @@ 
 #include "gdb_regex.h"
 
 #include "varobj.h"
-#include "common/vec.h"
+#include "gdbsupport/vec.h"
 #include "gdbthread.h"
 #include "inferior.h"
 #include "varobj-iter.h"
diff --git a/gdb/varobj.h b/gdb/varobj.h
index 5d8c6876dd8..9067d2d6beb 100644
--- a/gdb/varobj.h
+++ b/gdb/varobj.h
@@ -19,7 +19,7 @@ 
 
 #include "symtab.h"
 #include "gdbtypes.h"
-#include "common/vec.h"
+#include "gdbsupport/vec.h"
 #include "value.h"
 
 /* Enumeration for the format types */
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index ae4e3d55b30..3431181a88c 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -67,8 +67,8 @@ 
 #include "x86-nat.h"
 #include "complaints.h"
 #include "inf-child.h"
-#include "common/gdb_tilde_expand.h"
-#include "common/pathstuff.h"
+#include "gdbsupport/gdb_tilde_expand.h"
+#include "gdbsupport/pathstuff.h"
 
 #define AdjustTokenPrivileges		dyn_AdjustTokenPrivileges
 #define DebugActiveProcessStop		dyn_DebugActiveProcessStop
diff --git a/gdb/x86-linux-nat.c b/gdb/x86-linux-nat.c
index fe85358fa26..e1b592510fa 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 "common/x86-xstate.h"
+#include "gdbsupport/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 ae727da03b3..8b79d69a6d5 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 "common/filestuff.h"
+#include "gdbsupport/filestuff.h"
 #include "safe-ctype.h"
 #include <vector>
 #include <string>
diff --git a/gdb/xml-support.h b/gdb/xml-support.h
index c5cf617050a..eebd79d33a4 100644
--- a/gdb/xml-support.h
+++ b/gdb/xml-support.h
@@ -22,9 +22,9 @@ 
 #define XML_SUPPORT_H
 
 #include "gdb_obstack.h"
-#include "common/vec.h"
-#include "common/xml-utils.h"
-#include "common/byte-vector.h"
+#include "gdbsupport/vec.h"
+#include "gdbsupport/xml-utils.h"
+#include "gdbsupport/byte-vector.h"
 
 struct gdb_xml_parser;
 struct gdb_xml_element;
diff --git a/gdb/xml-tdesc.h b/gdb/xml-tdesc.h
index 2137ee8a411..902509b51f2 100644
--- a/gdb/xml-tdesc.h
+++ b/gdb/xml-tdesc.h
@@ -22,7 +22,7 @@ 
 #ifndef XML_TDESC_H
 #define XML_TDESC_H
 
-#include "common/gdb_optional.h"
+#include "gdbsupport/gdb_optional.h"
 #include <string>
 
 struct target_ops;
diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c
index 1555eb1eb4a..2dd76c37251 100644
--- a/gdb/xstormy16-tdep.c
+++ b/gdb/xstormy16-tdep.c
@@ -33,7 +33,7 @@ 
 #include "regcache.h"
 #include "osabi.h"
 #include "objfiles.h"
-#include "common/byte-vector.h"
+#include "gdbsupport/byte-vector.h"
 
 enum gdb_regnum
 {
diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c
index 13904069b3a..3ff66d171a0 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 "common/gdb_wait.h"
+#include "gdbsupport/gdb_wait.h"
 #include <fcntl.h>
 #include <sys/procfs.h>
 #include "nat/gdb_ptrace.h"