Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
* [PATCH v3 0/4] Include early include files with `-include`
@ 2024-03-26 19:06 Simon Marchi
  2024-03-26 19:06 ` [PATCH v3 1/4] gdb, gdbserver, gdbsupport: reformat some Makefile variables, one entry per line Simon Marchi
                   ` (4 more replies)
  0 siblings, 5 replies; 8+ messages in thread
From: Simon Marchi @ 2024-03-26 19:06 UTC (permalink / raw)
  To: gdb-patches; +Cc: Simon Marchi

This is v3 of:

https://inbox.sourceware.org/gdb-patches/20240323021648.154109-1-simon.marchi@efficios.com/T/#t

The only change in v3 concerns gdbreplay.  In patch 3, use `-include
gdbsupport/common-defs.h` when building `gdbreplay.o`.  In patch 4,
remove the corresponding #include in `gdbreplay.cc`.

Simon Marchi (4):
  gdb, gdbserver, gdbsupport: reformat some Makefile variables, one
    entry per line
  {gdb,gdbserver}/Makefile.in: remove unnecessary intermediary variables
  gdb, gdbserver, gdbsupport: include early header files with `-include`
  gdb, gdbserver, gdbsupport: remove includes of early headers

 gdb/Makefile.in                               | 50 +++++++++++-----
 gdb/aarch32-linux-nat.c                       |  1 -
 gdb/aarch32-tdep.c                            |  2 -
 gdb/aarch64-fbsd-nat.c                        |  1 -
 gdb/aarch64-fbsd-tdep.c                       |  1 -
 gdb/aarch64-linux-nat.c                       |  1 -
 gdb/aarch64-linux-tdep.c                      |  1 -
 gdb/aarch64-nat.c                             |  1 -
 gdb/aarch64-newlib-tdep.c                     |  1 -
 gdb/aarch64-ravenscar-thread.c                |  1 -
 gdb/aarch64-tdep.c                            |  1 -
 gdb/ada-exp.y                                 |  1 -
 gdb/ada-lang.c                                |  1 -
 gdb/ada-tasks.c                               |  1 -
 gdb/ada-typeprint.c                           |  1 -
 gdb/ada-valprint.c                            |  1 -
 gdb/ada-varobj.c                              |  1 -
 gdb/addrmap.c                                 |  1 -
 gdb/agent.c                                   |  1 -
 gdb/aix-thread.c                              |  1 -
 gdb/alloc.c                                   |  7 +--
 gdb/alpha-bsd-nat.c                           |  1 -
 gdb/alpha-bsd-tdep.c                          |  1 -
 gdb/alpha-linux-nat.c                         |  1 -
 gdb/alpha-linux-tdep.c                        |  1 -
 gdb/alpha-mdebug-tdep.c                       |  1 -
 gdb/alpha-netbsd-tdep.c                       |  1 -
 gdb/alpha-obsd-tdep.c                         |  1 -
 gdb/alpha-tdep.c                              |  1 -
 gdb/amd-dbgapi-target.c                       |  1 -
 gdb/amd64-bsd-nat.c                           |  1 -
 gdb/amd64-darwin-tdep.c                       |  1 -
 gdb/amd64-dicos-tdep.c                        |  1 -
 gdb/amd64-fbsd-nat.c                          |  1 -
 gdb/amd64-fbsd-tdep.c                         |  1 -
 gdb/amd64-linux-nat.c                         |  1 -
 gdb/amd64-linux-tdep.c                        |  1 -
 gdb/amd64-nat.c                               |  1 -
 gdb/amd64-netbsd-nat.c                        |  1 -
 gdb/amd64-netbsd-tdep.c                       |  1 -
 gdb/amd64-obsd-nat.c                          |  1 -
 gdb/amd64-obsd-tdep.c                         |  1 -
 gdb/amd64-ravenscar-thread.c                  |  1 -
 gdb/amd64-sol2-tdep.c                         |  1 -
 gdb/amd64-tdep.c                              |  1 -
 gdb/amd64-windows-nat.c                       |  1 -
 gdb/amd64-windows-tdep.c                      |  1 -
 gdb/amdgpu-tdep.c                             |  1 -
 gdb/annotate.c                                |  1 -
 gdb/arc-linux-nat.c                           |  1 -
 gdb/arc-linux-tdep.c                          |  1 -
 gdb/arc-newlib-tdep.c                         |  1 -
 gdb/arc-tdep.c                                |  1 -
 gdb/arch-utils.c                              |  1 -
 gdb/arch/aarch32.c                            |  1 -
 gdb/arch/aarch64-insn.c                       |  1 -
 gdb/arch/aarch64-mte-linux.h                  |  1 -
 gdb/arch/aarch64-scalable-linux.h             |  1 -
 gdb/arch/aarch64.c                            |  1 -
 gdb/arch/amd64.c                              |  1 -
 gdb/arch/arc.c                                |  1 -
 gdb/arch/arm-get-next-pcs.c                   |  1 -
 gdb/arch/arm-linux.c                          |  1 -
 gdb/arch/arm.c                                |  1 -
 gdb/arch/csky.c                               |  1 -
 gdb/arch/i386.c                               |  1 -
 gdb/arch/loongarch.c                          |  1 -
 gdb/arch/ppc-linux-common.c                   |  1 -
 gdb/arch/riscv.c                              |  1 -
 gdb/arch/tic6x.c                              |  1 -
 gdb/arm-bsd-tdep.c                            |  1 -
 gdb/arm-fbsd-nat.c                            |  1 -
 gdb/arm-fbsd-tdep.c                           |  1 -
 gdb/arm-linux-nat.c                           |  1 -
 gdb/arm-linux-tdep.c                          |  1 -
 gdb/arm-netbsd-nat.c                          |  1 -
 gdb/arm-netbsd-tdep.c                         |  1 -
 gdb/arm-none-tdep.c                           |  1 -
 gdb/arm-obsd-tdep.c                           |  1 -
 gdb/arm-pikeos-tdep.c                         |  1 -
 gdb/arm-tdep.c                                |  1 -
 gdb/arm-wince-tdep.c                          |  1 -
 gdb/async-event.c                             |  1 -
 gdb/auto-load.c                               |  1 -
 gdb/auxv.c                                    |  1 -
 gdb/avr-tdep.c                                |  1 -
 gdb/ax-gdb.c                                  |  1 -
 gdb/ax-general.c                              |  1 -
 gdb/bcache.c                                  |  1 -
 gdb/bfd-target.c                              |  1 -
 gdb/bfin-linux-tdep.c                         |  1 -
 gdb/bfin-tdep.c                               |  1 -
 gdb/block.c                                   |  1 -
 gdb/blockframe.c                              |  1 -
 gdb/bpf-tdep.c                                |  1 -
 gdb/break-catch-exec.c                        |  1 -
 gdb/break-catch-fork.c                        |  1 -
 gdb/break-catch-load.c                        |  1 -
 gdb/break-catch-sig.c                         |  1 -
 gdb/break-catch-syscall.c                     |  1 -
 gdb/break-catch-throw.c                       |  1 -
 gdb/breakpoint.c                              |  1 -
 gdb/bsd-kvm.c                                 |  1 -
 gdb/bsd-uthread.c                             |  1 -
 gdb/bt-utils.c                                |  1 -
 gdb/btrace.c                                  |  1 -
 gdb/build-id.c                                |  1 -
 gdb/buildsym-legacy.c                         |  1 -
 gdb/buildsym.c                                |  1 -
 gdb/c-exp.y                                   |  1 -
 gdb/c-lang.c                                  |  1 -
 gdb/c-typeprint.c                             |  1 -
 gdb/c-valprint.c                              |  1 -
 gdb/c-varobj.c                                |  1 -
 gdb/charset.c                                 |  1 -
 gdb/cli-out.c                                 |  1 -
 gdb/cli/cli-cmds.c                            |  1 -
 gdb/cli/cli-decode.c                          |  1 -
 gdb/cli/cli-dump.c                            |  1 -
 gdb/cli/cli-interp.c                          |  1 -
 gdb/cli/cli-logging.c                         |  1 -
 gdb/cli/cli-option.c                          |  1 -
 gdb/cli/cli-script.c                          |  1 -
 gdb/cli/cli-setshow.c                         |  1 -
 gdb/cli/cli-style.c                           |  1 -
 gdb/cli/cli-utils.c                           |  1 -
 gdb/coff-pe-read.c                            |  1 -
 gdb/coffread.c                                |  1 -
 gdb/compile/compile-c-support.c               |  1 -
 gdb/compile/compile-c-symbols.c               |  1 -
 gdb/compile/compile-c-types.c                 |  1 -
 gdb/compile/compile-cplus-symbols.c           |  1 -
 gdb/compile/compile-cplus-types.c             |  1 -
 gdb/compile/compile-loc2c.c                   |  1 -
 gdb/compile/compile-object-load.c             |  1 -
 gdb/compile/compile-object-run.c              |  1 -
 gdb/compile/compile.c                         |  1 -
 gdb/complaints.c                              |  1 -
 gdb/completer.c                               |  1 -
 gdb/copying.awk                               |  1 -
 gdb/copying.c                                 |  1 -
 gdb/corefile.c                                |  1 -
 gdb/corelow.c                                 |  1 -
 gdb/cp-abi.c                                  |  1 -
 gdb/cp-name-parser.y                          |  1 -
 gdb/cp-namespace.c                            |  1 -
 gdb/cp-support.c                              |  1 -
 gdb/cp-valprint.c                             |  1 -
 gdb/cris-linux-tdep.c                         |  1 -
 gdb/cris-tdep.c                               |  1 -
 gdb/csky-linux-tdep.c                         |  1 -
 gdb/csky-tdep.c                               |  1 -
 gdb/ctfread.c                                 |  1 -
 gdb/d-exp.y                                   |  1 -
 gdb/d-lang.c                                  |  1 -
 gdb/d-namespace.c                             |  1 -
 gdb/d-valprint.c                              |  1 -
 gdb/darwin-nat-info.c                         |  1 -
 gdb/darwin-nat.c                              |  1 -
 gdb/dbxread.c                                 |  1 -
 gdb/dcache.c                                  |  1 -
 gdb/debug.c                                   |  1 -
 gdb/debuginfod-support.c                      |  1 -
 gdb/dicos-tdep.c                              |  1 -
 gdb/dictionary.c                              |  1 -
 gdb/disasm-selftests.c                        |  1 -
 gdb/disasm.c                                  |  1 -
 gdb/displaced-stepping.c                      |  1 -
 gdb/dtrace-probe.c                            |  1 -
 gdb/dummy-frame.c                             |  1 -
 gdb/dwarf2/abbrev-cache.c                     |  1 -
 gdb/dwarf2/abbrev.c                           |  1 -
 gdb/dwarf2/ada-imported.c                     |  1 -
 gdb/dwarf2/aranges.c                          |  1 -
 gdb/dwarf2/attribute.c                        |  1 -
 gdb/dwarf2/comp-unit-head.c                   |  1 -
 gdb/dwarf2/cooked-index.c                     |  1 -
 gdb/dwarf2/cu.c                               |  1 -
 gdb/dwarf2/die.c                              |  1 -
 gdb/dwarf2/dwz.c                              |  1 -
 gdb/dwarf2/expr.c                             |  1 -
 gdb/dwarf2/frame-tailcall.c                   |  1 -
 gdb/dwarf2/frame.c                            |  1 -
 gdb/dwarf2/index-cache.c                      |  1 -
 gdb/dwarf2/index-common.c                     |  1 -
 gdb/dwarf2/index-write.c                      |  1 -
 gdb/dwarf2/leb.c                              |  1 -
 gdb/dwarf2/line-header.c                      |  1 -
 gdb/dwarf2/loc.c                              |  1 -
 gdb/dwarf2/macro.c                            |  1 -
 gdb/dwarf2/read-debug-names.c                 |  1 -
 gdb/dwarf2/read-gdb-index.c                   |  1 -
 gdb/dwarf2/read.c                             |  1 -
 gdb/dwarf2/section.c                          |  1 -
 gdb/dwarf2/stringify.c                        |  1 -
 gdb/elf-none-tdep.c                           |  1 -
 gdb/elfread.c                                 |  1 -
 gdb/eval.c                                    |  1 -
 gdb/event-top.c                               |  1 -
 gdb/exceptions.c                              |  1 -
 gdb/exec.c                                    |  1 -
 gdb/expprint.c                                |  1 -
 gdb/extension.c                               |  1 -
 gdb/f-array-walker.h                          |  1 -
 gdb/f-exp.y                                   |  1 -
 gdb/f-lang.c                                  |  1 -
 gdb/f-typeprint.c                             |  1 -
 gdb/f-valprint.c                              |  1 -
 gdb/fbsd-nat.c                                |  1 -
 gdb/fbsd-tdep.c                               |  1 -
 gdb/features/microblaze-with-stack-protect.c  |  1 -
 gdb/features/microblaze.c                     |  1 -
 gdb/features/mips-dsp-linux.c                 |  1 -
 gdb/features/mips-linux.c                     |  1 -
 gdb/features/mips64-dsp-linux.c               |  1 -
 gdb/features/mips64-linux.c                   |  1 -
 gdb/features/nds32.c                          |  1 -
 gdb/features/nios2.c                          |  1 -
 gdb/features/or1k-linux.c                     |  1 -
 gdb/features/or1k.c                           |  1 -
 gdb/features/rs6000/powerpc-32.c              |  1 -
 gdb/features/rs6000/powerpc-32l.c             |  1 -
 gdb/features/rs6000/powerpc-403.c             |  1 -
 gdb/features/rs6000/powerpc-403gc.c           |  1 -
 gdb/features/rs6000/powerpc-405.c             |  1 -
 gdb/features/rs6000/powerpc-505.c             |  1 -
 gdb/features/rs6000/powerpc-601.c             |  1 -
 gdb/features/rs6000/powerpc-602.c             |  1 -
 gdb/features/rs6000/powerpc-603.c             |  1 -
 gdb/features/rs6000/powerpc-604.c             |  1 -
 gdb/features/rs6000/powerpc-64.c              |  1 -
 gdb/features/rs6000/powerpc-64l.c             |  1 -
 gdb/features/rs6000/powerpc-7400.c            |  1 -
 gdb/features/rs6000/powerpc-750.c             |  1 -
 gdb/features/rs6000/powerpc-860.c             |  1 -
 gdb/features/rs6000/powerpc-altivec32.c       |  1 -
 gdb/features/rs6000/powerpc-altivec32l.c      |  1 -
 gdb/features/rs6000/powerpc-altivec64.c       |  1 -
 gdb/features/rs6000/powerpc-altivec64l.c      |  1 -
 gdb/features/rs6000/powerpc-e500.c            |  1 -
 gdb/features/rs6000/powerpc-e500l.c           |  1 -
 gdb/features/rs6000/powerpc-isa205-32l.c      |  1 -
 gdb/features/rs6000/powerpc-isa205-64l.c      |  1 -
 .../rs6000/powerpc-isa205-altivec32l.c        |  1 -
 .../rs6000/powerpc-isa205-altivec64l.c        |  1 -
 .../rs6000/powerpc-isa205-ppr-dscr-vsx32l.c   |  1 -
 .../rs6000/powerpc-isa205-ppr-dscr-vsx64l.c   |  1 -
 gdb/features/rs6000/powerpc-isa205-vsx32l.c   |  1 -
 gdb/features/rs6000/powerpc-isa205-vsx64l.c   |  1 -
 .../rs6000/powerpc-isa207-htm-vsx32l.c        |  1 -
 .../rs6000/powerpc-isa207-htm-vsx64l.c        |  1 -
 gdb/features/rs6000/powerpc-isa207-vsx32l.c   |  1 -
 gdb/features/rs6000/powerpc-isa207-vsx64l.c   |  1 -
 gdb/features/rs6000/powerpc-vsx32.c           |  1 -
 gdb/features/rs6000/powerpc-vsx32l.c          |  1 -
 gdb/features/rs6000/powerpc-vsx64.c           |  1 -
 gdb/features/rs6000/powerpc-vsx64l.c          |  1 -
 gdb/features/rs6000/rs6000.c                  |  1 -
 gdb/features/rx.c                             |  1 -
 gdb/features/s390-gs-linux64.c                |  1 -
 gdb/features/s390-linux32.c                   |  1 -
 gdb/features/s390-linux32v1.c                 |  1 -
 gdb/features/s390-linux32v2.c                 |  1 -
 gdb/features/s390-linux64.c                   |  1 -
 gdb/features/s390-linux64v1.c                 |  1 -
 gdb/features/s390-linux64v2.c                 |  1 -
 gdb/features/s390-te-linux64.c                |  1 -
 gdb/features/s390-tevx-linux64.c              |  1 -
 gdb/features/s390-vx-linux64.c                |  1 -
 gdb/features/s390x-gs-linux64.c               |  1 -
 gdb/features/s390x-linux64.c                  |  1 -
 gdb/features/s390x-linux64v1.c                |  1 -
 gdb/features/s390x-linux64v2.c                |  1 -
 gdb/features/s390x-te-linux64.c               |  1 -
 gdb/features/s390x-tevx-linux64.c             |  1 -
 gdb/features/s390x-vx-linux64.c               |  1 -
 gdb/features/sparc/sparc32-solaris.c          |  1 -
 gdb/features/sparc/sparc64-solaris.c          |  1 -
 gdb/features/z80.c                            |  1 -
 gdb/filename-seen-cache.c                     |  1 -
 gdb/filename-seen-cache.h                     |  1 -
 gdb/filesystem.c                              |  1 -
 gdb/findcmd.c                                 |  1 -
 gdb/findvar.c                                 |  1 -
 gdb/fork-child.c                              |  1 -
 gdb/frame-base.c                              |  1 -
 gdb/frame-unwind.c                            |  1 -
 gdb/frame.c                                   |  1 -
 gdb/frv-linux-tdep.c                          |  1 -
 gdb/frv-tdep.c                                |  1 -
 gdb/ft32-tdep.c                               |  1 -
 gdb/gcore-elf.c                               |  1 -
 gdb/gcore.c                                   |  1 -
 gdb/gdb-demangle.c                            |  1 -
 gdb/gdb.c                                     |  1 -
 gdb/gdb_bfd.c                                 |  1 -
 gdb/gdbarch-selftests.c                       |  1 -
 gdb/gdbtypes.c                                |  1 -
 gdb/glibc-tdep.c                              |  1 -
 gdb/gmp-utils.c                               |  1 -
 gdb/gnu-nat.c                                 |  1 -
 gdb/gnu-nat.h                                 |  2 -
 gdb/gnu-v2-abi.c                              |  1 -
 gdb/gnu-v3-abi.c                              |  1 -
 gdb/go-exp.y                                  |  1 -
 gdb/go-lang.c                                 |  1 -
 gdb/go-typeprint.c                            |  1 -
 gdb/go-valprint.c                             |  1 -
 gdb/go32-nat.c                                |  1 -
 gdb/guile/guile.c                             |  1 -
 gdb/guile/scm-arch.c                          |  1 -
 gdb/guile/scm-auto-load.c                     |  1 -
 gdb/guile/scm-block.c                         |  1 -
 gdb/guile/scm-breakpoint.c                    |  1 -
 gdb/guile/scm-cmd.c                           |  1 -
 gdb/guile/scm-disasm.c                        |  1 -
 gdb/guile/scm-exception.c                     |  1 -
 gdb/guile/scm-frame.c                         |  1 -
 gdb/guile/scm-gsmob.c                         |  1 -
 gdb/guile/scm-iterator.c                      |  1 -
 gdb/guile/scm-lazy-string.c                   |  1 -
 gdb/guile/scm-math.c                          |  1 -
 gdb/guile/scm-objfile.c                       |  1 -
 gdb/guile/scm-param.c                         |  1 -
 gdb/guile/scm-ports.c                         |  1 -
 gdb/guile/scm-pretty-print.c                  |  1 -
 gdb/guile/scm-progspace.c                     |  1 -
 gdb/guile/scm-safe-call.c                     |  1 -
 gdb/guile/scm-string.c                        |  1 -
 gdb/guile/scm-symbol.c                        |  1 -
 gdb/guile/scm-symtab.c                        |  1 -
 gdb/guile/scm-type.c                          |  1 -
 gdb/guile/scm-utils.c                         |  1 -
 gdb/guile/scm-value.c                         |  1 -
 gdb/h8300-tdep.c                              |  1 -
 gdb/hppa-bsd-tdep.c                           |  1 -
 gdb/hppa-linux-nat.c                          |  1 -
 gdb/hppa-linux-tdep.c                         |  1 -
 gdb/hppa-netbsd-nat.c                         |  1 -
 gdb/hppa-netbsd-tdep.c                        |  1 -
 gdb/hppa-obsd-nat.c                           |  1 -
 gdb/hppa-obsd-tdep.c                          |  1 -
 gdb/hppa-tdep.c                               |  1 -
 gdb/i386-bsd-nat.c                            |  1 -
 gdb/i386-bsd-tdep.c                           |  1 -
 gdb/i386-darwin-nat.c                         |  1 -
 gdb/i386-darwin-tdep.c                        |  1 -
 gdb/i386-dicos-tdep.c                         |  1 -
 gdb/i386-fbsd-nat.c                           |  1 -
 gdb/i386-fbsd-tdep.c                          |  1 -
 gdb/i386-gnu-nat.c                            |  1 -
 gdb/i386-gnu-tdep.c                           |  1 -
 gdb/i386-go32-tdep.c                          |  1 -
 gdb/i386-linux-nat.c                          |  1 -
 gdb/i386-linux-tdep.c                         |  1 -
 gdb/i386-netbsd-nat.c                         |  1 -
 gdb/i386-netbsd-tdep.c                        |  1 -
 gdb/i386-nto-tdep.c                           |  1 -
 gdb/i386-obsd-nat.c                           |  1 -
 gdb/i386-obsd-tdep.c                          |  1 -
 gdb/i386-sol2-nat.c                           |  1 -
 gdb/i386-sol2-tdep.c                          |  1 -
 gdb/i386-tdep.c                               |  1 -
 gdb/i386-windows-nat.c                        |  1 -
 gdb/i386-windows-tdep.c                       |  1 -
 gdb/i387-tdep.c                               |  1 -
 gdb/ia64-libunwind-tdep.c                     |  1 -
 gdb/ia64-linux-nat.c                          |  1 -
 gdb/ia64-linux-tdep.c                         |  1 -
 gdb/ia64-tdep.c                               |  1 -
 gdb/ia64-vms-tdep.c                           |  1 -
 gdb/inf-child.c                               |  1 -
 gdb/inf-loop.c                                |  1 -
 gdb/inf-ptrace.c                              |  1 -
 gdb/infcall.c                                 |  1 -
 gdb/infcmd.c                                  |  1 -
 gdb/inferior.c                                |  1 -
 gdb/inflow.c                                  |  1 -
 gdb/infrun.c                                  |  1 -
 gdb/inline-frame.c                            |  1 -
 gdb/interps.c                                 |  1 -
 gdb/iq2000-tdep.c                             |  1 -
 gdb/jit.c                                     |  1 -
 gdb/language.c                                |  1 -
 gdb/linespec.c                                |  1 -
 gdb/linux-fork.c                              |  1 -
 gdb/linux-nat-trad.c                          |  1 -
 gdb/linux-nat.c                               |  1 -
 gdb/linux-record.c                            |  1 -
 gdb/linux-tdep.c                              |  1 -
 gdb/linux-thread-db.c                         |  1 -
 gdb/lm32-tdep.c                               |  1 -
 gdb/location.c                                |  1 -
 gdb/loongarch-linux-nat.c                     |  1 -
 gdb/loongarch-linux-tdep.c                    |  1 -
 gdb/loongarch-tdep.c                          |  1 -
 gdb/m2-exp.y                                  |  1 -
 gdb/m2-lang.c                                 |  1 -
 gdb/m2-typeprint.c                            |  1 -
 gdb/m2-valprint.c                             |  1 -
 gdb/m32c-tdep.c                               |  1 -
 gdb/m32r-linux-nat.c                          |  1 -
 gdb/m32r-linux-tdep.c                         |  1 -
 gdb/m32r-tdep.c                               |  1 -
 gdb/m68hc11-tdep.c                            |  1 -
 gdb/m68k-bsd-nat.c                            |  1 -
 gdb/m68k-bsd-tdep.c                           |  1 -
 gdb/m68k-linux-nat.c                          |  1 -
 gdb/m68k-linux-tdep.c                         |  1 -
 gdb/m68k-tdep.c                               |  1 -
 gdb/machoread.c                               |  1 -
 gdb/macrocmd.c                                |  1 -
 gdb/macroexp.c                                |  1 -
 gdb/macroscope.c                              |  1 -
 gdb/macrotab.c                                |  1 -
 gdb/main.c                                    |  1 -
 gdb/maint-test-options.c                      |  1 -
 gdb/maint-test-settings.c                     |  1 -
 gdb/maint.c                                   |  1 -
 gdb/make-init-c                               |  1 -
 gdb/mdebugread.c                              |  1 -
 gdb/mem-break.c                               |  1 -
 gdb/memattr.c                                 |  1 -
 gdb/memory-map.c                              |  1 -
 gdb/memrange.c                                |  1 -
 gdb/memtag.c                                  |  1 -
 gdb/mep-tdep.c                                |  1 -
 gdb/mi/mi-cmd-break.c                         |  1 -
 gdb/mi/mi-cmd-catch.c                         |  1 -
 gdb/mi/mi-cmd-disas.c                         |  1 -
 gdb/mi/mi-cmd-env.c                           |  1 -
 gdb/mi/mi-cmd-file.c                          |  1 -
 gdb/mi/mi-cmd-info.c                          |  1 -
 gdb/mi/mi-cmd-stack.c                         |  1 -
 gdb/mi/mi-cmd-target.c                        |  1 -
 gdb/mi/mi-cmd-var.c                           |  1 -
 gdb/mi/mi-cmds.c                              |  1 -
 gdb/mi/mi-common.c                            |  1 -
 gdb/mi/mi-console.c                           |  1 -
 gdb/mi/mi-getopt.c                            |  1 -
 gdb/mi/mi-interp.c                            |  1 -
 gdb/mi/mi-main.c                              |  1 -
 gdb/mi/mi-out.c                               |  1 -
 gdb/mi/mi-parse.c                             |  1 -
 gdb/mi/mi-symbol-cmds.c                       |  1 -
 gdb/microblaze-linux-tdep.c                   |  1 -
 gdb/microblaze-tdep.c                         |  1 -
 gdb/mingw-hdep.c                              |  1 -
 gdb/minidebug.c                               |  1 -
 gdb/minsyms.c                                 |  1 -
 gdb/mips-fbsd-nat.c                           |  1 -
 gdb/mips-fbsd-tdep.c                          |  1 -
 gdb/mips-linux-nat.c                          |  1 -
 gdb/mips-linux-tdep.c                         |  1 -
 gdb/mips-netbsd-nat.c                         |  1 -
 gdb/mips-netbsd-tdep.c                        |  1 -
 gdb/mips-sde-tdep.c                           |  1 -
 gdb/mips-tdep.c                               |  1 -
 gdb/mips64-obsd-nat.c                         |  1 -
 gdb/mips64-obsd-tdep.c                        |  1 -
 gdb/mipsread.c                                |  1 -
 gdb/mn10300-linux-tdep.c                      |  1 -
 gdb/mn10300-tdep.c                            |  1 -
 gdb/moxie-tdep.c                              |  1 -
 gdb/msp430-tdep.c                             |  1 -
 gdb/namespace.c                               |  1 -
 gdb/nat/aarch64-hw-point.c                    |  1 -
 gdb/nat/aarch64-linux-hw-point.c              |  1 -
 gdb/nat/aarch64-linux.c                       |  1 -
 gdb/nat/aarch64-mte-linux-ptrace.c            |  1 -
 gdb/nat/aarch64-scalable-linux-ptrace.c       |  1 -
 gdb/nat/amd64-linux-siginfo.c                 |  1 -
 gdb/nat/fork-inferior.c                       |  1 -
 gdb/nat/linux-btrace.c                        |  1 -
 gdb/nat/linux-namespaces.c                    |  1 -
 gdb/nat/linux-osdata.c                        |  1 -
 gdb/nat/linux-personality.c                   |  1 -
 gdb/nat/linux-procfs.c                        |  1 -
 gdb/nat/linux-ptrace.c                        |  1 -
 gdb/nat/linux-waitpid.c                       |  1 -
 gdb/nat/mips-linux-watch.c                    |  1 -
 gdb/nat/netbsd-nat.c                          |  1 -
 gdb/nat/ppc-linux.c                           |  1 -
 gdb/nat/riscv-linux-tdesc.c                   |  1 -
 gdb/nat/windows-nat.c                         |  1 -
 gdb/nat/x86-dregs.c                           |  1 -
 gdb/nat/x86-linux-dregs.c                     |  1 -
 gdb/nat/x86-linux.c                           |  1 -
 gdb/nat/x86-xstate.c                          |  1 -
 gdb/nds32-tdep.c                              |  1 -
 gdb/netbsd-nat.c                              |  1 -
 gdb/netbsd-tdep.c                             |  1 -
 gdb/nios2-linux-tdep.c                        |  1 -
 gdb/nios2-tdep.c                              |  1 -
 gdb/nto-procfs.c                              |  1 -
 gdb/nto-tdep.c                                |  1 -
 gdb/objc-lang.c                               |  1 -
 gdb/objfiles.c                                |  1 -
 gdb/obsd-nat.c                                |  1 -
 gdb/obsd-tdep.c                               |  1 -
 gdb/observable.c                              |  1 -
 gdb/opencl-lang.c                             |  1 -
 gdb/or1k-linux-nat.c                          |  1 -
 gdb/or1k-linux-tdep.c                         |  1 -
 gdb/or1k-tdep.c                               |  1 -
 gdb/osabi.c                                   |  1 -
 gdb/osdata.c                                  |  1 -
 gdb/p-exp.y                                   |  1 -
 gdb/p-lang.c                                  |  1 -
 gdb/p-typeprint.c                             |  1 -
 gdb/p-valprint.c                              |  1 -
 gdb/parse.c                                   |  1 -
 gdb/posix-hdep.c                              |  1 -
 gdb/ppc-fbsd-nat.c                            |  1 -
 gdb/ppc-fbsd-tdep.c                           |  1 -
 gdb/ppc-linux-nat.c                           |  1 -
 gdb/ppc-linux-tdep.c                          |  1 -
 gdb/ppc-netbsd-nat.c                          |  1 -
 gdb/ppc-netbsd-tdep.c                         |  1 -
 gdb/ppc-obsd-nat.c                            |  1 -
 gdb/ppc-obsd-tdep.c                           |  1 -
 gdb/ppc-ravenscar-thread.c                    |  1 -
 gdb/ppc-sysv-tdep.c                           |  1 -
 gdb/ppc64-tdep.c                              |  1 -
 gdb/printcmd.c                                |  1 -
 gdb/probe.c                                   |  1 -
 gdb/proc-api.c                                |  1 -
 gdb/proc-events.c                             |  1 -
 gdb/proc-flags.c                              |  1 -
 gdb/proc-service.c                            |  1 -
 gdb/proc-why.c                                |  1 -
 gdb/process-stratum-target.c                  |  1 -
 gdb/procfs.c                                  |  1 -
 gdb/producer.c                                |  1 -
 gdb/progspace-and-thread.c                    |  1 -
 gdb/progspace.c                               |  1 -
 gdb/prologue-value.c                          |  1 -
 gdb/psymtab.c                                 |  1 -
 gdb/python/py-arch.c                          |  1 -
 gdb/python/py-auto-load.c                     |  1 -
 gdb/python/py-block.c                         |  1 -
 gdb/python/py-bpevent.c                       |  1 -
 gdb/python/py-breakpoint.c                    |  1 -
 gdb/python/py-cmd.c                           |  1 -
 gdb/python/py-connection.c                    |  1 -
 gdb/python/py-continueevent.c                 |  1 -
 gdb/python/py-dap.c                           |  1 -
 gdb/python/py-disasm.c                        |  1 -
 gdb/python/py-event.c                         |  1 -
 gdb/python/py-evtregistry.c                   |  1 -
 gdb/python/py-evts.c                          |  1 -
 gdb/python/py-exitedevent.c                   |  1 -
 gdb/python/py-finishbreakpoint.c              |  1 -
 gdb/python/py-frame.c                         |  1 -
 gdb/python/py-framefilter.c                   |  1 -
 gdb/python/py-function.c                      |  1 -
 gdb/python/py-gdb-readline.c                  |  1 -
 gdb/python/py-inferior.c                      |  1 -
 gdb/python/py-infevents.c                     |  1 -
 gdb/python/py-infthread.c                     |  1 -
 gdb/python/py-instruction.c                   |  1 -
 gdb/python/py-lazy-string.c                   |  1 -
 gdb/python/py-linetable.c                     |  1 -
 gdb/python/py-membuf.c                        |  1 -
 gdb/python/py-mi.c                            |  1 -
 gdb/python/py-micmd.c                         |  1 -
 gdb/python/py-newobjfileevent.c               |  1 -
 gdb/python/py-objfile.c                       |  1 -
 gdb/python/py-param.c                         |  1 -
 gdb/python/py-prettyprint.c                   |  1 -
 gdb/python/py-progspace.c                     |  1 -
 gdb/python/py-record-btrace.c                 |  1 -
 gdb/python/py-record-full.c                   |  1 -
 gdb/python/py-record.c                        |  1 -
 gdb/python/py-registers.c                     |  1 -
 gdb/python/py-signalevent.c                   |  1 -
 gdb/python/py-stopevent.c                     |  1 -
 gdb/python/py-symbol.c                        |  1 -
 gdb/python/py-symtab.c                        |  1 -
 gdb/python/py-threadevent.c                   |  1 -
 gdb/python/py-tui.c                           |  1 -
 gdb/python/py-type.c                          |  1 -
 gdb/python/py-unwind.c                        |  1 -
 gdb/python/py-utils.c                         |  1 -
 gdb/python/py-value.c                         |  1 -
 gdb/python/py-varobj.c                        |  1 -
 gdb/python/py-xmethods.c                      |  1 -
 gdb/python/python.c                           |  1 -
 gdb/ravenscar-thread.c                        |  1 -
 gdb/record-btrace.c                           |  1 -
 gdb/record-full.c                             |  1 -
 gdb/record.c                                  |  1 -
 gdb/regcache-dump.c                           |  1 -
 gdb/regcache.c                                |  1 -
 gdb/regformats/regdat.sh                      |  1 -
 gdb/reggroups.c                               |  1 -
 gdb/remote-fileio.c                           |  1 -
 gdb/remote-notif.c                            |  1 -
 gdb/remote-sim.c                              |  1 -
 gdb/remote.c                                  |  1 -
 gdb/reverse.c                                 |  1 -
 gdb/riscv-fbsd-nat.c                          |  1 -
 gdb/riscv-fbsd-tdep.c                         |  1 -
 gdb/riscv-linux-nat.c                         |  1 -
 gdb/riscv-linux-tdep.c                        |  1 -
 gdb/riscv-none-tdep.c                         |  1 -
 gdb/riscv-ravenscar-thread.c                  |  1 -
 gdb/riscv-tdep.c                              |  2 -
 gdb/rl78-tdep.c                               |  1 -
 gdb/rs6000-aix-nat.c                          |  1 -
 gdb/rs6000-aix-tdep.c                         |  1 -
 gdb/rs6000-lynx178-tdep.c                     |  1 -
 gdb/rs6000-tdep.c                             |  1 -
 gdb/run-on-main-thread.c                      |  1 -
 gdb/rust-lang.c                               |  1 -
 gdb/rust-parse.c                              |  1 -
 gdb/rx-tdep.c                                 |  1 -
 gdb/s12z-tdep.c                               |  1 -
 gdb/s390-linux-nat.c                          |  1 -
 gdb/s390-linux-tdep.c                         |  1 -
 gdb/s390-tdep.c                               |  1 -
 gdb/selftest-arch.c                           |  1 -
 gdb/sentinel-frame.c                          |  1 -
 gdb/ser-base.c                                |  1 -
 gdb/ser-event.c                               |  1 -
 gdb/ser-go32.c                                |  1 -
 gdb/ser-mingw.c                               |  1 -
 gdb/ser-pipe.c                                |  1 -
 gdb/ser-tcp.c                                 |  1 -
 gdb/ser-uds.c                                 |  1 -
 gdb/ser-unix.c                                |  1 -
 gdb/serial.c                                  |  1 -
 gdb/sh-linux-tdep.c                           |  1 -
 gdb/sh-netbsd-nat.c                           |  1 -
 gdb/sh-netbsd-tdep.c                          |  1 -
 gdb/sh-tdep.c                                 |  1 -
 gdb/skip.c                                    |  1 -
 gdb/sol-thread.c                              |  1 -
 gdb/sol2-tdep.c                               |  1 -
 gdb/solib-aix.c                               |  1 -
 gdb/solib-darwin.c                            |  1 -
 gdb/solib-dsbt.c                              |  1 -
 gdb/solib-frv.c                               |  1 -
 gdb/solib-rocm.c                              |  1 -
 gdb/solib-svr4.c                              |  1 -
 gdb/solib-target.c                            |  1 -
 gdb/solib.c                                   |  1 -
 gdb/source-cache.c                            |  1 -
 gdb/source.c                                  |  1 -
 gdb/sparc-linux-nat.c                         |  1 -
 gdb/sparc-linux-tdep.c                        |  1 -
 gdb/sparc-nat.c                               |  1 -
 gdb/sparc-netbsd-nat.c                        |  1 -
 gdb/sparc-netbsd-tdep.c                       |  1 -
 gdb/sparc-obsd-tdep.c                         |  1 -
 gdb/sparc-ravenscar-thread.c                  |  1 -
 gdb/sparc-sol2-nat.c                          |  1 -
 gdb/sparc-sol2-tdep.c                         |  1 -
 gdb/sparc-tdep.c                              |  1 -
 gdb/sparc64-fbsd-nat.c                        |  1 -
 gdb/sparc64-fbsd-tdep.c                       |  1 -
 gdb/sparc64-linux-nat.c                       |  1 -
 gdb/sparc64-linux-tdep.c                      |  1 -
 gdb/sparc64-nat.c                             |  1 -
 gdb/sparc64-netbsd-nat.c                      |  1 -
 gdb/sparc64-netbsd-tdep.c                     |  1 -
 gdb/sparc64-obsd-nat.c                        |  1 -
 gdb/sparc64-obsd-tdep.c                       |  1 -
 gdb/sparc64-sol2-tdep.c                       |  1 -
 gdb/sparc64-tdep.c                            |  1 -
 gdb/split-name.c                              |  1 -
 gdb/stabsread.c                               |  1 -
 gdb/stack.c                                   |  1 -
 gdb/stap-probe.c                              |  1 -
 gdb/std-regs.c                                |  1 -
 gdb/stub-termcap.c                            |  1 -
 gdb/symfile-debug.c                           |  1 -
 gdb/symfile-mem.c                             |  1 -
 gdb/symfile.c                                 |  1 -
 gdb/symmisc.c                                 |  1 -
 gdb/symtab.c                                  |  1 -
 gdb/target-connection.c                       |  1 -
 gdb/target-dcache.c                           |  1 -
 gdb/target-descriptions.c                     |  2 -
 gdb/target-float.c                            |  1 -
 gdb/target-memory.c                           |  1 -
 gdb/target.c                                  |  1 -
 gdb/target/target.c                           |  1 -
 gdb/target/waitstatus.c                       |  1 -
 gdb/test-target.c                             |  1 -
 gdb/thread-iter.c                             |  1 -
 gdb/thread.c                                  |  1 -
 gdb/tic6x-linux-tdep.c                        |  1 -
 gdb/tic6x-tdep.c                              |  1 -
 gdb/tid-parse.c                               |  1 -
 gdb/tilegx-linux-nat.c                        |  1 -
 gdb/tilegx-linux-tdep.c                       |  1 -
 gdb/tilegx-tdep.c                             |  1 -
 gdb/top.c                                     |  1 -
 gdb/tracectf.c                                |  1 -
 gdb/tracefile-tfile.c                         |  1 -
 gdb/tracefile.c                               |  1 -
 gdb/tracepoint.c                              |  1 -
 gdb/trad-frame.c                              |  1 -
 gdb/tramp-frame.c                             |  1 -
 gdb/tui/tui-command.c                         |  1 -
 gdb/tui/tui-data.c                            |  1 -
 gdb/tui/tui-disasm.c                          |  1 -
 gdb/tui/tui-file.c                            |  1 -
 gdb/tui/tui-hooks.c                           |  1 -
 gdb/tui/tui-interp.c                          |  1 -
 gdb/tui/tui-io.c                              |  1 -
 gdb/tui/tui-layout.c                          |  1 -
 gdb/tui/tui-location.c                        |  1 -
 gdb/tui/tui-regs.c                            |  1 -
 gdb/tui/tui-source.c                          |  1 -
 gdb/tui/tui-status.c                          |  1 -
 gdb/tui/tui-win.c                             |  1 -
 gdb/tui/tui-wingeneral.c                      |  1 -
 gdb/tui/tui-winsource.c                       |  1 -
 gdb/tui/tui.c                                 |  1 -
 gdb/type-stack.c                              |  1 -
 gdb/typeprint.c                               |  1 -
 gdb/ui-file.c                                 |  1 -
 gdb/ui-out.c                                  |  1 -
 gdb/ui-style.c                                |  1 -
 gdb/ui.c                                      |  1 -
 gdb/unittests/array-view-selftests.c          |  1 -
 gdb/unittests/child-path-selftests.c          |  1 -
 gdb/unittests/cli-utils-selftests.c           |  1 -
 gdb/unittests/command-def-selftests.c         |  1 -
 gdb/unittests/common-utils-selftests.c        |  1 -
 gdb/unittests/copy_bitwise-selftests.c        |  1 -
 gdb/unittests/enum-flags-selftests.c          |  1 -
 gdb/unittests/environ-selftests.c             |  1 -
 gdb/unittests/filtered_iterator-selftests.c   |  1 -
 gdb/unittests/format_pieces-selftests.c       |  1 -
 gdb/unittests/frame_info_ptr-selftests.c      |  1 -
 gdb/unittests/function-view-selftests.c       |  1 -
 gdb/unittests/gdb_tilde_expand-selftests.c    |  1 -
 gdb/unittests/gmp-utils-selftests.c           |  1 -
 gdb/unittests/intrusive_list-selftests.c      |  1 -
 gdb/unittests/lookup_name_info-selftests.c    |  1 -
 gdb/unittests/main-thread-selftests.c         |  1 -
 gdb/unittests/memory-map-selftests.c          |  1 -
 gdb/unittests/memrange-selftests.c            |  1 -
 gdb/unittests/mkdir-recursive-selftests.c     |  1 -
 gdb/unittests/observable-selftests.c          |  1 -
 gdb/unittests/offset-type-selftests.c         |  1 -
 gdb/unittests/packed-selftests.c              |  1 -
 gdb/unittests/parallel-for-selftests.c        |  1 -
 .../parse-connection-spec-selftests.c         |  1 -
 gdb/unittests/path-join-selftests.c           |  1 -
 gdb/unittests/ptid-selftests.c                |  1 -
 gdb/unittests/rsp-low-selftests.c             |  1 -
 gdb/unittests/scoped_fd-selftests.c           |  1 -
 .../scoped_ignore_signal-selftests.c          |  1 -
 gdb/unittests/scoped_mmap-selftests.c         |  1 -
 gdb/unittests/scoped_restore-selftests.c      |  1 -
 gdb/unittests/search-memory-selftests.c       |  1 -
 gdb/unittests/style-selftests.c               |  1 -
 gdb/unittests/tracepoint-selftests.c          |  1 -
 gdb/unittests/tui-selftests.c                 |  1 -
 gdb/unittests/ui-file-selftests.c             |  1 -
 gdb/unittests/unique_xmalloc_ptr_char.c       |  1 -
 gdb/unittests/unpack-selftests.c              |  1 -
 gdb/unittests/utils-selftests.c               |  1 -
 gdb/unittests/vec-utils-selftests.c           |  1 -
 gdb/unittests/xml-utils-selftests.c           |  1 -
 gdb/user-regs.c                               |  1 -
 gdb/utils.c                                   |  1 -
 gdb/v850-tdep.c                               |  1 -
 gdb/valarith.c                                |  1 -
 gdb/valops.c                                  |  1 -
 gdb/valprint.c                                |  1 -
 gdb/value.c                                   |  1 -
 gdb/varobj.c                                  |  1 -
 gdb/vax-bsd-nat.c                             |  1 -
 gdb/vax-netbsd-tdep.c                         |  1 -
 gdb/vax-tdep.c                                |  1 -
 gdb/windows-nat.c                             |  1 -
 gdb/windows-tdep.c                            |  1 -
 gdb/x86-bsd-nat.c                             |  1 -
 gdb/x86-fbsd-nat.c                            |  1 -
 gdb/x86-linux-nat.c                           |  1 -
 gdb/x86-nat.c                                 |  1 -
 gdb/x86-tdep.c                                |  1 -
 gdb/xcoffread.c                               |  1 -
 gdb/xml-support.c                             |  1 -
 gdb/xml-syscall.c                             |  1 -
 gdb/xml-tdesc.c                               |  1 -
 gdb/xstormy16-tdep.c                          |  1 -
 gdb/xtensa-config.c                           |  1 -
 gdb/xtensa-linux-nat.c                        |  1 -
 gdb/xtensa-linux-tdep.c                       |  1 -
 gdb/xtensa-tdep.c                             |  1 -
 gdb/z80-tdep.c                                |  1 -
 gdbserver/Makefile.in                         | 58 ++++++++++++++-----
 gdbserver/ax.cc                               |  1 -
 gdbserver/debug.cc                            |  1 -
 gdbserver/dll.cc                              |  1 -
 gdbserver/fork-child.cc                       |  1 -
 gdbserver/gdbreplay.cc                        |  2 -
 gdbserver/hostio.cc                           |  1 -
 gdbserver/i387-fp.cc                          |  1 -
 gdbserver/inferiors.cc                        |  1 -
 gdbserver/linux-aarch32-low.cc                |  1 -
 gdbserver/linux-aarch32-tdesc.cc              |  1 -
 gdbserver/linux-aarch64-ipa.cc                |  1 -
 gdbserver/linux-aarch64-low.cc                |  1 -
 gdbserver/linux-aarch64-tdesc.cc              |  1 -
 gdbserver/linux-amd64-ipa.cc                  |  1 -
 gdbserver/linux-arc-low.cc                    |  1 -
 gdbserver/linux-arm-low.cc                    |  1 -
 gdbserver/linux-arm-tdesc.cc                  |  1 -
 gdbserver/linux-csky-low.cc                   |  1 -
 gdbserver/linux-i386-ipa.cc                   |  1 -
 gdbserver/linux-ia64-low.cc                   |  1 -
 gdbserver/linux-loongarch-low.cc              |  1 -
 gdbserver/linux-low.cc                        |  1 -
 gdbserver/linux-m68k-low.cc                   |  1 -
 gdbserver/linux-mips-low.cc                   |  1 -
 gdbserver/linux-nios2-low.cc                  |  1 -
 gdbserver/linux-or1k-low.cc                   |  1 -
 gdbserver/linux-ppc-ipa.cc                    |  1 -
 gdbserver/linux-ppc-low.cc                    |  1 -
 gdbserver/linux-riscv-low.cc                  |  1 -
 gdbserver/linux-s390-ipa.cc                   |  1 -
 gdbserver/linux-s390-low.cc                   |  1 -
 gdbserver/linux-sh-low.cc                     |  1 -
 gdbserver/linux-sparc-low.cc                  |  1 -
 gdbserver/linux-tic6x-low.cc                  |  1 -
 gdbserver/linux-x86-low.cc                    |  1 -
 gdbserver/linux-x86-tdesc.cc                  |  1 -
 gdbserver/linux-xtensa-low.cc                 |  1 -
 gdbserver/mem-break.cc                        |  1 -
 gdbserver/netbsd-aarch64-low.cc               |  1 -
 gdbserver/netbsd-amd64-low.cc                 |  1 -
 gdbserver/netbsd-i386-low.cc                  |  1 -
 gdbserver/netbsd-low.cc                       |  1 -
 gdbserver/notif.cc                            |  1 -
 gdbserver/proc-service.cc                     |  1 -
 gdbserver/regcache.cc                         |  1 -
 gdbserver/remote-utils.cc                     |  1 -
 gdbserver/server.cc                           |  1 -
 gdbserver/symbol.cc                           |  1 -
 gdbserver/target.cc                           |  1 -
 gdbserver/tdesc.cc                            |  1 -
 gdbserver/thread-db.cc                        |  1 -
 gdbserver/tracepoint.cc                       |  1 -
 gdbserver/utils.cc                            |  1 -
 gdbserver/win32-i386-low.cc                   |  1 -
 gdbserver/win32-low.cc                        |  1 -
 gdbserver/x86-low.cc                          |  1 -
 gdbsupport/Makefile.am                        | 16 +++--
 gdbsupport/Makefile.in                        | 16 +++--
 gdbsupport/agent.cc                           |  1 -
 gdbsupport/btrace-common.cc                   |  1 -
 gdbsupport/cleanups.cc                        |  1 -
 gdbsupport/common-debug.cc                    |  1 -
 gdbsupport/common-exceptions.cc               |  1 -
 gdbsupport/common-inferior.cc                 |  1 -
 gdbsupport/common-regcache.cc                 |  1 -
 gdbsupport/common-utils.cc                    |  1 -
 gdbsupport/environ.cc                         |  1 -
 gdbsupport/errors.cc                          |  1 -
 gdbsupport/event-loop.cc                      |  1 -
 gdbsupport/event-pipe.cc                      |  1 -
 gdbsupport/fileio.cc                          |  1 -
 gdbsupport/filestuff.cc                       |  1 -
 gdbsupport/format.cc                          |  1 -
 gdbsupport/gdb-dlfcn.cc                       |  1 -
 gdbsupport/gdb-hashtab.cc                     |  1 -
 gdbsupport/gdb_obstack.cc                     |  1 -
 gdbsupport/gdb_regex.cc                       |  1 -
 gdbsupport/gdb_tilde_expand.cc                |  1 -
 gdbsupport/gdb_vecs.cc                        |  1 -
 gdbsupport/gdb_wait.cc                        |  1 -
 gdbsupport/job-control.cc                     |  1 -
 gdbsupport/netstuff.cc                        |  1 -
 gdbsupport/new-op.cc                          |  1 -
 gdbsupport/pathstuff.cc                       |  1 -
 gdbsupport/print-utils.cc                     |  1 -
 gdbsupport/ptid.cc                            |  1 -
 gdbsupport/rsp-low.cc                         |  1 -
 gdbsupport/run-time-clock.cc                  |  1 -
 gdbsupport/safe-strerror.cc                   |  1 -
 gdbsupport/scoped_mmap.cc                     |  1 -
 gdbsupport/search.cc                          |  1 -
 gdbsupport/selftest.cc                        |  1 -
 gdbsupport/signals-state-save-restore.cc      |  1 -
 gdbsupport/signals.cc                         |  1 -
 gdbsupport/task-group.cc                      |  1 -
 gdbsupport/tdesc.cc                           |  1 -
 gdbsupport/thread-pool.cc                     |  1 -
 gdbsupport/xml-utils.cc                       |  1 -
 896 files changed, 105 insertions(+), 938 deletions(-)


base-commit: 56f703d39d6f4793ba73b2364a4ea052e8ad755d
-- 
2.44.0


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH v3 1/4] gdb, gdbserver, gdbsupport: reformat some Makefile variables, one entry per line
  2024-03-26 19:06 [PATCH v3 0/4] Include early include files with `-include` Simon Marchi
@ 2024-03-26 19:06 ` Simon Marchi
  2024-03-26 19:06 ` [PATCH v3 2/4] {gdb, gdbserver}/Makefile.in: remove unnecessary intermediary variables Simon Marchi
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 8+ messages in thread
From: Simon Marchi @ 2024-03-26 19:06 UTC (permalink / raw)
  To: gdb-patches; +Cc: Simon Marchi

Reformat some variables definitions.  I think it makes them easier to
read, and it also makes diffs clearer.

Change-Id: I82f63ba0e6d0fe268eb1f1ad5ab22c3cd016ab02
---
 gdb/Makefile.in        | 39 ++++++++++++++++++++++++--------
 gdbserver/Makefile.in  | 50 ++++++++++++++++++++++++++++++++----------
 gdbsupport/Makefile.am | 15 +++++++++----
 gdbsupport/Makefile.in | 15 +++++++++----
 4 files changed, 90 insertions(+), 29 deletions(-)

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 331620375aed..bf57a9a3e62e 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -260,7 +260,9 @@ LIBBACKTRACE_LIB=@LIBBACKTRACE_LIB@
 
 SUPPORT = ../gdbsupport
 LIBSUPPORT = $(SUPPORT)/libgdbsupport.a
-INCSUPPORT = -I$(srcdir)/.. -I..
+INCSUPPORT = \
+	-I$(srcdir)/.. \
+	-I..
 
 #
 # CLI sub directory definitons
@@ -601,8 +603,12 @@ CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR))
 # your system doesn't have fcntl.h in /usr/include (which is where it
 # should be according to Posix).
 DEFS = @DEFS@
-GDB_CFLAGS = -I. -I$(srcdir) -I$(srcdir)/config \
-	-DLOCALEDIR="\"$(localedir)\"" $(DEFS)
+GDB_CFLAGS = \
+	-I. \
+	-I$(srcdir) \
+	-I$(srcdir)/config \
+	-DLOCALEDIR="\"$(localedir)\"" \
+	$(DEFS)
 
 # MH_CFLAGS, if defined, has host-dependent CFLAGS from the config directory.
 GLOBAL_CFLAGS = $(MH_CFLAGS)
@@ -626,12 +632,27 @@ INTERNAL_CPPFLAGS = $(CPPFLAGS) @GUILE_CPPFLAGS@ @PYTHON_CPPFLAGS@ \
 
 # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
 INTERNAL_CFLAGS_BASE = \
-	$(GLOBAL_CFLAGS) $(PROFILE_CFLAGS) \
-	$(GDB_CFLAGS) $(OPCODES_CFLAGS) $(BFD_CFLAGS) $(INCLUDE_CFLAGS) \
-	$(READLINE_CFLAGS) $(ZLIBINC) $(ZSTD_CFLAGS) $(LIBDECNUMBER_CFLAGS) \
-	$(INTL_CFLAGS) $(INCGNU) $(INCSUPPORT) $(LIBBACKTRACE_INC) \
-	$(ENABLE_CFLAGS) $(INTERNAL_CPPFLAGS) $(SRCHIGH_CFLAGS) \
-	$(TOP_CFLAGS) $(PTHREAD_CFLAGS) $(DEBUGINFOD_CFLAGS) $(GMPINC) \
+	$(GLOBAL_CFLAGS) \
+	$(PROFILE_CFLAGS) \
+	$(GDB_CFLAGS) \
+	$(OPCODES_CFLAGS) \
+	$(BFD_CFLAGS) \
+	$(INCLUDE_CFLAGS) \
+	$(READLINE_CFLAGS) \
+	$(ZLIBINC) \
+	$(ZSTD_CFLAGS) \
+	$(LIBDECNUMBER_CFLAGS) \
+	$(INTL_CFLAGS) \
+	$(INCGNU) \
+	$(INCSUPPORT) \
+	$(LIBBACKTRACE_INC) \
+	$(ENABLE_CFLAGS) \
+	$(INTERNAL_CPPFLAGS) \
+	$(SRCHIGH_CFLAGS) \
+	$(TOP_CFLAGS) \
+	$(PTHREAD_CFLAGS) \
+	$(DEBUGINFOD_CFLAGS) \
+	$(GMPINC) \
 	$(AMD_DBGAPI_CFLAGS)
 INTERNAL_WARN_CFLAGS = $(INTERNAL_CFLAGS_BASE) $(GDB_WARN_CFLAGS)
 INTERNAL_CFLAGS = $(INTERNAL_WARN_CFLAGS) $(GDB_WERROR_CFLAGS)
diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
index c7120895a26d..3aa7aa760eaf 100644
--- a/gdbserver/Makefile.in
+++ b/gdbserver/Makefile.in
@@ -114,7 +114,9 @@ INTL = @LIBINTL@
 INTL_DEPS = @LIBINTL_DEP@
 INTL_CFLAGS = @INCINTL@
 
-INCSUPPORT = -I$(srcdir)/.. -I..
+INCSUPPORT = \
+	-I$(srcdir)/.. \
+	-I..
 
 # All the includes used for CFLAGS and for lint.
 # -I. for config files.
@@ -125,9 +127,15 @@ INCSUPPORT = -I$(srcdir)/.. -I..
 # in those directories should be included with the subdirectory.
 # e.g.: "target/wait.h".
 #
-INCLUDE_CFLAGS = -I. -I${srcdir} \
-	-I$(srcdir)/../gdb/regformats -I$(srcdir)/.. -I$(INCLUDE_DIR) \
-	-I$(srcdir)/../gdb $(INCGNU) $(INCSUPPORT) \
+INCLUDE_CFLAGS = \
+	-I. \
+	-I${srcdir} \
+	-I$(srcdir)/../gdb/regformats \
+	-I$(srcdir)/.. \
+	-I$(INCLUDE_DIR) \
+	-I$(srcdir)/../gdb \
+	$(INCGNU) \
+	$(INCSUPPORT) \
 	$(INTL_CFLAGS)
 
 # M{H,T}_CFLAGS, if defined, has host- and target-dependent CFLAGS
@@ -155,10 +163,21 @@ WIN32APILIBS = @WIN32APILIBS@
 MAYBE_LIBICONV = @MAYBE_LIBICONV@
 
 # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
-INTERNAL_CFLAGS_BASE = ${GLOBAL_CFLAGS} \
-	${PROFILE_CFLAGS} ${INCLUDE_CFLAGS} ${CPPFLAGS} $(PTHREAD_CFLAGS)
-INTERNAL_WARN_CFLAGS = ${INTERNAL_CFLAGS_BASE} $(WARN_CFLAGS)
-INTERNAL_CFLAGS = ${INTERNAL_WARN_CFLAGS} $(WERROR_CFLAGS) -DGDBSERVER
+INTERNAL_CFLAGS_BASE = \
+	${GLOBAL_CFLAGS} \
+	${PROFILE_CFLAGS} \
+	${INCLUDE_CFLAGS} \
+	${CPPFLAGS} \
+	$(PTHREAD_CFLAGS)
+
+INTERNAL_WARN_CFLAGS = \
+	${INTERNAL_CFLAGS_BASE} \
+	$(WARN_CFLAGS)
+
+INTERNAL_CFLAGS = \
+	${INTERNAL_WARN_CFLAGS} \
+	$(WERROR_CFLAGS) \
+	-DGDBSERVER
 
 # LDFLAGS is specifically reserved for setting from the command line
 # when running make.
@@ -472,17 +491,24 @@ MAKEOVERRIDES =
 
 regdat_sh = $(srcdir)/../gdb/regformats/regdat.sh
 
-UST_CFLAGS = $(ustinc) -DCONFIG_UST_GDB_INTEGRATION
+UST_CFLAGS = \
+	$(ustinc) \
+	-DCONFIG_UST_GDB_INTEGRATION
 
 # Undo gnulib replacements for the IPA shared library build.
 # The gnulib headers are still needed, but gnulib is not linked
 # into the IPA lib so replacement apis don't work.
-UNDO_GNULIB_CFLAGS = -Drpl_strerror_r=strerror_r -Drpl_free=free \
-	-Drpl_malloc=malloc -Drpl_realloc=realloc
+UNDO_GNULIB_CFLAGS = \
+	-Drpl_strerror_r=strerror_r \
+	-Drpl_free=free \
+	-Drpl_malloc=malloc \
+	-Drpl_realloc=realloc
 
 # Note, we only build the IPA if -fvisibility=hidden is supported in
 # the first place.
-IPAGENT_CFLAGS = $(INTERNAL_CFLAGS) $(UST_CFLAGS) \
+IPAGENT_CFLAGS = \
+	$(INTERNAL_CFLAGS) \
+	$(UST_CFLAGS) \
 	$(UNDO_GNULIB_CFLAGS) \
 	-fPIC -DIN_PROCESS_AGENT \
 	-fvisibility=hidden
diff --git a/gdbsupport/Makefile.am b/gdbsupport/Makefile.am
index 88414b4c927a..7c360aa413ef 100644
--- a/gdbsupport/Makefile.am
+++ b/gdbsupport/Makefile.am
@@ -25,10 +25,17 @@ ACLOCAL_AMFLAGS = -I . -I ../config
 # ZW_GNU_GETTEXT_SISTER_DIR, but doesn't have any translations (currently).
 SUBDIRS =
 
-AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir)/../gdb \
-    -I../gnulib/import -I$(srcdir)/../gnulib/import \
-    -I.. -I$(srcdir)/.. $(INCINTL) -I../bfd -I$(srcdir)/../bfd \
-    @LARGEFILE_CPPFLAGS@
+AM_CPPFLAGS = \
+	-I$(srcdir)/../include \
+	-I$(srcdir)/../gdb \
+	-I../gnulib/import \
+	-I$(srcdir)/../gnulib/import \
+	-I.. \
+	-I$(srcdir)/.. \
+	$(INCINTL) \
+	-I../bfd \
+	-I$(srcdir)/../bfd \
+	@LARGEFILE_CPPFLAGS@
 
 override CXX += $(CXX_DIALECT)
 
diff --git a/gdbsupport/Makefile.in b/gdbsupport/Makefile.in
index 6f8dacc157f9..ab35b9148a50 100644
--- a/gdbsupport/Makefile.in
+++ b/gdbsupport/Makefile.in
@@ -393,10 +393,17 @@ ACLOCAL_AMFLAGS = -I . -I ../config
 # from Automake, as gdbsupport uses AM_GNU_GETTEXT through
 # ZW_GNU_GETTEXT_SISTER_DIR, but doesn't have any translations (currently).
 SUBDIRS = 
-AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir)/../gdb \
-    -I../gnulib/import -I$(srcdir)/../gnulib/import \
-    -I.. -I$(srcdir)/.. $(INCINTL) -I../bfd -I$(srcdir)/../bfd \
-    @LARGEFILE_CPPFLAGS@
+AM_CPPFLAGS = \
+	-I$(srcdir)/../include \
+	-I$(srcdir)/../gdb \
+	-I../gnulib/import \
+	-I$(srcdir)/../gnulib/import \
+	-I.. \
+	-I$(srcdir)/.. \
+	$(INCINTL) \
+	-I../bfd \
+	-I$(srcdir)/../bfd \
+	@LARGEFILE_CPPFLAGS@
 
 AM_CXXFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
 noinst_LIBRARIES = libgdbsupport.a
-- 
2.44.0


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH v3 2/4] {gdb, gdbserver}/Makefile.in: remove unnecessary intermediary variables
  2024-03-26 19:06 [PATCH v3 0/4] Include early include files with `-include` Simon Marchi
  2024-03-26 19:06 ` [PATCH v3 1/4] gdb, gdbserver, gdbsupport: reformat some Makefile variables, one entry per line Simon Marchi
@ 2024-03-26 19:06 ` Simon Marchi
  2024-03-26 19:06 ` [PATCH v3 3/4] gdb, gdbserver, gdbsupport: include early header files with `-include` Simon Marchi
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 8+ messages in thread
From: Simon Marchi @ 2024-03-26 19:06 UTC (permalink / raw)
  To: gdb-patches; +Cc: Simon Marchi

Remove `INTERNAL_CFLAGS_BASE` and `INTERNAL_WARN_CFLAGS`, inline their
contents in `INTERNAL_CFLAGS`.  Not functional changes expected.

Change-Id: I6a09794835ca2cfd4a88a3e9f2e627c8f5bd569f
---
 gdb/Makefile.in       |  8 ++++----
 gdbserver/Makefile.in | 12 +++---------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index bf57a9a3e62e..a5139ea75803 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -631,7 +631,7 @@ INTERNAL_CPPFLAGS = $(CPPFLAGS) @GUILE_CPPFLAGS@ @PYTHON_CPPFLAGS@ \
 	@LARGEFILE_CPPFLAGS@
 
 # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
-INTERNAL_CFLAGS_BASE = \
+INTERNAL_CFLAGS = \
 	$(GLOBAL_CFLAGS) \
 	$(PROFILE_CFLAGS) \
 	$(GDB_CFLAGS) \
@@ -653,9 +653,9 @@ INTERNAL_CFLAGS_BASE = \
 	$(PTHREAD_CFLAGS) \
 	$(DEBUGINFOD_CFLAGS) \
 	$(GMPINC) \
-	$(AMD_DBGAPI_CFLAGS)
-INTERNAL_WARN_CFLAGS = $(INTERNAL_CFLAGS_BASE) $(GDB_WARN_CFLAGS)
-INTERNAL_CFLAGS = $(INTERNAL_WARN_CFLAGS) $(GDB_WERROR_CFLAGS)
+	$(AMD_DBGAPI_CFLAGS) \
+	$(GDB_WARN_CFLAGS) \
+	$(GDB_WERROR_CFLAGS)
 
 # LDFLAGS is specifically reserved for setting from the command line
 # when running make.
diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
index 3aa7aa760eaf..45073abca493 100644
--- a/gdbserver/Makefile.in
+++ b/gdbserver/Makefile.in
@@ -163,19 +163,13 @@ WIN32APILIBS = @WIN32APILIBS@
 MAYBE_LIBICONV = @MAYBE_LIBICONV@
 
 # INTERNAL_CFLAGS is the aggregate of all other *CFLAGS macros.
-INTERNAL_CFLAGS_BASE = \
+INTERNAL_CFLAGS = \
 	${GLOBAL_CFLAGS} \
 	${PROFILE_CFLAGS} \
 	${INCLUDE_CFLAGS} \
 	${CPPFLAGS} \
-	$(PTHREAD_CFLAGS)
-
-INTERNAL_WARN_CFLAGS = \
-	${INTERNAL_CFLAGS_BASE} \
-	$(WARN_CFLAGS)
-
-INTERNAL_CFLAGS = \
-	${INTERNAL_WARN_CFLAGS} \
+	$(PTHREAD_CFLAGS) \
+	$(WARN_CFLAGS) \
 	$(WERROR_CFLAGS) \
 	-DGDBSERVER
 
-- 
2.44.0


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH v3 3/4] gdb, gdbserver, gdbsupport: include early header files with `-include`
  2024-03-26 19:06 [PATCH v3 0/4] Include early include files with `-include` Simon Marchi
  2024-03-26 19:06 ` [PATCH v3 1/4] gdb, gdbserver, gdbsupport: reformat some Makefile variables, one entry per line Simon Marchi
  2024-03-26 19:06 ` [PATCH v3 2/4] {gdb, gdbserver}/Makefile.in: remove unnecessary intermediary variables Simon Marchi
@ 2024-03-26 19:06 ` Simon Marchi
  2024-03-26 19:06 ` [PATCH v3 4/4] gdb, gdbserver, gdbsupport: remove includes of early headers Simon Marchi
  2024-03-26 19:09 ` [PATCH v3 0/4] Include early include files with `-include` Simon Marchi
  4 siblings, 0 replies; 8+ messages in thread
From: Simon Marchi @ 2024-03-26 19:06 UTC (permalink / raw)
  To: gdb-patches; +Cc: Simon Marchi

The motivation for this change is for analysis tools and IDEs to be
better at analyzing header files on their own.

There are some definitions and includes we want to occur at the very
beginning of all translation units.  The way we currently do that is by
requiring all source files (.c and .cc files) to include one of defs.h
(for gdb), server.h (for gdbserver) of common-defs.h (for gdbsupport and
shared source files).  These special header files define and include
everything that needs to be included at the very beginning.  Other
header files are written in a way that assume that these special
"prologue" header files have already been included.

My problem with that is that my editor (clangd-based) provides a very
bad experience when editing header files.  Since clangd doesn't know
that one of defs.h/server.h/common-defs.h was included already, a lot of
things are flagged as errors.  For instance, CORE_ADDR is not known.
It's possible to edit the files in this state, but a lot of the power of
the editor is unavailable.

My proposal to help with this is to include those things we always want
to be there using the compilers' `-include` option.  Tom Tromey said
that the current approach might exist because not all compilers used to
have an option like this.  But I believe that it's safe to assume they
do today.

With this change, clangd picks up the -include option from the compile
command, and is able to analyze the header file correctly, as it sees
all that stuff included or defined by that -include option.  That works
because when editing a header file, clangd tries to get the compilation
flags from a source file that includes said header file.

This change is a bit self-serving, because it addresses one of my
frustrations when editing header files, but it might help others too.
I'd be curious to know if others encounter the same kinds of problems
when editing header files.  Also, even if the change is not necessary by
any means, I think the solution of using -include for stuff we always
want to be there is more elegant than the current solution.

Even with this -include flag, many header files currently don't include
what they use, but rather depend on files included before them.  This
will still cause errors when editing them, but it should be easily
fixable by adding the appropriate include.  There's no rush to do so, as
long as the code still compiles, it's just a convenience thing.

The changes are:

 - Add the appropriate `-include` option to the various Makefiles.

 - There is one particularity for gdbserver's Makefile: we do not want
   to include server.h when building `gdbreplay.o`, as `gdbreplay.cc`
   doesn't include it.  So we can't simply put the `-include` in
   `INTERNAL_CFLAGS`.  Add the `-include server.h` option to the
   `COMPILE` and `IPAGENT_COMPILE` variables, and added a special rule
   to compile `gdbreplay.o` with `-include gdbsupport/common-defs.h`.

 - Remove the `-include` option from the `check-headers` rule in
   gdb/Makefile.in, since it is already included in `INTERNAL_CFLAGS`.

Change-Id: If3e345d00a9fc42336322f1d8286687d22134340
---
 gdb/Makefile.in        |  3 ++-
 gdbserver/Makefile.in  | 14 ++++++++++++--
 gdbsupport/Makefile.am |  1 +
 gdbsupport/Makefile.in |  1 +
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index a5139ea75803..a9f641c06593 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -607,6 +607,7 @@ GDB_CFLAGS = \
 	-I. \
 	-I$(srcdir) \
 	-I$(srcdir)/config \
+	-include $(srcdir)/defs.h \
 	-DLOCALEDIR="\"$(localedir)\"" \
 	$(DEFS)
 
@@ -2050,7 +2051,7 @@ check-headers:
 	@echo Checking headers.
 	for i in $(CHECK_HEADERS) ; do \
 		$(CXX) $(CXX_DIALECT) -x c++-header -c -fsyntax-only \
-		$(INTERNAL_CFLAGS) $(CXXFLAGS) -include defs.h $(srcdir)/$$i ; \
+		$(INTERNAL_CFLAGS) $(CXXFLAGS) $(srcdir)/$$i ; \
 	done
 .PHONY: check-headers
 
diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in
index 45073abca493..5180e7336cb4 100644
--- a/gdbserver/Makefile.in
+++ b/gdbserver/Makefile.in
@@ -69,9 +69,12 @@ COMPILE.pre = $(CXX) $(CXX_DIALECT)
 COMPILE.post = -c -o $@
 POSTCOMPILE = @true
 
+INCLUDE_SERVER_H = -include $(srcdir)/server.h
+
 # CXXFLAGS is at the very end on purpose, so that user-supplied flags can
 # override internal flags.
-COMPILE = $(ECHO_CXX) $(COMPILE.pre) $(INTERNAL_CFLAGS) $(CXXFLAGS) $(COMPILE.post)
+COMPILE = $(ECHO_CXX) $(COMPILE.pre) $(INTERNAL_CFLAGS) $(INCLUDE_SERVER_H) \
+	$(CXXFLAGS) $(COMPILE.post)
 
 # It is also possible that you will need to add -I/usr/include/sys to the
 # CFLAGS section if your system doesn't have fcntl.h in /usr/include (which
@@ -509,7 +512,8 @@ IPAGENT_CFLAGS = \
 
 # CXXFLAGS is at the very end on purpose, so that user-supplied flags can
 # override internal flags.
-IPAGENT_COMPILE = $(ECHO_CXX) $(COMPILE.pre) $(IPAGENT_CFLAGS) $(CXXFLAGS) $(COMPILE.post)
+IPAGENT_COMPILE = $(ECHO_CXX) $(COMPILE.pre) $(IPAGENT_CFLAGS) \
+	$(INCLUDE_SERVER_H) $(CXXFLAGS) $(COMPILE.post)
 
 # Rules for special cases.
 
@@ -589,6 +593,12 @@ target/%.o: ../gdb/target/%.c
 %-generated.cc: ../gdb/regformats/rs6000/%.dat $(regdat_sh)
 	$(ECHO_REGDAT) $(SHELL) $(regdat_sh) $< $@
 
+# Rule for gdbreplay.o.  This is the same as COMPILE, but includes common-defs.h
+# instead of server.h.
+gdbreplay.o: gdbreplay.cc
+	$(ECHO_CXX) $(COMPILE.pre) $(INTERNAL_CFLAGS) $(CXXFLAGS) \
+		-include gdbsupport/common-defs.h $(COMPILE.post) $<
+
 #
 # Dependency tracking.
 #
diff --git a/gdbsupport/Makefile.am b/gdbsupport/Makefile.am
index 7c360aa413ef..2b0f987125c1 100644
--- a/gdbsupport/Makefile.am
+++ b/gdbsupport/Makefile.am
@@ -35,6 +35,7 @@ AM_CPPFLAGS = \
 	$(INCINTL) \
 	-I../bfd \
 	-I$(srcdir)/../bfd \
+	-include $(srcdir)/common-defs.h \
 	@LARGEFILE_CPPFLAGS@
 
 override CXX += $(CXX_DIALECT)
diff --git a/gdbsupport/Makefile.in b/gdbsupport/Makefile.in
index ab35b9148a50..ee709112aaed 100644
--- a/gdbsupport/Makefile.in
+++ b/gdbsupport/Makefile.in
@@ -403,6 +403,7 @@ AM_CPPFLAGS = \
 	$(INCINTL) \
 	-I../bfd \
 	-I$(srcdir)/../bfd \
+	-include $(srcdir)/common-defs.h \
 	@LARGEFILE_CPPFLAGS@
 
 AM_CXXFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
-- 
2.44.0


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH v3 4/4] gdb, gdbserver, gdbsupport: remove includes of early headers
  2024-03-26 19:06 [PATCH v3 0/4] Include early include files with `-include` Simon Marchi
                   ` (2 preceding siblings ...)
  2024-03-26 19:06 ` [PATCH v3 3/4] gdb, gdbserver, gdbsupport: include early header files with `-include` Simon Marchi
@ 2024-03-26 19:06 ` Simon Marchi
  2024-03-26 19:09 ` [PATCH v3 0/4] Include early include files with `-include` Simon Marchi
  4 siblings, 0 replies; 8+ messages in thread
From: Simon Marchi @ 2024-03-26 19:06 UTC (permalink / raw)
  To: gdb-patches; +Cc: Simon Marchi

Now that defs.h, server.h and common-defs.h are included via the
`-include` option, it is no longer necessary for source files to include
it.  Remove all the inclusions of these files I could find.  Update the
generation scripts where relevant.

Change-Id: Ia026cff269c1b7ae7386dd3619bc9bb6a5332837
---
 gdb/aarch32-linux-nat.c                              | 1 -
 gdb/aarch32-tdep.c                                   | 2 --
 gdb/aarch64-fbsd-nat.c                               | 1 -
 gdb/aarch64-fbsd-tdep.c                              | 1 -
 gdb/aarch64-linux-nat.c                              | 1 -
 gdb/aarch64-linux-tdep.c                             | 1 -
 gdb/aarch64-nat.c                                    | 1 -
 gdb/aarch64-newlib-tdep.c                            | 1 -
 gdb/aarch64-ravenscar-thread.c                       | 1 -
 gdb/aarch64-tdep.c                                   | 1 -
 gdb/ada-exp.y                                        | 1 -
 gdb/ada-lang.c                                       | 1 -
 gdb/ada-tasks.c                                      | 1 -
 gdb/ada-typeprint.c                                  | 1 -
 gdb/ada-valprint.c                                   | 1 -
 gdb/ada-varobj.c                                     | 1 -
 gdb/addrmap.c                                        | 1 -
 gdb/agent.c                                          | 1 -
 gdb/aix-thread.c                                     | 1 -
 gdb/alloc.c                                          | 7 +------
 gdb/alpha-bsd-nat.c                                  | 1 -
 gdb/alpha-bsd-tdep.c                                 | 1 -
 gdb/alpha-linux-nat.c                                | 1 -
 gdb/alpha-linux-tdep.c                               | 1 -
 gdb/alpha-mdebug-tdep.c                              | 1 -
 gdb/alpha-netbsd-tdep.c                              | 1 -
 gdb/alpha-obsd-tdep.c                                | 1 -
 gdb/alpha-tdep.c                                     | 1 -
 gdb/amd-dbgapi-target.c                              | 1 -
 gdb/amd64-bsd-nat.c                                  | 1 -
 gdb/amd64-darwin-tdep.c                              | 1 -
 gdb/amd64-dicos-tdep.c                               | 1 -
 gdb/amd64-fbsd-nat.c                                 | 1 -
 gdb/amd64-fbsd-tdep.c                                | 1 -
 gdb/amd64-linux-nat.c                                | 1 -
 gdb/amd64-linux-tdep.c                               | 1 -
 gdb/amd64-nat.c                                      | 1 -
 gdb/amd64-netbsd-nat.c                               | 1 -
 gdb/amd64-netbsd-tdep.c                              | 1 -
 gdb/amd64-obsd-nat.c                                 | 1 -
 gdb/amd64-obsd-tdep.c                                | 1 -
 gdb/amd64-ravenscar-thread.c                         | 1 -
 gdb/amd64-sol2-tdep.c                                | 1 -
 gdb/amd64-tdep.c                                     | 1 -
 gdb/amd64-windows-nat.c                              | 1 -
 gdb/amd64-windows-tdep.c                             | 1 -
 gdb/amdgpu-tdep.c                                    | 1 -
 gdb/annotate.c                                       | 1 -
 gdb/arc-linux-nat.c                                  | 1 -
 gdb/arc-linux-tdep.c                                 | 1 -
 gdb/arc-newlib-tdep.c                                | 1 -
 gdb/arc-tdep.c                                       | 1 -
 gdb/arch-utils.c                                     | 1 -
 gdb/arch/aarch32.c                                   | 1 -
 gdb/arch/aarch64-insn.c                              | 1 -
 gdb/arch/aarch64-mte-linux.h                         | 1 -
 gdb/arch/aarch64-scalable-linux.h                    | 1 -
 gdb/arch/aarch64.c                                   | 1 -
 gdb/arch/amd64.c                                     | 1 -
 gdb/arch/arc.c                                       | 1 -
 gdb/arch/arm-get-next-pcs.c                          | 1 -
 gdb/arch/arm-linux.c                                 | 1 -
 gdb/arch/arm.c                                       | 1 -
 gdb/arch/csky.c                                      | 1 -
 gdb/arch/i386.c                                      | 1 -
 gdb/arch/loongarch.c                                 | 1 -
 gdb/arch/ppc-linux-common.c                          | 1 -
 gdb/arch/riscv.c                                     | 1 -
 gdb/arch/tic6x.c                                     | 1 -
 gdb/arm-bsd-tdep.c                                   | 1 -
 gdb/arm-fbsd-nat.c                                   | 1 -
 gdb/arm-fbsd-tdep.c                                  | 1 -
 gdb/arm-linux-nat.c                                  | 1 -
 gdb/arm-linux-tdep.c                                 | 1 -
 gdb/arm-netbsd-nat.c                                 | 1 -
 gdb/arm-netbsd-tdep.c                                | 1 -
 gdb/arm-none-tdep.c                                  | 1 -
 gdb/arm-obsd-tdep.c                                  | 1 -
 gdb/arm-pikeos-tdep.c                                | 1 -
 gdb/arm-tdep.c                                       | 1 -
 gdb/arm-wince-tdep.c                                 | 1 -
 gdb/async-event.c                                    | 1 -
 gdb/auto-load.c                                      | 1 -
 gdb/auxv.c                                           | 1 -
 gdb/avr-tdep.c                                       | 1 -
 gdb/ax-gdb.c                                         | 1 -
 gdb/ax-general.c                                     | 1 -
 gdb/bcache.c                                         | 1 -
 gdb/bfd-target.c                                     | 1 -
 gdb/bfin-linux-tdep.c                                | 1 -
 gdb/bfin-tdep.c                                      | 1 -
 gdb/block.c                                          | 1 -
 gdb/blockframe.c                                     | 1 -
 gdb/bpf-tdep.c                                       | 1 -
 gdb/break-catch-exec.c                               | 1 -
 gdb/break-catch-fork.c                               | 1 -
 gdb/break-catch-load.c                               | 1 -
 gdb/break-catch-sig.c                                | 1 -
 gdb/break-catch-syscall.c                            | 1 -
 gdb/break-catch-throw.c                              | 1 -
 gdb/breakpoint.c                                     | 1 -
 gdb/bsd-kvm.c                                        | 1 -
 gdb/bsd-uthread.c                                    | 1 -
 gdb/bt-utils.c                                       | 1 -
 gdb/btrace.c                                         | 1 -
 gdb/build-id.c                                       | 1 -
 gdb/buildsym-legacy.c                                | 1 -
 gdb/buildsym.c                                       | 1 -
 gdb/c-exp.y                                          | 1 -
 gdb/c-lang.c                                         | 1 -
 gdb/c-typeprint.c                                    | 1 -
 gdb/c-valprint.c                                     | 1 -
 gdb/c-varobj.c                                       | 1 -
 gdb/charset.c                                        | 1 -
 gdb/cli-out.c                                        | 1 -
 gdb/cli/cli-cmds.c                                   | 1 -
 gdb/cli/cli-decode.c                                 | 1 -
 gdb/cli/cli-dump.c                                   | 1 -
 gdb/cli/cli-interp.c                                 | 1 -
 gdb/cli/cli-logging.c                                | 1 -
 gdb/cli/cli-option.c                                 | 1 -
 gdb/cli/cli-script.c                                 | 1 -
 gdb/cli/cli-setshow.c                                | 1 -
 gdb/cli/cli-style.c                                  | 1 -
 gdb/cli/cli-utils.c                                  | 1 -
 gdb/coff-pe-read.c                                   | 1 -
 gdb/coffread.c                                       | 1 -
 gdb/compile/compile-c-support.c                      | 1 -
 gdb/compile/compile-c-symbols.c                      | 1 -
 gdb/compile/compile-c-types.c                        | 1 -
 gdb/compile/compile-cplus-symbols.c                  | 1 -
 gdb/compile/compile-cplus-types.c                    | 1 -
 gdb/compile/compile-loc2c.c                          | 1 -
 gdb/compile/compile-object-load.c                    | 1 -
 gdb/compile/compile-object-run.c                     | 1 -
 gdb/compile/compile.c                                | 1 -
 gdb/complaints.c                                     | 1 -
 gdb/completer.c                                      | 1 -
 gdb/copying.awk                                      | 1 -
 gdb/copying.c                                        | 1 -
 gdb/corefile.c                                       | 1 -
 gdb/corelow.c                                        | 1 -
 gdb/cp-abi.c                                         | 1 -
 gdb/cp-name-parser.y                                 | 1 -
 gdb/cp-namespace.c                                   | 1 -
 gdb/cp-support.c                                     | 1 -
 gdb/cp-valprint.c                                    | 1 -
 gdb/cris-linux-tdep.c                                | 1 -
 gdb/cris-tdep.c                                      | 1 -
 gdb/csky-linux-tdep.c                                | 1 -
 gdb/csky-tdep.c                                      | 1 -
 gdb/ctfread.c                                        | 1 -
 gdb/d-exp.y                                          | 1 -
 gdb/d-lang.c                                         | 1 -
 gdb/d-namespace.c                                    | 1 -
 gdb/d-valprint.c                                     | 1 -
 gdb/darwin-nat-info.c                                | 1 -
 gdb/darwin-nat.c                                     | 1 -
 gdb/dbxread.c                                        | 1 -
 gdb/dcache.c                                         | 1 -
 gdb/debug.c                                          | 1 -
 gdb/debuginfod-support.c                             | 1 -
 gdb/dicos-tdep.c                                     | 1 -
 gdb/dictionary.c                                     | 1 -
 gdb/disasm-selftests.c                               | 1 -
 gdb/disasm.c                                         | 1 -
 gdb/displaced-stepping.c                             | 1 -
 gdb/dtrace-probe.c                                   | 1 -
 gdb/dummy-frame.c                                    | 1 -
 gdb/dwarf2/abbrev-cache.c                            | 1 -
 gdb/dwarf2/abbrev.c                                  | 1 -
 gdb/dwarf2/ada-imported.c                            | 1 -
 gdb/dwarf2/aranges.c                                 | 1 -
 gdb/dwarf2/attribute.c                               | 1 -
 gdb/dwarf2/comp-unit-head.c                          | 1 -
 gdb/dwarf2/cooked-index.c                            | 1 -
 gdb/dwarf2/cu.c                                      | 1 -
 gdb/dwarf2/die.c                                     | 1 -
 gdb/dwarf2/dwz.c                                     | 1 -
 gdb/dwarf2/expr.c                                    | 1 -
 gdb/dwarf2/frame-tailcall.c                          | 1 -
 gdb/dwarf2/frame.c                                   | 1 -
 gdb/dwarf2/index-cache.c                             | 1 -
 gdb/dwarf2/index-common.c                            | 1 -
 gdb/dwarf2/index-write.c                             | 1 -
 gdb/dwarf2/leb.c                                     | 1 -
 gdb/dwarf2/line-header.c                             | 1 -
 gdb/dwarf2/loc.c                                     | 1 -
 gdb/dwarf2/macro.c                                   | 1 -
 gdb/dwarf2/read-debug-names.c                        | 1 -
 gdb/dwarf2/read-gdb-index.c                          | 1 -
 gdb/dwarf2/read.c                                    | 1 -
 gdb/dwarf2/section.c                                 | 1 -
 gdb/dwarf2/stringify.c                               | 1 -
 gdb/elf-none-tdep.c                                  | 1 -
 gdb/elfread.c                                        | 1 -
 gdb/eval.c                                           | 1 -
 gdb/event-top.c                                      | 1 -
 gdb/exceptions.c                                     | 1 -
 gdb/exec.c                                           | 1 -
 gdb/expprint.c                                       | 1 -
 gdb/extension.c                                      | 1 -
 gdb/f-array-walker.h                                 | 1 -
 gdb/f-exp.y                                          | 1 -
 gdb/f-lang.c                                         | 1 -
 gdb/f-typeprint.c                                    | 1 -
 gdb/f-valprint.c                                     | 1 -
 gdb/fbsd-nat.c                                       | 1 -
 gdb/fbsd-tdep.c                                      | 1 -
 gdb/features/microblaze-with-stack-protect.c         | 1 -
 gdb/features/microblaze.c                            | 1 -
 gdb/features/mips-dsp-linux.c                        | 1 -
 gdb/features/mips-linux.c                            | 1 -
 gdb/features/mips64-dsp-linux.c                      | 1 -
 gdb/features/mips64-linux.c                          | 1 -
 gdb/features/nds32.c                                 | 1 -
 gdb/features/nios2.c                                 | 1 -
 gdb/features/or1k-linux.c                            | 1 -
 gdb/features/or1k.c                                  | 1 -
 gdb/features/rs6000/powerpc-32.c                     | 1 -
 gdb/features/rs6000/powerpc-32l.c                    | 1 -
 gdb/features/rs6000/powerpc-403.c                    | 1 -
 gdb/features/rs6000/powerpc-403gc.c                  | 1 -
 gdb/features/rs6000/powerpc-405.c                    | 1 -
 gdb/features/rs6000/powerpc-505.c                    | 1 -
 gdb/features/rs6000/powerpc-601.c                    | 1 -
 gdb/features/rs6000/powerpc-602.c                    | 1 -
 gdb/features/rs6000/powerpc-603.c                    | 1 -
 gdb/features/rs6000/powerpc-604.c                    | 1 -
 gdb/features/rs6000/powerpc-64.c                     | 1 -
 gdb/features/rs6000/powerpc-64l.c                    | 1 -
 gdb/features/rs6000/powerpc-7400.c                   | 1 -
 gdb/features/rs6000/powerpc-750.c                    | 1 -
 gdb/features/rs6000/powerpc-860.c                    | 1 -
 gdb/features/rs6000/powerpc-altivec32.c              | 1 -
 gdb/features/rs6000/powerpc-altivec32l.c             | 1 -
 gdb/features/rs6000/powerpc-altivec64.c              | 1 -
 gdb/features/rs6000/powerpc-altivec64l.c             | 1 -
 gdb/features/rs6000/powerpc-e500.c                   | 1 -
 gdb/features/rs6000/powerpc-e500l.c                  | 1 -
 gdb/features/rs6000/powerpc-isa205-32l.c             | 1 -
 gdb/features/rs6000/powerpc-isa205-64l.c             | 1 -
 gdb/features/rs6000/powerpc-isa205-altivec32l.c      | 1 -
 gdb/features/rs6000/powerpc-isa205-altivec64l.c      | 1 -
 gdb/features/rs6000/powerpc-isa205-ppr-dscr-vsx32l.c | 1 -
 gdb/features/rs6000/powerpc-isa205-ppr-dscr-vsx64l.c | 1 -
 gdb/features/rs6000/powerpc-isa205-vsx32l.c          | 1 -
 gdb/features/rs6000/powerpc-isa205-vsx64l.c          | 1 -
 gdb/features/rs6000/powerpc-isa207-htm-vsx32l.c      | 1 -
 gdb/features/rs6000/powerpc-isa207-htm-vsx64l.c      | 1 -
 gdb/features/rs6000/powerpc-isa207-vsx32l.c          | 1 -
 gdb/features/rs6000/powerpc-isa207-vsx64l.c          | 1 -
 gdb/features/rs6000/powerpc-vsx32.c                  | 1 -
 gdb/features/rs6000/powerpc-vsx32l.c                 | 1 -
 gdb/features/rs6000/powerpc-vsx64.c                  | 1 -
 gdb/features/rs6000/powerpc-vsx64l.c                 | 1 -
 gdb/features/rs6000/rs6000.c                         | 1 -
 gdb/features/rx.c                                    | 1 -
 gdb/features/s390-gs-linux64.c                       | 1 -
 gdb/features/s390-linux32.c                          | 1 -
 gdb/features/s390-linux32v1.c                        | 1 -
 gdb/features/s390-linux32v2.c                        | 1 -
 gdb/features/s390-linux64.c                          | 1 -
 gdb/features/s390-linux64v1.c                        | 1 -
 gdb/features/s390-linux64v2.c                        | 1 -
 gdb/features/s390-te-linux64.c                       | 1 -
 gdb/features/s390-tevx-linux64.c                     | 1 -
 gdb/features/s390-vx-linux64.c                       | 1 -
 gdb/features/s390x-gs-linux64.c                      | 1 -
 gdb/features/s390x-linux64.c                         | 1 -
 gdb/features/s390x-linux64v1.c                       | 1 -
 gdb/features/s390x-linux64v2.c                       | 1 -
 gdb/features/s390x-te-linux64.c                      | 1 -
 gdb/features/s390x-tevx-linux64.c                    | 1 -
 gdb/features/s390x-vx-linux64.c                      | 1 -
 gdb/features/sparc/sparc32-solaris.c                 | 1 -
 gdb/features/sparc/sparc64-solaris.c                 | 1 -
 gdb/features/z80.c                                   | 1 -
 gdb/filename-seen-cache.c                            | 1 -
 gdb/filename-seen-cache.h                            | 1 -
 gdb/filesystem.c                                     | 1 -
 gdb/findcmd.c                                        | 1 -
 gdb/findvar.c                                        | 1 -
 gdb/fork-child.c                                     | 1 -
 gdb/frame-base.c                                     | 1 -
 gdb/frame-unwind.c                                   | 1 -
 gdb/frame.c                                          | 1 -
 gdb/frv-linux-tdep.c                                 | 1 -
 gdb/frv-tdep.c                                       | 1 -
 gdb/ft32-tdep.c                                      | 1 -
 gdb/gcore-elf.c                                      | 1 -
 gdb/gcore.c                                          | 1 -
 gdb/gdb-demangle.c                                   | 1 -
 gdb/gdb.c                                            | 1 -
 gdb/gdb_bfd.c                                        | 1 -
 gdb/gdbarch-selftests.c                              | 1 -
 gdb/gdbtypes.c                                       | 1 -
 gdb/glibc-tdep.c                                     | 1 -
 gdb/gmp-utils.c                                      | 1 -
 gdb/gnu-nat.c                                        | 1 -
 gdb/gnu-nat.h                                        | 2 --
 gdb/gnu-v2-abi.c                                     | 1 -
 gdb/gnu-v3-abi.c                                     | 1 -
 gdb/go-exp.y                                         | 1 -
 gdb/go-lang.c                                        | 1 -
 gdb/go-typeprint.c                                   | 1 -
 gdb/go-valprint.c                                    | 1 -
 gdb/go32-nat.c                                       | 1 -
 gdb/guile/guile.c                                    | 1 -
 gdb/guile/scm-arch.c                                 | 1 -
 gdb/guile/scm-auto-load.c                            | 1 -
 gdb/guile/scm-block.c                                | 1 -
 gdb/guile/scm-breakpoint.c                           | 1 -
 gdb/guile/scm-cmd.c                                  | 1 -
 gdb/guile/scm-disasm.c                               | 1 -
 gdb/guile/scm-exception.c                            | 1 -
 gdb/guile/scm-frame.c                                | 1 -
 gdb/guile/scm-gsmob.c                                | 1 -
 gdb/guile/scm-iterator.c                             | 1 -
 gdb/guile/scm-lazy-string.c                          | 1 -
 gdb/guile/scm-math.c                                 | 1 -
 gdb/guile/scm-objfile.c                              | 1 -
 gdb/guile/scm-param.c                                | 1 -
 gdb/guile/scm-ports.c                                | 1 -
 gdb/guile/scm-pretty-print.c                         | 1 -
 gdb/guile/scm-progspace.c                            | 1 -
 gdb/guile/scm-safe-call.c                            | 1 -
 gdb/guile/scm-string.c                               | 1 -
 gdb/guile/scm-symbol.c                               | 1 -
 gdb/guile/scm-symtab.c                               | 1 -
 gdb/guile/scm-type.c                                 | 1 -
 gdb/guile/scm-utils.c                                | 1 -
 gdb/guile/scm-value.c                                | 1 -
 gdb/h8300-tdep.c                                     | 1 -
 gdb/hppa-bsd-tdep.c                                  | 1 -
 gdb/hppa-linux-nat.c                                 | 1 -
 gdb/hppa-linux-tdep.c                                | 1 -
 gdb/hppa-netbsd-nat.c                                | 1 -
 gdb/hppa-netbsd-tdep.c                               | 1 -
 gdb/hppa-obsd-nat.c                                  | 1 -
 gdb/hppa-obsd-tdep.c                                 | 1 -
 gdb/hppa-tdep.c                                      | 1 -
 gdb/i386-bsd-nat.c                                   | 1 -
 gdb/i386-bsd-tdep.c                                  | 1 -
 gdb/i386-darwin-nat.c                                | 1 -
 gdb/i386-darwin-tdep.c                               | 1 -
 gdb/i386-dicos-tdep.c                                | 1 -
 gdb/i386-fbsd-nat.c                                  | 1 -
 gdb/i386-fbsd-tdep.c                                 | 1 -
 gdb/i386-gnu-nat.c                                   | 1 -
 gdb/i386-gnu-tdep.c                                  | 1 -
 gdb/i386-go32-tdep.c                                 | 1 -
 gdb/i386-linux-nat.c                                 | 1 -
 gdb/i386-linux-tdep.c                                | 1 -
 gdb/i386-netbsd-nat.c                                | 1 -
 gdb/i386-netbsd-tdep.c                               | 1 -
 gdb/i386-nto-tdep.c                                  | 1 -
 gdb/i386-obsd-nat.c                                  | 1 -
 gdb/i386-obsd-tdep.c                                 | 1 -
 gdb/i386-sol2-nat.c                                  | 1 -
 gdb/i386-sol2-tdep.c                                 | 1 -
 gdb/i386-tdep.c                                      | 1 -
 gdb/i386-windows-nat.c                               | 1 -
 gdb/i386-windows-tdep.c                              | 1 -
 gdb/i387-tdep.c                                      | 1 -
 gdb/ia64-libunwind-tdep.c                            | 1 -
 gdb/ia64-linux-nat.c                                 | 1 -
 gdb/ia64-linux-tdep.c                                | 1 -
 gdb/ia64-tdep.c                                      | 1 -
 gdb/ia64-vms-tdep.c                                  | 1 -
 gdb/inf-child.c                                      | 1 -
 gdb/inf-loop.c                                       | 1 -
 gdb/inf-ptrace.c                                     | 1 -
 gdb/infcall.c                                        | 1 -
 gdb/infcmd.c                                         | 1 -
 gdb/inferior.c                                       | 1 -
 gdb/inflow.c                                         | 1 -
 gdb/infrun.c                                         | 1 -
 gdb/inline-frame.c                                   | 1 -
 gdb/interps.c                                        | 1 -
 gdb/iq2000-tdep.c                                    | 1 -
 gdb/jit.c                                            | 1 -
 gdb/language.c                                       | 1 -
 gdb/linespec.c                                       | 1 -
 gdb/linux-fork.c                                     | 1 -
 gdb/linux-nat-trad.c                                 | 1 -
 gdb/linux-nat.c                                      | 1 -
 gdb/linux-record.c                                   | 1 -
 gdb/linux-tdep.c                                     | 1 -
 gdb/linux-thread-db.c                                | 1 -
 gdb/lm32-tdep.c                                      | 1 -
 gdb/location.c                                       | 1 -
 gdb/loongarch-linux-nat.c                            | 1 -
 gdb/loongarch-linux-tdep.c                           | 1 -
 gdb/loongarch-tdep.c                                 | 1 -
 gdb/m2-exp.y                                         | 1 -
 gdb/m2-lang.c                                        | 1 -
 gdb/m2-typeprint.c                                   | 1 -
 gdb/m2-valprint.c                                    | 1 -
 gdb/m32c-tdep.c                                      | 1 -
 gdb/m32r-linux-nat.c                                 | 1 -
 gdb/m32r-linux-tdep.c                                | 1 -
 gdb/m32r-tdep.c                                      | 1 -
 gdb/m68hc11-tdep.c                                   | 1 -
 gdb/m68k-bsd-nat.c                                   | 1 -
 gdb/m68k-bsd-tdep.c                                  | 1 -
 gdb/m68k-linux-nat.c                                 | 1 -
 gdb/m68k-linux-tdep.c                                | 1 -
 gdb/m68k-tdep.c                                      | 1 -
 gdb/machoread.c                                      | 1 -
 gdb/macrocmd.c                                       | 1 -
 gdb/macroexp.c                                       | 1 -
 gdb/macroscope.c                                     | 1 -
 gdb/macrotab.c                                       | 1 -
 gdb/main.c                                           | 1 -
 gdb/maint-test-options.c                             | 1 -
 gdb/maint-test-settings.c                            | 1 -
 gdb/maint.c                                          | 1 -
 gdb/make-init-c                                      | 1 -
 gdb/mdebugread.c                                     | 1 -
 gdb/mem-break.c                                      | 1 -
 gdb/memattr.c                                        | 1 -
 gdb/memory-map.c                                     | 1 -
 gdb/memrange.c                                       | 1 -
 gdb/memtag.c                                         | 1 -
 gdb/mep-tdep.c                                       | 1 -
 gdb/mi/mi-cmd-break.c                                | 1 -
 gdb/mi/mi-cmd-catch.c                                | 1 -
 gdb/mi/mi-cmd-disas.c                                | 1 -
 gdb/mi/mi-cmd-env.c                                  | 1 -
 gdb/mi/mi-cmd-file.c                                 | 1 -
 gdb/mi/mi-cmd-info.c                                 | 1 -
 gdb/mi/mi-cmd-stack.c                                | 1 -
 gdb/mi/mi-cmd-target.c                               | 1 -
 gdb/mi/mi-cmd-var.c                                  | 1 -
 gdb/mi/mi-cmds.c                                     | 1 -
 gdb/mi/mi-common.c                                   | 1 -
 gdb/mi/mi-console.c                                  | 1 -
 gdb/mi/mi-getopt.c                                   | 1 -
 gdb/mi/mi-interp.c                                   | 1 -
 gdb/mi/mi-main.c                                     | 1 -
 gdb/mi/mi-out.c                                      | 1 -
 gdb/mi/mi-parse.c                                    | 1 -
 gdb/mi/mi-symbol-cmds.c                              | 1 -
 gdb/microblaze-linux-tdep.c                          | 1 -
 gdb/microblaze-tdep.c                                | 1 -
 gdb/mingw-hdep.c                                     | 1 -
 gdb/minidebug.c                                      | 1 -
 gdb/minsyms.c                                        | 1 -
 gdb/mips-fbsd-nat.c                                  | 1 -
 gdb/mips-fbsd-tdep.c                                 | 1 -
 gdb/mips-linux-nat.c                                 | 1 -
 gdb/mips-linux-tdep.c                                | 1 -
 gdb/mips-netbsd-nat.c                                | 1 -
 gdb/mips-netbsd-tdep.c                               | 1 -
 gdb/mips-sde-tdep.c                                  | 1 -
 gdb/mips-tdep.c                                      | 1 -
 gdb/mips64-obsd-nat.c                                | 1 -
 gdb/mips64-obsd-tdep.c                               | 1 -
 gdb/mipsread.c                                       | 1 -
 gdb/mn10300-linux-tdep.c                             | 1 -
 gdb/mn10300-tdep.c                                   | 1 -
 gdb/moxie-tdep.c                                     | 1 -
 gdb/msp430-tdep.c                                    | 1 -
 gdb/namespace.c                                      | 1 -
 gdb/nat/aarch64-hw-point.c                           | 1 -
 gdb/nat/aarch64-linux-hw-point.c                     | 1 -
 gdb/nat/aarch64-linux.c                              | 1 -
 gdb/nat/aarch64-mte-linux-ptrace.c                   | 1 -
 gdb/nat/aarch64-scalable-linux-ptrace.c              | 1 -
 gdb/nat/amd64-linux-siginfo.c                        | 1 -
 gdb/nat/fork-inferior.c                              | 1 -
 gdb/nat/linux-btrace.c                               | 1 -
 gdb/nat/linux-namespaces.c                           | 1 -
 gdb/nat/linux-osdata.c                               | 1 -
 gdb/nat/linux-personality.c                          | 1 -
 gdb/nat/linux-procfs.c                               | 1 -
 gdb/nat/linux-ptrace.c                               | 1 -
 gdb/nat/linux-waitpid.c                              | 1 -
 gdb/nat/mips-linux-watch.c                           | 1 -
 gdb/nat/netbsd-nat.c                                 | 1 -
 gdb/nat/ppc-linux.c                                  | 1 -
 gdb/nat/riscv-linux-tdesc.c                          | 1 -
 gdb/nat/windows-nat.c                                | 1 -
 gdb/nat/x86-dregs.c                                  | 1 -
 gdb/nat/x86-linux-dregs.c                            | 1 -
 gdb/nat/x86-linux.c                                  | 1 -
 gdb/nat/x86-xstate.c                                 | 1 -
 gdb/nds32-tdep.c                                     | 1 -
 gdb/netbsd-nat.c                                     | 1 -
 gdb/netbsd-tdep.c                                    | 1 -
 gdb/nios2-linux-tdep.c                               | 1 -
 gdb/nios2-tdep.c                                     | 1 -
 gdb/nto-procfs.c                                     | 1 -
 gdb/nto-tdep.c                                       | 1 -
 gdb/objc-lang.c                                      | 1 -
 gdb/objfiles.c                                       | 1 -
 gdb/obsd-nat.c                                       | 1 -
 gdb/obsd-tdep.c                                      | 1 -
 gdb/observable.c                                     | 1 -
 gdb/opencl-lang.c                                    | 1 -
 gdb/or1k-linux-nat.c                                 | 1 -
 gdb/or1k-linux-tdep.c                                | 1 -
 gdb/or1k-tdep.c                                      | 1 -
 gdb/osabi.c                                          | 1 -
 gdb/osdata.c                                         | 1 -
 gdb/p-exp.y                                          | 1 -
 gdb/p-lang.c                                         | 1 -
 gdb/p-typeprint.c                                    | 1 -
 gdb/p-valprint.c                                     | 1 -
 gdb/parse.c                                          | 1 -
 gdb/posix-hdep.c                                     | 1 -
 gdb/ppc-fbsd-nat.c                                   | 1 -
 gdb/ppc-fbsd-tdep.c                                  | 1 -
 gdb/ppc-linux-nat.c                                  | 1 -
 gdb/ppc-linux-tdep.c                                 | 1 -
 gdb/ppc-netbsd-nat.c                                 | 1 -
 gdb/ppc-netbsd-tdep.c                                | 1 -
 gdb/ppc-obsd-nat.c                                   | 1 -
 gdb/ppc-obsd-tdep.c                                  | 1 -
 gdb/ppc-ravenscar-thread.c                           | 1 -
 gdb/ppc-sysv-tdep.c                                  | 1 -
 gdb/ppc64-tdep.c                                     | 1 -
 gdb/printcmd.c                                       | 1 -
 gdb/probe.c                                          | 1 -
 gdb/proc-api.c                                       | 1 -
 gdb/proc-events.c                                    | 1 -
 gdb/proc-flags.c                                     | 1 -
 gdb/proc-service.c                                   | 1 -
 gdb/proc-why.c                                       | 1 -
 gdb/process-stratum-target.c                         | 1 -
 gdb/procfs.c                                         | 1 -
 gdb/producer.c                                       | 1 -
 gdb/progspace-and-thread.c                           | 1 -
 gdb/progspace.c                                      | 1 -
 gdb/prologue-value.c                                 | 1 -
 gdb/psymtab.c                                        | 1 -
 gdb/python/py-arch.c                                 | 1 -
 gdb/python/py-auto-load.c                            | 1 -
 gdb/python/py-block.c                                | 1 -
 gdb/python/py-bpevent.c                              | 1 -
 gdb/python/py-breakpoint.c                           | 1 -
 gdb/python/py-cmd.c                                  | 1 -
 gdb/python/py-connection.c                           | 1 -
 gdb/python/py-continueevent.c                        | 1 -
 gdb/python/py-dap.c                                  | 1 -
 gdb/python/py-disasm.c                               | 1 -
 gdb/python/py-event.c                                | 1 -
 gdb/python/py-evtregistry.c                          | 1 -
 gdb/python/py-evts.c                                 | 1 -
 gdb/python/py-exitedevent.c                          | 1 -
 gdb/python/py-finishbreakpoint.c                     | 1 -
 gdb/python/py-frame.c                                | 1 -
 gdb/python/py-framefilter.c                          | 1 -
 gdb/python/py-function.c                             | 1 -
 gdb/python/py-gdb-readline.c                         | 1 -
 gdb/python/py-inferior.c                             | 1 -
 gdb/python/py-infevents.c                            | 1 -
 gdb/python/py-infthread.c                            | 1 -
 gdb/python/py-instruction.c                          | 1 -
 gdb/python/py-lazy-string.c                          | 1 -
 gdb/python/py-linetable.c                            | 1 -
 gdb/python/py-membuf.c                               | 1 -
 gdb/python/py-mi.c                                   | 1 -
 gdb/python/py-micmd.c                                | 1 -
 gdb/python/py-newobjfileevent.c                      | 1 -
 gdb/python/py-objfile.c                              | 1 -
 gdb/python/py-param.c                                | 1 -
 gdb/python/py-prettyprint.c                          | 1 -
 gdb/python/py-progspace.c                            | 1 -
 gdb/python/py-record-btrace.c                        | 1 -
 gdb/python/py-record-full.c                          | 1 -
 gdb/python/py-record.c                               | 1 -
 gdb/python/py-registers.c                            | 1 -
 gdb/python/py-signalevent.c                          | 1 -
 gdb/python/py-stopevent.c                            | 1 -
 gdb/python/py-symbol.c                               | 1 -
 gdb/python/py-symtab.c                               | 1 -
 gdb/python/py-threadevent.c                          | 1 -
 gdb/python/py-tui.c                                  | 1 -
 gdb/python/py-type.c                                 | 1 -
 gdb/python/py-unwind.c                               | 1 -
 gdb/python/py-utils.c                                | 1 -
 gdb/python/py-value.c                                | 1 -
 gdb/python/py-varobj.c                               | 1 -
 gdb/python/py-xmethods.c                             | 1 -
 gdb/python/python.c                                  | 1 -
 gdb/ravenscar-thread.c                               | 1 -
 gdb/record-btrace.c                                  | 1 -
 gdb/record-full.c                                    | 1 -
 gdb/record.c                                         | 1 -
 gdb/regcache-dump.c                                  | 1 -
 gdb/regcache.c                                       | 1 -
 gdb/regformats/regdat.sh                             | 1 -
 gdb/reggroups.c                                      | 1 -
 gdb/remote-fileio.c                                  | 1 -
 gdb/remote-notif.c                                   | 1 -
 gdb/remote-sim.c                                     | 1 -
 gdb/remote.c                                         | 1 -
 gdb/reverse.c                                        | 1 -
 gdb/riscv-fbsd-nat.c                                 | 1 -
 gdb/riscv-fbsd-tdep.c                                | 1 -
 gdb/riscv-linux-nat.c                                | 1 -
 gdb/riscv-linux-tdep.c                               | 1 -
 gdb/riscv-none-tdep.c                                | 1 -
 gdb/riscv-ravenscar-thread.c                         | 1 -
 gdb/riscv-tdep.c                                     | 2 --
 gdb/rl78-tdep.c                                      | 1 -
 gdb/rs6000-aix-nat.c                                 | 1 -
 gdb/rs6000-aix-tdep.c                                | 1 -
 gdb/rs6000-lynx178-tdep.c                            | 1 -
 gdb/rs6000-tdep.c                                    | 1 -
 gdb/run-on-main-thread.c                             | 1 -
 gdb/rust-lang.c                                      | 1 -
 gdb/rust-parse.c                                     | 1 -
 gdb/rx-tdep.c                                        | 1 -
 gdb/s12z-tdep.c                                      | 1 -
 gdb/s390-linux-nat.c                                 | 1 -
 gdb/s390-linux-tdep.c                                | 1 -
 gdb/s390-tdep.c                                      | 1 -
 gdb/selftest-arch.c                                  | 1 -
 gdb/sentinel-frame.c                                 | 1 -
 gdb/ser-base.c                                       | 1 -
 gdb/ser-event.c                                      | 1 -
 gdb/ser-go32.c                                       | 1 -
 gdb/ser-mingw.c                                      | 1 -
 gdb/ser-pipe.c                                       | 1 -
 gdb/ser-tcp.c                                        | 1 -
 gdb/ser-uds.c                                        | 1 -
 gdb/ser-unix.c                                       | 1 -
 gdb/serial.c                                         | 1 -
 gdb/sh-linux-tdep.c                                  | 1 -
 gdb/sh-netbsd-nat.c                                  | 1 -
 gdb/sh-netbsd-tdep.c                                 | 1 -
 gdb/sh-tdep.c                                        | 1 -
 gdb/skip.c                                           | 1 -
 gdb/sol-thread.c                                     | 1 -
 gdb/sol2-tdep.c                                      | 1 -
 gdb/solib-aix.c                                      | 1 -
 gdb/solib-darwin.c                                   | 1 -
 gdb/solib-dsbt.c                                     | 1 -
 gdb/solib-frv.c                                      | 1 -
 gdb/solib-rocm.c                                     | 1 -
 gdb/solib-svr4.c                                     | 1 -
 gdb/solib-target.c                                   | 1 -
 gdb/solib.c                                          | 1 -
 gdb/source-cache.c                                   | 1 -
 gdb/source.c                                         | 1 -
 gdb/sparc-linux-nat.c                                | 1 -
 gdb/sparc-linux-tdep.c                               | 1 -
 gdb/sparc-nat.c                                      | 1 -
 gdb/sparc-netbsd-nat.c                               | 1 -
 gdb/sparc-netbsd-tdep.c                              | 1 -
 gdb/sparc-obsd-tdep.c                                | 1 -
 gdb/sparc-ravenscar-thread.c                         | 1 -
 gdb/sparc-sol2-nat.c                                 | 1 -
 gdb/sparc-sol2-tdep.c                                | 1 -
 gdb/sparc-tdep.c                                     | 1 -
 gdb/sparc64-fbsd-nat.c                               | 1 -
 gdb/sparc64-fbsd-tdep.c                              | 1 -
 gdb/sparc64-linux-nat.c                              | 1 -
 gdb/sparc64-linux-tdep.c                             | 1 -
 gdb/sparc64-nat.c                                    | 1 -
 gdb/sparc64-netbsd-nat.c                             | 1 -
 gdb/sparc64-netbsd-tdep.c                            | 1 -
 gdb/sparc64-obsd-nat.c                               | 1 -
 gdb/sparc64-obsd-tdep.c                              | 1 -
 gdb/sparc64-sol2-tdep.c                              | 1 -
 gdb/sparc64-tdep.c                                   | 1 -
 gdb/split-name.c                                     | 1 -
 gdb/stabsread.c                                      | 1 -
 gdb/stack.c                                          | 1 -
 gdb/stap-probe.c                                     | 1 -
 gdb/std-regs.c                                       | 1 -
 gdb/stub-termcap.c                                   | 1 -
 gdb/symfile-debug.c                                  | 1 -
 gdb/symfile-mem.c                                    | 1 -
 gdb/symfile.c                                        | 1 -
 gdb/symmisc.c                                        | 1 -
 gdb/symtab.c                                         | 1 -
 gdb/target-connection.c                              | 1 -
 gdb/target-dcache.c                                  | 1 -
 gdb/target-descriptions.c                            | 2 --
 gdb/target-float.c                                   | 1 -
 gdb/target-memory.c                                  | 1 -
 gdb/target.c                                         | 1 -
 gdb/target/target.c                                  | 1 -
 gdb/target/waitstatus.c                              | 1 -
 gdb/test-target.c                                    | 1 -
 gdb/thread-iter.c                                    | 1 -
 gdb/thread.c                                         | 1 -
 gdb/tic6x-linux-tdep.c                               | 1 -
 gdb/tic6x-tdep.c                                     | 1 -
 gdb/tid-parse.c                                      | 1 -
 gdb/tilegx-linux-nat.c                               | 1 -
 gdb/tilegx-linux-tdep.c                              | 1 -
 gdb/tilegx-tdep.c                                    | 1 -
 gdb/top.c                                            | 1 -
 gdb/tracectf.c                                       | 1 -
 gdb/tracefile-tfile.c                                | 1 -
 gdb/tracefile.c                                      | 1 -
 gdb/tracepoint.c                                     | 1 -
 gdb/trad-frame.c                                     | 1 -
 gdb/tramp-frame.c                                    | 1 -
 gdb/tui/tui-command.c                                | 1 -
 gdb/tui/tui-data.c                                   | 1 -
 gdb/tui/tui-disasm.c                                 | 1 -
 gdb/tui/tui-file.c                                   | 1 -
 gdb/tui/tui-hooks.c                                  | 1 -
 gdb/tui/tui-interp.c                                 | 1 -
 gdb/tui/tui-io.c                                     | 1 -
 gdb/tui/tui-layout.c                                 | 1 -
 gdb/tui/tui-location.c                               | 1 -
 gdb/tui/tui-regs.c                                   | 1 -
 gdb/tui/tui-source.c                                 | 1 -
 gdb/tui/tui-status.c                                 | 1 -
 gdb/tui/tui-win.c                                    | 1 -
 gdb/tui/tui-wingeneral.c                             | 1 -
 gdb/tui/tui-winsource.c                              | 1 -
 gdb/tui/tui.c                                        | 1 -
 gdb/type-stack.c                                     | 1 -
 gdb/typeprint.c                                      | 1 -
 gdb/ui-file.c                                        | 1 -
 gdb/ui-out.c                                         | 1 -
 gdb/ui-style.c                                       | 1 -
 gdb/ui.c                                             | 1 -
 gdb/unittests/array-view-selftests.c                 | 1 -
 gdb/unittests/child-path-selftests.c                 | 1 -
 gdb/unittests/cli-utils-selftests.c                  | 1 -
 gdb/unittests/command-def-selftests.c                | 1 -
 gdb/unittests/common-utils-selftests.c               | 1 -
 gdb/unittests/copy_bitwise-selftests.c               | 1 -
 gdb/unittests/enum-flags-selftests.c                 | 1 -
 gdb/unittests/environ-selftests.c                    | 1 -
 gdb/unittests/filtered_iterator-selftests.c          | 1 -
 gdb/unittests/format_pieces-selftests.c              | 1 -
 gdb/unittests/frame_info_ptr-selftests.c             | 1 -
 gdb/unittests/function-view-selftests.c              | 1 -
 gdb/unittests/gdb_tilde_expand-selftests.c           | 1 -
 gdb/unittests/gmp-utils-selftests.c                  | 1 -
 gdb/unittests/intrusive_list-selftests.c             | 1 -
 gdb/unittests/lookup_name_info-selftests.c           | 1 -
 gdb/unittests/main-thread-selftests.c                | 1 -
 gdb/unittests/memory-map-selftests.c                 | 1 -
 gdb/unittests/memrange-selftests.c                   | 1 -
 gdb/unittests/mkdir-recursive-selftests.c            | 1 -
 gdb/unittests/observable-selftests.c                 | 1 -
 gdb/unittests/offset-type-selftests.c                | 1 -
 gdb/unittests/packed-selftests.c                     | 1 -
 gdb/unittests/parallel-for-selftests.c               | 1 -
 gdb/unittests/parse-connection-spec-selftests.c      | 1 -
 gdb/unittests/path-join-selftests.c                  | 1 -
 gdb/unittests/ptid-selftests.c                       | 1 -
 gdb/unittests/rsp-low-selftests.c                    | 1 -
 gdb/unittests/scoped_fd-selftests.c                  | 1 -
 gdb/unittests/scoped_ignore_signal-selftests.c       | 1 -
 gdb/unittests/scoped_mmap-selftests.c                | 1 -
 gdb/unittests/scoped_restore-selftests.c             | 1 -
 gdb/unittests/search-memory-selftests.c              | 1 -
 gdb/unittests/style-selftests.c                      | 1 -
 gdb/unittests/tracepoint-selftests.c                 | 1 -
 gdb/unittests/tui-selftests.c                        | 1 -
 gdb/unittests/ui-file-selftests.c                    | 1 -
 gdb/unittests/unique_xmalloc_ptr_char.c              | 1 -
 gdb/unittests/unpack-selftests.c                     | 1 -
 gdb/unittests/utils-selftests.c                      | 1 -
 gdb/unittests/vec-utils-selftests.c                  | 1 -
 gdb/unittests/xml-utils-selftests.c                  | 1 -
 gdb/user-regs.c                                      | 1 -
 gdb/utils.c                                          | 1 -
 gdb/v850-tdep.c                                      | 1 -
 gdb/valarith.c                                       | 1 -
 gdb/valops.c                                         | 1 -
 gdb/valprint.c                                       | 1 -
 gdb/value.c                                          | 1 -
 gdb/varobj.c                                         | 1 -
 gdb/vax-bsd-nat.c                                    | 1 -
 gdb/vax-netbsd-tdep.c                                | 1 -
 gdb/vax-tdep.c                                       | 1 -
 gdb/windows-nat.c                                    | 1 -
 gdb/windows-tdep.c                                   | 1 -
 gdb/x86-bsd-nat.c                                    | 1 -
 gdb/x86-fbsd-nat.c                                   | 1 -
 gdb/x86-linux-nat.c                                  | 1 -
 gdb/x86-nat.c                                        | 1 -
 gdb/x86-tdep.c                                       | 1 -
 gdb/xcoffread.c                                      | 1 -
 gdb/xml-support.c                                    | 1 -
 gdb/xml-syscall.c                                    | 1 -
 gdb/xml-tdesc.c                                      | 1 -
 gdb/xstormy16-tdep.c                                 | 1 -
 gdb/xtensa-config.c                                  | 1 -
 gdb/xtensa-linux-nat.c                               | 1 -
 gdb/xtensa-linux-tdep.c                              | 1 -
 gdb/xtensa-tdep.c                                    | 1 -
 gdb/z80-tdep.c                                       | 1 -
 gdbserver/ax.cc                                      | 1 -
 gdbserver/debug.cc                                   | 1 -
 gdbserver/dll.cc                                     | 1 -
 gdbserver/fork-child.cc                              | 1 -
 gdbserver/gdbreplay.cc                               | 2 --
 gdbserver/hostio.cc                                  | 1 -
 gdbserver/i387-fp.cc                                 | 1 -
 gdbserver/inferiors.cc                               | 1 -
 gdbserver/linux-aarch32-low.cc                       | 1 -
 gdbserver/linux-aarch32-tdesc.cc                     | 1 -
 gdbserver/linux-aarch64-ipa.cc                       | 1 -
 gdbserver/linux-aarch64-low.cc                       | 1 -
 gdbserver/linux-aarch64-tdesc.cc                     | 1 -
 gdbserver/linux-amd64-ipa.cc                         | 1 -
 gdbserver/linux-arc-low.cc                           | 1 -
 gdbserver/linux-arm-low.cc                           | 1 -
 gdbserver/linux-arm-tdesc.cc                         | 1 -
 gdbserver/linux-csky-low.cc                          | 1 -
 gdbserver/linux-i386-ipa.cc                          | 1 -
 gdbserver/linux-ia64-low.cc                          | 1 -
 gdbserver/linux-loongarch-low.cc                     | 1 -
 gdbserver/linux-low.cc                               | 1 -
 gdbserver/linux-m68k-low.cc                          | 1 -
 gdbserver/linux-mips-low.cc                          | 1 -
 gdbserver/linux-nios2-low.cc                         | 1 -
 gdbserver/linux-or1k-low.cc                          | 1 -
 gdbserver/linux-ppc-ipa.cc                           | 1 -
 gdbserver/linux-ppc-low.cc                           | 1 -
 gdbserver/linux-riscv-low.cc                         | 1 -
 gdbserver/linux-s390-ipa.cc                          | 1 -
 gdbserver/linux-s390-low.cc                          | 1 -
 gdbserver/linux-sh-low.cc                            | 1 -
 gdbserver/linux-sparc-low.cc                         | 1 -
 gdbserver/linux-tic6x-low.cc                         | 1 -
 gdbserver/linux-x86-low.cc                           | 1 -
 gdbserver/linux-x86-tdesc.cc                         | 1 -
 gdbserver/linux-xtensa-low.cc                        | 1 -
 gdbserver/mem-break.cc                               | 1 -
 gdbserver/netbsd-aarch64-low.cc                      | 1 -
 gdbserver/netbsd-amd64-low.cc                        | 1 -
 gdbserver/netbsd-i386-low.cc                         | 1 -
 gdbserver/netbsd-low.cc                              | 1 -
 gdbserver/notif.cc                                   | 1 -
 gdbserver/proc-service.cc                            | 1 -
 gdbserver/regcache.cc                                | 1 -
 gdbserver/remote-utils.cc                            | 1 -
 gdbserver/server.cc                                  | 1 -
 gdbserver/symbol.cc                                  | 1 -
 gdbserver/target.cc                                  | 1 -
 gdbserver/tdesc.cc                                   | 1 -
 gdbserver/thread-db.cc                               | 1 -
 gdbserver/tracepoint.cc                              | 1 -
 gdbserver/utils.cc                                   | 1 -
 gdbserver/win32-i386-low.cc                          | 1 -
 gdbserver/win32-low.cc                               | 1 -
 gdbserver/x86-low.cc                                 | 1 -
 gdbsupport/agent.cc                                  | 1 -
 gdbsupport/btrace-common.cc                          | 1 -
 gdbsupport/cleanups.cc                               | 1 -
 gdbsupport/common-debug.cc                           | 1 -
 gdbsupport/common-exceptions.cc                      | 1 -
 gdbsupport/common-inferior.cc                        | 1 -
 gdbsupport/common-regcache.cc                        | 1 -
 gdbsupport/common-utils.cc                           | 1 -
 gdbsupport/environ.cc                                | 1 -
 gdbsupport/errors.cc                                 | 1 -
 gdbsupport/event-loop.cc                             | 1 -
 gdbsupport/event-pipe.cc                             | 1 -
 gdbsupport/fileio.cc                                 | 1 -
 gdbsupport/filestuff.cc                              | 1 -
 gdbsupport/format.cc                                 | 1 -
 gdbsupport/gdb-dlfcn.cc                              | 1 -
 gdbsupport/gdb-hashtab.cc                            | 1 -
 gdbsupport/gdb_obstack.cc                            | 1 -
 gdbsupport/gdb_regex.cc                              | 1 -
 gdbsupport/gdb_tilde_expand.cc                       | 1 -
 gdbsupport/gdb_vecs.cc                               | 1 -
 gdbsupport/gdb_wait.cc                               | 1 -
 gdbsupport/job-control.cc                            | 1 -
 gdbsupport/netstuff.cc                               | 1 -
 gdbsupport/new-op.cc                                 | 1 -
 gdbsupport/pathstuff.cc                              | 1 -
 gdbsupport/print-utils.cc                            | 1 -
 gdbsupport/ptid.cc                                   | 1 -
 gdbsupport/rsp-low.cc                                | 1 -
 gdbsupport/run-time-clock.cc                         | 1 -
 gdbsupport/safe-strerror.cc                          | 1 -
 gdbsupport/scoped_mmap.cc                            | 1 -
 gdbsupport/search.cc                                 | 1 -
 gdbsupport/selftest.cc                               | 1 -
 gdbsupport/signals-state-save-restore.cc             | 1 -
 gdbsupport/signals.cc                                | 1 -
 gdbsupport/task-group.cc                             | 1 -
 gdbsupport/tdesc.cc                                  | 1 -
 gdbsupport/thread-pool.cc                            | 1 -
 gdbsupport/xml-utils.cc                              | 1 -
 892 files changed, 1 insertion(+), 902 deletions(-)

diff --git a/gdb/aarch32-linux-nat.c b/gdb/aarch32-linux-nat.c
index 8c1b3ab49cc6..edff97b0ea9e 100644
--- a/gdb/aarch32-linux-nat.c
+++ b/gdb/aarch32-linux-nat.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "regcache.h"
 #include "arm-tdep.h"
diff --git a/gdb/aarch32-tdep.c b/gdb/aarch32-tdep.c
index 0b7783c3e15d..5a54a71ba4fd 100644
--- a/gdb/aarch32-tdep.c
+++ b/gdb/aarch32-tdep.c
@@ -15,8 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
-
 #include "aarch32-tdep.h"
 
 #include "gdbsupport/common-regcache.h"
diff --git a/gdb/aarch64-fbsd-nat.c b/gdb/aarch64-fbsd-nat.c
index 89ed12bb8e57..7ca8463ece85 100644
--- a/gdb/aarch64-fbsd-nat.c
+++ b/gdb/aarch64-fbsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "inferior.h"
 #include "regcache.h"
diff --git a/gdb/aarch64-fbsd-tdep.c b/gdb/aarch64-fbsd-tdep.c
index 44ca6c90c818..e2ff57e83900 100644
--- a/gdb/aarch64-fbsd-tdep.c
+++ b/gdb/aarch64-fbsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "gdbarch.h"
 #include "fbsd-tdep.h"
diff --git a/gdb/aarch64-linux-nat.c b/gdb/aarch64-linux-nat.c
index cf7d5f8c6b14..3face34ce791 100644
--- a/gdb/aarch64-linux-nat.c
+++ b/gdb/aarch64-linux-nat.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "inferior.h"
 #include "gdbcore.h"
diff --git a/gdb/aarch64-linux-tdep.c b/gdb/aarch64-linux-tdep.c
index 4ebc173a0a00..0b9784f38e4c 100644
--- a/gdb/aarch64-linux-tdep.c
+++ b/gdb/aarch64-linux-tdep.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "gdbarch.h"
 #include "glibc-tdep.h"
diff --git a/gdb/aarch64-nat.c b/gdb/aarch64-nat.c
index 802bab6d6824..894fb73095b9 100644
--- a/gdb/aarch64-nat.c
+++ b/gdb/aarch64-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbarch.h"
 #include "inferior.h"
 #include "cli/cli-cmds.h"
diff --git a/gdb/aarch64-newlib-tdep.c b/gdb/aarch64-newlib-tdep.c
index c6370066aa35..4ac42a4ae268 100644
--- a/gdb/aarch64-newlib-tdep.c
+++ b/gdb/aarch64-newlib-tdep.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "gdbarch.h"
 #include "aarch64-tdep.h"
diff --git a/gdb/aarch64-ravenscar-thread.c b/gdb/aarch64-ravenscar-thread.c
index 155641d5b7c5..5a877cde89da 100644
--- a/gdb/aarch64-ravenscar-thread.c
+++ b/gdb/aarch64-ravenscar-thread.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "regcache.h"
 #include "aarch64-tdep.h"
diff --git a/gdb/aarch64-tdep.c b/gdb/aarch64-tdep.c
index d1d5486f90dd..545ec872fd86 100644
--- a/gdb/aarch64-tdep.c
+++ b/gdb/aarch64-tdep.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "frame.h"
 #include "language.h"
diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y
index 2b205714d7a3..b116f31104e8 100644
--- a/gdb/ada-exp.y
+++ b/gdb/ada-exp.y
@@ -35,7 +35,6 @@
 
 %{
 
-#include "defs.h"
 #include <ctype.h>
 #include "expression.h"
 #include "value.h"
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 493ef3b6c7d4..c9f12d72b70d 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include "defs.h"
 #include <ctype.h>
 #include "gdbsupport/gdb_regex.h"
 #include "frame.h"
diff --git a/gdb/ada-tasks.c b/gdb/ada-tasks.c
index 8ae94dcdbab2..864c5cfdf1c6 100644
--- a/gdb/ada-tasks.c
+++ b/gdb/ada-tasks.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "observable.h"
 #include "gdbcmd.h"
 #include "target.h"
diff --git a/gdb/ada-typeprint.c b/gdb/ada-typeprint.c
index df047d82fd64..deead1055dbf 100644
--- a/gdb/ada-typeprint.c
+++ b/gdb/ada-typeprint.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "bfd.h"
 #include "gdbtypes.h"
 #include "value.h"
diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
index ac85440b1396..6acfb9a48b69 100644
--- a/gdb/ada-valprint.c
+++ b/gdb/ada-valprint.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include <ctype.h>
 #include "gdbtypes.h"
 #include "expression.h"
diff --git a/gdb/ada-varobj.c b/gdb/ada-varobj.c
index 0a4c73f9c728..21412dbf2200 100644
--- a/gdb/ada-varobj.c
+++ b/gdb/ada-varobj.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "ada-lang.h"
 #include "varobj.h"
 #include "language.h"
diff --git a/gdb/addrmap.c b/gdb/addrmap.c
index 162ab84763bb..0c60c0c2cebd 100644
--- a/gdb/addrmap.c
+++ b/gdb/addrmap.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/gdb_obstack.h"
 #include "addrmap.h"
 #include "gdbsupport/selftest.h"
diff --git a/gdb/agent.c b/gdb/agent.c
index a01b02cd4d38..00e75458a79e 100644
--- a/gdb/agent.c
+++ b/gdb/agent.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "command.h"
 #include "gdbcmd.h"
 #include "target.h"
diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c
index c70bd82bc24e..0fe87b2b0809 100644
--- a/gdb/aix-thread.c
+++ b/gdb/aix-thread.c
@@ -39,7 +39,6 @@
 
      */
 
-#include "defs.h"
 #include "gdbthread.h"
 #include "target.h"
 #include "inferior.h"
diff --git a/gdb/alloc.c b/gdb/alloc.c
index 7c45c45ece38..d07c81f49553 100644
--- a/gdb/alloc.c
+++ b/gdb/alloc.c
@@ -27,14 +27,9 @@
    file can't live there.
 
    So, it lives in gdb and is built separately by gdb and gdbserver.
-   Please be aware of this when modifying it.
+   Please be aware of this when modifying it.  */
 
-   This also explains why this file includes common-defs.h and not
-   defs.h or server.h -- we'd prefer to avoid depending on the
-   GDBSERVER define when possible, and for this file it seemed
-   simple to do so.  */
 
-#include "gdbsupport/common-defs.h"
 #include "libiberty.h"
 #include "gdbsupport/errors.h"
 
diff --git a/gdb/alpha-bsd-nat.c b/gdb/alpha-bsd-nat.c
index 790958e33309..11e1639173a3 100644
--- a/gdb/alpha-bsd-nat.c
+++ b/gdb/alpha-bsd-nat.c
@@ -19,7 +19,6 @@
 
 /* We define this to get types like register_t.  */
 #define _KERNTYPES
-#include "defs.h"
 #include "inferior.h"
 #include "regcache.h"
 
diff --git a/gdb/alpha-bsd-tdep.c b/gdb/alpha-bsd-tdep.c
index 03becf22d9f1..21e39cc937ca 100644
--- a/gdb/alpha-bsd-tdep.c
+++ b/gdb/alpha-bsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "regcache.h"
 
 #include "alpha-tdep.h"
diff --git a/gdb/alpha-linux-nat.c b/gdb/alpha-linux-nat.c
index 618b0c8140b7..83d6bc468584 100644
--- a/gdb/alpha-linux-nat.c
+++ b/gdb/alpha-linux-nat.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "target.h"
 #include "regcache.h"
 #include "linux-nat-trad.h"
diff --git a/gdb/alpha-linux-tdep.c b/gdb/alpha-linux-tdep.c
index 5f5e46d514e4..9a40e0cda111 100644
--- a/gdb/alpha-linux-tdep.c
+++ b/gdb/alpha-linux-tdep.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "osabi.h"
 #include "solib-svr4.h"
diff --git a/gdb/alpha-mdebug-tdep.c b/gdb/alpha-mdebug-tdep.c
index 7e9312d2aa73..abded2ac1921 100644
--- a/gdb/alpha-mdebug-tdep.c
+++ b/gdb/alpha-mdebug-tdep.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "frame-base.h"
diff --git a/gdb/alpha-netbsd-tdep.c b/gdb/alpha-netbsd-tdep.c
index 569fe42a2a94..f3cd62b0b58e 100644
--- a/gdb/alpha-netbsd-tdep.c
+++ b/gdb/alpha-netbsd-tdep.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "gdbcore.h"
 #include "osabi.h"
diff --git a/gdb/alpha-obsd-tdep.c b/gdb/alpha-obsd-tdep.c
index 610866835c85..8602e21c64aa 100644
--- a/gdb/alpha-obsd-tdep.c
+++ b/gdb/alpha-obsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "gdbcore.h"
 #include "osabi.h"
diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c
index e5e0860fe241..c93bd69657f6 100644
--- a/gdb/alpha-tdep.c
+++ b/gdb/alpha-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "frame-base.h"
diff --git a/gdb/amd-dbgapi-target.c b/gdb/amd-dbgapi-target.c
index 3fdc3cd838af..fcde6d27ffb3 100644
--- a/gdb/amd-dbgapi-target.c
+++ b/gdb/amd-dbgapi-target.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "amd-dbgapi-target.h"
 #include "amdgpu-tdep.h"
diff --git a/gdb/amd64-bsd-nat.c b/gdb/amd64-bsd-nat.c
index ea9c0f47c6bf..e0ba28fa9fb8 100644
--- a/gdb/amd64-bsd-nat.c
+++ b/gdb/amd64-bsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "regcache.h"
 #include "target.h"
diff --git a/gdb/amd64-darwin-tdep.c b/gdb/amd64-darwin-tdep.c
index 001f5379def2..b0bead084fea 100644
--- a/gdb/amd64-darwin-tdep.c
+++ b/gdb/amd64-darwin-tdep.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "inferior.h"
 #include "gdbcore.h"
diff --git a/gdb/amd64-dicos-tdep.c b/gdb/amd64-dicos-tdep.c
index cc91b92f6dc0..7624289dc25d 100644
--- a/gdb/amd64-dicos-tdep.c
+++ b/gdb/amd64-dicos-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "osabi.h"
 #include "amd64-tdep.h"
 #include "gdbsupport/x86-xstate.h"
diff --git a/gdb/amd64-fbsd-nat.c b/gdb/amd64-fbsd-nat.c
index 6a742034cbcd..6ce7c45b8b3c 100644
--- a/gdb/amd64-fbsd-nat.c
+++ b/gdb/amd64-fbsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "regcache.h"
 #include "target.h"
diff --git a/gdb/amd64-fbsd-tdep.c b/gdb/amd64-fbsd-tdep.c
index a837bd197ffe..de295099052f 100644
--- a/gdb/amd64-fbsd-tdep.c
+++ b/gdb/amd64-fbsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "osabi.h"
 #include "regset.h"
 #include "target.h"
diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c
index 0ee878f54018..aa9295d57230 100644
--- a/gdb/amd64-linux-nat.c
+++ b/gdb/amd64-linux-nat.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "regcache.h"
 #include "elf/common.h"
diff --git a/gdb/amd64-linux-tdep.c b/gdb/amd64-linux-tdep.c
index 1deb13b4e9ad..9d560ac4fbf4 100644
--- a/gdb/amd64-linux-tdep.c
+++ b/gdb/amd64-linux-tdep.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "frame.h"
 #include "gdbcore.h"
diff --git a/gdb/amd64-nat.c b/gdb/amd64-nat.c
index cb76658ab580..5c5c368c93d6 100644
--- a/gdb/amd64-nat.c
+++ b/gdb/amd64-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbarch.h"
 #include "regcache.h"
 
diff --git a/gdb/amd64-netbsd-nat.c b/gdb/amd64-netbsd-nat.c
index abd92abd77f7..8bd3e122e7b0 100644
--- a/gdb/amd64-netbsd-nat.c
+++ b/gdb/amd64-netbsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "target.h"
 
 #include "netbsd-nat.h"
diff --git a/gdb/amd64-netbsd-tdep.c b/gdb/amd64-netbsd-tdep.c
index 40500ee5f76c..264042059b73 100644
--- a/gdb/amd64-netbsd-tdep.c
+++ b/gdb/amd64-netbsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "frame.h"
 #include "gdbcore.h"
diff --git a/gdb/amd64-obsd-nat.c b/gdb/amd64-obsd-nat.c
index 16c2c2d67a5e..717f6bd78677 100644
--- a/gdb/amd64-obsd-nat.c
+++ b/gdb/amd64-obsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "regcache.h"
 #include "target.h"
diff --git a/gdb/amd64-obsd-tdep.c b/gdb/amd64-obsd-tdep.c
index 6b37e8954ee4..f6f63bbf8ed0 100644
--- a/gdb/amd64-obsd-tdep.c
+++ b/gdb/amd64-obsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "gdbcore.h"
diff --git a/gdb/amd64-ravenscar-thread.c b/gdb/amd64-ravenscar-thread.c
index a97ed3c43cf1..a0de0d731351 100644
--- a/gdb/amd64-ravenscar-thread.c
+++ b/gdb/amd64-ravenscar-thread.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbarch.h"
 #include "gdbcore.h"
 #include "regcache.h"
diff --git a/gdb/amd64-sol2-tdep.c b/gdb/amd64-sol2-tdep.c
index 6cc84017f740..070d7ed324bd 100644
--- a/gdb/amd64-sol2-tdep.c
+++ b/gdb/amd64-sol2-tdep.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "gdbcore.h"
 #include "regcache.h"
diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
index 60d6b7aa1988..0bb7a24cbd08 100644
--- a/gdb/amd64-tdep.c
+++ b/gdb/amd64-tdep.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "language.h"
 #include "opcode/i386.h"
 #include "dis-asm.h"
diff --git a/gdb/amd64-windows-nat.c b/gdb/amd64-windows-nat.c
index b4625b2f0ded..a282762d027b 100644
--- a/gdb/amd64-windows-nat.c
+++ b/gdb/amd64-windows-nat.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "windows-nat.h"
 #include "x86-nat.h"
 #include "amd64-tdep.h"
diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c
index af17886c0806..a559d967b3c9 100644
--- a/gdb/amd64-windows-tdep.c
+++ b/gdb/amd64-windows-tdep.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "osabi.h"
 #include "amd64-tdep.h"
 #include "gdbsupport/x86-xstate.h"
diff --git a/gdb/amdgpu-tdep.c b/gdb/amdgpu-tdep.c
index ac137d9acc44..49996aeefc33 100644
--- a/gdb/amdgpu-tdep.c
+++ b/gdb/amdgpu-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "amd-dbgapi-target.h"
 #include "amdgpu-tdep.h"
diff --git a/gdb/annotate.c b/gdb/annotate.c
index 468b9698f023..19195ac70970 100644
--- a/gdb/annotate.c
+++ b/gdb/annotate.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "annotate.h"
 #include "value.h"
 #include "target.h"
diff --git a/gdb/arc-linux-nat.c b/gdb/arc-linux-nat.c
index 9f8125f8a235..66f00008089d 100644
--- a/gdb/arc-linux-nat.c
+++ b/gdb/arc-linux-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "inferior.h"
 #include "gdbcore.h"
diff --git a/gdb/arc-linux-tdep.c b/gdb/arc-linux-tdep.c
index ca630ab6df0c..54406ac5b907 100644
--- a/gdb/arc-linux-tdep.c
+++ b/gdb/arc-linux-tdep.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* GDB header files.  */
-#include "defs.h"
 #include "linux-tdep.h"
 #include "objfiles.h"
 #include "opcode/arc.h"
diff --git a/gdb/arc-newlib-tdep.c b/gdb/arc-newlib-tdep.c
index 2efea56a7c4a..dbc096142b5f 100644
--- a/gdb/arc-newlib-tdep.c
+++ b/gdb/arc-newlib-tdep.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "gdbarch.h"
 #include "arc-tdep.h"
diff --git a/gdb/arc-tdep.c b/gdb/arc-tdep.c
index 63a1fd918d1f..5684f324233c 100644
--- a/gdb/arc-tdep.c
+++ b/gdb/arc-tdep.c
@@ -19,7 +19,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* GDB header files.  */
-#include "defs.h"
 #include "arch-utils.h"
 #include "elf-bfd.h"
 #include "disasm.h"
diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index d404d1fc38a3..456bfe971ffa 100644
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "arch-utils.h"
 #include "gdbcmd.h"
diff --git a/gdb/arch/aarch32.c b/gdb/arch/aarch32.c
index 9f3e25088f41..ead368f5fb59 100644
--- a/gdb/arch/aarch32.c
+++ b/gdb/arch/aarch32.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "aarch32.h"
 
 #include "../features/arm/arm-core.c"
diff --git a/gdb/arch/aarch64-insn.c b/gdb/arch/aarch64-insn.c
index 65a2841eef5a..3caef45df70b 100644
--- a/gdb/arch/aarch64-insn.c
+++ b/gdb/arch/aarch64-insn.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "aarch64-insn.h"
 
 /* Toggle this file's internal debugging dump.  */
diff --git a/gdb/arch/aarch64-mte-linux.h b/gdb/arch/aarch64-mte-linux.h
index e0f4a9845b52..460b10e05c97 100644
--- a/gdb/arch/aarch64-mte-linux.h
+++ b/gdb/arch/aarch64-mte-linux.h
@@ -20,7 +20,6 @@
 #ifndef ARCH_AARCH64_MTE_LINUX_H
 #define ARCH_AARCH64_MTE_LINUX_H
 
-#include "gdbsupport/common-defs.h"
 
 /* Feature check for Memory Tagging Extension.  */
 #ifndef HWCAP2_MTE
diff --git a/gdb/arch/aarch64-scalable-linux.h b/gdb/arch/aarch64-scalable-linux.h
index 43577c43797f..4d2ace8f153b 100644
--- a/gdb/arch/aarch64-scalable-linux.h
+++ b/gdb/arch/aarch64-scalable-linux.h
@@ -21,7 +21,6 @@
 #ifndef ARCH_AARCH64_SCALABLE_LINUX_H
 #define ARCH_AARCH64_SCALABLE_LINUX_H
 
-#include "gdbsupport/common-defs.h"
 #include "gdbsupport/common-regcache.h"
 
 /* Feature check for Scalable Matrix Extension.  */
diff --git a/gdb/arch/aarch64.c b/gdb/arch/aarch64.c
index dfa4f592ef73..5526aa1b580b 100644
--- a/gdb/arch/aarch64.c
+++ b/gdb/arch/aarch64.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "aarch64.h"
 #include <stdlib.h>
 
diff --git a/gdb/arch/amd64.c b/gdb/arch/amd64.c
index b8ff42700797..cb9683c6931f 100644
--- a/gdb/arch/amd64.c
+++ b/gdb/arch/amd64.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "amd64.h"
 #include "gdbsupport/x86-xstate.h"
 #include <stdlib.h>
diff --git a/gdb/arch/arc.c b/gdb/arch/arc.c
index aeb476df1a00..e807b60539f6 100644
--- a/gdb/arch/arc.c
+++ b/gdb/arch/arc.c
@@ -16,7 +16,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include "gdbsupport/common-defs.h"
 #include "arc.h"
 #include <stdlib.h>
 #include <unordered_map>
diff --git a/gdb/arch/arm-get-next-pcs.c b/gdb/arch/arm-get-next-pcs.c
index 3657ac799c31..03115cf21387 100644
--- a/gdb/arch/arm-get-next-pcs.c
+++ b/gdb/arch/arm-get-next-pcs.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "gdbsupport/gdb_vecs.h"
 #include "gdbsupport/common-regcache.h"
 #include "arm.h"
diff --git a/gdb/arch/arm-linux.c b/gdb/arch/arm-linux.c
index 80c3cdd2e338..246bade658fe 100644
--- a/gdb/arch/arm-linux.c
+++ b/gdb/arch/arm-linux.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "gdbsupport/common-regcache.h"
 #include "arch/arm.h"
 #include "arm-linux.h"
diff --git a/gdb/arch/arm.c b/gdb/arch/arm.c
index 111803027d77..f1c292b44c9b 100644
--- a/gdb/arch/arm.c
+++ b/gdb/arch/arm.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "gdbsupport/common-regcache.h"
 #include "arm.h"
 
diff --git a/gdb/arch/csky.c b/gdb/arch/csky.c
index 3ecba618764c..32df2ade7183 100644
--- a/gdb/arch/csky.c
+++ b/gdb/arch/csky.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "csky.h"
 #include <stdlib.h>
 
diff --git a/gdb/arch/i386.c b/gdb/arch/i386.c
index 0e46b6afd5f7..f3165c5b7f0c 100644
--- a/gdb/arch/i386.c
+++ b/gdb/arch/i386.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "i386.h"
 #include "gdbsupport/tdesc.h"
 #include "gdbsupport/x86-xstate.h"
diff --git a/gdb/arch/loongarch.c b/gdb/arch/loongarch.c
index 22f2d3936cab..04b6dfc82794 100644
--- a/gdb/arch/loongarch.c
+++ b/gdb/arch/loongarch.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "loongarch.h"
 #include <stdlib.h>
 #include <unordered_map>
diff --git a/gdb/arch/ppc-linux-common.c b/gdb/arch/ppc-linux-common.c
index e67327872b6f..0a6915cdc097 100644
--- a/gdb/arch/ppc-linux-common.c
+++ b/gdb/arch/ppc-linux-common.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "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 cafcda50e54b..9a84844a6456 100644
--- a/gdb/arch/riscv.c
+++ b/gdb/arch/riscv.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "riscv.h"
 #include <stdlib.h>
 #include <unordered_map>
diff --git a/gdb/arch/tic6x.c b/gdb/arch/tic6x.c
index dea409a39469..680a79420708 100644
--- a/gdb/arch/tic6x.c
+++ b/gdb/arch/tic6x.c
@@ -17,7 +17,6 @@
 
 #include "gdbsupport/tdesc.h"
 #include "tic6x.h"
-#include "gdbsupport/common-defs.h"
 
 #include "../features/tic6x-core.c"
 #include "../features/tic6x-gp.c"
diff --git a/gdb/arm-bsd-tdep.c b/gdb/arm-bsd-tdep.c
index 1a9ebcf202cc..1ccabcb24f06 100644
--- a/gdb/arm-bsd-tdep.c
+++ b/gdb/arm-bsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "osabi.h"
 #include "regcache.h"
 #include "regset.h"
diff --git a/gdb/arm-fbsd-nat.c b/gdb/arm-fbsd-nat.c
index 80c901842ee5..cbe9867f49d2 100644
--- a/gdb/arm-fbsd-nat.c
+++ b/gdb/arm-fbsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "target.h"
 
diff --git a/gdb/arm-fbsd-tdep.c b/gdb/arm-fbsd-tdep.c
index 7b82de2166b5..dfb75329cd8c 100644
--- a/gdb/arm-fbsd-tdep.c
+++ b/gdb/arm-fbsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "elf/common.h"
 #include "target-descriptions.h"
diff --git a/gdb/arm-linux-nat.c b/gdb/arm-linux-nat.c
index 75f498cd5b3f..50c24ecfcd2e 100644
--- a/gdb/arm-linux-nat.c
+++ b/gdb/arm-linux-nat.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "gdbcore.h"
 #include "regcache.h"
diff --git a/gdb/arm-linux-tdep.c b/gdb/arm-linux-tdep.c
index a8b27a7463a6..8511abcd11d6 100644
--- a/gdb/arm-linux-tdep.c
+++ b/gdb/arm-linux-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "target.h"
 #include "value.h"
 #include "gdbtypes.h"
diff --git a/gdb/arm-netbsd-nat.c b/gdb/arm-netbsd-nat.c
index 4b9f92946412..37f6530a0fe8 100644
--- a/gdb/arm-netbsd-nat.c
+++ b/gdb/arm-netbsd-nat.c
@@ -19,7 +19,6 @@
 
 /* We define this to get types like register_t.  */
 #define _KERNTYPES
-#include "defs.h"
 #include "gdbcore.h"
 #include "inferior.h"
 #include "regcache.h"
diff --git a/gdb/arm-netbsd-tdep.c b/gdb/arm-netbsd-tdep.c
index 829e1d3d4b8b..f77fec7894ab 100644
--- a/gdb/arm-netbsd-tdep.c
+++ b/gdb/arm-netbsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "osabi.h"
 
 #include "arch/arm.h"
diff --git a/gdb/arm-none-tdep.c b/gdb/arm-none-tdep.c
index 72eff2c0b170..453e75234d4b 100644
--- a/gdb/arm-none-tdep.c
+++ b/gdb/arm-none-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arm-tdep.h"
 #include "arch-utils.h"
 #include "regcache.h"
diff --git a/gdb/arm-obsd-tdep.c b/gdb/arm-obsd-tdep.c
index 0bdecec3b6fb..56102b038158 100644
--- a/gdb/arm-obsd-tdep.c
+++ b/gdb/arm-obsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "osabi.h"
 #include "trad-frame.h"
 #include "tramp-frame.h"
diff --git a/gdb/arm-pikeos-tdep.c b/gdb/arm-pikeos-tdep.c
index 5354af6ac7bf..4760755a32a9 100644
--- a/gdb/arm-pikeos-tdep.c
+++ b/gdb/arm-pikeos-tdep.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "objfiles.h"
 #include "arm-tdep.h"
 #include "osabi.h"
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 3a5fbe71b8b5..b4062a8f9225 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include <ctype.h>
 
diff --git a/gdb/arm-wince-tdep.c b/gdb/arm-wince-tdep.c
index b722851e7e1a..eab496c2c0bd 100644
--- a/gdb/arm-wince-tdep.c
+++ b/gdb/arm-wince-tdep.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "osabi.h"
 #include "gdbcore.h"
 #include "target.h"
diff --git a/gdb/async-event.c b/gdb/async-event.c
index 7097c482fff2..32b58652e585 100644
--- a/gdb/async-event.c
+++ b/gdb/async-event.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "async-event.h"
 
 #include "ser-event.h"
diff --git a/gdb/auto-load.c b/gdb/auto-load.c
index a097a3bd2f4b..db6d6ae0f73d 100644
--- a/gdb/auto-load.c
+++ b/gdb/auto-load.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include <ctype.h>
 #include "auto-load.h"
 #include "progspace.h"
diff --git a/gdb/auxv.c b/gdb/auxv.c
index 323ea831d54e..1dc0587c0075 100644
--- a/gdb/auxv.c
+++ b/gdb/auxv.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "target.h"
 #include "gdbtypes.h"
 #include "command.h"
diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
index 2d38f41cd7fa..be95034abd5c 100644
--- a/gdb/avr-tdep.c
+++ b/gdb/avr-tdep.c
@@ -22,7 +22,6 @@
 /* Portions of this file were taken from the original gdb-4.18 patch developed
    by Denis Chertykov, denisc@overta.ru */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "frame-base.h"
diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c
index f6d2bc5772b3..ae0992a298a3 100644
--- a/gdb/ax-gdb.c
+++ b/gdb/ax-gdb.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "symfile.h"
 #include "gdbtypes.h"
diff --git a/gdb/ax-general.c b/gdb/ax-general.c
index 19c684c04e01..3d007456a52e 100644
--- a/gdb/ax-general.c
+++ b/gdb/ax-general.c
@@ -21,7 +21,6 @@
    dependencies, since we want to be able to use them in contexts
    outside of GDB (test suites, the stub, etc.)  */
 
-#include "defs.h"
 #include "ax.h"
 #include "gdbarch.h"
 
diff --git a/gdb/bcache.c b/gdb/bcache.c
index 674ba796833e..a9aab28ab841 100644
--- a/gdb/bcache.c
+++ b/gdb/bcache.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/gdb_obstack.h"
 #include "bcache.h"
 
diff --git a/gdb/bfd-target.c b/gdb/bfd-target.c
index 296e767d0266..96e045e4e52f 100644
--- a/gdb/bfd-target.c
+++ b/gdb/bfd-target.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "target.h"
 #include "bfd-target.h"
 #include "exec.h"
diff --git a/gdb/bfin-linux-tdep.c b/gdb/bfin-linux-tdep.c
index 31aa14765ae8..f67e06478eb1 100644
--- a/gdb/bfin-linux-tdep.c
+++ b/gdb/bfin-linux-tdep.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "regcache.h"
 #include "tramp-frame.h"
diff --git a/gdb/bfin-tdep.c b/gdb/bfin-tdep.c
index 357866ef9532..dbc339d93366 100644
--- a/gdb/bfin-tdep.c
+++ b/gdb/bfin-tdep.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "gdbcore.h"
 #include "arch-utils.h"
diff --git a/gdb/block.c b/gdb/block.c
index 6d0d33fa85ed..511689c9738f 100644
--- a/gdb/block.c
+++ b/gdb/block.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "block.h"
 #include "symtab.h"
 #include "symfile.h"
diff --git a/gdb/blockframe.c b/gdb/blockframe.c
index 451818332de3..b7c751300cbf 100644
--- a/gdb/blockframe.c
+++ b/gdb/blockframe.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "bfd.h"
 #include "objfiles.h"
diff --git a/gdb/bpf-tdep.c b/gdb/bpf-tdep.c
index 1b3f3e72c5b7..098a08aa7e7c 100644
--- a/gdb/bpf-tdep.c
+++ b/gdb/bpf-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "dis-asm.h"
 #include "frame.h"
diff --git a/gdb/break-catch-exec.c b/gdb/break-catch-exec.c
index 35b126ce9048..bd412fccdb73 100644
--- a/gdb/break-catch-exec.c
+++ b/gdb/break-catch-exec.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "annotate.h"
 #include "arch-utils.h"
diff --git a/gdb/break-catch-fork.c b/gdb/break-catch-fork.c
index 9417babdbd15..afbd84741f21 100644
--- a/gdb/break-catch-fork.c
+++ b/gdb/break-catch-fork.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "annotate.h"
 #include "arch-utils.h"
diff --git a/gdb/break-catch-load.c b/gdb/break-catch-load.c
index 9582a7ccaad4..ce30b6fd4275 100644
--- a/gdb/break-catch-load.c
+++ b/gdb/break-catch-load.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "annotate.h"
 #include "arch-utils.h"
diff --git a/gdb/break-catch-sig.c b/gdb/break-catch-sig.c
index b1cee147ef1f..f077fa29a0c1 100644
--- a/gdb/break-catch-sig.c
+++ b/gdb/break-catch-sig.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include <ctype.h>
 #include "breakpoint.h"
diff --git a/gdb/break-catch-syscall.c b/gdb/break-catch-syscall.c
index e5ddd835c92b..a0e6e6788fe8 100644
--- a/gdb/break-catch-syscall.c
+++ b/gdb/break-catch-syscall.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include <ctype.h>
 #include "breakpoint.h"
 #include "gdbcmd.h"
diff --git a/gdb/break-catch-throw.c b/gdb/break-catch-throw.c
index d053bd5fbe02..ce614ac8fe37 100644
--- a/gdb/break-catch-throw.c
+++ b/gdb/break-catch-throw.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include <ctype.h>
 #include "breakpoint.h"
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 39c13107ba26..053d17df03eb 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include <ctype.h>
 #include "hashtab.h"
diff --git a/gdb/bsd-kvm.c b/gdb/bsd-kvm.c
index 76021df1ed5f..a1020b05b193 100644
--- a/gdb/bsd-kvm.c
+++ b/gdb/bsd-kvm.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define _KMEMUSER
-#include "defs.h"
 #include "cli/cli-cmds.h"
 #include "command.h"
 #include "filenames.h"
diff --git a/gdb/bsd-uthread.c b/gdb/bsd-uthread.c
index 10e2ca5939e7..576a9ec1cfbb 100644
--- a/gdb/bsd-uthread.c
+++ b/gdb/bsd-uthread.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "gdbthread.h"
 #include "inferior.h"
diff --git a/gdb/bt-utils.c b/gdb/bt-utils.c
index 6f68e269c511..cbca4a9b7b8e 100644
--- a/gdb/bt-utils.c
+++ b/gdb/bt-utils.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "bt-utils.h"
 #include "command.h"
 #include "gdbcmd.h"
diff --git a/gdb/btrace.c b/gdb/btrace.c
index b5a047b245b0..04ae3fd0b5eb 100644
--- a/gdb/btrace.c
+++ b/gdb/btrace.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "btrace.h"
 #include "gdbthread.h"
 #include "inferior.h"
diff --git a/gdb/build-id.c b/gdb/build-id.c
index a40c56087ed1..d1ebd8d37d77 100644
--- a/gdb/build-id.c
+++ b/gdb/build-id.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "bfd.h"
 #include "gdb_bfd.h"
 #include "build-id.h"
diff --git a/gdb/buildsym-legacy.c b/gdb/buildsym-legacy.c
index 84bc96e843bc..a2d786b48774 100644
--- a/gdb/buildsym-legacy.c
+++ b/gdb/buildsym-legacy.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "buildsym-legacy.h"
 #include "symtab.h"
 
diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index 506110989bf5..1c762ad81bfd 100644
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "buildsym-legacy.h"
 #include "bfd.h"
 #include "gdbsupport/gdb_obstack.h"
diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index fb85914805cf..459a4cf1e8f2 100644
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -35,7 +35,6 @@
 
 %{
 
-#include "defs.h"
 #include <ctype.h>
 #include "expression.h"
 #include "value.h"
diff --git a/gdb/c-lang.c b/gdb/c-lang.c
index cc33aad088ed..922bf8c0de34 100644
--- a/gdb/c-lang.c
+++ b/gdb/c-lang.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index da269dae13b1..3e299356308c 100644
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/gdb_obstack.h"
 #include "bfd.h"
 #include "symtab.h"
diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
index 8911a1696049..28a6a6afea2f 100644
--- a/gdb/c-valprint.c
+++ b/gdb/c-valprint.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
diff --git a/gdb/c-varobj.c b/gdb/c-varobj.c
index 4a7476449097..4751f0a957a6 100644
--- a/gdb/c-varobj.c
+++ b/gdb/c-varobj.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "value.h"
 #include "varobj.h"
 #include "gdbthread.h"
diff --git a/gdb/charset.c b/gdb/charset.c
index 2b759495f17b..4c1debef6143 100644
--- a/gdb/charset.c
+++ b/gdb/charset.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "charset.h"
 #include "gdbcmd.h"
 #include "gdbsupport/gdb_obstack.h"
diff --git a/gdb/cli-out.c b/gdb/cli-out.c
index 2a1e72125f9c..1c303f096626 100644
--- a/gdb/cli-out.c
+++ b/gdb/cli-out.c
@@ -20,7 +20,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "ui-out.h"
 #include "cli-out.h"
 #include "completer.h"
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index df11f956245c..3afe2178199e 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "readline/tilde.h"
 #include "completer.h"
diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index bbabd40db071..d9a2ab40575a 100644
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include <ctype.h>
 #include "gdbsupport/gdb_regex.h"
diff --git a/gdb/cli/cli-dump.c b/gdb/cli/cli-dump.c
index 765117bcbb50..9b44c6edcf21 100644
--- a/gdb/cli/cli-dump.c
+++ b/gdb/cli/cli-dump.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "cli/cli-decode.h"
 #include "cli/cli-cmds.h"
 #include "value.h"
diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c
index a0bf32fd5857..7cefc3902d8c 100644
--- a/gdb/cli/cli-interp.c
+++ b/gdb/cli/cli-interp.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "cli-interp.h"
 #include "interps.h"
 #include "event-top.h"
diff --git a/gdb/cli/cli-logging.c b/gdb/cli/cli-logging.c
index 7c337c808e75..2b3572885855 100644
--- a/gdb/cli/cli-logging.c
+++ b/gdb/cli/cli-logging.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcmd.h"
 #include "ui-out.h"
 #include "interps.h"
diff --git a/gdb/cli/cli-option.c b/gdb/cli/cli-option.c
index 3ef210e53d3e..05539285c80d 100644
--- a/gdb/cli/cli-option.c
+++ b/gdb/cli/cli-option.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "cli/cli-option.h"
 #include "cli/cli-decode.h"
 #include "cli/cli-utils.h"
diff --git a/gdb/cli/cli-script.c b/gdb/cli/cli-script.c
index f06724af325a..2f731807c94f 100644
--- a/gdb/cli/cli-script.c
+++ b/gdb/cli/cli-script.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "value.h"
 #include <ctype.h>
 
diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index b1ad11cc61b4..bcc793b31480 100644
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "readline/tilde.h"
 #include "value.h"
 #include <ctype.h>
diff --git a/gdb/cli/cli-style.c b/gdb/cli/cli-style.c
index 2fccc72b1029..5928998e9cae 100644
--- a/gdb/cli/cli-style.c
+++ b/gdb/cli/cli-style.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "cli/cli-cmds.h"
 #include "cli/cli-decode.h"
 #include "cli/cli-setshow.h"
diff --git a/gdb/cli/cli-utils.c b/gdb/cli/cli-utils.c
index c3206c4f3fa3..45b30842e005 100644
--- a/gdb/cli/cli-utils.c
+++ b/gdb/cli/cli-utils.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "cli/cli-utils.h"
 #include "value.h"
 
diff --git a/gdb/coff-pe-read.c b/gdb/coff-pe-read.c
index 271076e6d8d9..43700d96ec36 100644
--- a/gdb/coff-pe-read.c
+++ b/gdb/coff-pe-read.c
@@ -21,7 +21,6 @@
 
    Contributed by Raoul M. Gough (RaoulGough@yahoo.co.uk).  */
 
-#include "defs.h"
 
 #include "coff-pe-read.h"
 
diff --git a/gdb/coffread.c b/gdb/coffread.c
index abb1c1880d68..327c014a5a4c 100644
--- a/gdb/coffread.c
+++ b/gdb/coffread.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "demangle.h"
diff --git a/gdb/compile/compile-c-support.c b/gdb/compile/compile-c-support.c
index 72e7bfe1484a..a152e5ace614 100644
--- a/gdb/compile/compile-c-support.c
+++ b/gdb/compile/compile-c-support.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "compile-internal.h"
 #include "compile-c.h"
 #include "compile-cplus.h"
diff --git a/gdb/compile/compile-c-symbols.c b/gdb/compile/compile-c-symbols.c
index 804a0a01377e..20e8550b3f7e 100644
--- a/gdb/compile/compile-c-symbols.c
+++ b/gdb/compile/compile-c-symbols.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include "defs.h"
 #include "compile-internal.h"
 #include "compile-c.h"
 #include "symtab.h"
diff --git a/gdb/compile/compile-c-types.c b/gdb/compile/compile-c-types.c
index 1243be369f83..6407f1243bea 100644
--- a/gdb/compile/compile-c-types.c
+++ b/gdb/compile/compile-c-types.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include "defs.h"
 #include "gdbtypes.h"
 #include "compile-internal.h"
 #include "compile-c.h"
diff --git a/gdb/compile/compile-cplus-symbols.c b/gdb/compile/compile-cplus-symbols.c
index c4355b83c7fd..c95c86f37756 100644
--- a/gdb/compile/compile-cplus-symbols.c
+++ b/gdb/compile/compile-cplus-symbols.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include "defs.h"
 #include "compile-internal.h"
 #include "compile-cplus.h"
 #include "gdbsupport/gdb_assert.h"
diff --git a/gdb/compile/compile-cplus-types.c b/gdb/compile/compile-cplus-types.c
index c8a255153591..212db680482b 100644
--- a/gdb/compile/compile-cplus-types.c
+++ b/gdb/compile/compile-cplus-types.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include "defs.h"
 #include "gdbsupport/preprocessor.h"
 #include "gdbtypes.h"
 #include "compile-internal.h"
diff --git a/gdb/compile/compile-loc2c.c b/gdb/compile/compile-loc2c.c
index da3a84e00807..fbcc3d6340b2 100644
--- a/gdb/compile/compile-loc2c.c
+++ b/gdb/compile/compile-loc2c.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "dwarf2.h"
 #include "objfiles.h"
 #include "dwarf2/expr.h"
diff --git a/gdb/compile/compile-object-load.c b/gdb/compile/compile-object-load.c
index 33971a51a711..d1b5d5947a67 100644
--- a/gdb/compile/compile-object-load.c
+++ b/gdb/compile/compile-object-load.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "compile-object-load.h"
 #include "compile-internal.h"
 #include "command.h"
diff --git a/gdb/compile/compile-object-run.c b/gdb/compile/compile-object-run.c
index a3ac376f38f7..5a810d5a16d4 100644
--- a/gdb/compile/compile-object-run.c
+++ b/gdb/compile/compile-object-run.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "compile-object-run.h"
 #include "value.h"
 #include "infcall.h"
diff --git a/gdb/compile/compile.c b/gdb/compile/compile.c
index 27cff2553eed..2d97a1b2005f 100644
--- a/gdb/compile/compile.c
+++ b/gdb/compile/compile.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "ui.h"
 #include "ui-out.h"
 #include "command.h"
diff --git a/gdb/complaints.c b/gdb/complaints.c
index 496736fe95f9..e375c7348848 100644
--- a/gdb/complaints.c
+++ b/gdb/complaints.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "complaints.h"
 #include "command.h"
 #include "gdbcmd.h"
diff --git a/gdb/completer.c b/gdb/completer.c
index 8e34e30f46be..171d1ca8c0ed 100644
--- a/gdb/completer.c
+++ b/gdb/completer.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
diff --git a/gdb/copying.awk b/gdb/copying.awk
index bbeb2664f4c6..0babd8342693 100644
--- a/gdb/copying.awk
+++ b/gdb/copying.awk
@@ -6,7 +6,6 @@ BEGIN	{
 	  print "   It is created automatically by copying.awk.";
 	  print "   Modify copying.awk instead.  <== */";
 	  print ""
-	  print "#include \"defs.h\""
 	  print "#include \"command.h\""
 	  print "#include \"gdbcmd.h\""
 	  print ""
diff --git a/gdb/copying.c b/gdb/copying.c
index a66a55b73ea3..bc45fe0dc3a5 100644
--- a/gdb/copying.c
+++ b/gdb/copying.c
@@ -2,7 +2,6 @@
    It is created automatically by copying.awk.
    Modify copying.awk instead.  <== */
 
-#include "defs.h"
 #include "command.h"
 #include "gdbcmd.h"
 
diff --git a/gdb/corefile.c b/gdb/corefile.c
index 169d4229e9c1..16cd60f7106d 100644
--- a/gdb/corefile.c
+++ b/gdb/corefile.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include <signal.h>
 #include <fcntl.h>
 #include "inferior.h"
diff --git a/gdb/corelow.c b/gdb/corelow.c
index f291b2aba191..f4e8273d9622 100644
--- a/gdb/corelow.c
+++ b/gdb/corelow.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include <signal.h>
 #include <fcntl.h>
diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c
index 882c1a03fe29..a813b4ad15cc 100644
--- a/gdb/cp-abi.c
+++ b/gdb/cp-abi.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "language.h"
 #include "value.h"
 #include "cp-abi.h"
diff --git a/gdb/cp-name-parser.y b/gdb/cp-name-parser.y
index 701ec25e3344..87f13445bbaf 100644
--- a/gdb/cp-name-parser.y
+++ b/gdb/cp-name-parser.y
@@ -37,7 +37,6 @@
 
 %{
 
-#include "defs.h"
 
 #include <unistd.h>
 #include "gdbsupport/gdb-safe-ctype.h"
diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
index fb9fcf8ed6e8..ec72d72b5a78 100644
--- a/gdb/cp-namespace.c
+++ b/gdb/cp-namespace.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "cp-support.h"
 #include "gdbsupport/gdb_obstack.h"
 #include "symtab.h"
diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index 6b7c2f5a0628..e6e811ddf503 100644
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "cp-support.h"
 #include "language.h"
 #include "demangle.h"
diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index d7fce64408d7..f2a2ca5288da 100644
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/gdb_obstack.h"
 #include "symtab.h"
 #include "gdbtypes.h"
diff --git a/gdb/cris-linux-tdep.c b/gdb/cris-linux-tdep.c
index d46f3e846489..7ec5505fba8e 100644
--- a/gdb/cris-linux-tdep.c
+++ b/gdb/cris-linux-tdep.c
@@ -21,7 +21,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "osabi.h"
 #include "linux-tdep.h"
 #include "solib-svr4.h"
diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c
index 02c35da723d4..dd013d531abb 100644
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -20,7 +20,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "frame-base.h"
diff --git a/gdb/csky-linux-tdep.c b/gdb/csky-linux-tdep.c
index d485f1763178..a703b389d2ea 100644
--- a/gdb/csky-linux-tdep.c
+++ b/gdb/csky-linux-tdep.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "osabi.h"
 #include "glibc-tdep.h"
 #include "linux-tdep.h"
diff --git a/gdb/csky-tdep.c b/gdb/csky-tdep.c
index c1ce8a5b02ce..5f0fd3d7170d 100644
--- a/gdb/csky-tdep.c
+++ b/gdb/csky-tdep.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/gdb_assert.h"
 #include "frame.h"
 #include "inferior.h"
diff --git a/gdb/ctfread.c b/gdb/ctfread.c
index cbb8c3f2b8a6..d8606d3c0611 100644
--- a/gdb/ctfread.c
+++ b/gdb/ctfread.c
@@ -75,7 +75,6 @@
    already in the symbol table, and the CTF string table does not contain any
    duplicated strings.  */
 
-#include "defs.h"
 #include "buildsym.h"
 #include "complaints.h"
 #include "block.h"
diff --git a/gdb/d-exp.y b/gdb/d-exp.y
index 620d900709c4..b2adad24d1a9 100644
--- a/gdb/d-exp.y
+++ b/gdb/d-exp.y
@@ -38,7 +38,6 @@
 
 %{
 
-#include "defs.h"
 #include <ctype.h>
 #include "expression.h"
 #include "value.h"
diff --git a/gdb/d-lang.c b/gdb/d-lang.c
index 6af57062ef96..d4f9956bc9ee 100644
--- a/gdb/d-lang.c
+++ b/gdb/d-lang.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "language.h"
 #include "varobj.h"
diff --git a/gdb/d-namespace.c b/gdb/d-namespace.c
index 3f8f7d8c24e1..0bcd75dac10c 100644
--- a/gdb/d-namespace.c
+++ b/gdb/d-namespace.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "block.h"
 #include "language.h"
diff --git a/gdb/d-valprint.c b/gdb/d-valprint.c
index 2cdbf5ae09b5..543bb193f615 100644
--- a/gdb/d-valprint.c
+++ b/gdb/d-valprint.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbtypes.h"
 #include "gdbcore.h"
 #include "d-lang.h"
diff --git a/gdb/darwin-nat-info.c b/gdb/darwin-nat-info.c
index 48868c8115ec..3d3e47c998a3 100644
--- a/gdb/darwin-nat-info.c
+++ b/gdb/darwin-nat-info.c
@@ -27,7 +27,6 @@
    the future.  It'd be good to remove this at some point when compiling on
    Tiger is no longer important.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "gdbcore.h"
diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c
index 0eb49d8734ae..0c5b54b40a3b 100644
--- a/gdb/darwin-nat.c
+++ b/gdb/darwin-nat.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "top.h"
 #include "inferior.h"
 #include "target.h"
diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index 1734e8062fb1..9faaf0e7381b 100644
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -30,7 +30,6 @@
    fledged symbol table by going back and reading the symbols
    for real.  dbx_psymtab_to_symtab() is the function that does this */
 
-#include "defs.h"
 
 #include "gdbsupport/gdb_obstack.h"
 #include <sys/stat.h>
diff --git a/gdb/dcache.c b/gdb/dcache.c
index 57b39c0e51ea..ae08f3518c11 100644
--- a/gdb/dcache.c
+++ b/gdb/dcache.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "dcache.h"
 #include "gdbcmd.h"
 #include "gdbcore.h"
diff --git a/gdb/debug.c b/gdb/debug.c
index 56725b68b316..f7d245126854 100644
--- a/gdb/debug.c
+++ b/gdb/debug.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "gdbsupport/common-debug.h"
 
diff --git a/gdb/debuginfod-support.c b/gdb/debuginfod-support.c
index 9bb3748c8c3b..841b6f2078c7 100644
--- a/gdb/debuginfod-support.c
+++ b/gdb/debuginfod-support.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "diagnostics.h"
 #include <errno.h>
 #include "gdbsupport/scoped_fd.h"
diff --git a/gdb/dicos-tdep.c b/gdb/dicos-tdep.c
index 950a7d617bf5..3627426eee75 100644
--- a/gdb/dicos-tdep.c
+++ b/gdb/dicos-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "osabi.h"
 #include "solib.h"
 #include "solib-target.h"
diff --git a/gdb/dictionary.c b/gdb/dictionary.c
index 8e7eb420cc6f..6925ad4d46ce 100644
--- a/gdb/dictionary.c
+++ b/gdb/dictionary.c
@@ -20,7 +20,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include <ctype.h>
 #include "gdbsupport/gdb_obstack.h"
 #include "symtab.h"
diff --git a/gdb/disasm-selftests.c b/gdb/disasm-selftests.c
index f288707669dd..14b7fb30badf 100644
--- a/gdb/disasm-selftests.c
+++ b/gdb/disasm-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "disasm.h"
 #include "gdbsupport/selftest.h"
 #include "selftest-arch.h"
diff --git a/gdb/disasm.c b/gdb/disasm.c
index cafbc078c60d..da6f3afba7a1 100644
--- a/gdb/disasm.c
+++ b/gdb/disasm.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "target.h"
 #include "value.h"
diff --git a/gdb/displaced-stepping.c b/gdb/displaced-stepping.c
index e727c6d5662e..7869ebae7714 100644
--- a/gdb/displaced-stepping.c
+++ b/gdb/displaced-stepping.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "displaced-stepping.h"
 
 #include "cli/cli-cmds.h"
diff --git a/gdb/dtrace-probe.c b/gdb/dtrace-probe.c
index 5757de1cf77d..ad1a3f870b63 100644
--- a/gdb/dtrace-probe.c
+++ b/gdb/dtrace-probe.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "probe.h"
 #include "elf-bfd.h"
 #include "gdbtypes.h"
diff --git a/gdb/dummy-frame.c b/gdb/dummy-frame.c
index 5969ef2cdadd..7d72fe032ee1 100644
--- a/gdb/dummy-frame.c
+++ b/gdb/dummy-frame.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include "defs.h"
 #include "dummy-frame.h"
 #include "regcache.h"
 #include "frame.h"
diff --git a/gdb/dwarf2/abbrev-cache.c b/gdb/dwarf2/abbrev-cache.c
index 01ff203aeee4..b87206c2c4ee 100644
--- a/gdb/dwarf2/abbrev-cache.c
+++ b/gdb/dwarf2/abbrev-cache.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "dwarf2/read.h"
 #include "dwarf2/abbrev-cache.h"
 
diff --git a/gdb/dwarf2/abbrev.c b/gdb/dwarf2/abbrev.c
index d68a86ef178f..359a0094872a 100644
--- a/gdb/dwarf2/abbrev.c
+++ b/gdb/dwarf2/abbrev.c
@@ -24,7 +24,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "dwarf2/read.h"
 #include "dwarf2/abbrev.h"
 #include "dwarf2/leb.h"
diff --git a/gdb/dwarf2/ada-imported.c b/gdb/dwarf2/ada-imported.c
index 065e2b90a0f4..9ec0d51e9205 100644
--- a/gdb/dwarf2/ada-imported.c
+++ b/gdb/dwarf2/ada-imported.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "value.h"
 #include "dwarf2/loc.h"
diff --git a/gdb/dwarf2/aranges.c b/gdb/dwarf2/aranges.c
index 4287a5a884b0..d577db627260 100644
--- a/gdb/dwarf2/aranges.c
+++ b/gdb/dwarf2/aranges.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "dwarf2/aranges.h"
 #include "dwarf2/read.h"
 
diff --git a/gdb/dwarf2/attribute.c b/gdb/dwarf2/attribute.c
index 6b8f1c95ce7a..f777c1454e65 100644
--- a/gdb/dwarf2/attribute.c
+++ b/gdb/dwarf2/attribute.c
@@ -24,7 +24,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "dwarf2/attribute.h"
 #include "dwarf2/stringify.h"
 #include "complaints.h"
diff --git a/gdb/dwarf2/comp-unit-head.c b/gdb/dwarf2/comp-unit-head.c
index 5a8279514855..a26a6c0cd58f 100644
--- a/gdb/dwarf2/comp-unit-head.c
+++ b/gdb/dwarf2/comp-unit-head.c
@@ -24,7 +24,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "dwarf2/comp-unit-head.h"
 #include "dwarf2/leb.h"
 #include "dwarf2/read.h"
diff --git a/gdb/dwarf2/cooked-index.c b/gdb/dwarf2/cooked-index.c
index f78b00df446e..66822b575ca1 100644
--- a/gdb/dwarf2/cooked-index.c
+++ b/gdb/dwarf2/cooked-index.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "dwarf2/cooked-index.h"
 #include "dwarf2/read.h"
 #include "dwarf2/stringify.h"
diff --git a/gdb/dwarf2/cu.c b/gdb/dwarf2/cu.c
index 62c0a8a3ede4..a64cb1d8380f 100644
--- a/gdb/dwarf2/cu.c
+++ b/gdb/dwarf2/cu.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "dwarf2/cu.h"
 #include "dwarf2/read.h"
 #include "objfiles.h"
diff --git a/gdb/dwarf2/die.c b/gdb/dwarf2/die.c
index 4bdf02be429f..bfa54e517abb 100644
--- a/gdb/dwarf2/die.c
+++ b/gdb/dwarf2/die.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "dwarf2/die.h"
 #include "dwarf2/stringify.h"
 
diff --git a/gdb/dwarf2/dwz.c b/gdb/dwarf2/dwz.c
index f53a5b64c4a3..1eb4816fb479 100644
--- a/gdb/dwarf2/dwz.c
+++ b/gdb/dwarf2/dwz.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "dwarf2/dwz.h"
 
 #include "build-id.h"
diff --git a/gdb/dwarf2/expr.c b/gdb/dwarf2/expr.c
index d0256e7009d9..d92facbf0dcf 100644
--- a/gdb/dwarf2/expr.c
+++ b/gdb/dwarf2/expr.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "block.h"
 #include "symtab.h"
 #include "gdbtypes.h"
diff --git a/gdb/dwarf2/frame-tailcall.c b/gdb/dwarf2/frame-tailcall.c
index 2f6400d62c38..bcbe41f7933c 100644
--- a/gdb/dwarf2/frame-tailcall.c
+++ b/gdb/dwarf2/frame-tailcall.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "dwarf2/frame-tailcall.h"
 #include "dwarf2/loc.h"
diff --git a/gdb/dwarf2/frame.c b/gdb/dwarf2/frame.c
index 530513c2684e..9ebf3ac4ac47 100644
--- a/gdb/dwarf2/frame.c
+++ b/gdb/dwarf2/frame.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "dwarf2/expr.h"
 #include "dwarf2.h"
 #include "dwarf2/leb.h"
diff --git a/gdb/dwarf2/index-cache.c b/gdb/dwarf2/index-cache.c
index d9047ef46bb2..1720e925ee60 100644
--- a/gdb/dwarf2/index-cache.c
+++ b/gdb/dwarf2/index-cache.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "dwarf2/index-cache.h"
 
 #include "build-id.h"
diff --git a/gdb/dwarf2/index-common.c b/gdb/dwarf2/index-common.c
index 515093a63d32..08b2f3746193 100644
--- a/gdb/dwarf2/index-common.c
+++ b/gdb/dwarf2/index-common.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "dwarf2/index-common.h"
 
 /* See dwarf-index-common.h.  */
diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c
index a114001f4eec..3f812285995d 100644
--- a/gdb/dwarf2/index-write.c
+++ b/gdb/dwarf2/index-write.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "dwarf2/index-write.h"
 
diff --git a/gdb/dwarf2/leb.c b/gdb/dwarf2/leb.c
index 7e10dc16e59f..1b7202e6240e 100644
--- a/gdb/dwarf2/leb.c
+++ b/gdb/dwarf2/leb.c
@@ -24,7 +24,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "dwarf2/leb.h"
 
 ULONGEST
diff --git a/gdb/dwarf2/line-header.c b/gdb/dwarf2/line-header.c
index a3ca49b64f56..eddb2ef7ae80 100644
--- a/gdb/dwarf2/line-header.c
+++ b/gdb/dwarf2/line-header.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "dwarf2/comp-unit-head.h"
 #include "dwarf2/leb.h"
 #include "dwarf2/line-header.h"
diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c
index 203ad536162a..205d2ba56cbb 100644
--- a/gdb/dwarf2/loc.c
+++ b/gdb/dwarf2/loc.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "ui-out.h"
 #include "value.h"
 #include "frame.h"
diff --git a/gdb/dwarf2/macro.c b/gdb/dwarf2/macro.c
index 6b43aa49aa46..a511d0a3b449 100644
--- a/gdb/dwarf2/macro.c
+++ b/gdb/dwarf2/macro.c
@@ -24,7 +24,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "dwarf2/read.h"
 #include "dwarf2/leb.h"
 #include "dwarf2/expr.h"
diff --git a/gdb/dwarf2/read-debug-names.c b/gdb/dwarf2/read-debug-names.c
index 0d60b01f408c..a3547cde7aa6 100644
--- a/gdb/dwarf2/read-debug-names.c
+++ b/gdb/dwarf2/read-debug-names.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "read-debug-names.h"
 #include "dwarf2/aranges.h"
 #include "dwarf2/cooked-index.h"
diff --git a/gdb/dwarf2/read-gdb-index.c b/gdb/dwarf2/read-gdb-index.c
index bf4f828b007b..8c0895b96393 100644
--- a/gdb/dwarf2/read-gdb-index.c
+++ b/gdb/dwarf2/read-gdb-index.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "read-gdb-index.h"
 
 #include "cli/cli-cmds.h"
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index a747922a4ed4..31313bc88b32 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -27,7 +27,6 @@
 /* FIXME: Various die-reading functions need to be more careful with
    reading off the end of the section.  */
 
-#include "defs.h"
 #include "dwarf2/read.h"
 #include "dwarf2/abbrev.h"
 #include "dwarf2/aranges.h"
diff --git a/gdb/dwarf2/section.c b/gdb/dwarf2/section.c
index e813fc0fd8ee..6aab0b9aee9f 100644
--- a/gdb/dwarf2/section.c
+++ b/gdb/dwarf2/section.c
@@ -24,7 +24,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "dwarf2/section.h"
 #include "gdb_bfd.h"
 #include "objfiles.h"
diff --git a/gdb/dwarf2/stringify.c b/gdb/dwarf2/stringify.c
index 3700e0c1e784..1a4e280fc765 100644
--- a/gdb/dwarf2/stringify.c
+++ b/gdb/dwarf2/stringify.c
@@ -24,7 +24,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "dwarf2.h"
 #include "dwarf2/stringify.h"
 
diff --git a/gdb/elf-none-tdep.c b/gdb/elf-none-tdep.c
index ddf26a9b666e..00d46992b248 100644
--- a/gdb/elf-none-tdep.c
+++ b/gdb/elf-none-tdep.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "elf-none-tdep.h"
 #include "regset.h"
 #include "elf-bfd.h"
diff --git a/gdb/elfread.c b/gdb/elfread.c
index e8a0c4d7a2cf..9bfe12712db7 100644
--- a/gdb/elfread.c
+++ b/gdb/elfread.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "bfd.h"
 #include "elf-bfd.h"
 #include "elf/common.h"
diff --git a/gdb/eval.c b/gdb/eval.c
index 2759b46a5dff..6b752e706355 100644
--- a/gdb/eval.c
+++ b/gdb/eval.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "value.h"
diff --git a/gdb/event-top.c b/gdb/event-top.c
index ef4ceedccfaa..9a02ac6df273 100644
--- a/gdb/event-top.c
+++ b/gdb/event-top.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "top.h"
 #include "ui.h"
 #include "inferior.h"
diff --git a/gdb/exceptions.c b/gdb/exceptions.c
index 3a4216382a58..368999829fce 100644
--- a/gdb/exceptions.c
+++ b/gdb/exceptions.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "exceptions.h"
 #include "breakpoint.h"
 #include "target.h"
diff --git a/gdb/exec.c b/gdb/exec.c
index f17040a7a1b1..98ad81fb99ae 100644
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "inferior.h"
 #include "target.h"
diff --git a/gdb/expprint.c b/gdb/expprint.c
index d34604fb13fb..2d8bccd60c65 100644
--- a/gdb/expprint.c
+++ b/gdb/expprint.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
diff --git a/gdb/extension.c b/gdb/extension.c
index 9db8b53a0873..f4bdcc1f6110 100644
--- a/gdb/extension.c
+++ b/gdb/extension.c
@@ -20,7 +20,6 @@
 /* Note: With few exceptions, external functions and variables in this file
    have "ext_lang" in the name, and no other symbol in gdb does.  */
 
-#include "defs.h"
 #include <signal.h>
 #include "target.h"
 #include "auto-load.h"
diff --git a/gdb/f-array-walker.h b/gdb/f-array-walker.h
index 8769e570ca34..bcbaa3da5b3c 100644
--- a/gdb/f-array-walker.h
+++ b/gdb/f-array-walker.h
@@ -21,7 +21,6 @@
 #ifndef F_ARRAY_WALKER_H
 #define F_ARRAY_WALKER_H
 
-#include "defs.h"
 #include "gdbtypes.h"
 #include "f-lang.h"
 
diff --git a/gdb/f-exp.y b/gdb/f-exp.y
index faa53ba9dd0e..11cd7948682e 100644
--- a/gdb/f-exp.y
+++ b/gdb/f-exp.y
@@ -42,7 +42,6 @@
    
 %{
 
-#include "defs.h"
 #include "expression.h"
 #include "value.h"
 #include "parser-defs.h"
diff --git a/gdb/f-lang.c b/gdb/f-lang.c
index 96d4ed821c65..5eeb22806bb6 100644
--- a/gdb/f-lang.c
+++ b/gdb/f-lang.c
@@ -20,7 +20,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
diff --git a/gdb/f-typeprint.c b/gdb/f-typeprint.c
index 617e87cdeb71..6e9722dbeb85 100644
--- a/gdb/f-typeprint.c
+++ b/gdb/f-typeprint.c
@@ -20,7 +20,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/gdb_obstack.h"
 #include "bfd.h"
 #include "symtab.h"
diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
index 19bcd746208a..cd87dd222fda 100644
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -20,7 +20,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "annotate.h"
 #include "symtab.h"
 #include "gdbtypes.h"
diff --git a/gdb/fbsd-nat.c b/gdb/fbsd-nat.c
index 7ac5983ae5ae..2d1bb5a33682 100644
--- a/gdb/fbsd-nat.c
+++ b/gdb/fbsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/block-signals.h"
 #include "gdbsupport/byte-vector.h"
 #include "gdbsupport/event-loop.h"
diff --git a/gdb/fbsd-tdep.c b/gdb/fbsd-tdep.c
index e3ebcb82ed64..593f5b4fd4a1 100644
--- a/gdb/fbsd-tdep.c
+++ b/gdb/fbsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "auxv.h"
 #include "gdbcore.h"
 #include "inferior.h"
diff --git a/gdb/features/microblaze-with-stack-protect.c b/gdb/features/microblaze-with-stack-protect.c
index 574dc02db67d..e5c0956610a3 100644
--- a/gdb/features/microblaze-with-stack-protect.c
+++ b/gdb/features/microblaze-with-stack-protect.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: microblaze-with-stack-protect.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/microblaze.c b/gdb/features/microblaze.c
index 8f1fb0a142fb..32ae3b02ad76 100644
--- a/gdb/features/microblaze.c
+++ b/gdb/features/microblaze.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: microblaze.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/mips-dsp-linux.c b/gdb/features/mips-dsp-linux.c
index d9d928c80128..d8e40283cafb 100644
--- a/gdb/features/mips-dsp-linux.c
+++ b/gdb/features/mips-dsp-linux.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: mips-dsp-linux.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/mips-linux.c b/gdb/features/mips-linux.c
index 8557bc8357df..f93eef5e41dc 100644
--- a/gdb/features/mips-linux.c
+++ b/gdb/features/mips-linux.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: mips-linux.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/mips64-dsp-linux.c b/gdb/features/mips64-dsp-linux.c
index 80bbbcbd152f..7ea0bb704f4a 100644
--- a/gdb/features/mips64-dsp-linux.c
+++ b/gdb/features/mips64-dsp-linux.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: mips64-dsp-linux.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/mips64-linux.c b/gdb/features/mips64-linux.c
index 21e8c37b9333..f4dcf8bc109b 100644
--- a/gdb/features/mips64-linux.c
+++ b/gdb/features/mips64-linux.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: mips64-linux.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/nds32.c b/gdb/features/nds32.c
index 7a08d2c85bb0..e5c5d50dce10 100644
--- a/gdb/features/nds32.c
+++ b/gdb/features/nds32.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: nds32.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/nios2.c b/gdb/features/nios2.c
index 648f7ed57abe..f53b0ddb4a03 100644
--- a/gdb/features/nios2.c
+++ b/gdb/features/nios2.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: nios2.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/or1k-linux.c b/gdb/features/or1k-linux.c
index 3eb65489383f..24731458de2c 100644
--- a/gdb/features/or1k-linux.c
+++ b/gdb/features/or1k-linux.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: or1k-linux.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/or1k.c b/gdb/features/or1k.c
index 67040965bd54..ee5e2f5b2067 100644
--- a/gdb/features/or1k.c
+++ b/gdb/features/or1k.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: or1k.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-32.c b/gdb/features/rs6000/powerpc-32.c
index a4f4bed180fa..562761e69a55 100644
--- a/gdb/features/rs6000/powerpc-32.c
+++ b/gdb/features/rs6000/powerpc-32.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-32.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-32l.c b/gdb/features/rs6000/powerpc-32l.c
index f5893bff01bf..caf81b760171 100644
--- a/gdb/features/rs6000/powerpc-32l.c
+++ b/gdb/features/rs6000/powerpc-32l.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-32l.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-403.c b/gdb/features/rs6000/powerpc-403.c
index 2783287b981e..7cff21ceed7b 100644
--- a/gdb/features/rs6000/powerpc-403.c
+++ b/gdb/features/rs6000/powerpc-403.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-403.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-403gc.c b/gdb/features/rs6000/powerpc-403gc.c
index c69a1342773b..e86b51c43467 100644
--- a/gdb/features/rs6000/powerpc-403gc.c
+++ b/gdb/features/rs6000/powerpc-403gc.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-403gc.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-405.c b/gdb/features/rs6000/powerpc-405.c
index 1146d6601bd6..2716e37d8a8c 100644
--- a/gdb/features/rs6000/powerpc-405.c
+++ b/gdb/features/rs6000/powerpc-405.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-405.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-505.c b/gdb/features/rs6000/powerpc-505.c
index a36157f6c74d..51352e78bac4 100644
--- a/gdb/features/rs6000/powerpc-505.c
+++ b/gdb/features/rs6000/powerpc-505.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-505.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-601.c b/gdb/features/rs6000/powerpc-601.c
index ceaf789f3d73..2b700bbe128f 100644
--- a/gdb/features/rs6000/powerpc-601.c
+++ b/gdb/features/rs6000/powerpc-601.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-601.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-602.c b/gdb/features/rs6000/powerpc-602.c
index eb85e69d6a0d..13591b953020 100644
--- a/gdb/features/rs6000/powerpc-602.c
+++ b/gdb/features/rs6000/powerpc-602.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-602.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-603.c b/gdb/features/rs6000/powerpc-603.c
index 223919ca2d73..88b2b2c98c62 100644
--- a/gdb/features/rs6000/powerpc-603.c
+++ b/gdb/features/rs6000/powerpc-603.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-603.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-604.c b/gdb/features/rs6000/powerpc-604.c
index 16e6c12dae93..d266ba6ee897 100644
--- a/gdb/features/rs6000/powerpc-604.c
+++ b/gdb/features/rs6000/powerpc-604.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-604.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-64.c b/gdb/features/rs6000/powerpc-64.c
index 43dee105954f..c2f741091850 100644
--- a/gdb/features/rs6000/powerpc-64.c
+++ b/gdb/features/rs6000/powerpc-64.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-64.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-64l.c b/gdb/features/rs6000/powerpc-64l.c
index 83a6a1590482..dbe06acdb200 100644
--- a/gdb/features/rs6000/powerpc-64l.c
+++ b/gdb/features/rs6000/powerpc-64l.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-64l.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-7400.c b/gdb/features/rs6000/powerpc-7400.c
index d5fbf4bd3d79..f1f52eb51e63 100644
--- a/gdb/features/rs6000/powerpc-7400.c
+++ b/gdb/features/rs6000/powerpc-7400.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-7400.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-750.c b/gdb/features/rs6000/powerpc-750.c
index 3c9e7e1d23a1..14f490565906 100644
--- a/gdb/features/rs6000/powerpc-750.c
+++ b/gdb/features/rs6000/powerpc-750.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-750.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-860.c b/gdb/features/rs6000/powerpc-860.c
index 3e9a25f8e974..b02fcc4e357e 100644
--- a/gdb/features/rs6000/powerpc-860.c
+++ b/gdb/features/rs6000/powerpc-860.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-860.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-altivec32.c b/gdb/features/rs6000/powerpc-altivec32.c
index 41cca727be8e..05f7348df9ac 100644
--- a/gdb/features/rs6000/powerpc-altivec32.c
+++ b/gdb/features/rs6000/powerpc-altivec32.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-altivec32.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-altivec32l.c b/gdb/features/rs6000/powerpc-altivec32l.c
index 9cd935551db7..0bcae972502e 100644
--- a/gdb/features/rs6000/powerpc-altivec32l.c
+++ b/gdb/features/rs6000/powerpc-altivec32l.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-altivec32l.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-altivec64.c b/gdb/features/rs6000/powerpc-altivec64.c
index 8422708ec7fa..bdc500043918 100644
--- a/gdb/features/rs6000/powerpc-altivec64.c
+++ b/gdb/features/rs6000/powerpc-altivec64.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-altivec64.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-altivec64l.c b/gdb/features/rs6000/powerpc-altivec64l.c
index 977af8c941f6..2392f3496576 100644
--- a/gdb/features/rs6000/powerpc-altivec64l.c
+++ b/gdb/features/rs6000/powerpc-altivec64l.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-altivec64l.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-e500.c b/gdb/features/rs6000/powerpc-e500.c
index 84f721d948f3..0442569c3181 100644
--- a/gdb/features/rs6000/powerpc-e500.c
+++ b/gdb/features/rs6000/powerpc-e500.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-e500.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-e500l.c b/gdb/features/rs6000/powerpc-e500l.c
index a1e133d1c730..4e426c3005ae 100644
--- a/gdb/features/rs6000/powerpc-e500l.c
+++ b/gdb/features/rs6000/powerpc-e500l.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-e500l.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-isa205-32l.c b/gdb/features/rs6000/powerpc-isa205-32l.c
index 57fb20a4b12c..3834c9800191 100644
--- a/gdb/features/rs6000/powerpc-isa205-32l.c
+++ b/gdb/features/rs6000/powerpc-isa205-32l.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-isa205-32l.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-isa205-64l.c b/gdb/features/rs6000/powerpc-isa205-64l.c
index b9ce8e604fba..9a3621877c07 100644
--- a/gdb/features/rs6000/powerpc-isa205-64l.c
+++ b/gdb/features/rs6000/powerpc-isa205-64l.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-isa205-64l.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-isa205-altivec32l.c b/gdb/features/rs6000/powerpc-isa205-altivec32l.c
index 54b914c3714b..e42e1b922972 100644
--- a/gdb/features/rs6000/powerpc-isa205-altivec32l.c
+++ b/gdb/features/rs6000/powerpc-isa205-altivec32l.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-isa205-altivec32l.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-isa205-altivec64l.c b/gdb/features/rs6000/powerpc-isa205-altivec64l.c
index 42e6f03e93c2..dc43206a9d37 100644
--- a/gdb/features/rs6000/powerpc-isa205-altivec64l.c
+++ b/gdb/features/rs6000/powerpc-isa205-altivec64l.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-isa205-altivec64l.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-isa205-ppr-dscr-vsx32l.c b/gdb/features/rs6000/powerpc-isa205-ppr-dscr-vsx32l.c
index a2c6172c6d27..acc1c5b9a3e7 100644
--- a/gdb/features/rs6000/powerpc-isa205-ppr-dscr-vsx32l.c
+++ b/gdb/features/rs6000/powerpc-isa205-ppr-dscr-vsx32l.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-isa205-ppr-dscr-vsx32l.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-isa205-ppr-dscr-vsx64l.c b/gdb/features/rs6000/powerpc-isa205-ppr-dscr-vsx64l.c
index 3e7915a0619c..6bfe08d4cb56 100644
--- a/gdb/features/rs6000/powerpc-isa205-ppr-dscr-vsx64l.c
+++ b/gdb/features/rs6000/powerpc-isa205-ppr-dscr-vsx64l.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-isa205-ppr-dscr-vsx64l.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-isa205-vsx32l.c b/gdb/features/rs6000/powerpc-isa205-vsx32l.c
index 4cefcc36de57..b3f40b9d009c 100644
--- a/gdb/features/rs6000/powerpc-isa205-vsx32l.c
+++ b/gdb/features/rs6000/powerpc-isa205-vsx32l.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-isa205-vsx32l.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-isa205-vsx64l.c b/gdb/features/rs6000/powerpc-isa205-vsx64l.c
index 2fb151d12c51..5f548176701b 100644
--- a/gdb/features/rs6000/powerpc-isa205-vsx64l.c
+++ b/gdb/features/rs6000/powerpc-isa205-vsx64l.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-isa205-vsx64l.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-isa207-htm-vsx32l.c b/gdb/features/rs6000/powerpc-isa207-htm-vsx32l.c
index b945039ca28d..b9dfd3092159 100644
--- a/gdb/features/rs6000/powerpc-isa207-htm-vsx32l.c
+++ b/gdb/features/rs6000/powerpc-isa207-htm-vsx32l.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-isa207-htm-vsx32l.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-isa207-htm-vsx64l.c b/gdb/features/rs6000/powerpc-isa207-htm-vsx64l.c
index 3aa579fd5f91..14a911b30aaf 100644
--- a/gdb/features/rs6000/powerpc-isa207-htm-vsx64l.c
+++ b/gdb/features/rs6000/powerpc-isa207-htm-vsx64l.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-isa207-htm-vsx64l.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-isa207-vsx32l.c b/gdb/features/rs6000/powerpc-isa207-vsx32l.c
index e5ce7f956cfb..bcfa7c175b85 100644
--- a/gdb/features/rs6000/powerpc-isa207-vsx32l.c
+++ b/gdb/features/rs6000/powerpc-isa207-vsx32l.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-isa207-vsx32l.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-isa207-vsx64l.c b/gdb/features/rs6000/powerpc-isa207-vsx64l.c
index adf6d3eec7f2..43bd6e584559 100644
--- a/gdb/features/rs6000/powerpc-isa207-vsx64l.c
+++ b/gdb/features/rs6000/powerpc-isa207-vsx64l.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-isa207-vsx64l.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-vsx32.c b/gdb/features/rs6000/powerpc-vsx32.c
index 6fccdb374fb3..6d60eca340fe 100644
--- a/gdb/features/rs6000/powerpc-vsx32.c
+++ b/gdb/features/rs6000/powerpc-vsx32.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-vsx32.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-vsx32l.c b/gdb/features/rs6000/powerpc-vsx32l.c
index 1efe880d379c..cf2331349788 100644
--- a/gdb/features/rs6000/powerpc-vsx32l.c
+++ b/gdb/features/rs6000/powerpc-vsx32l.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-vsx32l.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-vsx64.c b/gdb/features/rs6000/powerpc-vsx64.c
index df6d0f4bef91..a5baaa2dfdc2 100644
--- a/gdb/features/rs6000/powerpc-vsx64.c
+++ b/gdb/features/rs6000/powerpc-vsx64.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-vsx64.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/powerpc-vsx64l.c b/gdb/features/rs6000/powerpc-vsx64l.c
index 89aa13de6627..03d2b694b7d0 100644
--- a/gdb/features/rs6000/powerpc-vsx64l.c
+++ b/gdb/features/rs6000/powerpc-vsx64l.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: powerpc-vsx64l.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rs6000/rs6000.c b/gdb/features/rs6000/rs6000.c
index 4aa5a8764a02..210dd96e4f61 100644
--- a/gdb/features/rs6000/rs6000.c
+++ b/gdb/features/rs6000/rs6000.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: rs6000.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/rx.c b/gdb/features/rx.c
index 825a4ac4538f..f9a5584f9b80 100644
--- a/gdb/features/rx.c
+++ b/gdb/features/rx.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: rx.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/s390-gs-linux64.c b/gdb/features/s390-gs-linux64.c
index d48f8312f20b..49ea08b2c398 100644
--- a/gdb/features/s390-gs-linux64.c
+++ b/gdb/features/s390-gs-linux64.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: s390-gs-linux64.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/s390-linux32.c b/gdb/features/s390-linux32.c
index 03ec11a26b33..43ceb9c008e2 100644
--- a/gdb/features/s390-linux32.c
+++ b/gdb/features/s390-linux32.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: s390-linux32.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/s390-linux32v1.c b/gdb/features/s390-linux32v1.c
index 65de6f254f77..291784fdac75 100644
--- a/gdb/features/s390-linux32v1.c
+++ b/gdb/features/s390-linux32v1.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: s390-linux32v1.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/s390-linux32v2.c b/gdb/features/s390-linux32v2.c
index 0e3e04dfd435..6fa26daa537c 100644
--- a/gdb/features/s390-linux32v2.c
+++ b/gdb/features/s390-linux32v2.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: s390-linux32v2.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/s390-linux64.c b/gdb/features/s390-linux64.c
index f0ec91992f92..74c338c1fa60 100644
--- a/gdb/features/s390-linux64.c
+++ b/gdb/features/s390-linux64.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: s390-linux64.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/s390-linux64v1.c b/gdb/features/s390-linux64v1.c
index 9a360c7e2676..0aebbdb6b7ae 100644
--- a/gdb/features/s390-linux64v1.c
+++ b/gdb/features/s390-linux64v1.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: s390-linux64v1.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/s390-linux64v2.c b/gdb/features/s390-linux64v2.c
index 18bc6ed4f9c1..3b3b4916ac37 100644
--- a/gdb/features/s390-linux64v2.c
+++ b/gdb/features/s390-linux64v2.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: s390-linux64v2.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/s390-te-linux64.c b/gdb/features/s390-te-linux64.c
index a8909b36bbf4..d49e74413137 100644
--- a/gdb/features/s390-te-linux64.c
+++ b/gdb/features/s390-te-linux64.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: s390-te-linux64.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/s390-tevx-linux64.c b/gdb/features/s390-tevx-linux64.c
index 8f8aec61a49f..ffe1ddf4ee13 100644
--- a/gdb/features/s390-tevx-linux64.c
+++ b/gdb/features/s390-tevx-linux64.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: s390-tevx-linux64.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/s390-vx-linux64.c b/gdb/features/s390-vx-linux64.c
index 0bcc14d7d089..30262a63fce6 100644
--- a/gdb/features/s390-vx-linux64.c
+++ b/gdb/features/s390-vx-linux64.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: s390-vx-linux64.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/s390x-gs-linux64.c b/gdb/features/s390x-gs-linux64.c
index 074c38d668c9..501b3b24061e 100644
--- a/gdb/features/s390x-gs-linux64.c
+++ b/gdb/features/s390x-gs-linux64.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: s390x-gs-linux64.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/s390x-linux64.c b/gdb/features/s390x-linux64.c
index af5ba23dc383..8655d5a6116d 100644
--- a/gdb/features/s390x-linux64.c
+++ b/gdb/features/s390x-linux64.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: s390x-linux64.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/s390x-linux64v1.c b/gdb/features/s390x-linux64v1.c
index a33bdc1672f8..11bfd85c9955 100644
--- a/gdb/features/s390x-linux64v1.c
+++ b/gdb/features/s390x-linux64v1.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: s390x-linux64v1.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/s390x-linux64v2.c b/gdb/features/s390x-linux64v2.c
index 8b906a47e44c..400b1af44854 100644
--- a/gdb/features/s390x-linux64v2.c
+++ b/gdb/features/s390x-linux64v2.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: s390x-linux64v2.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/s390x-te-linux64.c b/gdb/features/s390x-te-linux64.c
index de8bf6104701..74883e30fe83 100644
--- a/gdb/features/s390x-te-linux64.c
+++ b/gdb/features/s390x-te-linux64.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: s390x-te-linux64.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/s390x-tevx-linux64.c b/gdb/features/s390x-tevx-linux64.c
index 8bd5cc6c4390..1d45d6044c10 100644
--- a/gdb/features/s390x-tevx-linux64.c
+++ b/gdb/features/s390x-tevx-linux64.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: s390x-tevx-linux64.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/s390x-vx-linux64.c b/gdb/features/s390x-vx-linux64.c
index f450c45144d6..4de6585a2276 100644
--- a/gdb/features/s390x-vx-linux64.c
+++ b/gdb/features/s390x-vx-linux64.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: s390x-vx-linux64.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/sparc/sparc32-solaris.c b/gdb/features/sparc/sparc32-solaris.c
index 3353d4f44f7a..dce96851f96a 100644
--- a/gdb/features/sparc/sparc32-solaris.c
+++ b/gdb/features/sparc/sparc32-solaris.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: sparc32-solaris.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/sparc/sparc64-solaris.c b/gdb/features/sparc/sparc64-solaris.c
index 1150c884b444..d030df63c6cc 100644
--- a/gdb/features/sparc/sparc64-solaris.c
+++ b/gdb/features/sparc/sparc64-solaris.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: sparc64-solaris.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/features/z80.c b/gdb/features/z80.c
index f8e2a1988d0e..627649cc6901 100644
--- a/gdb/features/z80.c
+++ b/gdb/features/z80.c
@@ -1,7 +1,6 @@
 /* THIS FILE IS GENERATED.  -*- buffer-read-only: t -*- vi:set ro:
   Original: z80.xml */
 
-#include "defs.h"
 #include "osabi.h"
 #include "target-descriptions.h"
 
diff --git a/gdb/filename-seen-cache.c b/gdb/filename-seen-cache.c
index d103f22b0b5b..a08927fb9fd4 100644
--- a/gdb/filename-seen-cache.c
+++ b/gdb/filename-seen-cache.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "filename-seen-cache.h"
 #include "filenames.h"
 
diff --git a/gdb/filename-seen-cache.h b/gdb/filename-seen-cache.h
index e351c074f222..5dc800d2b163 100644
--- a/gdb/filename-seen-cache.h
+++ b/gdb/filename-seen-cache.h
@@ -20,7 +20,6 @@
 #ifndef FILENAME_SEEN_CACHE_H
 #define FILENAME_SEEN_CACHE_H
 
-#include "defs.h"
 #include "gdbsupport/function-view.h"
 #include "gdbsupport/gdb-hashtab.h"
 
diff --git a/gdb/filesystem.c b/gdb/filesystem.c
index 62b2829a76c5..4e05b0413a89 100644
--- a/gdb/filesystem.c
+++ b/gdb/filesystem.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "filesystem.h"
 #include "gdbarch.h"
 #include "gdbcmd.h"
diff --git a/gdb/findcmd.c b/gdb/findcmd.c
index 2bc3fe107386..2915c7067334 100644
--- a/gdb/findcmd.c
+++ b/gdb/findcmd.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include <ctype.h>
 #include "gdbcmd.h"
diff --git a/gdb/findvar.c b/gdb/findvar.c
index 516a2ca044cc..71bfebe40a7a 100644
--- a/gdb/findvar.c
+++ b/gdb/findvar.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "frame.h"
diff --git a/gdb/fork-child.c b/gdb/fork-child.c
index 7bd81f41a531..e0891296f8c9 100644
--- a/gdb/fork-child.c
+++ b/gdb/fork-child.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "gdbcmd.h"
 #include "terminal.h"
diff --git a/gdb/frame-base.c b/gdb/frame-base.c
index fda19b57bacb..7faa999532bb 100644
--- a/gdb/frame-base.c
+++ b/gdb/frame-base.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame-base.h"
 #include "frame.h"
 #include "gdbsupport/gdb_obstack.h"
diff --git a/gdb/frame-unwind.c b/gdb/frame-unwind.c
index e9983a9fd74f..a80421a9c5a8 100644
--- a/gdb/frame-unwind.c
+++ b/gdb/frame-unwind.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "dummy-frame.h"
diff --git a/gdb/frame.c b/gdb/frame.c
index f1f97040ff0c..f042bbb2ec25 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "target.h"
 #include "value.h"
diff --git a/gdb/frv-linux-tdep.c b/gdb/frv-linux-tdep.c
index 5160c3b0c1d6..0b13a81c0642 100644
--- a/gdb/frv-linux-tdep.c
+++ b/gdb/frv-linux-tdep.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "target.h"
 #include "frame.h"
diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c
index bcb2c621945b..5c026ebd53a3 100644
--- a/gdb/frv-tdep.c
+++ b/gdb/frv-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "gdbcore.h"
 #include "arch-utils.h"
diff --git a/gdb/ft32-tdep.c b/gdb/ft32-tdep.c
index 60cd2c974a12..c5a48bebe5f2 100644
--- a/gdb/ft32-tdep.c
+++ b/gdb/ft32-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "frame-base.h"
diff --git a/gdb/gcore-elf.c b/gdb/gcore-elf.c
index 5b0a014deb0d..c88fa08a5891 100644
--- a/gdb/gcore-elf.c
+++ b/gdb/gcore-elf.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gcore-elf.h"
 #include "elf-bfd.h"
 #include "target.h"
diff --git a/gdb/gcore.c b/gdb/gcore.c
index 3d3973bfaba1..007966212a79 100644
--- a/gdb/gcore.c
+++ b/gdb/gcore.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "elf-bfd.h"
 #include "infcall.h"
 #include "inferior.h"
diff --git a/gdb/gdb-demangle.c b/gdb/gdb-demangle.c
index 20390aabb52e..7779beb591da 100644
--- a/gdb/gdb-demangle.c
+++ b/gdb/gdb-demangle.c
@@ -23,7 +23,6 @@
 /*  This file contains support code for C++ demangling that is common
    to a styles of demangling, and GDB specific.  */
 
-#include "defs.h"
 #include "cli/cli-utils.h"
 #include "command.h"
 #include "gdbcmd.h"
diff --git a/gdb/gdb.c b/gdb/gdb.c
index ad37e37e4669..5326df426931 100644
--- a/gdb/gdb.c
+++ b/gdb/gdb.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "main.h"
 #include "interps.h"
 #include "run-on-main-thread.h"
diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c
index 3b1df4897a32..ffff76e54b72 100644
--- a/gdb/gdb_bfd.c
+++ b/gdb/gdb_bfd.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdb_bfd.h"
 #include "ui-out.h"
 #include "gdbcmd.h"
diff --git a/gdb/gdbarch-selftests.c b/gdb/gdbarch-selftests.c
index 2013a0ebed3e..0dc0c5006544 100644
--- a/gdb/gdbarch-selftests.c
+++ b/gdb/gdbarch-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/selftest.h"
 #include "selftest-arch.h"
 #include "target.h"
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 960a7f49e451..1e1a7e9ce615 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "bfd.h"
 #include "symtab.h"
 #include "symfile.h"
diff --git a/gdb/glibc-tdep.c b/gdb/glibc-tdep.c
index ea1bfef60b5f..48e080ae9bf3 100644
--- a/gdb/glibc-tdep.c
+++ b/gdb/glibc-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "symtab.h"
 #include "symfile.h"
diff --git a/gdb/gmp-utils.c b/gdb/gmp-utils.c
index 4341ade16df1..aabdd5f3de5c 100644
--- a/gdb/gmp-utils.c
+++ b/gdb/gmp-utils.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gmp-utils.h"
 
 /* See gmp-utils.h.  */
diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c
index 0add13e3b89f..92b2858bd9d6 100644
--- a/gdb/gnu-nat.c
+++ b/gdb/gnu-nat.c
@@ -49,7 +49,6 @@ extern "C"
 #include <portinfo.h>
 }
 
-#include "defs.h"
 
 #include <ctype.h>
 #include <setjmp.h>
diff --git a/gdb/gnu-nat.h b/gdb/gnu-nat.h
index 725691c3d07b..f1694b8a3a78 100644
--- a/gdb/gnu-nat.h
+++ b/gdb/gnu-nat.h
@@ -19,8 +19,6 @@
 #ifndef GNU_NAT_H
 #define GNU_NAT_H
 
-#include "defs.h"
-
 /* Work around conflict between Mach's 'thread_info' function, and GDB's
    'thread_info' class.  Make the former available as 'mach_thread_info'.  */
 #define thread_info mach_thread_info
diff --git a/gdb/gnu-v2-abi.c b/gdb/gnu-v2-abi.c
index 34c8f1916610..7b511eabdec8 100644
--- a/gdb/gnu-v2-abi.c
+++ b/gdb/gnu-v2-abi.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "value.h"
diff --git a/gdb/gnu-v3-abi.c b/gdb/gnu-v3-abi.c
index 133bf28f6487..90f5b29dd8e9 100644
--- a/gdb/gnu-v3-abi.c
+++ b/gdb/gnu-v3-abi.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "language.h"
 #include "value.h"
 #include "cp-abi.h"
diff --git a/gdb/go-exp.y b/gdb/go-exp.y
index 2e56e4bff610..20ab8ff76cf8 100644
--- a/gdb/go-exp.y
+++ b/gdb/go-exp.y
@@ -51,7 +51,6 @@
 
 %{
 
-#include "defs.h"
 #include <ctype.h>
 #include "expression.h"
 #include "value.h"
diff --git a/gdb/go-lang.c b/gdb/go-lang.c
index 99bc5b74a934..8b4250b222a8 100644
--- a/gdb/go-lang.c
+++ b/gdb/go-lang.c
@@ -31,7 +31,6 @@
    - 6g mangling isn't supported yet
 */
 
-#include "defs.h"
 #include "gdbsupport/gdb_obstack.h"
 #include "block.h"
 #include "symtab.h"
diff --git a/gdb/go-typeprint.c b/gdb/go-typeprint.c
index 0d2653d909c0..7778c71a3d24 100644
--- a/gdb/go-typeprint.c
+++ b/gdb/go-typeprint.c
@@ -23,7 +23,6 @@
      want a Python API for type printing
 */
 
-#include "defs.h"
 #include "gdbtypes.h"
 #include "c-lang.h"
 #include "go-lang.h"
diff --git a/gdb/go-valprint.c b/gdb/go-valprint.c
index b16707138e65..43f279a44263 100644
--- a/gdb/go-valprint.c
+++ b/gdb/go-valprint.c
@@ -23,7 +23,6 @@
    Strings are handled specially here, at least for now, in case the Python
    support is unavailable.  */
 
-#include "defs.h"
 #include "gdbtypes.h"
 #include "gdbcore.h"
 #include "go-lang.h"
diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c
index 44022a260aa9..1d8c16fa71c3 100644
--- a/gdb/go32-nat.c
+++ b/gdb/go32-nat.c
@@ -81,7 +81,6 @@
    GDB does not use those as of this writing, and will never need
    to.  */
 
-#include "defs.h"
 
 #include <fcntl.h>
 
diff --git a/gdb/guile/guile.c b/gdb/guile/guile.c
index f0db709e4fec..f540659d6479 100644
--- a/gdb/guile/guile.c
+++ b/gdb/guile/guile.c
@@ -20,7 +20,6 @@
 /* See README file in this directory for implementation notes, coding
    conventions, et.al.  */
 
-#include "defs.h"
 #include "breakpoint.h"
 #include "cli/cli-cmds.h"
 #include "cli/cli-script.h"
diff --git a/gdb/guile/scm-arch.c b/gdb/guile/scm-arch.c
index eaa2e5e22b6a..02adad0ec113 100644
--- a/gdb/guile/scm-arch.c
+++ b/gdb/guile/scm-arch.c
@@ -20,7 +20,6 @@
 /* See README file in this directory for implementation notes, coding
    conventions, et.al.  */
 
-#include "defs.h"
 #include "charset.h"
 #include "gdbarch.h"
 #include "arch-utils.h"
diff --git a/gdb/guile/scm-auto-load.c b/gdb/guile/scm-auto-load.c
index 1ffa96070dd5..90c4eedb9254 100644
--- a/gdb/guile/scm-auto-load.c
+++ b/gdb/guile/scm-auto-load.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "top.h"
 #include "gdbcmd.h"
 #include "objfiles.h"
diff --git a/gdb/guile/scm-block.c b/gdb/guile/scm-block.c
index 44097a633dd6..4ca43117914e 100644
--- a/gdb/guile/scm-block.c
+++ b/gdb/guile/scm-block.c
@@ -20,7 +20,6 @@
 /* See README file in this directory for implementation notes, coding
    conventions, et.al.  */
 
-#include "defs.h"
 #include "block.h"
 #include "dictionary.h"
 #include "objfiles.h"
diff --git a/gdb/guile/scm-breakpoint.c b/gdb/guile/scm-breakpoint.c
index 88b660329e43..a32862b0349f 100644
--- a/gdb/guile/scm-breakpoint.c
+++ b/gdb/guile/scm-breakpoint.c
@@ -20,7 +20,6 @@
 /* See README file in this directory for implementation notes, coding
    conventions, et.al.  */
 
-#include "defs.h"
 #include "value.h"
 #include "breakpoint.h"
 #include "gdbcmd.h"
diff --git a/gdb/guile/scm-cmd.c b/gdb/guile/scm-cmd.c
index d70d4897413a..d75d2b63c8ca 100644
--- a/gdb/guile/scm-cmd.c
+++ b/gdb/guile/scm-cmd.c
@@ -20,7 +20,6 @@
 /* See README file in this directory for implementation notes, coding
    conventions, et.al.  */
 
-#include "defs.h"
 #include <ctype.h>
 #include "charset.h"
 #include "gdbcmd.h"
diff --git a/gdb/guile/scm-disasm.c b/gdb/guile/scm-disasm.c
index 5266faa601be..0c7c4ec6246b 100644
--- a/gdb/guile/scm-disasm.c
+++ b/gdb/guile/scm-disasm.c
@@ -20,7 +20,6 @@
 /* See README file in this directory for implementation notes, coding
    conventions, et.al.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "disasm.h"
 #include "dis-asm.h"
diff --git a/gdb/guile/scm-exception.c b/gdb/guile/scm-exception.c
index de17c089df3c..61007de935ec 100644
--- a/gdb/guile/scm-exception.c
+++ b/gdb/guile/scm-exception.c
@@ -28,7 +28,6 @@
    The non-static functions in this file have prefix gdbscm_ and
    not exscm_ on purpose.  */
 
-#include "defs.h"
 #include <signal.h>
 #include "guile-internal.h"
 
diff --git a/gdb/guile/scm-frame.c b/gdb/guile/scm-frame.c
index b133e8de11d6..c94fcfe66982 100644
--- a/gdb/guile/scm-frame.c
+++ b/gdb/guile/scm-frame.c
@@ -20,7 +20,6 @@
 /* See README file in this directory for implementation notes, coding
    conventions, et.al.  */
 
-#include "defs.h"
 #include "block.h"
 #include "frame.h"
 #include "inferior.h"
diff --git a/gdb/guile/scm-gsmob.c b/gdb/guile/scm-gsmob.c
index 40871e9167de..b3efad20aba6 100644
--- a/gdb/guile/scm-gsmob.c
+++ b/gdb/guile/scm-gsmob.c
@@ -41,7 +41,6 @@
    seeing if it's already in the table.  Eqable gsmobs can also be used where
    lifetime-tracking is required.  */
 
-#include "defs.h"
 #include "hashtab.h"
 #include "objfiles.h"
 #include "guile-internal.h"
diff --git a/gdb/guile/scm-iterator.c b/gdb/guile/scm-iterator.c
index 035aa8bb8ff1..f4d5344dfc15 100644
--- a/gdb/guile/scm-iterator.c
+++ b/gdb/guile/scm-iterator.c
@@ -50,7 +50,6 @@
    There is SRFI 41, Streams.  We might support that too eventually (not with
    this interface of course).  */
 
-#include "defs.h"
 #include "guile-internal.h"
 
 /* A smob for iterating over something.
diff --git a/gdb/guile/scm-lazy-string.c b/gdb/guile/scm-lazy-string.c
index 30f5a0daeada..94032ae5332b 100644
--- a/gdb/guile/scm-lazy-string.c
+++ b/gdb/guile/scm-lazy-string.c
@@ -20,7 +20,6 @@
 /* See README file in this directory for implementation notes, coding
    conventions, et.al.  */
 
-#include "defs.h"
 #include "charset.h"
 #include "value.h"
 #include "valprint.h"
diff --git a/gdb/guile/scm-math.c b/gdb/guile/scm-math.c
index b09a0ff7ffda..7a4a703e103f 100644
--- a/gdb/guile/scm-math.c
+++ b/gdb/guile/scm-math.c
@@ -20,7 +20,6 @@
 /* See README file in this directory for implementation notes, coding
    conventions, et.al.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "charset.h"
 #include "cp-abi.h"
diff --git a/gdb/guile/scm-objfile.c b/gdb/guile/scm-objfile.c
index 5db4bd2922e0..bccf6ba156d7 100644
--- a/gdb/guile/scm-objfile.c
+++ b/gdb/guile/scm-objfile.c
@@ -20,7 +20,6 @@
 /* See README file in this directory for implementation notes, coding
    conventions, et.al.  */
 
-#include "defs.h"
 #include "objfiles.h"
 #include "language.h"
 #include "guile-internal.h"
diff --git a/gdb/guile/scm-param.c b/gdb/guile/scm-param.c
index b26e66e71d81..018bd1499c99 100644
--- a/gdb/guile/scm-param.c
+++ b/gdb/guile/scm-param.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "value.h"
 #include "charset.h"
 #include "gdbcmd.h"
diff --git a/gdb/guile/scm-ports.c b/gdb/guile/scm-ports.c
index 3b58fff17e72..ab78b5c43439 100644
--- a/gdb/guile/scm-ports.c
+++ b/gdb/guile/scm-ports.c
@@ -21,7 +21,6 @@
 /* See README file in this directory for implementation notes, coding
    conventions, et.al.  */
 
-#include "defs.h"
 #include "gdbsupport/gdb_select.h"
 #include "ui.h"
 #include "target.h"
diff --git a/gdb/guile/scm-pretty-print.c b/gdb/guile/scm-pretty-print.c
index 068fadb853ae..99fa243f9d72 100644
--- a/gdb/guile/scm-pretty-print.c
+++ b/gdb/guile/scm-pretty-print.c
@@ -20,7 +20,6 @@
 /* See README file in this directory for implementation notes, coding
    conventions, et.al.  */
 
-#include "defs.h"
 #include "top.h"
 #include "charset.h"
 #include "symtab.h"
diff --git a/gdb/guile/scm-progspace.c b/gdb/guile/scm-progspace.c
index 216985efd685..fcdcca24f068 100644
--- a/gdb/guile/scm-progspace.c
+++ b/gdb/guile/scm-progspace.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "charset.h"
 #include "progspace.h"
 #include "objfiles.h"
diff --git a/gdb/guile/scm-safe-call.c b/gdb/guile/scm-safe-call.c
index 1c5b9fac4130..bc0a1e641c0c 100644
--- a/gdb/guile/scm-safe-call.c
+++ b/gdb/guile/scm-safe-call.c
@@ -20,7 +20,6 @@
 /* See README file in this directory for implementation notes, coding
    conventions, et.al.  */
 
-#include "defs.h"
 #include "filenames.h"
 #include "guile-internal.h"
 #include "gdbsupport/pathstuff.h"
diff --git a/gdb/guile/scm-string.c b/gdb/guile/scm-string.c
index 134445d011c2..a249bccda1eb 100644
--- a/gdb/guile/scm-string.c
+++ b/gdb/guile/scm-string.c
@@ -20,7 +20,6 @@
 /* See README file in this directory for implementation notes, coding
    conventions, et.al.  */
 
-#include "defs.h"
 #include "charset.h"
 #include "guile-internal.h"
 #include "gdbsupport/buildargv.h"
diff --git a/gdb/guile/scm-symbol.c b/gdb/guile/scm-symbol.c
index 860ed5222748..368a598dc4b2 100644
--- a/gdb/guile/scm-symbol.c
+++ b/gdb/guile/scm-symbol.c
@@ -20,7 +20,6 @@
 /* See README file in this directory for implementation notes, coding
    conventions, et.al.  */
 
-#include "defs.h"
 #include "block.h"
 #include "frame.h"
 #include "symtab.h"
diff --git a/gdb/guile/scm-symtab.c b/gdb/guile/scm-symtab.c
index 9a34a5d7b92e..2fd4b03b4c6d 100644
--- a/gdb/guile/scm-symtab.c
+++ b/gdb/guile/scm-symtab.c
@@ -20,7 +20,6 @@
 /* See README file in this directory for implementation notes, coding
    conventions, et.al.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "source.h"
 #include "objfiles.h"
diff --git a/gdb/guile/scm-type.c b/gdb/guile/scm-type.c
index 67b8179e076f..19324a69810c 100644
--- a/gdb/guile/scm-type.c
+++ b/gdb/guile/scm-type.c
@@ -20,7 +20,6 @@
 /* See README file in this directory for implementation notes, coding
    conventions, et.al.  */
 
-#include "defs.h"
 #include "top.h"
 #include "arch-utils.h"
 #include "value.h"
diff --git a/gdb/guile/scm-utils.c b/gdb/guile/scm-utils.c
index 1cacafdd1375..45f42ba0ccf0 100644
--- a/gdb/guile/scm-utils.c
+++ b/gdb/guile/scm-utils.c
@@ -20,7 +20,6 @@
 /* See README file in this directory for implementation notes, coding
    conventions, et.al.  */
 
-#include "defs.h"
 #include "guile-internal.h"
 
 /* Define VARIABLES in the gdb module.  */
diff --git a/gdb/guile/scm-value.c b/gdb/guile/scm-value.c
index f8b3eea52e28..a7b21707eba1 100644
--- a/gdb/guile/scm-value.c
+++ b/gdb/guile/scm-value.c
@@ -20,7 +20,6 @@
 /* See README file in this directory for implementation notes, coding
    conventions, et.al.  */
 
-#include "defs.h"
 #include "top.h"
 #include "arch-utils.h"
 #include "charset.h"
diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c
index 36cbd9d4aa60..32907e29abff 100644
--- a/gdb/h8300-tdep.c
+++ b/gdb/h8300-tdep.c
@@ -22,7 +22,6 @@
    sac@cygnus.com
  */
 
-#include "defs.h"
 #include "value.h"
 #include "arch-utils.h"
 #include "regcache.h"
diff --git a/gdb/hppa-bsd-tdep.c b/gdb/hppa-bsd-tdep.c
index b1df3d17aa4d..dacda88c5866 100644
--- a/gdb/hppa-bsd-tdep.c
+++ b/gdb/hppa-bsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "objfiles.h"
 #include "target.h"
 #include "value.h"
diff --git a/gdb/hppa-linux-nat.c b/gdb/hppa-linux-nat.c
index 46bcb7c186ec..96faeb39d8f4 100644
--- a/gdb/hppa-linux-nat.c
+++ b/gdb/hppa-linux-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "regcache.h"
 #include "inferior.h"
diff --git a/gdb/hppa-linux-tdep.c b/gdb/hppa-linux-tdep.c
index db0c36801316..659c265bfb86 100644
--- a/gdb/hppa-linux-tdep.c
+++ b/gdb/hppa-linux-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "osabi.h"
 #include "target.h"
diff --git a/gdb/hppa-netbsd-nat.c b/gdb/hppa-netbsd-nat.c
index 6966aa4b8750..e7df997f6e4b 100644
--- a/gdb/hppa-netbsd-nat.c
+++ b/gdb/hppa-netbsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "regcache.h"
 
diff --git a/gdb/hppa-netbsd-tdep.c b/gdb/hppa-netbsd-tdep.c
index ccf32c790906..c71e191c8a58 100644
--- a/gdb/hppa-netbsd-tdep.c
+++ b/gdb/hppa-netbsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "osabi.h"
 #include "regcache.h"
 #include "regset.h"
diff --git a/gdb/hppa-obsd-nat.c b/gdb/hppa-obsd-nat.c
index 3e9938c5e545..f6f79cd33857 100644
--- a/gdb/hppa-obsd-nat.c
+++ b/gdb/hppa-obsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "regcache.h"
 #include "target.h"
diff --git a/gdb/hppa-obsd-tdep.c b/gdb/hppa-obsd-tdep.c
index f009775425c8..c4f8d1fcfe1e 100644
--- a/gdb/hppa-obsd-tdep.c
+++ b/gdb/hppa-obsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "osabi.h"
 #include "regcache.h"
 #include "regset.h"
diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index 30128bafac48..8becfd5f9f9d 100644
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -20,7 +20,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "bfd.h"
 #include "inferior.h"
 #include "regcache.h"
diff --git a/gdb/i386-bsd-nat.c b/gdb/i386-bsd-nat.c
index 612eae9e6f14..e1db6c74f9c4 100644
--- a/gdb/i386-bsd-nat.c
+++ b/gdb/i386-bsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "regcache.h"
 
diff --git a/gdb/i386-bsd-tdep.c b/gdb/i386-bsd-tdep.c
index 8470f2b6d2f9..db00e18bccfe 100644
--- a/gdb/i386-bsd-tdep.c
+++ b/gdb/i386-bsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "frame.h"
 #include "gdbcore.h"
diff --git a/gdb/i386-darwin-nat.c b/gdb/i386-darwin-nat.c
index 4fa86e49696c..acfa46a8b7d0 100644
--- a/gdb/i386-darwin-nat.c
+++ b/gdb/i386-darwin-nat.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "inferior.h"
 #include "target.h"
diff --git a/gdb/i386-darwin-tdep.c b/gdb/i386-darwin-tdep.c
index fc0a3dd3909e..5a5c8bffc210 100644
--- a/gdb/i386-darwin-tdep.c
+++ b/gdb/i386-darwin-tdep.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "inferior.h"
 #include "gdbcore.h"
diff --git a/gdb/i386-dicos-tdep.c b/gdb/i386-dicos-tdep.c
index e893a04617f8..9859c855150d 100644
--- a/gdb/i386-dicos-tdep.c
+++ b/gdb/i386-dicos-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "osabi.h"
 #include "dicos-tdep.h"
 #include "gdbarch.h"
diff --git a/gdb/i386-fbsd-nat.c b/gdb/i386-fbsd-nat.c
index 6b567071fb39..f4538fbe407b 100644
--- a/gdb/i386-fbsd-nat.c
+++ b/gdb/i386-fbsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "regcache.h"
 #include "target.h"
diff --git a/gdb/i386-fbsd-tdep.c b/gdb/i386-fbsd-tdep.c
index 2b9ef77e5e6d..d6d477ab7322 100644
--- a/gdb/i386-fbsd-tdep.c
+++ b/gdb/i386-fbsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "osabi.h"
 #include "regcache.h"
diff --git a/gdb/i386-gnu-nat.c b/gdb/i386-gnu-nat.c
index 0b0759179aa7..52d4a4b7cec2 100644
--- a/gdb/i386-gnu-nat.c
+++ b/gdb/i386-gnu-nat.c
@@ -29,7 +29,6 @@ extern "C"
 #include <mach/exception.h>
 }
 
-#include "defs.h"
 #include "x86-nat.h"
 #include "inferior.h"
 #include "floatformat.h"
diff --git a/gdb/i386-gnu-tdep.c b/gdb/i386-gnu-tdep.c
index aa1898693b61..fb308215a7a9 100644
--- a/gdb/i386-gnu-tdep.c
+++ b/gdb/i386-gnu-tdep.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "osabi.h"
 #include "solib-svr4.h"
diff --git a/gdb/i386-go32-tdep.c b/gdb/i386-go32-tdep.c
index fd1a22fb50a9..738b2583a1dc 100644
--- a/gdb/i386-go32-tdep.c
+++ b/gdb/i386-go32-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "i386-tdep.h"
 #include "gdbsupport/x86-xstate.h"
 #include "target-descriptions.h"
diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c
index 25c57fc902cc..7278dd91ff0b 100644
--- a/gdb/i386-linux-nat.c
+++ b/gdb/i386-linux-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "gdbcore.h"
 #include "regcache.h"
diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c
index a2f937690c2e..44730f204db5 100644
--- a/gdb/i386-linux-tdep.c
+++ b/gdb/i386-linux-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "frame.h"
 #include "value.h"
diff --git a/gdb/i386-netbsd-nat.c b/gdb/i386-netbsd-nat.c
index e4f912f733b1..7eaaaf398c3b 100644
--- a/gdb/i386-netbsd-nat.c
+++ b/gdb/i386-netbsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "regcache.h"
 #include "target.h"
diff --git a/gdb/i386-netbsd-tdep.c b/gdb/i386-netbsd-tdep.c
index 9596435e9d10..a43765696270 100644
--- a/gdb/i386-netbsd-tdep.c
+++ b/gdb/i386-netbsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "frame.h"
 #include "gdbcore.h"
diff --git a/gdb/i386-nto-tdep.c b/gdb/i386-nto-tdep.c
index f4bb70cc5a08..674d45feba99 100644
--- a/gdb/i386-nto-tdep.c
+++ b/gdb/i386-nto-tdep.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "osabi.h"
 #include "regcache.h"
diff --git a/gdb/i386-obsd-nat.c b/gdb/i386-obsd-nat.c
index 69dd67ed6558..2b3d3912430f 100644
--- a/gdb/i386-obsd-nat.c
+++ b/gdb/i386-obsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "regcache.h"
 #include "target.h"
diff --git a/gdb/i386-obsd-tdep.c b/gdb/i386-obsd-tdep.c
index e1480ec6cc41..6e31567328eb 100644
--- a/gdb/i386-obsd-tdep.c
+++ b/gdb/i386-obsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "frame.h"
 #include "frame-unwind.h"
diff --git a/gdb/i386-sol2-nat.c b/gdb/i386-sol2-nat.c
index 7b3bc3a02ace..20ca9d68cbc8 100644
--- a/gdb/i386-sol2-nat.c
+++ b/gdb/i386-sol2-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "regcache.h"
 
 #include <sys/reg.h>
diff --git a/gdb/i386-sol2-tdep.c b/gdb/i386-sol2-tdep.c
index bc8df378219d..b85ac1751ac4 100644
--- a/gdb/i386-sol2-tdep.c
+++ b/gdb/i386-sol2-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "value.h"
 #include "osabi.h"
 
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c
index 0d4e30b9a4e4..1b1efad6fa3e 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "opcode/i386.h"
 #include "arch-utils.h"
 #include "command.h"
diff --git a/gdb/i386-windows-nat.c b/gdb/i386-windows-nat.c
index d262b5fce67e..ec6077ffce18 100644
--- a/gdb/i386-windows-nat.c
+++ b/gdb/i386-windows-nat.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "windows-nat.h"
 #include "x86-nat.h"
 #include "i386-tdep.h"
diff --git a/gdb/i386-windows-tdep.c b/gdb/i386-windows-tdep.c
index e8ed043be8a0..b3a96d70bdf1 100644
--- a/gdb/i386-windows-tdep.c
+++ b/gdb/i386-windows-tdep.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "osabi.h"
 #include "i386-tdep.h"
 #include "windows-tdep.h"
diff --git a/gdb/i387-tdep.c b/gdb/i387-tdep.c
index 3d979e279a1e..00c9523ff258 100644
--- a/gdb/i387-tdep.c
+++ b/gdb/i387-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "gdbcore.h"
 #include "inferior.h"
diff --git a/gdb/ia64-libunwind-tdep.c b/gdb/ia64-libunwind-tdep.c
index 24a5162cdc65..72e4fae418d9 100644
--- a/gdb/ia64-libunwind-tdep.c
+++ b/gdb/ia64-libunwind-tdep.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "inferior.h"
 #include "frame.h"
diff --git a/gdb/ia64-linux-nat.c b/gdb/ia64-linux-nat.c
index 2ea7203e7b0f..7a8e742daea3 100644
--- a/gdb/ia64-linux-nat.c
+++ b/gdb/ia64-linux-nat.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "target.h"
 #include "gdbarch.h"
diff --git a/gdb/ia64-linux-tdep.c b/gdb/ia64-linux-tdep.c
index 68d4102ee9a2..676fdb8edac7 100644
--- a/gdb/ia64-linux-tdep.c
+++ b/gdb/ia64-linux-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "ia64-tdep.h"
 #include "arch-utils.h"
 #include "gdbcore.h"
diff --git a/gdb/ia64-tdep.c b/gdb/ia64-tdep.c
index 88f67ccf0962..f49a8d6b5586 100644
--- a/gdb/ia64-tdep.c
+++ b/gdb/ia64-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "gdbcore.h"
 #include "arch-utils.h"
diff --git a/gdb/ia64-vms-tdep.c b/gdb/ia64-vms-tdep.c
index f5bf2b53e5e2..20308c707205 100644
--- a/gdb/ia64-vms-tdep.c
+++ b/gdb/ia64-vms-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame-unwind.h"
 #include "ia64-tdep.h"
 #include "osabi.h"
diff --git a/gdb/inf-child.c b/gdb/inf-child.c
index d44179ca042e..1318d6b041e1 100644
--- a/gdb/inf-child.c
+++ b/gdb/inf-child.c
@@ -22,7 +22,6 @@
    new prototype target and then overriding target methods as
    necessary.  */
 
-#include "defs.h"
 #include "regcache.h"
 #include "memattr.h"
 #include "symtab.h"
diff --git a/gdb/inf-loop.c b/gdb/inf-loop.c
index e23608f2800f..41e766095f05 100644
--- a/gdb/inf-loop.c
+++ b/gdb/inf-loop.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "infrun.h"
 #include "gdbsupport/event-loop.h"
diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c
index 31638fcbb2d8..ce303eb87eaf 100644
--- a/gdb/inf-ptrace.c
+++ b/gdb/inf-ptrace.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "command.h"
 #include "inferior.h"
 #include "terminal.h"
diff --git a/gdb/infcall.c b/gdb/infcall.c
index c9267e7a1293..86f50044d6db 100644
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "infcall.h"
 #include "breakpoint.h"
 #include "tracepoint.h"
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index ac41ebf11b4f..600c90c055a5 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "symtab.h"
 #include "gdbtypes.h"
diff --git a/gdb/inferior.c b/gdb/inferior.c
index 5ff5eb989552..4e1d789d1ba6 100644
--- a/gdb/inferior.c
+++ b/gdb/inferior.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "exec.h"
 #include "inferior.h"
 #include "target.h"
diff --git a/gdb/inflow.c b/gdb/inflow.c
index 3dd70b97fe53..ac71e262a1f2 100644
--- a/gdb/inflow.c
+++ b/gdb/inflow.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "inferior.h"
 #include "command.h"
diff --git a/gdb/infrun.c b/gdb/infrun.c
index b06972bb9687..a5030b16376d 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "displaced-stepping.h"
 #include "infrun.h"
 #include <ctype.h>
diff --git a/gdb/inline-frame.c b/gdb/inline-frame.c
index 9f3deef8f030..f65f39be40d6 100644
--- a/gdb/inline-frame.c
+++ b/gdb/inline-frame.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "breakpoint.h"
 #include "inline-frame.h"
 #include "addrmap.h"
diff --git a/gdb/interps.c b/gdb/interps.c
index 8e9570ecb1eb..36d96eea5149 100644
--- a/gdb/interps.c
+++ b/gdb/interps.c
@@ -29,7 +29,6 @@
    the readline command interface, and it is probably simpler to just let
    them take over the input in their resume proc.  */
 
-#include "defs.h"
 #include "gdbcmd.h"
 #include "ui-out.h"
 #include "gdbsupport/event-loop.h"
diff --git a/gdb/iq2000-tdep.c b/gdb/iq2000-tdep.c
index 4177de059c0d..b9d95bbc2675 100644
--- a/gdb/iq2000-tdep.c
+++ b/gdb/iq2000-tdep.c
@@ -20,7 +20,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-base.h"
 #include "frame-unwind.h"
diff --git a/gdb/jit.c b/gdb/jit.c
index a7fd5c40f9d4..3843b84b0e63 100644
--- a/gdb/jit.c
+++ b/gdb/jit.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "jit.h"
 #include "jit-reader.h"
diff --git a/gdb/language.c b/gdb/language.c
index c5bbc3199637..e43e0fe7a172 100644
--- a/gdb/language.c
+++ b/gdb/language.c
@@ -28,7 +28,6 @@
    return data out of a "language-specific" struct pointer that is set
    whenever the working language changes.  That would be a lot faster.  */
 
-#include "defs.h"
 #include <ctype.h>
 #include "symtab.h"
 #include "gdbtypes.h"
diff --git a/gdb/linespec.c b/gdb/linespec.c
index b5bbd8c433c9..ca154d2dcba1 100644
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "frame.h"
 #include "command.h"
diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c
index 0d92d61f0d24..bb8119a36d05 100644
--- a/gdb/linux-fork.c
+++ b/gdb/linux-fork.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "inferior.h"
 #include "infrun.h"
diff --git a/gdb/linux-nat-trad.c b/gdb/linux-nat-trad.c
index 3639b2e2578b..d90d76fd9a03 100644
--- a/gdb/linux-nat-trad.c
+++ b/gdb/linux-nat-trad.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "linux-nat-trad.h"
 
 #include "nat/gdb_ptrace.h"
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index 3ba072bc8d70..2602e1f240d0 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "infrun.h"
 #include "target.h"
diff --git a/gdb/linux-record.c b/gdb/linux-record.c
index 1b7330de08c4..6430c0e00884 100644
--- a/gdb/linux-record.c
+++ b/gdb/linux-record.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "target.h"
 #include "gdbtypes.h"
 #include "regcache.h"
diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c
index 701e3df7a279..b967580a6431 100644
--- a/gdb/linux-tdep.c
+++ b/gdb/linux-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbtypes.h"
 #include "linux-tdep.h"
 #include "auxv.h"
diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c
index 34a39899eeb4..65bf4a79fdf1 100644
--- a/gdb/linux-thread-db.c
+++ b/gdb/linux-thread-db.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include <dlfcn.h>
 #include "gdb_proc_service.h"
 #include "nat/gdb_thread_db.h"
diff --git a/gdb/lm32-tdep.c b/gdb/lm32-tdep.c
index b4605e48c6a3..478f1edf3e64 100644
--- a/gdb/lm32-tdep.c
+++ b/gdb/lm32-tdep.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "frame-base.h"
diff --git a/gdb/location.c b/gdb/location.c
index c3bea1fc673d..851d6e474448 100644
--- a/gdb/location.c
+++ b/gdb/location.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/gdb_assert.h"
 #include "gdbsupport/gdb-checked-static-cast.h"
 #include "location.h"
diff --git a/gdb/loongarch-linux-nat.c b/gdb/loongarch-linux-nat.c
index 9bceb8a5953d..15fca6ad781c 100644
--- a/gdb/loongarch-linux-nat.c
+++ b/gdb/loongarch-linux-nat.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "elf/common.h"
 #include "gregset.h"
 #include "inferior.h"
diff --git a/gdb/loongarch-linux-tdep.c b/gdb/loongarch-linux-tdep.c
index cc8121bb2b8d..a57dc31cde8a 100644
--- a/gdb/loongarch-linux-tdep.c
+++ b/gdb/loongarch-linux-tdep.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "glibc-tdep.h"
 #include "inferior.h"
 #include "linux-tdep.h"
diff --git a/gdb/loongarch-tdep.c b/gdb/loongarch-tdep.c
index 0b38e751d165..149fbd55db90 100644
--- a/gdb/loongarch-tdep.c
+++ b/gdb/loongarch-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "dwarf2/frame.h"
 #include "elf-bfd.h"
diff --git a/gdb/m2-exp.y b/gdb/m2-exp.y
index ce5a399477d4..ebbc49c62a5e 100644
--- a/gdb/m2-exp.y
+++ b/gdb/m2-exp.y
@@ -37,7 +37,6 @@
    
 %{
 
-#include "defs.h"
 #include "expression.h"
 #include "language.h"
 #include "value.h"
diff --git a/gdb/m2-lang.c b/gdb/m2-lang.c
index 30c2a931236b..86fef96dec18 100644
--- a/gdb/m2-lang.c
+++ b/gdb/m2-lang.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
diff --git a/gdb/m2-typeprint.c b/gdb/m2-typeprint.c
index d8172c0c3684..32cc930cfb8d 100644
--- a/gdb/m2-typeprint.c
+++ b/gdb/m2-typeprint.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "language.h"
 #include "gdbsupport/gdb_obstack.h"
 #include "bfd.h"
diff --git a/gdb/m2-valprint.c b/gdb/m2-valprint.c
index c98f9269ae62..62bfec9cf1c4 100644
--- a/gdb/m2-valprint.c
+++ b/gdb/m2-valprint.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
diff --git a/gdb/m32c-tdep.c b/gdb/m32c-tdep.c
index 0895f7bd0c4b..33ec44349d76 100644
--- a/gdb/m32c-tdep.c
+++ b/gdb/m32c-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "sim/sim-m32c.h"
 #include "gdbtypes.h"
 #include "regcache.h"
diff --git a/gdb/m32r-linux-nat.c b/gdb/m32r-linux-nat.c
index f482fe62e235..08a4db1d39a6 100644
--- a/gdb/m32r-linux-nat.c
+++ b/gdb/m32r-linux-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "gdbcore.h"
 #include "regcache.h"
diff --git a/gdb/m32r-linux-tdep.c b/gdb/m32r-linux-tdep.c
index b74d2f3f161b..a28e11358402 100644
--- a/gdb/m32r-linux-tdep.c
+++ b/gdb/m32r-linux-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "frame.h"
 #include "value.h"
diff --git a/gdb/m32r-tdep.c b/gdb/m32r-tdep.c
index 0bd6b499e6f0..215df88b21c8 100644
--- a/gdb/m32r-tdep.c
+++ b/gdb/m32r-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "frame-base.h"
diff --git a/gdb/m68hc11-tdep.c b/gdb/m68hc11-tdep.c
index d80b190f2c0f..70b3f129d5aa 100644
--- a/gdb/m68hc11-tdep.c
+++ b/gdb/m68hc11-tdep.c
@@ -20,7 +20,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "frame-base.h"
diff --git a/gdb/m68k-bsd-nat.c b/gdb/m68k-bsd-nat.c
index 29fd98f0921e..1fb0c20d05cd 100644
--- a/gdb/m68k-bsd-nat.c
+++ b/gdb/m68k-bsd-nat.c
@@ -19,7 +19,6 @@
 
 /* We define this to get types like register_t.  */
 #define _KERNTYPES
-#include "defs.h"
 #include "gdbcore.h"
 #include "inferior.h"
 #include "regcache.h"
diff --git a/gdb/m68k-bsd-tdep.c b/gdb/m68k-bsd-tdep.c
index 3903a83f4e04..faec4713143a 100644
--- a/gdb/m68k-bsd-tdep.c
+++ b/gdb/m68k-bsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "frame.h"
 #include "osabi.h"
diff --git a/gdb/m68k-linux-nat.c b/gdb/m68k-linux-nat.c
index 8b1f868a6b9f..7f3373986769 100644
--- a/gdb/m68k-linux-nat.c
+++ b/gdb/m68k-linux-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "inferior.h"
 #include "language.h"
diff --git a/gdb/m68k-linux-tdep.c b/gdb/m68k-linux-tdep.c
index eca4ede099f7..4874db720db9 100644
--- a/gdb/m68k-linux-tdep.c
+++ b/gdb/m68k-linux-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "frame.h"
 #include "target.h"
diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c
index abfc605aabb6..f73f58de90aa 100644
--- a/gdb/m68k-tdep.c
+++ b/gdb/m68k-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "dwarf2/frame.h"
 #include "frame.h"
 #include "frame-base.h"
diff --git a/gdb/machoread.c b/gdb/machoread.c
index 8022fac9378c..b65694e697d5 100644
--- a/gdb/machoread.c
+++ b/gdb/machoread.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "bfd.h"
diff --git a/gdb/macrocmd.c b/gdb/macrocmd.c
index d3879cdf94c8..ddabfede0f55 100644
--- a/gdb/macrocmd.c
+++ b/gdb/macrocmd.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include "defs.h"
 #include "macrotab.h"
 #include "macroexp.h"
 #include "macroscope.h"
diff --git a/gdb/macroexp.c b/gdb/macroexp.c
index b8a9b29db245..bcae7ec8daf6 100644
--- a/gdb/macroexp.c
+++ b/gdb/macroexp.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/gdb_obstack.h"
 #include "macrotab.h"
 #include "macroexp.h"
diff --git a/gdb/macroscope.c b/gdb/macroscope.c
index b193b0a5c02e..4c1304f119ad 100644
--- a/gdb/macroscope.c
+++ b/gdb/macroscope.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "macroscope.h"
 #include "symtab.h"
diff --git a/gdb/macrotab.c b/gdb/macrotab.c
index 5329d2a5a939..f2012dae1ad6 100644
--- a/gdb/macrotab.c
+++ b/gdb/macrotab.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/gdb_obstack.h"
 #include "gdbsupport/pathstuff.h"
 #include "splay-tree.h"
diff --git a/gdb/main.c b/gdb/main.c
index 17826fae95e3..bf3c776dba9c 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "top.h"
 #include "ui.h"
 #include "target.h"
diff --git a/gdb/maint-test-options.c b/gdb/maint-test-options.c
index 11b0e1d1f0f0..f671771f3b37 100644
--- a/gdb/maint-test-options.c
+++ b/gdb/maint-test-options.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcmd.h"
 #include "cli/cli-option.h"
 
diff --git a/gdb/maint-test-settings.c b/gdb/maint-test-settings.c
index 22c7d2dd7ab7..61456911589d 100644
--- a/gdb/maint-test-settings.c
+++ b/gdb/maint-test-settings.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include "defs.h"
 #include "gdbcmd.h"
 
 /* Command list for "maint set test-settings".  */
diff --git a/gdb/maint.c b/gdb/maint.c
index f410cf11e697..6a5a55afebf8 100644
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -20,7 +20,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include "defs.h"
 #include "arch-utils.h"
 #include <ctype.h>
 #include <cmath>
diff --git a/gdb/make-init-c b/gdb/make-init-c
index 7190e691c3e7..3458333c84cb 100755
--- a/gdb/make-init-c
+++ b/gdb/make-init-c
@@ -41,7 +41,6 @@ set -e
 
 echo "/* Do not modify this file.  */"
 echo "/* It is created automatically by the Makefile.  */"
-echo "#include \"defs.h\"      /* For initialize_file_ftype.  */"
 echo "#include <algorithm>"
 echo ""
 sed -n -e 's/^\(_initialize_[a-zA-Z0-9_]*\) ()$/\1/p' "$@" | while read -r name; do
diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c
index 4748b0cd7aa8..ab4d509e02a2 100644
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -39,7 +39,6 @@
    This module can read all four of the known byte-order combinations,
    on any type of host.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "gdbcore.h"
diff --git a/gdb/mem-break.c b/gdb/mem-break.c
index 552bb28b288d..712ad000daf1 100644
--- a/gdb/mem-break.c
+++ b/gdb/mem-break.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "breakpoint.h"
 #include "inferior.h"
diff --git a/gdb/memattr.c b/gdb/memattr.c
index 6d406be36337..062611e8ee6f 100644
--- a/gdb/memattr.c
+++ b/gdb/memattr.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "command.h"
 #include "gdbcmd.h"
 #include "memattr.h"
diff --git a/gdb/memory-map.c b/gdb/memory-map.c
index 7b7a0ebf9503..26c49dbb079c 100644
--- a/gdb/memory-map.c
+++ b/gdb/memory-map.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "memory-map.h"
 
 #if !defined(HAVE_LIBEXPAT)
diff --git a/gdb/memrange.c b/gdb/memrange.c
index 161e9ac8f955..11687b808b86 100644
--- a/gdb/memrange.c
+++ b/gdb/memrange.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "memrange.h"
 #include <algorithm>
 
diff --git a/gdb/memtag.c b/gdb/memtag.c
index 86b2f66de28f..54bdc0ad323c 100644
--- a/gdb/memtag.c
+++ b/gdb/memtag.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "memtag.h"
 #include "bfd.h"
 
diff --git a/gdb/mep-tdep.c b/gdb/mep-tdep.c
index f455d3eb51d6..fdb589134da0 100644
--- a/gdb/mep-tdep.c
+++ b/gdb/mep-tdep.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "frame-base.h"
diff --git a/gdb/mi/mi-cmd-break.c b/gdb/mi/mi-cmd-break.c
index 4e64283f8e94..343a167e3d87 100644
--- a/gdb/mi/mi-cmd-break.c
+++ b/gdb/mi/mi-cmd-break.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "mi-cmds.h"
 #include "ui-out.h"
diff --git a/gdb/mi/mi-cmd-catch.c b/gdb/mi/mi-cmd-catch.c
index 422bbe793f2c..6cba316efda4 100644
--- a/gdb/mi/mi-cmd-catch.c
+++ b/gdb/mi/mi-cmd-catch.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "breakpoint.h"
 #include "ada-lang.h"
diff --git a/gdb/mi/mi-cmd-disas.c b/gdb/mi/mi-cmd-disas.c
index 3121f0c1dd9f..99b2ae418172 100644
--- a/gdb/mi/mi-cmd-disas.c
+++ b/gdb/mi/mi-cmd-disas.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "target.h"
 #include "value.h"
diff --git a/gdb/mi/mi-cmd-env.c b/gdb/mi/mi-cmd-env.c
index e4fa89bb82cd..ae8c5e8bf00c 100644
--- a/gdb/mi/mi-cmd-env.c
+++ b/gdb/mi/mi-cmd-env.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "value.h"
 #include "mi-out.h"
diff --git a/gdb/mi/mi-cmd-file.c b/gdb/mi/mi-cmd-file.c
index 95128a9ad6dc..3e2702e04ed1 100644
--- a/gdb/mi/mi-cmd-file.c
+++ b/gdb/mi/mi-cmd-file.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "mi-cmds.h"
 #include "mi-getopt.h"
 #include "mi-interp.h"
diff --git a/gdb/mi/mi-cmd-info.c b/gdb/mi/mi-cmd-info.c
index 1af20f8cb3a9..628891bcc119 100644
--- a/gdb/mi/mi-cmd-info.c
+++ b/gdb/mi/mi-cmd-info.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "osdata.h"
 #include "mi-cmds.h"
 #include "ada-lang.h"
diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c
index 09c31b6a9a4c..b78c169e70bc 100644
--- a/gdb/mi/mi-cmd-stack.c
+++ b/gdb/mi/mi-cmd-stack.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "target.h"
 #include "frame.h"
 #include "value.h"
diff --git a/gdb/mi/mi-cmd-target.c b/gdb/mi/mi-cmd-target.c
index e9edad739960..fbc6d6c07c8f 100644
--- a/gdb/mi/mi-cmd-target.c
+++ b/gdb/mi/mi-cmd-target.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "mi-cmds.h"
 #include "mi-getopt.h"
 #include "remote.h"
diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c
index cb5bafe9b7b7..f31120472a70 100644
--- a/gdb/mi/mi-cmd-var.c
+++ b/gdb/mi/mi-cmd-var.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "mi-cmds.h"
 #include "mi-main.h"
 #include "ui-out.h"
diff --git a/gdb/mi/mi-cmds.c b/gdb/mi/mi-cmds.c
index 53df07c41d07..c7afb10097be 100644
--- a/gdb/mi/mi-cmds.c
+++ b/gdb/mi/mi-cmds.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "top.h"
 #include "mi-cmds.h"
 #include "mi-main.h"
diff --git a/gdb/mi/mi-common.c b/gdb/mi/mi-common.c
index dc0ea563921b..699ead285200 100644
--- a/gdb/mi/mi-common.c
+++ b/gdb/mi/mi-common.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "mi-common.h"
 
 static const char * const async_reason_string_lookup[] =
diff --git a/gdb/mi/mi-console.c b/gdb/mi/mi-console.c
index 74d332005759..1f8d731e39fa 100644
--- a/gdb/mi/mi-console.c
+++ b/gdb/mi/mi-console.c
@@ -24,7 +24,6 @@
    for instance, error output is normally identified by a leading
    "&".  */
 
-#include "defs.h"
 #include "mi-console.h"
 
 /* Create a console that wraps the given output stream RAW with the
diff --git a/gdb/mi/mi-getopt.c b/gdb/mi/mi-getopt.c
index cf98c56e7e05..143c5b92dcdb 100644
--- a/gdb/mi/mi-getopt.c
+++ b/gdb/mi/mi-getopt.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "mi-getopt.h"
 /* See comments about mi_getopt and mi_getopt_silent in mi-getopt.h.
    When there is an unknown option, if ERROR_ON_UNKNOWN is true,
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index 38ae22769015..07e036f5ff90 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "mi-interp.h"
 
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index f4ab17915ecb..ab788a202310 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "target.h"
 #include "inferior.h"
diff --git a/gdb/mi/mi-out.c b/gdb/mi/mi-out.c
index 41bb95a92737..ff93d2cd4485 100644
--- a/gdb/mi/mi-out.c
+++ b/gdb/mi/mi-out.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "mi-out.h"
 
 #include <vector>
diff --git a/gdb/mi/mi-parse.c b/gdb/mi/mi-parse.c
index 6975821c7ec9..8804c98d7b4b 100644
--- a/gdb/mi/mi-parse.c
+++ b/gdb/mi/mi-parse.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "mi-cmds.h"
 #include "mi-parse.h"
 #include "charset.h"
diff --git a/gdb/mi/mi-symbol-cmds.c b/gdb/mi/mi-symbol-cmds.c
index 37cf2fbcfa2b..15c032b9ae29 100644
--- a/gdb/mi/mi-symbol-cmds.c
+++ b/gdb/mi/mi-symbol-cmds.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "mi-cmds.h"
 #include "symtab.h"
 #include "objfiles.h"
diff --git a/gdb/microblaze-linux-tdep.c b/gdb/microblaze-linux-tdep.c
index 6236ab0a0447..999a3bc27126 100644
--- a/gdb/microblaze-linux-tdep.c
+++ b/gdb/microblaze-linux-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "inferior.h"
 #include "symtab.h"
diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c
index 07261bd4d22f..1886c973bdc5 100644
--- a/gdb/microblaze-tdep.c
+++ b/gdb/microblaze-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "dis-asm.h"
 #include "frame.h"
diff --git a/gdb/mingw-hdep.c b/gdb/mingw-hdep.c
index 0ef19b680fb2..53815b2f683e 100644
--- a/gdb/mingw-hdep.c
+++ b/gdb/mingw-hdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "main.h"
 #include "serial.h"
 #include "gdbsupport/event-loop.h"
diff --git a/gdb/minidebug.c b/gdb/minidebug.c
index b7558b71f980..b3a1f121280a 100644
--- a/gdb/minidebug.c
+++ b/gdb/minidebug.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdb_bfd.h"
 #include "symfile.h"
 #include "objfiles.h"
diff --git a/gdb/minsyms.c b/gdb/minsyms.c
index 6aa2010fb014..38176c4bdcb4 100644
--- a/gdb/minsyms.c
+++ b/gdb/minsyms.c
@@ -36,7 +36,6 @@
    to figure out what full symbol table entries need to be read in.  */
 
 
-#include "defs.h"
 #include <ctype.h>
 #include "symtab.h"
 #include "bfd.h"
diff --git a/gdb/mips-fbsd-nat.c b/gdb/mips-fbsd-nat.c
index 6dd7b00bf5ed..b4d410405e3d 100644
--- a/gdb/mips-fbsd-nat.c
+++ b/gdb/mips-fbsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "regcache.h"
 #include "target.h"
diff --git a/gdb/mips-fbsd-tdep.c b/gdb/mips-fbsd-tdep.c
index 8464a92bf4af..188ef4099da8 100644
--- a/gdb/mips-fbsd-tdep.c
+++ b/gdb/mips-fbsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "osabi.h"
 #include "regset.h"
 #include "trad-frame.h"
diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c
index 435aff82bbc5..97ec72e5d731 100644
--- a/gdb/mips-linux-nat.c
+++ b/gdb/mips-linux-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "command.h"
 #include "gdbcmd.h"
 #include "inferior.h"
diff --git a/gdb/mips-linux-tdep.c b/gdb/mips-linux-tdep.c
index 0b5e7867788d..79508f0fce75 100644
--- a/gdb/mips-linux-tdep.c
+++ b/gdb/mips-linux-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "target.h"
 #include "solib-svr4.h"
diff --git a/gdb/mips-netbsd-nat.c b/gdb/mips-netbsd-nat.c
index ddf6a8d15db9..3576c099fa69 100644
--- a/gdb/mips-netbsd-nat.c
+++ b/gdb/mips-netbsd-nat.c
@@ -19,7 +19,6 @@
 
 /* We define this to get types like register_t.  */
 #define _KERNTYPES
-#include "defs.h"
 #include "inferior.h"
 #include "regcache.h"
 #include "target.h"
diff --git a/gdb/mips-netbsd-tdep.c b/gdb/mips-netbsd-tdep.c
index 8d3604a8b905..63068a18fe8e 100644
--- a/gdb/mips-netbsd-tdep.c
+++ b/gdb/mips-netbsd-tdep.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "regcache.h"
 #include "regset.h"
diff --git a/gdb/mips-sde-tdep.c b/gdb/mips-sde-tdep.c
index 7b367898f043..90988cdfdac0 100644
--- a/gdb/mips-sde-tdep.c
+++ b/gdb/mips-sde-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "osabi.h"
 #include "elf-bfd.h"
 #include "symtab.h"
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 67bed1d2ba05..c34971c60c1b 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -20,7 +20,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "inferior.h"
 #include "symtab.h"
diff --git a/gdb/mips64-obsd-nat.c b/gdb/mips64-obsd-nat.c
index 2b3449c2dc12..ced3ffb2ee28 100644
--- a/gdb/mips64-obsd-nat.c
+++ b/gdb/mips64-obsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "regcache.h"
 #include "target.h"
diff --git a/gdb/mips64-obsd-tdep.c b/gdb/mips64-obsd-tdep.c
index cacb8bbee50a..543938bc08eb 100644
--- a/gdb/mips64-obsd-tdep.c
+++ b/gdb/mips64-obsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbtypes.h"
 #include "osabi.h"
 #include "regcache.h"
diff --git a/gdb/mipsread.c b/gdb/mipsread.c
index 40b1413e2155..53def129be70 100644
--- a/gdb/mipsread.c
+++ b/gdb/mipsread.c
@@ -23,7 +23,6 @@
 /* Read symbols from an ECOFF file.  Most of the work is done in
    mdebugread.c.  */
 
-#include "defs.h"
 #include "bfd.h"
 #include "symtab.h"
 #include "objfiles.h"
diff --git a/gdb/mn10300-linux-tdep.c b/gdb/mn10300-linux-tdep.c
index 4554cb182314..8eb59d2cee46 100644
--- a/gdb/mn10300-linux-tdep.c
+++ b/gdb/mn10300-linux-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "regcache.h"
 #include "mn10300-tdep.h"
diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c
index f8c5a0906ef5..cd70f8adb68d 100644
--- a/gdb/mn10300-tdep.c
+++ b/gdb/mn10300-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "dis-asm.h"
 #include "gdbtypes.h"
diff --git a/gdb/moxie-tdep.c b/gdb/moxie-tdep.c
index 812c92d1e0af..a6b783e5c84c 100644
--- a/gdb/moxie-tdep.c
+++ b/gdb/moxie-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "frame-base.h"
diff --git a/gdb/msp430-tdep.c b/gdb/msp430-tdep.c
index e07e3cc4be2b..9d90a6e2784d 100644
--- a/gdb/msp430-tdep.c
+++ b/gdb/msp430-tdep.c
@@ -20,7 +20,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "prologue-value.h"
 #include "target.h"
diff --git a/gdb/namespace.c b/gdb/namespace.c
index 33057fe08bef..231c7bd4cb66 100644
--- a/gdb/namespace.c
+++ b/gdb/namespace.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "namespace.h"
 #include "frame.h"
 #include "symtab.h"
diff --git a/gdb/nat/aarch64-hw-point.c b/gdb/nat/aarch64-hw-point.c
index 08fd230b71f3..b62c4627d963 100644
--- a/gdb/nat/aarch64-hw-point.c
+++ b/gdb/nat/aarch64-hw-point.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "gdbsupport/break-common.h"
 #include "gdbsupport/common-regcache.h"
 #include "aarch64-hw-point.h"
diff --git a/gdb/nat/aarch64-linux-hw-point.c b/gdb/nat/aarch64-linux-hw-point.c
index 8a06a0c30ef9..43e04fef137d 100644
--- a/gdb/nat/aarch64-linux-hw-point.c
+++ b/gdb/nat/aarch64-linux-hw-point.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "gdbsupport/break-common.h"
 #include "gdbsupport/common-regcache.h"
 #include "nat/linux-nat.h"
diff --git a/gdb/nat/aarch64-linux.c b/gdb/nat/aarch64-linux.c
index 5ebbc9b81f8a..5a95f22a6fce 100644
--- a/gdb/nat/aarch64-linux.c
+++ b/gdb/nat/aarch64-linux.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "gdbsupport/break-common.h"
 #include "nat/linux-nat.h"
 #include "nat/aarch64-linux-hw-point.h"
diff --git a/gdb/nat/aarch64-mte-linux-ptrace.c b/gdb/nat/aarch64-mte-linux-ptrace.c
index dfd2856a642e..ace3e1880610 100644
--- a/gdb/nat/aarch64-mte-linux-ptrace.c
+++ b/gdb/nat/aarch64-mte-linux-ptrace.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "gdbsupport/byte-vector.h"
 
 #include "linux-ptrace.h"
diff --git a/gdb/nat/aarch64-scalable-linux-ptrace.c b/gdb/nat/aarch64-scalable-linux-ptrace.c
index a840d513c0c0..81bb8eab4a8f 100644
--- a/gdb/nat/aarch64-scalable-linux-ptrace.c
+++ b/gdb/nat/aarch64-scalable-linux-ptrace.c
@@ -19,7 +19,6 @@
 
 #include <sys/utsname.h>
 #include <sys/uio.h>
-#include "gdbsupport/common-defs.h"
 #include "elf/external.h"
 #include "elf/common.h"
 #include "aarch64-scalable-linux-ptrace.h"
diff --git a/gdb/nat/amd64-linux-siginfo.c b/gdb/nat/amd64-linux-siginfo.c
index 8ced1935342b..f5e99941b5c1 100644
--- a/gdb/nat/amd64-linux-siginfo.c
+++ b/gdb/nat/amd64-linux-siginfo.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include <signal.h>
 #include "amd64-linux-siginfo.h"
 
diff --git a/gdb/nat/fork-inferior.c b/gdb/nat/fork-inferior.c
index dfc2f6c5a88e..a5900fe4ee8f 100644
--- a/gdb/nat/fork-inferior.c
+++ b/gdb/nat/fork-inferior.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "fork-inferior.h"
 #include "target/waitstatus.h"
 #include "gdbsupport/filestuff.h"
diff --git a/gdb/nat/linux-btrace.c b/gdb/nat/linux-btrace.c
index f8352b62b8b6..5715168d2f08 100644
--- a/gdb/nat/linux-btrace.c
+++ b/gdb/nat/linux-btrace.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "linux-btrace.h"
 #include "gdbsupport/common-regcache.h"
 #include "gdbsupport/gdb_wait.h"
diff --git a/gdb/nat/linux-namespaces.c b/gdb/nat/linux-namespaces.c
index 292e7e7ffc83..36a245c6a4cb 100644
--- a/gdb/nat/linux-namespaces.c
+++ b/gdb/nat/linux-namespaces.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "nat/linux-namespaces.h"
 #include "gdbsupport/filestuff.h"
 #include <fcntl.h>
diff --git a/gdb/nat/linux-osdata.c b/gdb/nat/linux-osdata.c
index c9192940f236..6ffabe90aa7d 100644
--- a/gdb/nat/linux-osdata.c
+++ b/gdb/nat/linux-osdata.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "linux-osdata.h"
 
 #include <sys/types.h>
diff --git a/gdb/nat/linux-personality.c b/gdb/nat/linux-personality.c
index 49789321aeb8..a406c73dfe81 100644
--- a/gdb/nat/linux-personality.c
+++ b/gdb/nat/linux-personality.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "nat/linux-personality.h"
 
 #include <sys/personality.h>
diff --git a/gdb/nat/linux-procfs.c b/gdb/nat/linux-procfs.c
index b17e3120792e..e2086952ce6b 100644
--- a/gdb/nat/linux-procfs.c
+++ b/gdb/nat/linux-procfs.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "linux-procfs.h"
 #include "gdbsupport/filestuff.h"
 #include <dirent.h>
diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c
index 4fe8ffa40538..9ea0e22913f6 100644
--- a/gdb/nat/linux-ptrace.c
+++ b/gdb/nat/linux-ptrace.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "linux-ptrace.h"
 #include "linux-procfs.h"
 #include "linux-waitpid.h"
diff --git a/gdb/nat/linux-waitpid.c b/gdb/nat/linux-waitpid.c
index 7b5b095b560a..0ac2f9fb2b9e 100644
--- a/gdb/nat/linux-waitpid.c
+++ b/gdb/nat/linux-waitpid.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 
 #include "linux-nat.h"
 #include "linux-waitpid.h"
diff --git a/gdb/nat/mips-linux-watch.c b/gdb/nat/mips-linux-watch.c
index 091d235f760c..7d105e8e6eac 100644
--- a/gdb/nat/mips-linux-watch.c
+++ b/gdb/nat/mips-linux-watch.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "nat/gdb_ptrace.h"
 #include "mips-linux-watch.h"
 
diff --git a/gdb/nat/netbsd-nat.c b/gdb/nat/netbsd-nat.c
index 5b208c15fe47..713ed6a16fa5 100644
--- a/gdb/nat/netbsd-nat.c
+++ b/gdb/nat/netbsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "nat/netbsd-nat.h"
 #include "gdbsupport/common-debug.h"
 
diff --git a/gdb/nat/ppc-linux.c b/gdb/nat/ppc-linux.c
index cc6dffe7d60f..d64ed33fcf21 100644
--- a/gdb/nat/ppc-linux.c
+++ b/gdb/nat/ppc-linux.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "ppc-linux.h"
 #include "nat/gdb_ptrace.h"
 #include <elf.h>
diff --git a/gdb/nat/riscv-linux-tdesc.c b/gdb/nat/riscv-linux-tdesc.c
index 32f52772f625..0cd38435b228 100644
--- a/gdb/nat/riscv-linux-tdesc.c
+++ b/gdb/nat/riscv-linux-tdesc.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 
 #include "gdb_proc_service.h"
 #include "arch/riscv.h"
diff --git a/gdb/nat/windows-nat.c b/gdb/nat/windows-nat.c
index 86b70c8d566b..f9f6848861d3 100644
--- a/gdb/nat/windows-nat.c
+++ b/gdb/nat/windows-nat.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "nat/windows-nat.h"
 #include "gdbsupport/common-debug.h"
 #include "target/target.h"
diff --git a/gdb/nat/x86-dregs.c b/gdb/nat/x86-dregs.c
index d22e839730aa..7ea9f49eb680 100644
--- a/gdb/nat/x86-dregs.c
+++ b/gdb/nat/x86-dregs.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "x86-dregs.h"
 #include "gdbsupport/break-common.h"
 
diff --git a/gdb/nat/x86-linux-dregs.c b/gdb/nat/x86-linux-dregs.c
index a1bc49909d97..a6c0ea63552d 100644
--- a/gdb/nat/x86-linux-dregs.c
+++ b/gdb/nat/x86-linux-dregs.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "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 e61f4d749ba1..7a21c8f2c268 100644
--- a/gdb/nat/x86-linux.c
+++ b/gdb/nat/x86-linux.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "x86-linux.h"
 #include "x86-linux-dregs.h"
 
diff --git a/gdb/nat/x86-xstate.c b/gdb/nat/x86-xstate.c
index 9b64ceb309e6..970dda1d8946 100644
--- a/gdb/nat/x86-xstate.c
+++ b/gdb/nat/x86-xstate.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "gdbsupport/x86-xstate.h"
 #include "nat/x86-cpuid.h"
 #include "nat/x86-xstate.h"
diff --git a/gdb/nds32-tdep.c b/gdb/nds32-tdep.c
index e453cd0f6d9a..bbbc80b37cd2 100644
--- a/gdb/nds32-tdep.c
+++ b/gdb/nds32-tdep.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "frame-base.h"
diff --git a/gdb/netbsd-nat.c b/gdb/netbsd-nat.c
index 574c1ad489ca..90456de165e2 100644
--- a/gdb/netbsd-nat.c
+++ b/gdb/netbsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "netbsd-nat.h"
 #include "nat/netbsd-nat.h"
diff --git a/gdb/netbsd-tdep.c b/gdb/netbsd-tdep.c
index e21217d75090..953b329674a4 100644
--- a/gdb/netbsd-tdep.c
+++ b/gdb/netbsd-tdep.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "auxv.h"
 #include "solib-svr4.h"
 #include "netbsd-tdep.h"
diff --git a/gdb/nios2-linux-tdep.c b/gdb/nios2-linux-tdep.c
index 9d2d4fff04a2..bd5f6cfe3f61 100644
--- a/gdb/nios2-linux-tdep.c
+++ b/gdb/nios2-linux-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "osabi.h"
 #include "solib-svr4.h"
diff --git a/gdb/nios2-tdep.c b/gdb/nios2-tdep.c
index 0a8eeb88bb5a..da2616b436eb 100644
--- a/gdb/nios2-tdep.c
+++ b/gdb/nios2-tdep.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "frame-base.h"
diff --git a/gdb/nto-procfs.c b/gdb/nto-procfs.c
index a076a237f269..95a75b46d4fc 100644
--- a/gdb/nto-procfs.c
+++ b/gdb/nto-procfs.c
@@ -20,7 +20,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include <fcntl.h>
 #include <spawn.h>
diff --git a/gdb/nto-tdep.c b/gdb/nto-tdep.c
index a16459283f50..937902b4f0a5 100644
--- a/gdb/nto-tdep.c
+++ b/gdb/nto-tdep.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include <sys/stat.h>
 #include "nto-tdep.h"
 #include "top.h"
diff --git a/gdb/objc-lang.c b/gdb/objc-lang.c
index 2424e1e8530d..e492c82845b3 100644
--- a/gdb/objc-lang.c
+++ b/gdb/objc-lang.c
@@ -20,7 +20,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index d880b9304d27..ba88ed1bc41b 100644
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -22,7 +22,6 @@
 /* This file contains support routines for creating, manipulating, and
    destroying objfile structures.  */
 
-#include "defs.h"
 #include "bfd.h"
 #include "symtab.h"
 #include "symfile.h"
diff --git a/gdb/obsd-nat.c b/gdb/obsd-nat.c
index d9134c0b18da..69a21ad71fce 100644
--- a/gdb/obsd-nat.c
+++ b/gdb/obsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbthread.h"
 #include "inferior.h"
 #include "target.h"
diff --git a/gdb/obsd-tdep.c b/gdb/obsd-tdep.c
index da53a82b2a82..5142984bc84f 100644
--- a/gdb/obsd-tdep.c
+++ b/gdb/obsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "auxv.h"
 #include "frame.h"
 #include "symtab.h"
diff --git a/gdb/observable.c b/gdb/observable.c
index 6ee456243a53..0527cc68e2c0 100644
--- a/gdb/observable.c
+++ b/gdb/observable.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "observable.h"
 #include "command.h"
 #include "gdbcmd.h"
diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c
index 2b58deed5730..2132778b4bee 100644
--- a/gdb/opencl-lang.c
+++ b/gdb/opencl-lang.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbtypes.h"
 #include "symtab.h"
 #include "expression.h"
diff --git a/gdb/or1k-linux-nat.c b/gdb/or1k-linux-nat.c
index 9a84bc93af32..21392245f484 100644
--- a/gdb/or1k-linux-nat.c
+++ b/gdb/or1k-linux-nat.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "regcache.h"
 #include "gregset.h"
 #include "linux-nat.h"
diff --git a/gdb/or1k-linux-tdep.c b/gdb/or1k-linux-tdep.c
index 75ab8459e754..00045a338204 100644
--- a/gdb/or1k-linux-tdep.c
+++ b/gdb/or1k-linux-tdep.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "or1k-tdep.h"
 #include "osabi.h"
 #include "glibc-tdep.h"
diff --git a/gdb/or1k-tdep.c b/gdb/or1k-tdep.c
index ffcb50f4bcd1..d4ac0ac1b9d1 100644
--- a/gdb/or1k-tdep.c
+++ b/gdb/or1k-tdep.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "inferior.h"
 #include "symtab.h"
diff --git a/gdb/osabi.c b/gdb/osabi.c
index 9917d360b6a2..016c203f47fe 100644
--- a/gdb/osabi.c
+++ b/gdb/osabi.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "osabi.h"
 #include "arch-utils.h"
diff --git a/gdb/osdata.c b/gdb/osdata.c
index a1cc468a346b..6dea1003cd2c 100644
--- a/gdb/osdata.c
+++ b/gdb/osdata.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "target.h"
 #include "xml-support.h"
 #include "osdata.h"
diff --git a/gdb/p-exp.y b/gdb/p-exp.y
index bfb1cad60a77..2140b6092251 100644
--- a/gdb/p-exp.y
+++ b/gdb/p-exp.y
@@ -43,7 +43,6 @@
    Probably also lots of other problems, less well defined PM.  */
 %{
 
-#include "defs.h"
 #include <ctype.h>
 #include "expression.h"
 #include "value.h"
diff --git a/gdb/p-lang.c b/gdb/p-lang.c
index 73ba436437b1..adc6402084d7 100644
--- a/gdb/p-lang.c
+++ b/gdb/p-lang.c
@@ -19,7 +19,6 @@
 
 /* This file is derived from c-lang.c */
 
-#include "defs.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "expression.h"
diff --git a/gdb/p-typeprint.c b/gdb/p-typeprint.c
index eb2d0283d63d..5c48c1400c4d 100644
--- a/gdb/p-typeprint.c
+++ b/gdb/p-typeprint.c
@@ -18,7 +18,6 @@
 
 /* This file is derived from p-typeprint.c */
 
-#include "defs.h"
 #include "gdbsupport/gdb_obstack.h"
 #include "bfd.h"
 #include "symtab.h"
diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c
index 2372cdf83ebf..7f6d7dc6e6bb 100644
--- a/gdb/p-valprint.c
+++ b/gdb/p-valprint.c
@@ -19,7 +19,6 @@
 
 /* This file is derived from c-valprint.c */
 
-#include "defs.h"
 #include "gdbsupport/gdb_obstack.h"
 #include "symtab.h"
 #include "gdbtypes.h"
diff --git a/gdb/parse.c b/gdb/parse.c
index 4b0eeaf53305..fecaa81c318a 100644
--- a/gdb/parse.c
+++ b/gdb/parse.c
@@ -29,7 +29,6 @@
    during the process of parsing; the lower levels of the tree always
    come first in the result.  */
 
-#include "defs.h"
 #include <ctype.h>
 #include "arch-utils.h"
 #include "symtab.h"
diff --git a/gdb/posix-hdep.c b/gdb/posix-hdep.c
index ae5add9790f1..a0d5c585ebc7 100644
--- a/gdb/posix-hdep.c
+++ b/gdb/posix-hdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/event-loop.h"
 #include "gdbsupport/gdb_select.h"
 #include "inferior.h"
diff --git a/gdb/ppc-fbsd-nat.c b/gdb/ppc-fbsd-nat.c
index 1925660f4573..b3b20ffdbbc1 100644
--- a/gdb/ppc-fbsd-nat.c
+++ b/gdb/ppc-fbsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "inferior.h"
 #include "regcache.h"
diff --git a/gdb/ppc-fbsd-tdep.c b/gdb/ppc-fbsd-tdep.c
index 719ddc71d130..8f86607d5d19 100644
--- a/gdb/ppc-fbsd-tdep.c
+++ b/gdb/ppc-fbsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "frame.h"
 #include "gdbcore.h"
diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
index 028422bb1e8d..2ed6e6e50685 100644
--- a/gdb/ppc-linux-nat.c
+++ b/gdb/ppc-linux-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "inferior.h"
 #include "gdbthread.h"
diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c
index 2824cb628c3d..2da2d32eb262 100644
--- a/gdb/ppc-linux-tdep.c
+++ b/gdb/ppc-linux-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "inferior.h"
 #include "symtab.h"
diff --git a/gdb/ppc-netbsd-nat.c b/gdb/ppc-netbsd-nat.c
index 06a7a3710f71..a384944376e2 100644
--- a/gdb/ppc-netbsd-nat.c
+++ b/gdb/ppc-netbsd-nat.c
@@ -21,7 +21,6 @@
 
 /* We define this to get types like register_t.  */
 #define _KERNTYPES
-#include "defs.h"
 
 #include <sys/types.h>
 #include <sys/ptrace.h>
diff --git a/gdb/ppc-netbsd-tdep.c b/gdb/ppc-netbsd-tdep.c
index 58f5678d5d9c..d8e4c424ba46 100644
--- a/gdb/ppc-netbsd-tdep.c
+++ b/gdb/ppc-netbsd-tdep.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbtypes.h"
 #include "osabi.h"
 #include "regcache.h"
diff --git a/gdb/ppc-obsd-nat.c b/gdb/ppc-obsd-nat.c
index 06a67c3e25ff..66e7b9357fa7 100644
--- a/gdb/ppc-obsd-nat.c
+++ b/gdb/ppc-obsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "inferior.h"
 #include "regcache.h"
diff --git a/gdb/ppc-obsd-tdep.c b/gdb/ppc-obsd-tdep.c
index b845e67bcaab..b50a24c6af79 100644
--- a/gdb/ppc-obsd-tdep.c
+++ b/gdb/ppc-obsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "frame.h"
 #include "frame-unwind.h"
diff --git a/gdb/ppc-ravenscar-thread.c b/gdb/ppc-ravenscar-thread.c
index 8e610573bd97..fd44a9a3ec6a 100644
--- a/gdb/ppc-ravenscar-thread.c
+++ b/gdb/ppc-ravenscar-thread.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "regcache.h"
 #include "ppc-tdep.h"
diff --git a/gdb/ppc-sysv-tdep.c b/gdb/ppc-sysv-tdep.c
index ebbf1cf4295f..9d0e8a95a773 100644
--- a/gdb/ppc-sysv-tdep.c
+++ b/gdb/ppc-sysv-tdep.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "language.h"
 #include "gdbcore.h"
 #include "inferior.h"
diff --git a/gdb/ppc64-tdep.c b/gdb/ppc64-tdep.c
index 5797d55f00b7..8f91d06a085d 100644
--- a/gdb/ppc64-tdep.c
+++ b/gdb/ppc64-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "gdbcore.h"
 #include "infrun.h"
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 63e530e612e2..cb0d32aa4bcf 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "symtab.h"
 #include "gdbtypes.h"
diff --git a/gdb/probe.c b/gdb/probe.c
index 4d68e129636e..b13baf00e714 100644
--- a/gdb/probe.c
+++ b/gdb/probe.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "probe.h"
 #include "command.h"
 #include "cli/cli-cmds.h"
diff --git a/gdb/proc-api.c b/gdb/proc-api.c
index 07395c5ab0b4..0d3f389afdb5 100644
--- a/gdb/proc-api.c
+++ b/gdb/proc-api.c
@@ -24,7 +24,6 @@
  * Pretty-print trace of api calls to the /proc api
  */
 
-#include "defs.h"
 #include "gdbcmd.h"
 #include "completer.h"
 
diff --git a/gdb/proc-events.c b/gdb/proc-events.c
index 76d66deb593b..55b73636cb56 100644
--- a/gdb/proc-events.c
+++ b/gdb/proc-events.c
@@ -28,7 +28,6 @@
    FIXME: At present, the syscall translation table must be
    initialized, which is not true of the other translation tables.  */
 
-#include "defs.h"
 
 #include <sys/types.h>
 #include <sys/procfs.h>
diff --git a/gdb/proc-flags.c b/gdb/proc-flags.c
index 24b0cce91be7..33075e933ecc 100644
--- a/gdb/proc-flags.c
+++ b/gdb/proc-flags.c
@@ -25,7 +25,6 @@
  *
  */
 
-#include "defs.h"
 
 #include <sys/types.h>
 #include <sys/procfs.h>
diff --git a/gdb/proc-service.c b/gdb/proc-service.c
index f2ba0975096a..1889a001a1dd 100644
--- a/gdb/proc-service.c
+++ b/gdb/proc-service.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "gdbcore.h"
 #include "inferior.h"
diff --git a/gdb/proc-why.c b/gdb/proc-why.c
index 5bfc3627c7e6..ec8987ddb736 100644
--- a/gdb/proc-why.c
+++ b/gdb/proc-why.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include <sys/types.h>
 #include <sys/procfs.h>
diff --git a/gdb/process-stratum-target.c b/gdb/process-stratum-target.c
index 8737938e3b49..ce8ff28958e0 100644
--- a/gdb/process-stratum-target.c
+++ b/gdb/process-stratum-target.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "process-stratum-target.h"
 #include "inferior.h"
 #include <algorithm>
diff --git a/gdb/procfs.c b/gdb/procfs.c
index ba2b166727ee..77fdacfd61e1 100644
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -20,7 +20,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "infrun.h"
 #include "target.h"
diff --git a/gdb/producer.c b/gdb/producer.c
index cd615a450c2f..2ca701f5c7ca 100644
--- a/gdb/producer.c
+++ b/gdb/producer.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "producer.h"
 #include "gdbsupport/selftest.h"
 #include "gdbsupport/gdb_regex.h"
diff --git a/gdb/progspace-and-thread.c b/gdb/progspace-and-thread.c
index 092deb774712..e78e56d84946 100644
--- a/gdb/progspace-and-thread.c
+++ b/gdb/progspace-and-thread.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "progspace-and-thread.h"
 #include "inferior.h"
 
diff --git a/gdb/progspace.c b/gdb/progspace.c
index cda0f415a3fd..131cd2f11865 100644
--- a/gdb/progspace.c
+++ b/gdb/progspace.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcmd.h"
 #include "objfiles.h"
 #include "arch-utils.h"
diff --git a/gdb/prologue-value.c b/gdb/prologue-value.c
index 7183a9079a3f..2c0ce52421b5 100644
--- a/gdb/prologue-value.c
+++ b/gdb/prologue-value.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "prologue-value.h"
 #include "regcache.h"
 
diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index a831e5eec40b..a4f5b04627c2 100644
--- a/gdb/psymtab.c
+++ b/gdb/psymtab.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "objfiles.h"
 #include "psymtab.h"
diff --git a/gdb/python/py-arch.c b/gdb/python/py-arch.c
index 663113d4fd5b..c6f566221d82 100644
--- a/gdb/python/py-arch.c
+++ b/gdb/python/py-arch.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbarch.h"
 #include "arch-utils.h"
 #include "disasm.h"
diff --git a/gdb/python/py-auto-load.c b/gdb/python/py-auto-load.c
index 42795259399c..8a3327b37226 100644
--- a/gdb/python/py-auto-load.c
+++ b/gdb/python/py-auto-load.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "top.h"
 #include "gdbcmd.h"
 #include "objfiles.h"
diff --git a/gdb/python/py-block.c b/gdb/python/py-block.c
index 9417ebc252e9..3e30faf08560 100644
--- a/gdb/python/py-block.c
+++ b/gdb/python/py-block.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "block.h"
 #include "dictionary.h"
 #include "symtab.h"
diff --git a/gdb/python/py-bpevent.c b/gdb/python/py-bpevent.c
index dc962f117882..5982a26f5629 100644
--- a/gdb/python/py-bpevent.c
+++ b/gdb/python/py-bpevent.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "py-stopevent.h"
 
 /* Create and initialize a BreakpointEvent object.  This acquires new
diff --git a/gdb/python/py-breakpoint.c b/gdb/python/py-breakpoint.c
index 95782444c4a7..cd9ef3093c16 100644
--- a/gdb/python/py-breakpoint.c
+++ b/gdb/python/py-breakpoint.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "value.h"
 #include "python-internal.h"
 #include "python.h"
diff --git a/gdb/python/py-cmd.c b/gdb/python/py-cmd.c
index 91e8f100e1c4..f18a8e8eaa9a 100644
--- a/gdb/python/py-cmd.c
+++ b/gdb/python/py-cmd.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "value.h"
 #include "python-internal.h"
diff --git a/gdb/python/py-connection.c b/gdb/python/py-connection.c
index 84f80cf6a74b..dcca76b7867b 100644
--- a/gdb/python/py-connection.c
+++ b/gdb/python/py-connection.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "python-internal.h"
 #include "process-stratum-target.h"
 #include "inferior.h"
diff --git a/gdb/python/py-continueevent.c b/gdb/python/py-continueevent.c
index e366b4d1bc3c..c859b1e91cae 100644
--- a/gdb/python/py-continueevent.c
+++ b/gdb/python/py-continueevent.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "py-event.h"
 #include "gdbthread.h"
 
diff --git a/gdb/python/py-dap.c b/gdb/python/py-dap.c
index 9a00130fe907..861514d90021 100644
--- a/gdb/python/py-dap.c
+++ b/gdb/python/py-dap.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "python-internal.h"
 #include "interps.h"
 #include "cli-out.h"
diff --git a/gdb/python/py-disasm.c b/gdb/python/py-disasm.c
index b48d5620b158..2d8ce44a0655 100644
--- a/gdb/python/py-disasm.c
+++ b/gdb/python/py-disasm.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "python-internal.h"
 #include "language.h"
 #include "dis-asm.h"
diff --git a/gdb/python/py-event.c b/gdb/python/py-event.c
index 7ac16c850f16..47a2997a09a3 100644
--- a/gdb/python/py-event.c
+++ b/gdb/python/py-event.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "py-event.h"
 
 void
diff --git a/gdb/python/py-evtregistry.c b/gdb/python/py-evtregistry.c
index d968815003a2..1f486e28c92e 100644
--- a/gdb/python/py-evtregistry.c
+++ b/gdb/python/py-evtregistry.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "command.h"
 #include "py-events.h"
 
diff --git a/gdb/python/py-evts.c b/gdb/python/py-evts.c
index 1fbba517a39a..4e966e197e3f 100644
--- a/gdb/python/py-evts.c
+++ b/gdb/python/py-evts.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "py-events.h"
 
 static struct PyModuleDef EventModuleDef =
diff --git a/gdb/python/py-exitedevent.c b/gdb/python/py-exitedevent.c
index bef16c913a1e..4837468ff997 100644
--- a/gdb/python/py-exitedevent.c
+++ b/gdb/python/py-exitedevent.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "py-event.h"
 
 static gdbpy_ref<>
diff --git a/gdb/python/py-finishbreakpoint.c b/gdb/python/py-finishbreakpoint.c
index 617e879a040c..c74a2473a815 100644
--- a/gdb/python/py-finishbreakpoint.c
+++ b/gdb/python/py-finishbreakpoint.c
@@ -19,7 +19,6 @@
 
 
 
-#include "defs.h"
 #include "top.h"
 #include "python-internal.h"
 #include "breakpoint.h"
diff --git a/gdb/python/py-frame.c b/gdb/python/py-frame.c
index 7467f845b78f..bbb42afb2ede 100644
--- a/gdb/python/py-frame.c
+++ b/gdb/python/py-frame.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "language.h"
 #include "charset.h"
 #include "block.h"
diff --git a/gdb/python/py-framefilter.c b/gdb/python/py-framefilter.c
index 768e3a6e0c81..0cd15977d2ff 100644
--- a/gdb/python/py-framefilter.c
+++ b/gdb/python/py-framefilter.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "objfiles.h"
 #include "symtab.h"
 #include "language.h"
diff --git a/gdb/python/py-function.c b/gdb/python/py-function.c
index 81c4106c477d..077396cb93ec 100644
--- a/gdb/python/py-function.c
+++ b/gdb/python/py-function.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include "defs.h"
 #include "value.h"
 #include "python-internal.h"
 #include "charset.h"
diff --git a/gdb/python/py-gdb-readline.c b/gdb/python/py-gdb-readline.c
index bbf49bb73264..92287eea7c91 100644
--- a/gdb/python/py-gdb-readline.c
+++ b/gdb/python/py-gdb-readline.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "python-internal.h"
 #include "top.h"
 #include "cli/cli-utils.h"
diff --git a/gdb/python/py-inferior.c b/gdb/python/py-inferior.c
index c25519c8dd9c..795ac655ddd5 100644
--- a/gdb/python/py-inferior.c
+++ b/gdb/python/py-inferior.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "auto-load.h"
 #include "gdbcore.h"
 #include "gdbthread.h"
diff --git a/gdb/python/py-infevents.c b/gdb/python/py-infevents.c
index 8a150852e089..f53d589f85b5 100644
--- a/gdb/python/py-infevents.c
+++ b/gdb/python/py-infevents.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "py-event.h"
 
 /* Construct either a gdb.InferiorCallPreEvent or a
diff --git a/gdb/python/py-infthread.c b/gdb/python/py-infthread.c
index 995397e7f0d2..a17f25ed4985 100644
--- a/gdb/python/py-infthread.c
+++ b/gdb/python/py-infthread.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbthread.h"
 #include "inferior.h"
 #include "python-internal.h"
diff --git a/gdb/python/py-instruction.c b/gdb/python/py-instruction.c
index e3c99ef7a7b3..bc3945af2cf0 100644
--- a/gdb/python/py-instruction.c
+++ b/gdb/python/py-instruction.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "py-instruction.h"
 
 /* Python type object for the abstract gdb.Instruction class.  This class
diff --git a/gdb/python/py-lazy-string.c b/gdb/python/py-lazy-string.c
index 5d07f376f97c..0b7f5c9d680a 100644
--- a/gdb/python/py-lazy-string.c
+++ b/gdb/python/py-lazy-string.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "python-internal.h"
 #include "charset.h"
 #include "value.h"
diff --git a/gdb/python/py-linetable.c b/gdb/python/py-linetable.c
index 31194786eb7b..e3e71f9e4367 100644
--- a/gdb/python/py-linetable.c
+++ b/gdb/python/py-linetable.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "python-internal.h"
 
 struct linetable_entry_object {
diff --git a/gdb/python/py-membuf.c b/gdb/python/py-membuf.c
index 538d7f41fe3e..af48d01b9edd 100644
--- a/gdb/python/py-membuf.c
+++ b/gdb/python/py-membuf.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "python-internal.h"
 
 struct membuf_object {
diff --git a/gdb/python/py-mi.c b/gdb/python/py-mi.c
index 49e524a2df81..bc95e86a4566 100644
--- a/gdb/python/py-mi.c
+++ b/gdb/python/py-mi.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "python-internal.h"
 #include "py-uiout.h"
 #include "utils.h"
diff --git a/gdb/python/py-micmd.c b/gdb/python/py-micmd.c
index aab6c5c2317a..54427d4633b1 100644
--- a/gdb/python/py-micmd.c
+++ b/gdb/python/py-micmd.c
@@ -19,7 +19,6 @@
 
 /* GDB/MI commands implemented in Python.  */
 
-#include "defs.h"
 #include "python-internal.h"
 #include "arch-utils.h"
 #include "charset.h"
diff --git a/gdb/python/py-newobjfileevent.c b/gdb/python/py-newobjfileevent.c
index b7a09680613a..deaee706246c 100644
--- a/gdb/python/py-newobjfileevent.c
+++ b/gdb/python/py-newobjfileevent.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "py-event.h"
 
 static gdbpy_ref<>
diff --git a/gdb/python/py-objfile.c b/gdb/python/py-objfile.c
index ffdb7be4a9a1..60a14833b957 100644
--- a/gdb/python/py-objfile.c
+++ b/gdb/python/py-objfile.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "python-internal.h"
 #include "charset.h"
 #include "objfiles.h"
diff --git a/gdb/python/py-param.c b/gdb/python/py-param.c
index 9f3c63116ec9..ba837566343e 100644
--- a/gdb/python/py-param.c
+++ b/gdb/python/py-param.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include "defs.h"
 #include "value.h"
 #include "python-internal.h"
 #include "charset.h"
diff --git a/gdb/python/py-prettyprint.c b/gdb/python/py-prettyprint.c
index fb141fb42dc5..368b3a3c793f 100644
--- a/gdb/python/py-prettyprint.c
+++ b/gdb/python/py-prettyprint.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "objfiles.h"
 #include "symtab.h"
 #include "language.h"
diff --git a/gdb/python/py-progspace.c b/gdb/python/py-progspace.c
index 5d883a7d8127..a5b22ce9d5c8 100644
--- a/gdb/python/py-progspace.c
+++ b/gdb/python/py-progspace.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "python-internal.h"
 #include "charset.h"
 #include "progspace.h"
diff --git a/gdb/python/py-record-btrace.c b/gdb/python/py-record-btrace.c
index 347100ba404e..8c34add0d771 100644
--- a/gdb/python/py-record-btrace.c
+++ b/gdb/python/py-record-btrace.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "gdbcmd.h"
 #include "gdbthread.h"
diff --git a/gdb/python/py-record-full.c b/gdb/python/py-record-full.c
index 73b24053c9da..b6623a600c58 100644
--- a/gdb/python/py-record-full.c
+++ b/gdb/python/py-record-full.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "py-record-full.h"
 
 /* Implementation of
diff --git a/gdb/python/py-record.c b/gdb/python/py-record.c
index 81b4c63d5974..d4891268e036 100644
--- a/gdb/python/py-record.c
+++ b/gdb/python/py-record.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "py-instruction.h"
 #include "py-record.h"
 #include "py-record-btrace.h"
diff --git a/gdb/python/py-registers.c b/gdb/python/py-registers.c
index d7a40c9ba581..f03274c308a1 100644
--- a/gdb/python/py-registers.c
+++ b/gdb/python/py-registers.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbarch.h"
 #include "arch-utils.h"
 #include "reggroups.h"
diff --git a/gdb/python/py-signalevent.c b/gdb/python/py-signalevent.c
index 73f56035e354..bf511064fe6c 100644
--- a/gdb/python/py-signalevent.c
+++ b/gdb/python/py-signalevent.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "py-stopevent.h"
 
 gdbpy_ref<>
diff --git a/gdb/python/py-stopevent.c b/gdb/python/py-stopevent.c
index fcaebe26f13c..be26bc17f859 100644
--- a/gdb/python/py-stopevent.c
+++ b/gdb/python/py-stopevent.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "py-stopevent.h"
 #include "py-uiout.h"
 #include "thread-fsm.h"
diff --git a/gdb/python/py-symbol.c b/gdb/python/py-symbol.c
index 88da56527e83..754420f3b564 100644
--- a/gdb/python/py-symbol.c
+++ b/gdb/python/py-symbol.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "top.h"
 #include "block.h"
 #include "frame.h"
diff --git a/gdb/python/py-symtab.c b/gdb/python/py-symtab.c
index b28f6ca8b48c..7290b8564789 100644
--- a/gdb/python/py-symtab.c
+++ b/gdb/python/py-symtab.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "charset.h"
 #include "symtab.h"
 #include "source.h"
diff --git a/gdb/python/py-threadevent.c b/gdb/python/py-threadevent.c
index 5c99b60b46f6..557f2b780170 100644
--- a/gdb/python/py-threadevent.c
+++ b/gdb/python/py-threadevent.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "py-event.h"
 #include "infrun.h"
 #include "gdbthread.h"
diff --git a/gdb/python/py-tui.c b/gdb/python/py-tui.c
index 089f4f877686..5dcec4bd2b11 100644
--- a/gdb/python/py-tui.c
+++ b/gdb/python/py-tui.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "python-internal.h"
 #include "gdbsupport/intrusive_list.h"
diff --git a/gdb/python/py-type.c b/gdb/python/py-type.c
index 8793db8eed1e..863e6f6175fc 100644
--- a/gdb/python/py-type.c
+++ b/gdb/python/py-type.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "value.h"
 #include "python-internal.h"
 #include "charset.h"
diff --git a/gdb/python/py-unwind.c b/gdb/python/py-unwind.c
index 56f925bc57f0..58bcf40e1c9f 100644
--- a/gdb/python/py-unwind.c
+++ b/gdb/python/py-unwind.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "frame-unwind.h"
 #include "gdbsupport/gdb_obstack.h"
diff --git a/gdb/python/py-utils.c b/gdb/python/py-utils.c
index 3fcf48f79988..47f65f4fd441 100644
--- a/gdb/python/py-utils.c
+++ b/gdb/python/py-utils.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "top.h"
 #include "charset.h"
 #include "value.h"
diff --git a/gdb/python/py-value.c b/gdb/python/py-value.c
index ff7943d80c39..dd17420b0b50 100644
--- a/gdb/python/py-value.c
+++ b/gdb/python/py-value.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "top.h"
 #include "charset.h"
 #include "value.h"
diff --git a/gdb/python/py-varobj.c b/gdb/python/py-varobj.c
index efe6b4312b64..cbfea266f605 100644
--- a/gdb/python/py-varobj.c
+++ b/gdb/python/py-varobj.c
@@ -13,7 +13,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "python-internal.h"
 #include "varobj.h"
 #include "varobj-iter.h"
diff --git a/gdb/python/py-xmethods.c b/gdb/python/py-xmethods.c
index c7041eb2ad3c..2fae04303b22 100644
--- a/gdb/python/py-xmethods.c
+++ b/gdb/python/py-xmethods.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "extension-priv.h"
 #include "objfiles.h"
diff --git a/gdb/python/python.c b/gdb/python/python.c
index e2ac315f9f59..d6e5883476e1 100644
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "command.h"
 #include "ui-out.h"
diff --git a/gdb/ravenscar-thread.c b/gdb/ravenscar-thread.c
index 75d110f20c5c..ecc9235c9174 100644
--- a/gdb/ravenscar-thread.c
+++ b/gdb/ravenscar-thread.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "gdbthread.h"
 #include "ada-lang.h"
diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c
index 6350400c318a..0ef1dfbe652f 100644
--- a/gdb/record-btrace.c
+++ b/gdb/record-btrace.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "record.h"
 #include "record-btrace.h"
 #include "gdbthread.h"
diff --git a/gdb/record-full.c b/gdb/record-full.c
index 24058824d749..4c3667f48bad 100644
--- a/gdb/record-full.c
+++ b/gdb/record-full.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcmd.h"
 #include "regcache.h"
 #include "gdbthread.h"
diff --git a/gdb/record.c b/gdb/record.c
index 25901d2deefd..1843969c2c9b 100644
--- a/gdb/record.c
+++ b/gdb/record.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcmd.h"
 #include "completer.h"
 #include "record.h"
diff --git a/gdb/regcache-dump.c b/gdb/regcache-dump.c
index 709dd0586336..33205a4241d8 100644
--- a/gdb/regcache-dump.c
+++ b/gdb/regcache-dump.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcmd.h"
 #include "regcache.h"
 #include "gdbsupport/def-vector.h"
diff --git a/gdb/regcache.c b/gdb/regcache.c
index af298893acf9..b7abbe99f3cc 100644
--- a/gdb/regcache.c
+++ b/gdb/regcache.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "gdbthread.h"
 #include "target.h"
diff --git a/gdb/regformats/regdat.sh b/gdb/regformats/regdat.sh
index 344fcf5b9a17..38464c65b067 100755
--- a/gdb/regformats/regdat.sh
+++ b/gdb/regformats/regdat.sh
@@ -107,7 +107,6 @@ EOF
 
 exec > new-$2
 copyright $1
-echo '#include "server.h"'
 echo '#include "regdef.h"'
 echo '#include "tdesc.h"'
 echo
diff --git a/gdb/reggroups.c b/gdb/reggroups.c
index ee76c04623e7..8fb21bd7622d 100644
--- a/gdb/reggroups.c
+++ b/gdb/reggroups.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "reggroups.h"
 #include "gdbtypes.h"
diff --git a/gdb/remote-fileio.c b/gdb/remote-fileio.c
index 154cd0be8e5f..eaa0d8f619a6 100644
--- a/gdb/remote-fileio.c
+++ b/gdb/remote-fileio.c
@@ -19,7 +19,6 @@
 
 /* See the GDB User Guide for details of the GDB remote protocol.  */
 
-#include "defs.h"
 #include "gdbcmd.h"
 #include "remote.h"
 #include "gdbsupport/gdb_wait.h"
diff --git a/gdb/remote-notif.c b/gdb/remote-notif.c
index 2088b50fd957..9acf3f8dc78e 100644
--- a/gdb/remote-notif.c
+++ b/gdb/remote-notif.c
@@ -31,7 +31,6 @@
    remote_async_get_pending_events_handler, while in all-stop mode,
    they are processed in remote_resume.  */
 
-#include "defs.h"
 #include "remote.h"
 #include "remote-notif.h"
 #include "observable.h"
diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index e761d3a05799..5fccefe93a16 100644
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -20,7 +20,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdb_bfd.h"
 #include "inferior.h"
 #include "infrun.h"
diff --git a/gdb/remote.c b/gdb/remote.c
index 14c8b020b1e9..e278711df7b5 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -19,7 +19,6 @@
 
 /* See the GDB User Guide for details of the GDB remote protocol.  */
 
-#include "defs.h"
 #include <ctype.h>
 #include <fcntl.h>
 #include "inferior.h"
diff --git a/gdb/reverse.c b/gdb/reverse.c
index 9a011631a320..11c76b4b3355 100644
--- a/gdb/reverse.c
+++ b/gdb/reverse.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "target.h"
 #include "top.h"
 #include "cli/cli-cmds.h"
diff --git a/gdb/riscv-fbsd-nat.c b/gdb/riscv-fbsd-nat.c
index 8da2e02fafec..bc9d613d207f 100644
--- a/gdb/riscv-fbsd-nat.c
+++ b/gdb/riscv-fbsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "regcache.h"
 #include "target.h"
 
diff --git a/gdb/riscv-fbsd-tdep.c b/gdb/riscv-fbsd-tdep.c
index 205f7a950df5..68f726743d9c 100644
--- a/gdb/riscv-fbsd-tdep.c
+++ b/gdb/riscv-fbsd-tdep.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "fbsd-tdep.h"
 #include "osabi.h"
 #include "riscv-tdep.h"
diff --git a/gdb/riscv-linux-nat.c b/gdb/riscv-linux-nat.c
index 5bccc1f53490..a5507e88ea17 100644
--- a/gdb/riscv-linux-nat.c
+++ b/gdb/riscv-linux-nat.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "regcache.h"
 #include "gregset.h"
 #include "linux-nat.h"
diff --git a/gdb/riscv-linux-tdep.c b/gdb/riscv-linux-tdep.c
index 0267dc65e58e..ff478cf4c287 100644
--- a/gdb/riscv-linux-tdep.c
+++ b/gdb/riscv-linux-tdep.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "riscv-tdep.h"
 #include "osabi.h"
 #include "glibc-tdep.h"
diff --git a/gdb/riscv-none-tdep.c b/gdb/riscv-none-tdep.c
index 7dcab01de6d1..e98c699a68c5 100644
--- a/gdb/riscv-none-tdep.c
+++ b/gdb/riscv-none-tdep.c
@@ -17,7 +17,6 @@
 
 /* This file contain code that is specific for bare-metal RISC-V targets.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "regcache.h"
 #include "riscv-tdep.h"
diff --git a/gdb/riscv-ravenscar-thread.c b/gdb/riscv-ravenscar-thread.c
index 794b0c44c998..291b1db8d9e4 100644
--- a/gdb/riscv-ravenscar-thread.c
+++ b/gdb/riscv-ravenscar-thread.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbarch.h"
 #include "gdbcore.h"
 #include "regcache.h"
diff --git a/gdb/riscv-tdep.c b/gdb/riscv-tdep.c
index 604a19fe2a62..f86a37988cbd 100644
--- a/gdb/riscv-tdep.c
+++ b/gdb/riscv-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "inferior.h"
 #include "symtab.h"
@@ -49,7 +48,6 @@
 #include "dwarf2/frame.h"
 #include "user-regs.h"
 #include "valprint.h"
-#include "gdbsupport/common-defs.h"
 #include "opcode/riscv-opc.h"
 #include "cli/cli-decode.h"
 #include "observable.h"
diff --git a/gdb/rl78-tdep.c b/gdb/rl78-tdep.c
index 1e439f363564..acd0731dd9f4 100644
--- a/gdb/rl78-tdep.c
+++ b/gdb/rl78-tdep.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "prologue-value.h"
 #include "target.h"
diff --git a/gdb/rs6000-aix-nat.c b/gdb/rs6000-aix-nat.c
index 066d34d446c5..908671a713a4 100644
--- a/gdb/rs6000-aix-nat.c
+++ b/gdb/rs6000-aix-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "target.h"
 #include "gdbcore.h"
diff --git a/gdb/rs6000-aix-tdep.c b/gdb/rs6000-aix-tdep.c
index db76af6984b9..5111f4f55c0a 100644
--- a/gdb/rs6000-aix-tdep.c
+++ b/gdb/rs6000-aix-tdep.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "osabi.h"
 #include "regcache.h"
 #include "regset.h"
diff --git a/gdb/rs6000-lynx178-tdep.c b/gdb/rs6000-lynx178-tdep.c
index c92c71dcb881..550e06882031 100644
--- a/gdb/rs6000-lynx178-tdep.c
+++ b/gdb/rs6000-lynx178-tdep.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "osabi.h"
 #include "regcache.h"
 #include "gdbcore.h"
diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c
index 3157213cb1fa..b7ba0042bb73 100644
--- a/gdb/rs6000-tdep.c
+++ b/gdb/rs6000-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "inferior.h"
 #include "infrun.h"
diff --git a/gdb/run-on-main-thread.c b/gdb/run-on-main-thread.c
index 7b9807e0eaf0..e30dabaff032 100644
--- a/gdb/run-on-main-thread.c
+++ b/gdb/run-on-main-thread.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "run-on-main-thread.h"
 #include "ser-event.h"
 #if CXX_STD_THREAD
diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c
index ab537cc97528..64e40577a696 100644
--- a/gdb/rust-lang.c
+++ b/gdb/rust-lang.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include <ctype.h>
 
diff --git a/gdb/rust-parse.c b/gdb/rust-parse.c
index 66263b91bdc9..9300e17bdf83 100644
--- a/gdb/rust-parse.c
+++ b/gdb/rust-parse.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "block.h"
 #include "charset.h"
diff --git a/gdb/rx-tdep.c b/gdb/rx-tdep.c
index 53ad5d5c92b2..844e36023e04 100644
--- a/gdb/rx-tdep.c
+++ b/gdb/rx-tdep.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "prologue-value.h"
 #include "target.h"
diff --git a/gdb/s12z-tdep.c b/gdb/s12z-tdep.c
index 60cbc26afffd..29d4ef3b71ce 100644
--- a/gdb/s12z-tdep.c
+++ b/gdb/s12z-tdep.c
@@ -18,7 +18,6 @@
 
 /* Much of this file is shamelessly copied from or1k-tdep.c and others.  */
 
-#include "defs.h"
 
 #include "arch-utils.h"
 #include "dwarf2/frame.h"
diff --git a/gdb/s390-linux-nat.c b/gdb/s390-linux-nat.c
index 1e074814d87b..fa4aaf9aa9ae 100644
--- a/gdb/s390-linux-nat.c
+++ b/gdb/s390-linux-nat.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "regcache.h"
 #include "inferior.h"
 #include "target.h"
diff --git a/gdb/s390-linux-tdep.c b/gdb/s390-linux-tdep.c
index 945b3c7cee72..bc1db550d2e7 100644
--- a/gdb/s390-linux-tdep.c
+++ b/gdb/s390-linux-tdep.c
@@ -20,7 +20,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "auxv.h"
 #include "elf/common.h"
diff --git a/gdb/s390-tdep.c b/gdb/s390-tdep.c
index 174338e18852..519e3eb0a423 100644
--- a/gdb/s390-tdep.c
+++ b/gdb/s390-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "arch-utils.h"
 #include "ax-gdb.h"
diff --git a/gdb/selftest-arch.c b/gdb/selftest-arch.c
index 99677edfa66f..a337f76083ab 100644
--- a/gdb/selftest-arch.c
+++ b/gdb/selftest-arch.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include <functional>
 
 #if GDB_SELF_TEST
diff --git a/gdb/sentinel-frame.c b/gdb/sentinel-frame.c
index ca7c28952f36..4eaeae0d254f 100644
--- a/gdb/sentinel-frame.c
+++ b/gdb/sentinel-frame.c
@@ -18,7 +18,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include "defs.h"
 #include "regcache.h"
 #include "sentinel-frame.h"
 #include "inferior.h"
diff --git a/gdb/ser-base.c b/gdb/ser-base.c
index f63082685466..ccf38d2202b6 100644
--- a/gdb/ser-base.c
+++ b/gdb/ser-base.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "serial.h"
 #include "ser-base.h"
 #include "gdbsupport/event-loop.h"
diff --git a/gdb/ser-event.c b/gdb/ser-event.c
index 374322ead23c..fe1c460aa1fe 100644
--- a/gdb/ser-event.c
+++ b/gdb/ser-event.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "ser-event.h"
 #include "serial.h"
 #include "gdbsupport/filestuff.h"
diff --git a/gdb/ser-go32.c b/gdb/ser-go32.c
index 57c44806c0e8..ae71f73cce92 100644
--- a/gdb/ser-go32.c
+++ b/gdb/ser-go32.c
@@ -21,7 +21,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcmd.h"
 #include "serial.h"
 /*
diff --git a/gdb/ser-mingw.c b/gdb/ser-mingw.c
index 5c2e06c29262..2603bb8dcfb4 100644
--- a/gdb/ser-mingw.c
+++ b/gdb/ser-mingw.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "serial.h"
 #include "ser-base.h"
 #include "ser-tcp.h"
diff --git a/gdb/ser-pipe.c b/gdb/ser-pipe.c
index 842b656eb5af..49312036da02 100644
--- a/gdb/ser-pipe.c
+++ b/gdb/ser-pipe.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "serial.h"
 #include "ser-base.h"
 #include "ser-unix.h"
diff --git a/gdb/ser-tcp.c b/gdb/ser-tcp.c
index 3f5541d0a2f2..6efc2457bdb7 100644
--- a/gdb/ser-tcp.c
+++ b/gdb/ser-tcp.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "serial.h"
 #include "ser-base.h"
 #include "ser-tcp.h"
diff --git a/gdb/ser-uds.c b/gdb/ser-uds.c
index 39a5f6f053a0..8da4c7a22fa5 100644
--- a/gdb/ser-uds.c
+++ b/gdb/ser-uds.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "serial.h"
 #include "ser-base.h"
 
diff --git a/gdb/ser-unix.c b/gdb/ser-unix.c
index bc8b087b6eb6..db1464f8f6e8 100644
--- a/gdb/ser-unix.c
+++ b/gdb/ser-unix.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "serial.h"
 #include "ser-base.h"
 #include "ser-unix.h"
diff --git a/gdb/serial.c b/gdb/serial.c
index 734a580ed020..aeab7ebcfb08 100644
--- a/gdb/serial.c
+++ b/gdb/serial.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include <ctype.h>
 #include "serial.h"
 #include "gdbcmd.h"
diff --git a/gdb/sh-linux-tdep.c b/gdb/sh-linux-tdep.c
index c78d363400ad..affbf550a505 100644
--- a/gdb/sh-linux-tdep.c
+++ b/gdb/sh-linux-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "osabi.h"
 
 #include "solib-svr4.h"
diff --git a/gdb/sh-netbsd-nat.c b/gdb/sh-netbsd-nat.c
index cf321984eeb6..c3c31e9bb3a0 100644
--- a/gdb/sh-netbsd-nat.c
+++ b/gdb/sh-netbsd-nat.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 
 #include <sys/types.h>
diff --git a/gdb/sh-netbsd-tdep.c b/gdb/sh-netbsd-tdep.c
index e04df2709f4b..fec6a2e03d22 100644
--- a/gdb/sh-netbsd-tdep.c
+++ b/gdb/sh-netbsd-tdep.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "regset.h"
 #include "value.h"
diff --git a/gdb/sh-tdep.c b/gdb/sh-tdep.c
index 16e513eb4053..1c67ea42b040 100644
--- a/gdb/sh-tdep.c
+++ b/gdb/sh-tdep.c
@@ -20,7 +20,6 @@
 /* Contributed by Steve Chamberlain
    sac@cygnus.com.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-base.h"
 #include "frame-unwind.h"
diff --git a/gdb/skip.c b/gdb/skip.c
index 79db4c54e06e..f2818eccb34c 100644
--- a/gdb/skip.c
+++ b/gdb/skip.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "skip.h"
 #include "value.h"
 #include "valprint.h"
diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c
index d58e2af0d22e..7c17601d5608 100644
--- a/gdb/sol-thread.c
+++ b/gdb/sol-thread.c
@@ -48,7 +48,6 @@
    symbols, etc...  The ps_* routines actually do most of their work
    by calling functions in procfs.c.  */
 
-#include "defs.h"
 #include <thread.h>
 #include <proc_service.h>
 #include <thread_db.h>
diff --git a/gdb/sol2-tdep.c b/gdb/sol2-tdep.c
index 4ee2d0ac3460..468b132165e6 100644
--- a/gdb/sol2-tdep.c
+++ b/gdb/sol2-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "symtab.h"
 #include "inferior.h"
diff --git a/gdb/solib-aix.c b/gdb/solib-aix.c
index 8c8f219bdc59..a50bb165c193 100644
--- a/gdb/solib-aix.c
+++ b/gdb/solib-aix.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "solib-aix.h"
 #include "solib.h"
 #include "solist.h"
diff --git a/gdb/solib-darwin.c b/gdb/solib-darwin.c
index 5ef0646d5385..6943b2df5865 100644
--- a/gdb/solib-darwin.c
+++ b/gdb/solib-darwin.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "bfd.h"
 #include "objfiles.h"
diff --git a/gdb/solib-dsbt.c b/gdb/solib-dsbt.c
index f1c10d0f302d..0208ed13effc 100644
--- a/gdb/solib-dsbt.c
+++ b/gdb/solib-dsbt.c
@@ -17,7 +17,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include "defs.h"
 #include "inferior.h"
 #include "gdbcore.h"
 #include "solib.h"
diff --git a/gdb/solib-frv.c b/gdb/solib-frv.c
index f90a0a218d6c..aef609378a42 100644
--- a/gdb/solib-frv.c
+++ b/gdb/solib-frv.c
@@ -17,7 +17,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "solib.h"
 #include "solist.h"
diff --git a/gdb/solib-rocm.c b/gdb/solib-rocm.c
index 02ab36bb95e6..b714e4ef6cce 100644
--- a/gdb/solib-rocm.c
+++ b/gdb/solib-rocm.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "amd-dbgapi-target.h"
 #include "amdgpu-tdep.h"
diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c
index 2377ed3341dc..49dd1e9aa330 100644
--- a/gdb/solib-svr4.c
+++ b/gdb/solib-svr4.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "elf/external.h"
 #include "elf/common.h"
diff --git a/gdb/solib-target.c b/gdb/solib-target.c
index bb4c6a6c174f..6563da05a471 100644
--- a/gdb/solib-target.c
+++ b/gdb/solib-target.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "objfiles.h"
 #include "solist.h"
 #include "symtab.h"
diff --git a/gdb/solib.c b/gdb/solib.c
index 9497f5d30992..2f69c3372b0b 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include <fcntl.h>
 #include "symtab.h"
diff --git a/gdb/source-cache.c b/gdb/source-cache.c
index 8b5bd84d19a8..6af984fb88bf 100644
--- a/gdb/source-cache.c
+++ b/gdb/source-cache.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "source-cache.h"
 #include "gdbsupport/scoped_fd.h"
 #include "source.h"
diff --git a/gdb/source.c b/gdb/source.c
index bbeb41542583..432301e2a717 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "symtab.h"
 #include "expression.h"
diff --git a/gdb/sparc-linux-nat.c b/gdb/sparc-linux-nat.c
index f8142435162b..0b3a69256109 100644
--- a/gdb/sparc-linux-nat.c
+++ b/gdb/sparc-linux-nat.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "regcache.h"
 
 #include <sys/procfs.h>
diff --git a/gdb/sparc-linux-tdep.c b/gdb/sparc-linux-tdep.c
index 1590cbdc4f05..fac4c7d773db 100644
--- a/gdb/sparc-linux-tdep.c
+++ b/gdb/sparc-linux-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "dwarf2/frame.h"
 #include "frame.h"
 #include "frame-unwind.h"
diff --git a/gdb/sparc-nat.c b/gdb/sparc-nat.c
index d3149ab39ef7..b8d0bed622f0 100644
--- a/gdb/sparc-nat.c
+++ b/gdb/sparc-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "regcache.h"
 #include "target.h"
diff --git a/gdb/sparc-netbsd-nat.c b/gdb/sparc-netbsd-nat.c
index 1f65c01d3dfb..82592ccc3cfa 100644
--- a/gdb/sparc-netbsd-nat.c
+++ b/gdb/sparc-netbsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "regcache.h"
 #include "target.h"
 
diff --git a/gdb/sparc-netbsd-tdep.c b/gdb/sparc-netbsd-tdep.c
index d2b1a4bfd140..fc22e66826fd 100644
--- a/gdb/sparc-netbsd-tdep.c
+++ b/gdb/sparc-netbsd-tdep.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "gdbcore.h"
diff --git a/gdb/sparc-obsd-tdep.c b/gdb/sparc-obsd-tdep.c
index 8cdbc8aae6e7..d6166710709c 100644
--- a/gdb/sparc-obsd-tdep.c
+++ b/gdb/sparc-obsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "gdbcore.h"
diff --git a/gdb/sparc-ravenscar-thread.c b/gdb/sparc-ravenscar-thread.c
index 0f6dec072c3e..82f68e14cb28 100644
--- a/gdb/sparc-ravenscar-thread.c
+++ b/gdb/sparc-ravenscar-thread.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "regcache.h"
 #include "sparc-tdep.h"
diff --git a/gdb/sparc-sol2-nat.c b/gdb/sparc-sol2-nat.c
index cee9a68459e5..8f9607f338d9 100644
--- a/gdb/sparc-sol2-nat.c
+++ b/gdb/sparc-sol2-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "regcache.h"
 
 #include <sys/procfs.h>
diff --git a/gdb/sparc-sol2-tdep.c b/gdb/sparc-sol2-tdep.c
index 525784401038..aea3766d9b53 100644
--- a/gdb/sparc-sol2-tdep.c
+++ b/gdb/sparc-sol2-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "gdbcore.h"
diff --git a/gdb/sparc-tdep.c b/gdb/sparc-tdep.c
index 5eec3615f536..fbc27ffcb5e6 100644
--- a/gdb/sparc-tdep.c
+++ b/gdb/sparc-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "dis-asm.h"
 #include "dwarf2.h"
diff --git a/gdb/sparc64-fbsd-nat.c b/gdb/sparc64-fbsd-nat.c
index 7c025405e974..c10d55f0cd0e 100644
--- a/gdb/sparc64-fbsd-nat.c
+++ b/gdb/sparc64-fbsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "regcache.h"
 #include "target.h"
 
diff --git a/gdb/sparc64-fbsd-tdep.c b/gdb/sparc64-fbsd-tdep.c
index c992c8c8f6fb..a30c7c448e5b 100644
--- a/gdb/sparc64-fbsd-tdep.c
+++ b/gdb/sparc64-fbsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "gdbcore.h"
diff --git a/gdb/sparc64-linux-nat.c b/gdb/sparc64-linux-nat.c
index 24dfa2c01455..bd9aafd58b00 100644
--- a/gdb/sparc64-linux-nat.c
+++ b/gdb/sparc64-linux-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "regcache.h"
 
 #include <sys/procfs.h>
diff --git a/gdb/sparc64-linux-tdep.c b/gdb/sparc64-linux-tdep.c
index 33da5321d81a..e91bba3aadba 100644
--- a/gdb/sparc64-linux-tdep.c
+++ b/gdb/sparc64-linux-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "dwarf2/frame.h"
diff --git a/gdb/sparc64-nat.c b/gdb/sparc64-nat.c
index a7cc4403c250..aa07bf5d3628 100644
--- a/gdb/sparc64-nat.c
+++ b/gdb/sparc64-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbarch.h"
 
 #include "sparc64-tdep.h"
diff --git a/gdb/sparc64-netbsd-nat.c b/gdb/sparc64-netbsd-nat.c
index 32dc87e5495a..111a45dd8a76 100644
--- a/gdb/sparc64-netbsd-nat.c
+++ b/gdb/sparc64-netbsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "regcache.h"
 #include "target.h"
diff --git a/gdb/sparc64-netbsd-tdep.c b/gdb/sparc64-netbsd-tdep.c
index fe97689ae157..b101f4970d90 100644
--- a/gdb/sparc64-netbsd-tdep.c
+++ b/gdb/sparc64-netbsd-tdep.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "gdbcore.h"
diff --git a/gdb/sparc64-obsd-nat.c b/gdb/sparc64-obsd-nat.c
index c007edb71229..71589d109e3d 100644
--- a/gdb/sparc64-obsd-nat.c
+++ b/gdb/sparc64-obsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcore.h"
 #include "regcache.h"
 #include "target.h"
diff --git a/gdb/sparc64-obsd-tdep.c b/gdb/sparc64-obsd-tdep.c
index 3837074a9fb7..6caeb107b9f0 100644
--- a/gdb/sparc64-obsd-tdep.c
+++ b/gdb/sparc64-obsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "gdbcore.h"
diff --git a/gdb/sparc64-sol2-tdep.c b/gdb/sparc64-sol2-tdep.c
index 7cef98bb681c..b7ca4ca1f5ba 100644
--- a/gdb/sparc64-sol2-tdep.c
+++ b/gdb/sparc64-sol2-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "gdbarch.h"
diff --git a/gdb/sparc64-tdep.c b/gdb/sparc64-tdep.c
index 8a90dd00d16f..a55107fa32d9 100644
--- a/gdb/sparc64-tdep.c
+++ b/gdb/sparc64-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "dwarf2/frame.h"
 #include "frame.h"
diff --git a/gdb/split-name.c b/gdb/split-name.c
index eacec135530b..f29608095ab3 100644
--- a/gdb/split-name.c
+++ b/gdb/split-name.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "split-name.h"
 #include "cp-support.h"
 
diff --git a/gdb/stabsread.c b/gdb/stabsread.c
index 025cb2120d19..85fe4000f329 100644
--- a/gdb/stabsread.c
+++ b/gdb/stabsread.c
@@ -24,7 +24,6 @@
    format).  Avoid placing any object file format specific code in
    this file.  */
 
-#include "defs.h"
 #include "bfd.h"
 #include "gdbsupport/gdb_obstack.h"
 #include "symtab.h"
diff --git a/gdb/stack.c b/gdb/stack.c
index 23e3891a0600..9c679222708e 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "value.h"
 #include "symtab.h"
 #include "gdbtypes.h"
diff --git a/gdb/stap-probe.c b/gdb/stap-probe.c
index b54e4d2d10a7..0b66554efae1 100644
--- a/gdb/stap-probe.c
+++ b/gdb/stap-probe.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "stap-probe.h"
 #include "probe.h"
 #include "ui-out.h"
diff --git a/gdb/std-regs.c b/gdb/std-regs.c
index 755e0c987e6e..3539d8a629a6 100644
--- a/gdb/std-regs.c
+++ b/gdb/std-regs.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "user-regs.h"
 #include "frame.h"
 #include "gdbtypes.h"
diff --git a/gdb/stub-termcap.c b/gdb/stub-termcap.c
index 28b046d7f7f1..ff0ef9929604 100644
--- a/gdb/stub-termcap.c
+++ b/gdb/stub-termcap.c
@@ -20,7 +20,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include "defs.h"
 
 extern "C" {
 
diff --git a/gdb/symfile-debug.c b/gdb/symfile-debug.c
index 3955298b1fef..bc70447600ee 100644
--- a/gdb/symfile-debug.c
+++ b/gdb/symfile-debug.c
@@ -25,7 +25,6 @@
    and then if the function returns a result printing a message after it
    returns.  */
 
-#include "defs.h"
 #include "gdbcmd.h"
 #include "objfiles.h"
 #include "observable.h"
diff --git a/gdb/symfile-mem.c b/gdb/symfile-mem.c
index 12a5f7d936b2..87fcc076986e 100644
--- a/gdb/symfile-mem.c
+++ b/gdb/symfile-mem.c
@@ -41,7 +41,6 @@
    entry point.  */
 
 
-#include "defs.h"
 #include "symtab.h"
 #include "gdbcore.h"
 #include "objfiles.h"
diff --git a/gdb/symfile.c b/gdb/symfile.c
index db6d76e78bf5..2a7d41dc9746 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "bfdlink.h"
 #include "symtab.h"
diff --git a/gdb/symmisc.c b/gdb/symmisc.c
index 49b9674f77ad..f80fc5ab196d 100644
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "bfd.h"
diff --git a/gdb/symtab.c b/gdb/symtab.c
index 33b664f94789..86603dfebc31 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "dwarf2/call-site.h"
 #include "symtab.h"
 #include "gdbtypes.h"
diff --git a/gdb/target-connection.c b/gdb/target-connection.c
index 388fd873d642..d9a529ae9bb3 100644
--- a/gdb/target-connection.c
+++ b/gdb/target-connection.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "target-connection.h"
 
 #include <map>
diff --git a/gdb/target-dcache.c b/gdb/target-dcache.c
index 72886d753ec0..7c6bcd8d18c9 100644
--- a/gdb/target-dcache.c
+++ b/gdb/target-dcache.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "target-dcache.h"
 #include "gdbcmd.h"
 #include "progspace.h"
diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c
index 591ae3dac7b5..8aca5cf719ba 100644
--- a/gdb/target-descriptions.c
+++ b/gdb/target-descriptions.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "gdbcmd.h"
 #include "gdbtypes.h"
@@ -1299,7 +1298,6 @@ class print_c_tdesc : public tdesc_element_visitor
     gdb_printf ("  Original: %s */\n\n",
 		lbasename (m_filename_after_features.c_str ()));
 
-    gdb_printf ("#include \"defs.h\"\n");
     gdb_printf ("#include \"osabi.h\"\n");
     gdb_printf ("#include \"target-descriptions.h\"\n");
     gdb_printf ("\n");
diff --git a/gdb/target-float.c b/gdb/target-float.c
index 415988923561..9b1b6b781d98 100644
--- a/gdb/target-float.c
+++ b/gdb/target-float.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbtypes.h"
 #include "floatformat.h"
 #include "target-float.h"
diff --git a/gdb/target-memory.c b/gdb/target-memory.c
index 6bb67e44aa0d..f752769e415a 100644
--- a/gdb/target-memory.c
+++ b/gdb/target-memory.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "target.h"
 #include "memory-map.h"
 #include "inferior.h"
diff --git a/gdb/target.c b/gdb/target.c
index bbc1badc9e19..107a84b3ca1d 100644
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "target.h"
 #include "target-dcache.h"
 #include "gdbcmd.h"
diff --git a/gdb/target/target.c b/gdb/target/target.c
index f00506a625ef..c84a6ff52daa 100644
--- a/gdb/target/target.c
+++ b/gdb/target/target.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "target/target.h"
 
 /* Read LEN bytes of target memory at address MEMADDR, placing the
diff --git a/gdb/target/waitstatus.c b/gdb/target/waitstatus.c
index 411a2ecc4f82..30c0621326fd 100644
--- a/gdb/target/waitstatus.c
+++ b/gdb/target/waitstatus.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "waitstatus.h"
 
 /* See waitstatus.h.  */
diff --git a/gdb/test-target.c b/gdb/test-target.c
index 3d6629506701..4da7a08f24e6 100644
--- a/gdb/test-target.c
+++ b/gdb/test-target.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "test-target.h"
 
 #if GDB_SELF_TEST
diff --git a/gdb/thread-iter.c b/gdb/thread-iter.c
index 31fcf1fc2551..601d23c9ec34 100644
--- a/gdb/thread-iter.c
+++ b/gdb/thread-iter.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbthread.h"
 #include "inferior.h"
 
diff --git a/gdb/thread.c b/gdb/thread.c
index 22523569fdbd..60a1bef8cf0a 100644
--- a/gdb/thread.c
+++ b/gdb/thread.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "language.h"
 #include "symtab.h"
 #include "frame.h"
diff --git a/gdb/tic6x-linux-tdep.c b/gdb/tic6x-linux-tdep.c
index a9de60cf662a..c214178b66d4 100644
--- a/gdb/tic6x-linux-tdep.c
+++ b/gdb/tic6x-linux-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "solib.h"
 #include "osabi.h"
 #include "linux-tdep.h"
diff --git a/gdb/tic6x-tdep.c b/gdb/tic6x-tdep.c
index aa115095df79..3a63b0cc25db 100644
--- a/gdb/tic6x-tdep.c
+++ b/gdb/tic6x-tdep.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-unwind.h"
 #include "frame-base.h"
diff --git a/gdb/tid-parse.c b/gdb/tid-parse.c
index aa1480d7cf0c..623f55e14b36 100644
--- a/gdb/tid-parse.c
+++ b/gdb/tid-parse.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "tid-parse.h"
 #include "inferior.h"
 #include "gdbthread.h"
diff --git a/gdb/tilegx-linux-nat.c b/gdb/tilegx-linux-nat.c
index ad707d34daf4..bbfeaefeccd2 100644
--- a/gdb/tilegx-linux-nat.c
+++ b/gdb/tilegx-linux-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "gdbcore.h"
 #include "regcache.h"
diff --git a/gdb/tilegx-linux-tdep.c b/gdb/tilegx-linux-tdep.c
index e0ff0fc2a86c..cec2be2bfec0 100644
--- a/gdb/tilegx-linux-tdep.c
+++ b/gdb/tilegx-linux-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "osabi.h"
 #include "linux-tdep.h"
 #include "glibc-tdep.h"
diff --git a/gdb/tilegx-tdep.c b/gdb/tilegx-tdep.c
index c25933be5585..d5ea93cf5038 100644
--- a/gdb/tilegx-tdep.c
+++ b/gdb/tilegx-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-base.h"
 #include "frame-unwind.h"
diff --git a/gdb/top.c b/gdb/top.c
index 0aeeb9878321..6e9df41c4f3c 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcmd.h"
 #include "cli/cli-cmds.h"
 #include "cli/cli-script.h"
diff --git a/gdb/tracectf.c b/gdb/tracectf.c
index 2ffae6bd326a..282a8250ac10 100644
--- a/gdb/tracectf.c
+++ b/gdb/tracectf.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "tracectf.h"
 #include "tracepoint.h"
 #include "regcache.h"
diff --git a/gdb/tracefile-tfile.c b/gdb/tracefile-tfile.c
index f5696bf0129e..79af963b049b 100644
--- a/gdb/tracefile-tfile.c
+++ b/gdb/tracefile-tfile.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "tracefile.h"
 #include "readline/tilde.h"
 #include "gdbsupport/filestuff.h"
diff --git a/gdb/tracefile.c b/gdb/tracefile.c
index e347b3a30c0d..9db68bbac510 100644
--- a/gdb/tracefile.c
+++ b/gdb/tracefile.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "tracefile.h"
 #include "tracectf.h"
 #include "exec.h"
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 418d9ea2203a..1586a043af69 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "symtab.h"
 #include "frame.h"
diff --git a/gdb/trad-frame.c b/gdb/trad-frame.c
index c35e08ab2805..fc9261314784 100644
--- a/gdb/trad-frame.c
+++ b/gdb/trad-frame.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "trad-frame.h"
 #include "regcache.h"
diff --git a/gdb/tramp-frame.c b/gdb/tramp-frame.c
index 0e730e66b583..4b397cbf046d 100644
--- a/gdb/tramp-frame.c
+++ b/gdb/tramp-frame.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "tramp-frame.h"
 #include "frame-unwind.h"
 #include "gdbcore.h"
diff --git a/gdb/tui/tui-command.c b/gdb/tui/tui-command.c
index 2587dfe59b4a..59e595525b00 100644
--- a/gdb/tui/tui-command.c
+++ b/gdb/tui/tui-command.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "tui/tui.h"
 #include "tui/tui-data.h"
 #include "tui/tui-win.h"
diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c
index 03395d2df09d..462771ca1637 100644
--- a/gdb/tui/tui-data.c
+++ b/gdb/tui/tui-data.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "tui/tui.h"
 #include "tui/tui-data.h"
diff --git a/gdb/tui/tui-disasm.c b/gdb/tui/tui-disasm.c
index 5dc27c32daac..07ca37603b8c 100644
--- a/gdb/tui/tui-disasm.c
+++ b/gdb/tui/tui-disasm.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "symtab.h"
 #include "breakpoint.h"
diff --git a/gdb/tui/tui-file.c b/gdb/tui/tui-file.c
index 1cf840488c12..a0d72a0fbd2e 100644
--- a/gdb/tui/tui-file.c
+++ b/gdb/tui/tui-file.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "tui/tui-file.h"
 #include "tui/tui-io.h"
 #include "tui/tui-command.h"
diff --git a/gdb/tui/tui-hooks.c b/gdb/tui/tui-hooks.c
index 289a25996889..cf48e709ed8a 100644
--- a/gdb/tui/tui-hooks.c
+++ b/gdb/tui/tui-hooks.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "inferior.h"
 #include "command.h"
diff --git a/gdb/tui/tui-interp.c b/gdb/tui/tui-interp.c
index b16da314455e..a75708ba6624 100644
--- a/gdb/tui/tui-interp.c
+++ b/gdb/tui/tui-interp.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "cli/cli-interp.h"
 #include "interps.h"
 #include "ui.h"
diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c
index ba07e3d573bb..34e85de08532 100644
--- a/gdb/tui/tui-io.c
+++ b/gdb/tui/tui-io.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "target.h"
 #include "gdbsupport/event-loop.h"
 #include "event-top.h"
diff --git a/gdb/tui/tui-layout.c b/gdb/tui/tui-layout.c
index a96ca855d1d7..143254bcf990 100644
--- a/gdb/tui/tui-layout.c
+++ b/gdb/tui/tui-layout.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "command.h"
 #include "symtab.h"
diff --git a/gdb/tui/tui-location.c b/gdb/tui/tui-location.c
index 831ab14345eb..7e8f769d8047 100644
--- a/gdb/tui/tui-location.c
+++ b/gdb/tui/tui-location.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "tui/tui.h"
 #include "tui/tui-status.h"
 #include "tui/tui-data.h"
diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c
index 05211eb7b221..88e1c5a34105 100644
--- a/gdb/tui/tui-regs.c
+++ b/gdb/tui/tui-regs.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "tui/tui.h"
 #include "tui/tui-data.h"
diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c
index fa956b29a195..5c17aba3a1a2 100644
--- a/gdb/tui/tui-source.c
+++ b/gdb/tui/tui-source.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include <math.h>
 #include <ctype.h>
 #include "symtab.h"
diff --git a/gdb/tui/tui-status.c b/gdb/tui/tui-status.c
index aac391d3babc..c7750af6ea0b 100644
--- a/gdb/tui/tui-status.c
+++ b/gdb/tui/tui-status.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "breakpoint.h"
 #include "frame.h"
diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index a2982eba0c62..ced7e254f505 100644
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -24,7 +24,6 @@
 
    Author: Susan B. Macchia  */
 
-#include "defs.h"
 #include "command.h"
 #include "symtab.h"
 #include "breakpoint.h"
diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c
index 4263b9c049ba..c14ac5a8faf2 100644
--- a/gdb/tui/tui-wingeneral.c
+++ b/gdb/tui/tui-wingeneral.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "tui/tui.h"
 #include "tui/tui-data.h"
 #include "tui/tui-io.h"
diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index 6b8716cd27cf..4dbbe922256e 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include <ctype.h>
 #include "symtab.h"
 #include "frame.h"
diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c
index dea6ffbf954d..19f09609a2f6 100644
--- a/gdb/tui/tui.c
+++ b/gdb/tui/tui.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcmd.h"
 #include "tui/tui.h"
 #include "tui/tui-hooks.h"
diff --git a/gdb/type-stack.c b/gdb/type-stack.c
index 614f7e8764e6..09348dfd3713 100644
--- a/gdb/type-stack.c
+++ b/gdb/type-stack.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "type-stack.h"
 
 #include "gdbtypes.h"
diff --git a/gdb/typeprint.c b/gdb/typeprint.c
index 3b100dcb1482..4d0e764274a1 100644
--- a/gdb/typeprint.c
+++ b/gdb/typeprint.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/gdb_obstack.h"
 #include "bfd.h"
 #include "symtab.h"
diff --git a/gdb/ui-file.c b/gdb/ui-file.c
index e60921072a47..dd15ea427bcf 100644
--- a/gdb/ui-file.c
+++ b/gdb/ui-file.c
@@ -19,7 +19,6 @@
 
 /* Implement the ``struct ui_file'' object.  */
 
-#include "defs.h"
 #include "ui-file.h"
 #include "gdbsupport/gdb_obstack.h"
 #include "gdbsupport/gdb_select.h"
diff --git a/gdb/ui-out.c b/gdb/ui-out.c
index a5f1ba518abe..b3a2fb7f4e51 100644
--- a/gdb/ui-out.c
+++ b/gdb/ui-out.c
@@ -20,7 +20,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "expression.h"
 #include "language.h"
 #include "ui-out.h"
diff --git a/gdb/ui-style.c b/gdb/ui-style.c
index 3d9e1b5a97de..952102e30c32 100644
--- a/gdb/ui-style.c
+++ b/gdb/ui-style.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "ui-style.h"
 #include "gdbsupport/gdb_regex.h"
 
diff --git a/gdb/ui.c b/gdb/ui.c
index 2a9bf519c6cd..80ee67dbae5a 100644
--- a/gdb/ui.c
+++ b/gdb/ui.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "ui.h"
 
 #include "cli/cli-cmds.h"
diff --git a/gdb/unittests/array-view-selftests.c b/gdb/unittests/array-view-selftests.c
index 299318ace434..eb3ae304790f 100644
--- a/gdb/unittests/array-view-selftests.c
+++ b/gdb/unittests/array-view-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/selftest.h"
 #include "gdbsupport/array-view.h"
 #include <array>
diff --git a/gdb/unittests/child-path-selftests.c b/gdb/unittests/child-path-selftests.c
index 9f77dd739955..4c4014d14776 100644
--- a/gdb/unittests/child-path-selftests.c
+++ b/gdb/unittests/child-path-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/pathstuff.h"
 #include "gdbsupport/selftest.h"
 
diff --git a/gdb/unittests/cli-utils-selftests.c b/gdb/unittests/cli-utils-selftests.c
index 69d84bf50153..6ade3af4ffa4 100644
--- a/gdb/unittests/cli-utils-selftests.c
+++ b/gdb/unittests/cli-utils-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "cli/cli-utils.h"
 #include "gdbsupport/selftest.h"
 
diff --git a/gdb/unittests/command-def-selftests.c b/gdb/unittests/command-def-selftests.c
index 74a218019766..6936af740fc4 100644
--- a/gdb/unittests/command-def-selftests.c
+++ b/gdb/unittests/command-def-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "cli/cli-cmds.h"
 #include "cli/cli-decode.h"
 #include "gdbsupport/selftest.h"
diff --git a/gdb/unittests/common-utils-selftests.c b/gdb/unittests/common-utils-selftests.c
index b1f8fb843964..e66e38045ad5 100644
--- a/gdb/unittests/common-utils-selftests.c
+++ b/gdb/unittests/common-utils-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "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 776d99ac9f12..c9f61b09cf42 100644
--- a/gdb/unittests/copy_bitwise-selftests.c
+++ b/gdb/unittests/copy_bitwise-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/selftest.h"
 #include "utils.h"
 
diff --git a/gdb/unittests/enum-flags-selftests.c b/gdb/unittests/enum-flags-selftests.c
index 54e168173de6..b55d8c314062 100644
--- a/gdb/unittests/enum-flags-selftests.c
+++ b/gdb/unittests/enum-flags-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/enum-flags.h"
 #include "gdbsupport/valid-expr.h"
 #include "gdbsupport/selftest.h"
diff --git a/gdb/unittests/environ-selftests.c b/gdb/unittests/environ-selftests.c
index c016e74ccf1e..9bd736028b3b 100644
--- a/gdb/unittests/environ-selftests.c
+++ b/gdb/unittests/environ-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/selftest.h"
 #include "gdbsupport/environ.h"
 #include "diagnostics.h"
diff --git a/gdb/unittests/filtered_iterator-selftests.c b/gdb/unittests/filtered_iterator-selftests.c
index 147f09dd4499..dc76fe031aa4 100644
--- a/gdb/unittests/filtered_iterator-selftests.c
+++ b/gdb/unittests/filtered_iterator-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "gdbsupport/selftest.h"
 #include "gdbsupport/filtered-iterator.h"
 
diff --git a/gdb/unittests/format_pieces-selftests.c b/gdb/unittests/format_pieces-selftests.c
index b4918c67af42..a01f248c316f 100644
--- a/gdb/unittests/format_pieces-selftests.c
+++ b/gdb/unittests/format_pieces-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/format.h"
 #include "gdbsupport/selftest.h"
 
diff --git a/gdb/unittests/frame_info_ptr-selftests.c b/gdb/unittests/frame_info_ptr-selftests.c
index f09d1c8ba015..ec83024cc3d1 100644
--- a/gdb/unittests/frame_info_ptr-selftests.c
+++ b/gdb/unittests/frame_info_ptr-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "frame.h"
 #include "gdbsupport/selftest.h"
diff --git a/gdb/unittests/function-view-selftests.c b/gdb/unittests/function-view-selftests.c
index b01c02c1d9bd..dc1a6304eb68 100644
--- a/gdb/unittests/function-view-selftests.c
+++ b/gdb/unittests/function-view-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/selftest.h"
 #include "gdbsupport/function-view.h"
 
diff --git a/gdb/unittests/gdb_tilde_expand-selftests.c b/gdb/unittests/gdb_tilde_expand-selftests.c
index 5edf4b688b19..165885f361b9 100644
--- a/gdb/unittests/gdb_tilde_expand-selftests.c
+++ b/gdb/unittests/gdb_tilde_expand-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "gdbsupport/selftest.h"
 #include <cstdlib>
 
diff --git a/gdb/unittests/gmp-utils-selftests.c b/gdb/unittests/gmp-utils-selftests.c
index 513ebc824979..3c6b71062a7b 100644
--- a/gdb/unittests/gmp-utils-selftests.c
+++ b/gdb/unittests/gmp-utils-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gmp-utils.h"
 #include "gdbsupport/selftest.h"
 
diff --git a/gdb/unittests/intrusive_list-selftests.c b/gdb/unittests/intrusive_list-selftests.c
index 61e1343b2419..28d0134ffe6b 100644
--- a/gdb/unittests/intrusive_list-selftests.c
+++ b/gdb/unittests/intrusive_list-selftests.c
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "gdbsupport/intrusive_list.h"
 #include "gdbsupport/selftest.h"
diff --git a/gdb/unittests/lookup_name_info-selftests.c b/gdb/unittests/lookup_name_info-selftests.c
index 2fd8be9a3dbd..fe87bedac765 100644
--- a/gdb/unittests/lookup_name_info-selftests.c
+++ b/gdb/unittests/lookup_name_info-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/selftest.h"
 #include "symtab.h"
 
diff --git a/gdb/unittests/main-thread-selftests.c b/gdb/unittests/main-thread-selftests.c
index 9fd1b99e34b0..1ba350575f10 100644
--- a/gdb/unittests/main-thread-selftests.c
+++ b/gdb/unittests/main-thread-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/selftest.h"
 #include "gdbsupport/block-signals.h"
 #include "gdbsupport/scope-exit.h"
diff --git a/gdb/unittests/memory-map-selftests.c b/gdb/unittests/memory-map-selftests.c
index cc059bbc1996..55d66fd61a0d 100644
--- a/gdb/unittests/memory-map-selftests.c
+++ b/gdb/unittests/memory-map-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/selftest.h"
 #include "memory-map.h"
 
diff --git a/gdb/unittests/memrange-selftests.c b/gdb/unittests/memrange-selftests.c
index d6a10511a751..df02b6ad2658 100644
--- a/gdb/unittests/memrange-selftests.c
+++ b/gdb/unittests/memrange-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/selftest.h"
 #include "memrange.h"
 
diff --git a/gdb/unittests/mkdir-recursive-selftests.c b/gdb/unittests/mkdir-recursive-selftests.c
index 1aaf685855b2..a96874d22282 100644
--- a/gdb/unittests/mkdir-recursive-selftests.c
+++ b/gdb/unittests/mkdir-recursive-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "gdbsupport/filestuff.h"
 #include "gdbsupport/selftest.h"
diff --git a/gdb/unittests/observable-selftests.c b/gdb/unittests/observable-selftests.c
index bc2e001d86a0..2640f6817ee5 100644
--- a/gdb/unittests/observable-selftests.c
+++ b/gdb/unittests/observable-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/selftest.h"
 #include "gdbsupport/observable.h"
 
diff --git a/gdb/unittests/offset-type-selftests.c b/gdb/unittests/offset-type-selftests.c
index e5a24ab1a19b..95cc4f8ebd59 100644
--- a/gdb/unittests/offset-type-selftests.c
+++ b/gdb/unittests/offset-type-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/selftest.h"
 #include "gdbsupport/offset-type.h"
 #include "gdbsupport/underlying.h"
diff --git a/gdb/unittests/packed-selftests.c b/gdb/unittests/packed-selftests.c
index 852a7d364ce9..060c87c4e159 100644
--- a/gdb/unittests/packed-selftests.c
+++ b/gdb/unittests/packed-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/selftest.h"
 #include "gdbsupport/packed.h"
 
diff --git a/gdb/unittests/parallel-for-selftests.c b/gdb/unittests/parallel-for-selftests.c
index a9abbf0328c1..0261948361ae 100644
--- a/gdb/unittests/parallel-for-selftests.c
+++ b/gdb/unittests/parallel-for-selftests.c
@@ -24,7 +24,6 @@
    FOR_EACH.  The FOR_EACH-defined part reads like a regular function.  */
 #ifndef FOR_EACH
 
-#include "defs.h"
 #include "gdbsupport/selftest.h"
 #include "gdbsupport/parallel-for.h"
 
diff --git a/gdb/unittests/parse-connection-spec-selftests.c b/gdb/unittests/parse-connection-spec-selftests.c
index 83c006ba9285..55a7c13c3a8c 100644
--- a/gdb/unittests/parse-connection-spec-selftests.c
+++ b/gdb/unittests/parse-connection-spec-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/selftest.h"
 #include "gdbsupport/netstuff.h"
 #include "diagnostics.h"
diff --git a/gdb/unittests/path-join-selftests.c b/gdb/unittests/path-join-selftests.c
index 15df04884d9b..08fad63341d8 100644
--- a/gdb/unittests/path-join-selftests.c
+++ b/gdb/unittests/path-join-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/pathstuff.h"
 #include "gdbsupport/selftest.h"
 
diff --git a/gdb/unittests/ptid-selftests.c b/gdb/unittests/ptid-selftests.c
index a44ffa3f7c99..6fc04c12eb1c 100644
--- a/gdb/unittests/ptid-selftests.c
+++ b/gdb/unittests/ptid-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/ptid.h"
 #include <type_traits>
 
diff --git a/gdb/unittests/rsp-low-selftests.c b/gdb/unittests/rsp-low-selftests.c
index 90141abb65e7..7a1787150965 100644
--- a/gdb/unittests/rsp-low-selftests.c
+++ b/gdb/unittests/rsp-low-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/selftest.h"
 #include "gdbsupport/rsp-low.h"
 
diff --git a/gdb/unittests/scoped_fd-selftests.c b/gdb/unittests/scoped_fd-selftests.c
index e85f9f7d920f..1413c5018e87 100644
--- a/gdb/unittests/scoped_fd-selftests.c
+++ b/gdb/unittests/scoped_fd-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "gdbsupport/filestuff.h"
 #include "gdbsupport/scoped_fd.h"
diff --git a/gdb/unittests/scoped_ignore_signal-selftests.c b/gdb/unittests/scoped_ignore_signal-selftests.c
index dc1d9341b7a1..361928c53c0b 100644
--- a/gdb/unittests/scoped_ignore_signal-selftests.c
+++ b/gdb/unittests/scoped_ignore_signal-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/scoped_ignore_signal.h"
 #include "gdbsupport/selftest.h"
 #include "gdbsupport/scope-exit.h"
diff --git a/gdb/unittests/scoped_mmap-selftests.c b/gdb/unittests/scoped_mmap-selftests.c
index dbf836fa2d7c..7b3a6f5202b4 100644
--- a/gdb/unittests/scoped_mmap-selftests.c
+++ b/gdb/unittests/scoped_mmap-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #include "gdbsupport/filestuff.h"
 #include "gdbsupport/scoped_mmap.h"
diff --git a/gdb/unittests/scoped_restore-selftests.c b/gdb/unittests/scoped_restore-selftests.c
index 074cc4ccda1e..1fd511813923 100644
--- a/gdb/unittests/scoped_restore-selftests.c
+++ b/gdb/unittests/scoped_restore-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/selftest.h"
 #include "gdbsupport/scoped_restore.h"
 
diff --git a/gdb/unittests/search-memory-selftests.c b/gdb/unittests/search-memory-selftests.c
index 109ce8b528d5..11246337db33 100644
--- a/gdb/unittests/search-memory-selftests.c
+++ b/gdb/unittests/search-memory-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "gdbsupport/selftest.h"
 #include "gdbsupport/search.h"
 
diff --git a/gdb/unittests/style-selftests.c b/gdb/unittests/style-selftests.c
index 8a6cf2b38682..4dc3c842c470 100644
--- a/gdb/unittests/style-selftests.c
+++ b/gdb/unittests/style-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/selftest.h"
 #include "ui-style.h"
 
diff --git a/gdb/unittests/tracepoint-selftests.c b/gdb/unittests/tracepoint-selftests.c
index 7267b70eef97..027002845483 100644
--- a/gdb/unittests/tracepoint-selftests.c
+++ b/gdb/unittests/tracepoint-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/selftest.h"
 #include "tracepoint.h"
 
diff --git a/gdb/unittests/tui-selftests.c b/gdb/unittests/tui-selftests.c
index e936b20f3705..684720797017 100644
--- a/gdb/unittests/tui-selftests.c
+++ b/gdb/unittests/tui-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/selftest.h"
 
 #ifdef TUI
diff --git a/gdb/unittests/ui-file-selftests.c b/gdb/unittests/ui-file-selftests.c
index eff1be7f2b2f..7c55b80cdfed 100644
--- a/gdb/unittests/ui-file-selftests.c
+++ b/gdb/unittests/ui-file-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/selftest.h"
 #include "ui-file.h"
 
diff --git a/gdb/unittests/unique_xmalloc_ptr_char.c b/gdb/unittests/unique_xmalloc_ptr_char.c
index e36d871dd170..b7fd5b6c4a1a 100644
--- a/gdb/unittests/unique_xmalloc_ptr_char.c
+++ b/gdb/unittests/unique_xmalloc_ptr_char.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/selftest.h"
 #include "selftest-arch.h"
 #include "gdbsupport/gdb_unique_ptr.h"
diff --git a/gdb/unittests/unpack-selftests.c b/gdb/unittests/unpack-selftests.c
index 2fc789231db1..35f4eeeee2fb 100644
--- a/gdb/unittests/unpack-selftests.c
+++ b/gdb/unittests/unpack-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/selftest.h"
 #include "selftest-arch.h"
 #include "value.h"
diff --git a/gdb/unittests/utils-selftests.c b/gdb/unittests/utils-selftests.c
index 2f6d10400e1e..6748dc2546c7 100644
--- a/gdb/unittests/utils-selftests.c
+++ b/gdb/unittests/utils-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "utils.h"
 #include "gdbsupport/selftest.h"
 
diff --git a/gdb/unittests/vec-utils-selftests.c b/gdb/unittests/vec-utils-selftests.c
index e7ff1289205d..da3bcf08d3cd 100644
--- a/gdb/unittests/vec-utils-selftests.c
+++ b/gdb/unittests/vec-utils-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "gdbsupport/selftest.h"
 
 #include "gdbsupport/gdb_vecs.h"
diff --git a/gdb/unittests/xml-utils-selftests.c b/gdb/unittests/xml-utils-selftests.c
index 31f74742b0a5..627d5d8428ee 100644
--- a/gdb/unittests/xml-utils-selftests.c
+++ b/gdb/unittests/xml-utils-selftests.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbsupport/xml-utils.h"
 #include "gdbsupport/selftest.h"
 
diff --git a/gdb/user-regs.c b/gdb/user-regs.c
index d1b510a79278..ac04f63dbb80 100644
--- a/gdb/user-regs.c
+++ b/gdb/user-regs.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "user-regs.h"
 #include "gdbtypes.h"
 #include "frame.h"
diff --git a/gdb/utils.c b/gdb/utils.c
index 68aebf373819..ded03c740997 100644
--- a/gdb/utils.c
+++ b/gdb/utils.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include <ctype.h>
 #include "gdbsupport/gdb_wait.h"
 #include "event-top.h"
diff --git a/gdb/v850-tdep.c b/gdb/v850-tdep.c
index 4c1fd383a84f..6bda14f0fa15 100644
--- a/gdb/v850-tdep.c
+++ b/gdb/v850-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-base.h"
 #include "trad-frame.h"
diff --git a/gdb/valarith.c b/gdb/valarith.c
index 31b1c4762f77..6b152cadcac9 100644
--- a/gdb/valarith.c
+++ b/gdb/valarith.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "value.h"
 #include "symtab.h"
 #include "gdbtypes.h"
diff --git a/gdb/valops.c b/gdb/valops.c
index 52cce2872813..a17b937a9631 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "value.h"
diff --git a/gdb/valprint.c b/gdb/valprint.c
index 7b3ffc884f13..40ffdbe6146f 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "value.h"
diff --git a/gdb/value.c b/gdb/value.c
index 7ddfeb7c7286..1bd180a62ccc 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "symtab.h"
 #include "gdbtypes.h"
diff --git a/gdb/varobj.c b/gdb/varobj.c
index af64534169f8..8ce3cbdd440f 100644
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "value.h"
 #include "expression.h"
 #include "frame.h"
diff --git a/gdb/vax-bsd-nat.c b/gdb/vax-bsd-nat.c
index 0f982ca62190..2a4db3a81218 100644
--- a/gdb/vax-bsd-nat.c
+++ b/gdb/vax-bsd-nat.c
@@ -19,7 +19,6 @@
 
 /* We define this to get types like register_t.  */
 #define _KERNTYPES
-#include "defs.h"
 #include "inferior.h"
 #include "regcache.h"
 #include "target.h"
diff --git a/gdb/vax-netbsd-tdep.c b/gdb/vax-netbsd-tdep.c
index 66c56227f418..fa528ae658a3 100644
--- a/gdb/vax-netbsd-tdep.c
+++ b/gdb/vax-netbsd-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "osabi.h"
 
diff --git a/gdb/vax-tdep.c b/gdb/vax-tdep.c
index 125f3423be57..dd00898c298c 100644
--- a/gdb/vax-tdep.c
+++ b/gdb/vax-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "dis-asm.h"
 #include "frame.h"
diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index b123a66ef0f9..6fc412310236 100644
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -21,7 +21,6 @@
 
 /* Originally by Steve Chamberlain, sac@cygnus.com */
 
-#include "defs.h"
 #include "frame.h"
 #include "inferior.h"
 #include "infrun.h"
diff --git a/gdb/windows-tdep.c b/gdb/windows-tdep.c
index 361ccdd0dcbf..f9585adf8fa3 100644
--- a/gdb/windows-tdep.c
+++ b/gdb/windows-tdep.c
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "windows-tdep.h"
 #include "gdbsupport/gdb_obstack.h"
 #include "xml-support.h"
diff --git a/gdb/x86-bsd-nat.c b/gdb/x86-bsd-nat.c
index e2bc7a8ad0b1..2bdd385e7f24 100644
--- a/gdb/x86-bsd-nat.c
+++ b/gdb/x86-bsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "gdbthread.h"
 
diff --git a/gdb/x86-fbsd-nat.c b/gdb/x86-fbsd-nat.c
index eea4dd37cac5..bfd15bf6748d 100644
--- a/gdb/x86-fbsd-nat.c
+++ b/gdb/x86-fbsd-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "x86-fbsd-nat.h"
 #ifdef PT_GETXSTATE_INFO
 #include "nat/x86-xstate.h"
diff --git a/gdb/x86-linux-nat.c b/gdb/x86-linux-nat.c
index b93ffca38db2..a3d8ffb60f16 100644
--- a/gdb/x86-linux-nat.c
+++ b/gdb/x86-linux-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "inferior.h"
 #include "elf/common.h"
 #include "gdb_proc_service.h"
diff --git a/gdb/x86-nat.c b/gdb/x86-nat.c
index bd4a05da2375..5826716a1f8d 100644
--- a/gdb/x86-nat.c
+++ b/gdb/x86-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "x86-nat.h"
 #include "gdbcmd.h"
 #include "inferior.h"
diff --git a/gdb/x86-tdep.c b/gdb/x86-tdep.c
index 4cacf3ba511d..5d7aa9535b7c 100644
--- a/gdb/x86-tdep.c
+++ b/gdb/x86-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "x86-tdep.h"
 #include "symtab.h"
 
diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index e324f4ef8caf..c4914bdcbaf0 100644
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "bfd.h"
 
 #include <sys/types.h>
diff --git a/gdb/xml-support.c b/gdb/xml-support.c
index 65de9b292f0b..583e101c25f4 100644
--- a/gdb/xml-support.c
+++ b/gdb/xml-support.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbcmd.h"
 #include "xml-builtin.h"
 #include "xml-support.h"
diff --git a/gdb/xml-syscall.c b/gdb/xml-syscall.c
index fc999f0eee30..2373d0fd77b5 100644
--- a/gdb/xml-syscall.c
+++ b/gdb/xml-syscall.c
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "gdbtypes.h"
 #include "xml-support.h"
 #include "xml-syscall.h"
diff --git a/gdb/xml-tdesc.c b/gdb/xml-tdesc.c
index 0a84f2b77ed5..436c493d4f91 100644
--- a/gdb/xml-tdesc.c
+++ b/gdb/xml-tdesc.c
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "target.h"
 #include "target-descriptions.h"
 #include "xml-support.h"
diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c
index 12b16c2d3d36..166e6af85275 100644
--- a/gdb/xstormy16-tdep.c
+++ b/gdb/xstormy16-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "frame-base.h"
 #include "frame-unwind.h"
diff --git a/gdb/xtensa-config.c b/gdb/xtensa-config.c
index c312fe2749ef..77eb922c1f9f 100644
--- a/gdb/xtensa-config.c
+++ b/gdb/xtensa-config.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 
 #define XTENSA_CONFIG_VERSION 0x60
 
diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c
index e32656833a16..f8509b02e07d 100644
--- a/gdb/xtensa-linux-nat.c
+++ b/gdb/xtensa-linux-nat.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "inferior.h"
 #include "gdbcore.h"
diff --git a/gdb/xtensa-linux-tdep.c b/gdb/xtensa-linux-tdep.c
index cc8c30b10683..7c215e300b37 100644
--- a/gdb/xtensa-linux-tdep.c
+++ b/gdb/xtensa-linux-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "xtensa-tdep.h"
 #include "osabi.h"
 #include "linux-tdep.h"
diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c
index d116b34fd819..2c3d468d8be9 100644
--- a/gdb/xtensa-tdep.c
+++ b/gdb/xtensa-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "frame.h"
 #include "solib-svr4.h"
 #include "symtab.h"
diff --git a/gdb/z80-tdep.c b/gdb/z80-tdep.c
index f2d000f53030..ee8e36b18670 100644
--- a/gdb/z80-tdep.c
+++ b/gdb/z80-tdep.c
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "defs.h"
 #include "arch-utils.h"
 #include "dis-asm.h"
 #include "frame.h"
diff --git a/gdbserver/ax.cc b/gdbserver/ax.cc
index 2307e8dbeea6..ff42795582ff 100644
--- a/gdbserver/ax.cc
+++ b/gdbserver/ax.cc
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "ax.h"
 #include "gdbsupport/format.h"
 #include "tracepoint.h"
diff --git a/gdbserver/debug.cc b/gdbserver/debug.cc
index 9bdff962dda0..ae9ca5cd7687 100644
--- a/gdbserver/debug.cc
+++ b/gdbserver/debug.cc
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include <chrono>
 
 #if !defined (IN_PROCESS_AGENT)
diff --git a/gdbserver/dll.cc b/gdbserver/dll.cc
index 0fb6476f40e1..ff637a03fed1 100644
--- a/gdbserver/dll.cc
+++ b/gdbserver/dll.cc
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "dll.h"
 
 #include <algorithm>
diff --git a/gdbserver/fork-child.cc b/gdbserver/fork-child.cc
index 43ff57c31673..7e4c69b31bd5 100644
--- a/gdbserver/fork-child.cc
+++ b/gdbserver/fork-child.cc
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "gdbsupport/job-control.h"
 #include "gdbsupport/scoped_restore.h"
 #include "nat/fork-inferior.h"
diff --git a/gdbserver/gdbreplay.cc b/gdbserver/gdbreplay.cc
index 6263423db357..0219e865ec73 100644
--- a/gdbserver/gdbreplay.cc
+++ b/gdbserver/gdbreplay.cc
@@ -17,8 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
-
 #undef PACKAGE
 #undef PACKAGE_NAME
 #undef PACKAGE_VERSION
diff --git a/gdbserver/hostio.cc b/gdbserver/hostio.cc
index 255d86dab654..c5ae35ab7ddb 100644
--- a/gdbserver/hostio.cc
+++ b/gdbserver/hostio.cc
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "gdbsupport/fileio.h"
 #include "hostio.h"
 
diff --git a/gdbserver/i387-fp.cc b/gdbserver/i387-fp.cc
index 60d565b84823..62cafd872041 100644
--- a/gdbserver/i387-fp.cc
+++ b/gdbserver/i387-fp.cc
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "i387-fp.h"
 #include "gdbsupport/x86-xstate.h"
 #include "nat/x86-xstate.h"
diff --git a/gdbserver/inferiors.cc b/gdbserver/inferiors.cc
index c02d47aa91b8..d088340474fa 100644
--- a/gdbserver/inferiors.cc
+++ b/gdbserver/inferiors.cc
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "gdbsupport/common-inferior.h"
 #include "gdbthread.h"
 #include "dll.h"
diff --git a/gdbserver/linux-aarch32-low.cc b/gdbserver/linux-aarch32-low.cc
index 940c10fd1cf5..ca66e7f8fbc5 100644
--- a/gdbserver/linux-aarch32-low.cc
+++ b/gdbserver/linux-aarch32-low.cc
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "arch/arm.h"
 #include "arch/arm-linux.h"
 #include "linux-low.h"
diff --git a/gdbserver/linux-aarch32-tdesc.cc b/gdbserver/linux-aarch32-tdesc.cc
index 54c6f62e9965..b8987752b9f8 100644
--- a/gdbserver/linux-aarch32-tdesc.cc
+++ b/gdbserver/linux-aarch32-tdesc.cc
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 
 #include "linux-aarch32-tdesc.h"
 
diff --git a/gdbserver/linux-aarch64-ipa.cc b/gdbserver/linux-aarch64-ipa.cc
index f33374ebd6c8..99b7700ac4b9 100644
--- a/gdbserver/linux-aarch64-ipa.cc
+++ b/gdbserver/linux-aarch64-ipa.cc
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include <sys/mman.h>
 #include "tracepoint.h"
 #include <elf.h>
diff --git a/gdbserver/linux-aarch64-low.cc b/gdbserver/linux-aarch64-low.cc
index 28d75d035dcb..5df67fccd08c 100644
--- a/gdbserver/linux-aarch64-low.cc
+++ b/gdbserver/linux-aarch64-low.cc
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "linux-low.h"
 #include "nat/aarch64-linux.h"
 #include "nat/aarch64-linux-hw-point.h"
diff --git a/gdbserver/linux-aarch64-tdesc.cc b/gdbserver/linux-aarch64-tdesc.cc
index 7a41769905c4..0ed9a42cbff6 100644
--- a/gdbserver/linux-aarch64-tdesc.cc
+++ b/gdbserver/linux-aarch64-tdesc.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 
 #include "linux-aarch64-tdesc.h"
 
diff --git a/gdbserver/linux-amd64-ipa.cc b/gdbserver/linux-amd64-ipa.cc
index 54e4c9812bb3..13c8a5bb360e 100644
--- a/gdbserver/linux-amd64-ipa.cc
+++ b/gdbserver/linux-amd64-ipa.cc
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include <sys/mman.h>
 #include "tracepoint.h"
 #include "linux-x86-tdesc.h"
diff --git a/gdbserver/linux-arc-low.cc b/gdbserver/linux-arc-low.cc
index 166a4431f09f..dda224f0a74c 100644
--- a/gdbserver/linux-arc-low.cc
+++ b/gdbserver/linux-arc-low.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "regdef.h"
 #include "linux-low.h"
 #include "tdesc.h"
diff --git a/gdbserver/linux-arm-low.cc b/gdbserver/linux-arm-low.cc
index 396ec88081b9..17b64c09affd 100644
--- a/gdbserver/linux-arm-low.cc
+++ b/gdbserver/linux-arm-low.cc
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "linux-low.h"
 #include "arch/arm.h"
 #include "arch/arm-linux.h"
diff --git a/gdbserver/linux-arm-tdesc.cc b/gdbserver/linux-arm-tdesc.cc
index 24941fe667e3..559f9b0f3dc3 100644
--- a/gdbserver/linux-arm-tdesc.cc
+++ b/gdbserver/linux-arm-tdesc.cc
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 
 #include "linux-arm-tdesc.h"
 
diff --git a/gdbserver/linux-csky-low.cc b/gdbserver/linux-csky-low.cc
index 5497f7dc7a36..2eb5a2df17b9 100644
--- a/gdbserver/linux-csky-low.cc
+++ b/gdbserver/linux-csky-low.cc
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "tdesc.h"
 #include "linux-low.h"
 #include <sys/ptrace.h>
diff --git a/gdbserver/linux-i386-ipa.cc b/gdbserver/linux-i386-ipa.cc
index 2e4646f8c032..8f14e0937d40 100644
--- a/gdbserver/linux-i386-ipa.cc
+++ b/gdbserver/linux-i386-ipa.cc
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include <sys/mman.h>
 #include "tracepoint.h"
 #include "linux-x86-tdesc.h"
diff --git a/gdbserver/linux-ia64-low.cc b/gdbserver/linux-ia64-low.cc
index 7bceaadbc809..b7c3c642eb3e 100644
--- a/gdbserver/linux-ia64-low.cc
+++ b/gdbserver/linux-ia64-low.cc
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "linux-low.h"
 
 #ifdef HAVE_SYS_REG_H
diff --git a/gdbserver/linux-loongarch-low.cc b/gdbserver/linux-loongarch-low.cc
index f1e1deb878ba..584ea64a7d95 100644
--- a/gdbserver/linux-loongarch-low.cc
+++ b/gdbserver/linux-loongarch-low.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "linux-low.h"
 #include "tdesc.h"
 #include "elf/common.h"
diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc
index 9d5a62428034..d8842f0972db 100644
--- a/gdbserver/linux-low.cc
+++ b/gdbserver/linux-low.cc
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "linux-low.h"
 #include "nat/linux-osdata.h"
 #include "gdbsupport/agent.h"
diff --git a/gdbserver/linux-m68k-low.cc b/gdbserver/linux-m68k-low.cc
index 1cccb25bc53d..8020e49ac6e7 100644
--- a/gdbserver/linux-m68k-low.cc
+++ b/gdbserver/linux-m68k-low.cc
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "linux-low.h"
 
 /* Linux target op definitions for the m68k architecture.  */
diff --git a/gdbserver/linux-mips-low.cc b/gdbserver/linux-mips-low.cc
index 35f92fc24d45..6cf4a6d2d9b7 100644
--- a/gdbserver/linux-mips-low.cc
+++ b/gdbserver/linux-mips-low.cc
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "linux-low.h"
 
 #include "nat/gdb_ptrace.h"
diff --git a/gdbserver/linux-nios2-low.cc b/gdbserver/linux-nios2-low.cc
index 31868ff0a4a9..c37bb5a5da9e 100644
--- a/gdbserver/linux-nios2-low.cc
+++ b/gdbserver/linux-nios2-low.cc
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "linux-low.h"
 #include "elf/common.h"
 #include "nat/gdb_ptrace.h"
diff --git a/gdbserver/linux-or1k-low.cc b/gdbserver/linux-or1k-low.cc
index bea92516e9c7..1e0fa39358ce 100644
--- a/gdbserver/linux-or1k-low.cc
+++ b/gdbserver/linux-or1k-low.cc
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "linux-low.h"
 #include "elf/common.h"
 #include "nat/gdb_ptrace.h"
diff --git a/gdbserver/linux-ppc-ipa.cc b/gdbserver/linux-ppc-ipa.cc
index 299ef377843a..cbbfcfa19be0 100644
--- a/gdbserver/linux-ppc-ipa.cc
+++ b/gdbserver/linux-ppc-ipa.cc
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include <sys/mman.h>
 #include "tracepoint.h"
 #include "arch/ppc-linux-tdesc.h"
diff --git a/gdbserver/linux-ppc-low.cc b/gdbserver/linux-ppc-low.cc
index 5c45a3f6ecb0..bd3ac143660d 100644
--- a/gdbserver/linux-ppc-low.cc
+++ b/gdbserver/linux-ppc-low.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "linux-low.h"
 
 #include "elf/common.h"
diff --git a/gdbserver/linux-riscv-low.cc b/gdbserver/linux-riscv-low.cc
index 680e9f7a094b..c4554c507a8c 100644
--- a/gdbserver/linux-riscv-low.cc
+++ b/gdbserver/linux-riscv-low.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 
 #include "linux-low.h"
 #include "tdesc.h"
diff --git a/gdbserver/linux-s390-ipa.cc b/gdbserver/linux-s390-ipa.cc
index 56d106674457..55ce4a41d157 100644
--- a/gdbserver/linux-s390-ipa.cc
+++ b/gdbserver/linux-s390-ipa.cc
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include <sys/mman.h>
 #include "tracepoint.h"
 #include "linux-s390-tdesc.h"
diff --git a/gdbserver/linux-s390-low.cc b/gdbserver/linux-s390-low.cc
index 79937f00d6f1..ee2c192609ac 100644
--- a/gdbserver/linux-s390-low.cc
+++ b/gdbserver/linux-s390-low.cc
@@ -19,7 +19,6 @@
 
 /* This file is used for both 31-bit and 64-bit S/390 systems.  */
 
-#include "server.h"
 #include "linux-low.h"
 #include "elf/common.h"
 #include "ax.h"
diff --git a/gdbserver/linux-sh-low.cc b/gdbserver/linux-sh-low.cc
index 910b6a0e2e9e..64e6de3480bc 100644
--- a/gdbserver/linux-sh-low.cc
+++ b/gdbserver/linux-sh-low.cc
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "linux-low.h"
 
 /* Linux target op definitions for the SH architecture.  */
diff --git a/gdbserver/linux-sparc-low.cc b/gdbserver/linux-sparc-low.cc
index 8e3960a5fa7e..4192bd3984ef 100644
--- a/gdbserver/linux-sparc-low.cc
+++ b/gdbserver/linux-sparc-low.cc
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "linux-low.h"
 
 #include "nat/gdb_ptrace.h"
diff --git a/gdbserver/linux-tic6x-low.cc b/gdbserver/linux-tic6x-low.cc
index 7c961901dd10..707be2e7b0f9 100644
--- a/gdbserver/linux-tic6x-low.cc
+++ b/gdbserver/linux-tic6x-low.cc
@@ -19,7 +19,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "linux-low.h"
 #include "arch/tic6x.h"
 #include "tdesc.h"
diff --git a/gdbserver/linux-x86-low.cc b/gdbserver/linux-x86-low.cc
index 933d1fb012a1..2532603451af 100644
--- a/gdbserver/linux-x86-low.cc
+++ b/gdbserver/linux-x86-low.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include <signal.h>
 #include <limits.h>
 #include <inttypes.h>
diff --git a/gdbserver/linux-x86-tdesc.cc b/gdbserver/linux-x86-tdesc.cc
index 626207fc477a..cd3b5d80e37e 100644
--- a/gdbserver/linux-x86-tdesc.cc
+++ b/gdbserver/linux-x86-tdesc.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "tdesc.h"
 #include "linux-x86-tdesc.h"
 #include "arch/i386.h"
diff --git a/gdbserver/linux-xtensa-low.cc b/gdbserver/linux-xtensa-low.cc
index 9ebb2e635906..b20b62e1c0d3 100644
--- a/gdbserver/linux-xtensa-low.cc
+++ b/gdbserver/linux-xtensa-low.cc
@@ -17,7 +17,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include "server.h"
 #include "linux-low.h"
 
 /* Linux target op definitions for the Xtensa architecture.  */
diff --git a/gdbserver/mem-break.cc b/gdbserver/mem-break.cc
index c23bb46c666a..eebf999c223d 100644
--- a/gdbserver/mem-break.cc
+++ b/gdbserver/mem-break.cc
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "regcache.h"
 #include "ax.h"
 
diff --git a/gdbserver/netbsd-aarch64-low.cc b/gdbserver/netbsd-aarch64-low.cc
index cfb1bb7914b0..f20a1a717733 100644
--- a/gdbserver/netbsd-aarch64-low.cc
+++ b/gdbserver/netbsd-aarch64-low.cc
@@ -19,7 +19,6 @@
 #include <sys/ptrace.h>
 #include <limits.h>
 
-#include "server.h"
 #include "netbsd-low.h"
 #include "arch/aarch64.h"
 #include "arch/aarch64-insn.h"
diff --git a/gdbserver/netbsd-amd64-low.cc b/gdbserver/netbsd-amd64-low.cc
index 5555e0ba3070..2c8c7113f7dd 100644
--- a/gdbserver/netbsd-amd64-low.cc
+++ b/gdbserver/netbsd-amd64-low.cc
@@ -19,7 +19,6 @@
 #include <sys/ptrace.h>
 #include <limits.h>
 
-#include "server.h"
 #include "netbsd-low.h"
 #include "gdbsupport/x86-xstate.h"
 #include "arch/amd64.h"
diff --git a/gdbserver/netbsd-i386-low.cc b/gdbserver/netbsd-i386-low.cc
index a694609d50df..247a39797c41 100644
--- a/gdbserver/netbsd-i386-low.cc
+++ b/gdbserver/netbsd-i386-low.cc
@@ -19,7 +19,6 @@
 #include <sys/ptrace.h>
 #include <limits.h>
 
-#include "server.h"
 #include "netbsd-low.h"
 #include "gdbsupport/x86-xstate.h"
 #include "arch/i386.h"
diff --git a/gdbserver/netbsd-low.cc b/gdbserver/netbsd-low.cc
index bcb1bd97170f..4b58826e0914 100644
--- a/gdbserver/netbsd-low.cc
+++ b/gdbserver/netbsd-low.cc
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "target.h"
 #include "netbsd-low.h"
 #include "nat/netbsd-nat.h"
diff --git a/gdbserver/notif.cc b/gdbserver/notif.cc
index 25e40a3c6b61..dac3c3b1bab0 100644
--- a/gdbserver/notif.cc
+++ b/gdbserver/notif.cc
@@ -47,7 +47,6 @@
 
    # 3 is done by function 'handle_notif_ack'.  */
 
-#include "server.h"
 #include "notif.h"
 
 static struct notif_server *notifs[] =
diff --git a/gdbserver/proc-service.cc b/gdbserver/proc-service.cc
index 40a0c7c43bfc..0a332b52d56b 100644
--- a/gdbserver/proc-service.cc
+++ b/gdbserver/proc-service.cc
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 
 /* This file is currently tied to GNU/Linux.  It should scale well to
    another libthread_db implementation, with the appropriate gdbserver
diff --git a/gdbserver/regcache.cc b/gdbserver/regcache.cc
index 55d14239e816..1bb71d103288 100644
--- a/gdbserver/regcache.cc
+++ b/gdbserver/regcache.cc
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "regdef.h"
 #include "gdbthread.h"
 #include "tdesc.h"
diff --git a/gdbserver/remote-utils.cc b/gdbserver/remote-utils.cc
index 959557534013..5a8eb9ae52ae 100644
--- a/gdbserver/remote-utils.cc
+++ b/gdbserver/remote-utils.cc
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #if HAVE_TERMIOS_H
 #include <termios.h>
 #endif
diff --git a/gdbserver/server.cc b/gdbserver/server.cc
index 74c7763d777a..c7d5cc1c1b0a 100644
--- a/gdbserver/server.cc
+++ b/gdbserver/server.cc
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "gdbthread.h"
 #include "gdbsupport/agent.h"
 #include "notif.h"
diff --git a/gdbserver/symbol.cc b/gdbserver/symbol.cc
index 90945dcd35dc..435acc71978f 100644
--- a/gdbserver/symbol.cc
+++ b/gdbserver/symbol.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "gdbsupport/symbol.h"
 
 /* See gdbsupport/symbol.h.  */
diff --git a/gdbserver/target.cc b/gdbserver/target.cc
index 23b699d33bb9..6db32da2e959 100644
--- a/gdbserver/target.cc
+++ b/gdbserver/target.cc
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "tracepoint.h"
 #include "gdbsupport/byte-vector.h"
 #include "hostio.h"
diff --git a/gdbserver/tdesc.cc b/gdbserver/tdesc.cc
index aff6f53029a3..3265793da962 100644
--- a/gdbserver/tdesc.cc
+++ b/gdbserver/tdesc.cc
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "tdesc.h"
 #include "regdef.h"
 
diff --git a/gdbserver/thread-db.cc b/gdbserver/thread-db.cc
index d08c0f752632..8cef84206b8b 100644
--- a/gdbserver/thread-db.cc
+++ b/gdbserver/thread-db.cc
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 
 #include "linux-low.h"
 
diff --git a/gdbserver/tracepoint.cc b/gdbserver/tracepoint.cc
index 461fa8fa1c55..b7d0ef2c2932 100644
--- a/gdbserver/tracepoint.cc
+++ b/gdbserver/tracepoint.cc
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "tracepoint.h"
 #include "gdbthread.h"
 #include "gdbsupport/rsp-low.h"
diff --git a/gdbserver/utils.cc b/gdbserver/utils.cc
index 11902f7c3fd5..3d3144e33da3 100644
--- a/gdbserver/utils.cc
+++ b/gdbserver/utils.cc
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 
 #ifdef IN_PROCESS_AGENT
 #  define PREFIX "ipa: "
diff --git a/gdbserver/win32-i386-low.cc b/gdbserver/win32-i386-low.cc
index 44490300b693..0a761ca58ef3 100644
--- a/gdbserver/win32-i386-low.cc
+++ b/gdbserver/win32-i386-low.cc
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "win32-low.h"
 #include "x86-low.h"
 #include "gdbsupport/x86-xstate.h"
diff --git a/gdbserver/win32-low.cc b/gdbserver/win32-low.cc
index 58e8b089f2e4..f672e542d1bc 100644
--- a/gdbserver/win32-low.cc
+++ b/gdbserver/win32-low.cc
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "regcache.h"
 #include "gdbsupport/fileio.h"
 #include "mem-break.h"
diff --git a/gdbserver/x86-low.cc b/gdbserver/x86-low.cc
index 11d9028992c3..c59b31b78f79 100644
--- a/gdbserver/x86-low.cc
+++ b/gdbserver/x86-low.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "server.h"
 #include "x86-low.h"
 
 /* Clear the reference counts and forget everything we knew about the
diff --git a/gdbsupport/agent.cc b/gdbsupport/agent.cc
index 862582c78887..c70b59a4c839 100644
--- a/gdbsupport/agent.cc
+++ b/gdbsupport/agent.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "target/target.h"
 #include "gdbsupport/symbol.h"
 #include <unistd.h>
diff --git a/gdbsupport/btrace-common.cc b/gdbsupport/btrace-common.cc
index 2d54e8ba82d7..2358a9fab338 100644
--- a/gdbsupport/btrace-common.cc
+++ b/gdbsupport/btrace-common.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "btrace-common.h"
 
 
diff --git a/gdbsupport/cleanups.cc b/gdbsupport/cleanups.cc
index cc14523b2d1a..6362ea24e7c2 100644
--- a/gdbsupport/cleanups.cc
+++ b/gdbsupport/cleanups.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "cleanups.h"
 #include <vector>
 
diff --git a/gdbsupport/common-debug.cc b/gdbsupport/common-debug.cc
index 9a5309f1e721..c4d95287271d 100644
--- a/gdbsupport/common-debug.cc
+++ b/gdbsupport/common-debug.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "common-debug.h"
 
 /* See gdbsupport/common-debug.h.  */
diff --git a/gdbsupport/common-exceptions.cc b/gdbsupport/common-exceptions.cc
index 0caed27434e5..5aa16129b02b 100644
--- a/gdbsupport/common-exceptions.cc
+++ b/gdbsupport/common-exceptions.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "common-exceptions.h"
 #include <forward_list>
 
diff --git a/gdbsupport/common-inferior.cc b/gdbsupport/common-inferior.cc
index e9824dfcd36d..4211e049ba7d 100644
--- a/gdbsupport/common-inferior.cc
+++ b/gdbsupport/common-inferior.cc
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "gdbsupport/common-inferior.h"
 
 /* See common-inferior.h.  */
diff --git a/gdbsupport/common-regcache.cc b/gdbsupport/common-regcache.cc
index 9baca3197d10..525bb5ce7056 100644
--- a/gdbsupport/common-regcache.cc
+++ b/gdbsupport/common-regcache.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "common-regcache.h"
 
 /* Return the register's value or throw if it's not available.  */
diff --git a/gdbsupport/common-utils.cc b/gdbsupport/common-utils.cc
index 99b9cb8609bb..91c14a0f139f 100644
--- a/gdbsupport/common-utils.cc
+++ b/gdbsupport/common-utils.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "common-utils.h"
 #include "host-defs.h"
 #include "gdbsupport/gdb-safe-ctype.h"
diff --git a/gdbsupport/environ.cc b/gdbsupport/environ.cc
index f7984c565cb5..1b6ca61ee804 100644
--- a/gdbsupport/environ.cc
+++ b/gdbsupport/environ.cc
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "environ.h"
 #include <algorithm>
 #include <utility>
diff --git a/gdbsupport/errors.cc b/gdbsupport/errors.cc
index cccdc5cafb24..c11229aa0d7b 100644
--- a/gdbsupport/errors.cc
+++ b/gdbsupport/errors.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "errors.h"
 #if defined (USE_WIN32API) || defined(__CYGWIN__)
 #include <windows.h>
diff --git a/gdbsupport/event-loop.cc b/gdbsupport/event-loop.cc
index 0ab6974b8769..b18a9fdaac0a 100644
--- a/gdbsupport/event-loop.cc
+++ b/gdbsupport/event-loop.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "gdbsupport/event-loop.h"
 
 #include <chrono>
diff --git a/gdbsupport/event-pipe.cc b/gdbsupport/event-pipe.cc
index 7e8e8d63683f..af6c943284fc 100644
--- a/gdbsupport/event-pipe.cc
+++ b/gdbsupport/event-pipe.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 #include "gdbsupport/event-pipe.h"
 #include "gdbsupport/filestuff.h"
 
diff --git a/gdbsupport/fileio.cc b/gdbsupport/fileio.cc
index 26fa6fd616eb..b115e33b581e 100644
--- a/gdbsupport/fileio.cc
+++ b/gdbsupport/fileio.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "fileio.h"
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/gdbsupport/filestuff.cc b/gdbsupport/filestuff.cc
index 9d3b417359b1..5c427e11b02a 100644
--- a/gdbsupport/filestuff.cc
+++ b/gdbsupport/filestuff.cc
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "filestuff.h"
 #include "gdb_vecs.h"
 #include <fcntl.h>
diff --git a/gdbsupport/format.cc b/gdbsupport/format.cc
index 4e228a95ea87..12173eeba300 100644
--- a/gdbsupport/format.cc
+++ b/gdbsupport/format.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "format.h"
 
 format_pieces::format_pieces (const char **arg, bool gdb_extensions,
diff --git a/gdbsupport/gdb-dlfcn.cc b/gdbsupport/gdb-dlfcn.cc
index d8dbabd336de..1a8289ace742 100644
--- a/gdbsupport/gdb-dlfcn.cc
+++ b/gdbsupport/gdb-dlfcn.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "gdb-dlfcn.h"
 
 #ifdef HAVE_DLFCN_H
diff --git a/gdbsupport/gdb-hashtab.cc b/gdbsupport/gdb-hashtab.cc
index 7ef41cc332db..42f80faa403e 100644
--- a/gdbsupport/gdb-hashtab.cc
+++ b/gdbsupport/gdb-hashtab.cc
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "gdb-hashtab.h"
 
 /* Allocation function for the libiberty hash table which uses an
diff --git a/gdbsupport/gdb_obstack.cc b/gdbsupport/gdb_obstack.cc
index 8bbd64fb6fae..f24b4fc998b5 100644
--- a/gdbsupport/gdb_obstack.cc
+++ b/gdbsupport/gdb_obstack.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "gdb_obstack.h"
 
 /* Concatenate NULL terminated variable argument list of `const char *'
diff --git a/gdbsupport/gdb_regex.cc b/gdbsupport/gdb_regex.cc
index 4c50c4fadef7..5570a1435c72 100644
--- a/gdbsupport/gdb_regex.cc
+++ b/gdbsupport/gdb_regex.cc
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "gdb_regex.h"
 #include "gdbsupport/def-vector.h"
 
diff --git a/gdbsupport/gdb_tilde_expand.cc b/gdbsupport/gdb_tilde_expand.cc
index 8aa4fa02ec2c..4a0a5734ad86 100644
--- a/gdbsupport/gdb_tilde_expand.cc
+++ b/gdbsupport/gdb_tilde_expand.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include <algorithm>
 #include "filenames.h"
 #include "gdb_tilde_expand.h"
diff --git a/gdbsupport/gdb_vecs.cc b/gdbsupport/gdb_vecs.cc
index 8b7f4fb91463..71c730876d6e 100644
--- a/gdbsupport/gdb_vecs.cc
+++ b/gdbsupport/gdb_vecs.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "gdb_vecs.h"
 #include "host-defs.h"
 
diff --git a/gdbsupport/gdb_wait.cc b/gdbsupport/gdb_wait.cc
index 5c1c42495875..476861db2288 100644
--- a/gdbsupport/gdb_wait.cc
+++ b/gdbsupport/gdb_wait.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 
 #include "gdb_wait.h"
 
diff --git a/gdbsupport/job-control.cc b/gdbsupport/job-control.cc
index 7637cc5988f9..eff196dfdc85 100644
--- a/gdbsupport/job-control.cc
+++ b/gdbsupport/job-control.cc
@@ -18,7 +18,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "job-control.h"
 #ifdef HAVE_TERMIOS_H
 #include <termios.h>
diff --git a/gdbsupport/netstuff.cc b/gdbsupport/netstuff.cc
index af00f9cb8606..73f1d3b4dcb8 100644
--- a/gdbsupport/netstuff.cc
+++ b/gdbsupport/netstuff.cc
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "netstuff.h"
 #include <algorithm>
 
diff --git a/gdbsupport/new-op.cc b/gdbsupport/new-op.cc
index 3d3fa999bf11..23ab0bb90aa9 100644
--- a/gdbsupport/new-op.cc
+++ b/gdbsupport/new-op.cc
@@ -23,7 +23,6 @@
 #endif
 
 #if !__has_feature(address_sanitizer) && !defined(__SANITIZE_ADDRESS__)
-#include "common-defs.h"
 #include "host-defs.h"
 #include <new>
 
diff --git a/gdbsupport/pathstuff.cc b/gdbsupport/pathstuff.cc
index f40df1150e01..9c3816ccc630 100644
--- a/gdbsupport/pathstuff.cc
+++ b/gdbsupport/pathstuff.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "pathstuff.h"
 #include "host-defs.h"
 #include "filenames.h"
diff --git a/gdbsupport/print-utils.cc b/gdbsupport/print-utils.cc
index 1fdaf4d745a0..565a4791675f 100644
--- a/gdbsupport/print-utils.cc
+++ b/gdbsupport/print-utils.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "print-utils.h"
 /* Temporary storage using circular buffer.  */
 
diff --git a/gdbsupport/ptid.cc b/gdbsupport/ptid.cc
index 08866ef90e61..56daf92d4a9b 100644
--- a/gdbsupport/ptid.cc
+++ b/gdbsupport/ptid.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "ptid.h"
 #include "print-utils.h"
 
diff --git a/gdbsupport/rsp-low.cc b/gdbsupport/rsp-low.cc
index 37dce9d5c747..20f249f642d5 100644
--- a/gdbsupport/rsp-low.cc
+++ b/gdbsupport/rsp-low.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "rsp-low.h"
 
 /* See rsp-low.h.  */
diff --git a/gdbsupport/run-time-clock.cc b/gdbsupport/run-time-clock.cc
index 4e0f9802de2b..f754b03f0466 100644
--- a/gdbsupport/run-time-clock.cc
+++ b/gdbsupport/run-time-clock.cc
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "run-time-clock.h"
 #if defined HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
diff --git a/gdbsupport/safe-strerror.cc b/gdbsupport/safe-strerror.cc
index 68899dfbdaad..54b3b857d4dc 100644
--- a/gdbsupport/safe-strerror.cc
+++ b/gdbsupport/safe-strerror.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include <string.h>
 
 /* There are two different versions of strerror_r; one is GNU-specific, the
diff --git a/gdbsupport/scoped_mmap.cc b/gdbsupport/scoped_mmap.cc
index 4f70ac65ec7c..c5c527b4fd4f 100644
--- a/gdbsupport/scoped_mmap.cc
+++ b/gdbsupport/scoped_mmap.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "scoped_mmap.h"
 #include "scoped_fd.h"
 #include "gdbsupport/filestuff.h"
diff --git a/gdbsupport/search.cc b/gdbsupport/search.cc
index 896aed5e6956..6c52643a4f3f 100644
--- a/gdbsupport/search.cc
+++ b/gdbsupport/search.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "gdbsupport/common-defs.h"
 
 #include "gdbsupport/search.h"
 #include "gdbsupport/byte-vector.h"
diff --git a/gdbsupport/selftest.cc b/gdbsupport/selftest.cc
index 1e6d07f287af..d3bed68038a9 100644
--- a/gdbsupport/selftest.cc
+++ b/gdbsupport/selftest.cc
@@ -16,7 +16,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "common-exceptions.h"
 #include "common-debug.h"
 #include "selftest.h"
diff --git a/gdbsupport/signals-state-save-restore.cc b/gdbsupport/signals-state-save-restore.cc
index 307e238307fb..60724f95c87e 100644
--- a/gdbsupport/signals-state-save-restore.cc
+++ b/gdbsupport/signals-state-save-restore.cc
@@ -15,7 +15,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "signals-state-save-restore.h"
 #include "gdbsupport/gdb-sigmask.h"
 
diff --git a/gdbsupport/signals.cc b/gdbsupport/signals.cc
index 782b4904f917..4989b3fc28bd 100644
--- a/gdbsupport/signals.cc
+++ b/gdbsupport/signals.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 
 #ifdef HAVE_SIGNAL_H
 #include <signal.h>
diff --git a/gdbsupport/task-group.cc b/gdbsupport/task-group.cc
index 6844d8594e3e..e29ed25e0d35 100644
--- a/gdbsupport/task-group.cc
+++ b/gdbsupport/task-group.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "task-group.h"
 #include "thread-pool.h"
 
diff --git a/gdbsupport/tdesc.cc b/gdbsupport/tdesc.cc
index 1ee3e1f7c2ec..080d39c485dc 100644
--- a/gdbsupport/tdesc.cc
+++ b/gdbsupport/tdesc.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "gdbsupport/tdesc.h"
 
 tdesc_reg::tdesc_reg (struct tdesc_feature *feature, const std::string &name_,
diff --git a/gdbsupport/thread-pool.cc b/gdbsupport/thread-pool.cc
index 1b46b68e12ee..04a203444204 100644
--- a/gdbsupport/thread-pool.cc
+++ b/gdbsupport/thread-pool.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "gdbsupport/thread-pool.h"
 
 #if CXX_STD_THREAD
diff --git a/gdbsupport/xml-utils.cc b/gdbsupport/xml-utils.cc
index 0490f21d763c..b89204cdf510 100644
--- a/gdbsupport/xml-utils.cc
+++ b/gdbsupport/xml-utils.cc
@@ -17,7 +17,6 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include "common-defs.h"
 #include "xml-utils.h"
 
 /* See xml-utils.h.  */
-- 
2.44.0


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v3 0/4] Include early include files with `-include`
  2024-03-26 19:06 [PATCH v3 0/4] Include early include files with `-include` Simon Marchi
                   ` (3 preceding siblings ...)
  2024-03-26 19:06 ` [PATCH v3 4/4] gdb, gdbserver, gdbsupport: remove includes of early headers Simon Marchi
@ 2024-03-26 19:09 ` Simon Marchi
  2024-03-26 19:56   ` Pedro Alves
  4 siblings, 1 reply; 8+ messages in thread
From: Simon Marchi @ 2024-03-26 19:09 UTC (permalink / raw)
  To: gdb-patches

On 3/26/24 3:06 PM, Simon Marchi wrote:
> This is v3 of:
> 
> https://inbox.sourceware.org/gdb-patches/20240323021648.154109-1-simon.marchi@efficios.com/T/#t
> 
> The only change in v3 concerns gdbreplay.  In patch 3, use `-include
> gdbsupport/common-defs.h` when building `gdbreplay.o`.  In patch 4,
> remove the corresponding #include in `gdbreplay.cc`.
> 
> Simon Marchi (4):
>   gdb, gdbserver, gdbsupport: reformat some Makefile variables, one
>     entry per line
>   {gdb,gdbserver}/Makefile.in: remove unnecessary intermediary variables
>   gdb, gdbserver, gdbsupport: include early header files with `-include`
>   gdb, gdbserver, gdbsupport: remove includes of early headers

Actually, there's one more change: in patch 4, make regdat.sh not output
an include for server.h.

Simon

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v3 0/4] Include early include files with `-include`
  2024-03-26 19:09 ` [PATCH v3 0/4] Include early include files with `-include` Simon Marchi
@ 2024-03-26 19:56   ` Pedro Alves
  2024-03-27  1:15     ` Simon Marchi
  0 siblings, 1 reply; 8+ messages in thread
From: Pedro Alves @ 2024-03-26 19:56 UTC (permalink / raw)
  To: Simon Marchi, gdb-patches

On 2024-03-26 19:09, Simon Marchi wrote:
> On 3/26/24 3:06 PM, Simon Marchi wrote:
>> This is v3 of:
>>
>> https://inbox.sourceware.org/gdb-patches/20240323021648.154109-1-simon.marchi@efficios.com/T/#t
>>
>> The only change in v3 concerns gdbreplay.  In patch 3, use `-include
>> gdbsupport/common-defs.h` when building `gdbreplay.o`.  In patch 4,
>> remove the corresponding #include in `gdbreplay.cc`.
>>
>> Simon Marchi (4):
>>   gdb, gdbserver, gdbsupport: reformat some Makefile variables, one
>>     entry per line
>>   {gdb,gdbserver}/Makefile.in: remove unnecessary intermediary variables
>>   gdb, gdbserver, gdbsupport: include early header files with `-include`
>>   gdb, gdbserver, gdbsupport: remove includes of early headers
> 
> Actually, there's one more change: in patch 4, make regdat.sh not output
> an include for server.h.
> 

Thanks, LGTM.

Approved-By: Pedro Alves <pedro@palves.net>


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v3 0/4] Include early include files with `-include`
  2024-03-26 19:56   ` Pedro Alves
@ 2024-03-27  1:15     ` Simon Marchi
  0 siblings, 0 replies; 8+ messages in thread
From: Simon Marchi @ 2024-03-27  1:15 UTC (permalink / raw)
  To: Pedro Alves, Simon Marchi, gdb-patches



On 2024-03-26 15:56, Pedro Alves wrote:
> On 2024-03-26 19:09, Simon Marchi wrote:
>> On 3/26/24 3:06 PM, Simon Marchi wrote:
>>> This is v3 of:
>>>
>>> https://inbox.sourceware.org/gdb-patches/20240323021648.154109-1-simon.marchi@efficios.com/T/#t
>>>
>>> The only change in v3 concerns gdbreplay.  In patch 3, use `-include
>>> gdbsupport/common-defs.h` when building `gdbreplay.o`.  In patch 4,
>>> remove the corresponding #include in `gdbreplay.cc`.
>>>
>>> Simon Marchi (4):
>>>   gdb, gdbserver, gdbsupport: reformat some Makefile variables, one
>>>     entry per line
>>>   {gdb,gdbserver}/Makefile.in: remove unnecessary intermediary variables
>>>   gdb, gdbserver, gdbsupport: include early header files with `-include`
>>>   gdb, gdbserver, gdbsupport: remove includes of early headers
>>
>> Actually, there's one more change: in patch 4, make regdat.sh not output
>> an include for server.h.
>>
> 
> Thanks, LGTM.
> 
> Approved-By: Pedro Alves <pedro@palves.net>
> 

Thanks, pushed.  Let's hope it doesn't break some obscure config.

I'll go over the `C/C++ Coding Standards` wiki page and update what
needs to be updated.

Simon

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2024-03-27  1:15 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-26 19:06 [PATCH v3 0/4] Include early include files with `-include` Simon Marchi
2024-03-26 19:06 ` [PATCH v3 1/4] gdb, gdbserver, gdbsupport: reformat some Makefile variables, one entry per line Simon Marchi
2024-03-26 19:06 ` [PATCH v3 2/4] {gdb, gdbserver}/Makefile.in: remove unnecessary intermediary variables Simon Marchi
2024-03-26 19:06 ` [PATCH v3 3/4] gdb, gdbserver, gdbsupport: include early header files with `-include` Simon Marchi
2024-03-26 19:06 ` [PATCH v3 4/4] gdb, gdbserver, gdbsupport: remove includes of early headers Simon Marchi
2024-03-26 19:09 ` [PATCH v3 0/4] Include early include files with `-include` Simon Marchi
2024-03-26 19:56   ` Pedro Alves
2024-03-27  1:15     ` Simon Marchi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox