public inbox for gdb-patches@sourceware.org
 help / color / mirror / Atom feed
* [PATCH v2 0/4] Add include guard checker and reformatter
@ 2024-04-18 15:41 Tom Tromey
  2024-04-18 15:41 ` [PATCH v2 1/4] Fix some minor header file irregularities Tom Tromey
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: Tom Tromey @ 2024-04-18 15:41 UTC (permalink / raw)
  To: gdb-patches

After the recent patch to fix an include guard misspelling, I thought
I'd write a script to automatically check this.  Then I realized I
could have the script fix up the sources; and finally I figured out
that it could be run from pre-commit.

This series is the result.  Regression tested on x86-64 Fedora 38.

Also, it occurs to me now that we could add pre-commit hooks for other
maintainer scripts, like gdbarch.py.  I can look into that if it
sounds interesting.

---
Changes in v2:
- Changed script to not emit errors when updating files
- Don't crash on empty headers
- Addressed Simon's review comments
- Link to v1: https://inbox.sourceware.org/gdb-patches/20240417-header-check-v1-0-a60f610f5bcc@adacore.com

---
Tom Tromey (4):
      Fix some minor header file irregularities
      Add an include-checking script
      Add check-include-guards.py to pre-commit
      Run check-include-guards.py

 .pre-commit-config.yaml                     |   7 ++
 gdb/aarch32-linux-nat.h                     |   6 +-
 gdb/aarch32-tdep.h                          |   6 +-
 gdb/aarch64-fbsd-tdep.h                     |   6 +-
 gdb/aarch64-linux-tdep.h                    |   6 +-
 gdb/aarch64-nat.h                           |   6 +-
 gdb/aarch64-ravenscar-thread.h              |   6 +-
 gdb/aarch64-tdep.h                          |   6 +-
 gdb/ada-exp.h                               |   6 +-
 gdb/ada-lang.h                              |   6 +-
 gdb/addrmap.h                               |   6 +-
 gdb/alpha-bsd-tdep.h                        |   6 +-
 gdb/alpha-tdep.h                            |   6 +-
 gdb/amd-dbgapi-target.h                     |   6 +-
 gdb/amd64-bsd-nat.h                         |   6 +-
 gdb/amd64-darwin-tdep.h                     |   6 +-
 gdb/amd64-fbsd-tdep.h                       |   6 +-
 gdb/amd64-linux-tdep.h                      |   6 +-
 gdb/amd64-nat.h                             |   6 +-
 gdb/amd64-ravenscar-thread.h                |   6 +-
 gdb/amd64-tdep.h                            |   6 +-
 gdb/amdgpu-tdep.h                           |   6 +-
 gdb/annotate.h                              |   6 +-
 gdb/arc-linux-tdep.h                        |   6 +-
 gdb/arc-tdep.h                              |   6 +-
 gdb/arch-utils.h                            |   6 +-
 gdb/arch/aarch32.h                          |   6 +-
 gdb/arch/aarch64-insn.h                     |   6 +-
 gdb/arch/aarch64-mte-linux.h                |   6 +-
 gdb/arch/aarch64-scalable-linux.h           |   6 +-
 gdb/arch/aarch64.h                          |   6 +-
 gdb/arch/amd64.h                            |   6 +-
 gdb/arch/arc.h                              |   6 +-
 gdb/arch/arm-get-next-pcs.h                 |   6 +-
 gdb/arch/arm-linux.h                        |   6 +-
 gdb/arch/arm.h                              |   6 +-
 gdb/arch/csky.h                             |   6 +-
 gdb/arch/i386.h                             |   6 +-
 gdb/arch/loongarch.h                        |   6 +-
 gdb/arch/ppc-linux-common.h                 |   6 +-
 gdb/arch/ppc-linux-tdesc.h                  |   6 +-
 gdb/arch/riscv.h                            |   6 +-
 gdb/arch/tic6x.h                            |   6 +-
 gdb/arch/xtensa.h                           |   6 +-
 gdb/arm-fbsd-tdep.h                         |   6 +-
 gdb/arm-linux-tdep.h                        |   6 +-
 gdb/arm-netbsd-tdep.h                       |   6 +-
 gdb/arm-tdep.h                              |   6 +-
 gdb/async-event.h                           |   6 +-
 gdb/auto-load.h                             |   6 +-
 gdb/auxv.h                                  |   6 +-
 gdb/ax-gdb.h                                |   6 +-
 gdb/ax.h                                    |   6 +-
 gdb/bcache.h                                |   6 +-
 gdb/bfd-target.h                            |   6 +-
 gdb/bfin-tdep.h                             |   6 +-
 gdb/block.h                                 |   6 +-
 gdb/breakpoint.h                            |   6 +-
 gdb/bsd-kvm.h                               |   6 +-
 gdb/bsd-uthread.h                           |   6 +-
 gdb/bt-utils.h                              |   6 +-
 gdb/btrace.h                                |   6 +-
 gdb/build-id.h                              |   6 +-
 gdb/buildsym-legacy.h                       |   6 +-
 gdb/buildsym.h                              |   6 +-
 gdb/c-exp.h                                 |   6 +-
 gdb/c-lang.h                                |   6 +-
 gdb/c-support.h                             |   6 +-
 gdb/cgen-remap.h                            |   6 +-
 gdb/charset-list.h                          |   6 +-
 gdb/charset.h                               |   6 +-
 gdb/check-include-guards.py                 | 110 ++++++++++++++++++++++++++++
 gdb/cli-out.h                               |   6 +-
 gdb/cli/cli-cmds.h                          |   6 +-
 gdb/cli/cli-decode.h                        |   6 +-
 gdb/cli/cli-interp.h                        |   6 +-
 gdb/cli/cli-option.h                        |   6 +-
 gdb/cli/cli-script.h                        |   6 +-
 gdb/cli/cli-setshow.h                       |   6 +-
 gdb/cli/cli-style.h                         |   6 +-
 gdb/cli/cli-utils.h                         |   6 +-
 gdb/coff-pe-read.h                          |   6 +-
 gdb/command.h                               |   6 +-
 gdb/compile/compile-c.h                     |   6 +-
 gdb/compile/compile-cplus.h                 |   6 +-
 gdb/compile/compile-internal.h              |   6 +-
 gdb/compile/compile-object-load.h           |   6 +-
 gdb/compile/compile-object-run.h            |   6 +-
 gdb/compile/compile.h                       |   6 +-
 gdb/compile/gcc-c-plugin.h                  |   6 +-
 gdb/compile/gcc-cp-plugin.h                 |   6 +-
 gdb/complaints.h                            |   6 +-
 gdb/completer.h                             |   6 +-
 gdb/config/nm-linux.h                       |   6 +-
 gdb/config/nm-nto.h                         |   6 +-
 gdb/cp-abi.h                                |   6 +-
 gdb/cp-support.h                            |   6 +-
 gdb/cris-tdep.h                             |   6 +-
 gdb/csky-tdep.h                             |   6 +-
 gdb/ctfread.h                               |   6 +-
 gdb/d-lang.h                                |   6 +-
 gdb/darwin-nat.h                            |   6 +-
 gdb/dcache.h                                |   6 +-
 gdb/debuginfod-support.h                    |   6 +-
 gdb/defs.h                                  |   6 +-
 gdb/dicos-tdep.h                            |   6 +-
 gdb/dictionary.h                            |   6 +-
 gdb/disasm-flags.h                          |   7 +-
 gdb/disasm.h                                |   6 +-
 gdb/displaced-stepping.h                    |   6 +-
 gdb/dummy-frame.h                           |   6 +-
 gdb/dwarf2/call-site.h                      |   6 +-
 gdb/dwarf2/comp-unit-head.h                 |   6 +-
 gdb/dwarf2/expr.h                           |   6 +-
 gdb/dwarf2/frame-tailcall.h                 |   6 +-
 gdb/dwarf2/frame.h                          |   6 +-
 gdb/dwarf2/index-cache.h                    |   6 +-
 gdb/dwarf2/index-common.h                   |   6 +-
 gdb/dwarf2/index-write.h                    |   6 +-
 gdb/dwarf2/line-header.h                    |   6 +-
 gdb/dwarf2/loc.h                            |   6 +-
 gdb/dwarf2/public.h                         |   6 +-
 gdb/dwarf2/read-debug-names.h               |   6 +-
 gdb/dwarf2/read-gdb-index.h                 |   6 +-
 gdb/dwarf2/read.h                           |   6 +-
 gdb/dwarf2/types.h                          |   6 +-
 gdb/elf-none-tdep.h                         |   6 +-
 gdb/event-top.h                             |   6 +-
 gdb/exceptions.h                            |   6 +-
 gdb/exec.h                                  |   6 +-
 gdb/expop.h                                 |   6 +-
 gdb/expression.h                            |   6 +-
 gdb/extension-priv.h                        |   6 +-
 gdb/extension.h                             |   6 +-
 gdb/f-array-walker.h                        |   6 +-
 gdb/f-exp.h                                 |   6 +-
 gdb/f-lang.h                                |   6 +-
 gdb/fbsd-nat.h                              |   6 +-
 gdb/fbsd-tdep.h                             |   6 +-
 gdb/filename-seen-cache.h                   |   6 +-
 gdb/filesystem.h                            |   6 +-
 gdb/frame-base.h                            |   6 +-
 gdb/frame-id.h                              |   4 +-
 gdb/frame-unwind.h                          |   6 +-
 gdb/frame.h                                 |   6 +-
 gdb/frv-tdep.h                              |   6 +-
 gdb/ft32-tdep.h                             |   6 +-
 gdb/gcore-elf.h                             |   6 +-
 gdb/gcore.h                                 |   6 +-
 gdb/gdb-demangle.h                          |   6 +-
 gdb/gdb-stabs.h                             |   6 +-
 gdb/gdb_bfd.h                               |   6 +-
 gdb/gdb_curses.h                            |   6 +-
 gdb/gdb_expat.h                             |   6 +-
 gdb/gdb_proc_service.h                      |   6 +-
 gdb/gdb_vfork.h                             |   6 +-
 gdb/gdb_wchar.h                             |   6 +-
 gdb/gdbarch.h                               |   6 +-
 gdb/gdbcmd.h                                |   6 +-
 gdb/gdbcore.h                               |   6 +-
 gdb/gdbthread.h                             |   6 +-
 gdb/gdbtypes.h                              |   7 +-
 gdb/glibc-tdep.h                            |   6 +-
 gdb/gmp-utils.h                             |   6 +-
 gdb/gnu-nat-mig.h                           |   6 +-
 gdb/gnu-nat.h                               |   6 +-
 gdb/go-lang.h                               |   6 +-
 gdb/gregset.h                               |   6 +-
 gdb/guile/guile-internal.h                  |   6 +-
 gdb/guile/guile.h                           |   6 +-
 gdb/hppa-bsd-tdep.h                         |   6 +-
 gdb/hppa-linux-offsets.h                    |   6 +-
 gdb/hppa-tdep.h                             |   6 +-
 gdb/i386-bsd-nat.h                          |   6 +-
 gdb/i386-darwin-tdep.h                      |   6 +-
 gdb/i386-fbsd-tdep.h                        |   6 +-
 gdb/i386-linux-nat.h                        |   6 +-
 gdb/i386-linux-tdep.h                       |   6 +-
 gdb/i386-tdep.h                             |   6 +-
 gdb/i387-tdep.h                             |   6 +-
 gdb/ia64-libunwind-tdep.h                   |   6 +-
 gdb/ia64-tdep.h                             |   6 +-
 gdb/inf-child.h                             |   6 +-
 gdb/inf-loop.h                              |   6 +-
 gdb/inf-ptrace.h                            |   6 +-
 gdb/infcall.h                               |   6 +-
 gdb/inferior-iter.h                         |   6 +-
 gdb/inferior.h                              |   6 +-
 gdb/infrun.h                                |   6 +-
 gdb/inline-frame.h                          |   6 +-
 gdb/interps.h                               |   6 +-
 gdb/jit.h                                   |   6 +-
 gdb/language.h                              |   6 +-
 gdb/linespec.h                              |   6 +-
 gdb/linux-fork.h                            |   6 +-
 gdb/linux-nat-trad.h                        |   6 +-
 gdb/linux-nat.h                             |   6 +-
 gdb/linux-record.h                          |   6 +-
 gdb/linux-tdep.h                            |   6 +-
 gdb/location.h                              |   6 +-
 gdb/loongarch-tdep.h                        |   6 +-
 gdb/m2-exp.h                                |   6 +-
 gdb/m2-lang.h                               |   6 +-
 gdb/m32r-tdep.h                             |   6 +-
 gdb/m68k-tdep.h                             |   6 +-
 gdb/macroexp.h                              |   6 +-
 gdb/macroscope.h                            |   6 +-
 gdb/macrotab.h                              |   6 +-
 gdb/main.h                                  |   6 +-
 gdb/maint.h                                 |   6 +-
 gdb/mdebugread.h                            |   6 +-
 gdb/memattr.h                               |   6 +-
 gdb/memory-map.h                            |   6 +-
 gdb/memrange.h                              |   6 +-
 gdb/memtag.h                                |   6 +-
 gdb/mi/mi-cmd-break.h                       |   6 +-
 gdb/mi/mi-cmds.h                            |   6 +-
 gdb/mi/mi-common.h                          |   6 +-
 gdb/mi/mi-console.h                         |   6 +-
 gdb/mi/mi-getopt.h                          |   6 +-
 gdb/mi/mi-interp.h                          |   6 +-
 gdb/mi/mi-main.h                            |   6 +-
 gdb/mi/mi-out.h                             |   6 +-
 gdb/mi/mi-parse.h                           |   6 +-
 gdb/microblaze-tdep.h                       |   6 +-
 gdb/minsyms.h                               |   6 +-
 gdb/mips-fbsd-tdep.h                        |   6 +-
 gdb/mips-linux-tdep.h                       |   6 +-
 gdb/mips-netbsd-tdep.h                      |   6 +-
 gdb/mips-tdep.h                             |   6 +-
 gdb/mn10300-tdep.h                          |   6 +-
 gdb/moxie-tdep.h                            |   6 +-
 gdb/namespace.h                             |   6 +-
 gdb/nat/aarch64-hw-point.h                  |   6 +-
 gdb/nat/aarch64-linux-hw-point.h            |   6 +-
 gdb/nat/aarch64-linux.h                     |   6 +-
 gdb/nat/aarch64-mte-linux-ptrace.h          |   6 +-
 gdb/nat/aarch64-scalable-linux-ptrace.h     |   6 +-
 gdb/nat/aarch64-scalable-linux-sigcontext.h |   6 +-
 gdb/nat/amd64-linux-siginfo.h               |   6 +-
 gdb/nat/fork-inferior.h                     |   6 +-
 gdb/nat/gdb_ptrace.h                        |   6 +-
 gdb/nat/gdb_thread_db.h                     |   6 +-
 gdb/nat/glibc_thread_db.h                   |   6 +-
 gdb/nat/linux-btrace.h                      |   6 +-
 gdb/nat/linux-namespaces.h                  |   6 +-
 gdb/nat/linux-nat.h                         |   6 +-
 gdb/nat/linux-osdata.h                      |   6 +-
 gdb/nat/linux-personality.h                 |   6 +-
 gdb/nat/linux-procfs.h                      |   6 +-
 gdb/nat/linux-ptrace.h                      |   6 +-
 gdb/nat/linux-waitpid.h                     |   6 +-
 gdb/nat/mips-linux-watch.h                  |   6 +-
 gdb/nat/netbsd-nat.h                        |   6 +-
 gdb/nat/ppc-linux.h                         |   6 +-
 gdb/nat/riscv-linux-tdesc.h                 |   6 +-
 gdb/nat/windows-nat.h                       |   6 +-
 gdb/nat/x86-cpuid.h                         |   6 +-
 gdb/nat/x86-dregs.h                         |   6 +-
 gdb/nat/x86-gcc-cpuid.h                     |   6 +-
 gdb/nat/x86-linux-dregs.h                   |   6 +-
 gdb/nat/x86-linux.h                         |   6 +-
 gdb/nat/x86-xstate.h                        |   6 +-
 gdb/nds32-tdep.h                            |   6 +-
 gdb/netbsd-nat.h                            |   6 +-
 gdb/netbsd-tdep.h                           |   6 +-
 gdb/nios2-tdep.h                            |   6 +-
 gdb/nto-tdep.h                              |   6 +-
 gdb/objc-lang.h                             |   6 +-
 gdb/objfile-flags.h                         |   6 +-
 gdb/objfiles.h                              |   6 +-
 gdb/obsd-nat.h                              |   6 +-
 gdb/obsd-tdep.h                             |   6 +-
 gdb/observable.h                            |   6 +-
 gdb/or1k-linux-tdep.h                       |   6 +-
 gdb/or1k-tdep.h                             |   6 +-
 gdb/osabi.h                                 |   6 +-
 gdb/osdata.h                                |   6 +-
 gdb/p-lang.h                                |   6 +-
 gdb/parser-defs.h                           |   7 +-
 gdb/ppc-fbsd-tdep.h                         |   6 +-
 gdb/ppc-linux-tdep.h                        |   6 +-
 gdb/ppc-netbsd-tdep.h                       |   6 +-
 gdb/ppc-obsd-tdep.h                         |   6 +-
 gdb/ppc-ravenscar-thread.h                  |   6 +-
 gdb/ppc-tdep.h                              |   6 +-
 gdb/ppc64-tdep.h                            |   6 +-
 gdb/probe.h                                 |   6 +-
 gdb/proc-utils.h                            |   6 +-
 gdb/process-stratum-target.h                |   6 +-
 gdb/procfs.h                                |   6 +-
 gdb/producer.h                              |   6 +-
 gdb/progspace-and-thread.h                  |   6 +-
 gdb/progspace.h                             |   6 +-
 gdb/prologue-value.h                        |   6 +-
 gdb/psymtab.h                               |   6 +-
 gdb/python/py-event.h                       |   6 +-
 gdb/python/py-events.h                      |   6 +-
 gdb/python/py-instruction.h                 |   6 +-
 gdb/python/py-record-btrace.h               |   6 +-
 gdb/python/py-record-full.h                 |   6 +-
 gdb/python/py-record.h                      |   6 +-
 gdb/python/py-ref.h                         |   6 +-
 gdb/python/py-stopevent.h                   |   6 +-
 gdb/python/python-internal.h                |   6 +-
 gdb/python/python.h                         |   6 +-
 gdb/ravenscar-thread.h                      |   6 +-
 gdb/record-btrace.h                         |   6 +-
 gdb/record-full.h                           |   6 +-
 gdb/record.h                                |   6 +-
 gdb/regcache.h                              |   6 +-
 gdb/regformats/regdef.h                     |   6 +-
 gdb/reggroups.h                             |   6 +-
 gdb/registry.h                              |   6 +-
 gdb/regset.h                                |   6 +-
 gdb/remote-fileio.h                         |   6 +-
 gdb/remote-notif.h                          |   6 +-
 gdb/remote.h                                |   6 +-
 gdb/riscv-fbsd-tdep.h                       |   6 +-
 gdb/riscv-ravenscar-thread.h                |   6 +-
 gdb/riscv-tdep.h                            |   6 +-
 gdb/rs6000-aix-tdep.h                       |   6 +-
 gdb/rust-exp.h                              |   6 +-
 gdb/rust-lang.h                             |   6 +-
 gdb/s390-linux-tdep.h                       |   6 +-
 gdb/s390-tdep.h                             |   6 +-
 gdb/scoped-mock-context.h                   |   6 +-
 gdb/selftest-arch.h                         |   6 +-
 gdb/sentinel-frame.h                        |   6 +-
 gdb/ser-base.h                              |   6 +-
 gdb/ser-event.h                             |   6 +-
 gdb/ser-tcp.h                               |   6 +-
 gdb/ser-unix.h                              |   6 +-
 gdb/serial.h                                |   6 +-
 gdb/sh-tdep.h                               |   6 +-
 gdb/sim-regno.h                             |   6 +-
 gdb/skip.h                                  |   6 +-
 gdb/sol2-tdep.h                             |   6 +-
 gdb/solib-aix.h                             |   6 +-
 gdb/solib-darwin.h                          |   6 +-
 gdb/solib-dsbt.h                            |   6 +-
 gdb/solib-svr4.h                            |   6 +-
 gdb/solib-target.h                          |   6 +-
 gdb/solib.h                                 |   6 +-
 gdb/solist.h                                |   6 +-
 gdb/source-cache.h                          |   6 +-
 gdb/source.h                                |   6 +-
 gdb/sparc-nat.h                             |   6 +-
 gdb/sparc-ravenscar-thread.h                |   6 +-
 gdb/sparc-tdep.h                            |   6 +-
 gdb/sparc64-tdep.h                          |   6 +-
 gdb/stabsread.h                             |   6 +-
 gdb/stack.h                                 |   6 +-
 gdb/stap-probe.h                            |   6 +-
 gdb/symfile-add-flags.h                     |   6 +-
 gdb/symfile.h                               |   6 +-
 gdb/symtab.h                                |   6 +-
 gdb/target-connection.h                     |   6 +-
 gdb/target-dcache.h                         |   6 +-
 gdb/target-debug.h                          |   6 +-
 gdb/target-descriptions.h                   |   6 +-
 gdb/target-float.h                          |   6 +-
 gdb/target.h                                |   6 +-
 gdb/target/resume.h                         |   6 +-
 gdb/target/target.h                         |   6 +-
 gdb/target/wait.h                           |   6 +-
 gdb/target/waitstatus.h                     |   6 +-
 gdb/terminal.h                              |   6 +-
 gdb/test-target.h                           |   6 +-
 gdb/thread-fsm.h                            |   6 +-
 gdb/thread-iter.h                           |   6 +-
 gdb/tic6x-tdep.h                            |   6 +-
 gdb/tid-parse.h                             |   6 +-
 gdb/tilegx-tdep.h                           |   6 +-
 gdb/top.h                                   |   6 +-
 gdb/tracectf.h                              |   6 +-
 gdb/tracefile.h                             |  24 +++++-
 gdb/tracepoint.h                            |   6 +-
 gdb/trad-frame.h                            |   6 +-
 gdb/tramp-frame.h                           |   6 +-
 gdb/tui/tui-command.h                       |   6 +-
 gdb/tui/tui-data.h                          |   6 +-
 gdb/tui/tui-disasm.h                        |   6 +-
 gdb/tui/tui-file.h                          |   6 +-
 gdb/tui/tui-hooks.h                         |   6 +-
 gdb/tui/tui-io.h                            |   6 +-
 gdb/tui/tui-layout.h                        |   6 +-
 gdb/tui/tui-location.h                      |   6 +-
 gdb/tui/tui-regs.h                          |   6 +-
 gdb/tui/tui-source.h                        |   6 +-
 gdb/tui/tui-status.h                        |   6 +-
 gdb/tui/tui-win.h                           |   6 +-
 gdb/tui/tui-wingeneral.h                    |   6 +-
 gdb/tui/tui-winsource.h                     |   6 +-
 gdb/tui/tui.h                               |   6 +-
 gdb/type-stack.h                            |   6 +-
 gdb/typeprint.h                             |   6 +-
 gdb/ui-file.h                               |   6 +-
 gdb/ui-out.h                                |   6 +-
 gdb/ui-style.h                              |   6 +-
 gdb/ui.h                                    |   6 +-
 gdb/user-regs.h                             |   6 +-
 gdb/utils.h                                 |   6 +-
 gdb/valprint.h                              |   6 +-
 gdb/value.h                                 |   6 +-
 gdb/varobj-iter.h                           |   6 +-
 gdb/varobj.h                                |   6 +-
 gdb/vax-tdep.h                              |   6 +-
 gdb/windows-nat.h                           |   7 +-
 gdb/windows-tdep.h                          |   6 +-
 gdb/x86-bsd-nat.h                           |   6 +-
 gdb/x86-fbsd-nat.h                          |   6 +-
 gdb/x86-linux-nat.h                         |   6 +-
 gdb/x86-nat.h                               |   6 +-
 gdb/x86-tdep.h                              |   6 +-
 gdb/xcoffread.h                             |   6 +-
 gdb/xml-builtin.h                           |   6 +-
 gdb/xml-support.h                           |   6 +-
 gdb/xml-syscall.h                           |   6 +-
 gdb/xml-tdesc.h                             |   7 +-
 gdb/xtensa-tdep.h                           |   6 +-
 gdb/yy-remap.h                              |   6 +-
 gdb/z80-tdep.h                              |   6 +-
 gdbserver/linux-aarch32-tdesc.h             |   2 +-
 gdbserver/linux-arm-tdesc.h                 |   2 +-
 gdbsupport/agent.h                          |   6 +-
 gdbsupport/array-view.h                     |   6 +-
 gdbsupport/break-common.h                   |   6 +-
 gdbsupport/btrace-common.h                  |   6 +-
 gdbsupport/byte-vector.h                    |   6 +-
 gdbsupport/cleanups.h                       |   6 +-
 gdbsupport/common-debug.h                   |   6 +-
 gdbsupport/common-defs.h                    |   6 +-
 gdbsupport/common-exceptions.h              |   6 +-
 gdbsupport/common-gdbthread.h               |   6 +-
 gdbsupport/common-inferior.h                |   6 +-
 gdbsupport/common-regcache.h                |   6 +-
 gdbsupport/common-types.h                   |   6 +-
 gdbsupport/common-utils.h                   |   6 +-
 gdbsupport/def-vector.h                     |   6 +-
 gdbsupport/default-init-alloc.h             |   6 +-
 gdbsupport/enum-flags.h                     |   6 +-
 gdbsupport/environ.h                        |   6 +-
 gdbsupport/errors.h                         |   6 +-
 gdbsupport/event-loop.h                     |   6 +-
 gdbsupport/event-pipe.h                     |   6 +-
 gdbsupport/fileio.h                         |   6 +-
 gdbsupport/filestuff.h                      |   6 +-
 gdbsupport/filtered-iterator.h              |   6 +-
 gdbsupport/format.h                         |   6 +-
 gdbsupport/forward-scope-exit.h             |   6 +-
 gdbsupport/function-view.h                  |   6 +-
 gdbsupport/gdb-checked-static-cast.h        |   6 +-
 gdbsupport/gdb-dlfcn.h                      |   6 +-
 gdbsupport/gdb-safe-ctype.h                 |   6 +-
 gdbsupport/gdb_assert.h                     |   6 +-
 gdbsupport/gdb_file.h                       |   6 +-
 gdbsupport/gdb_locale.h                     |   6 +-
 gdbsupport/gdb_obstack.h                    |   6 +-
 gdbsupport/gdb_proc_service.h               |   6 +-
 gdbsupport/gdb_ref_ptr.h                    |   6 +-
 gdbsupport/gdb_regex.h                      |   6 +-
 gdbsupport/gdb_select.h                     |   6 +-
 gdbsupport/gdb_setjmp.h                     |   6 +-
 gdbsupport/gdb_signals.h                    |   6 +-
 gdbsupport/gdb_splay_tree.h                 |   6 +-
 gdbsupport/gdb_sys_time.h                   |   6 +-
 gdbsupport/gdb_tilde_expand.h               |   6 +-
 gdbsupport/gdb_unique_ptr.h                 |   6 +-
 gdbsupport/gdb_unlinker.h                   |   6 +-
 gdbsupport/gdb_vecs.h                       |   6 +-
 gdbsupport/gdb_wait.h                       |   6 +-
 gdbsupport/hash_enum.h                      |   6 +-
 gdbsupport/host-defs.h                      |   6 +-
 gdbsupport/job-control.h                    |   6 +-
 gdbsupport/netstuff.h                       |   6 +-
 gdbsupport/next-iterator.h                  |   6 +-
 gdbsupport/observable.h                     |   6 +-
 gdbsupport/offset-type.h                    |   6 +-
 gdbsupport/packed.h                         |   6 +-
 gdbsupport/pathstuff.h                      |   6 +-
 gdbsupport/poison.h                         |   6 +-
 gdbsupport/preprocessor.h                   |   6 +-
 gdbsupport/print-utils.h                    |   6 +-
 gdbsupport/ptid.h                           |   6 +-
 gdbsupport/refcounted-object.h              |   6 +-
 gdbsupport/rsp-low.h                        |   6 +-
 gdbsupport/run-time-clock.h                 |   6 +-
 gdbsupport/safe-iterator.h                  |   6 +-
 gdbsupport/scope-exit.h                     |   6 +-
 gdbsupport/scoped_fd.h                      |   6 +-
 gdbsupport/scoped_ignore_signal.h           |   6 +-
 gdbsupport/scoped_ignore_sigttou.h          |   6 +-
 gdbsupport/scoped_mmap.h                    |   6 +-
 gdbsupport/scoped_restore.h                 |   6 +-
 gdbsupport/search.h                         |   6 +-
 gdbsupport/selftest.h                       |   6 +-
 gdbsupport/signals-state-save-restore.h     |   6 +-
 gdbsupport/symbol.h                         |   6 +-
 gdbsupport/tdesc.h                          |   6 +-
 gdbsupport/traits.h                         |   6 +-
 gdbsupport/underlying.h                     |   6 +-
 gdbsupport/valid-expr.h                     |   6 +-
 gdbsupport/version.h                        |   6 +-
 gdbsupport/x86-xstate.h                     |   6 +-
 gdbsupport/xml-utils.h                      |   6 +-
 506 files changed, 1642 insertions(+), 1512 deletions(-)
---
base-commit: c7d73a715775ade814370212726d50ab4b7c6fe0
change-id: 20240417-header-check-70c1b75fc2cf

Best regards,
-- 
Tom Tromey <tromey@adacore.com>


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

* [PATCH v2 1/4] Fix some minor header file irregularities
  2024-04-18 15:41 [PATCH v2 0/4] Add include guard checker and reformatter Tom Tromey
@ 2024-04-18 15:41 ` Tom Tromey
  2024-04-18 15:41 ` [PATCH v2 2/4] Add an include-checking script Tom Tromey
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 8+ messages in thread
From: Tom Tromey @ 2024-04-18 15:41 UTC (permalink / raw)
  To: gdb-patches

The script in the next patch noticed some irregularities in some
headers: trailing or leading blank lines, or in one case a missing
copyright header.  This patch fixes these.
---
 gdb/disasm-flags.h |  1 -
 gdb/gdbtypes.h     |  1 -
 gdb/parser-defs.h  |  1 -
 gdb/tracefile.h    | 18 ++++++++++++++++++
 gdb/windows-nat.h  |  1 -
 gdb/xml-tdesc.h    |  1 -
 6 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/gdb/disasm-flags.h b/gdb/disasm-flags.h
index 4f711259453..b2f0ec95b07 100644
--- a/gdb/disasm-flags.h
+++ b/gdb/disasm-flags.h
@@ -38,4 +38,3 @@ enum gdb_disassembly_flag : unsigned
 DEF_ENUM_FLAGS_TYPE (enum gdb_disassembly_flag, gdb_disassembly_flags);
 
 #endif /* DISASM_FLAGS_H */
-
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index f80bd7e071a..55018f2c344 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -1,4 +1,3 @@
-
 /* Internal type definitions for GDB.
 
    Copyright (C) 1992-2024 Free Software Foundation, Inc.
diff --git a/gdb/parser-defs.h b/gdb/parser-defs.h
index 5d3c1893836..9774a465ee2 100644
--- a/gdb/parser-defs.h
+++ b/gdb/parser-defs.h
@@ -390,4 +390,3 @@ extern bool fits_in_type (int n_sign, const gdb_mpz &n, int type_bits,
 extern void parser_fprintf (FILE *, const char *, ...) ATTRIBUTE_PRINTF (2, 3);
 
 #endif /* PARSER_DEFS_H */
-
diff --git a/gdb/tracefile.h b/gdb/tracefile.h
index 9c7fdea7297..90967eff855 100644
--- a/gdb/tracefile.h
+++ b/gdb/tracefile.h
@@ -1,3 +1,21 @@
+/* Tracefile declarations
+   Copyright (C) 2014-2024 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
 #ifndef TRACEFILE_H
 #define TRACEFILE_H 1
 
diff --git a/gdb/windows-nat.h b/gdb/windows-nat.h
index 5422aa064e9..3fbb1ea35df 100644
--- a/gdb/windows-nat.h
+++ b/gdb/windows-nat.h
@@ -37,4 +37,3 @@ extern const int amd64_mappings[];
 #endif
 
 #endif
-
diff --git a/gdb/xml-tdesc.h b/gdb/xml-tdesc.h
index 823dbee0f2d..cd6e79cc24f 100644
--- a/gdb/xml-tdesc.h
+++ b/gdb/xml-tdesc.h
@@ -50,4 +50,3 @@ std::optional<std::string> target_fetch_description_xml (target_ops *ops);
 const struct target_desc *string_read_description_xml (const char *xml);
 
 #endif /* XML_TDESC_H */
-

-- 
2.43.0


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

* [PATCH v2 2/4] Add an include-checking script
  2024-04-18 15:41 [PATCH v2 0/4] Add include guard checker and reformatter Tom Tromey
  2024-04-18 15:41 ` [PATCH v2 1/4] Fix some minor header file irregularities Tom Tromey
@ 2024-04-18 15:41 ` Tom Tromey
  2024-04-18 19:25   ` Simon Marchi
  2024-04-18 15:41 ` [PATCH v2 3/4] Add check-include-guards.py to pre-commit Tom Tromey
  2024-04-18 15:41 ` [PATCH v2 4/4] Run check-include-guards.py Tom Tromey
  3 siblings, 1 reply; 8+ messages in thread
From: Tom Tromey @ 2024-04-18 15:41 UTC (permalink / raw)
  To: gdb-patches

This adds a new Python script that checks the header guards of all gdb
source files.  It enforces a fairly strict formatting and naming
scheme.

In particular, for a file "x/y-z.h" (relative to the repository root),
the include guard will be named "X_Y_Z_H".  Only the '#ifndef' form is
allowed, not "#if !defined(...)".  The trailing comment on the
"#endif" is also required.

The script also tries to update files that appear to have the required
lines if they are in the wrong form or use the wrong name.
---
 gdb/check-include-guards.py | 125 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 125 insertions(+)

diff --git a/gdb/check-include-guards.py b/gdb/check-include-guards.py
new file mode 100755
index 00000000000..5c61fc90bb0
--- /dev/null
+++ b/gdb/check-include-guards.py
@@ -0,0 +1,125 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2024 Free Software Foundation, Inc.
+#
+# This file is part of GDB.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# This is intended to be run from pre-commit.  You can also run it by
+# hand by passing repository-relative filenames to it, like:
+#   ./gdb/check-include-guards.py gdb/*.h
+
+
+import glob
+import re
+import sys
+
+status = 0
+
+DEF = re.compile("^#ifndef ([A-Za-z0-9_]+)\n")
+OLDDEF = re.compile("^#if !defined *\\(([A-Za-z0-9_]+)\\)\n")
+
+
+def failure(filename, ndx, text):
+    print(filename + ":" + str(ndx + 1) + ": " + text)
+    global status
+    status = 1
+
+
+def headers(dirname):
+    return glob.iglob(dirname + "/*.h")
+
+
+def skip_comments_and_blanks(ndx, contents):
+    while ndx < len(contents) and contents[ndx].startswith("/*"):
+        while ndx < len(contents):
+            ndx += 1
+            if contents[ndx - 1].endswith("*/\n"):
+                break
+        # Skip blank lines.
+        while ndx < len(contents):
+            if contents[ndx].strip() != "":
+                break
+            ndx += 1
+    return ndx
+
+
+def write_header(filename, contents):
+    with open(filename, "w") as f:
+        f.writelines(contents)
+
+
+def check_header(filename):
+    # Turn x/y-z.h into X_Y_Z_H.
+    assert filename.endswith(".h")
+    expected = filename.replace("-", "_")
+    expected = expected.replace(".", "_")
+    expected = expected.replace("/", "_")
+    expected = expected.upper()
+    with open(filename) as f:
+        contents = list(f)
+    if "THIS FILE IS GENERATED" in contents[0]:
+        # Ignore.
+        return
+    if not contents[0].startswith("/*"):
+        failure(filename, 0, "header should start with comment")
+        return
+    i = skip_comments_and_blanks(0, contents)
+    if i == len(contents):
+        failure(filename, i, "unterminated intro comment or missing body")
+        return
+    m = DEF.match(contents[i])
+    force_rewrite = False
+    if not m:
+        m = OLDDEF.match(contents[i])
+        if not m:
+            failure(filename, i, "no header guard")
+            return
+        force_rewrite = True
+    symbol = m.group(1)
+    updated = False
+    if symbol != expected:
+        failure(filename, i, "symbol should be: " + expected)
+        force_rewrite = True
+    if force_rewrite:
+        contents[i] = "#ifndef " + expected + "\n"
+        updated = True
+    i += 1
+    if i == len(contents):
+        failure(filename, i, "premature EOF")
+        return
+    if not contents[i].startswith("#define "):
+        failure(filename, i, "no define of header guard")
+        return
+    if contents[i] != "#define " + expected + "\n":
+        failure(filename, i, "wrong symbol name in define")
+        contents[i] = "#define " + expected + "\n"
+        updated = True
+    i = len(contents) - 1
+    if not contents[i].startswith("#endif"):
+        failure(filename, i, "no trailing endif")
+        return
+    if contents[i] != "#endif /* " + expected + " */\n":
+        failure(filename, i, "incorrect endif")
+        contents[i] = "#endif /* " + expected + " */\n"
+        updated = True
+    if updated:
+        write_header(filename, contents)
+
+
+for filename in sys.argv[1:]:
+    check_header(filename)
+
+sys.exit(status)

-- 
2.43.0


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

* [PATCH v2 3/4] Add check-include-guards.py to pre-commit
  2024-04-18 15:41 [PATCH v2 0/4] Add include guard checker and reformatter Tom Tromey
  2024-04-18 15:41 ` [PATCH v2 1/4] Fix some minor header file irregularities Tom Tromey
  2024-04-18 15:41 ` [PATCH v2 2/4] Add an include-checking script Tom Tromey
@ 2024-04-18 15:41 ` Tom Tromey
  2024-04-18 15:41 ` [PATCH v2 4/4] Run check-include-guards.py Tom Tromey
  3 siblings, 0 replies; 8+ messages in thread
From: Tom Tromey @ 2024-04-18 15:41 UTC (permalink / raw)
  To: gdb-patches

This changes pre-commit to run check-include-guards.py.
---
 .pre-commit-config.yaml     |  7 +++++++
 gdb/check-include-guards.py | 35 ++++++++++-------------------------
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8721dac678b..b3dcf6482cf 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -22,3 +22,10 @@ repos:
     - id: isort
       types_or: [file]
       files: 'gdb/.*\.py(\.in)?$'
+  - repo: local
+    hooks:
+    - id: check-include-guards
+      name: check-include-guards
+      language: python
+      entry: gdb/check-include-guards.py
+      files: '^(gdb(support|server)?)/[^/]*(/[^/]*)?\.h$'
diff --git a/gdb/check-include-guards.py b/gdb/check-include-guards.py
index 5c61fc90bb0..428b5a71fa2 100755
--- a/gdb/check-include-guards.py
+++ b/gdb/check-include-guards.py
@@ -22,27 +22,19 @@
 #   ./gdb/check-include-guards.py gdb/*.h
 
 
-import glob
 import re
 import sys
 
-status = 0
-
 DEF = re.compile("^#ifndef ([A-Za-z0-9_]+)\n")
 OLDDEF = re.compile("^#if !defined *\\(([A-Za-z0-9_]+)\\)\n")
 
 
-def failure(filename, ndx, text):
-    print(filename + ":" + str(ndx + 1) + ": " + text)
-    global status
-    status = 1
-
-
-def headers(dirname):
-    return glob.iglob(dirname + "/*.h")
+def failure(filename: str, ndx: int, text: str):
+    print(filename + ":" + str(ndx + 1) + ": " + text, file=sys.stderr)
+    sys.exit(1)
 
 
-def skip_comments_and_blanks(ndx, contents):
+def skip_comments_and_blanks(ndx: int, contents: list[str]):
     while ndx < len(contents) and contents[ndx].startswith("/*"):
         while ndx < len(contents):
             ndx += 1
@@ -56,12 +48,12 @@ def skip_comments_and_blanks(ndx, contents):
     return ndx
 
 
-def write_header(filename, contents):
+def write_header(filename: str, contents: list[str]):
     with open(filename, "w") as f:
         f.writelines(contents)
 
 
-def check_header(filename):
+def check_header(filename: str):
     # Turn x/y-z.h into X_Y_Z_H.
     assert filename.endswith(".h")
     expected = filename.replace("-", "_")
@@ -70,28 +62,28 @@ def check_header(filename):
     expected = expected.upper()
     with open(filename) as f:
         contents = list(f)
+    if len(contents) == 0:
+        # Empty file -- pathological but we can just ignore rather
+        # than crashing.
+        return
     if "THIS FILE IS GENERATED" in contents[0]:
         # Ignore.
         return
     if not contents[0].startswith("/*"):
         failure(filename, 0, "header should start with comment")
-        return
     i = skip_comments_and_blanks(0, contents)
     if i == len(contents):
         failure(filename, i, "unterminated intro comment or missing body")
-        return
     m = DEF.match(contents[i])
     force_rewrite = False
     if not m:
         m = OLDDEF.match(contents[i])
         if not m:
             failure(filename, i, "no header guard")
-            return
         force_rewrite = True
     symbol = m.group(1)
     updated = False
     if symbol != expected:
-        failure(filename, i, "symbol should be: " + expected)
         force_rewrite = True
     if force_rewrite:
         contents[i] = "#ifndef " + expected + "\n"
@@ -99,20 +91,15 @@ def check_header(filename):
     i += 1
     if i == len(contents):
         failure(filename, i, "premature EOF")
-        return
     if not contents[i].startswith("#define "):
         failure(filename, i, "no define of header guard")
-        return
     if contents[i] != "#define " + expected + "\n":
-        failure(filename, i, "wrong symbol name in define")
         contents[i] = "#define " + expected + "\n"
         updated = True
     i = len(contents) - 1
     if not contents[i].startswith("#endif"):
         failure(filename, i, "no trailing endif")
-        return
     if contents[i] != "#endif /* " + expected + " */\n":
-        failure(filename, i, "incorrect endif")
         contents[i] = "#endif /* " + expected + " */\n"
         updated = True
     if updated:
@@ -121,5 +108,3 @@ def check_header(filename):
 
 for filename in sys.argv[1:]:
     check_header(filename)
-
-sys.exit(status)

-- 
2.43.0


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

* [PATCH v2 4/4] Run check-include-guards.py
  2024-04-18 15:41 [PATCH v2 0/4] Add include guard checker and reformatter Tom Tromey
                   ` (2 preceding siblings ...)
  2024-04-18 15:41 ` [PATCH v2 3/4] Add check-include-guards.py to pre-commit Tom Tromey
@ 2024-04-18 15:41 ` Tom Tromey
  3 siblings, 0 replies; 8+ messages in thread
From: Tom Tromey @ 2024-04-18 15:41 UTC (permalink / raw)
  To: gdb-patches

This patch is the result of running check-include-guards.py on the
current tree.  Running it a second time causes no changes.
---
 gdb/aarch32-linux-nat.h                     | 6 +++---
 gdb/aarch32-tdep.h                          | 6 +++---
 gdb/aarch64-fbsd-tdep.h                     | 6 +++---
 gdb/aarch64-linux-tdep.h                    | 6 +++---
 gdb/aarch64-nat.h                           | 6 +++---
 gdb/aarch64-ravenscar-thread.h              | 6 +++---
 gdb/aarch64-tdep.h                          | 6 +++---
 gdb/ada-exp.h                               | 6 +++---
 gdb/ada-lang.h                              | 6 +++---
 gdb/addrmap.h                               | 6 +++---
 gdb/alpha-bsd-tdep.h                        | 6 +++---
 gdb/alpha-tdep.h                            | 6 +++---
 gdb/amd-dbgapi-target.h                     | 6 +++---
 gdb/amd64-bsd-nat.h                         | 6 +++---
 gdb/amd64-darwin-tdep.h                     | 6 +++---
 gdb/amd64-fbsd-tdep.h                       | 6 +++---
 gdb/amd64-linux-tdep.h                      | 6 +++---
 gdb/amd64-nat.h                             | 6 +++---
 gdb/amd64-ravenscar-thread.h                | 6 +++---
 gdb/amd64-tdep.h                            | 6 +++---
 gdb/amdgpu-tdep.h                           | 6 +++---
 gdb/annotate.h                              | 6 +++---
 gdb/arc-linux-tdep.h                        | 6 +++---
 gdb/arc-tdep.h                              | 6 +++---
 gdb/arch-utils.h                            | 6 +++---
 gdb/arch/aarch32.h                          | 6 +++---
 gdb/arch/aarch64-insn.h                     | 6 +++---
 gdb/arch/aarch64-mte-linux.h                | 6 +++---
 gdb/arch/aarch64-scalable-linux.h           | 6 +++---
 gdb/arch/aarch64.h                          | 6 +++---
 gdb/arch/amd64.h                            | 6 +++---
 gdb/arch/arc.h                              | 6 +++---
 gdb/arch/arm-get-next-pcs.h                 | 6 +++---
 gdb/arch/arm-linux.h                        | 6 +++---
 gdb/arch/arm.h                              | 6 +++---
 gdb/arch/csky.h                             | 6 +++---
 gdb/arch/i386.h                             | 6 +++---
 gdb/arch/loongarch.h                        | 6 +++---
 gdb/arch/ppc-linux-common.h                 | 6 +++---
 gdb/arch/ppc-linux-tdesc.h                  | 6 +++---
 gdb/arch/riscv.h                            | 6 +++---
 gdb/arch/tic6x.h                            | 6 +++---
 gdb/arch/xtensa.h                           | 6 +++---
 gdb/arm-fbsd-tdep.h                         | 6 +++---
 gdb/arm-linux-tdep.h                        | 6 +++---
 gdb/arm-netbsd-tdep.h                       | 6 +++---
 gdb/arm-tdep.h                              | 6 +++---
 gdb/async-event.h                           | 6 +++---
 gdb/auto-load.h                             | 6 +++---
 gdb/auxv.h                                  | 6 +++---
 gdb/ax-gdb.h                                | 6 +++---
 gdb/ax.h                                    | 6 +++---
 gdb/bcache.h                                | 6 +++---
 gdb/bfd-target.h                            | 6 +++---
 gdb/bfin-tdep.h                             | 6 +++---
 gdb/block.h                                 | 6 +++---
 gdb/breakpoint.h                            | 6 +++---
 gdb/bsd-kvm.h                               | 6 +++---
 gdb/bsd-uthread.h                           | 6 +++---
 gdb/bt-utils.h                              | 6 +++---
 gdb/btrace.h                                | 6 +++---
 gdb/build-id.h                              | 6 +++---
 gdb/buildsym-legacy.h                       | 6 +++---
 gdb/buildsym.h                              | 6 +++---
 gdb/c-exp.h                                 | 6 +++---
 gdb/c-lang.h                                | 6 +++---
 gdb/c-support.h                             | 6 +++---
 gdb/cgen-remap.h                            | 6 +++---
 gdb/charset-list.h                          | 6 +++---
 gdb/charset.h                               | 6 +++---
 gdb/cli-out.h                               | 6 +++---
 gdb/cli/cli-cmds.h                          | 6 +++---
 gdb/cli/cli-decode.h                        | 6 +++---
 gdb/cli/cli-interp.h                        | 6 +++---
 gdb/cli/cli-option.h                        | 6 +++---
 gdb/cli/cli-script.h                        | 6 +++---
 gdb/cli/cli-setshow.h                       | 6 +++---
 gdb/cli/cli-style.h                         | 6 +++---
 gdb/cli/cli-utils.h                         | 6 +++---
 gdb/coff-pe-read.h                          | 6 +++---
 gdb/command.h                               | 6 +++---
 gdb/compile/compile-c.h                     | 6 +++---
 gdb/compile/compile-cplus.h                 | 6 +++---
 gdb/compile/compile-internal.h              | 6 +++---
 gdb/compile/compile-object-load.h           | 6 +++---
 gdb/compile/compile-object-run.h            | 6 +++---
 gdb/compile/compile.h                       | 6 +++---
 gdb/compile/gcc-c-plugin.h                  | 6 +++---
 gdb/compile/gcc-cp-plugin.h                 | 6 +++---
 gdb/complaints.h                            | 6 +++---
 gdb/completer.h                             | 6 +++---
 gdb/config/nm-linux.h                       | 6 +++---
 gdb/config/nm-nto.h                         | 6 +++---
 gdb/cp-abi.h                                | 6 +++---
 gdb/cp-support.h                            | 6 +++---
 gdb/cris-tdep.h                             | 6 +++---
 gdb/csky-tdep.h                             | 6 +++---
 gdb/ctfread.h                               | 6 +++---
 gdb/d-lang.h                                | 6 +++---
 gdb/darwin-nat.h                            | 6 +++---
 gdb/dcache.h                                | 6 +++---
 gdb/debuginfod-support.h                    | 6 +++---
 gdb/defs.h                                  | 6 +++---
 gdb/dicos-tdep.h                            | 6 +++---
 gdb/dictionary.h                            | 6 +++---
 gdb/disasm-flags.h                          | 6 +++---
 gdb/disasm.h                                | 6 +++---
 gdb/displaced-stepping.h                    | 6 +++---
 gdb/dummy-frame.h                           | 6 +++---
 gdb/dwarf2/call-site.h                      | 6 +++---
 gdb/dwarf2/comp-unit-head.h                 | 6 +++---
 gdb/dwarf2/expr.h                           | 6 +++---
 gdb/dwarf2/frame-tailcall.h                 | 6 +++---
 gdb/dwarf2/frame.h                          | 6 +++---
 gdb/dwarf2/index-cache.h                    | 6 +++---
 gdb/dwarf2/index-common.h                   | 6 +++---
 gdb/dwarf2/index-write.h                    | 6 +++---
 gdb/dwarf2/line-header.h                    | 6 +++---
 gdb/dwarf2/loc.h                            | 6 +++---
 gdb/dwarf2/public.h                         | 6 +++---
 gdb/dwarf2/read-debug-names.h               | 6 +++---
 gdb/dwarf2/read-gdb-index.h                 | 6 +++---
 gdb/dwarf2/read.h                           | 6 +++---
 gdb/dwarf2/types.h                          | 6 +++---
 gdb/elf-none-tdep.h                         | 6 +++---
 gdb/event-top.h                             | 6 +++---
 gdb/exceptions.h                            | 6 +++---
 gdb/exec.h                                  | 6 +++---
 gdb/expop.h                                 | 6 +++---
 gdb/expression.h                            | 6 +++---
 gdb/extension-priv.h                        | 6 +++---
 gdb/extension.h                             | 6 +++---
 gdb/f-array-walker.h                        | 6 +++---
 gdb/f-exp.h                                 | 6 +++---
 gdb/f-lang.h                                | 6 +++---
 gdb/fbsd-nat.h                              | 6 +++---
 gdb/fbsd-tdep.h                             | 6 +++---
 gdb/filename-seen-cache.h                   | 6 +++---
 gdb/filesystem.h                            | 6 +++---
 gdb/frame-base.h                            | 6 +++---
 gdb/frame-id.h                              | 4 ++--
 gdb/frame-unwind.h                          | 6 +++---
 gdb/frame.h                                 | 6 +++---
 gdb/frv-tdep.h                              | 6 +++---
 gdb/ft32-tdep.h                             | 6 +++---
 gdb/gcore-elf.h                             | 6 +++---
 gdb/gcore.h                                 | 6 +++---
 gdb/gdb-demangle.h                          | 6 +++---
 gdb/gdb-stabs.h                             | 6 +++---
 gdb/gdb_bfd.h                               | 6 +++---
 gdb/gdb_curses.h                            | 6 +++---
 gdb/gdb_expat.h                             | 6 +++---
 gdb/gdb_proc_service.h                      | 6 +++---
 gdb/gdb_vfork.h                             | 6 +++---
 gdb/gdb_wchar.h                             | 6 +++---
 gdb/gdbarch.h                               | 6 +++---
 gdb/gdbcmd.h                                | 6 +++---
 gdb/gdbcore.h                               | 6 +++---
 gdb/gdbthread.h                             | 6 +++---
 gdb/gdbtypes.h                              | 6 +++---
 gdb/glibc-tdep.h                            | 6 +++---
 gdb/gmp-utils.h                             | 6 +++---
 gdb/gnu-nat-mig.h                           | 6 +++---
 gdb/gnu-nat.h                               | 6 +++---
 gdb/go-lang.h                               | 6 +++---
 gdb/gregset.h                               | 6 +++---
 gdb/guile/guile-internal.h                  | 6 +++---
 gdb/guile/guile.h                           | 6 +++---
 gdb/hppa-bsd-tdep.h                         | 6 +++---
 gdb/hppa-linux-offsets.h                    | 6 +++---
 gdb/hppa-tdep.h                             | 6 +++---
 gdb/i386-bsd-nat.h                          | 6 +++---
 gdb/i386-darwin-tdep.h                      | 6 +++---
 gdb/i386-fbsd-tdep.h                        | 6 +++---
 gdb/i386-linux-nat.h                        | 6 +++---
 gdb/i386-linux-tdep.h                       | 6 +++---
 gdb/i386-tdep.h                             | 6 +++---
 gdb/i387-tdep.h                             | 6 +++---
 gdb/ia64-libunwind-tdep.h                   | 6 +++---
 gdb/ia64-tdep.h                             | 6 +++---
 gdb/inf-child.h                             | 6 +++---
 gdb/inf-loop.h                              | 6 +++---
 gdb/inf-ptrace.h                            | 6 +++---
 gdb/infcall.h                               | 6 +++---
 gdb/inferior-iter.h                         | 6 +++---
 gdb/inferior.h                              | 6 +++---
 gdb/infrun.h                                | 6 +++---
 gdb/inline-frame.h                          | 6 +++---
 gdb/interps.h                               | 6 +++---
 gdb/jit.h                                   | 6 +++---
 gdb/language.h                              | 6 +++---
 gdb/linespec.h                              | 6 +++---
 gdb/linux-fork.h                            | 6 +++---
 gdb/linux-nat-trad.h                        | 6 +++---
 gdb/linux-nat.h                             | 6 +++---
 gdb/linux-record.h                          | 6 +++---
 gdb/linux-tdep.h                            | 6 +++---
 gdb/location.h                              | 6 +++---
 gdb/loongarch-tdep.h                        | 6 +++---
 gdb/m2-exp.h                                | 6 +++---
 gdb/m2-lang.h                               | 6 +++---
 gdb/m32r-tdep.h                             | 6 +++---
 gdb/m68k-tdep.h                             | 6 +++---
 gdb/macroexp.h                              | 6 +++---
 gdb/macroscope.h                            | 6 +++---
 gdb/macrotab.h                              | 6 +++---
 gdb/main.h                                  | 6 +++---
 gdb/maint.h                                 | 6 +++---
 gdb/mdebugread.h                            | 6 +++---
 gdb/memattr.h                               | 6 +++---
 gdb/memory-map.h                            | 6 +++---
 gdb/memrange.h                              | 6 +++---
 gdb/memtag.h                                | 6 +++---
 gdb/mi/mi-cmd-break.h                       | 6 +++---
 gdb/mi/mi-cmds.h                            | 6 +++---
 gdb/mi/mi-common.h                          | 6 +++---
 gdb/mi/mi-console.h                         | 6 +++---
 gdb/mi/mi-getopt.h                          | 6 +++---
 gdb/mi/mi-interp.h                          | 6 +++---
 gdb/mi/mi-main.h                            | 6 +++---
 gdb/mi/mi-out.h                             | 6 +++---
 gdb/mi/mi-parse.h                           | 6 +++---
 gdb/microblaze-tdep.h                       | 6 +++---
 gdb/minsyms.h                               | 6 +++---
 gdb/mips-fbsd-tdep.h                        | 6 +++---
 gdb/mips-linux-tdep.h                       | 6 +++---
 gdb/mips-netbsd-tdep.h                      | 6 +++---
 gdb/mips-tdep.h                             | 6 +++---
 gdb/mn10300-tdep.h                          | 6 +++---
 gdb/moxie-tdep.h                            | 6 +++---
 gdb/namespace.h                             | 6 +++---
 gdb/nat/aarch64-hw-point.h                  | 6 +++---
 gdb/nat/aarch64-linux-hw-point.h            | 6 +++---
 gdb/nat/aarch64-linux.h                     | 6 +++---
 gdb/nat/aarch64-mte-linux-ptrace.h          | 6 +++---
 gdb/nat/aarch64-scalable-linux-ptrace.h     | 6 +++---
 gdb/nat/aarch64-scalable-linux-sigcontext.h | 6 +++---
 gdb/nat/amd64-linux-siginfo.h               | 6 +++---
 gdb/nat/fork-inferior.h                     | 6 +++---
 gdb/nat/gdb_ptrace.h                        | 6 +++---
 gdb/nat/gdb_thread_db.h                     | 6 +++---
 gdb/nat/glibc_thread_db.h                   | 6 +++---
 gdb/nat/linux-btrace.h                      | 6 +++---
 gdb/nat/linux-namespaces.h                  | 6 +++---
 gdb/nat/linux-nat.h                         | 6 +++---
 gdb/nat/linux-osdata.h                      | 6 +++---
 gdb/nat/linux-personality.h                 | 6 +++---
 gdb/nat/linux-procfs.h                      | 6 +++---
 gdb/nat/linux-ptrace.h                      | 6 +++---
 gdb/nat/linux-waitpid.h                     | 6 +++---
 gdb/nat/mips-linux-watch.h                  | 6 +++---
 gdb/nat/netbsd-nat.h                        | 6 +++---
 gdb/nat/ppc-linux.h                         | 6 +++---
 gdb/nat/riscv-linux-tdesc.h                 | 6 +++---
 gdb/nat/windows-nat.h                       | 6 +++---
 gdb/nat/x86-cpuid.h                         | 6 +++---
 gdb/nat/x86-dregs.h                         | 6 +++---
 gdb/nat/x86-gcc-cpuid.h                     | 6 +++---
 gdb/nat/x86-linux-dregs.h                   | 6 +++---
 gdb/nat/x86-linux.h                         | 6 +++---
 gdb/nat/x86-xstate.h                        | 6 +++---
 gdb/nds32-tdep.h                            | 6 +++---
 gdb/netbsd-nat.h                            | 6 +++---
 gdb/netbsd-tdep.h                           | 6 +++---
 gdb/nios2-tdep.h                            | 6 +++---
 gdb/nto-tdep.h                              | 6 +++---
 gdb/objc-lang.h                             | 6 +++---
 gdb/objfile-flags.h                         | 6 +++---
 gdb/objfiles.h                              | 6 +++---
 gdb/obsd-nat.h                              | 6 +++---
 gdb/obsd-tdep.h                             | 6 +++---
 gdb/observable.h                            | 6 +++---
 gdb/or1k-linux-tdep.h                       | 6 +++---
 gdb/or1k-tdep.h                             | 6 +++---
 gdb/osabi.h                                 | 6 +++---
 gdb/osdata.h                                | 6 +++---
 gdb/p-lang.h                                | 6 +++---
 gdb/parser-defs.h                           | 6 +++---
 gdb/ppc-fbsd-tdep.h                         | 6 +++---
 gdb/ppc-linux-tdep.h                        | 6 +++---
 gdb/ppc-netbsd-tdep.h                       | 6 +++---
 gdb/ppc-obsd-tdep.h                         | 6 +++---
 gdb/ppc-ravenscar-thread.h                  | 6 +++---
 gdb/ppc-tdep.h                              | 6 +++---
 gdb/ppc64-tdep.h                            | 6 +++---
 gdb/probe.h                                 | 6 +++---
 gdb/proc-utils.h                            | 6 +++---
 gdb/process-stratum-target.h                | 6 +++---
 gdb/procfs.h                                | 6 +++---
 gdb/producer.h                              | 6 +++---
 gdb/progspace-and-thread.h                  | 6 +++---
 gdb/progspace.h                             | 6 +++---
 gdb/prologue-value.h                        | 6 +++---
 gdb/psymtab.h                               | 6 +++---
 gdb/python/py-event.h                       | 6 +++---
 gdb/python/py-events.h                      | 6 +++---
 gdb/python/py-instruction.h                 | 6 +++---
 gdb/python/py-record-btrace.h               | 6 +++---
 gdb/python/py-record-full.h                 | 6 +++---
 gdb/python/py-record.h                      | 6 +++---
 gdb/python/py-ref.h                         | 6 +++---
 gdb/python/py-stopevent.h                   | 6 +++---
 gdb/python/python-internal.h                | 6 +++---
 gdb/python/python.h                         | 6 +++---
 gdb/ravenscar-thread.h                      | 6 +++---
 gdb/record-btrace.h                         | 6 +++---
 gdb/record-full.h                           | 6 +++---
 gdb/record.h                                | 6 +++---
 gdb/regcache.h                              | 6 +++---
 gdb/regformats/regdef.h                     | 6 +++---
 gdb/reggroups.h                             | 6 +++---
 gdb/registry.h                              | 6 +++---
 gdb/regset.h                                | 6 +++---
 gdb/remote-fileio.h                         | 6 +++---
 gdb/remote-notif.h                          | 6 +++---
 gdb/remote.h                                | 6 +++---
 gdb/riscv-fbsd-tdep.h                       | 6 +++---
 gdb/riscv-ravenscar-thread.h                | 6 +++---
 gdb/riscv-tdep.h                            | 6 +++---
 gdb/rs6000-aix-tdep.h                       | 6 +++---
 gdb/rust-exp.h                              | 6 +++---
 gdb/rust-lang.h                             | 6 +++---
 gdb/s390-linux-tdep.h                       | 6 +++---
 gdb/s390-tdep.h                             | 6 +++---
 gdb/scoped-mock-context.h                   | 6 +++---
 gdb/selftest-arch.h                         | 6 +++---
 gdb/sentinel-frame.h                        | 6 +++---
 gdb/ser-base.h                              | 6 +++---
 gdb/ser-event.h                             | 6 +++---
 gdb/ser-tcp.h                               | 6 +++---
 gdb/ser-unix.h                              | 6 +++---
 gdb/serial.h                                | 6 +++---
 gdb/sh-tdep.h                               | 6 +++---
 gdb/sim-regno.h                             | 6 +++---
 gdb/skip.h                                  | 6 +++---
 gdb/sol2-tdep.h                             | 6 +++---
 gdb/solib-aix.h                             | 6 +++---
 gdb/solib-darwin.h                          | 6 +++---
 gdb/solib-dsbt.h                            | 6 +++---
 gdb/solib-svr4.h                            | 6 +++---
 gdb/solib-target.h                          | 6 +++---
 gdb/solib.h                                 | 6 +++---
 gdb/solist.h                                | 6 +++---
 gdb/source-cache.h                          | 6 +++---
 gdb/source.h                                | 6 +++---
 gdb/sparc-nat.h                             | 6 +++---
 gdb/sparc-ravenscar-thread.h                | 6 +++---
 gdb/sparc-tdep.h                            | 6 +++---
 gdb/sparc64-tdep.h                          | 6 +++---
 gdb/stabsread.h                             | 6 +++---
 gdb/stack.h                                 | 6 +++---
 gdb/stap-probe.h                            | 6 +++---
 gdb/symfile-add-flags.h                     | 6 +++---
 gdb/symfile.h                               | 6 +++---
 gdb/symtab.h                                | 6 +++---
 gdb/target-connection.h                     | 6 +++---
 gdb/target-dcache.h                         | 6 +++---
 gdb/target-debug.h                          | 6 +++---
 gdb/target-descriptions.h                   | 6 +++---
 gdb/target-float.h                          | 6 +++---
 gdb/target.h                                | 6 +++---
 gdb/target/resume.h                         | 6 +++---
 gdb/target/target.h                         | 6 +++---
 gdb/target/wait.h                           | 6 +++---
 gdb/target/waitstatus.h                     | 6 +++---
 gdb/terminal.h                              | 6 +++---
 gdb/test-target.h                           | 6 +++---
 gdb/thread-fsm.h                            | 6 +++---
 gdb/thread-iter.h                           | 6 +++---
 gdb/tic6x-tdep.h                            | 6 +++---
 gdb/tid-parse.h                             | 6 +++---
 gdb/tilegx-tdep.h                           | 6 +++---
 gdb/top.h                                   | 6 +++---
 gdb/tracectf.h                              | 6 +++---
 gdb/tracefile.h                             | 6 +++---
 gdb/tracepoint.h                            | 6 +++---
 gdb/trad-frame.h                            | 6 +++---
 gdb/tramp-frame.h                           | 6 +++---
 gdb/tui/tui-command.h                       | 6 +++---
 gdb/tui/tui-data.h                          | 6 +++---
 gdb/tui/tui-disasm.h                        | 6 +++---
 gdb/tui/tui-file.h                          | 6 +++---
 gdb/tui/tui-hooks.h                         | 6 +++---
 gdb/tui/tui-io.h                            | 6 +++---
 gdb/tui/tui-layout.h                        | 6 +++---
 gdb/tui/tui-location.h                      | 6 +++---
 gdb/tui/tui-regs.h                          | 6 +++---
 gdb/tui/tui-source.h                        | 6 +++---
 gdb/tui/tui-status.h                        | 6 +++---
 gdb/tui/tui-win.h                           | 6 +++---
 gdb/tui/tui-wingeneral.h                    | 6 +++---
 gdb/tui/tui-winsource.h                     | 6 +++---
 gdb/tui/tui.h                               | 6 +++---
 gdb/type-stack.h                            | 6 +++---
 gdb/typeprint.h                             | 6 +++---
 gdb/ui-file.h                               | 6 +++---
 gdb/ui-out.h                                | 6 +++---
 gdb/ui-style.h                              | 6 +++---
 gdb/ui.h                                    | 6 +++---
 gdb/user-regs.h                             | 6 +++---
 gdb/utils.h                                 | 6 +++---
 gdb/valprint.h                              | 6 +++---
 gdb/value.h                                 | 6 +++---
 gdb/varobj-iter.h                           | 6 +++---
 gdb/varobj.h                                | 6 +++---
 gdb/vax-tdep.h                              | 6 +++---
 gdb/windows-nat.h                           | 6 +++---
 gdb/windows-tdep.h                          | 6 +++---
 gdb/x86-bsd-nat.h                           | 6 +++---
 gdb/x86-fbsd-nat.h                          | 6 +++---
 gdb/x86-linux-nat.h                         | 6 +++---
 gdb/x86-nat.h                               | 6 +++---
 gdb/x86-tdep.h                              | 6 +++---
 gdb/xcoffread.h                             | 6 +++---
 gdb/xml-builtin.h                           | 6 +++---
 gdb/xml-support.h                           | 6 +++---
 gdb/xml-syscall.h                           | 6 +++---
 gdb/xml-tdesc.h                             | 6 +++---
 gdb/xtensa-tdep.h                           | 6 +++---
 gdb/yy-remap.h                              | 6 +++---
 gdb/z80-tdep.h                              | 6 +++---
 gdbserver/linux-aarch32-tdesc.h             | 2 +-
 gdbserver/linux-arm-tdesc.h                 | 2 +-
 gdbsupport/agent.h                          | 6 +++---
 gdbsupport/array-view.h                     | 6 +++---
 gdbsupport/break-common.h                   | 6 +++---
 gdbsupport/btrace-common.h                  | 6 +++---
 gdbsupport/byte-vector.h                    | 6 +++---
 gdbsupport/cleanups.h                       | 6 +++---
 gdbsupport/common-debug.h                   | 6 +++---
 gdbsupport/common-defs.h                    | 6 +++---
 gdbsupport/common-exceptions.h              | 6 +++---
 gdbsupport/common-gdbthread.h               | 6 +++---
 gdbsupport/common-inferior.h                | 6 +++---
 gdbsupport/common-regcache.h                | 6 +++---
 gdbsupport/common-types.h                   | 6 +++---
 gdbsupport/common-utils.h                   | 6 +++---
 gdbsupport/def-vector.h                     | 6 +++---
 gdbsupport/default-init-alloc.h             | 6 +++---
 gdbsupport/enum-flags.h                     | 6 +++---
 gdbsupport/environ.h                        | 6 +++---
 gdbsupport/errors.h                         | 6 +++---
 gdbsupport/event-loop.h                     | 6 +++---
 gdbsupport/event-pipe.h                     | 6 +++---
 gdbsupport/fileio.h                         | 6 +++---
 gdbsupport/filestuff.h                      | 6 +++---
 gdbsupport/filtered-iterator.h              | 6 +++---
 gdbsupport/format.h                         | 6 +++---
 gdbsupport/forward-scope-exit.h             | 6 +++---
 gdbsupport/function-view.h                  | 6 +++---
 gdbsupport/gdb-checked-static-cast.h        | 6 +++---
 gdbsupport/gdb-dlfcn.h                      | 6 +++---
 gdbsupport/gdb-safe-ctype.h                 | 6 +++---
 gdbsupport/gdb_assert.h                     | 6 +++---
 gdbsupport/gdb_file.h                       | 6 +++---
 gdbsupport/gdb_locale.h                     | 6 +++---
 gdbsupport/gdb_obstack.h                    | 6 +++---
 gdbsupport/gdb_proc_service.h               | 6 +++---
 gdbsupport/gdb_ref_ptr.h                    | 6 +++---
 gdbsupport/gdb_regex.h                      | 6 +++---
 gdbsupport/gdb_select.h                     | 6 +++---
 gdbsupport/gdb_setjmp.h                     | 6 +++---
 gdbsupport/gdb_signals.h                    | 6 +++---
 gdbsupport/gdb_splay_tree.h                 | 6 +++---
 gdbsupport/gdb_sys_time.h                   | 6 +++---
 gdbsupport/gdb_tilde_expand.h               | 6 +++---
 gdbsupport/gdb_unique_ptr.h                 | 6 +++---
 gdbsupport/gdb_unlinker.h                   | 6 +++---
 gdbsupport/gdb_vecs.h                       | 6 +++---
 gdbsupport/gdb_wait.h                       | 6 +++---
 gdbsupport/hash_enum.h                      | 6 +++---
 gdbsupport/host-defs.h                      | 6 +++---
 gdbsupport/job-control.h                    | 6 +++---
 gdbsupport/netstuff.h                       | 6 +++---
 gdbsupport/next-iterator.h                  | 6 +++---
 gdbsupport/observable.h                     | 6 +++---
 gdbsupport/offset-type.h                    | 6 +++---
 gdbsupport/packed.h                         | 6 +++---
 gdbsupport/pathstuff.h                      | 6 +++---
 gdbsupport/poison.h                         | 6 +++---
 gdbsupport/preprocessor.h                   | 6 +++---
 gdbsupport/print-utils.h                    | 6 +++---
 gdbsupport/ptid.h                           | 6 +++---
 gdbsupport/refcounted-object.h              | 6 +++---
 gdbsupport/rsp-low.h                        | 6 +++---
 gdbsupport/run-time-clock.h                 | 6 +++---
 gdbsupport/safe-iterator.h                  | 6 +++---
 gdbsupport/scope-exit.h                     | 6 +++---
 gdbsupport/scoped_fd.h                      | 6 +++---
 gdbsupport/scoped_ignore_signal.h           | 6 +++---
 gdbsupport/scoped_ignore_sigttou.h          | 6 +++---
 gdbsupport/scoped_mmap.h                    | 6 +++---
 gdbsupport/scoped_restore.h                 | 6 +++---
 gdbsupport/search.h                         | 6 +++---
 gdbsupport/selftest.h                       | 6 +++---
 gdbsupport/signals-state-save-restore.h     | 6 +++---
 gdbsupport/symbol.h                         | 6 +++---
 gdbsupport/tdesc.h                          | 6 +++---
 gdbsupport/traits.h                         | 6 +++---
 gdbsupport/underlying.h                     | 6 +++---
 gdbsupport/valid-expr.h                     | 6 +++---
 gdbsupport/version.h                        | 6 +++---
 gdbsupport/x86-xstate.h                     | 6 +++---
 gdbsupport/xml-utils.h                      | 6 +++---
 504 files changed, 1507 insertions(+), 1507 deletions(-)

diff --git a/gdb/aarch32-linux-nat.h b/gdb/aarch32-linux-nat.h
index 611c9fcfba9..79ad5adcef8 100644
--- a/gdb/aarch32-linux-nat.h
+++ b/gdb/aarch32-linux-nat.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AARCH32_LINUX_NAT_H
-#define AARCH32_LINUX_NAT_H
+#ifndef GDB_AARCH32_LINUX_NAT_H
+#define GDB_AARCH32_LINUX_NAT_H
 
 void aarch32_gp_regcache_supply (struct regcache *regcache, uint32_t *regs,
 				 int arm_apcs_32);
@@ -31,4 +31,4 @@ void aarch32_vfp_regcache_collect (const struct regcache *regcache,
 				   gdb_byte *regs,
 				   const int vfp_register_count);
 
-#endif /* AARCH32_LINUX_NAT_H */
+#endif /* GDB_AARCH32_LINUX_NAT_H */
diff --git a/gdb/aarch32-tdep.h b/gdb/aarch32-tdep.h
index 009ee61890e..16ceb30a25f 100644
--- a/gdb/aarch32-tdep.h
+++ b/gdb/aarch32-tdep.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AARCH32_TDEP_H
-#define AARCH32_TDEP_H
+#ifndef GDB_AARCH32_TDEP_H
+#define GDB_AARCH32_TDEP_H
 
 struct target_desc;
 
@@ -24,4 +24,4 @@ struct target_desc;
 
 const target_desc *aarch32_read_description (bool tls);
 
-#endif /* aarch32-tdep.h.  */
+#endif /* GDB_AARCH32_TDEP_H */
diff --git a/gdb/aarch64-fbsd-tdep.h b/gdb/aarch64-fbsd-tdep.h
index 56b15a94ee4..6d53b28386f 100644
--- a/gdb/aarch64-fbsd-tdep.h
+++ b/gdb/aarch64-fbsd-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AARCH64_FBSD_TDEP_H
-#define AARCH64_FBSD_TDEP_H
+#ifndef GDB_AARCH64_FBSD_TDEP_H
+#define GDB_AARCH64_FBSD_TDEP_H
 
 #include "regset.h"
 
@@ -39,4 +39,4 @@ extern const struct regset aarch64_fbsd_gregset;
 extern const struct regset aarch64_fbsd_fpregset;
 extern const struct regset aarch64_fbsd_tls_regset;
 
-#endif /* AARCH64_FBSD_TDEP_H */
+#endif /* GDB_AARCH64_FBSD_TDEP_H */
diff --git a/gdb/aarch64-linux-tdep.h b/gdb/aarch64-linux-tdep.h
index 1961250e14f..4cca8e901a7 100644
--- a/gdb/aarch64-linux-tdep.h
+++ b/gdb/aarch64-linux-tdep.h
@@ -18,8 +18,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AARCH64_LINUX_TDEP_H
-#define AARCH64_LINUX_TDEP_H
+#ifndef GDB_AARCH64_LINUX_TDEP_H
+#define GDB_AARCH64_LINUX_TDEP_H
 
 #include "regset.h"
 
@@ -45,4 +45,4 @@ extern const struct regset aarch64_linux_fpregset;
 /* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h.  */
 #define AARCH64_HWCAP_PACA (1 << 30)
 
-#endif /* AARCH64_LINUX_TDEP_H */
+#endif /* GDB_AARCH64_LINUX_TDEP_H */
diff --git a/gdb/aarch64-nat.h b/gdb/aarch64-nat.h
index 947d2805602..33621c2643b 100644
--- a/gdb/aarch64-nat.h
+++ b/gdb/aarch64-nat.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AARCH64_NAT_H
-#define AARCH64_NAT_H
+#ifndef GDB_AARCH64_NAT_H
+#define GDB_AARCH64_NAT_H
 
 #include "breakpoint.h"
 #include "nat/aarch64-hw-point.h"
@@ -106,4 +106,4 @@ struct aarch64_nat_target : public BaseTarget
   { return start <= addr && start + length - 1 >= addr; }
 };
 
-#endif /* AARCH64_NAT_H */
+#endif /* GDB_AARCH64_NAT_H */
diff --git a/gdb/aarch64-ravenscar-thread.h b/gdb/aarch64-ravenscar-thread.h
index 2d2665627c5..9cf0113e635 100644
--- a/gdb/aarch64-ravenscar-thread.h
+++ b/gdb/aarch64-ravenscar-thread.h
@@ -17,11 +17,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AARCH64_RAVENSCAR_THREAD_H
-#define AARCH64_RAVENSCAR_THREAD_H
+#ifndef GDB_AARCH64_RAVENSCAR_THREAD_H
+#define GDB_AARCH64_RAVENSCAR_THREAD_H
 
 struct gdbarch;
 
 extern void register_aarch64_ravenscar_ops (struct gdbarch *gdbarch);
 
-#endif
+#endif /* GDB_AARCH64_RAVENSCAR_THREAD_H */
diff --git a/gdb/aarch64-tdep.h b/gdb/aarch64-tdep.h
index 0e6024bfcbc..e1e9f43fd11 100644
--- a/gdb/aarch64-tdep.h
+++ b/gdb/aarch64-tdep.h
@@ -19,8 +19,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#ifndef AARCH64_TDEP_H
-#define AARCH64_TDEP_H
+#ifndef GDB_AARCH64_TDEP_H
+#define GDB_AARCH64_TDEP_H
 
 #include "arch/aarch64.h"
 #include "displaced-stepping.h"
@@ -203,4 +203,4 @@ void aarch64_displaced_step_fixup (struct gdbarch *gdbarch,
 
 bool aarch64_displaced_step_hw_singlestep (struct gdbarch *gdbarch);
 
-#endif /* aarch64-tdep.h */
+#endif /* GDB_AARCH64_TDEP_H */
diff --git a/gdb/ada-exp.h b/gdb/ada-exp.h
index 94e4ea0f47e..0a59b343f14 100644
--- a/gdb/ada-exp.h
+++ b/gdb/ada-exp.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ADA_EXP_H
-#define ADA_EXP_H
+#ifndef GDB_ADA_EXP_H
+#define GDB_ADA_EXP_H
 
 #include "expop.h"
 
@@ -981,4 +981,4 @@ class ada_concat_operation : public concat_operation
 
 } /* namespace expr */
 
-#endif /* ADA_EXP_H */
+#endif /* GDB_ADA_EXP_H */
diff --git a/gdb/ada-lang.h b/gdb/ada-lang.h
index 5083d004ac9..69c91b2e719 100644
--- a/gdb/ada-lang.h
+++ b/gdb/ada-lang.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (ADA_LANG_H)
-#define ADA_LANG_H 1
+#ifndef GDB_ADA_LANG_H
+#define GDB_ADA_LANG_H
 
 class frame_info_ptr;
 struct inferior;
@@ -435,4 +435,4 @@ extern block_symbol ada_resolve_variable (struct symbol *sym,
 extern struct type *ada_index_type (struct type *type, int n,
 				    const char *name);
 
-#endif
+#endif /* GDB_ADA_LANG_H */
diff --git a/gdb/addrmap.h b/gdb/addrmap.h
index 5378b753760..a2ccc7b0cfd 100644
--- a/gdb/addrmap.h
+++ b/gdb/addrmap.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ADDRMAP_H
-#define ADDRMAP_H
+#ifndef GDB_ADDRMAP_H
+#define GDB_ADDRMAP_H
 
 #include "splay-tree.h"
 #include "gdbsupport/function-view.h"
@@ -222,4 +222,4 @@ struct addrmap_mutable final : public addrmap
 void addrmap_dump (struct addrmap *map, struct ui_file *outfile,
 		   void *payload);
 
-#endif /* ADDRMAP_H */
+#endif /* GDB_ADDRMAP_H */
diff --git a/gdb/alpha-bsd-tdep.h b/gdb/alpha-bsd-tdep.h
index 25ac043ba86..4783854eb47 100644
--- a/gdb/alpha-bsd-tdep.h
+++ b/gdb/alpha-bsd-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ALPHA_BSD_TDEP_H
-#define ALPHA_BSD_TDEP_H
+#ifndef GDB_ALPHA_BSD_TDEP_H
+#define GDB_ALPHA_BSD_TDEP_H
 
 #include "gdbarch.h"
 
@@ -39,4 +39,4 @@ void alphanbsd_iterate_over_regset_sections (struct gdbarch *gdbarch,
 					     void *cb_data,
 					     const struct regcache *regcache);
 
-#endif /* alpha-bsd-tdep.h */
+#endif /* GDB_ALPHA_BSD_TDEP_H */
diff --git a/gdb/alpha-tdep.h b/gdb/alpha-tdep.h
index 0423abb2558..37c1eddf691 100644
--- a/gdb/alpha-tdep.h
+++ b/gdb/alpha-tdep.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ALPHA_TDEP_H
-#define ALPHA_TDEP_H
+#ifndef GDB_ALPHA_TDEP_H
+#define GDB_ALPHA_TDEP_H
 
 #include "gdbarch.h"
 
@@ -121,4 +121,4 @@ extern void alpha_supply_fp_regs (struct regcache *, int,
 extern void alpha_fill_fp_regs (const struct regcache *,
 				int, void *, void *);
 
-#endif /* ALPHA_TDEP_H */
+#endif /* GDB_ALPHA_TDEP_H */
diff --git a/gdb/amd-dbgapi-target.h b/gdb/amd-dbgapi-target.h
index f377fd0c57a..0a9cafaa7ee 100644
--- a/gdb/amd-dbgapi-target.h
+++ b/gdb/amd-dbgapi-target.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AMD_DBGAPI_TARGET_H
-#define AMD_DBGAPI_TARGET_H 1
+#ifndef GDB_AMD_DBGAPI_TARGET_H
+#define GDB_AMD_DBGAPI_TARGET_H
 
 #include "gdbsupport/observable.h"
 
@@ -113,4 +113,4 @@ get_status_string (amd_dbgapi_status_t status)
   return ret;
 }
 
-#endif /* AMD_DBGAPI_TARGET_H */
+#endif /* GDB_AMD_DBGAPI_TARGET_H */
diff --git a/gdb/amd64-bsd-nat.h b/gdb/amd64-bsd-nat.h
index b11356e0375..7ea26827625 100644
--- a/gdb/amd64-bsd-nat.h
+++ b/gdb/amd64-bsd-nat.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AMD64_BSD_NAT_H
-#define AMD64_BSD_NAT_H
+#ifndef GDB_AMD64_BSD_NAT_H
+#define GDB_AMD64_BSD_NAT_H
 
 #include "x86-bsd-nat.h"
 
@@ -41,4 +41,4 @@ class amd64_bsd_nat_target : public x86bsd_nat_target<BaseTarget>
   { amd64bsd_store_inferior_registers (regcache, regnum); }
 };
 
-#endif /* i386-bsd-nat.h */
+#endif /* GDB_AMD64_BSD_NAT_H */
diff --git a/gdb/amd64-darwin-tdep.h b/gdb/amd64-darwin-tdep.h
index 19d92b61b90..c09cfe3229b 100644
--- a/gdb/amd64-darwin-tdep.h
+++ b/gdb/amd64-darwin-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AMD64_DARWIN_TDEP_H
-#define AMD64_DARWIN_TDEP_H
+#ifndef GDB_AMD64_DARWIN_TDEP_H
+#define GDB_AMD64_DARWIN_TDEP_H
 
 /* Mapping between the general-purpose registers in Darwin x86-64 thread
    state and GDB's register cache layout.
@@ -26,4 +26,4 @@
 extern int amd64_darwin_thread_state_reg_offset[];
 extern const int amd64_darwin_thread_state_num_regs;
 
-#endif /* AMD64_DARWIN_TDEP_H */
+#endif /* GDB_AMD64_DARWIN_TDEP_H */
diff --git a/gdb/amd64-fbsd-tdep.h b/gdb/amd64-fbsd-tdep.h
index 93b0ca901ce..7e8acc6959e 100644
--- a/gdb/amd64-fbsd-tdep.h
+++ b/gdb/amd64-fbsd-tdep.h
@@ -17,11 +17,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AMD64_FBSD_TDEP_H
-#define AMD64_FBSD_TDEP_H
+#ifndef GDB_AMD64_FBSD_TDEP_H
+#define GDB_AMD64_FBSD_TDEP_H
 
 #include "regset.h"
 
 extern const struct regset amd64_fbsd_gregset;
 
-#endif /* AMD64_FBSD_TDEP_H */
+#endif /* GDB_AMD64_FBSD_TDEP_H */
diff --git a/gdb/amd64-linux-tdep.h b/gdb/amd64-linux-tdep.h
index 2003dcda78f..6ce0032040c 100644
--- a/gdb/amd64-linux-tdep.h
+++ b/gdb/amd64-linux-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AMD64_LINUX_TDEP_H
-#define AMD64_LINUX_TDEP_H
+#ifndef GDB_AMD64_LINUX_TDEP_H
+#define GDB_AMD64_LINUX_TDEP_H
 
 /* Like for i386 GNU/Linux, there is an extra "register"
    used to control syscall restarting.  */
@@ -604,4 +604,4 @@ enum amd64_x32_syscall {
   amd64_x32_sys_getsockopt = (amd64_x32_syscall_bit + 542),
 };
 
-#endif /* amd64-linux-tdep.h */
+#endif /* GDB_AMD64_LINUX_TDEP_H */
diff --git a/gdb/amd64-nat.h b/gdb/amd64-nat.h
index b18ff8b1728..56ad36c9f1e 100644
--- a/gdb/amd64-nat.h
+++ b/gdb/amd64-nat.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AMD64_NAT_H
-#define AMD64_NAT_H 1
+#ifndef GDB_AMD64_NAT_H
+#define GDB_AMD64_NAT_H
 
 struct regcache;
 
@@ -49,4 +49,4 @@ extern void amd64_supply_native_gregset (struct regcache *regcache,
 extern void amd64_collect_native_gregset (const struct regcache *regcache,
 					  void *gregs, int regnum);
 
-#endif /* amd64-nat.h */
+#endif /* GDB_AMD64_NAT_H */
diff --git a/gdb/amd64-ravenscar-thread.h b/gdb/amd64-ravenscar-thread.h
index 1a723600e7a..41e38327753 100644
--- a/gdb/amd64-ravenscar-thread.h
+++ b/gdb/amd64-ravenscar-thread.h
@@ -17,11 +17,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AMD64_RAVENSCAR_THREAD_H
-#define AMD64_RAVENSCAR_THREAD_H
+#ifndef GDB_AMD64_RAVENSCAR_THREAD_H
+#define GDB_AMD64_RAVENSCAR_THREAD_H
 
 struct gdbarch;
 
 extern void register_amd64_ravenscar_ops (struct gdbarch *gdbarch);
 
-#endif /* AMD64_RAVENSCAR_THREAD_H */
+#endif /* GDB_AMD64_RAVENSCAR_THREAD_H */
diff --git a/gdb/amd64-tdep.h b/gdb/amd64-tdep.h
index 696c65b4f1b..c964e26e6a3 100644
--- a/gdb/amd64-tdep.h
+++ b/gdb/amd64-tdep.h
@@ -18,8 +18,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AMD64_TDEP_H
-#define AMD64_TDEP_H
+#ifndef GDB_AMD64_TDEP_H
+#define GDB_AMD64_TDEP_H
 
 struct gdbarch;
 class frame_info_ptr;
@@ -144,4 +144,4 @@ extern int amd64nbsd_r_reg_offset[];
 /* Variables exported from amd64-obsd-tdep.c.  */
 extern int amd64obsd_r_reg_offset[];
 
-#endif /* amd64-tdep.h */
+#endif /* GDB_AMD64_TDEP_H */
diff --git a/gdb/amdgpu-tdep.h b/gdb/amdgpu-tdep.h
index 2656d18e727..16c7b83a679 100644
--- a/gdb/amdgpu-tdep.h
+++ b/gdb/amdgpu-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AMDGPU_TDEP_H
-#define AMDGPU_TDEP_H
+#ifndef GDB_AMDGPU_TDEP_H
+#define GDB_AMDGPU_TDEP_H
 
 #include "gdbarch.h"
 
@@ -90,4 +90,4 @@ bool is_amdgpu_arch (struct gdbarch *gdbarch);
 
 amdgpu_gdbarch_tdep *get_amdgpu_gdbarch_tdep (gdbarch *arch);
 
-#endif /* AMDGPU_TDEP_H */
+#endif /* GDB_AMDGPU_TDEP_H */
diff --git a/gdb/annotate.h b/gdb/annotate.h
index b8ce63ff233..d730b2e8297 100644
--- a/gdb/annotate.h
+++ b/gdb/annotate.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ANNOTATE_H
-#define ANNOTATE_H
+#ifndef GDB_ANNOTATE_H
+#define GDB_ANNOTATE_H
 
 #include "symtab.h"
 #include "gdbtypes.h"
@@ -132,4 +132,4 @@ extern void annotate_array_section_end (void);
 extern void (*deprecated_annotate_signalled_hook) (void);
 extern void (*deprecated_annotate_signal_hook) (void);
 
-#endif /* ANNOTATE_H */
+#endif /* GDB_ANNOTATE_H */
diff --git a/gdb/arc-linux-tdep.h b/gdb/arc-linux-tdep.h
index 20ed525fe7c..9fe4116984d 100644
--- a/gdb/arc-linux-tdep.h
+++ b/gdb/arc-linux-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARC_LINUX_TDEP_H
-#define ARC_LINUX_TDEP_H
+#ifndef GDB_ARC_LINUX_TDEP_H
+#define GDB_ARC_LINUX_TDEP_H
 
 #include "gdbarch.h"
 #include "regset.h"
@@ -49,4 +49,4 @@ void arc_linux_collect_v2_regset (const struct regset *regset,
 				  const struct regcache *regcache,
 				  int regnum, void *v2_regs, size_t size);
 
-#endif /* ARC_LINUX_TDEP_H */
+#endif /* GDB_ARC_LINUX_TDEP_H */
diff --git a/gdb/arc-tdep.h b/gdb/arc-tdep.h
index c59490dec00..86a483d00c7 100644
--- a/gdb/arc-tdep.h
+++ b/gdb/arc-tdep.h
@@ -18,8 +18,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARC_TDEP_H
-#define ARC_TDEP_H
+#ifndef GDB_ARC_TDEP_H
+#define GDB_ARC_TDEP_H
 
 /* Need disassemble_info.  */
 #include "dis-asm.h"
@@ -205,4 +205,4 @@ CORE_ADDR arc_insn_get_linear_next_pc (const struct arc_instruction &insn);
 arc_arch_features arc_arch_features_create (const bfd *abfd,
 					    const unsigned long mach);
 
-#endif /* ARC_TDEP_H */
+#endif /* GDB_ARC_TDEP_H */
diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h
index 2dcd8f6dc53..d70d0b670c0 100644
--- a/gdb/arch-utils.h
+++ b/gdb/arch-utils.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_UTILS_H
-#define ARCH_UTILS_H
+#ifndef GDB_ARCH_UTILS_H
+#define GDB_ARCH_UTILS_H
 
 #include "gdbarch.h"
 
@@ -325,4 +325,4 @@ extern enum return_value_convention default_gdbarch_return_value
       struct regcache *regcache, struct value **read_value,
       const gdb_byte *writebuf);
 
-#endif /* ARCH_UTILS_H */
+#endif /* GDB_ARCH_UTILS_H */
diff --git a/gdb/arch/aarch32.h b/gdb/arch/aarch32.h
index 1811b8a7a92..f3e70affb0b 100644
--- a/gdb/arch/aarch32.h
+++ b/gdb/arch/aarch32.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_AARCH32_H
-#define ARCH_AARCH32_H
+#ifndef GDB_ARCH_AARCH32_H
+#define GDB_ARCH_AARCH32_H
 
 #include "gdbsupport/tdesc.h"
 
@@ -24,4 +24,4 @@
 
 target_desc *aarch32_create_target_description (bool tls);
 
-#endif /* aarch32.h.  */
+#endif /* GDB_ARCH_AARCH32_H */
diff --git a/gdb/arch/aarch64-insn.h b/gdb/arch/aarch64-insn.h
index e4ee5c74fbf..bd3a85f9686 100644
--- a/gdb/arch/aarch64-insn.h
+++ b/gdb/arch/aarch64-insn.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_AARCH64_INSN_H
-#define ARCH_AARCH64_INSN_H
+#ifndef GDB_ARCH_AARCH64_INSN_H
+#define GDB_ARCH_AARCH64_INSN_H
 
 extern bool aarch64_debug;
 
@@ -356,4 +356,4 @@ int aarch64_emit_load_store (uint32_t *buf, uint32_t size,
 			     struct aarch64_register rn,
 			     struct aarch64_memory_operand operand);
 
-#endif /* ARCH_AARCH64_INSN_H */
+#endif /* GDB_ARCH_AARCH64_INSN_H */
diff --git a/gdb/arch/aarch64-mte-linux.h b/gdb/arch/aarch64-mte-linux.h
index 460b10e05c9..d917dd1b1e3 100644
--- a/gdb/arch/aarch64-mte-linux.h
+++ b/gdb/arch/aarch64-mte-linux.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_AARCH64_MTE_LINUX_H
-#define ARCH_AARCH64_MTE_LINUX_H
+#ifndef GDB_ARCH_AARCH64_MTE_LINUX_H
+#define GDB_ARCH_AARCH64_MTE_LINUX_H
 
 
 /* Feature check for Memory Tagging Extension.  */
@@ -80,4 +80,4 @@ extern void aarch64_mte_pack_tags (gdb::byte_vector &tags);
    first unpacked element.  Otherwise leave it in the unpacked vector.  */
 extern void aarch64_mte_unpack_tags (gdb::byte_vector &tags, bool skip_first);
 
-#endif /* ARCH_AARCH64_MTE_LINUX_H */
+#endif /* GDB_ARCH_AARCH64_MTE_LINUX_H */
diff --git a/gdb/arch/aarch64-scalable-linux.h b/gdb/arch/aarch64-scalable-linux.h
index 4d2ace8f153..886f4a2dee8 100644
--- a/gdb/arch/aarch64-scalable-linux.h
+++ b/gdb/arch/aarch64-scalable-linux.h
@@ -18,8 +18,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_AARCH64_SCALABLE_LINUX_H
-#define ARCH_AARCH64_SCALABLE_LINUX_H
+#ifndef GDB_ARCH_AARCH64_SCALABLE_LINUX_H
+#define GDB_ARCH_AARCH64_SCALABLE_LINUX_H
 
 #include "gdbsupport/common-regcache.h"
 
@@ -55,4 +55,4 @@
    is empty (zero).  Return FALSE otherwise.  */
 extern bool sve_state_is_empty (const struct reg_buffer_common *reg_buf);
 
-#endif /* ARCH_AARCH64_SCALABLE_LINUX_H */
+#endif /* GDB_ARCH_AARCH64_SCALABLE_LINUX_H */
diff --git a/gdb/arch/aarch64.h b/gdb/arch/aarch64.h
index b4c0111aeb4..f45a0e2f13e 100644
--- a/gdb/arch/aarch64.h
+++ b/gdb/arch/aarch64.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_AARCH64_H
-#define ARCH_AARCH64_H
+#ifndef GDB_ARCH_AARCH64_H
+#define GDB_ARCH_AARCH64_H
 
 #include "gdbsupport/tdesc.h"
 
@@ -230,4 +230,4 @@ enum aarch64_regnum
 /* Size of the SME2 ZT0 register in bytes.  */
 #define AARCH64_SME2_ZT0_SIZE 64
 
-#endif /* ARCH_AARCH64_H */
+#endif /* GDB_ARCH_AARCH64_H */
diff --git a/gdb/arch/amd64.h b/gdb/arch/amd64.h
index 042d986a694..1c7a2bb26e9 100644
--- a/gdb/arch/amd64.h
+++ b/gdb/arch/amd64.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_AMD64_H
-#define ARCH_AMD64_H
+#ifndef GDB_ARCH_AMD64_H
+#define GDB_ARCH_AMD64_H
 
 #include "gdbsupport/tdesc.h"
 #include <stdint.h>
@@ -24,4 +24,4 @@
 target_desc *amd64_create_target_description (uint64_t xcr0, bool is_x32,
 					      bool is_linux, bool segments);
 
-#endif /* ARCH_AMD64_H */
+#endif /* GDB_ARCH_AMD64_H */
diff --git a/gdb/arch/arc.h b/gdb/arch/arc.h
index 1a5a9b6b492..887431ea12a 100644
--- a/gdb/arch/arc.h
+++ b/gdb/arch/arc.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_ARC_H
-#define ARCH_ARC_H
+#ifndef GDB_ARCH_ARC_H
+#define GDB_ARCH_ARC_H
 
 #include "gdbsupport/tdesc.h"
 
@@ -84,4 +84,4 @@ const target_desc *arc_lookup_target_description
 #endif /* GDBSERVER */
 
 
-#endif /* ARCH_ARC_H */
+#endif /* GDB_ARCH_ARC_H */
diff --git a/gdb/arch/arm-get-next-pcs.h b/gdb/arch/arm-get-next-pcs.h
index 77bf0b566a8..7680373c638 100644
--- a/gdb/arch/arm-get-next-pcs.h
+++ b/gdb/arch/arm-get-next-pcs.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_ARM_GET_NEXT_PCS_H
-#define ARCH_ARM_GET_NEXT_PCS_H
+#ifndef GDB_ARCH_ARM_GET_NEXT_PCS_H
+#define GDB_ARCH_ARM_GET_NEXT_PCS_H
 
 #include <vector>
 
@@ -65,4 +65,4 @@ void arm_get_next_pcs_ctor (struct arm_get_next_pcs *self,
 /* Find the next possible PCs after the current instruction executes.  */
 std::vector<CORE_ADDR> arm_get_next_pcs (struct arm_get_next_pcs *self);
 
-#endif /* ARCH_ARM_GET_NEXT_PCS_H */
+#endif /* GDB_ARCH_ARM_GET_NEXT_PCS_H */
diff --git a/gdb/arch/arm-linux.h b/gdb/arch/arm-linux.h
index 68862521bbc..39c73c34011 100644
--- a/gdb/arch/arm-linux.h
+++ b/gdb/arch/arm-linux.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_ARM_LINUX_H
-#define ARCH_ARM_LINUX_H
+#ifndef GDB_ARCH_ARM_LINUX_H
+#define GDB_ARCH_ARM_LINUX_H
 
 /* The index to access CSPR in user_regs defined in GLIBC.  */
 #define ARM_CPSR_GREGNUM 16
@@ -79,4 +79,4 @@ struct arm_get_next_pcs;
 CORE_ADDR arm_linux_get_next_pcs_fixup (struct arm_get_next_pcs *self,
 					CORE_ADDR pc);
 
-#endif /* ARCH_ARM_LINUX_H */
+#endif /* GDB_ARCH_ARM_LINUX_H */
diff --git a/gdb/arch/arm.h b/gdb/arch/arm.h
index 34cf7ca79cf..7738d9c6611 100644
--- a/gdb/arch/arm.h
+++ b/gdb/arch/arm.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_ARM_H
-#define ARCH_ARM_H
+#ifndef GDB_ARCH_ARM_H
+#define GDB_ARCH_ARM_H
 
 #include "gdbsupport/tdesc.h"
 
@@ -227,4 +227,4 @@ target_desc *arm_create_target_description (arm_fp_type fp_type, bool tls);
 
 target_desc *arm_create_mprofile_target_description (arm_m_profile_type m_type);
 
-#endif /* ARCH_ARM_H */
+#endif /* GDB_ARCH_ARM_H */
diff --git a/gdb/arch/csky.h b/gdb/arch/csky.h
index 290bf97dd12..67b2f176114 100644
--- a/gdb/arch/csky.h
+++ b/gdb/arch/csky.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_CSKY_H
-#define ARCH_CSKY_H
+#ifndef GDB_ARCH_CSKY_H
+#define GDB_ARCH_CSKY_H
 
 #include "gdbsupport/tdesc.h"
 
@@ -26,4 +26,4 @@
 
 target_desc_up csky_create_target_description (void);
 
-#endif /* ARCH_CSKY_H */
+#endif /* GDB_ARCH_CSKY_H */
diff --git a/gdb/arch/i386.h b/gdb/arch/i386.h
index d0519f1b551..1b5cc6e1095 100644
--- a/gdb/arch/i386.h
+++ b/gdb/arch/i386.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_I386_H
-#define ARCH_I386_H
+#ifndef GDB_ARCH_I386_H
+#define GDB_ARCH_I386_H
 
 #include "gdbsupport/tdesc.h"
 #include <stdint.h>
@@ -24,4 +24,4 @@
 target_desc *i386_create_target_description (uint64_t xcr0, bool is_linux,
 					     bool segments);
 
-#endif /* ARCH_I386_H */
+#endif /* GDB_ARCH_I386_H */
diff --git a/gdb/arch/loongarch.h b/gdb/arch/loongarch.h
index 7056d506bf4..07f37d8d7e8 100644
--- a/gdb/arch/loongarch.h
+++ b/gdb/arch/loongarch.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_LOONGARCH_H
-#define ARCH_LOONGARCH_H
+#ifndef GDB_ARCH_LOONGARCH_H
+#define GDB_ARCH_LOONGARCH_H
 
 #include "gdbsupport/tdesc.h"
 
@@ -128,4 +128,4 @@ const target_desc *loongarch_lookup_target_description
 
 #endif /* GDBSERVER */
 
-#endif /* ARCH_LOONGARCH_H  */
+#endif /* GDB_ARCH_LOONGARCH_H */
diff --git a/gdb/arch/ppc-linux-common.h b/gdb/arch/ppc-linux-common.h
index 05704c8f898..1f72b295de8 100644
--- a/gdb/arch/ppc-linux-common.h
+++ b/gdb/arch/ppc-linux-common.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_PPC_LINUX_COMMON_H
-#define ARCH_PPC_LINUX_COMMON_H
+#ifndef GDB_ARCH_PPC_LINUX_COMMON_H
+#define GDB_ARCH_PPC_LINUX_COMMON_H
 
 struct target_desc;
 
@@ -75,4 +75,4 @@ const struct ppc_linux_features ppc_linux_no_features = {
 const struct target_desc * ppc_linux_match_description
 (struct ppc_linux_features features);
 
-#endif /* ARCH_PPC_LINUX_COMMON_H */
+#endif /* GDB_ARCH_PPC_LINUX_COMMON_H */
diff --git a/gdb/arch/ppc-linux-tdesc.h b/gdb/arch/ppc-linux-tdesc.h
index 0a022071c08..bde6ba225bd 100644
--- a/gdb/arch/ppc-linux-tdesc.h
+++ b/gdb/arch/ppc-linux-tdesc.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_PPC_LINUX_TDESC_H
-#define ARCH_PPC_LINUX_TDESC_H
+#ifndef GDB_ARCH_PPC_LINUX_TDESC_H
+#define GDB_ARCH_PPC_LINUX_TDESC_H
 
 struct target_desc;
 
@@ -43,4 +43,4 @@ extern const struct target_desc *tdesc_powerpc_isa205_ppr_dscr_vsx64l;
 extern const struct target_desc *tdesc_powerpc_isa207_vsx64l;
 extern const struct target_desc *tdesc_powerpc_isa207_htm_vsx64l;
 
-#endif /* ARCH_PPC_LINUX_TDESC_H */
+#endif /* GDB_ARCH_PPC_LINUX_TDESC_H */
diff --git a/gdb/arch/riscv.h b/gdb/arch/riscv.h
index 925fffee18a..bf65b0bc5a8 100644
--- a/gdb/arch/riscv.h
+++ b/gdb/arch/riscv.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_RISCV_H
-#define ARCH_RISCV_H
+#ifndef GDB_ARCH_RISCV_H
+#define GDB_ARCH_RISCV_H
 
 #include "gdbsupport/tdesc.h"
 
@@ -119,4 +119,4 @@ const target_desc *riscv_lookup_target_description
 #endif /* GDBSERVER */
 
 
-#endif /* ARCH_RISCV_H */
+#endif /* GDB_ARCH_RISCV_H */
diff --git a/gdb/arch/tic6x.h b/gdb/arch/tic6x.h
index da67da7c5fb..efb3282c506 100644
--- a/gdb/arch/tic6x.h
+++ b/gdb/arch/tic6x.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_TIC6X_H
-#define ARCH_TIC6X_H
+#ifndef GDB_ARCH_TIC6X_H
+#define GDB_ARCH_TIC6X_H
 
 enum c6x_feature
 {
@@ -28,4 +28,4 @@ enum c6x_feature
 
 target_desc *tic6x_create_target_description (enum c6x_feature feature);
 
-#endif /* ARCH_TIC6X_H */
+#endif /* GDB_ARCH_TIC6X_H */
diff --git a/gdb/arch/xtensa.h b/gdb/arch/xtensa.h
index 5961641cad8..70167b304ce 100644
--- a/gdb/arch/xtensa.h
+++ b/gdb/arch/xtensa.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_XTENSA_H
-#define ARCH_XTENSA_H
+#ifndef GDB_ARCH_XTENSA_H
+#define GDB_ARCH_XTENSA_H
 
 /* Xtensa ELF core file register set representation ('.reg' section).
    Copied from target-side ELF header <xtensa/elf.h>.  */
@@ -45,4 +45,4 @@ typedef struct
 
 #define C0_NREGS   16	/* Number of A-registers to track in call0 ABI.  */
 
-#endif /* ARCH_XTENSA_H */
+#endif /* GDB_ARCH_XTENSA_H */
diff --git a/gdb/arm-fbsd-tdep.h b/gdb/arm-fbsd-tdep.h
index 26a9dbcdd21..151f26c83b7 100644
--- a/gdb/arm-fbsd-tdep.h
+++ b/gdb/arm-fbsd-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARM_FBSD_TDEP_H
-#define ARM_FBSD_TDEP_H
+#ifndef GDB_ARM_FBSD_TDEP_H
+#define GDB_ARM_FBSD_TDEP_H
 
 #include "regset.h"
 
@@ -56,4 +56,4 @@ extern const struct target_desc *
 extern const struct target_desc *
   arm_fbsd_read_description_auxv (bool tls);
 
-#endif /* ARM_FBSD_TDEP_H */
+#endif /* GDB_ARM_FBSD_TDEP_H */
diff --git a/gdb/arm-linux-tdep.h b/gdb/arm-linux-tdep.h
index a6eeb333351..7aa69ce3f4c 100644
--- a/gdb/arm-linux-tdep.h
+++ b/gdb/arm-linux-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARM_LINUX_TDEP_H
-#define ARM_LINUX_TDEP_H
+#ifndef GDB_ARM_LINUX_TDEP_H
+#define GDB_ARM_LINUX_TDEP_H
 
 struct regset;
 struct regcache;
@@ -67,4 +67,4 @@ void arm_linux_collect_nwfpe (const struct regset *regset,
 #define HWCAP_VFPv3     8192
 #define HWCAP_VFPv3D16  16384
 
-#endif /* ARM_LINUX_TDEP_H */
+#endif /* GDB_ARM_LINUX_TDEP_H */
diff --git a/gdb/arm-netbsd-tdep.h b/gdb/arm-netbsd-tdep.h
index 75b1fb9bd27..6e554d4ca21 100644
--- a/gdb/arm-netbsd-tdep.h
+++ b/gdb/arm-netbsd-tdep.h
@@ -17,11 +17,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARM_NBSD_TDEP_H
-#define ARM_NBSD_TDEP_H
+#ifndef GDB_ARM_NETBSD_TDEP_H
+#define GDB_ARM_NETBSD_TDEP_H
 
 void arm_nbsd_supply_gregset
   (const struct regset *regset, struct regcache *regcache,
    int regnum, const void *gregs, size_t len);
 
-#endif
+#endif /* GDB_ARM_NETBSD_TDEP_H */
diff --git a/gdb/arm-tdep.h b/gdb/arm-tdep.h
index 11839b0ff4d..f8049f4673c 100644
--- a/gdb/arm-tdep.h
+++ b/gdb/arm-tdep.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARM_TDEP_H
-#define ARM_TDEP_H
+#ifndef GDB_ARM_TDEP_H
+#define GDB_ARM_TDEP_H
 
 /* Forward declarations.  */
 struct regset;
@@ -326,4 +326,4 @@ const target_desc *arm_read_description (arm_fp_type fp_type, bool tls);
    type.  */
 const target_desc *arm_read_mprofile_description (arm_m_profile_type m_type);
 
-#endif /* arm-tdep.h */
+#endif /* GDB_ARM_TDEP_H */
diff --git a/gdb/async-event.h b/gdb/async-event.h
index 1027f9d6fb3..16045f42448 100644
--- a/gdb/async-event.h
+++ b/gdb/async-event.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ASYNC_EVENT_H
-#define ASYNC_EVENT_H
+#ifndef GDB_ASYNC_EVENT_H
+#define GDB_ASYNC_EVENT_H
 
 #include "gdbsupport/event-loop.h"
 
@@ -87,4 +87,4 @@ extern void clear_async_event_handler (struct async_event_handler *handler);
 
 extern void initialize_async_signal_handlers (void);
 
-#endif /* ASYNC_EVENT_H */
+#endif /* GDB_ASYNC_EVENT_H */
diff --git a/gdb/auto-load.h b/gdb/auto-load.h
index c1003aef0e3..48e6ccfc82f 100644
--- a/gdb/auto-load.h
+++ b/gdb/auto-load.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AUTO_LOAD_H
-#define AUTO_LOAD_H 1
+#ifndef GDB_AUTO_LOAD_H
+#define GDB_AUTO_LOAD_H
 
 struct objfile;
 struct program_space;
@@ -79,4 +79,4 @@ extern bool file_is_auto_load_safe (const char *filename);
 extern bool auto_load_gdb_scripts_enabled
   (const struct extension_language_defn *extlang);
 
-#endif /* AUTO_LOAD_H */
+#endif /* GDB_AUTO_LOAD_H */
diff --git a/gdb/auxv.h b/gdb/auxv.h
index aed430dd851..3faddff7771 100644
--- a/gdb/auxv.h
+++ b/gdb/auxv.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AUXV_H
-#define AUXV_H
+#ifndef GDB_AUXV_H
+#define GDB_AUXV_H
 
 #include "target.h"
 
@@ -88,4 +88,4 @@ extern void default_print_auxv_entry (struct gdbarch *gdbarch,
 extern target_xfer_partial_ftype memory_xfer_auxv;
 
 
-#endif
+#endif /* GDB_AUXV_H */
diff --git a/gdb/ax-gdb.h b/gdb/ax-gdb.h
index 9e2dfea1c51..53f48ff9e33 100644
--- a/gdb/ax-gdb.h
+++ b/gdb/ax-gdb.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AX_GDB_H
-#define AX_GDB_H
+#ifndef GDB_AX_GDB_H
+#define GDB_AX_GDB_H
 
 #include "ax.h"
 
@@ -123,4 +123,4 @@ extern agent_expr_up gen_printf (CORE_ADDR, struct gdbarch *,
 				 CORE_ADDR, LONGEST, const char *, int,
 				 int, struct expression **);
 
-#endif /* AX_GDB_H */
+#endif /* GDB_AX_GDB_H */
diff --git a/gdb/ax.h b/gdb/ax.h
index 46c2393f9e0..45fd560927b 100644
--- a/gdb/ax.h
+++ b/gdb/ax.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AX_H
-#define AX_H
+#ifndef GDB_AX_H
+#define GDB_AX_H
 
 /* It's sometimes useful to be able to debug programs that you can't
    really stop for more than a fraction of a second.  To this end, the
@@ -224,4 +224,4 @@ extern void ax_print (struct ui_file *f, struct agent_expr * EXPR);
 
 extern void ax_reqs (struct agent_expr *ax);
 
-#endif /* AX_H */
+#endif /* GDB_AX_H */
diff --git a/gdb/bcache.h b/gdb/bcache.h
index 17a09880d99..abe9e58c116 100644
--- a/gdb/bcache.h
+++ b/gdb/bcache.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef BCACHE_H
-#define BCACHE_H 1
+#ifndef GDB_BCACHE_H
+#define GDB_BCACHE_H
 
 /* A bcache is a data structure for factoring out duplication in
    read-only structures.  You give the bcache some string of bytes S.
@@ -207,4 +207,4 @@ struct bcache
 
 } /* namespace gdb */
 
-#endif /* BCACHE_H */
+#endif /* GDB_BCACHE_H */
diff --git a/gdb/bfd-target.h b/gdb/bfd-target.h
index d20c9263c4b..ab3233e8f6f 100644
--- a/gdb/bfd-target.h
+++ b/gdb/bfd-target.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef BFD_TARGET_H
-#define BFD_TARGET_H
+#ifndef GDB_BFD_TARGET_H
+#define GDB_BFD_TARGET_H
 
 #include "gdb_bfd.h"
 
@@ -27,4 +27,4 @@ struct target_ops;
 /* Given an existing BFD, re-open it as a "struct target_ops".  */
 target_ops_up target_bfd_reopen (const gdb_bfd_ref_ptr &bfd);
 
-#endif
+#endif /* GDB_BFD_TARGET_H */
diff --git a/gdb/bfin-tdep.h b/gdb/bfin-tdep.h
index dbdafae9d45..d28af50406f 100644
--- a/gdb/bfin-tdep.h
+++ b/gdb/bfin-tdep.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef BFIN_TDEP_H
-#define BFIN_TDEP_H
+#ifndef GDB_BFIN_TDEP_H
+#define GDB_BFIN_TDEP_H
 
 #include "gdbarch.h"
 
@@ -105,4 +105,4 @@ struct bfin_gdbarch_tdep : gdbarch_tdep_base
 /* Return the Blackfin ABI associated with GDBARCH.  */
 extern enum bfin_abi bfin_abi (struct gdbarch *gdbarch);
 
-#endif /* BFIN_TDEP_H */
+#endif /* GDB_BFIN_TDEP_H */
diff --git a/gdb/block.h b/gdb/block.h
index ae676c4ba67..0cc4d7d53f7 100644
--- a/gdb/block.h
+++ b/gdb/block.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef BLOCK_H
-#define BLOCK_H
+#ifndef GDB_BLOCK_H
+#define GDB_BLOCK_H
 
 #include "dictionary.h"
 #include "gdbsupport/array-view.h"
@@ -592,4 +592,4 @@ extern struct symbol *block_find_symbol (const struct block *block,
 struct blockranges *make_blockranges (struct objfile *objfile,
 				      const std::vector<blockrange> &rangevec);
 
-#endif /* BLOCK_H */
+#endif /* GDB_BLOCK_H */
diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 6da04d5ec00..4db18274e55 100644
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (BREAKPOINT_H)
-#define BREAKPOINT_H 1
+#ifndef GDB_BREAKPOINT_H
+#define GDB_BREAKPOINT_H
 
 #include "frame.h"
 #include "value.h"
@@ -2068,4 +2068,4 @@ extern void enable_disable_bp_location (bp_location *loc, bool enable);
 
 extern void notify_breakpoint_modified (breakpoint *b);
 
-#endif /* !defined (BREAKPOINT_H) */
+#endif /* GDB_BREAKPOINT_H */
diff --git a/gdb/bsd-kvm.h b/gdb/bsd-kvm.h
index 1606eb3acea..6ddd154da4a 100644
--- a/gdb/bsd-kvm.h
+++ b/gdb/bsd-kvm.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef BSD_KVM_H
-#define BSD_KVM_H
+#ifndef GDB_BSD_KVM_H
+#define GDB_BSD_KVM_H
 
 struct pcb;
 struct regcache;
@@ -30,4 +30,4 @@ struct regcache;
 extern void
   bsd_kvm_add_target (int (*supply_pcb)(struct regcache *, struct pcb *));
 
-#endif /* bsd-kvm.h */
+#endif /* GDB_BSD_KVM_H */
diff --git a/gdb/bsd-uthread.h b/gdb/bsd-uthread.h
index eabd82dbdaf..e236eaae4f6 100644
--- a/gdb/bsd-uthread.h
+++ b/gdb/bsd-uthread.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef BSD_UTHREAD_H
-#define BSD_UTHREAD_H 1
+#ifndef GDB_BSD_UTHREAD_H
+#define GDB_BSD_UTHREAD_H
 
 /* Set the function that supplies registers for an inactive thread for
    architecture GDBARCH to SUPPLY_UTHREAD.  */
@@ -35,4 +35,4 @@ extern void bsd_uthread_set_collect_uthread (struct gdbarch *gdbarch,
 			     void (*collect_uthread) (const struct regcache *,
 						      int, CORE_ADDR));
 
-#endif /* bsd-uthread.h */
+#endif /* GDB_BSD_UTHREAD_H */
diff --git a/gdb/bt-utils.h b/gdb/bt-utils.h
index ec2d14a5484..819dd8caf86 100644
--- a/gdb/bt-utils.h
+++ b/gdb/bt-utils.h
@@ -18,8 +18,8 @@
 /* Support for printing a backtrace when GDB hits an error.  This is not
    for printing backtraces of the inferior, but backtraces of GDB itself.  */
 
-#ifndef BT_UTILS_H
-#define BT_UTILS_H
+#ifndef GDB_BT_UTILS_H
+#define GDB_BT_UTILS_H
 
 #ifdef HAVE_LIBBACKTRACE
 # include "backtrace.h"
@@ -71,4 +71,4 @@ extern void gdb_internal_backtrace ();
 extern void gdb_internal_backtrace_set_cmd (const char *args, int from_tty,
 					    cmd_list_element *c);
 
-#endif /* BT_UTILS_H */
+#endif /* GDB_BT_UTILS_H */
diff --git a/gdb/btrace.h b/gdb/btrace.h
index f05ec2bca04..dc9541960e0 100644
--- a/gdb/btrace.h
+++ b/gdb/btrace.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef BTRACE_H
-#define BTRACE_H
+#ifndef GDB_BTRACE_H
+#define GDB_BTRACE_H
 
 /* Branch tracing (btrace) is a per-thread control-flow execution trace of the
    inferior.  For presentation purposes, the branch trace is represented as a
@@ -498,4 +498,4 @@ extern int btrace_is_replaying (struct thread_info *tp);
 /* Return non-zero if the branch trace for TP is empty; zero otherwise.  */
 extern int btrace_is_empty (struct thread_info *tp);
 
-#endif /* BTRACE_H */
+#endif /* GDB_BTRACE_H */
diff --git a/gdb/build-id.h b/gdb/build-id.h
index 15bd8a964dc..5bf338299b1 100644
--- a/gdb/build-id.h
+++ b/gdb/build-id.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef BUILD_ID_H
-#define BUILD_ID_H
+#ifndef GDB_BUILD_ID_H
+#define GDB_BUILD_ID_H
 
 #include "gdb_bfd.h"
 #include "gdbsupport/rsp-low.h"
@@ -70,4 +70,4 @@ build_id_to_string (const bfd_build_id *build_id)
   return bin2hex (build_id->data, build_id->size);
 }
 
-#endif /* BUILD_ID_H */
+#endif /* GDB_BUILD_ID_H */
diff --git a/gdb/buildsym-legacy.h b/gdb/buildsym-legacy.h
index 1fb545831b8..1f032c42751 100644
--- a/gdb/buildsym-legacy.h
+++ b/gdb/buildsym-legacy.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef BUILDSYM_LEGACY_H
-#define BUILDSYM_LEGACY_H
+#ifndef GDB_BUILDSYM_LEGACY_H
+#define GDB_BUILDSYM_LEGACY_H
 
 #include "buildsym.h"
 
@@ -144,4 +144,4 @@ extern struct pending **get_global_symbols ();
 
 extern struct buildsym_compunit *get_buildsym_compunit ();
 
-#endif /* BUILDSYM_LEGACY_H */
+#endif /* GDB_BUILDSYM_LEGACY_H */
diff --git a/gdb/buildsym.h b/gdb/buildsym.h
index c1eed247d25..974645c1c47 100644
--- a/gdb/buildsym.h
+++ b/gdb/buildsym.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (BUILDSYM_H)
-#define BUILDSYM_H 1
+#ifndef GDB_BUILDSYM_H
+#define GDB_BUILDSYM_H
 
 #include "gdbsupport/gdb_obstack.h"
 #include "symtab.h"
@@ -456,4 +456,4 @@ extern void add_symbol_to_list (struct symbol *symbol,
 extern struct symbol *find_symbol_in_list (struct pending *list,
 					   char *name, int length);
 
-#endif /* defined (BUILDSYM_H) */
+#endif /* GDB_BUILDSYM_H */
diff --git a/gdb/c-exp.h b/gdb/c-exp.h
index a76f1bc8213..a6c084d32be 100644
--- a/gdb/c-exp.h
+++ b/gdb/c-exp.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef C_EXP_H
-#define C_EXP_H
+#ifndef GDB_C_EXP_H
+#define GDB_C_EXP_H
 
 #include "expop.h"
 #include "objc-lang.h"
@@ -217,4 +217,4 @@ class opencl_ternop_cond_operation
 
 }/* namespace expr */
 
-#endif /* C_EXP_H */
+#endif /* GDB_C_EXP_H */
diff --git a/gdb/c-lang.h b/gdb/c-lang.h
index 8dc47ac8be5..0e733d810d8 100644
--- a/gdb/c-lang.h
+++ b/gdb/c-lang.h
@@ -18,8 +18,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#if !defined (C_LANG_H)
-#define C_LANG_H 1
+#ifndef GDB_C_LANG_H
+#define GDB_C_LANG_H
 
 struct ui_file;
 struct language_arch_info;
@@ -174,4 +174,4 @@ extern std::string cplus_compute_program (compile_instance *inst,
 
 extern gdb::unique_xmalloc_ptr<char> c_canonicalize_name (const char *name);
 
-#endif /* !defined (C_LANG_H) */
+#endif /* GDB_C_LANG_H */
diff --git a/gdb/c-support.h b/gdb/c-support.h
index 3718181ba81..30858d1e1af 100644
--- a/gdb/c-support.h
+++ b/gdb/c-support.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef C_SUPPORT_H
-#define C_SUPPORT_H
+#ifndef GDB_C_SUPPORT_H
+#define GDB_C_SUPPORT_H
 
 #include "safe-ctype.h"
 
@@ -43,4 +43,4 @@ c_ident_is_alnum (unsigned char ch)
   return ISALNUM (ch) || ch >= 0x80;
 }
 
-#endif /* C_SUPPORT_H */
+#endif /* GDB_C_SUPPORT_H */
diff --git a/gdb/cgen-remap.h b/gdb/cgen-remap.h
index 35f09c1269b..30b84575263 100644
--- a/gdb/cgen-remap.h
+++ b/gdb/cgen-remap.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CGEN_REMAP_H
-#define CGEN_REMAP_H
+#ifndef GDB_CGEN_REMAP_H
+#define GDB_CGEN_REMAP_H
 
 /* Remap cgen interface names, so we can have multiple cgen generated include
    files in gdb without violating c++ ODR.  */
@@ -50,4 +50,4 @@
 #define CGEN_OPERAND		GDB_CGEN_REMAP (CGEN_OPERAND)
 #define CGEN_MAYBE_MULTI_IFLD	GDB_CGEN_REMAP (CGEN_MAYBE_MULTI_IFLD)
 
-#endif /* CGEN_REMAP_H */
+#endif /* GDB_CGEN_REMAP_H */
diff --git a/gdb/charset-list.h b/gdb/charset-list.h
index c4d0867d580..9da3da2590a 100644
--- a/gdb/charset-list.h
+++ b/gdb/charset-list.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CHARSET_LIST_H
-#define CHARSET_LIST_H
+#ifndef GDB_CHARSET_LIST_H
+#define GDB_CHARSET_LIST_H
 
 /* Note that the first entry must always be "auto".
    The remaining entries were created by running this script:
@@ -1192,4 +1192,4 @@
 "WS2", \
 "YU",
 
-#endif /* CHARSET_LIST_H */
+#endif /* GDB_CHARSET_LIST_H */
diff --git a/gdb/charset.h b/gdb/charset.h
index 4263dc147e9..c4e0de553d3 100644
--- a/gdb/charset.h
+++ b/gdb/charset.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CHARSET_H
-#define CHARSET_H
+#ifndef GDB_CHARSET_H
+#define GDB_CHARSET_H
 
 #include "gdbsupport/def-vector.h"
 
@@ -165,4 +165,4 @@ char host_letter_to_control_character (char c);
 #define HOST_UTF32 "UTF-32LE"
 #endif
 
-#endif /* CHARSET_H */
+#endif /* GDB_CHARSET_H */
diff --git a/gdb/cli-out.h b/gdb/cli-out.h
index f17cb0c9856..5799df559f4 100644
--- a/gdb/cli-out.h
+++ b/gdb/cli-out.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CLI_OUT_H
-#define CLI_OUT_H
+#ifndef GDB_CLI_OUT_H
+#define GDB_CLI_OUT_H
 
 #include "ui-out.h"
 #include <chrono>
@@ -112,4 +112,4 @@ class cli_ui_out : public ui_out
 
 extern void cli_display_match_list (char **matches, int len, int max);
 
-#endif
+#endif /* GDB_CLI_OUT_H */
diff --git a/gdb/cli/cli-cmds.h b/gdb/cli/cli-cmds.h
index 8f26ca3e17a..6719ad7cae3 100644
--- a/gdb/cli/cli-cmds.h
+++ b/gdb/cli/cli-cmds.h
@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CLI_CLI_CMDS_H
-#define CLI_CLI_CMDS_H
+#ifndef GDB_CLI_CLI_CMDS_H
+#define GDB_CLI_CLI_CMDS_H
 
 #include "gdbsupport/filestuff.h"
 #include <optional>
@@ -202,4 +202,4 @@ extern void with_command_completer_1 (const char *set_cmd_prefix,
 				      completion_tracker &tracker,
 				      const char *text);
 
-#endif /* CLI_CLI_CMDS_H */
+#endif /* GDB_CLI_CLI_CMDS_H */
diff --git a/gdb/cli/cli-decode.h b/gdb/cli/cli-decode.h
index 7365c3f0157..2219d62fbf3 100644
--- a/gdb/cli/cli-decode.h
+++ b/gdb/cli/cli-decode.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CLI_CLI_DECODE_H
-#define CLI_CLI_DECODE_H
+#ifndef GDB_CLI_CLI_DECODE_H
+#define GDB_CLI_CLI_DECODE_H
 
 /* This file defines the private interfaces for any code implementing
    command internals.  */
@@ -313,4 +313,4 @@ extern int cli_user_command_p (struct cmd_list_element *);
 
 extern int find_command_name_length (const char *);
 
-#endif /* CLI_CLI_DECODE_H */
+#endif /* GDB_CLI_CLI_DECODE_H */
diff --git a/gdb/cli/cli-interp.h b/gdb/cli/cli-interp.h
index 137eb466f6b..fc3dee7b68b 100644
--- a/gdb/cli/cli-interp.h
+++ b/gdb/cli/cli-interp.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CLI_CLI_INTERP_H
-#define CLI_CLI_INTERP_H
+#ifndef GDB_CLI_CLI_INTERP_H
+#define GDB_CLI_CLI_INTERP_H
 
 #include "interps.h"
 
@@ -69,4 +69,4 @@ class cli_interp_base : public interp
 extern int should_print_stop_to_console (struct interp *interp,
 					 struct thread_info *tp);
 
-#endif /* CLI_CLI_INTERP_H */
+#endif /* GDB_CLI_CLI_INTERP_H */
diff --git a/gdb/cli/cli-option.h b/gdb/cli/cli-option.h
index bbe281d9721..35e5bdcd684 100644
--- a/gdb/cli/cli-option.h
+++ b/gdb/cli/cli-option.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CLI_OPTION_H
-#define CLI_OPTION_H 1
+#ifndef GDB_CLI_CLI_OPTION_H
+#define GDB_CLI_CLI_OPTION_H
 
 #include <optional>
 #include "gdbsupport/array-view.h"
@@ -379,4 +379,4 @@ extern void add_setshow_cmds_for_options (command_class cmd_class, void *data,
 } /* namespace option */
 } /* namespace gdb */
 
-#endif /* CLI_OPTION_H */
+#endif /* GDB_CLI_CLI_OPTION_H */
diff --git a/gdb/cli/cli-script.h b/gdb/cli/cli-script.h
index d36743e5a31..1f0cfd3c1dd 100644
--- a/gdb/cli/cli-script.h
+++ b/gdb/cli/cli-script.h
@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CLI_CLI_SCRIPT_H
-#define CLI_CLI_SCRIPT_H
+#ifndef GDB_CLI_CLI_SCRIPT_H
+#define GDB_CLI_CLI_SCRIPT_H
 
 #include "gdbsupport/function-view.h"
 
@@ -181,4 +181,4 @@ extern void print_command_trace (const char *cmd, ...)
 
 extern void reset_command_nest_depth (void);
 
-#endif /* CLI_CLI_SCRIPT_H */
+#endif /* GDB_CLI_CLI_SCRIPT_H */
diff --git a/gdb/cli/cli-setshow.h b/gdb/cli/cli-setshow.h
index 4b8875d5794..9eac86fc674 100644
--- a/gdb/cli/cli-setshow.h
+++ b/gdb/cli/cli-setshow.h
@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CLI_CLI_SETSHOW_H
-#define CLI_CLI_SETSHOW_H
+#ifndef GDB_CLI_CLI_SETSHOW_H
+#define GDB_CLI_CLI_SETSHOW_H
 
 #include <string>
 
@@ -60,4 +60,4 @@ extern std::string get_setshow_command_value_string (const setting &var);
 
 extern void cmd_show_list (struct cmd_list_element *list, int from_tty);
 
-#endif /* CLI_CLI_SETSHOW_H */
+#endif /* GDB_CLI_CLI_SETSHOW_H */
diff --git a/gdb/cli/cli-style.h b/gdb/cli/cli-style.h
index 31d40ed65ca..1a9c8e65b60 100644
--- a/gdb/cli/cli-style.h
+++ b/gdb/cli/cli-style.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CLI_CLI_STYLE_H
-#define CLI_CLI_STYLE_H
+#ifndef GDB_CLI_CLI_STYLE_H
+#define GDB_CLI_CLI_STYLE_H
 
 #include "ui-file.h"
 #include "command.h"
@@ -150,4 +150,4 @@ extern bool disassembler_styling;
 /* True if styling is enabled.  */
 extern bool cli_styling;
 
-#endif /* CLI_CLI_STYLE_H */
+#endif /* GDB_CLI_CLI_STYLE_H */
diff --git a/gdb/cli/cli-utils.h b/gdb/cli/cli-utils.h
index 54b45fdc796..e11430ecb70 100644
--- a/gdb/cli/cli-utils.h
+++ b/gdb/cli/cli-utils.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CLI_CLI_UTILS_H
-#define CLI_CLI_UTILS_H
+#ifndef GDB_CLI_CLI_UTILS_H
+#define GDB_CLI_CLI_UTILS_H
 
 #include "completer.h"
 
@@ -225,4 +225,4 @@ struct qcs_flags
    message.  */
 extern void validate_flags_qcs (const char *which_command, qcs_flags *flags);
 
-#endif /* CLI_CLI_UTILS_H */
+#endif /* GDB_CLI_CLI_UTILS_H */
diff --git a/gdb/coff-pe-read.h b/gdb/coff-pe-read.h
index d596240f97d..c1510460f9b 100644
--- a/gdb/coff-pe-read.h
+++ b/gdb/coff-pe-read.h
@@ -19,8 +19,8 @@
 
    Contributed by Raoul M. Gough (RaoulGough@yahoo.co.uk).  */
 
-#if !defined (COFF_PE_READ_H)
-#define COFF_PE_READ_H
+#ifndef GDB_COFF_PE_READ_H
+#define GDB_COFF_PE_READ_H
 
 class minimal_symbol_reader;
 struct objfile;
@@ -35,4 +35,4 @@ extern void read_pe_exported_syms (minimal_symbol_reader &reader,
    Returns default value 0x1000 if information is not found.  */
 extern CORE_ADDR pe_text_section_offset (struct bfd *abfd);
 
-#endif /* !defined (COFF_PE_READ_H) */
+#endif /* GDB_COFF_PE_READ_H */
diff --git a/gdb/command.h b/gdb/command.h
index 615f4e524aa..4f83d3515c3 100644
--- a/gdb/command.h
+++ b/gdb/command.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (COMMAND_H)
-#define COMMAND_H 1
+#ifndef GDB_COMMAND_H
+#define GDB_COMMAND_H
 
 #include "gdbsupport/gdb_vecs.h"
 #include "gdbsupport/scoped_restore.h"
@@ -934,4 +934,4 @@ extern void not_just_help_class_command (const char *, int);
 extern void cmd_func (struct cmd_list_element *cmd,
 		      const char *args, int from_tty);
 
-#endif /* !defined (COMMAND_H) */
+#endif /* GDB_COMMAND_H */
diff --git a/gdb/compile/compile-c.h b/gdb/compile/compile-c.h
index 4670d671a9f..b77b7aab087 100644
--- a/gdb/compile/compile-c.h
+++ b/gdb/compile/compile-c.h
@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMPILE_COMPILE_C_H
-#define COMPILE_COMPILE_C_H
+#ifndef GDB_COMPILE_COMPILE_C_H
+#define GDB_COMPILE_COMPILE_C_H
 
 #include "compile/compile.h"
 #include "gdbsupport/enum-flags.h"
@@ -93,4 +93,4 @@ extern std::string c_get_range_decl_name (const struct dynamic_prop *prop);
 extern gdb::unique_xmalloc_ptr<char>
   c_symbol_substitution_name (struct symbol *sym);
 
-#endif /* COMPILE_COMPILE_C_H */
+#endif /* GDB_COMPILE_COMPILE_C_H */
diff --git a/gdb/compile/compile-cplus.h b/gdb/compile/compile-cplus.h
index a714b6dab3c..d3b2d3e9843 100644
--- a/gdb/compile/compile-cplus.h
+++ b/gdb/compile/compile-cplus.h
@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMPILE_COMPILE_CPLUS_H
-#define COMPILE_COMPILE_CPLUS_H
+#ifndef GDB_COMPILE_COMPILE_CPLUS_H
+#define GDB_COMPILE_COMPILE_CPLUS_H
 
 #include "compile/compile.h"
 #include "gdbsupport/enum-flags.h"
@@ -204,4 +204,4 @@ class compile_cplus_instance : public compile_instance
 enum gcc_cp_symbol_kind get_method_access_flag (const struct type *type,
 						int fni, int num);
 
-#endif /* COMPILE_COMPILE_CPLUS_H */
+#endif /* GDB_COMPILE_COMPILE_CPLUS_H */
diff --git a/gdb/compile/compile-internal.h b/gdb/compile/compile-internal.h
index 666406b2395..f4cc9ee4984 100644
--- a/gdb/compile/compile-internal.h
+++ b/gdb/compile/compile-internal.h
@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMPILE_COMPILE_INTERNAL_H
-#define COMPILE_COMPILE_INTERNAL_H
+#ifndef GDB_COMPILE_COMPILE_INTERNAL_H
+#define GDB_COMPILE_COMPILE_INTERNAL_H
 
 #include "gcc-c-interface.h"
 #include "gdbsupport/gdb-hashtab.h"
@@ -80,4 +80,4 @@ class compile_file_names
   std::string m_object_file;
 };
 
-#endif /* COMPILE_COMPILE_INTERNAL_H */
+#endif /* GDB_COMPILE_COMPILE_INTERNAL_H */
diff --git a/gdb/compile/compile-object-load.h b/gdb/compile/compile-object-load.h
index eb6eb0dd871..bb414f90df4 100644
--- a/gdb/compile/compile-object-load.h
+++ b/gdb/compile/compile-object-load.h
@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMPILE_COMPILE_OBJECT_LOAD_H
-#define COMPILE_COMPILE_OBJECT_LOAD_H
+#ifndef GDB_COMPILE_COMPILE_OBJECT_LOAD_H
+#define GDB_COMPILE_COMPILE_OBJECT_LOAD_H
 
 #include "compile-internal.h"
 #include <list>
@@ -94,4 +94,4 @@ extern compile_module_up compile_object_load
   (const compile_file_names &fnames,
    enum compile_i_scope_types scope, void *scope_data);
 
-#endif /* COMPILE_COMPILE_OBJECT_LOAD_H */
+#endif /* GDB_COMPILE_COMPILE_OBJECT_LOAD_H */
diff --git a/gdb/compile/compile-object-run.h b/gdb/compile/compile-object-run.h
index 5d9f23c6a39..64b2bd90a99 100644
--- a/gdb/compile/compile-object-run.h
+++ b/gdb/compile/compile-object-run.h
@@ -14,11 +14,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMPILE_COMPILE_OBJECT_RUN_H
-#define COMPILE_COMPILE_OBJECT_RUN_H
+#ifndef GDB_COMPILE_COMPILE_OBJECT_RUN_H
+#define GDB_COMPILE_COMPILE_OBJECT_RUN_H
 
 #include "compile-object-load.h"
 
 extern void compile_object_run (compile_module_up &&module);
 
-#endif /* COMPILE_COMPILE_OBJECT_RUN_H */
+#endif /* GDB_COMPILE_COMPILE_OBJECT_RUN_H */
diff --git a/gdb/compile/compile.h b/gdb/compile/compile.h
index d584df6661c..14b97c4b91c 100644
--- a/gdb/compile/compile.h
+++ b/gdb/compile/compile.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMPILE_COMPILE_H
-#define COMPILE_COMPILE_H
+#ifndef GDB_COMPILE_COMPILE_H
+#define GDB_COMPILE_COMPILE_H
 
 #include "gcc-c-interface.h"
 
@@ -231,4 +231,4 @@ extern void compile_print_value (struct value *val, void *data_voidp);
 /* Command element for the 'compile' command.  */
 extern cmd_list_element *compile_cmd_element;
 
-#endif /* COMPILE_COMPILE_H */
+#endif /* GDB_COMPILE_COMPILE_H */
diff --git a/gdb/compile/gcc-c-plugin.h b/gdb/compile/gcc-c-plugin.h
index 4008807526b..d12472f01c1 100644
--- a/gdb/compile/gcc-c-plugin.h
+++ b/gdb/compile/gcc-c-plugin.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMPILE_GCC_C_PLUGIN_H
-#define COMPILE_GCC_C_PLUGIN_H
+#ifndef GDB_COMPILE_GCC_C_PLUGIN_H
+#define GDB_COMPILE_GCC_C_PLUGIN_H
 
 #include "compile-internal.h"
 
@@ -68,4 +68,4 @@ class gcc_c_plugin
   struct gcc_c_context *m_context;
 };
 
-#endif /* COMPILE_GCC_C_PLUGIN_H */
+#endif /* GDB_COMPILE_GCC_C_PLUGIN_H */
diff --git a/gdb/compile/gcc-cp-plugin.h b/gdb/compile/gcc-cp-plugin.h
index cf8ccd90725..8f369934127 100644
--- a/gdb/compile/gcc-cp-plugin.h
+++ b/gdb/compile/gcc-cp-plugin.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMPILE_GCC_CP_PLUGIN_H
-#define COMPILE_GCC_CP_PLUGIN_H
+#ifndef GDB_COMPILE_GCC_CP_PLUGIN_H
+#define GDB_COMPILE_GCC_CP_PLUGIN_H
 
 /* A class representing the GCC C++ plug-in.  */
 
@@ -87,4 +87,4 @@ class gcc_cp_plugin
   struct gcc_cp_context *m_context;
 };
 
-#endif /* COMPILE_GCC_CP_PLUGIN_H */
+#endif /* GDB_COMPILE_GCC_CP_PLUGIN_H */
diff --git a/gdb/complaints.h b/gdb/complaints.h
index 995c35e0ab0..ab91d05b8a0 100644
--- a/gdb/complaints.h
+++ b/gdb/complaints.h
@@ -18,8 +18,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#if !defined (COMPLAINTS_H)
-#define COMPLAINTS_H
+#ifndef GDB_COMPLAINTS_H
+#define GDB_COMPLAINTS_H
 
 #include <unordered_set>
 
@@ -109,4 +109,4 @@ class complaint_interceptor final : public warning_hook_handler_type
 
 extern void re_emit_complaints (const complaint_collection &);
 
-#endif /* !defined (COMPLAINTS_H) */
+#endif /* GDB_COMPLAINTS_H */
diff --git a/gdb/completer.h b/gdb/completer.h
index 98a12f3907c..9ca97c2b435 100644
--- a/gdb/completer.h
+++ b/gdb/completer.h
@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (COMPLETER_H)
-#define COMPLETER_H 1
+#ifndef GDB_COMPLETER_H
+#define GDB_COMPLETER_H
 
 #include "gdbsupport/gdb-hashtab.h"
 #include "gdbsupport/gdb_vecs.h"
@@ -661,4 +661,4 @@ extern bool skip_over_slash_fmt (completion_tracker &tracker,
 
 extern int max_completions;
 
-#endif /* defined (COMPLETER_H) */
+#endif /* GDB_COMPLETER_H */
diff --git a/gdb/config/nm-linux.h b/gdb/config/nm-linux.h
index 4ac42cdae1a..d599d3fdef5 100644
--- a/gdb/config/nm-linux.h
+++ b/gdb/config/nm-linux.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CONFIG_NM_LINUX_H
-#define CONFIG_NM_LINUX_H
+#ifndef GDB_CONFIG_NM_LINUX_H
+#define GDB_CONFIG_NM_LINUX_H
 
 /* Use elf_gregset_t and elf_fpregset_t, rather than
    gregset_t and fpregset_t.  */
@@ -26,4 +26,4 @@
 #define GDB_GREGSET_T  elf_gregset_t
 #define GDB_FPREGSET_T elf_fpregset_t
 
-#endif /* CONFIG_NM_LINUX_H */
+#endif /* GDB_CONFIG_NM_LINUX_H */
diff --git a/gdb/config/nm-nto.h b/gdb/config/nm-nto.h
index 5a002df5548..b06cd1f5e03 100644
--- a/gdb/config/nm-nto.h
+++ b/gdb/config/nm-nto.h
@@ -19,11 +19,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CONFIG_NM_NTO_H
-#define CONFIG_NM_NTO_H
+#ifndef GDB_CONFIG_NM_NTO_H
+#define GDB_CONFIG_NM_NTO_H
 
 /* Setup the valid realtime signal range.  */
 #define REALTIME_LO 41
 #define REALTIME_HI 56
 
-#endif /* CONFIG_NM_NTO_H */
+#endif /* GDB_CONFIG_NM_NTO_H */
diff --git a/gdb/cp-abi.h b/gdb/cp-abi.h
index fdbe4843129..6c8d9043463 100644
--- a/gdb/cp-abi.h
+++ b/gdb/cp-abi.h
@@ -20,8 +20,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CP_ABI_H
-#define CP_ABI_H
+#ifndef GDB_CP_ABI_H
+#define GDB_CP_ABI_H
 
 struct fn_field;
 struct type;
@@ -255,4 +255,4 @@ struct cp_abi_ops
 extern int register_cp_abi (struct cp_abi_ops *abi);
 extern void set_cp_abi_as_auto_default (const char *short_name);
 
-#endif /* CP_ABI_H */
+#endif /* GDB_CP_ABI_H */
diff --git a/gdb/cp-support.h b/gdb/cp-support.h
index 4015126154b..e2d480b2f16 100644
--- a/gdb/cp-support.h
+++ b/gdb/cp-support.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CP_SUPPORT_H
-#define CP_SUPPORT_H
+#ifndef GDB_CP_SUPPORT_H
+#define GDB_CP_SUPPORT_H
 
 #include "symtab.h"
 #include "gdbsupport/gdb_vecs.h"
@@ -212,4 +212,4 @@ extern char *gdb_cplus_demangle_print (int options,
 
 extern const char *find_toplevel_char (const char *s, char c);
 
-#endif /* CP_SUPPORT_H */
+#endif /* GDB_CP_SUPPORT_H */
diff --git a/gdb/cris-tdep.h b/gdb/cris-tdep.h
index f4f4744adaf..8be95473e21 100644
--- a/gdb/cris-tdep.h
+++ b/gdb/cris-tdep.h
@@ -20,8 +20,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CRIS_TDEP_H
-#define CRIS_TDEP_H
+#ifndef GDB_CRIS_TDEP_H
+#define GDB_CRIS_TDEP_H
 
 #include "gdbarch.h"
 
@@ -33,4 +33,4 @@ struct cris_gdbarch_tdep : gdbarch_tdep_base
   int cris_dwarf2_cfi = 0;
 };
 
-#endif /* CRIS_TDEP_H */
+#endif /* GDB_CRIS_TDEP_H */
diff --git a/gdb/csky-tdep.h b/gdb/csky-tdep.h
index e5516e83550..29917192298 100644
--- a/gdb/csky-tdep.h
+++ b/gdb/csky-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CSKY_TDEP_H
-#define CSKY_TDEP_H
+#ifndef GDB_CSKY_TDEP_H
+#define GDB_CSKY_TDEP_H
 
 #include "gdbarch.h"
 
@@ -390,4 +390,4 @@ enum csky_regnum
 #define CSKY_LRW_T1_PC_8    0x2ea8d
 #define CSKY_JMP_T1_VS_NOP  0x6c037834
 
-#endif
+#endif /* GDB_CSKY_TDEP_H */
diff --git a/gdb/ctfread.h b/gdb/ctfread.h
index ff348a2487b..711a1dd2902 100644
--- a/gdb/ctfread.h
+++ b/gdb/ctfread.h
@@ -17,9 +17,9 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CTFREAD_H
-#define CTFREAD_H
+#ifndef GDB_CTFREAD_H
+#define GDB_CTFREAD_H
 
 extern void elfctf_build_psymtabs (struct objfile *objfile);
 
-#endif /* CTFREAD_H */
+#endif /* GDB_CTFREAD_H */
diff --git a/gdb/d-lang.h b/gdb/d-lang.h
index ecf194d8155..8a944472b32 100644
--- a/gdb/d-lang.h
+++ b/gdb/d-lang.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (D_LANG_H)
-#define D_LANG_H 1
+#ifndef GDB_D_LANG_H
+#define GDB_D_LANG_H
 
 #include "symtab.h"
 
@@ -84,4 +84,4 @@ extern void d_value_print_inner (struct value *val,
 				 struct ui_file *stream, int recurse,
 				 const struct value_print_options *options);
 
-#endif /* !defined (D_LANG_H) */
+#endif /* GDB_D_LANG_H */
diff --git a/gdb/darwin-nat.h b/gdb/darwin-nat.h
index 71aee57f61a..4ead0ea7003 100644
--- a/gdb/darwin-nat.h
+++ b/gdb/darwin-nat.h
@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef DARWIN_NAT_H
-#define DARWIN_NAT_H
+#ifndef GDB_DARWIN_NAT_H
+#define GDB_DARWIN_NAT_H
 
 #include "inf-child.h"
 #include <mach/mach.h>
@@ -210,4 +210,4 @@ void darwin_set_sstep (thread_t thread, int enable);
 
 void darwin_check_osabi (darwin_inferior *inf, thread_t thread);
 
-#endif /* DARWIN_NAT_H */
+#endif /* GDB_DARWIN_NAT_H */
diff --git a/gdb/dcache.h b/gdb/dcache.h
index 101e65dc41f..21f49e522c5 100644
--- a/gdb/dcache.h
+++ b/gdb/dcache.h
@@ -18,8 +18,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef DCACHE_H
-#define DCACHE_H
+#ifndef GDB_DCACHE_H
+#define GDB_DCACHE_H
 
 #include "target.h"
 
@@ -52,4 +52,4 @@ void dcache_update (DCACHE *dcache, enum target_xfer_status status,
 		    CORE_ADDR memaddr, const gdb_byte *myaddr,
 		    ULONGEST len);
 
-#endif /* DCACHE_H */
+#endif /* GDB_DCACHE_H */
diff --git a/gdb/debuginfod-support.h b/gdb/debuginfod-support.h
index 2b816fd4b82..2b396dc13c1 100644
--- a/gdb/debuginfod-support.h
+++ b/gdb/debuginfod-support.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef DEBUGINFOD_SUPPORT_H
-#define DEBUGINFOD_SUPPORT_H
+#ifndef GDB_DEBUGINFOD_SUPPORT_H
+#define GDB_DEBUGINFOD_SUPPORT_H
 
 #include "gdbsupport/scoped_fd.h"
 
@@ -105,4 +105,4 @@ extern scoped_fd debuginfod_section_query (const unsigned char *build_id,
 					   const char *section_name,
 					   gdb::unique_xmalloc_ptr<char>
 					     *destname);
-#endif /* DEBUGINFOD_SUPPORT_H */
+#endif /* GDB_DEBUGINFOD_SUPPORT_H */
diff --git a/gdb/defs.h b/gdb/defs.h
index cf471bf5d66..212599b2bcc 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef DEFS_H
-#define DEFS_H
+#ifndef GDB_DEFS_H
+#define GDB_DEFS_H
 
 #ifdef GDBSERVER
 #  error gdbserver should not include gdb/defs.h
@@ -619,4 +619,4 @@ DEF_ENUM_FLAGS_TYPE (enum user_selected_what_flag, user_selected_what);
 
 #include "utils.h"
 
-#endif /* #ifndef DEFS_H */
+#endif /* GDB_DEFS_H */
diff --git a/gdb/dicos-tdep.h b/gdb/dicos-tdep.h
index 1e3eb41a41f..5305debd707 100644
--- a/gdb/dicos-tdep.h
+++ b/gdb/dicos-tdep.h
@@ -17,10 +17,10 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef DICOS_TDEP_H
-#define DICOS_TDEP_H
+#ifndef GDB_DICOS_TDEP_H
+#define GDB_DICOS_TDEP_H
 
 extern void dicos_init_abi (struct gdbarch *gdbarch);
 extern int dicos_load_module_p (bfd *abfd, int header_size);
 
-#endif /* dicos-tdep.h */
+#endif /* GDB_DICOS_TDEP_H */
diff --git a/gdb/dictionary.h b/gdb/dictionary.h
index 6f602f4a18b..a06aa1738f1 100644
--- a/gdb/dictionary.h
+++ b/gdb/dictionary.h
@@ -20,8 +20,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef DICTIONARY_H
-#define DICTIONARY_H
+#ifndef GDB_DICTIONARY_H
+#define GDB_DICTIONARY_H
 
 #include "symfile.h"
 
@@ -208,4 +208,4 @@ struct mdict_iterator_wrapper
   struct mdict_iterator m_iter;
 };
 
-#endif /* DICTIONARY_H */
+#endif /* GDB_DICTIONARY_H */
diff --git a/gdb/disasm-flags.h b/gdb/disasm-flags.h
index b2f0ec95b07..9d4011cebf2 100644
--- a/gdb/disasm-flags.h
+++ b/gdb/disasm-flags.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef DISASM_FLAGS_H
-#define DISASM_FLAGS_H
+#ifndef GDB_DISASM_FLAGS_H
+#define GDB_DISASM_FLAGS_H
 
 #include "gdbsupport/enum-flags.h"
 
@@ -37,4 +37,4 @@ enum gdb_disassembly_flag : unsigned
   };
 DEF_ENUM_FLAGS_TYPE (enum gdb_disassembly_flag, gdb_disassembly_flags);
 
-#endif /* DISASM_FLAGS_H */
+#endif /* GDB_DISASM_FLAGS_H */
diff --git a/gdb/disasm.h b/gdb/disasm.h
index 9282632b270..60d7e0fc834 100644
--- a/gdb/disasm.h
+++ b/gdb/disasm.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef DISASM_H
-#define DISASM_H
+#ifndef GDB_DISASM_H
+#define GDB_DISASM_H
 
 #include "dis-asm.h"
 #include "disasm-flags.h"
@@ -391,4 +391,4 @@ extern const char *get_disassembler_options (struct gdbarch *gdbarch);
 
 extern void set_disassembler_options (const char *options);
 
-#endif
+#endif /* GDB_DISASM_H */
diff --git a/gdb/displaced-stepping.h b/gdb/displaced-stepping.h
index ba0d56c2a1f..d7a537a58c9 100644
--- a/gdb/displaced-stepping.h
+++ b/gdb/displaced-stepping.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef DISPLACED_STEPPING_H
-#define DISPLACED_STEPPING_H
+#ifndef GDB_DISPLACED_STEPPING_H
+#define GDB_DISPLACED_STEPPING_H
 
 #include "gdbsupport/array-view.h"
 #include "gdbsupport/byte-vector.h"
@@ -207,4 +207,4 @@ struct displaced_step_buffers
   std::vector<displaced_step_buffer> m_buffers;
 };
 
-#endif /* DISPLACED_STEPPING_H */
+#endif /* GDB_DISPLACED_STEPPING_H */
diff --git a/gdb/dummy-frame.h b/gdb/dummy-frame.h
index 7d963ad9beb..78998e84413 100644
--- a/gdb/dummy-frame.h
+++ b/gdb/dummy-frame.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (DUMMY_FRAME_H)
-#define DUMMY_FRAME_H 1
+#ifndef GDB_DUMMY_FRAME_H
+#define GDB_DUMMY_FRAME_H
 
 #include "frame.h"
 
@@ -80,4 +80,4 @@ extern int find_dummy_frame_dtor (dummy_frame_dtor_ftype *dtor,
 extern struct frame_id default_dummy_id (struct gdbarch *gdbarch,
 					 const frame_info_ptr &this_frame);
 
-#endif /* !defined (DUMMY_FRAME_H)  */
+#endif /* GDB_DUMMY_FRAME_H */
diff --git a/gdb/dwarf2/call-site.h b/gdb/dwarf2/call-site.h
index 0a0c7e83b81..0c587470311 100644
--- a/gdb/dwarf2/call-site.h
+++ b/gdb/dwarf2/call-site.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CALL_SITE_H
-#define CALL_SITE_H
+#ifndef GDB_DWARF2_CALL_SITE_H
+#define GDB_DWARF2_CALL_SITE_H
 
 #include "dwarf2/types.h"
 #include "../frame.h"
@@ -241,4 +241,4 @@ struct call_site
   struct call_site_parameter parameter[];
 };
 
-#endif /* CALL_SITE_H */
+#endif /* GDB_DWARF2_CALL_SITE_H */
diff --git a/gdb/dwarf2/comp-unit-head.h b/gdb/dwarf2/comp-unit-head.h
index fad484c3b93..d161783187c 100644
--- a/gdb/dwarf2/comp-unit-head.h
+++ b/gdb/dwarf2/comp-unit-head.h
@@ -24,8 +24,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GDB_DWARF2_COMP_UNIT_H
-#define GDB_DWARF2_COMP_UNIT_H
+#ifndef GDB_DWARF2_COMP_UNIT_HEAD_H
+#define GDB_DWARF2_COMP_UNIT_HEAD_H
 
 #include "dwarf2.h"
 #include "dwarf2/leb.h"
@@ -136,4 +136,4 @@ extern const gdb_byte *read_and_check_comp_unit_head
    const gdb_byte *info_ptr,
    rcuh_kind section_kind);
 
-#endif /* GDB_DWARF2_COMP_UNIT_H */
+#endif /* GDB_DWARF2_COMP_UNIT_HEAD_H */
diff --git a/gdb/dwarf2/expr.h b/gdb/dwarf2/expr.h
index b02cc531640..bbb9cd078ba 100644
--- a/gdb/dwarf2/expr.h
+++ b/gdb/dwarf2/expr.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (DWARF2EXPR_H)
-#define DWARF2EXPR_H
+#ifndef GDB_DWARF2_EXPR_H
+#define GDB_DWARF2_EXPR_H
 
 #include "leb128.h"
 #include "dwarf2/call-site.h"
@@ -320,4 +320,4 @@ extern const gdb_byte *safe_read_sleb128 (const gdb_byte *buf,
 extern const gdb_byte *safe_skip_leb128 (const gdb_byte *buf,
 					 const gdb_byte *buf_end);
 
-#endif /* DWARF2EXPR_H */
+#endif /* GDB_DWARF2_EXPR_H */
diff --git a/gdb/dwarf2/frame-tailcall.h b/gdb/dwarf2/frame-tailcall.h
index 3f49487ac2a..558957eb999 100644
--- a/gdb/dwarf2/frame-tailcall.h
+++ b/gdb/dwarf2/frame-tailcall.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef DWARF2_FRAME_TAILCALL_H
-#define DWARF2_FRAME_TAILCALL_H 1
+#ifndef GDB_DWARF2_FRAME_TAILCALL_H
+#define GDB_DWARF2_FRAME_TAILCALL_H
 
 class frame_info_ptr;
 struct frame_unwind;
@@ -36,4 +36,4 @@ extern struct value *
 
 extern const struct frame_unwind dwarf2_tailcall_frame_unwind;
 
-#endif /* !DWARF2_FRAME_TAILCALL_H */
+#endif /* GDB_DWARF2_FRAME_TAILCALL_H */
diff --git a/gdb/dwarf2/frame.h b/gdb/dwarf2/frame.h
index 2167310fbdf..f53f4bdd864 100644
--- a/gdb/dwarf2/frame.h
+++ b/gdb/dwarf2/frame.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef DWARF2_FRAME_H
-#define DWARF2_FRAME_H 1
+#ifndef GDB_DWARF2_FRAME_H
+#define GDB_DWARF2_FRAME_H
 
 struct gdbarch;
 class frame_info_ptr;
@@ -294,4 +294,4 @@ extern void *dwarf2_frame_get_fn_data (const frame_info_ptr &this_frame,
 				       void **this_cache,
 				       fn_prev_register cookie);
 
-#endif /* dwarf2-frame.h */
+#endif /* GDB_DWARF2_FRAME_H */
diff --git a/gdb/dwarf2/index-cache.h b/gdb/dwarf2/index-cache.h
index 95f217ed961..922c1568f8e 100644
--- a/gdb/dwarf2/index-cache.h
+++ b/gdb/dwarf2/index-cache.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef DWARF_INDEX_CACHE_H
-#define DWARF_INDEX_CACHE_H
+#ifndef GDB_DWARF2_INDEX_CACHE_H
+#define GDB_DWARF2_INDEX_CACHE_H
 
 #include "dwarf2/index-common.h"
 #include "gdbsupport/array-view.h"
@@ -137,4 +137,4 @@ class index_cache
 /* The global instance of the index cache.  */
 extern index_cache global_index_cache;
 
-#endif /* DWARF_INDEX_CACHE_H */
+#endif /* GDB_DWARF2_INDEX_CACHE_H */
diff --git a/gdb/dwarf2/index-common.h b/gdb/dwarf2/index-common.h
index dca41517b3d..4c029f4318e 100644
--- a/gdb/dwarf2/index-common.h
+++ b/gdb/dwarf2/index-common.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef DWARF_INDEX_COMMON_H
-#define DWARF_INDEX_COMMON_H
+#ifndef GDB_DWARF2_INDEX_COMMON_H
+#define GDB_DWARF2_INDEX_COMMON_H
 
 /* The suffix for an index file.  */
 #define INDEX4_SUFFIX ".gdb-index"
@@ -56,4 +56,4 @@ uint32_t dwarf5_djb_hash (const char *str_);
 
 uint32_t dwarf5_djb_hash (std::string_view str_);
 
-#endif /* DWARF_INDEX_COMMON_H */
+#endif /* GDB_DWARF2_INDEX_COMMON_H */
diff --git a/gdb/dwarf2/index-write.h b/gdb/dwarf2/index-write.h
index b7cf564efc5..1982e8510fc 100644
--- a/gdb/dwarf2/index-write.h
+++ b/gdb/dwarf2/index-write.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef DWARF_INDEX_WRITE_H
-#define DWARF_INDEX_WRITE_H
+#ifndef GDB_DWARF2_INDEX_WRITE_H
+#define GDB_DWARF2_INDEX_WRITE_H
 
 #include "dwarf2/read.h"
 #include "dwarf2/public.h"
@@ -36,4 +36,4 @@ extern void write_dwarf_index
   (dwarf2_per_bfd *per_bfd, const char *dir, const char *basename,
    const char *dwz_basename, dw_index_kind index_kind);
 
-#endif /* DWARF_INDEX_WRITE_H */
+#endif /* GDB_DWARF2_INDEX_WRITE_H */
diff --git a/gdb/dwarf2/line-header.h b/gdb/dwarf2/line-header.h
index c068dff70a3..b9bc55a926e 100644
--- a/gdb/dwarf2/line-header.h
+++ b/gdb/dwarf2/line-header.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef DWARF2_LINE_HEADER_H
-#define DWARF2_LINE_HEADER_H
+#ifndef GDB_DWARF2_LINE_HEADER_H
+#define GDB_DWARF2_LINE_HEADER_H
 
 /* dir_index is 1-based in DWARF 4 and before, and is 0-based in DWARF 5 and
    later.  */
@@ -217,4 +217,4 @@ extern line_header_up dwarf_decode_line_header
    struct dwarf2_section_info *section, const struct comp_unit_head *cu_header,
    const char *comp_dir);
 
-#endif /* DWARF2_LINE_HEADER_H */
+#endif /* GDB_DWARF2_LINE_HEADER_H */
diff --git a/gdb/dwarf2/loc.h b/gdb/dwarf2/loc.h
index 4fb743618e7..78635682d94 100644
--- a/gdb/dwarf2/loc.h
+++ b/gdb/dwarf2/loc.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (DWARF2LOC_H)
-#define DWARF2LOC_H
+#ifndef GDB_DWARF2_LOC_H
+#define GDB_DWARF2_LOC_H
 
 #include "dwarf2/expr.h"
 
@@ -308,4 +308,4 @@ extern struct value *value_of_dwarf_reg_entry (struct type *type,
 					       const frame_info_ptr &frame,
 					       enum call_site_parameter_kind kind,
 					       union call_site_parameter_u kind_u);
-#endif /* DWARF2LOC_H */
+#endif /* GDB_DWARF2_LOC_H */
diff --git a/gdb/dwarf2/public.h b/gdb/dwarf2/public.h
index bc419ff208f..8247641b25b 100644
--- a/gdb/dwarf2/public.h
+++ b/gdb/dwarf2/public.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef DWARF2_PUBLIC_H
-#define DWARF2_PUBLIC_H
+#ifndef GDB_DWARF2_PUBLIC_H
+#define GDB_DWARF2_PUBLIC_H
 
 /* A DWARF names index variant.  */
 enum class dw_index_kind
@@ -44,4 +44,4 @@ extern bool dwarf2_initialize_objfile
 
 extern void dwarf2_build_frame_info (struct objfile *);
 
-#endif /* DWARF2_PUBLIC_H */
+#endif /* GDB_DWARF2_PUBLIC_H */
diff --git a/gdb/dwarf2/read-debug-names.h b/gdb/dwarf2/read-debug-names.h
index e616cf887a7..729fe898ea8 100644
--- a/gdb/dwarf2/read-debug-names.h
+++ b/gdb/dwarf2/read-debug-names.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef DWARF2_READ_DEBUG_NAMES_H
-#define DWARF2_READ_DEBUG_NAMES_H
+#ifndef GDB_DWARF2_READ_DEBUG_NAMES_H
+#define GDB_DWARF2_READ_DEBUG_NAMES_H
 
 struct dwarf2_per_objfile;
 
@@ -29,4 +29,4 @@ extern const gdb_byte dwarf5_augmentation[8];
 
 bool dwarf2_read_debug_names (dwarf2_per_objfile *per_objfile);
 
-#endif /* DWARF2_READ_DEBUG_NAMES_H */
+#endif /* GDB_DWARF2_READ_DEBUG_NAMES_H */
diff --git a/gdb/dwarf2/read-gdb-index.h b/gdb/dwarf2/read-gdb-index.h
index e411114b147..906e3bd0bed 100644
--- a/gdb/dwarf2/read-gdb-index.h
+++ b/gdb/dwarf2/read-gdb-index.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef DWARF2_READ_GDB_INDEX_H
-#define DWARF2_READ_GDB_INDEX_H
+#ifndef GDB_DWARF2_READ_GDB_INDEX_H
+#define GDB_DWARF2_READ_GDB_INDEX_H
 
 #include "gdbsupport/function-view.h"
 
@@ -44,4 +44,4 @@ int dwarf2_read_gdb_index
    get_gdb_index_contents_ftype get_gdb_index_contents,
    get_gdb_index_contents_dwz_ftype get_gdb_index_contents_dwz);
 
-#endif /* DWARF2_READ_GDB_INDEX_H */
+#endif /* GDB_DWARF2_READ_GDB_INDEX_H */
diff --git a/gdb/dwarf2/read.h b/gdb/dwarf2/read.h
index 73def88c4c0..76bf6a422f4 100644
--- a/gdb/dwarf2/read.h
+++ b/gdb/dwarf2/read.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef DWARF2READ_H
-#define DWARF2READ_H
+#ifndef GDB_DWARF2_READ_H
+#define GDB_DWARF2_READ_H
 
 #include <queue>
 #include <unordered_map>
@@ -932,4 +932,4 @@ extern void create_all_units (dwarf2_per_objfile *per_objfile);
 
 extern htab_up create_quick_file_names_table (unsigned int nr_initial_entries);
 
-#endif /* DWARF2READ_H */
+#endif /* GDB_DWARF2_READ_H */
diff --git a/gdb/dwarf2/types.h b/gdb/dwarf2/types.h
index 9db5c635704..f4588a12df8 100644
--- a/gdb/dwarf2/types.h
+++ b/gdb/dwarf2/types.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef DWARF2_TYPES_H
-#define DWARF2_TYPES_H
+#ifndef GDB_DWARF2_TYPES_H
+#define GDB_DWARF2_TYPES_H
 
 #include "gdbsupport/offset-type.h"
 #include "gdbsupport/underlying.h"
@@ -37,4 +37,4 @@ sect_offset_str (sect_offset offset)
   return hex_string (to_underlying (offset));
 }
 
-#endif /* DWARF2_TYPES_H */
+#endif /* GDB_DWARF2_TYPES_H */
diff --git a/gdb/elf-none-tdep.h b/gdb/elf-none-tdep.h
index ecbf2d776c6..1881e4b8cb6 100644
--- a/gdb/elf-none-tdep.h
+++ b/gdb/elf-none-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NONE_TDEP_H
-#define NONE_TDEP_H
+#ifndef GDB_ELF_NONE_TDEP_H
+#define GDB_ELF_NONE_TDEP_H
 
 struct gdbarch;
 
@@ -27,4 +27,4 @@ struct gdbarch;
 
 void elf_none_init_abi (struct gdbarch *gdbarch);
 
-#endif /* NONE_TDEP_H */
+#endif /* GDB_ELF_NONE_TDEP_H */
diff --git a/gdb/event-top.h b/gdb/event-top.h
index f431f2812b2..7f544b0f27c 100644
--- a/gdb/event-top.h
+++ b/gdb/event-top.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef EVENT_TOP_H
-#define EVENT_TOP_H
+#ifndef GDB_EVENT_TOP_H
+#define GDB_EVENT_TOP_H
 
 #include <signal.h>
 
@@ -90,4 +90,4 @@ class scoped_segv_handler_restore
   segv_handler_t m_old_handler;
 };
 
-#endif
+#endif /* GDB_EVENT_TOP_H */
diff --git a/gdb/exceptions.h b/gdb/exceptions.h
index 64f4d75c39c..bf7141dbb9f 100644
--- a/gdb/exceptions.h
+++ b/gdb/exceptions.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef EXCEPTIONS_H
-#define EXCEPTIONS_H
+#ifndef GDB_EXCEPTIONS_H
+#define GDB_EXCEPTIONS_H
 
 #include "ui-out.h"
 
@@ -31,4 +31,4 @@ extern void exception_fprintf (struct ui_file *file,
 			       const char *prefix,
 			       ...) ATTRIBUTE_PRINTF (3, 4);
 
-#endif
+#endif /* GDB_EXCEPTIONS_H */
diff --git a/gdb/exec.h b/gdb/exec.h
index f667f23600d..950a21c2f3a 100644
--- a/gdb/exec.h
+++ b/gdb/exec.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef EXEC_H
-#define EXEC_H
+#ifndef GDB_EXEC_H
+#define GDB_EXEC_H
 
 #include "target.h"
 #include "progspace.h"
@@ -105,4 +105,4 @@ extern void print_section_info (const std::vector<target_section> *table,
 extern void try_open_exec_file (const char *exec_file_host,
 				struct inferior *inf,
 				symfile_add_flags add_flags);
-#endif
+#endif /* GDB_EXEC_H */
diff --git a/gdb/expop.h b/gdb/expop.h
index b81e228c07e..64158bc4706 100644
--- a/gdb/expop.h
+++ b/gdb/expop.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef EXPOP_H
-#define EXPOP_H
+#ifndef GDB_EXPOP_H
+#define GDB_EXPOP_H
 
 #include "c-lang.h"
 #include "cp-abi.h"
@@ -2215,4 +2215,4 @@ class funcall_operation
 
 } /* namespace expr */
 
-#endif /* EXPOP_H */
+#endif /* GDB_EXPOP_H */
diff --git a/gdb/expression.h b/gdb/expression.h
index 5bfc74c973f..7c79518da8b 100644
--- a/gdb/expression.h
+++ b/gdb/expression.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (EXPRESSION_H)
-#define EXPRESSION_H 1
+#ifndef GDB_EXPRESSION_H
+#define GDB_EXPRESSION_H
 
 #include "gdbtypes.h"
 #include "symtab.h"
@@ -387,4 +387,4 @@ enum range_flag : unsigned
 
 DEF_ENUM_FLAGS_TYPE (enum range_flag, range_flags);
 
-#endif /* !defined (EXPRESSION_H) */
+#endif /* GDB_EXPRESSION_H */
diff --git a/gdb/extension-priv.h b/gdb/extension-priv.h
index cb00cb6ff7b..f6c5f3fe75f 100644
--- a/gdb/extension-priv.h
+++ b/gdb/extension-priv.h
@@ -18,8 +18,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef EXTENSION_PRIV_H
-#define EXTENSION_PRIV_H
+#ifndef GDB_EXTENSION_PRIV_H
+#define GDB_EXTENSION_PRIV_H
 
 #include "extension.h"
 #include <signal.h>
@@ -320,4 +320,4 @@ extern struct active_ext_lang_state *set_active_ext_lang
 
 extern void restore_active_ext_lang (struct active_ext_lang_state *previous);
 
-#endif /* EXTENSION_PRIV_H */
+#endif /* GDB_EXTENSION_PRIV_H */
diff --git a/gdb/extension.h b/gdb/extension.h
index 5260bcbde00..93c3cdfcc69 100644
--- a/gdb/extension.h
+++ b/gdb/extension.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef EXTENSION_H
-#define EXTENSION_H
+#ifndef GDB_EXTENSION_H
+#define GDB_EXTENSION_H
 
 #include "mi/mi-cmds.h"
 #include "gdbsupport/array-view.h"
@@ -428,4 +428,4 @@ class scoped_disable_cooperative_sigint_handling
   bool m_prev_cooperative_sigint_handling_disabled;
 };
 
-#endif /* EXTENSION_H */
+#endif /* GDB_EXTENSION_H */
diff --git a/gdb/f-array-walker.h b/gdb/f-array-walker.h
index bcbaa3da5b3..d1f2b06fa9b 100644
--- a/gdb/f-array-walker.h
+++ b/gdb/f-array-walker.h
@@ -18,8 +18,8 @@
 /* Support classes to wrap up the process of iterating over a
    multi-dimensional Fortran array.  */
 
-#ifndef F_ARRAY_WALKER_H
-#define F_ARRAY_WALKER_H
+#ifndef GDB_F_ARRAY_WALKER_H
+#define GDB_F_ARRAY_WALKER_H
 
 #include "gdbtypes.h"
 #include "f-lang.h"
@@ -298,4 +298,4 @@ class fortran_array_walker
   int m_nss;
 };
 
-#endif /* F_ARRAY_WALKER_H */
+#endif /* GDB_F_ARRAY_WALKER_H */
diff --git a/gdb/f-exp.h b/gdb/f-exp.h
index aa0094c8ff1..47d469abe7c 100644
--- a/gdb/f-exp.h
+++ b/gdb/f-exp.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef FORTRAN_EXP_H
-#define FORTRAN_EXP_H
+#ifndef GDB_F_EXP_H
+#define GDB_F_EXP_H
 
 #include "expop.h"
 
@@ -417,4 +417,4 @@ class fortran_structop_operation
 
 } /* namespace expr */
 
-#endif /* FORTRAN_EXP_H */
+#endif /* GDB_F_EXP_H */
diff --git a/gdb/f-lang.h b/gdb/f-lang.h
index c2034258513..59cdd5f2334 100644
--- a/gdb/f-lang.h
+++ b/gdb/f-lang.h
@@ -20,8 +20,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef F_LANG_H
-#define F_LANG_H
+#ifndef GDB_F_LANG_H
+#define GDB_F_LANG_H
 
 #include "language.h"
 #include "valprint.h"
@@ -378,4 +378,4 @@ extern struct type *fortran_preserve_arg_pointer (struct value *arg,
 extern CORE_ADDR fortran_adjust_dynamic_array_base_address_hack
 	(struct type *type, CORE_ADDR address);
 
-#endif /* F_LANG_H */
+#endif /* GDB_F_LANG_H */
diff --git a/gdb/fbsd-nat.h b/gdb/fbsd-nat.h
index 35c06b2c985..2123175944e 100644
--- a/gdb/fbsd-nat.h
+++ b/gdb/fbsd-nat.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef FBSD_NAT_H
-#define FBSD_NAT_H
+#ifndef GDB_FBSD_NAT_H
+#define GDB_FBSD_NAT_H
 
 #include <optional>
 #include "inf-ptrace.h"
@@ -285,4 +285,4 @@ class fbsd_nat_target : public inf_ptrace_target
    Return true if successful.  */
 bool fbsd_nat_get_siginfo (ptid_t ptid, siginfo_t *siginfo);
 
-#endif /* fbsd-nat.h */
+#endif /* GDB_FBSD_NAT_H */
diff --git a/gdb/fbsd-tdep.h b/gdb/fbsd-tdep.h
index 54ff45c8d93..79381b3fefd 100644
--- a/gdb/fbsd-tdep.h
+++ b/gdb/fbsd-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef FBSD_TDEP_H
-#define FBSD_TDEP_H
+#ifndef GDB_FBSD_TDEP_H
+#define GDB_FBSD_TDEP_H
 
 extern void fbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch);
 
@@ -76,4 +76,4 @@ extern CORE_ADDR fbsd_get_thread_local_address (struct gdbarch *gdbarch,
 extern CORE_ADDR fbsd_skip_solib_resolver (struct gdbarch *gdbarch,
 					   CORE_ADDR pc);
 
-#endif /* fbsd-tdep.h */
+#endif /* GDB_FBSD_TDEP_H */
diff --git a/gdb/filename-seen-cache.h b/gdb/filename-seen-cache.h
index 5dc800d2b16..9107f449183 100644
--- a/gdb/filename-seen-cache.h
+++ b/gdb/filename-seen-cache.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef FILENAME_SEEN_CACHE_H
-#define FILENAME_SEEN_CACHE_H
+#ifndef GDB_FILENAME_SEEN_CACHE_H
+#define GDB_FILENAME_SEEN_CACHE_H
 
 #include "gdbsupport/function-view.h"
 #include "gdbsupport/gdb-hashtab.h"
@@ -62,4 +62,4 @@ class filename_seen_cache
   htab_up m_tab;
 };
 
-#endif /* FILENAME_SEEN_CACHE_H */
+#endif /* GDB_FILENAME_SEEN_CACHE_H */
diff --git a/gdb/filesystem.h b/gdb/filesystem.h
index 29c31803fc4..73b9a8bb84e 100644
--- a/gdb/filesystem.h
+++ b/gdb/filesystem.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef FILESYSTEM_H
-#define FILESYSTEM_H
+#ifndef GDB_FILESYSTEM_H
+#define GDB_FILESYSTEM_H
 
 extern const char file_system_kind_auto[];
 extern const char file_system_kind_unix[];
@@ -55,4 +55,4 @@ extern const char *target_lbasename (const char *kind, const char *name);
    result from this function.  */
 extern const char *effective_target_file_system_kind (void);
 
-#endif
+#endif /* GDB_FILESYSTEM_H */
diff --git a/gdb/frame-base.h b/gdb/frame-base.h
index ae22431d5ef..8436929839e 100644
--- a/gdb/frame-base.h
+++ b/gdb/frame-base.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (FRAME_BASE_H)
-#define FRAME_BASE_H 1
+#ifndef GDB_FRAME_BASE_H
+#define GDB_FRAME_BASE_H
 
 class frame_info_ptr;
 struct frame_id;
@@ -88,4 +88,4 @@ extern void frame_base_set_default (struct gdbarch *gdbarch,
 
 extern const struct frame_base *frame_base_find_by_frame (const frame_info_ptr &this_frame);
 
-#endif
+#endif /* GDB_FRAME_BASE_H */
diff --git a/gdb/frame-id.h b/gdb/frame-id.h
index 0d03b476aef..30850e24017 100644
--- a/gdb/frame-id.h
+++ b/gdb/frame-id.h
@@ -18,7 +18,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef GDB_FRAME_ID_H
-#define GDB_FRAME_ID_H 1
+#define GDB_FRAME_ID_H
 
 /* Status of a given frame's stack.  */
 
@@ -140,4 +140,4 @@ is_sentinel_frame_id (frame_id id)
   return id.stack_status == FID_STACK_SENTINEL;
 }
 
-#endif /* ifdef GDB_FRAME_ID_H  */
+#endif /* GDB_FRAME_ID_H */
diff --git a/gdb/frame-unwind.h b/gdb/frame-unwind.h
index 53fcd6869e9..1799d3625bd 100644
--- a/gdb/frame-unwind.h
+++ b/gdb/frame-unwind.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (FRAME_UNWIND_H)
-#define FRAME_UNWIND_H 1
+#ifndef GDB_FRAME_UNWIND_H
+#define GDB_FRAME_UNWIND_H
 
 struct frame_data;
 class frame_info_ptr;
@@ -235,4 +235,4 @@ value *frame_unwind_got_bytes (const frame_info_ptr &frame, int regnum,
 value *frame_unwind_got_address (const frame_info_ptr &frame, int regnum,
 				 CORE_ADDR addr);
 
-#endif
+#endif /* GDB_FRAME_UNWIND_H */
diff --git a/gdb/frame.h b/gdb/frame.h
index e784c17b480..9b41dd958fa 100644
--- a/gdb/frame.h
+++ b/gdb/frame.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (FRAME_H)
-#define FRAME_H 1
+#ifndef GDB_FRAME_H
+#define GDB_FRAME_H
 
 /* The following is the intended naming schema for frame functions.
    It isn't 100% consistent, but it is approaching that.  Frame naming
@@ -1077,4 +1077,4 @@ extern void set_frame_previous_pc_masked (const frame_info_ptr &frame);
 extern bool get_frame_pc_masked (const frame_info_ptr &frame);
 
 
-#endif /* !defined (FRAME_H)  */
+#endif /* GDB_FRAME_H */
diff --git a/gdb/frv-tdep.h b/gdb/frv-tdep.h
index 95347ed224e..0d78ec4ac6a 100644
--- a/gdb/frv-tdep.h
+++ b/gdb/frv-tdep.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef FRV_TDEP_H
-#define FRV_TDEP_H
+#ifndef GDB_FRV_TDEP_H
+#define GDB_FRV_TDEP_H
 
 /* Enumerate the possible ABIs for FR-V.  */
 enum frv_abi
@@ -121,4 +121,4 @@ CORE_ADDR frv_fetch_objfile_link_map (struct objfile *objfile);
 struct solib_ops;
 extern const solib_ops frv_so_ops;
 
-#endif /* FRV_TDEP_H */
+#endif /* GDB_FRV_TDEP_H */
diff --git a/gdb/ft32-tdep.h b/gdb/ft32-tdep.h
index 308d2333bc2..ee4a2473f8d 100644
--- a/gdb/ft32-tdep.h
+++ b/gdb/ft32-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef FT32_TDEP_H
-#define FT32_TDEP_H
+#ifndef GDB_FT32_TDEP_H
+#define GDB_FT32_TDEP_H
 
 #include "gdbarch.h"
 
@@ -28,4 +28,4 @@ struct ft32_gdbarch_tdep : gdbarch_tdep_base
   struct type *pc_type = nullptr;
 };
 
-#endif /* FT32_TDEP_H */
+#endif /* GDB_FT32_TDEP_H */
diff --git a/gdb/gcore-elf.h b/gdb/gcore-elf.h
index e7239b88b09..8217f0b1c85 100644
--- a/gdb/gcore-elf.h
+++ b/gdb/gcore-elf.h
@@ -17,8 +17,8 @@
 
 /* This file contains generic functions for writing ELF based core files.  */
 
-#if !defined (GCORE_ELF_H)
-#define GCORE_ELF_H 1
+#ifndef GDB_GCORE_ELF_H
+#define GDB_GCORE_ELF_H
 
 #include "gdb_bfd.h"
 #include "gdbsupport/gdb_signals.h"
@@ -45,4 +45,4 @@ extern void gcore_elf_make_tdesc_note
   (struct gdbarch *gdbarch, bfd *obfd,
    gdb::unique_xmalloc_ptr<char> *note_data, int *note_size);
 
-#endif /* GCORE_ELF_H */
+#endif /* GDB_GCORE_ELF_H */
diff --git a/gdb/gcore.h b/gdb/gcore.h
index 0bedc0a7ba9..21e7a8d29ee 100644
--- a/gdb/gcore.h
+++ b/gdb/gcore.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (GCORE_H)
-#define GCORE_H 1
+#ifndef GDB_GCORE_H
+#define GDB_GCORE_H
 
 #include "gdb_bfd.h"
 
@@ -37,4 +37,4 @@ extern int objfile_find_memory_regions (struct target_ops *self,
 
 extern thread_info *gcore_find_signalled_thread ();
 
-#endif /* GCORE_H */
+#endif /* GDB_GCORE_H */
diff --git a/gdb/gdb-demangle.h b/gdb/gdb-demangle.h
index e434f890969..86a8bd618eb 100644
--- a/gdb/gdb-demangle.h
+++ b/gdb/gdb-demangle.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GDB_DEMANGLE_H
-#define GDB_DEMANGLE_H
+#ifndef GDB_GDB_DEMANGLE_H
+#define GDB_GDB_DEMANGLE_H
 
 /* True means that encoded C++/ObjC names should be printed out in their
    C++/ObjC form rather than raw.  */
@@ -31,4 +31,4 @@ extern bool asm_demangle;
 /* Check if a character is one of the commonly used C++ marker characters.  */
 extern bool is_cplus_marker (int);
 
-#endif /* GDB_DEMANGLE_H */
+#endif /* GDB_GDB_DEMANGLE_H */
diff --git a/gdb/gdb-stabs.h b/gdb/gdb-stabs.h
index 3786ad6881d..373a7269470 100644
--- a/gdb/gdb-stabs.h
+++ b/gdb/gdb-stabs.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GDB_STABS_H
-#define GDB_STABS_H
+#ifndef GDB_GDB_STABS_H
+#define GDB_GDB_STABS_H
 
 /* This file exists to hold the common definitions required of most of
    the symbol-readers that end up using stabs.  The common use of
@@ -75,4 +75,4 @@ extern const registry<objfile>::key<dbx_symfile_info> dbx_objfile_data_key;
 #define DBX_BSS_SECTION(o)	(DBX_SYMFILE_INFO(o)->bss_section)
 #define DBX_STAB_SECTION(o)	(DBX_SYMFILE_INFO(o)->stab_section)
 
-#endif /* GDB_STABS_H */
+#endif /* GDB_GDB_STABS_H */
diff --git a/gdb/gdb_bfd.h b/gdb/gdb_bfd.h
index 331570d769c..c09e4e7f811 100644
--- a/gdb/gdb_bfd.h
+++ b/gdb/gdb_bfd.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GDB_BFD_H
-#define GDB_BFD_H
+#ifndef GDB_GDB_BFD_H
+#define GDB_GDB_BFD_H
 
 #include "registry.h"
 #include "gdbsupport/byte-vector.h"
@@ -263,4 +263,4 @@ extern std::string gdb_bfd_errmsg (bfd_error_type error_tag, char **matching);
 
 extern void gdb_bfd_init ();
 
-#endif /* GDB_BFD_H */
+#endif /* GDB_GDB_BFD_H */
diff --git a/gdb/gdb_curses.h b/gdb/gdb_curses.h
index c7ee862cd67..c0ab883f17b 100644
--- a/gdb/gdb_curses.h
+++ b/gdb/gdb_curses.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GDB_CURSES_H
-#define GDB_CURSES_H 1
+#ifndef GDB_GDB_CURSES_H
+#define GDB_GDB_CURSES_H
 
 #ifdef __MINGW32__
 /* Windows API headers, included e.g. by serial.h, define MOUSE_MOVED,
@@ -71,4 +71,4 @@ extern "C" int tgetnum (const char *);
 #undef reg
 #endif
 
-#endif /* gdb_curses.h */
+#endif /* GDB_GDB_CURSES_H */
diff --git a/gdb/gdb_expat.h b/gdb/gdb_expat.h
index 566f065fd13..36cee8031eb 100644
--- a/gdb/gdb_expat.h
+++ b/gdb/gdb_expat.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined(GDB_EXPAT_H)
-#define GDB_EXPAT_H
+#ifndef GDB_GDB_EXPAT_H
+#define GDB_GDB_EXPAT_H
 
 #include <expat.h>
 
@@ -35,4 +35,4 @@
 #define XMLCALL
 #endif
 
-#endif /* !defined(GDB_EXPAT_H) */
+#endif /* GDB_GDB_EXPAT_H */
diff --git a/gdb/gdb_proc_service.h b/gdb/gdb_proc_service.h
index 1088e19a4c5..c5e060b4eee 100644
--- a/gdb/gdb_proc_service.h
+++ b/gdb/gdb_proc_service.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GDB_PROC_SERVICE_H
-#define GDB_PROC_SERVICE_H
+#ifndef GDB_GDB_PROC_SERVICE_H
+#define GDB_GDB_PROC_SERVICE_H
 
 #include "gdbsupport/gdb_proc_service.h"
 
@@ -30,4 +30,4 @@ struct ps_prochandle
   thread_info *thread;
 };
 
-#endif /* gdb_proc_service.h */
+#endif /* GDB_GDB_PROC_SERVICE_H */
diff --git a/gdb/gdb_vfork.h b/gdb/gdb_vfork.h
index 521fed9b007..69f4955ee97 100644
--- a/gdb/gdb_vfork.h
+++ b/gdb/gdb_vfork.h
@@ -16,11 +16,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GDB_VFORK_H
-#define GDB_VFORK_H
+#ifndef GDB_GDB_VFORK_H
+#define GDB_GDB_VFORK_H
 
 #if HAVE_VFORK_H
 #include <vfork.h>
 #endif
 
-#endif /* GDB_VFORK_H */
+#endif /* GDB_GDB_VFORK_H */
diff --git a/gdb/gdb_wchar.h b/gdb/gdb_wchar.h
index 8df00e4679f..937b409d039 100644
--- a/gdb/gdb_wchar.h
+++ b/gdb/gdb_wchar.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GDB_WCHAR_H
-#define GDB_WCHAR_H
+#ifndef GDB_GDB_WCHAR_H
+#define GDB_GDB_WCHAR_H
 
 /* We handle three different modes here.
    
@@ -121,4 +121,4 @@ typedef int gdb_wint_t;
 
 #endif
 
-#endif /* GDB_WCHAR_H */
+#endif /* GDB_GDB_WCHAR_H */
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index 77d3406779f..bfe08fe65a8 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -18,8 +18,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#ifndef GDBARCH_H
-#define GDBARCH_H
+#ifndef GDB_GDBARCH_H
+#define GDB_GDBARCH_H
 
 #include <vector>
 #include "frame.h"
@@ -370,4 +370,4 @@ gdbarch_num_cooked_regs (gdbarch *arch)
   return gdbarch_num_regs (arch) + gdbarch_num_pseudo_regs (arch);
 }
 
-#endif
+#endif /* GDB_GDBARCH_H */
diff --git a/gdb/gdbcmd.h b/gdb/gdbcmd.h
index 8a1f6f20052..cba32528dfa 100644
--- a/gdb/gdbcmd.h
+++ b/gdb/gdbcmd.h
@@ -21,8 +21,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (GDBCMD_H)
-#define GDBCMD_H 1
+#ifndef GDB_GDBCMD_H
+#define GDB_GDBCMD_H
 
 #include "command.h"
 #include "ui-out.h"
@@ -69,4 +69,4 @@ extern void print_command_lines (struct ui_out *,
 extern struct cmd_list_element *style_set_list;
 extern struct cmd_list_element *style_show_list;
 
-#endif /* !defined (GDBCMD_H) */
+#endif /* GDB_GDBCMD_H */
diff --git a/gdb/gdbcore.h b/gdb/gdbcore.h
index d6aeb356e37..4eab2cd70a5 100644
--- a/gdb/gdbcore.h
+++ b/gdb/gdbcore.h
@@ -19,8 +19,8 @@
 
 /* Interface routines for core, executable, etc.  */
 
-#if !defined (GDBCORE_H)
-#define GDBCORE_H 1
+#ifndef GDB_GDBCORE_H
+#define GDB_GDBCORE_H
 
 struct type;
 struct regcache;
@@ -196,4 +196,4 @@ class thread_section_name
   std::string m_storage;
 };
 
-#endif /* !defined (GDBCORE_H) */
+#endif /* GDB_GDBCORE_H */
diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h
index 73f6895fe46..490d05db340 100644
--- a/gdb/gdbthread.h
+++ b/gdb/gdbthread.h
@@ -18,8 +18,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GDBTHREAD_H
-#define GDBTHREAD_H
+#ifndef GDB_GDBTHREAD_H
+#define GDB_GDBTHREAD_H
 
 struct symtab;
 
@@ -1071,4 +1071,4 @@ extern void thread_try_catch_cmd (thread_info *thr,
 
 extern const char *thread_state_string (enum thread_state state);
 
-#endif /* GDBTHREAD_H */
+#endif /* GDB_GDBTHREAD_H */
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 55018f2c344..5182b54cc96 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (GDBTYPES_H)
-#define GDBTYPES_H 1
+#ifndef GDB_GDBTYPES_H
+#define GDB_GDBTYPES_H
 
 /* * \page gdbtypes GDB Types
 
@@ -2830,4 +2830,4 @@ extern unsigned int overload_debug;
 
 extern bool is_nocall_function (const struct type *type);
 
-#endif /* GDBTYPES_H */
+#endif /* GDB_GDBTYPES_H */
diff --git a/gdb/glibc-tdep.h b/gdb/glibc-tdep.h
index 264e1e707f2..17006d0fafc 100644
--- a/gdb/glibc-tdep.h
+++ b/gdb/glibc-tdep.h
@@ -17,12 +17,12 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GLIBC_TDEP_H
-#define GLIBC_TDEP_H
+#ifndef GDB_GLIBC_TDEP_H
+#define GDB_GLIBC_TDEP_H
 
 struct gdbarch;
 
 extern CORE_ADDR glibc_skip_solib_resolver (struct gdbarch *gdbarch,
 					    CORE_ADDR);
 
-#endif /* glibc-tdep.h */
+#endif /* GDB_GLIBC_TDEP_H */
diff --git a/gdb/gmp-utils.h b/gdb/gmp-utils.h
index 51e06abc050..84ac0e7333b 100644
--- a/gdb/gmp-utils.h
+++ b/gdb/gmp-utils.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GMP_UTILS_H
-#define GMP_UTILS_H
+#ifndef GDB_GMP_UTILS_H
+#define GDB_GMP_UTILS_H
 
 /* Include <stdio.h> and <stdarg.h> ahead of <gmp.h>, so as to get
    access to GMP's various formatting functions.  */
@@ -663,4 +663,4 @@ gdb_mpz::as_integer_truncate () const
   return result;
 }
 
-#endif
+#endif /* GDB_GMP_UTILS_H */
diff --git a/gdb/gnu-nat-mig.h b/gdb/gnu-nat-mig.h
index 4b9e78c99e2..01c1ed46f20 100644
--- a/gdb/gnu-nat-mig.h
+++ b/gdb/gnu-nat-mig.h
@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GNU_NAT_MIG_H
-#define GNU_NAT_MIG_H
+#ifndef GDB_GNU_NAT_MIG_H
+#define GDB_GNU_NAT_MIG_H
 
 #include <mach/boolean.h>
 #include <mach/message.h>
@@ -28,4 +28,4 @@ boolean_t notify_server (mach_msg_header_t *InHeadP,
 boolean_t process_reply_server (mach_msg_header_t *InHeadP,
 				mach_msg_header_t *OutHeadP);
 
-#endif /* GNU_NAT_MIG_H */
+#endif /* GDB_GNU_NAT_MIG_H */
diff --git a/gdb/gnu-nat.h b/gdb/gnu-nat.h
index f1694b8a3a7..700a01a7d17 100644
--- a/gdb/gnu-nat.h
+++ b/gdb/gnu-nat.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GNU_NAT_H
-#define GNU_NAT_H
+#ifndef GDB_GNU_NAT_H
+#define GDB_GNU_NAT_H
 
 /* Work around conflict between Mach's 'thread_info' function, and GDB's
    'thread_info' class.  Make the former available as 'mach_thread_info'.  */
@@ -188,4 +188,4 @@ struct gnu_nat_target : public inf_child_target
 /* The final/concrete instance.  */
 extern gnu_nat_target *gnu_target;
 
-#endif /* GNU_NAT_H */
+#endif /* GDB_GNU_NAT_H */
diff --git a/gdb/go-lang.h b/gdb/go-lang.h
index 1aca9ddd118..030febc4215 100644
--- a/gdb/go-lang.h
+++ b/gdb/go-lang.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (GO_LANG_H)
-#define GO_LANG_H 1
+#ifndef GDB_GO_LANG_H
+#define GDB_GO_LANG_H
 
 struct type_print_options;
 
@@ -144,4 +144,4 @@ class go_language : public language_defn
   { return true; }
 };
 
-#endif /* !defined (GO_LANG_H) */
+#endif /* GDB_GO_LANG_H */
diff --git a/gdb/gregset.h b/gdb/gregset.h
index 8c14809a47d..9345625d98a 100644
--- a/gdb/gregset.h
+++ b/gdb/gregset.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GREGSET_H
-#define GREGSET_H
+#ifndef GDB_GREGSET_H
+#define GDB_GREGSET_H
 
 #ifdef HAVE_SYS_PROCFS_H
 #include <sys/procfs.h>
@@ -60,4 +60,4 @@ extern void fill_gregset (const struct regcache *regcache,
 extern void fill_fpregset (const struct regcache *regcache,
 			   gdb_fpregset_t *fpregs, int regno);
 
-#endif
+#endif /* GDB_GREGSET_H */
diff --git a/gdb/guile/guile-internal.h b/gdb/guile/guile-internal.h
index be16fee0dd2..c2856478eed 100644
--- a/gdb/guile/guile-internal.h
+++ b/gdb/guile/guile-internal.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GUILE_GUILE_INTERNAL_H
-#define GUILE_GUILE_INTERNAL_H
+#ifndef GDB_GUILE_GUILE_INTERNAL_H
+#define GDB_GUILE_GUILE_INTERNAL_H
 
 /* See README file in this directory for implementation notes, coding
    conventions, et.al.  */
@@ -722,4 +722,4 @@ gdbscm_wrap (Function &&func, Args &&... args)
   return result;
 }
 
-#endif /* GUILE_GUILE_INTERNAL_H */
+#endif /* GDB_GUILE_GUILE_INTERNAL_H */
diff --git a/gdb/guile/guile.h b/gdb/guile/guile.h
index 2ab1f7552c7..6ce4864aabd 100644
--- a/gdb/guile/guile.h
+++ b/gdb/guile/guile.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GUILE_GUILE_H
-#define GUILE_GUILE_H
+#ifndef GDB_GUILE_GUILE_H
+#define GDB_GUILE_GUILE_H
 
 #include "extension.h"
 
@@ -28,4 +28,4 @@ extern const struct extension_language_defn extension_language_guile;
 /* Command element for the 'guile' command.  */
 extern cmd_list_element *guile_cmd_element;
 
-#endif /* GUILE_GUILE_H */
+#endif /* GDB_GUILE_GUILE_H */
diff --git a/gdb/hppa-bsd-tdep.h b/gdb/hppa-bsd-tdep.h
index 42aefe6e142..54599ab9ab4 100644
--- a/gdb/hppa-bsd-tdep.h
+++ b/gdb/hppa-bsd-tdep.h
@@ -17,9 +17,9 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef HPPA_BSD_TDEP_H
-#define HPPA_BSD_TDEP_H
+#ifndef GDB_HPPA_BSD_TDEP_H
+#define GDB_HPPA_BSD_TDEP_H
 
 extern void hppabsd_init_abi (struct gdbarch_info, struct gdbarch *);
 
-#endif /* hppa-bsd-tdep.h */
+#endif /* GDB_HPPA_BSD_TDEP_H */
diff --git a/gdb/hppa-linux-offsets.h b/gdb/hppa-linux-offsets.h
index b1543b05705..958afd115a8 100644
--- a/gdb/hppa-linux-offsets.h
+++ b/gdb/hppa-linux-offsets.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef HPPA_LINUX_OFFSETS_H
-#define HPPA_LINUX_OFFSETS_H
+#ifndef GDB_HPPA_LINUX_OFFSETS_H
+#define GDB_HPPA_LINUX_OFFSETS_H
 
 #define PT_PSW offsetof(struct pt_regs, gr[ 0])
 #define PT_GR1 offsetof(struct pt_regs, gr[ 1])
@@ -105,4 +105,4 @@
 #define PT_ISR offsetof(struct pt_regs, isr)
 #define PT_IOR offsetof(struct pt_regs, ior)
 
-#endif /* HPPA_LINUX_OFFSETS_H */
+#endif /* GDB_HPPA_LINUX_OFFSETS_H */
diff --git a/gdb/hppa-tdep.h b/gdb/hppa-tdep.h
index 0f706536cc9..e1143a56bcd 100644
--- a/gdb/hppa-tdep.h
+++ b/gdb/hppa-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef HPPA_TDEP_H
-#define HPPA_TDEP_H
+#ifndef GDB_HPPA_TDEP_H
+#define GDB_HPPA_TDEP_H
 
 #include "gdbarch.h"
 
@@ -214,4 +214,4 @@ extern int hppa_in_solib_call_trampoline (struct gdbarch *gdbarch,
 					  CORE_ADDR pc);
 extern CORE_ADDR hppa_skip_trampoline_code (const frame_info_ptr &, CORE_ADDR pc);
 
-#endif  /* hppa-tdep.h */
+#endif /* GDB_HPPA_TDEP_H */
diff --git a/gdb/i386-bsd-nat.h b/gdb/i386-bsd-nat.h
index a05eb90d4f8..54061ab46d1 100644
--- a/gdb/i386-bsd-nat.h
+++ b/gdb/i386-bsd-nat.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef I386_BSD_NAT_H
-#define I386_BSD_NAT_H
+#ifndef GDB_I386_BSD_NAT_H
+#define GDB_I386_BSD_NAT_H
 
 #include "x86-bsd-nat.h"
 
@@ -41,4 +41,4 @@ class i386_bsd_nat_target : public x86bsd_nat_target<BaseTarget>
   { i386bsd_store_inferior_registers (regcache, regnum); }
 };
 
-#endif /* i386-bsd-nat.h */
+#endif /* GDB_I386_BSD_NAT_H */
diff --git a/gdb/i386-darwin-tdep.h b/gdb/i386-darwin-tdep.h
index 0b867fab94c..7ccdeeced13 100644
--- a/gdb/i386-darwin-tdep.h
+++ b/gdb/i386-darwin-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef I386_DARWIN_TDEP_H
-#define I386_DARWIN_TDEP_H
+#ifndef GDB_I386_DARWIN_TDEP_H
+#define GDB_I386_DARWIN_TDEP_H
 
 #include "frame.h"
 
@@ -29,4 +29,4 @@ extern const int i386_darwin_thread_state_num_regs;
 
 int darwin_dwarf_signal_frame_p (struct gdbarch *, const frame_info_ptr &);
 
-#endif /* I386_DARWIN_TDEP_H */
+#endif /* GDB_I386_DARWIN_TDEP_H */
diff --git a/gdb/i386-fbsd-tdep.h b/gdb/i386-fbsd-tdep.h
index 0a008421915..3b953e58435 100644
--- a/gdb/i386-fbsd-tdep.h
+++ b/gdb/i386-fbsd-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef I386_FBSD_TDEP_H
-#define I386_FBSD_TDEP_H
+#ifndef GDB_I386_FBSD_TDEP_H
+#define GDB_I386_FBSD_TDEP_H
 
 #include "gdbsupport/x86-xstate.h"
 #include "regset.h"
@@ -42,4 +42,4 @@ bool i386_fbsd_core_read_x86_xsave_layout (struct gdbarch *gdbarch,
 
 extern const struct regset i386_fbsd_gregset;
 
-#endif /* i386-fbsd-tdep.h */
+#endif /* GDB_I386_FBSD_TDEP_H */
diff --git a/gdb/i386-linux-nat.h b/gdb/i386-linux-nat.h
index c3d32aff1be..e4a86c70382 100644
--- a/gdb/i386-linux-nat.h
+++ b/gdb/i386-linux-nat.h
@@ -17,10 +17,10 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef I386_LINUX_NAT_H
-#define I386_LINUX_NAT_H 1
+#ifndef GDB_I386_LINUX_NAT_H
+#define GDB_I386_LINUX_NAT_H
 
 /* Does the current host support the GETFPXREGS request? */
 extern int have_ptrace_getfpxregs;
 
-#endif
+#endif /* GDB_I386_LINUX_NAT_H */
diff --git a/gdb/i386-linux-tdep.h b/gdb/i386-linux-tdep.h
index 5891747572b..025b0f5fc51 100644
--- a/gdb/i386-linux-tdep.h
+++ b/gdb/i386-linux-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef I386_LINUX_TDEP_H
-#define I386_LINUX_TDEP_H
+#ifndef GDB_I386_LINUX_TDEP_H
+#define GDB_I386_LINUX_TDEP_H
 
 #include "gdbsupport/x86-xstate.h"
 
@@ -83,4 +83,4 @@ extern int i386_linux_gregset_reg_offset[];
 /* Return x86 siginfo type.  */
 extern struct type *x86_linux_get_siginfo_type (struct gdbarch *gdbarch);
 
-#endif /* i386-linux-tdep.h */
+#endif /* GDB_I386_LINUX_TDEP_H */
diff --git a/gdb/i386-tdep.h b/gdb/i386-tdep.h
index a85e0a984a0..e394e159c04 100644
--- a/gdb/i386-tdep.h
+++ b/gdb/i386-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef I386_TDEP_H
-#define I386_TDEP_H
+#ifndef GDB_I386_TDEP_H
+#define GDB_I386_TDEP_H
 
 #include "gdbarch.h"
 #include "infrun.h"
@@ -488,4 +488,4 @@ extern int i386_stap_is_single_operand (struct gdbarch *gdbarch,
 extern expr::operation_up i386_stap_parse_special_token
      (struct gdbarch *gdbarch, struct stap_parse_info *p);
 
-#endif /* i386-tdep.h */
+#endif /* GDB_I386_TDEP_H */
diff --git a/gdb/i387-tdep.h b/gdb/i387-tdep.h
index 30d769478a6..77e089ab723 100644
--- a/gdb/i387-tdep.h
+++ b/gdb/i387-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef I387_TDEP_H
-#define I387_TDEP_H
+#ifndef GDB_I387_TDEP_H
+#define GDB_I387_TDEP_H
 
 struct gdbarch;
 class frame_info_ptr;
@@ -185,4 +185,4 @@ extern void i387_return_value (struct gdbarch *gdbarch,
    all memory range can be accessed.  */
 extern void i387_reset_bnd_regs (struct gdbarch *gdbarch,
 				 struct regcache *regcache);
-#endif /* i387-tdep.h */
+#endif /* GDB_I387_TDEP_H */
diff --git a/gdb/ia64-libunwind-tdep.h b/gdb/ia64-libunwind-tdep.h
index 4f064bfc333..9d358642d9f 100644
--- a/gdb/ia64-libunwind-tdep.h
+++ b/gdb/ia64-libunwind-tdep.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef IA64_LIBUNWIND_TDEP_H
-#define IA64_LIBUNWIND_TDEP_H 1
+#ifndef GDB_IA64_LIBUNWIND_TDEP_H
+#define GDB_IA64_LIBUNWIND_TDEP_H
 
 class frame_info_ptr;
 struct frame_id;
@@ -76,4 +76,4 @@ int libunwind_get_reg_special (struct gdbarch *gdbarch,
 			       readable_regcache *regcache,
 			       int regnum, void *buf);
 
-#endif /* IA64_LIBUNWIND_TDEP_H */
+#endif /* GDB_IA64_LIBUNWIND_TDEP_H */
diff --git a/gdb/ia64-tdep.h b/gdb/ia64-tdep.h
index 64be38b4d76..e5eb7eac071 100644
--- a/gdb/ia64-tdep.h
+++ b/gdb/ia64-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef IA64_TDEP_H
-#define IA64_TDEP_H
+#ifndef GDB_IA64_TDEP_H
+#define GDB_IA64_TDEP_H
 
 #include "gdbarch.h"
 
@@ -265,4 +265,4 @@ extern unw_accessors_t ia64_unw_rse_accessors;
 extern struct libunwind_descr ia64_libunwind_descr;
 #endif
 
-#endif /* ia64-tdep.h */
+#endif /* GDB_IA64_TDEP_H */
diff --git a/gdb/inf-child.h b/gdb/inf-child.h
index 91955a64f4c..2a251b365f2 100644
--- a/gdb/inf-child.h
+++ b/gdb/inf-child.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef INF_CHILD_H
-#define INF_CHILD_H
+#ifndef GDB_INF_CHILD_H
+#define GDB_INF_CHILD_H
 
 #include "target.h"
 #include "process-stratum-target.h"
@@ -115,4 +115,4 @@ extern void add_inf_child_target (inf_child_target *target);
    targets use add_inf_child_target instead.  */
 extern void inf_child_open_target (const char *arg, int from_tty);
 
-#endif
+#endif /* GDB_INF_CHILD_H */
diff --git a/gdb/inf-loop.h b/gdb/inf-loop.h
index ceabd14bd9e..2bf29fa7498 100644
--- a/gdb/inf-loop.h
+++ b/gdb/inf-loop.h
@@ -17,11 +17,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef INF_LOOP_H
-#define INF_LOOP_H
+#ifndef GDB_INF_LOOP_H
+#define GDB_INF_LOOP_H
 
 #include "target.h"
 
 extern void inferior_event_handler (enum inferior_event_type event_type);
 
-#endif /* #ifndef INF_LOOP_H */
+#endif /* GDB_INF_LOOP_H */
diff --git a/gdb/inf-ptrace.h b/gdb/inf-ptrace.h
index 868bee92da8..901f7e9162d 100644
--- a/gdb/inf-ptrace.h
+++ b/gdb/inf-ptrace.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef INF_PTRACE_H
-#define INF_PTRACE_H
+#ifndef GDB_INF_PTRACE_H
+#define GDB_INF_PTRACE_H
 
 #include "gdbsupport/event-pipe.h"
 #include "inf-child.h"
@@ -113,4 +113,4 @@ struct inf_ptrace_target : public inf_child_target
 extern pid_t get_ptrace_pid (ptid_t);
 #endif
 
-#endif
+#endif /* GDB_INF_PTRACE_H */
diff --git a/gdb/infcall.h b/gdb/infcall.h
index dcc701b5f31..eccf13307c7 100644
--- a/gdb/infcall.h
+++ b/gdb/infcall.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef INFCALL_H
-#define INFCALL_H
+#ifndef GDB_INFCALL_H
+#define GDB_INFCALL_H
 
 #include "dummy-frame.h"
 #include "gdbsupport/array-view.h"
@@ -71,4 +71,4 @@ extern struct value *
 
 extern void error_call_unknown_return_type (const char *func_name);
 
-#endif
+#endif /* GDB_INFCALL_H */
diff --git a/gdb/inferior-iter.h b/gdb/inferior-iter.h
index 821c7bec94e..05ddfca54c9 100644
--- a/gdb/inferior-iter.h
+++ b/gdb/inferior-iter.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef INFERIOR_ITER_H
-#define INFERIOR_ITER_H
+#ifndef GDB_INFERIOR_ITER_H
+#define GDB_INFERIOR_ITER_H
 
 #include "gdbsupport/filtered-iterator.h"
 #include "gdbsupport/safe-iterator.h"
@@ -132,4 +132,4 @@ using all_inferiors_safe_iterator
 
 using all_inferiors_safe_range = iterator_range<all_inferiors_safe_iterator>;
 
-#endif /* !defined (INFERIOR_ITER_H) */
+#endif /* GDB_INFERIOR_ITER_H */
diff --git a/gdb/inferior.h b/gdb/inferior.h
index 7be28423aeb..4163396b775 100644
--- a/gdb/inferior.h
+++ b/gdb/inferior.h
@@ -18,8 +18,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (INFERIOR_H)
-#define INFERIOR_H 1
+#ifndef GDB_INFERIOR_H
+#define GDB_INFERIOR_H
 
 #include <exception>
 #include <list>
@@ -869,4 +869,4 @@ valid_global_inferior_id (int id)
   return false;
 }
 
-#endif /* !defined (INFERIOR_H) */
+#endif /* GDB_INFERIOR_H */
diff --git a/gdb/infrun.h b/gdb/infrun.h
index 5f83ca2b4c3..4574874706e 100644
--- a/gdb/infrun.h
+++ b/gdb/infrun.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef INFRUN_H
-#define INFRUN_H 1
+#ifndef GDB_INFRUN_H
+#define GDB_INFRUN_H
 
 #include "gdbthread.h"
 #include "symtab.h"
@@ -418,4 +418,4 @@ struct scoped_enable_commit_resumed
 };
 
 
-#endif /* INFRUN_H */
+#endif /* GDB_INFRUN_H */
diff --git a/gdb/inline-frame.h b/gdb/inline-frame.h
index bbe617c7c5b..a11376f1d43 100644
--- a/gdb/inline-frame.h
+++ b/gdb/inline-frame.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (INLINE_FRAME_H)
-#define INLINE_FRAME_H 1
+#ifndef GDB_INLINE_FRAME_H
+#define GDB_INLINE_FRAME_H
 
 class frame_info_ptr;
 struct frame_unwind;
@@ -70,4 +70,4 @@ struct symbol *inline_skipped_symbol (thread_info *thread);
 
 int frame_inlined_callees (const frame_info_ptr &this_frame);
 
-#endif /* !defined (INLINE_FRAME_H) */
+#endif /* GDB_INLINE_FRAME_H */
diff --git a/gdb/interps.h b/gdb/interps.h
index bd435d734af..726b660684e 100644
--- a/gdb/interps.h
+++ b/gdb/interps.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef INTERPS_H
-#define INTERPS_H
+#ifndef GDB_INTERPS_H
+#define GDB_INTERPS_H
 
 #include "gdbsupport/intrusive_list.h"
 
@@ -372,4 +372,4 @@ extern void interps_notify_memory_changed (inferior *inf, CORE_ADDR addr,
 #define INTERP_TUI		"tui"
 #define INTERP_INSIGHT		"insight"
 
-#endif
+#endif /* GDB_INTERPS_H */
diff --git a/gdb/jit.h b/gdb/jit.h
index ade0fb28ce2..59ad900c4e0 100644
--- a/gdb/jit.h
+++ b/gdb/jit.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef JIT_H
-#define JIT_H
+#ifndef GDB_JIT_H
+#define GDB_JIT_H
 
 struct inferior;
 struct objfile;
@@ -122,4 +122,4 @@ extern void jit_breakpoint_re_set (void);
 
 extern void jit_event_handler (gdbarch *gdbarch, objfile *jiter);
 
-#endif /* JIT_H */
+#endif /* GDB_JIT_H */
diff --git a/gdb/language.h b/gdb/language.h
index e67150d7596..157c46877d2 100644
--- a/gdb/language.h
+++ b/gdb/language.h
@@ -20,8 +20,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (LANGUAGE_H)
-#define LANGUAGE_H 1
+#ifndef GDB_LANGUAGE_H
+#define GDB_LANGUAGE_H
 
 #include "symtab.h"
 #include "gdbsupport/function-view.h"
@@ -911,4 +911,4 @@ class scoped_switch_to_sym_language_if_auto
   enum language m_lang;
 };
 
-#endif /* defined (LANGUAGE_H) */
+#endif /* GDB_LANGUAGE_H */
diff --git a/gdb/linespec.h b/gdb/linespec.h
index 18f491d74d0..86eb36bbae9 100644
--- a/gdb/linespec.h
+++ b/gdb/linespec.h
@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (LINESPEC_H)
-#define LINESPEC_H 1
+#ifndef GDB_LINESPEC_H
+#define GDB_LINESPEC_H
 
 struct symtab;
 
@@ -201,4 +201,4 @@ extern void linespec_complete_label (completion_tracker &tracker,
    advancing EXP_PTR past any parsed text.  */
 
 extern CORE_ADDR linespec_expression_to_pc (const char **exp_ptr);
-#endif /* defined (LINESPEC_H) */
+#endif /* GDB_LINESPEC_H */
diff --git a/gdb/linux-fork.h b/gdb/linux-fork.h
index c553aaf0740..2a306881695 100644
--- a/gdb/linux-fork.h
+++ b/gdb/linux-fork.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef LINUX_FORK_H
-#define LINUX_FORK_H
+#ifndef GDB_LINUX_FORK_H
+#define GDB_LINUX_FORK_H
 
 struct fork_info;
 struct lwp_info;
@@ -30,4 +30,4 @@ extern void linux_fork_detach (int, lwp_info *);
 extern int forks_exist_p (void);
 extern int linux_fork_checkpointing_p (int);
 
-#endif /* LINUX_FORK_H */
+#endif /* GDB_LINUX_FORK_H */
diff --git a/gdb/linux-nat-trad.h b/gdb/linux-nat-trad.h
index ae40ce773b4..c1c031ea27d 100644
--- a/gdb/linux-nat-trad.h
+++ b/gdb/linux-nat-trad.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef LINUX_NAT_TRAD_H
-#define LINUX_NAT_TRAD_H
+#ifndef GDB_LINUX_NAT_TRAD_H
+#define GDB_LINUX_NAT_TRAD_H
 
 #include "linux-nat.h"
 
@@ -43,4 +43,4 @@ class linux_nat_trad_target : public linux_nat_target
   void store_register (const struct regcache *regcache, int regnum);
 };
 
-#endif /* LINUX_NAT_TRAD_H */
+#endif /* GDB_LINUX_NAT_TRAD_H */
diff --git a/gdb/linux-nat.h b/gdb/linux-nat.h
index 4dcbe9e170a..01e071e0f89 100644
--- a/gdb/linux-nat.h
+++ b/gdb/linux-nat.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef LINUX_NAT_H
-#define LINUX_NAT_H
+#ifndef GDB_LINUX_NAT_H
+#define GDB_LINUX_NAT_H
 
 #include "nat/linux-nat.h"
 #include "inf-ptrace.h"
@@ -339,4 +339,4 @@ void linux_nat_switch_fork (ptid_t new_ptid);
    uninitialized in such case).  */
 bool linux_nat_get_siginfo (ptid_t ptid, siginfo_t *siginfo);
 
-#endif /* LINUX_NAT_H */
+#endif /* GDB_LINUX_NAT_H */
diff --git a/gdb/linux-record.h b/gdb/linux-record.h
index 962cedc3d34..26d113b6a65 100644
--- a/gdb/linux-record.h
+++ b/gdb/linux-record.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef LINUX_RECORD_H
-#define LINUX_RECORD_H
+#ifndef GDB_LINUX_RECORD_H
+#define GDB_LINUX_RECORD_H
 
 struct linux_record_tdep
 {
@@ -549,4 +549,4 @@ extern int record_linux_system_call (enum gdb_syscall num,
 				     struct regcache *regcache,
 				     struct linux_record_tdep *tdep);
 
-#endif /* LINUX_RECORD_H */
+#endif /* GDB_LINUX_RECORD_H */
diff --git a/gdb/linux-tdep.h b/gdb/linux-tdep.h
index 66b03cabaa6..bf4220bf75b 100644
--- a/gdb/linux-tdep.h
+++ b/gdb/linux-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef LINUX_TDEP_H
-#define LINUX_TDEP_H
+#ifndef GDB_LINUX_TDEP_H
+#define GDB_LINUX_TDEP_H
 
 #include "bfd.h"
 #include "displaced-stepping.h"
@@ -117,4 +117,4 @@ extern CORE_ADDR linux_get_hwcap2 ();
 extern struct link_map_offsets *linux_ilp32_fetch_link_map_offsets ();
 extern struct link_map_offsets *linux_lp64_fetch_link_map_offsets ();
 
-#endif /* linux-tdep.h */
+#endif /* GDB_LINUX_TDEP_H */
diff --git a/gdb/location.h b/gdb/location.h
index e8cdd0d4ec6..7772d10426f 100644
--- a/gdb/location.h
+++ b/gdb/location.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef LOCATION_H
-#define LOCATION_H
+#ifndef GDB_LOCATION_H
+#define GDB_LOCATION_H
 
 #include "symtab.h"
 
@@ -365,4 +365,4 @@ extern location_spec_up
 				    const struct language_defn *language,
 				    explicit_completion_info *completion_info);
 
-#endif /* LOCATION_H */
+#endif /* GDB_LOCATION_H */
diff --git a/gdb/loongarch-tdep.h b/gdb/loongarch-tdep.h
index 5c8108182ad..4908923db20 100644
--- a/gdb/loongarch-tdep.h
+++ b/gdb/loongarch-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef LOONGARCH_TDEP_H
-#define LOONGARCH_TDEP_H
+#ifndef GDB_LOONGARCH_TDEP_H
+#define GDB_LOONGARCH_TDEP_H
 
 #include "gdbarch.h"
 #include "arch/loongarch.h"
@@ -44,4 +44,4 @@ struct loongarch_gdbarch_tdep : gdbarch_tdep_base
   CORE_ADDR (*syscall_next_pc) (const frame_info_ptr &frame) = nullptr;
 };
 
-#endif /* LOONGARCH_TDEP_H  */
+#endif /* GDB_LOONGARCH_TDEP_H */
diff --git a/gdb/m2-exp.h b/gdb/m2-exp.h
index 9d2634f813b..ce773cbf864 100644
--- a/gdb/m2-exp.h
+++ b/gdb/m2-exp.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef M2_EXP_H
-#define M2_EXP_H
+#ifndef GDB_M2_EXP_H
+#define GDB_M2_EXP_H
 
 #include "expop.h"
 
@@ -81,4 +81,4 @@ class m2_binop_subscript_operation
 
 } /* namespace expr */
 
-#endif /* M2_EXP_H */
+#endif /* GDB_M2_EXP_H */
diff --git a/gdb/m2-lang.h b/gdb/m2-lang.h
index 3d3c6980bb2..1551d7e00d6 100644
--- a/gdb/m2-lang.h
+++ b/gdb/m2-lang.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef M2_LANG_H
-#define M2_LANG_H
+#ifndef GDB_M2_LANG_H
+#define GDB_M2_LANG_H
 
 struct type_print_options;
 struct parser_state;
@@ -149,4 +149,4 @@ class m2_language : public language_defn
   { return true; }
 };
 
-#endif /* M2_LANG_H */
+#endif /* GDB_M2_LANG_H */
diff --git a/gdb/m32r-tdep.h b/gdb/m32r-tdep.h
index 83799a3c698..1cc0de38c15 100644
--- a/gdb/m32r-tdep.h
+++ b/gdb/m32r-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef M32R_TDEP_H
-#define M32R_TDEP_H
+#ifndef GDB_M32R_TDEP_H
+#define GDB_M32R_TDEP_H
 
 #include "gdbarch.h"
 
@@ -49,4 +49,4 @@ enum m32r_regnum
 
 #define M32R_NUM_REGS 25
 
-#endif /* m32r-tdep.h */
+#endif /* GDB_M32R_TDEP_H */
diff --git a/gdb/m68k-tdep.h b/gdb/m68k-tdep.h
index dcb3728896e..ad569932144 100644
--- a/gdb/m68k-tdep.h
+++ b/gdb/m68k-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef M68K_TDEP_H
-#define M68K_TDEP_H
+#ifndef GDB_M68K_TDEP_H
+#define GDB_M68K_TDEP_H
 
 #include "gdbarch.h"
 
@@ -111,4 +111,4 @@ extern void m68k_svr4_init_abi (struct gdbarch_info, struct gdbarch *);
 
 extern int m68kbsd_fpreg_offset (struct gdbarch *gdbarch, int regnum);
 
-#endif /* m68k-tdep.h */
+#endif /* GDB_M68K_TDEP_H */
diff --git a/gdb/macroexp.h b/gdb/macroexp.h
index 2706f15787f..6fd5dc27916 100644
--- a/gdb/macroexp.h
+++ b/gdb/macroexp.h
@@ -18,8 +18,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#ifndef MACROEXP_H
-#define MACROEXP_H
+#ifndef GDB_MACROEXP_H
+#define GDB_MACROEXP_H
 
 struct macro_scope;
 
@@ -81,4 +81,4 @@ int macro_is_digit (int c);
 /* Stringify STR according to C rules and return a null-terminated string.  */
 gdb::unique_xmalloc_ptr<char> macro_stringify (const char *str);
 
-#endif /* MACROEXP_H */
+#endif /* GDB_MACROEXP_H */
diff --git a/gdb/macroscope.h b/gdb/macroscope.h
index 6a1f5f0a3fe..ce9ae33838f 100644
--- a/gdb/macroscope.h
+++ b/gdb/macroscope.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MACROSCOPE_H
-#define MACROSCOPE_H
+#ifndef GDB_MACROSCOPE_H
+#define GDB_MACROSCOPE_H
 
 #include "macrotab.h"
 #include "symtab.h"
@@ -61,4 +61,4 @@ gdb::unique_xmalloc_ptr<struct macro_scope> default_macro_scope (void);
 macro_definition *standard_macro_lookup (const char *name,
 					 const macro_scope &ms);
 
-#endif /* MACROSCOPE_H */
+#endif /* GDB_MACROSCOPE_H */
diff --git a/gdb/macrotab.h b/gdb/macrotab.h
index 789beed0476..ea6557aa391 100644
--- a/gdb/macrotab.h
+++ b/gdb/macrotab.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MACROTAB_H
-#define MACROTAB_H
+#ifndef GDB_MACROTAB_H
+#define GDB_MACROTAB_H
 
 #include "gdbsupport/function-view.h"
 
@@ -361,4 +361,4 @@ void macro_for_each_in_scope (struct macro_source_file *file, int line,
    of macro filenames printing was "absolute".  */
 extern std::string macro_source_fullname (struct macro_source_file *file);
 
-#endif /* MACROTAB_H */
+#endif /* GDB_MACROTAB_H */
diff --git a/gdb/main.h b/gdb/main.h
index fa267786d89..35dfe9d4729 100644
--- a/gdb/main.h
+++ b/gdb/main.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MAIN_H
-#define MAIN_H
+#ifndef GDB_MAIN_H
+#define GDB_MAIN_H
 
 struct captured_main_args
 {
@@ -46,4 +46,4 @@ extern char *windows_get_absolute_argv0 (const char *argv0);
 
 extern void set_gdb_data_directory (const char *new_data_dir);
 
-#endif
+#endif /* GDB_MAIN_H */
diff --git a/gdb/maint.h b/gdb/maint.h
index c1860d8cd59..5529d8a9d3a 100644
--- a/gdb/maint.h
+++ b/gdb/maint.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MAINT_H
-#define MAINT_H
+#ifndef GDB_MAINT_H
+#define GDB_MAINT_H
 
 #include "gdbsupport/run-time-clock.h"
 #include <chrono>
@@ -70,4 +70,4 @@ class scoped_command_stats
 extern obj_section *maint_obj_section_from_bfd_section (bfd *abfd,
 							asection *asection,
 							objfile *ofile);
-#endif /* MAINT_H */
+#endif /* GDB_MAINT_H */
diff --git a/gdb/mdebugread.h b/gdb/mdebugread.h
index af0584bd3e6..4f434226ff9 100644
--- a/gdb/mdebugread.h
+++ b/gdb/mdebugread.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MDEBUGREAD_H
-#define MDEBUGREAD_H
+#ifndef GDB_MDEBUGREAD_H
+#define GDB_MDEBUGREAD_H
 
 #include "coff/sym.h"
 #include "coff/symconst.h"
@@ -46,4 +46,4 @@ extern void elfmdebug_build_psymtabs (struct objfile *,
 				      const struct ecoff_debug_swap *,
 				      asection *);
 
-#endif /* MDEBUGREAD_H */
+#endif /* GDB_MDEBUGREAD_H */
diff --git a/gdb/memattr.h b/gdb/memattr.h
index dcc52298846..a6c9e6dcd8c 100644
--- a/gdb/memattr.h
+++ b/gdb/memattr.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MEMATTR_H
-#define MEMATTR_H
+#ifndef GDB_MEMATTR_H
+#define GDB_MEMATTR_H
 
 enum mem_access_mode
 {
@@ -129,4 +129,4 @@ extern struct mem_region *lookup_mem_region (CORE_ADDR);
 
 void invalidate_target_mem_regions (void);
 
-#endif	/* MEMATTR_H */
+#endif /* GDB_MEMATTR_H */
diff --git a/gdb/memory-map.h b/gdb/memory-map.h
index 525646b6e37..59fcd4a9f73 100644
--- a/gdb/memory-map.h
+++ b/gdb/memory-map.h
@@ -18,8 +18,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#ifndef MEMORY_MAP_H
-#define MEMORY_MAP_H
+#ifndef GDB_MEMORY_MAP_H
+#define GDB_MEMORY_MAP_H
 
 #include "memattr.h"
 
@@ -28,4 +28,4 @@
    return an empty vector.  Does not throw.  */
 std::vector<mem_region> parse_memory_map (const char *memory_map);
 
-#endif
+#endif /* GDB_MEMORY_MAP_H */
diff --git a/gdb/memrange.h b/gdb/memrange.h
index 74df82588f4..ec033ddb21e 100644
--- a/gdb/memrange.h
+++ b/gdb/memrange.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MEMRANGE_H
-#define MEMRANGE_H
+#ifndef GDB_MEMRANGE_H
+#define GDB_MEMRANGE_H
 
 /* Defines a [START, START + LENGTH) memory range.  */
 
@@ -64,4 +64,4 @@ extern int address_in_mem_range (CORE_ADDR addr,
 
 extern void normalize_mem_ranges (std::vector<mem_range> *memory);
 
-#endif
+#endif /* GDB_MEMRANGE_H */
diff --git a/gdb/memtag.h b/gdb/memtag.h
index b176371699c..600b4b9db74 100644
--- a/gdb/memtag.h
+++ b/gdb/memtag.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MEMTAG_H
-#define MEMTAG_H
+#ifndef GDB_MEMTAG_H
+#define GDB_MEMTAG_H
 
 #include "bfd.h"
 
@@ -47,4 +47,4 @@ bool get_next_core_memtag_section (bfd *abfd, asection *section,
 				   CORE_ADDR address,
 				   memtag_section_info &info);
 
-#endif /* MEMTAG_H */
+#endif /* GDB_MEMTAG_H */
diff --git a/gdb/mi/mi-cmd-break.h b/gdb/mi/mi-cmd-break.h
index 76aedfffcd9..160c578865d 100644
--- a/gdb/mi/mi-cmd-break.h
+++ b/gdb/mi/mi-cmd-break.h
@@ -18,8 +18,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MI_MI_CMD_BREAK_H
-#define MI_MI_CMD_BREAK_H
+#ifndef GDB_MI_MI_CMD_BREAK_H
+#define GDB_MI_MI_CMD_BREAK_H
 
 #include "gdbsupport/scoped_restore.h"
 
@@ -27,4 +27,4 @@
    catchpoint.  */
 scoped_restore_tmpl<int> setup_breakpoint_reporting (void);
 
-#endif /* MI_MI_CMD_BREAK_H */
+#endif /* GDB_MI_MI_CMD_BREAK_H */
diff --git a/gdb/mi/mi-cmds.h b/gdb/mi/mi-cmds.h
index 26faded3032..9e31ba397b0 100644
--- a/gdb/mi/mi-cmds.h
+++ b/gdb/mi/mi-cmds.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MI_MI_CMDS_H
-#define MI_MI_CMDS_H
+#ifndef GDB_MI_MI_CMDS_H
+#define GDB_MI_MI_CMDS_H
 
 #include "gdbsupport/function-view.h"
 #include <optional>
@@ -237,4 +237,4 @@ extern void remove_mi_cmd_entries (remove_mi_cmd_entries_ftype callback);
 
 extern bool mi_simple_type_p (struct type *type);
 
-#endif /* MI_MI_CMDS_H */
+#endif /* GDB_MI_MI_CMDS_H */
diff --git a/gdb/mi/mi-common.h b/gdb/mi/mi-common.h
index 38ad35c3e36..4c3951ca8c0 100644
--- a/gdb/mi/mi-common.h
+++ b/gdb/mi/mi-common.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MI_MI_COMMON_H
-#define MI_MI_COMMON_H
+#ifndef GDB_MI_MI_COMMON_H
+#define GDB_MI_MI_COMMON_H
 
 /* Represents the reason why GDB is sending an asynchronous command to
    the front end.  NOTE: When modifying this, don't forget to update
@@ -49,4 +49,4 @@ enum async_reply_reason
 
 const char *async_reason_lookup (enum async_reply_reason reason);
 
-#endif /* MI_MI_COMMON_H */
+#endif /* GDB_MI_MI_COMMON_H */
diff --git a/gdb/mi/mi-console.h b/gdb/mi/mi-console.h
index 89ba199fbce..89e0f4d3db6 100644
--- a/gdb/mi/mi-console.h
+++ b/gdb/mi/mi-console.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MI_MI_CONSOLE_H
-#define MI_MI_CONSOLE_H
+#ifndef GDB_MI_MI_CONSOLE_H
+#define GDB_MI_MI_CONSOLE_H
 
 /* An output stream for MI.  Wraps a given output stream with a prefix
    and handles quoting.  This stream is locally buffered.  */
@@ -55,4 +55,4 @@ class mi_console_file : public ui_file
   char m_quote;
 };
 
-#endif /* MI_MI_CONSOLE_H */
+#endif /* GDB_MI_MI_CONSOLE_H */
diff --git a/gdb/mi/mi-getopt.h b/gdb/mi/mi-getopt.h
index f3dd326fced..5bc35aa565a 100644
--- a/gdb/mi/mi-getopt.h
+++ b/gdb/mi/mi-getopt.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MI_MI_GETOPT_H
-#define MI_MI_GETOPT_H
+#ifndef GDB_MI_MI_GETOPT_H
+#define GDB_MI_MI_GETOPT_H
 
 /* The option list.  Terminated by NAME==NULL.  ARG_P that the option
    requires an argument.  INDEX is returned to identify the option.  */
@@ -78,4 +78,4 @@ extern int mi_getopt_allow_unknown (const char *prefix, int argc,
 extern int mi_valid_noargs (const char *prefix, int argc,
 			    const char *const *argv);
 
-#endif /* MI_MI_GETOPT_H */
+#endif /* GDB_MI_MI_GETOPT_H */
diff --git a/gdb/mi/mi-interp.h b/gdb/mi/mi-interp.h
index cd48fcf0aa1..8f5eee6f558 100644
--- a/gdb/mi/mi-interp.h
+++ b/gdb/mi/mi-interp.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MI_MI_INTERP_H
-#define MI_MI_INTERP_H
+#ifndef GDB_MI_MI_INTERP_H
+#define GDB_MI_MI_INTERP_H
 
 #include "interps.h"
 
@@ -119,4 +119,4 @@ as_mi_interp (struct interp *interp)
   return dynamic_cast<mi_interp *> (interp);
 }
 
-#endif /* MI_MI_INTERP_H */
+#endif /* GDB_MI_MI_INTERP_H */
diff --git a/gdb/mi/mi-main.h b/gdb/mi/mi-main.h
index 59c9ffa31bb..af670295c1f 100644
--- a/gdb/mi/mi-main.h
+++ b/gdb/mi/mi-main.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MI_MI_MAIN_H
-#define MI_MI_MAIN_H
+#ifndef GDB_MI_MI_MAIN_H
+#define GDB_MI_MI_MAIN_H
 
 struct ui_file;
 
@@ -79,4 +79,4 @@ extern void mi_cmd_fix_breakpoint_script_output (const char *command,
 
 extern int mi_parse_thread_group_id (const char *id);
 
-#endif /* MI_MI_MAIN_H */
+#endif /* GDB_MI_MI_MAIN_H */
diff --git a/gdb/mi/mi-out.h b/gdb/mi/mi-out.h
index a7afb156ed4..16e6db2456e 100644
--- a/gdb/mi/mi-out.h
+++ b/gdb/mi/mi-out.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MI_MI_OUT_H
-#define MI_MI_OUT_H
+#ifndef GDB_MI_MI_OUT_H
+#define GDB_MI_MI_OUT_H
 
 #include <vector>
 
@@ -151,4 +151,4 @@ std::unique_ptr<mi_ui_out> mi_out_new (const char *mi_version);
 void mi_out_put (ui_out *uiout, struct ui_file *stream);
 void mi_out_rewind (ui_out *uiout);
 
-#endif /* MI_MI_OUT_H */
+#endif /* GDB_MI_MI_OUT_H */
diff --git a/gdb/mi/mi-parse.h b/gdb/mi/mi-parse.h
index 8b685755a5c..22d10185925 100644
--- a/gdb/mi/mi-parse.h
+++ b/gdb/mi/mi-parse.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MI_MI_PARSE_H
-#define MI_MI_PARSE_H
+#ifndef GDB_MI_MI_PARSE_H
+#define GDB_MI_MI_PARSE_H
 
 #include "gdbsupport/run-time-clock.h"
 #include <chrono>
@@ -101,4 +101,4 @@ struct mi_parse
 
 enum print_values mi_parse_print_values (const char *name);
 
-#endif /* MI_MI_PARSE_H */
+#endif /* GDB_MI_MI_PARSE_H */
diff --git a/gdb/microblaze-tdep.h b/gdb/microblaze-tdep.h
index 0b4a5a3f472..7b5924e9317 100644
--- a/gdb/microblaze-tdep.h
+++ b/gdb/microblaze-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MICROBLAZE_TDEP_H
-#define MICROBLAZE_TDEP_H 1
+#ifndef GDB_MICROBLAZE_TDEP_H
+#define GDB_MICROBLAZE_TDEP_H
 
 #include "gdbarch.h"
 
@@ -120,4 +120,4 @@ struct microblaze_frame_cache
    Only used for native debugging.  */
 #define MICROBLAZE_BREAKPOINT {0xb9, 0xcc, 0x00, 0x60}
 
-#endif /* microblaze-tdep.h */
+#endif /* GDB_MICROBLAZE_TDEP_H */
diff --git a/gdb/minsyms.h b/gdb/minsyms.h
index d44f281939b..4d704f0d35b 100644
--- a/gdb/minsyms.h
+++ b/gdb/minsyms.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MINSYMS_H
-#define MINSYMS_H
+#ifndef GDB_MINSYMS_H
+#define GDB_MINSYMS_H
 
 struct type;
 
@@ -327,4 +327,4 @@ CORE_ADDR minimal_symbol_upper_bound (struct bound_minimal_symbol minsym);
 type *find_minsym_type_and_address (minimal_symbol *msymbol, objfile *objf,
 				    CORE_ADDR *address_p);
 
-#endif /* MINSYMS_H */
+#endif /* GDB_MINSYMS_H */
diff --git a/gdb/mips-fbsd-tdep.h b/gdb/mips-fbsd-tdep.h
index ec834d0474a..201b1e5a793 100644
--- a/gdb/mips-fbsd-tdep.h
+++ b/gdb/mips-fbsd-tdep.h
@@ -17,12 +17,12 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MIPS_FBSD_TDEP_H
-#define MIPS_FBSD_TDEP_H
+#ifndef GDB_MIPS_FBSD_TDEP_H
+#define GDB_MIPS_FBSD_TDEP_H
 
 void mips_fbsd_supply_fpregs (struct regcache *, int, const void *, size_t);
 void mips_fbsd_supply_gregs (struct regcache *, int, const void *, size_t);
 void mips_fbsd_collect_fpregs (const struct regcache *, int, void *, size_t);
 void mips_fbsd_collect_gregs (const struct regcache *, int, void *, size_t);
 
-#endif /* MIPS_FBSD_TDEP_H */
+#endif /* GDB_MIPS_FBSD_TDEP_H */
diff --git a/gdb/mips-linux-tdep.h b/gdb/mips-linux-tdep.h
index 2c4c35954c4..8670c0b7e15 100644
--- a/gdb/mips-linux-tdep.h
+++ b/gdb/mips-linux-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MIPS_LINUX_TDEP_H
-#define MIPS_LINUX_TDEP_H
+#ifndef GDB_MIPS_LINUX_TDEP_H
+#define GDB_MIPS_LINUX_TDEP_H
 
 /* Copied from <asm/elf.h>.  */
 #define ELF_NGREG       45
@@ -113,4 +113,4 @@ extern const struct target_desc *tdesc_mips64_linux;
 extern const struct target_desc *tdesc_mips_dsp_linux;
 extern const struct target_desc *tdesc_mips64_dsp_linux;
 
-#endif /* MIPS_LINUX_TDEP_H */
+#endif /* GDB_MIPS_LINUX_TDEP_H */
diff --git a/gdb/mips-netbsd-tdep.h b/gdb/mips-netbsd-tdep.h
index 034261fbf44..e9544f0f1bf 100644
--- a/gdb/mips-netbsd-tdep.h
+++ b/gdb/mips-netbsd-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MIPS_NBSD_TDEP_H
-#define MIPS_NBSD_TDEP_H
+#ifndef GDB_MIPS_NETBSD_TDEP_H
+#define GDB_MIPS_NETBSD_TDEP_H
 
 void mipsnbsd_supply_reg (struct regcache *, const char *, int);
 void mipsnbsd_fill_reg (const struct regcache *, char *, int);
@@ -26,4 +26,4 @@ void mipsnbsd_fill_reg (const struct regcache *, char *, int);
 void mipsnbsd_supply_fpreg (struct regcache *, const char *, int);
 void mipsnbsd_fill_fpreg (const struct regcache *, char *, int);
 
-#endif /* MIPS_NBSD_TDEP_H */
+#endif /* GDB_MIPS_NETBSD_TDEP_H */
diff --git a/gdb/mips-tdep.h b/gdb/mips-tdep.h
index eec1fb56f4e..df589cf71b8 100644
--- a/gdb/mips-tdep.h
+++ b/gdb/mips-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MIPS_TDEP_H
-#define MIPS_TDEP_H
+#ifndef GDB_MIPS_TDEP_H
+#define GDB_MIPS_TDEP_H
 
 #include "objfiles.h"
 #include "gdbarch.h"
@@ -201,4 +201,4 @@ in_mips_stubs_section (CORE_ADDR pc)
   return pc_in_section (pc, ".MIPS.stubs");
 }
 
-#endif /* MIPS_TDEP_H */
+#endif /* GDB_MIPS_TDEP_H */
diff --git a/gdb/mn10300-tdep.h b/gdb/mn10300-tdep.h
index 683a6ec2e14..bec5f04253a 100644
--- a/gdb/mn10300-tdep.h
+++ b/gdb/mn10300-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MN10300_TDEP_H
-#define MN10300_TDEP_H
+#ifndef GDB_MN10300_TDEP_H
+#define GDB_MN10300_TDEP_H
 
 #include "gdbarch.h"
 
@@ -88,4 +88,4 @@ get_am33_mode (gdbarch *arch)
   return tdep->am33_mode;
 }
 
-#endif /* MN10300_TDEP_H */
+#endif /* GDB_MN10300_TDEP_H */
diff --git a/gdb/moxie-tdep.h b/gdb/moxie-tdep.h
index 64bfc825fc1..329d9972b49 100644
--- a/gdb/moxie-tdep.h
+++ b/gdb/moxie-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef MOXIE_TDEP_H
-#define MOXIE_TDEP_H
+#ifndef GDB_MOXIE_TDEP_H
+#define GDB_MOXIE_TDEP_H
 
 #include "gdbarch.h"
 
@@ -42,4 +42,4 @@ enum moxie_regnum
 
 #define MOXIE_NUM_REGS 18
 
-#endif /* moxie-tdep.h */
+#endif /* GDB_MOXIE_TDEP_H */
diff --git a/gdb/namespace.h b/gdb/namespace.h
index 232dcc03bd8..a9b020f6395 100644
--- a/gdb/namespace.h
+++ b/gdb/namespace.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAMESPACE_H
-#define NAMESPACE_H
+#ifndef GDB_NAMESPACE_H
+#define GDB_NAMESPACE_H
 
 #include "gdbsupport/gdb_vecs.h"
 #include "gdbsupport/gdb_obstack.h"
@@ -127,4 +127,4 @@ extern void add_using_directive (struct using_direct **using_directives,
 				 const unsigned int decl_line,
 				 struct obstack *obstack);
 
-#endif /* NAMESPACE_H */
+#endif /* GDB_NAMESPACE_H */
diff --git a/gdb/nat/aarch64-hw-point.h b/gdb/nat/aarch64-hw-point.h
index bdcca932e57..f4db38b494d 100644
--- a/gdb/nat/aarch64-hw-point.h
+++ b/gdb/nat/aarch64-hw-point.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_AARCH64_HW_POINT_H
-#define NAT_AARCH64_HW_POINT_H
+#ifndef GDB_NAT_AARCH64_HW_POINT_H
+#define GDB_NAT_AARCH64_HW_POINT_H
 
 /* Macro definitions, data structures, and code for the hardware
    breakpoint and hardware watchpoint support follow.  We use the
@@ -128,4 +128,4 @@ void aarch64_show_debug_reg_state (struct aarch64_debug_reg_state *state,
 
 int aarch64_region_ok_for_watchpoint (CORE_ADDR addr, int len);
 
-#endif /* NAT_AARCH64_HW_POINT_H */
+#endif /* GDB_NAT_AARCH64_HW_POINT_H */
diff --git a/gdb/nat/aarch64-linux-hw-point.h b/gdb/nat/aarch64-linux-hw-point.h
index cf749c34ae7..618f79f1587 100644
--- a/gdb/nat/aarch64-linux-hw-point.h
+++ b/gdb/nat/aarch64-linux-hw-point.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_AARCH64_LINUX_HW_POINT_H
-#define NAT_AARCH64_LINUX_HW_POINT_H
+#ifndef GDB_NAT_AARCH64_LINUX_HW_POINT_H
+#define GDB_NAT_AARCH64_LINUX_HW_POINT_H
 
 #include "gdbsupport/break-common.h"
 
@@ -109,4 +109,4 @@ void aarch64_linux_get_debug_reg_capacity (int tid);
 
 struct aarch64_debug_reg_state *aarch64_get_debug_reg_state (pid_t pid);
 
-#endif /* NAT_AARCH64_LINUX_HW_POINT_H */
+#endif /* GDB_NAT_AARCH64_LINUX_HW_POINT_H */
diff --git a/gdb/nat/aarch64-linux.h b/gdb/nat/aarch64-linux.h
index f4df7481162..969bb52b812 100644
--- a/gdb/nat/aarch64-linux.h
+++ b/gdb/nat/aarch64-linux.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_AARCH64_LINUX_H
-#define NAT_AARCH64_LINUX_H
+#ifndef GDB_NAT_AARCH64_LINUX_H
+#define GDB_NAT_AARCH64_LINUX_H
 
 #include <signal.h>
 
@@ -133,4 +133,4 @@ ps_err_e aarch64_ps_get_thread_area (struct ps_prochandle *ph,
    used for aarch64 state.  */
 int aarch64_tls_register_count (int tid);
 
-#endif /* NAT_AARCH64_LINUX_H */
+#endif /* GDB_NAT_AARCH64_LINUX_H */
diff --git a/gdb/nat/aarch64-mte-linux-ptrace.h b/gdb/nat/aarch64-mte-linux-ptrace.h
index 28dd8158c90..e02a0818963 100644
--- a/gdb/nat/aarch64-mte-linux-ptrace.h
+++ b/gdb/nat/aarch64-mte-linux-ptrace.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_AARCH64_MTE_LINUX_PTRACE_H
-#define NAT_AARCH64_MTE_LINUX_PTRACE_H
+#ifndef GDB_NAT_AARCH64_MTE_LINUX_PTRACE_H
+#define GDB_NAT_AARCH64_MTE_LINUX_PTRACE_H
 
 /* MTE allocation tag access */
 
@@ -47,4 +47,4 @@ extern bool aarch64_mte_fetch_memtags (int tid, CORE_ADDR address, size_t len,
 extern bool aarch64_mte_store_memtags (int tid, CORE_ADDR address, size_t len,
 				       const gdb::byte_vector &tags);
 
-#endif /* NAT_AARCH64_MTE_LINUX_PTRACE_H */
+#endif /* GDB_NAT_AARCH64_MTE_LINUX_PTRACE_H */
diff --git a/gdb/nat/aarch64-scalable-linux-ptrace.h b/gdb/nat/aarch64-scalable-linux-ptrace.h
index 2be45588785..2c6d899e931 100644
--- a/gdb/nat/aarch64-scalable-linux-ptrace.h
+++ b/gdb/nat/aarch64-scalable-linux-ptrace.h
@@ -18,8 +18,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_AARCH64_SCALABLE_LINUX_PTRACE_H
-#define NAT_AARCH64_SCALABLE_LINUX_PTRACE_H
+#ifndef GDB_NAT_AARCH64_SCALABLE_LINUX_PTRACE_H
+#define GDB_NAT_AARCH64_SCALABLE_LINUX_PTRACE_H
 
 #include <signal.h>
 #include <sys/utsname.h>
@@ -176,4 +176,4 @@ aarch64_zt_regs_copy_to_reg_buf (int tid, struct reg_buffer_common *reg_buf,
 extern void
 aarch64_zt_regs_copy_from_reg_buf (int tid, struct reg_buffer_common *reg_buf,
 				   int zt_regnum);
-#endif /* NAT_AARCH64_SCALABLE_LINUX_PTRACE_H */
+#endif /* GDB_NAT_AARCH64_SCALABLE_LINUX_PTRACE_H */
diff --git a/gdb/nat/aarch64-scalable-linux-sigcontext.h b/gdb/nat/aarch64-scalable-linux-sigcontext.h
index 8db524250a8..bfda9be617a 100644
--- a/gdb/nat/aarch64-scalable-linux-sigcontext.h
+++ b/gdb/nat/aarch64-scalable-linux-sigcontext.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_AARCH64_SCALABLE_LINUX_SIGCONTEXT_H
-#define NAT_AARCH64_SCALABLE_LINUX_SIGCONTEXT_H
+#ifndef GDB_NAT_AARCH64_SCALABLE_LINUX_SIGCONTEXT_H
+#define GDB_NAT_AARCH64_SCALABLE_LINUX_SIGCONTEXT_H
 
 #ifndef SVE_SIG_ZREGS_SIZE
 
@@ -325,4 +325,4 @@ struct user_za_header {
 	(ZA_PT_ZA_OFFSET + ZA_PT_ZA_SIZE(vq))
 #endif /* ZA_PT_SIZE */
 
-#endif /* NAT_AARCH64_SCALABLE_LINUX_SIGCONTEXT_H */
+#endif /* GDB_NAT_AARCH64_SCALABLE_LINUX_SIGCONTEXT_H */
diff --git a/gdb/nat/amd64-linux-siginfo.h b/gdb/nat/amd64-linux-siginfo.h
index b8fd8c0e2ae..1e102ae99b3 100644
--- a/gdb/nat/amd64-linux-siginfo.h
+++ b/gdb/nat/amd64-linux-siginfo.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_AMD64_LINUX_SIGINFO_H
-#define NAT_AMD64_LINUX_SIGINFO_H
+#ifndef GDB_NAT_AMD64_LINUX_SIGINFO_H
+#define GDB_NAT_AMD64_LINUX_SIGINFO_H
 
 #include <signal.h>
 
@@ -55,4 +55,4 @@ int amd64_linux_siginfo_fixup_common (siginfo_t *native, gdb_byte *inf,
 				      int direction,
 				      enum amd64_siginfo_fixup_mode mode);
 
-#endif /* NAT_AMD64_LINUX_SIGINFO_H */
+#endif /* GDB_NAT_AMD64_LINUX_SIGINFO_H */
diff --git a/gdb/nat/fork-inferior.h b/gdb/nat/fork-inferior.h
index a609f68bcb4..509aa053764 100644
--- a/gdb/nat/fork-inferior.h
+++ b/gdb/nat/fork-inferior.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_FORK_INFERIOR_H
-#define NAT_FORK_INFERIOR_H
+#ifndef GDB_NAT_FORK_INFERIOR_H
+#define GDB_NAT_FORK_INFERIOR_H
 
 #include <string>
 #include "gdbsupport/function-view.h"
@@ -87,4 +87,4 @@ extern void trace_start_error (const char *fmt, ...)
 extern void trace_start_error_with_name (const char *string)
   ATTRIBUTE_NORETURN;
 
-#endif /* NAT_FORK_INFERIOR_H */
+#endif /* GDB_NAT_FORK_INFERIOR_H */
diff --git a/gdb/nat/gdb_ptrace.h b/gdb/nat/gdb_ptrace.h
index 81727cbdbd6..17858848a62 100644
--- a/gdb/nat/gdb_ptrace.h
+++ b/gdb/nat/gdb_ptrace.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_GDB_PTRACE_H
-#define NAT_GDB_PTRACE_H
+#ifndef GDB_NAT_GDB_PTRACE_H
+#define GDB_NAT_GDB_PTRACE_H
 
 /* The <sys/ptrace.h> header was introduced with 4.4BSD, and provided
    the PT_* symbolic constants for the ptrace(2) request numbers.  The
@@ -142,4 +142,4 @@
 	 ptrace ((PTRACE_TYPE_ARG1) request, pid, addr, data)
 #endif
 
-#endif /* NAT_GDB_PTRACE_H */
+#endif /* GDB_NAT_GDB_PTRACE_H */
diff --git a/gdb/nat/gdb_thread_db.h b/gdb/nat/gdb_thread_db.h
index 0e683787c40..446b92129dd 100644
--- a/gdb/nat/gdb_thread_db.h
+++ b/gdb/nat/gdb_thread_db.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_GDB_THREAD_DB_H
-#define NAT_GDB_THREAD_DB_H
+#ifndef GDB_NAT_GDB_THREAD_DB_H
+#define GDB_NAT_GDB_THREAD_DB_H
 
 #ifdef HAVE_THREAD_DB_H
 #include <thread_db.h>
@@ -73,4 +73,4 @@ typedef td_err_e (td_thr_tlsbase_ftype) (const td_thrhandle_t *th,
 typedef const char ** (td_symbol_list_ftype) (void);
 typedef td_err_e (td_ta_delete_ftype) (td_thragent_t *);
 
-#endif /* NAT_GDB_THREAD_DB_H */
+#endif /* GDB_NAT_GDB_THREAD_DB_H */
diff --git a/gdb/nat/glibc_thread_db.h b/gdb/nat/glibc_thread_db.h
index 598805deef2..87eb62b3efe 100644
--- a/gdb/nat/glibc_thread_db.h
+++ b/gdb/nat/glibc_thread_db.h
@@ -16,8 +16,8 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_GLIBC_THREAD_DB_H
-#define NAT_GLIBC_THREAD_DB_H
+#ifndef GDB_NAT_GLIBC_THREAD_DB_H
+#define GDB_NAT_GLIBC_THREAD_DB_H
 
 /* This is the debugger interface for the NPTL library.  It is
    modelled closely after the interface with same names in Solaris
@@ -455,4 +455,4 @@ extern td_err_e td_thr_dbsuspend (const td_thrhandle_t *__th);
 /* Resume execution of thread TH.  */
 extern td_err_e td_thr_dbresume (const td_thrhandle_t *__th);
 
-#endif /* NAT_GLIBC_THREAD_DB_H */
+#endif /* GDB_NAT_GLIBC_THREAD_DB_H */
diff --git a/gdb/nat/linux-btrace.h b/gdb/nat/linux-btrace.h
index 0771f4b5a65..6fd81073673 100644
--- a/gdb/nat/linux-btrace.h
+++ b/gdb/nat/linux-btrace.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_LINUX_BTRACE_H
-#define NAT_LINUX_BTRACE_H
+#ifndef GDB_NAT_LINUX_BTRACE_H
+#define GDB_NAT_LINUX_BTRACE_H
 
 #include "gdbsupport/btrace-common.h"
 #include "gdbsupport/gdb-checked-static-cast.h"
@@ -86,4 +86,4 @@ extern enum btrace_error linux_read_btrace (struct btrace_data *btrace,
 extern const struct btrace_config *
   linux_btrace_conf (const struct btrace_target_info *);
 
-#endif /* NAT_LINUX_BTRACE_H */
+#endif /* GDB_NAT_LINUX_BTRACE_H */
diff --git a/gdb/nat/linux-namespaces.h b/gdb/nat/linux-namespaces.h
index 298ff056653..4327292950b 100644
--- a/gdb/nat/linux-namespaces.h
+++ b/gdb/nat/linux-namespaces.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_LINUX_NAMESPACES_H
-#define NAT_LINUX_NAMESPACES_H
+#ifndef GDB_NAT_LINUX_NAMESPACES_H
+#define GDB_NAT_LINUX_NAMESPACES_H
 
 /* Set to true to enable debugging of Linux namespaces code.  */
 
@@ -73,4 +73,4 @@ extern int linux_mntns_unlink (pid_t pid, const char *filename);
 extern ssize_t linux_mntns_readlink (pid_t pid, const char *filename,
 				     char *buf, size_t bufsiz);
 
-#endif /* NAT_LINUX_NAMESPACES_H */
+#endif /* GDB_NAT_LINUX_NAMESPACES_H */
diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h
index d4a36cbb601..e847eb033bd 100644
--- a/gdb/nat/linux-nat.h
+++ b/gdb/nat/linux-nat.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_LINUX_NAT_H
-#define NAT_LINUX_NAT_H
+#ifndef GDB_NAT_LINUX_NAT_H
+#define GDB_NAT_LINUX_NAT_H
 
 #include "gdbsupport/function-view.h"
 #include "target/waitstatus.h"
@@ -91,4 +91,4 @@ extern void linux_stop_lwp (struct lwp_info *lwp);
 
 extern int lwp_is_stepping (struct lwp_info *lwp);
 
-#endif /* NAT_LINUX_NAT_H */
+#endif /* GDB_NAT_LINUX_NAT_H */
diff --git a/gdb/nat/linux-osdata.h b/gdb/nat/linux-osdata.h
index 833915cdb2f..a700ea1eb80 100644
--- a/gdb/nat/linux-osdata.h
+++ b/gdb/nat/linux-osdata.h
@@ -17,11 +17,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_LINUX_OSDATA_H
-#define NAT_LINUX_OSDATA_H
+#ifndef GDB_NAT_LINUX_OSDATA_H
+#define GDB_NAT_LINUX_OSDATA_H
 
 extern int linux_common_core_of_thread (ptid_t ptid);
 extern LONGEST linux_common_xfer_osdata (const char *annex, gdb_byte *readbuf,
 					 ULONGEST offset, ULONGEST len);
 
-#endif /* NAT_LINUX_OSDATA_H */
+#endif /* GDB_NAT_LINUX_OSDATA_H */
diff --git a/gdb/nat/linux-personality.h b/gdb/nat/linux-personality.h
index 0238fe0c7e5..ab6727076ad 100644
--- a/gdb/nat/linux-personality.h
+++ b/gdb/nat/linux-personality.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_LINUX_PERSONALITY_H
-#define NAT_LINUX_PERSONALITY_H
+#ifndef GDB_NAT_LINUX_PERSONALITY_H
+#define GDB_NAT_LINUX_PERSONALITY_H
 
 class maybe_disable_address_space_randomization
 {
@@ -43,4 +43,4 @@ class maybe_disable_address_space_randomization
   int m_personality_orig;
 };
 
-#endif /* ! NAT_LINUX_PERSONALITY_H */
+#endif /* GDB_NAT_LINUX_PERSONALITY_H */
diff --git a/gdb/nat/linux-procfs.h b/gdb/nat/linux-procfs.h
index 880afbcdd61..6b352d97f3d 100644
--- a/gdb/nat/linux-procfs.h
+++ b/gdb/nat/linux-procfs.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_LINUX_PROCFS_H
-#define NAT_LINUX_PROCFS_H
+#ifndef GDB_NAT_LINUX_PROCFS_H
+#define GDB_NAT_LINUX_PROCFS_H
 
 #include <unistd.h>
 
@@ -85,4 +85,4 @@ extern const char *linux_proc_pid_to_exec_file (int pid);
 
 extern void linux_proc_init_warnings ();
 
-#endif /* NAT_LINUX_PROCFS_H */
+#endif /* GDB_NAT_LINUX_PROCFS_H */
diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
index a268432ad92..fee2a4f4c5d 100644
--- a/gdb/nat/linux-ptrace.h
+++ b/gdb/nat/linux-ptrace.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_LINUX_PTRACE_H
-#define NAT_LINUX_PTRACE_H
+#ifndef GDB_NAT_LINUX_PTRACE_H
+#define GDB_NAT_LINUX_PTRACE_H
 
 #include "nat/gdb_ptrace.h"
 #include "gdbsupport/gdb_wait.h"
@@ -189,4 +189,4 @@ extern int linux_ptrace_get_extended_event (int wstat);
 extern int linux_is_extended_waitstatus (int wstat);
 extern int linux_wstatus_maybe_breakpoint (int wstat);
 
-#endif /* NAT_LINUX_PTRACE_H */
+#endif /* GDB_NAT_LINUX_PTRACE_H */
diff --git a/gdb/nat/linux-waitpid.h b/gdb/nat/linux-waitpid.h
index e069f8a84a8..b75782d4520 100644
--- a/gdb/nat/linux-waitpid.h
+++ b/gdb/nat/linux-waitpid.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_LINUX_WAITPID_H
-#define NAT_LINUX_WAITPID_H
+#ifndef GDB_NAT_LINUX_WAITPID_H
+#define GDB_NAT_LINUX_WAITPID_H
 
 /* Wrapper function for waitpid which handles EINTR.  */
 extern int my_waitpid (int pid, int *status, int flags);
@@ -27,4 +27,4 @@ extern int my_waitpid (int pid, int *status, int flags);
    messages only.  */
 extern std::string status_to_str (int status);
 
-#endif /* NAT_LINUX_WAITPID_H */
+#endif /* GDB_NAT_LINUX_WAITPID_H */
diff --git a/gdb/nat/mips-linux-watch.h b/gdb/nat/mips-linux-watch.h
index a37eabd2058..b18b009f3b7 100644
--- a/gdb/nat/mips-linux-watch.h
+++ b/gdb/nat/mips-linux-watch.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_MIPS_LINUX_WATCH_H
-#define NAT_MIPS_LINUX_WATCH_H
+#ifndef GDB_NAT_MIPS_LINUX_WATCH_H
+#define GDB_NAT_MIPS_LINUX_WATCH_H
 
 #include <asm/ptrace.h>
 #include "gdbsupport/break-common.h"
@@ -116,4 +116,4 @@ int mips_linux_read_watch_registers (long lwpid,
 				     struct pt_watch_regs *watch_readback,
 				     int *watch_readback_valid, int force);
 
-#endif /* NAT_MIPS_LINUX_WATCH_H */
+#endif /* GDB_NAT_MIPS_LINUX_WATCH_H */
diff --git a/gdb/nat/netbsd-nat.h b/gdb/nat/netbsd-nat.h
index cc529cfd0c6..1ffd705e3be 100644
--- a/gdb/nat/netbsd-nat.h
+++ b/gdb/nat/netbsd-nat.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_NETBSD_NAT_H
-#define NAT_NETBSD_NAT_H
+#ifndef GDB_NAT_NETBSD_NAT_H
+#define GDB_NAT_NETBSD_NAT_H
 
 #include "gdbsupport/function-view.h"
 
@@ -91,4 +91,4 @@ extern int read_memory (pid_t pid, unsigned char *readbuf, CORE_ADDR offset,
 			size_t len, size_t *xfered_len);
 }
 
-#endif
+#endif /* GDB_NAT_NETBSD_NAT_H */
diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h
index b51e2278f4b..3efc1b9a9bf 100644
--- a/gdb/nat/ppc-linux.h
+++ b/gdb/nat/ppc-linux.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_PPC_LINUX_H
-#define NAT_PPC_LINUX_H
+#ifndef GDB_NAT_PPC_LINUX_H
+#define GDB_NAT_PPC_LINUX_H
 
 #include <asm/ptrace.h>
 #include <asm/cputable.h>
@@ -162,4 +162,4 @@
 /* Return the wordsize of the target, either 4 or 8 bytes.  */
 int ppc_linux_target_wordsize (int tid);
 
-#endif /* NAT_PPC_LINUX_H */
+#endif /* GDB_NAT_PPC_LINUX_H */
diff --git a/gdb/nat/riscv-linux-tdesc.h b/gdb/nat/riscv-linux-tdesc.h
index fa9d5bcb7f5..875135ed979 100644
--- a/gdb/nat/riscv-linux-tdesc.h
+++ b/gdb/nat/riscv-linux-tdesc.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_RISCV_LINUX_TDESC_H
-#define NAT_RISCV_LINUX_TDESC_H
+#ifndef GDB_NAT_RISCV_LINUX_TDESC_H
+#define GDB_NAT_RISCV_LINUX_TDESC_H
 
 #include "arch/riscv.h"
 
@@ -25,4 +25,4 @@
    corresponding features object.  */
 struct riscv_gdbarch_features riscv_linux_read_features (int tid);
 
-#endif /* NAT_RISCV_LINUX_TDESC_H */
+#endif /* GDB_NAT_RISCV_LINUX_TDESC_H */
diff --git a/gdb/nat/windows-nat.h b/gdb/nat/windows-nat.h
index f2b5d777016..e03b41a53d4 100644
--- a/gdb/nat/windows-nat.h
+++ b/gdb/nat/windows-nat.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_WINDOWS_NAT_H
-#define NAT_WINDOWS_NAT_H
+#ifndef GDB_NAT_WINDOWS_NAT_H
+#define GDB_NAT_WINDOWS_NAT_H
 
 #include <windows.h>
 #include <psapi.h>
@@ -440,4 +440,4 @@ extern bool initialize_loadable ();
 
 }
 
-#endif
+#endif /* GDB_NAT_WINDOWS_NAT_H */
diff --git a/gdb/nat/x86-cpuid.h b/gdb/nat/x86-cpuid.h
index 5e9ce604f4e..02a204c1348 100644
--- a/gdb/nat/x86-cpuid.h
+++ b/gdb/nat/x86-cpuid.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_X86_CPUID_H
-#define NAT_X86_CPUID_H
+#ifndef GDB_NAT_X86_CPUID_H
+#define GDB_NAT_X86_CPUID_H
 
 /* Always include the header for the cpu bit defines.  */
 #include "x86-gcc-cpuid.h"
@@ -82,4 +82,4 @@ x86_cpuid_count (unsigned int __level, unsigned int __sublevel,
 #undef nullptr
 #endif
 
-#endif /* NAT_X86_CPUID_H */
+#endif /* GDB_NAT_X86_CPUID_H */
diff --git a/gdb/nat/x86-dregs.h b/gdb/nat/x86-dregs.h
index 795cb112f88..3dcbf8e3028 100644
--- a/gdb/nat/x86-dregs.h
+++ b/gdb/nat/x86-dregs.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_X86_DREGS_H
-#define NAT_X86_DREGS_H
+#ifndef GDB_NAT_X86_DREGS_H
+#define GDB_NAT_X86_DREGS_H
 
 /* Support for hardware watchpoints and breakpoints using the x86
    debug registers.
@@ -133,4 +133,4 @@ extern int x86_dr_stopped_by_watchpoint (struct x86_debug_reg_state *state);
    triggered.  Otherwise return false.  */
 extern int x86_dr_stopped_by_hw_breakpoint (struct x86_debug_reg_state *state);
 
-#endif /* NAT_X86_DREGS_H */
+#endif /* GDB_NAT_X86_DREGS_H */
diff --git a/gdb/nat/x86-gcc-cpuid.h b/gdb/nat/x86-gcc-cpuid.h
index dfd12587d81..b0f2d239af3 100644
--- a/gdb/nat/x86-gcc-cpuid.h
+++ b/gdb/nat/x86-gcc-cpuid.h
@@ -3,8 +3,8 @@
  * include this directly, but pull in x86-cpuid.h and use that func.
  */
 
-#ifndef NAT_X86_GCC_CPUID_H
-#define NAT_X86_GCC_CPUID_H
+#ifndef GDB_NAT_X86_GCC_CPUID_H
+#define GDB_NAT_X86_GCC_CPUID_H
 
 /*
  * Copyright (C) 2007-2024 Free Software Foundation, Inc.
@@ -273,4 +273,4 @@ __get_cpuid_count (unsigned int __leaf, unsigned int __subleaf,
   return 1;
 }
 
-#endif /* NAT_X86_GCC_CPUID_H */
+#endif /* GDB_NAT_X86_GCC_CPUID_H */
diff --git a/gdb/nat/x86-linux-dregs.h b/gdb/nat/x86-linux-dregs.h
index 2b30c4a7a62..6f6a6e3d24e 100644
--- a/gdb/nat/x86-linux-dregs.h
+++ b/gdb/nat/x86-linux-dregs.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_X86_LINUX_DREGS_H
-#define NAT_X86_LINUX_DREGS_H
+#ifndef GDB_NAT_X86_LINUX_DREGS_H
+#define GDB_NAT_X86_LINUX_DREGS_H
 
 /* Return the address stored in the current inferior's debug register
    REGNUM.  */
@@ -50,4 +50,4 @@ extern unsigned long x86_linux_dr_get_status (void);
 
 extern void x86_linux_update_debug_registers (struct lwp_info *lwp);
 
-#endif /* NAT_X86_LINUX_DREGS_H */
+#endif /* GDB_NAT_X86_LINUX_DREGS_H */
diff --git a/gdb/nat/x86-linux.h b/gdb/nat/x86-linux.h
index 822882173f9..9b5db895455 100644
--- a/gdb/nat/x86-linux.h
+++ b/gdb/nat/x86-linux.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_X86_LINUX_H
-#define NAT_X86_LINUX_H
+#ifndef GDB_NAT_X86_LINUX_H
+#define GDB_NAT_X86_LINUX_H
 
 #include "nat/linux-nat.h"
 
@@ -47,4 +47,4 @@ extern void x86_linux_delete_thread (struct arch_lwp_info *arch_lwp);
 
 extern void x86_linux_prepare_to_resume (struct lwp_info *lwp);
 
-#endif /* NAT_X86_LINUX_H */
+#endif /* GDB_NAT_X86_LINUX_H */
diff --git a/gdb/nat/x86-xstate.h b/gdb/nat/x86-xstate.h
index 199d39a5217..14b58cd0312 100644
--- a/gdb/nat/x86-xstate.h
+++ b/gdb/nat/x86-xstate.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NAT_X86_XSTATE_H
-#define NAT_X86_XSTATE_H
+#ifndef GDB_NAT_X86_XSTATE_H
+#define GDB_NAT_X86_XSTATE_H
 
 #include "gdbsupport/x86-xstate.h"
 
@@ -32,4 +32,4 @@ int x86_xsave_length ();
 
 x86_xsave_layout x86_fetch_xsave_layout (uint64_t xcr0, int len);
 
-#endif /* NAT_X86_XSTATE_H */
+#endif /* GDB_NAT_X86_XSTATE_H */
diff --git a/gdb/nds32-tdep.h b/gdb/nds32-tdep.h
index a4d62848c51..18c360d7bdb 100644
--- a/gdb/nds32-tdep.h
+++ b/gdb/nds32-tdep.h
@@ -18,8 +18,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NDS32_TDEP_H
-#define NDS32_TDEP_H
+#ifndef GDB_NDS32_TDEP_H
+#define GDB_NDS32_TDEP_H
 
 #include "gdbarch.h"
 
@@ -53,4 +53,4 @@ struct nds32_gdbarch_tdep : gdbarch_tdep_base
   /* ELF ABI info.  */
   int elf_abi = 0;
 };
-#endif /* NDS32_TDEP_H */
+#endif /* GDB_NDS32_TDEP_H */
diff --git a/gdb/netbsd-nat.h b/gdb/netbsd-nat.h
index 4895b088d13..87e076f69e7 100644
--- a/gdb/netbsd-nat.h
+++ b/gdb/netbsd-nat.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NBSD_NAT_H
-#define NBSD_NAT_H
+#ifndef GDB_NETBSD_NAT_H
+#define GDB_NETBSD_NAT_H
 
 #include "inf-ptrace.h"
 
@@ -61,4 +61,4 @@ struct nbsd_nat_target : public inf_ptrace_target
   void post_startup_inferior (ptid_t ptid) override;
 };
 
-#endif /* netbsd-nat.h */
+#endif /* GDB_NETBSD_NAT_H */
diff --git a/gdb/netbsd-tdep.h b/gdb/netbsd-tdep.h
index 3a9d527ca81..2e2993ea5dc 100644
--- a/gdb/netbsd-tdep.h
+++ b/gdb/netbsd-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NBSD_TDEP_H
-#define NBSD_TDEP_H
+#ifndef GDB_NETBSD_TDEP_H
+#define GDB_NETBSD_TDEP_H
 
 int nbsd_pc_in_sigtramp (CORE_ADDR, const char *);
 
@@ -44,4 +44,4 @@ extern void nbsd_info_proc_mappings_entry (int addr_bit, ULONGEST kve_start,
 					   int kve_flags, int kve_protection,
 					   const char *kve_path);
 
-#endif /* NBSD_TDEP_H */
+#endif /* GDB_NETBSD_TDEP_H */
diff --git a/gdb/nios2-tdep.h b/gdb/nios2-tdep.h
index 57e0de7076d..0b3d01ab232 100644
--- a/gdb/nios2-tdep.h
+++ b/gdb/nios2-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NIOS2_TDEP_H
-#define NIOS2_TDEP_H
+#ifndef GDB_NIOS2_TDEP_H
+#define GDB_NIOS2_TDEP_H
 
 #include "gdbarch.h"
 
@@ -87,4 +87,4 @@ struct nios2_gdbarch_tdep : gdbarch_tdep_base
 extern const struct target_desc *tdesc_nios2_linux;
 extern const struct target_desc *tdesc_nios2;
 
-#endif /* NIOS2_TDEP_H */
+#endif /* GDB_NIOS2_TDEP_H */
diff --git a/gdb/nto-tdep.h b/gdb/nto-tdep.h
index 249a4f631fe..2edbcff8c91 100644
--- a/gdb/nto-tdep.h
+++ b/gdb/nto-tdep.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef NTO_TDEP_H
-#define NTO_TDEP_H
+#ifndef GDB_NTO_TDEP_H
+#define GDB_NTO_TDEP_H
 
 #include "solist.h"
 #include "osabi.h"
@@ -191,4 +191,4 @@ LONGEST nto_read_auxv_from_initial_stack (CORE_ADDR initial_stack,
 
 struct nto_inferior_data *nto_inferior_data (struct inferior *inf);
 
-#endif /* NTO_TDEP_H */
+#endif /* GDB_NTO_TDEP_H */
diff --git a/gdb/objc-lang.h b/gdb/objc-lang.h
index 879d7475d9d..6a8dc39c53a 100644
--- a/gdb/objc-lang.h
+++ b/gdb/objc-lang.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined(OBJC_LANG_H)
-#define OBJC_LANG_H
+#ifndef GDB_OBJC_LANG_H
+#define GDB_OBJC_LANG_H
 
 struct stoken;
 
@@ -48,4 +48,4 @@ struct symbol *lookup_struct_typedef (const char *name,
 				      const struct block *block,
 				      int noerr);
 
-#endif
+#endif /* GDB_OBJC_LANG_H */
diff --git a/gdb/objfile-flags.h b/gdb/objfile-flags.h
index 43d888e2a5a..e0a84bcdc2e 100644
--- a/gdb/objfile-flags.h
+++ b/gdb/objfile-flags.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (OBJFILE_FLAGS_H)
-#define OBJFILE_FLAGS_H
+#ifndef GDB_OBJFILE_FLAGS_H
+#define GDB_OBJFILE_FLAGS_H
 
 #include "gdbsupport/enum-flags.h"
 
@@ -60,4 +60,4 @@ enum objfile_flag : unsigned
 
 DEF_ENUM_FLAGS_TYPE (enum objfile_flag, objfile_flags);
 
-#endif /* !defined (OBJFILE_FLAGS_H) */
+#endif /* GDB_OBJFILE_FLAGS_H */
diff --git a/gdb/objfiles.h b/gdb/objfiles.h
index 8b8b7182e87..4d8e5c45680 100644
--- a/gdb/objfiles.h
+++ b/gdb/objfiles.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (OBJFILES_H)
-#define OBJFILES_H
+#ifndef GDB_OBJFILES_H
+#define GDB_OBJFILES_H
 
 #include "hashtab.h"
 #include "gdbsupport/gdb_obstack.h"
@@ -1031,4 +1031,4 @@ extern void objfile_register_static_link
 extern const struct dynamic_prop *objfile_lookup_static_link
   (struct objfile *objfile, const struct block *block);
 
-#endif /* !defined (OBJFILES_H) */
+#endif /* GDB_OBJFILES_H */
diff --git a/gdb/obsd-nat.h b/gdb/obsd-nat.h
index 0811a82d85c..35ee212e09f 100644
--- a/gdb/obsd-nat.h
+++ b/gdb/obsd-nat.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef OBSD_NAT_H
-#define OBSD_NAT_H
+#ifndef GDB_OBSD_NAT_H
+#define GDB_OBSD_NAT_H
 
 #include "inf-ptrace.h"
 
@@ -41,4 +41,4 @@ class obsd_nat_target : public inf_ptrace_target
   void post_startup_inferior (ptid_t) override;
 };
 
-#endif /* obsd-nat.h */
+#endif /* GDB_OBSD_NAT_H */
diff --git a/gdb/obsd-tdep.h b/gdb/obsd-tdep.h
index 85cea7be7cf..c018513cb1b 100644
--- a/gdb/obsd-tdep.h
+++ b/gdb/obsd-tdep.h
@@ -17,12 +17,12 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef OBSD_TDEP_H
-#define OBSD_TDEP_H 1
+#ifndef GDB_OBSD_TDEP_H
+#define GDB_OBSD_TDEP_H
 
 struct gdbarch;
 
 CORE_ADDR obsd_skip_solib_resolver (struct gdbarch *, CORE_ADDR);
 void obsd_init_abi (struct gdbarch_info, struct gdbarch *);
 
-#endif /* obsd-tdep.h */
+#endif /* GDB_OBSD_TDEP_H */
diff --git a/gdb/observable.h b/gdb/observable.h
index 2aa3ef3fd4e..2ce2711abd6 100644
--- a/gdb/observable.h
+++ b/gdb/observable.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef OBSERVABLE_H
-#define OBSERVABLE_H
+#ifndef GDB_OBSERVABLE_H
+#define GDB_OBSERVABLE_H
 
 #include "gdbsupport/observable.h"
 #include "target/waitstatus.h"
@@ -257,4 +257,4 @@ extern observable <program_space */* pspace */> free_program_space;
 
 } /* namespace gdb */
 
-#endif /* OBSERVABLE_H */
+#endif /* GDB_OBSERVABLE_H */
diff --git a/gdb/or1k-linux-tdep.h b/gdb/or1k-linux-tdep.h
index 4e84e72c269..b510f32d16e 100644
--- a/gdb/or1k-linux-tdep.h
+++ b/gdb/or1k-linux-tdep.h
@@ -17,10 +17,10 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef OR1K_LINUX_TDEP_H
-#define OR1K_LINUX_TDEP_H
+#ifndef GDB_OR1K_LINUX_TDEP_H
+#define GDB_OR1K_LINUX_TDEP_H
 
 /* Target descriptions.  */
 extern struct target_desc *tdesc_or1k_linux;
 
-#endif /* OR1K_LINUX_TDEP_H */
+#endif /* GDB_OR1K_LINUX_TDEP_H */
diff --git a/gdb/or1k-tdep.h b/gdb/or1k-tdep.h
index 6107cc4612c..f3072572e57 100644
--- a/gdb/or1k-tdep.h
+++ b/gdb/or1k-tdep.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License along
    With this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef OR1K_TDEP_H
-#define OR1K_TDEP_H
+#ifndef GDB_OR1K_TDEP_H
+#define GDB_OR1K_TDEP_H
 
 #ifndef TARGET_OR1K
 #define TARGET_OR1K
@@ -60,4 +60,4 @@ extern std::vector<CORE_ADDR> or1k_software_single_step
   (struct regcache *regcache);
 
 
-#endif /* OR1K_TDEP_H */
+#endif /* GDB_OR1K_TDEP_H */
diff --git a/gdb/osabi.h b/gdb/osabi.h
index c1a85d1b9a3..bbcd0d0c23a 100644
--- a/gdb/osabi.h
+++ b/gdb/osabi.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef OSABI_H
-#define OSABI_H
+#ifndef GDB_OSABI_H
+#define GDB_OSABI_H
 
 /* * List of known OS ABIs.  If you change this, make sure to update the
    table in osabi.c.  */
@@ -92,4 +92,4 @@ const char *osabi_triplet_regexp (enum gdb_osabi osabi);
 void generic_elf_osabi_sniff_abi_tag_sections (bfd *, asection *,
 					       enum gdb_osabi *);
 
-#endif /* OSABI_H */
+#endif /* GDB_OSABI_H */
diff --git a/gdb/osdata.h b/gdb/osdata.h
index 09259b6c9ae..9de443ac4de 100644
--- a/gdb/osdata.h
+++ b/gdb/osdata.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef OSDATA_H
-#define OSDATA_H
+#ifndef GDB_OSDATA_H
+#define GDB_OSDATA_H
 
 #include <vector>
 
@@ -57,4 +57,4 @@ const std::string *get_osdata_column (const osdata_item &item,
    available types of OS data.  */
 void info_osdata (const char *type);
 
-#endif /* OSDATA_H */
+#endif /* GDB_OSDATA_H */
diff --git a/gdb/p-lang.h b/gdb/p-lang.h
index fe12e7cab33..abb981aeaed 100644
--- a/gdb/p-lang.h
+++ b/gdb/p-lang.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef P_LANG_H
-#define P_LANG_H
+#ifndef GDB_P_LANG_H
+#define GDB_P_LANG_H
 
 /* This file is derived from c-lang.h */
 
@@ -252,4 +252,4 @@ class pascal_language : public language_defn
 				   struct type *type) const;
 };
 
-#endif /* P_LANG_H */
+#endif /* GDB_P_LANG_H */
diff --git a/gdb/parser-defs.h b/gdb/parser-defs.h
index 9774a465ee2..eaa3c411141 100644
--- a/gdb/parser-defs.h
+++ b/gdb/parser-defs.h
@@ -20,8 +20,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (PARSER_DEFS_H)
-#define PARSER_DEFS_H 1
+#ifndef GDB_PARSER_DEFS_H
+#define GDB_PARSER_DEFS_H
 
 #include "expression.h"
 #include "symtab.h"
@@ -389,4 +389,4 @@ extern bool fits_in_type (int n_sign, const gdb_mpz &n, int type_bits,
 
 extern void parser_fprintf (FILE *, const char *, ...) ATTRIBUTE_PRINTF (2, 3);
 
-#endif /* PARSER_DEFS_H */
+#endif /* GDB_PARSER_DEFS_H */
diff --git a/gdb/ppc-fbsd-tdep.h b/gdb/ppc-fbsd-tdep.h
index b9c0e6bb351..93ba9045f2f 100644
--- a/gdb/ppc-fbsd-tdep.h
+++ b/gdb/ppc-fbsd-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef PPC_FBSD_TDEP_H
-#define PPC_FBSD_TDEP_H
+#ifndef GDB_PPC_FBSD_TDEP_H
+#define GDB_PPC_FBSD_TDEP_H
 
 struct regset;
 
@@ -26,4 +26,4 @@ struct regset;
 const struct regset *ppc_fbsd_gregset (int);
 const struct regset *ppc_fbsd_fpregset (void);
 
-#endif /* PPC_FBSD_TDEP_H  */
+#endif /* GDB_PPC_FBSD_TDEP_H */
diff --git a/gdb/ppc-linux-tdep.h b/gdb/ppc-linux-tdep.h
index 8a0a59f2b70..a1db503c9f5 100644
--- a/gdb/ppc-linux-tdep.h
+++ b/gdb/ppc-linux-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef PPC_LINUX_TDEP_H
-#define PPC_LINUX_TDEP_H
+#ifndef GDB_PPC_LINUX_TDEP_H
+#define GDB_PPC_LINUX_TDEP_H
 
 #include "ppc-tdep.h"
 
@@ -65,4 +65,4 @@ extern const struct regset ppc32_linux_cpprregset;
 extern const struct regset ppc32_linux_cdscrregset;
 extern const struct regset ppc32_linux_ctarregset;
 
-#endif /* PPC_LINUX_TDEP_H */
+#endif /* GDB_PPC_LINUX_TDEP_H */
diff --git a/gdb/ppc-netbsd-tdep.h b/gdb/ppc-netbsd-tdep.h
index 6a92020f5ab..47a8b25782a 100644
--- a/gdb/ppc-netbsd-tdep.h
+++ b/gdb/ppc-netbsd-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef PPC_NBSD_TDEP_H
-#define PPC_NBSD_TDEP_H
+#ifndef GDB_PPC_NETBSD_TDEP_H
+#define GDB_PPC_NETBSD_TDEP_H
 
 struct regset;
 
@@ -29,4 +29,4 @@ extern struct ppc_reg_offsets ppcnbsd_reg_offsets;
 extern const struct regset ppcnbsd_gregset;
 extern const struct regset ppcnbsd_fpregset;
 
-#endif /* PPC_NBSD_TDEP_H */
+#endif /* GDB_PPC_NETBSD_TDEP_H */
diff --git a/gdb/ppc-obsd-tdep.h b/gdb/ppc-obsd-tdep.h
index 70396abdf84..7f5e7b99850 100644
--- a/gdb/ppc-obsd-tdep.h
+++ b/gdb/ppc-obsd-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef PPC_OBSD_TDEP_H
-#define PPC_OBSD_TDEP_H
+#ifndef GDB_PPC_OBSD_TDEP_H
+#define GDB_PPC_OBSD_TDEP_H
 
 struct regset;
 struct regcache;
@@ -49,4 +49,4 @@ extern void ppcobsd_collect_gregset (const struct regset *regset,
 				     const struct regcache *regcache,
 				     int regnum, void *gregs, size_t len);
 
-#endif /* ppc-obsd-tdep.h */
+#endif /* GDB_PPC_OBSD_TDEP_H */
diff --git a/gdb/ppc-ravenscar-thread.h b/gdb/ppc-ravenscar-thread.h
index 2b0916a916f..c03fbd2ec52 100644
--- a/gdb/ppc-ravenscar-thread.h
+++ b/gdb/ppc-ravenscar-thread.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef PPC_RAVENSCAR_THREAD_H
-#define PPC_RAVENSCAR_THREAD_H
+#ifndef GDB_PPC_RAVENSCAR_THREAD_H
+#define GDB_PPC_RAVENSCAR_THREAD_H
 
 struct gdbarch;
 
@@ -26,4 +26,4 @@ extern void register_ppc_ravenscar_ops (struct gdbarch *gdbarch);
 
 extern void register_e500_ravenscar_ops (struct gdbarch *gdbarch);
 
-#endif
+#endif /* GDB_PPC_RAVENSCAR_THREAD_H */
diff --git a/gdb/ppc-tdep.h b/gdb/ppc-tdep.h
index db31c7f199a..3176c155fe3 100644
--- a/gdb/ppc-tdep.h
+++ b/gdb/ppc-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef PPC_TDEP_H
-#define PPC_TDEP_H
+#ifndef GDB_PPC_TDEP_H
+#define GDB_PPC_TDEP_H
 
 #include "gdbarch.h"
 
@@ -458,4 +458,4 @@ extern const struct target_desc *tdesc_powerpc_vsx32;
 extern const struct target_desc *tdesc_powerpc_altivec64;
 extern const struct target_desc *tdesc_powerpc_altivec32;
 
-#endif /* ppc-tdep.h */
+#endif /* GDB_PPC_TDEP_H */
diff --git a/gdb/ppc64-tdep.h b/gdb/ppc64-tdep.h
index ff0e3fdd033..7bea549dda0 100644
--- a/gdb/ppc64-tdep.h
+++ b/gdb/ppc64-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef PPC64_TDEP_H
-#define PPC64_TDEP_H
+#ifndef GDB_PPC64_TDEP_H
+#define GDB_PPC64_TDEP_H
 
 struct gdbarch;
 class frame_info_ptr;
@@ -33,4 +33,4 @@ extern CORE_ADDR ppc64_convert_from_func_ptr_addr (struct gdbarch *gdbarch,
 
 extern void ppc64_elf_make_msymbol_special (asymbol *,
 					    struct minimal_symbol *);
-#endif /* PPC64_TDEP_H  */
+#endif /* GDB_PPC64_TDEP_H */
diff --git a/gdb/probe.h b/gdb/probe.h
index 41e728ad049..00b3f9086b4 100644
--- a/gdb/probe.h
+++ b/gdb/probe.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (PROBE_H)
-#define PROBE_H 1
+#ifndef GDB_PROBE_H
+#define GDB_PROBE_H
 
 #include "symtab.h"
 
@@ -309,4 +309,4 @@ extern struct value *probe_safe_evaluate_at_pc (const frame_info_ptr &frame,
 
 bool ignore_probe_p (const char *provider, const char *name,
 		     const char *objfile_name, const char *TYPE);
-#endif /* !defined (PROBE_H) */
+#endif /* GDB_PROBE_H */
diff --git a/gdb/proc-utils.h b/gdb/proc-utils.h
index 8ef7d7ccd34..5f8fe39f78f 100644
--- a/gdb/proc-utils.h
+++ b/gdb/proc-utils.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef PROC_UTILS_H
-#define PROC_UTILS_H
+#ifndef GDB_PROC_UTILS_H
+#define GDB_PROC_UTILS_H
 
 /* From proc-why.c */
 
@@ -117,4 +117,4 @@ extern  void  procfs_note      (const char *, const char *, int);
    word used to write to the /proc/PID/ctl file.  */
 typedef long procfs_ctl_t;
 
-#endif /* PROC_UTILS_H */
+#endif /* GDB_PROC_UTILS_H */
diff --git a/gdb/process-stratum-target.h b/gdb/process-stratum-target.h
index 9aa9d874ecb..8a0e139cd0c 100644
--- a/gdb/process-stratum-target.h
+++ b/gdb/process-stratum-target.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef PROCESS_STRATUM_TARGET_H
-#define PROCESS_STRATUM_TARGET_H
+#ifndef GDB_PROCESS_STRATUM_TARGET_H
+#define GDB_PROCESS_STRATUM_TARGET_H
 
 #include "target.h"
 #include <set>
@@ -173,4 +173,4 @@ extern std::set<process_stratum_target *> all_non_exited_process_targets ();
 
 extern void switch_to_target_no_thread (process_stratum_target *target);
 
-#endif /* !defined (PROCESS_STRATUM_TARGET_H) */
+#endif /* GDB_PROCESS_STRATUM_TARGET_H */
diff --git a/gdb/procfs.h b/gdb/procfs.h
index e0c1dd654ca..0dafb9a88b4 100644
--- a/gdb/procfs.h
+++ b/gdb/procfs.h
@@ -17,12 +17,12 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef PROCFS_H
-#define PROCFS_H
+#ifndef GDB_PROCFS_H
+#define GDB_PROCFS_H
 
 /* Return a ptid for which we guarantee we will be able to find a
    'live' procinfo.  */
 
 extern ptid_t procfs_first_available (void);
 
-#endif /* PROCFS_H */
+#endif /* GDB_PROCFS_H */
diff --git a/gdb/producer.h b/gdb/producer.h
index 84721bd2665..5cdb7ee3435 100644
--- a/gdb/producer.h
+++ b/gdb/producer.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef PRODUCER_H
-#define PRODUCER_H
+#ifndef GDB_PRODUCER_H
+#define GDB_PRODUCER_H
 
 /* Check for GCC >= 4.x according to the symtab->producer string.  Return minor
    version (x) of 4.x in such case.  If it is not GCC or it is GCC older than
@@ -50,4 +50,4 @@ extern bool producer_is_llvm (const char *producer);
    Sets MAJOR and MINOR accordingly, if not NULL.  */
 extern bool producer_is_clang (const char *producer, int *major, int *minor);
 
-#endif
+#endif /* GDB_PRODUCER_H */
diff --git a/gdb/progspace-and-thread.h b/gdb/progspace-and-thread.h
index fa512710a25..52c493bf687 100644
--- a/gdb/progspace-and-thread.h
+++ b/gdb/progspace-and-thread.h
@@ -16,8 +16,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#ifndef PROGSPACE_AND_THREAD_H
-#define PROGSPACE_AND_THREAD_H
+#ifndef GDB_PROGSPACE_AND_THREAD_H
+#define GDB_PROGSPACE_AND_THREAD_H
 
 #include "progspace.h"
 #include "gdbthread.h"
@@ -37,4 +37,4 @@ class scoped_restore_current_pspace_and_thread
    current thread, if there's one and it isn't executing.  */
 void switch_to_program_space_and_thread (program_space *pspace);
 
-#endif
+#endif /* GDB_PROGSPACE_AND_THREAD_H */
diff --git a/gdb/progspace.h b/gdb/progspace.h
index 7f5e23df126..74220e5ba4c 100644
--- a/gdb/progspace.h
+++ b/gdb/progspace.h
@@ -18,8 +18,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#ifndef PROGSPACE_H
-#define PROGSPACE_H
+#ifndef GDB_PROGSPACE_H
+#define GDB_PROGSPACE_H
 
 #include "target.h"
 #include "gdb_bfd.h"
@@ -472,4 +472,4 @@ extern address_space_ref_ptr maybe_new_address_space ();
    mappings.  */
 extern void update_address_spaces (void);
 
-#endif
+#endif /* GDB_PROGSPACE_H */
diff --git a/gdb/prologue-value.h b/gdb/prologue-value.h
index ea784f90dd2..39235d591fc 100644
--- a/gdb/prologue-value.h
+++ b/gdb/prologue-value.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef PROLOGUE_VALUE_H
-#define PROLOGUE_VALUE_H
+#ifndef GDB_PROLOGUE_VALUE_H
+#define GDB_PROLOGUE_VALUE_H
 
 /* What sort of value is this?  This determines the interpretation
    of subsequent fields.  */
@@ -327,4 +327,4 @@ class pv_area
   struct area_entry *m_entry;
 };
 
-#endif /* PROLOGUE_VALUE_H */
+#endif /* GDB_PROLOGUE_VALUE_H */
diff --git a/gdb/psymtab.h b/gdb/psymtab.h
index 557a7cf4c08..7833815ef50 100644
--- a/gdb/psymtab.h
+++ b/gdb/psymtab.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef PSYMTAB_H
-#define PSYMTAB_H
+#ifndef GDB_PSYMTAB_H
+#define GDB_PSYMTAB_H
 
 #include "objfiles.h"
 #include <string_view>
@@ -687,4 +687,4 @@ struct psymbol_functions : public quick_symbol_functions
   std::shared_ptr<psymtab_storage> m_partial_symtabs;
 };
 
-#endif /* PSYMTAB_H */
+#endif /* GDB_PSYMTAB_H */
diff --git a/gdb/python/py-event.h b/gdb/python/py-event.h
index 388c513e5e9..2819707b2dd 100644
--- a/gdb/python/py-event.h
+++ b/gdb/python/py-event.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef PYTHON_PY_EVENT_H
-#define PYTHON_PY_EVENT_H
+#ifndef GDB_PYTHON_PY_EVENT_H
+#define GDB_PYTHON_PY_EVENT_H
 
 #include "py-events.h"
 #include "command.h"
@@ -87,4 +87,4 @@ extern int evpy_add_attribute (PyObject *event,
 int gdbpy_initialize_event_generic (PyTypeObject *type, const char *name)
   CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION;
 
-#endif /* PYTHON_PY_EVENT_H */
+#endif /* GDB_PYTHON_PY_EVENT_H */
diff --git a/gdb/python/py-events.h b/gdb/python/py-events.h
index e628e0fd63e..b44c4371f24 100644
--- a/gdb/python/py-events.h
+++ b/gdb/python/py-events.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef PYTHON_PY_EVENTS_H
-#define PYTHON_PY_EVENTS_H
+#ifndef GDB_PYTHON_PY_EVENTS_H
+#define GDB_PYTHON_PY_EVENTS_H
 
 #include "command.h"
 #include "python-internal.h"
@@ -54,4 +54,4 @@ extern events_object gdb_py_events;
 extern eventregistry_object *create_eventregistry_object (void);
 extern bool evregpy_no_listeners_p (eventregistry_object *registry);
 
-#endif /* PYTHON_PY_EVENTS_H */
+#endif /* GDB_PYTHON_PY_EVENTS_H */
diff --git a/gdb/python/py-instruction.h b/gdb/python/py-instruction.h
index 85604de5188..efbdda84bae 100644
--- a/gdb/python/py-instruction.h
+++ b/gdb/python/py-instruction.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef PYTHON_PY_INSTRUCTION_H
-#define PYTHON_PY_INSTRUCTION_H
+#ifndef GDB_PYTHON_PY_INSTRUCTION_H
+#define GDB_PYTHON_PY_INSTRUCTION_H
 
 #include "python-internal.h"
 
@@ -32,4 +32,4 @@
 
 extern PyTypeObject *py_insn_get_insn_type ();
 
-#endif /* PYTHON_PY_INSTRUCTION_H */
+#endif /* GDB_PYTHON_PY_INSTRUCTION_H */
diff --git a/gdb/python/py-record-btrace.h b/gdb/python/py-record-btrace.h
index 8678e77322b..0410dd66be8 100644
--- a/gdb/python/py-record-btrace.h
+++ b/gdb/python/py-record-btrace.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef PYTHON_PY_RECORD_BTRACE_H
-#define PYTHON_PY_RECORD_BTRACE_H
+#ifndef GDB_PYTHON_PY_RECORD_BTRACE_H
+#define GDB_PYTHON_PY_RECORD_BTRACE_H
 
 #include "python-internal.h"
 
@@ -88,4 +88,4 @@ extern PyObject *recpy_bt_func_prev (PyObject *self, void *closure);
 /* Implementation of RecordFunctionSegment.next [RecordFunctionSegment].  */
 extern PyObject *recpy_bt_func_next (PyObject *self, void *closure);
 
-#endif /* PYTHON_PY_RECORD_BTRACE_H */
+#endif /* GDB_PYTHON_PY_RECORD_BTRACE_H */
diff --git a/gdb/python/py-record-full.h b/gdb/python/py-record-full.h
index 7125e4eba05..df957761602 100644
--- a/gdb/python/py-record-full.h
+++ b/gdb/python/py-record-full.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef PYTHON_PY_RECORD_FULL_H
-#define PYTHON_PY_RECORD_FULL_H
+#ifndef GDB_PYTHON_PY_RECORD_FULL_H
+#define GDB_PYTHON_PY_RECORD_FULL_H
 
 #include "python-internal.h"
 
@@ -28,4 +28,4 @@ extern PyObject *recpy_full_method (PyObject *self, void *value);
 /* Implementation of record.format [str].  */
 extern PyObject *recpy_full_format (PyObject *self, void *value);
 
-#endif /* PYTHON_PY_RECORD_FULL_H */
+#endif /* GDB_PYTHON_PY_RECORD_FULL_H */
diff --git a/gdb/python/py-record.h b/gdb/python/py-record.h
index 7e1161005b4..0687e78784a 100644
--- a/gdb/python/py-record.h
+++ b/gdb/python/py-record.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef PYTHON_PY_RECORD_H
-#define PYTHON_PY_RECORD_H
+#ifndef GDB_PYTHON_PY_RECORD_H
+#define GDB_PYTHON_PY_RECORD_H
 
 #include "inferior.h"
 #include "python-internal.h"
@@ -71,4 +71,4 @@ extern PyObject *recpy_func_new (thread_info *thread, enum record_method method,
 extern PyObject *recpy_gap_new (int reason_code, const char *reason_string,
 				Py_ssize_t number);
 
-#endif /* PYTHON_PY_RECORD_H */
+#endif /* GDB_PYTHON_PY_RECORD_H */
diff --git a/gdb/python/py-ref.h b/gdb/python/py-ref.h
index 35029e8d673..938068e7803 100644
--- a/gdb/python/py-ref.h
+++ b/gdb/python/py-ref.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef PYTHON_PY_REF_H
-#define PYTHON_PY_REF_H
+#ifndef GDB_PYTHON_PY_REF_H
+#define GDB_PYTHON_PY_REF_H
 
 #include "gdbsupport/gdb_ref_ptr.h"
 
@@ -42,4 +42,4 @@ struct gdbpy_ref_policy
 template<typename T = PyObject> using gdbpy_ref
   = gdb::ref_ptr<T, gdbpy_ref_policy<T>>;
 
-#endif /* PYTHON_PY_REF_H */
+#endif /* GDB_PYTHON_PY_REF_H */
diff --git a/gdb/python/py-stopevent.h b/gdb/python/py-stopevent.h
index 6cae0a729db..450d8c23b4a 100644
--- a/gdb/python/py-stopevent.h
+++ b/gdb/python/py-stopevent.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef PYTHON_PY_STOPEVENT_H
-#define PYTHON_PY_STOPEVENT_H
+#ifndef GDB_PYTHON_PY_STOPEVENT_H
+#define GDB_PYTHON_PY_STOPEVENT_H
 
 #include "py-event.h"
 
@@ -35,4 +35,4 @@ extern gdbpy_ref<> create_breakpoint_event_object (const gdbpy_ref<> &dict,
 extern gdbpy_ref<> create_signal_event_object (const gdbpy_ref<> &dict,
 					       enum gdb_signal stop_signal);
 
-#endif /* PYTHON_PY_STOPEVENT_H */
+#endif /* GDB_PYTHON_PY_STOPEVENT_H */
diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
index 5132ec15ba6..d9863935f0c 100644
--- a/gdb/python/python-internal.h
+++ b/gdb/python/python-internal.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef PYTHON_PYTHON_INTERNAL_H
-#define PYTHON_PYTHON_INTERNAL_H
+#ifndef GDB_PYTHON_PYTHON_INTERNAL_H
+#define GDB_PYTHON_PYTHON_INTERNAL_H
 
 #include "extension.h"
 #include "extension-priv.h"
@@ -1035,4 +1035,4 @@ extern std::optional<int> gdbpy_print_insn (struct gdbarch *gdbarch,
 					    CORE_ADDR address,
 					    disassemble_info *info);
 
-#endif /* PYTHON_PYTHON_INTERNAL_H */
+#endif /* GDB_PYTHON_PYTHON_INTERNAL_H */
diff --git a/gdb/python/python.h b/gdb/python/python.h
index e6279482ce0..e8032853e8e 100644
--- a/gdb/python/python.h
+++ b/gdb/python/python.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef PYTHON_PYTHON_H
-#define PYTHON_PYTHON_H
+#ifndef GDB_PYTHON_PYTHON_H
+#define GDB_PYTHON_PYTHON_H
 
 #include "extension.h"
 
@@ -34,4 +34,4 @@ extern cmd_list_element *python_cmd_element;
    at other times.  */
 extern struct objfile *gdbpy_current_objfile;
 
-#endif /* PYTHON_PYTHON_H */
+#endif /* GDB_PYTHON_PYTHON_H */
diff --git a/gdb/ravenscar-thread.h b/gdb/ravenscar-thread.h
index 32c31269225..046b3575e7f 100644
--- a/gdb/ravenscar-thread.h
+++ b/gdb/ravenscar-thread.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef RAVENSCAR_THREAD_H
-#define RAVENSCAR_THREAD_H
+#ifndef GDB_RAVENSCAR_THREAD_H
+#define GDB_RAVENSCAR_THREAD_H
 
 /* Architecture-specific hooks.  */
 
@@ -130,4 +130,4 @@ struct ravenscar_arch_ops
   CORE_ADDR get_stack_base (struct regcache *) const;
 };
 
-#endif /* !defined (RAVENSCAR_THREAD_H) */
+#endif /* GDB_RAVENSCAR_THREAD_H */
diff --git a/gdb/record-btrace.h b/gdb/record-btrace.h
index b6e6c4df030..5ab3208f659 100644
--- a/gdb/record-btrace.h
+++ b/gdb/record-btrace.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef RECORD_BTRACE_H
-#define RECORD_BTRACE_H
+#ifndef GDB_RECORD_BTRACE_H
+#define GDB_RECORD_BTRACE_H
 
 /* Push the record_btrace target.  */
 extern void record_btrace_push_target (void);
@@ -29,4 +29,4 @@ extern void record_btrace_push_target (void);
    NULL if the cpu was configured as auto.  */
 extern const struct btrace_cpu *record_btrace_get_cpu (void);
 
-#endif /* RECORD_BTRACE_H */
+#endif /* GDB_RECORD_BTRACE_H */
diff --git a/gdb/record-full.h b/gdb/record-full.h
index ef45b1c0d59..dc14d476715 100644
--- a/gdb/record-full.h
+++ b/gdb/record-full.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef RECORD_FULL_H
-#define RECORD_FULL_H
+#ifndef GDB_RECORD_FULL_H
+#define GDB_RECORD_FULL_H
 
 extern bool record_full_memory_query;
 
@@ -31,4 +31,4 @@ extern int record_full_is_used (void);
 
 extern scoped_restore_tmpl<int> record_full_gdb_operation_disable_set ();
 
-#endif /* RECORD_FULL_H */
+#endif /* GDB_RECORD_FULL_H */
diff --git a/gdb/record.h b/gdb/record.h
index f44b3952943..471e2711b12 100644
--- a/gdb/record.h
+++ b/gdb/record.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef RECORD_H
-#define RECORD_H
+#ifndef GDB_RECORD_H
+#define GDB_RECORD_H
 
 #include "target/waitstatus.h"
 #include "gdbsupport/enum-flags.h"
@@ -114,4 +114,4 @@ extern void record_start (const char *method, const char *format,
 /* Stop recording.  Throw on failure.  */
 extern void record_stop (int from_tty);
 
-#endif /* RECORD_H */
+#endif /* GDB_RECORD_H */
diff --git a/gdb/regcache.h b/gdb/regcache.h
index 9ba6c79ab0d..1e06dc60096 100644
--- a/gdb/regcache.h
+++ b/gdb/regcache.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef REGCACHE_H
-#define REGCACHE_H
+#ifndef GDB_REGCACHE_H
+#define GDB_REGCACHE_H
 
 #include "gdbsupport/array-view.h"
 #include "gdbsupport/common-regcache.h"
@@ -548,4 +548,4 @@ class register_dump
   gdbarch *m_gdbarch;
 };
 
-#endif /* REGCACHE_H */
+#endif /* GDB_REGCACHE_H */
diff --git a/gdb/regformats/regdef.h b/gdb/regformats/regdef.h
index 0ba7a08bb0c..8715229fcdb 100644
--- a/gdb/regformats/regdef.h
+++ b/gdb/regformats/regdef.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef REGFORMATS_REGDEF_H
-#define REGFORMATS_REGDEF_H
+#ifndef GDB_REGFORMATS_REGDEF_H
+#define GDB_REGFORMATS_REGDEF_H
 
 namespace gdb {
 
@@ -64,4 +64,4 @@ struct reg
 
 } /* namespace gdb */
 
-#endif /* REGFORMATS_REGDEF_H */
+#endif /* GDB_REGFORMATS_REGDEF_H */
diff --git a/gdb/reggroups.h b/gdb/reggroups.h
index 1be1f0ad613..24f81e4675b 100644
--- a/gdb/reggroups.h
+++ b/gdb/reggroups.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef REGGROUPS_H
-#define REGGROUPS_H
+#ifndef GDB_REGGROUPS_H
+#define GDB_REGGROUPS_H
 
 struct gdbarch;
 
@@ -98,4 +98,4 @@ extern const reggroup *reggroup_find (struct gdbarch *gdbarch,
 extern int default_register_reggroup_p (struct gdbarch *gdbarch, int regnum,
 					const struct reggroup *reggroup);
 
-#endif
+#endif /* GDB_REGGROUPS_H */
diff --git a/gdb/registry.h b/gdb/registry.h
index b6b941f56fd..32216545cb0 100644
--- a/gdb/registry.h
+++ b/gdb/registry.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef REGISTRY_H
-#define REGISTRY_H
+#ifndef GDB_REGISTRY_H
+#define GDB_REGISTRY_H
 
 #include <type_traits>
 
@@ -225,4 +225,4 @@ class registry
   }
 };
 
-#endif /* REGISTRY_H */
+#endif /* GDB_REGISTRY_H */
diff --git a/gdb/regset.h b/gdb/regset.h
index 5fab2e16d9c..44eaf1406bc 100644
--- a/gdb/regset.h
+++ b/gdb/regset.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef REGSET_H
-#define REGSET_H 1
+#ifndef GDB_REGSET_H
+#define GDB_REGSET_H
 
 struct gdbarch;
 struct regcache;
@@ -52,4 +52,4 @@ struct regset
 #define REGSET_VARIABLE_SIZE 1	/* Accept a larger regset section size
 				   in a core file without warning.  */
 
-#endif /* regset.h */
+#endif /* GDB_REGSET_H */
diff --git a/gdb/remote-fileio.h b/gdb/remote-fileio.h
index 479dc46888e..d406895bc7e 100644
--- a/gdb/remote-fileio.h
+++ b/gdb/remote-fileio.h
@@ -19,8 +19,8 @@
 
 /* See the GDB User Guide for details of the GDB remote protocol.  */
 
-#ifndef REMOTE_FILEIO_H
-#define REMOTE_FILEIO_H
+#ifndef GDB_REMOTE_FILEIO_H
+#define GDB_REMOTE_FILEIO_H
 
 #include "gdbsupport/fileio.h"
 
@@ -44,4 +44,4 @@ extern void initialize_remote_fileio (
 extern void remote_fileio_to_host_stat (struct fio_stat *fst,
 					struct stat *st);
 
-#endif
+#endif /* GDB_REMOTE_FILEIO_H */
diff --git a/gdb/remote-notif.h b/gdb/remote-notif.h
index 4c5b50a0d12..cca26b09f95 100644
--- a/gdb/remote-notif.h
+++ b/gdb/remote-notif.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef REMOTE_NOTIF_H
-#define REMOTE_NOTIF_H
+#ifndef GDB_REMOTE_NOTIF_H
+#define GDB_REMOTE_NOTIF_H
 
 #include <list>
 #include <memory>
@@ -131,4 +131,4 @@ extern const notif_client notif_client_stop;
 
 extern bool notif_debug;
 
-#endif /* REMOTE_NOTIF_H */
+#endif /* GDB_REMOTE_NOTIF_H */
diff --git a/gdb/remote.h b/gdb/remote.h
index cb0a66da66e..173f3a2a0f2 100644
--- a/gdb/remote.h
+++ b/gdb/remote.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef REMOTE_H
-#define REMOTE_H
+#ifndef GDB_REMOTE_H
+#define GDB_REMOTE_H
 
 #include "remote-notif.h"
 
@@ -121,4 +121,4 @@ extern void send_remote_packet (gdb::array_view<const char> &buf,
 
 extern bool is_remote_target (process_stratum_target *target);
 
-#endif
+#endif /* GDB_REMOTE_H */
diff --git a/gdb/riscv-fbsd-tdep.h b/gdb/riscv-fbsd-tdep.h
index c797b231a8e..22ae08d3678 100644
--- a/gdb/riscv-fbsd-tdep.h
+++ b/gdb/riscv-fbsd-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef RISCV_FBSD_TDEP_H
-#define RISCV_FBSD_TDEP_H
+#ifndef GDB_RISCV_FBSD_TDEP_H
+#define GDB_RISCV_FBSD_TDEP_H
 
 #include "regset.h"
 
@@ -35,4 +35,4 @@
 extern const struct regset riscv_fbsd_gregset;
 extern const struct regset riscv_fbsd_fpregset;
 
-#endif /* RISCV_FBSD_TDEP_H */
+#endif /* GDB_RISCV_FBSD_TDEP_H */
diff --git a/gdb/riscv-ravenscar-thread.h b/gdb/riscv-ravenscar-thread.h
index a586a85583a..87730438017 100644
--- a/gdb/riscv-ravenscar-thread.h
+++ b/gdb/riscv-ravenscar-thread.h
@@ -17,11 +17,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef RISCV_RAVENSCAR_THREAD_H
-#define RISCV_RAVENSCAR_THREAD_H
+#ifndef GDB_RISCV_RAVENSCAR_THREAD_H
+#define GDB_RISCV_RAVENSCAR_THREAD_H
 
 struct gdbarch;
 
 extern void register_riscv_ravenscar_ops (struct gdbarch *gdbarch);
 
-#endif
+#endif /* GDB_RISCV_RAVENSCAR_THREAD_H */
diff --git a/gdb/riscv-tdep.h b/gdb/riscv-tdep.h
index 4bdc2e7a3d5..15c2c4cafcb 100644
--- a/gdb/riscv-tdep.h
+++ b/gdb/riscv-tdep.h
@@ -18,8 +18,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef RISCV_TDEP_H
-#define RISCV_TDEP_H
+#ifndef GDB_RISCV_TDEP_H
+#define GDB_RISCV_TDEP_H
 
 #include "arch/riscv.h"
 #include "gdbarch.h"
@@ -180,4 +180,4 @@ extern void riscv_supply_regset (const struct regset *regset,
 /* The names of the RISC-V target description features.  */
 extern const char *riscv_feature_name_csr;
 
-#endif /* RISCV_TDEP_H */
+#endif /* GDB_RISCV_TDEP_H */
diff --git a/gdb/rs6000-aix-tdep.h b/gdb/rs6000-aix-tdep.h
index 52cffc31084..5e4f7865ac6 100644
--- a/gdb/rs6000-aix-tdep.h
+++ b/gdb/rs6000-aix-tdep.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef RS6000_AIX_TDEP_H
-#define RS6000_AIX_TDEP_H
+#ifndef GDB_RS6000_AIX_TDEP_H
+#define GDB_RS6000_AIX_TDEP_H
 
 extern ULONGEST rs6000_aix_ld_info_to_xml (struct gdbarch *gdbarch,
 					   const gdb_byte *ldi_buf,
@@ -25,4 +25,4 @@ extern ULONGEST rs6000_aix_ld_info_to_xml (struct gdbarch *gdbarch,
 					   ULONGEST len,
 					   int close_ldinfo_fd);
 
-#endif /* RS6000_AIX_TDEP_H */
+#endif /* GDB_RS6000_AIX_TDEP_H */
diff --git a/gdb/rust-exp.h b/gdb/rust-exp.h
index f5c5904cfb4..e0496e1a050 100644
--- a/gdb/rust-exp.h
+++ b/gdb/rust-exp.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef RUST_EXP_H
-#define RUST_EXP_H
+#ifndef GDB_RUST_EXP_H
+#define GDB_RUST_EXP_H
 
 #include "expop.h"
 
@@ -226,4 +226,4 @@ class rust_parenthesized_operation
 
 } /* namespace expr */
 
-#endif /* RUST_EXP_H */
+#endif /* GDB_RUST_EXP_H */
diff --git a/gdb/rust-lang.h b/gdb/rust-lang.h
index 9ae5961e9ac..f9c82454817 100644
--- a/gdb/rust-lang.h
+++ b/gdb/rust-lang.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef RUST_LANG_H
-#define RUST_LANG_H
+#ifndef GDB_RUST_LANG_H
+#define GDB_RUST_LANG_H
 
 #include "demangle.h"
 #include "language.h"
@@ -228,4 +228,4 @@ class rust_language : public language_defn
 		   const struct value_print_options *options) const;
 };
 
-#endif /* RUST_LANG_H */
+#endif /* GDB_RUST_LANG_H */
diff --git a/gdb/s390-linux-tdep.h b/gdb/s390-linux-tdep.h
index 2f9741dca96..b2efb5b1d2f 100644
--- a/gdb/s390-linux-tdep.h
+++ b/gdb/s390-linux-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef S390_LINUX_TDEP_H
-#define S390_LINUX_TDEP_H
+#ifndef GDB_S390_LINUX_TDEP_H
+#define GDB_S390_LINUX_TDEP_H
 
 #define S390_IS_GREGSET_REGNUM(i)					\
   (((i) >= S390_PSWM_REGNUM && (i) <= S390_A15_REGNUM)			\
@@ -64,4 +64,4 @@ extern const struct target_desc *tdesc_s390x_vx_linux64;
 extern const struct target_desc *tdesc_s390x_tevx_linux64;
 extern const struct target_desc *tdesc_s390x_gs_linux64;
 
-#endif /* S390_LINUX_TDEP_H */
+#endif /* GDB_S390_LINUX_TDEP_H */
diff --git a/gdb/s390-tdep.h b/gdb/s390-tdep.h
index 10f775f468f..bfcb8f17c56 100644
--- a/gdb/s390-tdep.h
+++ b/gdb/s390-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef S390_TDEP_H
-#define S390_TDEP_H
+#ifndef GDB_S390_TDEP_H
+#define GDB_S390_TDEP_H
 
 #include "prologue-value.h"
 #include "gdbarch.h"
@@ -322,4 +322,4 @@ extern struct value *s390_trad_frame_prev_register
 extern const struct target_desc *tdesc_s390_linux32;
 extern const struct target_desc *tdesc_s390x_linux64;
 
-#endif /* S390_TDEP_H */
+#endif /* GDB_S390_TDEP_H */
diff --git a/gdb/scoped-mock-context.h b/gdb/scoped-mock-context.h
index 2446e9ad41b..6fd83da4679 100644
--- a/gdb/scoped-mock-context.h
+++ b/gdb/scoped-mock-context.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SCOPED_MOCK_CONTEXT_H
-#define SCOPED_MOCK_CONTEXT_H
+#ifndef GDB_SCOPED_MOCK_CONTEXT_H
+#define GDB_SCOPED_MOCK_CONTEXT_H
 
 #include "inferior.h"
 #include "gdbthread.h"
@@ -78,4 +78,4 @@ struct scoped_mock_context
 } // namespace selftests
 #endif /* GDB_SELF_TEST */
 
-#endif /* !defined (SCOPED_MOCK_CONTEXT_H) */
+#endif /* GDB_SCOPED_MOCK_CONTEXT_H */
diff --git a/gdb/selftest-arch.h b/gdb/selftest-arch.h
index 84494076bd7..db11723395e 100644
--- a/gdb/selftest-arch.h
+++ b/gdb/selftest-arch.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SELFTEST_ARCH_H
-#define SELFTEST_ARCH_H
+#ifndef GDB_SELFTEST_ARCH_H
+#define GDB_SELFTEST_ARCH_H
 
 typedef void self_test_foreach_arch_function (struct gdbarch *);
 
@@ -31,4 +31,4 @@ extern void
 			      self_test_foreach_arch_function *function);
 }
 
-#endif /* SELFTEST_ARCH_H */
+#endif /* GDB_SELFTEST_ARCH_H */
diff --git a/gdb/sentinel-frame.h b/gdb/sentinel-frame.h
index 1a37ff1f49a..36bee59f0f0 100644
--- a/gdb/sentinel-frame.h
+++ b/gdb/sentinel-frame.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (SENTINEL_FRAME_H)
-#define SENTINEL_FRAME_H 1
+#ifndef GDB_SENTINEL_FRAME_H
+#define GDB_SENTINEL_FRAME_H
 
 struct frame_unwind;
 struct regcache;
@@ -36,4 +36,4 @@ extern void *sentinel_frame_cache (struct regcache *regcache);
 
 extern const struct frame_unwind sentinel_frame_unwind;
 
-#endif /* !defined (SENTINEL_FRAME_H)  */
+#endif /* GDB_SENTINEL_FRAME_H */
diff --git a/gdb/ser-base.h b/gdb/ser-base.h
index 37fe0a2e5f5..ecb7c99ea62 100644
--- a/gdb/ser-base.h
+++ b/gdb/ser-base.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SER_BASE_H
-#define SER_BASE_H
+#ifndef GDB_SER_BASE_H
+#define GDB_SER_BASE_H
 
 #include "serial.h"
 
@@ -50,4 +50,4 @@ extern void ser_base_write (struct serial *scb, const void *buf, size_t count);
 extern void ser_base_async (struct serial *scb, int async_p);
 extern int ser_base_readchar (struct serial *scb, int timeout);
 
-#endif
+#endif /* GDB_SER_BASE_H */
diff --git a/gdb/ser-event.h b/gdb/ser-event.h
index 2c0a59df5df..08fc62b29ab 100644
--- a/gdb/ser-event.h
+++ b/gdb/ser-event.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SER_EVENT_H
-#define SER_EVENT_H
+#ifndef GDB_SER_EVENT_H
+#define GDB_SER_EVENT_H
 
 /* This is used to be able to signal the event loop (or any other
    select/poll) of events, in a race-free manner.
@@ -48,4 +48,4 @@ extern void serial_event_set (struct serial_event *event);
    call is made.  */
 extern void serial_event_clear (struct serial_event *event);
 
-#endif
+#endif /* GDB_SER_EVENT_H */
diff --git a/gdb/ser-tcp.h b/gdb/ser-tcp.h
index 6ff3662cefd..a1ebcf3c2a8 100644
--- a/gdb/ser-tcp.h
+++ b/gdb/ser-tcp.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SER_TCP_H
-#define SER_TCP_H
+#ifndef GDB_SER_TCP_H
+#define GDB_SER_TCP_H
 
 struct serial;
 
@@ -28,4 +28,4 @@ extern int net_read_prim (struct serial *scb, size_t count);
 extern int net_write_prim (struct serial *scb, const void *buf, size_t count);
 extern void ser_tcp_send_break (struct serial *scb);
 
-#endif
+#endif /* GDB_SER_TCP_H */
diff --git a/gdb/ser-unix.h b/gdb/ser-unix.h
index 253c95b24c0..487921f8d53 100644
--- a/gdb/ser-unix.h
+++ b/gdb/ser-unix.h
@@ -17,11 +17,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SER_UNIX_H
-#define SER_UNIX_H
+#ifndef GDB_SER_UNIX_H
+#define GDB_SER_UNIX_H
 
 extern int ser_unix_read_prim (struct serial *scb, size_t count);
 extern int ser_unix_write_prim (struct serial *scb, const void *buf, 
 				size_t count);
 
-#endif
+#endif /* GDB_SER_UNIX_H */
diff --git a/gdb/serial.h b/gdb/serial.h
index 69507e69295..017b8904c35 100644
--- a/gdb/serial.h
+++ b/gdb/serial.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SERIAL_H
-#define SERIAL_H
+#ifndef GDB_SERIAL_H
+#define GDB_SERIAL_H
 
 #ifdef USE_WIN32API
 #include <winsock2.h>
@@ -326,4 +326,4 @@ extern void serial_done_wait_handle (struct serial *);
 
 #endif /* USE_WIN32API */
 
-#endif /* SERIAL_H */
+#endif /* GDB_SERIAL_H */
diff --git a/gdb/sh-tdep.h b/gdb/sh-tdep.h
index 1b1f019920a..dd524406b25 100644
--- a/gdb/sh-tdep.h
+++ b/gdb/sh-tdep.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SH_TDEP_H
-#define SH_TDEP_H
+#ifndef GDB_SH_TDEP_H
+#define GDB_SH_TDEP_H
 
 #include "gdbarch.h"
 
@@ -115,4 +115,4 @@ void sh_corefile_supply_regset (const struct regset *regset,
 void sh_corefile_collect_regset (const struct regset *regset,
 				 const struct regcache *regcache,
 				 int regnum, void *regs, size_t len);
-#endif /* SH_TDEP_H */
+#endif /* GDB_SH_TDEP_H */
diff --git a/gdb/sim-regno.h b/gdb/sim-regno.h
index 7f8f9422a02..76ecfeae3d9 100644
--- a/gdb/sim-regno.h
+++ b/gdb/sim-regno.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SIM_REGNO_H
-#define SIM_REGNO_H
+#ifndef GDB_SIM_REGNO_H
+#define GDB_SIM_REGNO_H
 
 /* The gdbarch_register_sim_regno (REGNUM) method, when there is a
    corresponding simulator register, returns that register number as a
@@ -40,4 +40,4 @@ enum sim_regno {
 
 extern int one2one_register_sim_regno (struct gdbarch *gdbarch, int regnum);
 
-#endif
+#endif /* GDB_SIM_REGNO_H */
diff --git a/gdb/skip.h b/gdb/skip.h
index c3e6cbf98ba..5625a7962fc 100644
--- a/gdb/skip.h
+++ b/gdb/skip.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (SKIP_H)
-#define SKIP_H
+#ifndef GDB_SKIP_H
+#define GDB_SKIP_H
 
 struct symtab_and_line;
 
@@ -25,4 +25,4 @@ struct symtab_and_line;
 bool function_name_is_marked_for_skip (const char *function_name,
 				       const symtab_and_line &function_sal);
 
-#endif /* !defined (SKIP_H) */
+#endif /* GDB_SKIP_H */
diff --git a/gdb/sol2-tdep.h b/gdb/sol2-tdep.h
index a189666f05e..8e505d30e0e 100644
--- a/gdb/sol2-tdep.h
+++ b/gdb/sol2-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SOL2_TDEP_H
-#define SOL2_TDEP_H 1
+#ifndef GDB_SOL2_TDEP_H
+#define GDB_SOL2_TDEP_H
 
 struct gdbarch;
 
@@ -26,4 +26,4 @@ int sol2_sigtramp_p (const frame_info_ptr &this_frame);
 
 void sol2_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch);
 
-#endif /* sol2-tdep.h */
+#endif /* GDB_SOL2_TDEP_H */
diff --git a/gdb/solib-aix.h b/gdb/solib-aix.h
index 6487460b04c..79cad4dcdee 100644
--- a/gdb/solib-aix.h
+++ b/gdb/solib-aix.h
@@ -15,12 +15,12 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SOLIB_AIX_H
-#define SOLIB_AIX_H
+#ifndef GDB_SOLIB_AIX_H
+#define GDB_SOLIB_AIX_H
 
 struct solib_ops;
 extern const solib_ops solib_aix_so_ops;
 
 extern CORE_ADDR solib_aix_get_toc_value (CORE_ADDR pc);
 
-#endif
+#endif /* GDB_SOLIB_AIX_H */
diff --git a/gdb/solib-darwin.h b/gdb/solib-darwin.h
index d6be9eb5b42..d62d6805137 100644
--- a/gdb/solib-darwin.h
+++ b/gdb/solib-darwin.h
@@ -17,11 +17,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SOLIB_DARWIN_H
-#define SOLIB_DARWIN_H
+#ifndef GDB_SOLIB_DARWIN_H
+#define GDB_SOLIB_DARWIN_H
 
 struct solib_ops;
 
 extern const solib_ops darwin_so_ops;
 
-#endif /* solib-darwin.h */
+#endif /* GDB_SOLIB_DARWIN_H */
diff --git a/gdb/solib-dsbt.h b/gdb/solib-dsbt.h
index e1f7d143848..2777939f7f9 100644
--- a/gdb/solib-dsbt.h
+++ b/gdb/solib-dsbt.h
@@ -17,11 +17,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SOLIB_DSBT_H
-#define SOLIB_DSBT_H
+#ifndef GDB_SOLIB_DSBT_H
+#define GDB_SOLIB_DSBT_H
 
 struct solib_ops;
 
 extern const solib_ops dsbt_so_ops;
 
-#endif /* solib-dsbt.h */
+#endif /* GDB_SOLIB_DSBT_H */
diff --git a/gdb/solib-svr4.h b/gdb/solib-svr4.h
index 579fe6d9843..37cdaff4882 100644
--- a/gdb/solib-svr4.h
+++ b/gdb/solib-svr4.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SOLIB_SVR4_H
-#define SOLIB_SVR4_H
+#ifndef GDB_SOLIB_SVR4_H
+#define GDB_SOLIB_SVR4_H
 
 #include "solist.h"
 
@@ -112,4 +112,4 @@ extern struct link_map_offsets *svr4_lp64_fetch_link_map_offsets (void);
    SVR4 run time loader.  */
 int svr4_in_dynsym_resolve_code (CORE_ADDR pc);
 
-#endif /* solib-svr4.h */
+#endif /* GDB_SOLIB_SVR4_H */
diff --git a/gdb/solib-target.h b/gdb/solib-target.h
index 70f53c54553..f03e221588e 100644
--- a/gdb/solib-target.h
+++ b/gdb/solib-target.h
@@ -17,10 +17,10 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SOLIB_TARGET_H
-#define SOLIB_TARGET_H
+#ifndef GDB_SOLIB_TARGET_H
+#define GDB_SOLIB_TARGET_H
 
 struct solib_ops;
 extern const solib_ops solib_target_so_ops;
 
-#endif /* solib-target.h */
+#endif /* GDB_SOLIB_TARGET_H */
diff --git a/gdb/solib.h b/gdb/solib.h
index f7a93c0718f..1d3089634fe 100644
--- a/gdb/solib.h
+++ b/gdb/solib.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SOLIB_H
-#define SOLIB_H
+#ifndef GDB_SOLIB_H
+#define GDB_SOLIB_H
 
 /* Forward decl's for prototypes */
 struct solib;
@@ -143,4 +143,4 @@ extern void set_cbfd_soname_build_id (gdb_bfd_ref_ptr abfd,
 				      const char *soname,
 				      const bfd_build_id *build_id);
 
-#endif /* SOLIB_H */
+#endif /* GDB_SOLIB_H */
diff --git a/gdb/solist.h b/gdb/solist.h
index f0d22080de1..006cdddeed9 100644
--- a/gdb/solist.h
+++ b/gdb/solist.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SOLIST_H
-#define SOLIST_H
+#ifndef GDB_SOLIST_H
+#define GDB_SOLIST_H
 
 #define SO_NAME_MAX_PATH_SIZE 512	/* FIXME: Should be dynamic */
 /* For domain_enum domain.  */
@@ -186,4 +186,4 @@ extern gdb_bfd_ref_ptr solib_bfd_fopen (const char *pathname, int fd);
 /* Find solib binary file and open it.  */
 extern gdb_bfd_ref_ptr solib_bfd_open (const char *in_pathname);
 
-#endif
+#endif /* GDB_SOLIST_H */
diff --git a/gdb/source-cache.h b/gdb/source-cache.h
index d4cb7d00ae8..35eeb1cb204 100644
--- a/gdb/source-cache.h
+++ b/gdb/source-cache.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SOURCE_CACHE_H
-#define SOURCE_CACHE_H
+#ifndef GDB_SOURCE_CACHE_H
+#define GDB_SOURCE_CACHE_H
 
 #include <unordered_map>
 #include <unordered_set>
@@ -104,4 +104,4 @@ class source_cache
 /* The global source cache.  */
 extern source_cache g_source_cache;
 
-#endif /* SOURCE_CACHE_H */
+#endif /* GDB_SOURCE_CACHE_H */
diff --git a/gdb/source.h b/gdb/source.h
index 144ee48f722..09eb1e38655 100644
--- a/gdb/source.h
+++ b/gdb/source.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SOURCE_H
-#define SOURCE_H
+#ifndef GDB_SOURCE_H
+#define GDB_SOURCE_H
 
 #include "gdbsupport/scoped_fd.h"
 
@@ -216,4 +216,4 @@ extern void forget_cached_source_info (void);
    need to would make things slower than necessary.  */
 extern void select_source_symtab ();
 
-#endif
+#endif /* GDB_SOURCE_H */
diff --git a/gdb/sparc-nat.h b/gdb/sparc-nat.h
index 29d994c2a41..712c9d0ac12 100644
--- a/gdb/sparc-nat.h
+++ b/gdb/sparc-nat.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SPARC_NAT_H
-#define SPARC_NAT_H 1
+#ifndef GDB_SPARC_NAT_H
+#define GDB_SPARC_NAT_H
 
 #include "target.h"
 
@@ -82,4 +82,4 @@ struct sparc_target : public BaseTarget
   }
 };
 
-#endif /* sparc-nat.h */
+#endif /* GDB_SPARC_NAT_H */
diff --git a/gdb/sparc-ravenscar-thread.h b/gdb/sparc-ravenscar-thread.h
index d45f6ba8ba5..5f2749f5cd5 100644
--- a/gdb/sparc-ravenscar-thread.h
+++ b/gdb/sparc-ravenscar-thread.h
@@ -17,10 +17,10 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SPARC_RAVENSCAR_THREAD_H
-#define SPARC_RAVENSCAR_THREAD_H
+#ifndef GDB_SPARC_RAVENSCAR_THREAD_H
+#define GDB_SPARC_RAVENSCAR_THREAD_H
 
 struct gdbarch;
 
 extern void register_sparc_ravenscar_ops (struct gdbarch *gdbarch);
-#endif
+#endif /* GDB_SPARC_RAVENSCAR_THREAD_H */
diff --git a/gdb/sparc-tdep.h b/gdb/sparc-tdep.h
index 2d8c50768be..4fd7e6b0f74 100644
--- a/gdb/sparc-tdep.h
+++ b/gdb/sparc-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SPARC_TDEP_H
-#define SPARC_TDEP_H 1
+#ifndef GDB_SPARC_TDEP_H
+#define GDB_SPARC_TDEP_H
 
 #include "gdbarch.h"
 
@@ -264,4 +264,4 @@ extern void sparc32nbsd_init_abi (struct gdbarch_info info,
 extern struct trad_frame_saved_reg *
   sparc32nbsd_sigcontext_saved_regs (const frame_info_ptr &next_frame);
 
-#endif /* sparc-tdep.h */
+#endif /* GDB_SPARC_TDEP_H */
diff --git a/gdb/sparc64-tdep.h b/gdb/sparc64-tdep.h
index 6fcd91ee8d3..a19af4a1b5d 100644
--- a/gdb/sparc64-tdep.h
+++ b/gdb/sparc64-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SPARC64_TDEP_H
-#define SPARC64_TDEP_H 1
+#ifndef GDB_SPARC64_TDEP_H
+#define GDB_SPARC64_TDEP_H
 
 class frame_info_ptr;
 struct gdbarch;
@@ -137,4 +137,4 @@ extern const struct sparc_fpregmap sparc64_bsd_fpregmap;
 
 extern void sparc64_forget_process (pid_t pid);
 
-#endif /* sparc64-tdep.h */
+#endif /* GDB_SPARC64_TDEP_H */
diff --git a/gdb/stabsread.h b/gdb/stabsread.h
index 0a868409470..00c7bd9edfa 100644
--- a/gdb/stabsread.h
+++ b/gdb/stabsread.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef STABSREAD_H
-#define STABSREAD_H
+#ifndef GDB_STABSREAD_H
+#define GDB_STABSREAD_H
 
 struct objfile;
 struct legacy_psymtab;
@@ -215,4 +215,4 @@ extern void init_header_files (void);
 
 extern void scan_file_globals (struct objfile *objfile);
 
-#endif /* STABSREAD_H */
+#endif /* GDB_STABSREAD_H */
diff --git a/gdb/stack.h b/gdb/stack.h
index e7242c71036..e87ba322dee 100644
--- a/gdb/stack.h
+++ b/gdb/stack.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef STACK_H
-#define STACK_H
+#ifndef GDB_STACK_H
+#define GDB_STACK_H
 
 gdb::unique_xmalloc_ptr<char> find_frame_funname (const frame_info_ptr &frame,
 						  enum language *funlang,
@@ -84,4 +84,4 @@ void frame_apply_all_cmd_completer (struct cmd_list_element *ignore,
 				    completion_tracker &tracker,
 				    const char *text, const char */*word*/);
 
-#endif /* #ifndef STACK_H */
+#endif /* GDB_STACK_H */
diff --git a/gdb/stap-probe.h b/gdb/stap-probe.h
index 1401b876ba7..e757d80ef38 100644
--- a/gdb/stap-probe.h
+++ b/gdb/stap-probe.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (STAP_PROBE_H)
-#define STAP_PROBE_H 1
+#ifndef GDB_STAP_PROBE_H
+#define GDB_STAP_PROBE_H
 
 #include "parser-defs.h"
 
@@ -66,4 +66,4 @@ struct stap_parse_info
   int inside_paren_p;
 };
 
-#endif /* !defined (STAP_PROBE_H) */
+#endif /* GDB_STAP_PROBE_H */
diff --git a/gdb/symfile-add-flags.h b/gdb/symfile-add-flags.h
index 19dd5e36907..3db532cc86b 100644
--- a/gdb/symfile-add-flags.h
+++ b/gdb/symfile-add-flags.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (SYMFILE_ADD_FLAGS_H)
-#define SYMFILE_ADD_FLAGS_H
+#ifndef GDB_SYMFILE_ADD_FLAGS_H
+#define GDB_SYMFILE_ADD_FLAGS_H
 
 #include "gdbsupport/enum-flags.h"
 
@@ -54,4 +54,4 @@ enum symfile_add_flag : unsigned
 
 DEF_ENUM_FLAGS_TYPE (enum symfile_add_flag, symfile_add_flags);
 
-#endif /* !defined(SYMFILE_ADD_FLAGS_H) */
+#endif /* GDB_SYMFILE_ADD_FLAGS_H */
diff --git a/gdb/symfile.h b/gdb/symfile.h
index 6f8b441b39f..3ed2179ba41 100644
--- a/gdb/symfile.h
+++ b/gdb/symfile.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (SYMFILE_H)
-#define SYMFILE_H
+#ifndef GDB_SYMFILE_H
+#define GDB_SYMFILE_H
 
 /* This file requires that you first include "bfd.h".  */
 #include "symtab.h"
@@ -379,4 +379,4 @@ extern int readnow_symbol_files;
 
 extern int readnever_symbol_files;
 
-#endif /* !defined(SYMFILE_H) */
+#endif /* GDB_SYMFILE_H */
diff --git a/gdb/symtab.h b/gdb/symtab.h
index bf9a3cfb79f..bfc91574415 100644
--- a/gdb/symtab.h
+++ b/gdb/symtab.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (SYMTAB_H)
-#define SYMTAB_H 1
+#ifndef GDB_SYMTAB_H
+#define GDB_SYMTAB_H
 
 #include <array>
 #include <vector>
@@ -2974,4 +2974,4 @@ extern void info_sources_worker (struct ui_out *uiout,
 
 std::optional<CORE_ADDR> find_epilogue_using_linetable (CORE_ADDR func_addr);
 
-#endif /* !defined(SYMTAB_H) */
+#endif /* GDB_SYMTAB_H */
diff --git a/gdb/target-connection.h b/gdb/target-connection.h
index c742932644f..4faae112dc7 100644
--- a/gdb/target-connection.h
+++ b/gdb/target-connection.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TARGET_CONNECTION_H
-#define TARGET_CONNECTION_H
+#ifndef GDB_TARGET_CONNECTION_H
+#define GDB_TARGET_CONNECTION_H
 
 #include <string>
 
@@ -37,4 +37,4 @@ void connection_list_remove (process_stratum_target *t);
    it.  */
 std::string make_target_connection_string (process_stratum_target *t);
 
-#endif /* TARGET_CONNECTION_H */
+#endif /* GDB_TARGET_CONNECTION_H */
diff --git a/gdb/target-dcache.h b/gdb/target-dcache.h
index 4acc82f83ce..a199a2382f2 100644
--- a/gdb/target-dcache.h
+++ b/gdb/target-dcache.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TARGET_DCACHE_H
-#define TARGET_DCACHE_H
+#ifndef GDB_TARGET_DCACHE_H
+#define GDB_TARGET_DCACHE_H
 
 #include "dcache.h"
 #include "progspace.h"
@@ -33,4 +33,4 @@ extern int stack_cache_enabled_p (void);
 
 extern int code_cache_enabled_p (void);
 
-#endif /* TARGET_DCACHE_H */
+#endif /* GDB_TARGET_DCACHE_H */
diff --git a/gdb/target-debug.h b/gdb/target-debug.h
index 20ba1f73ac5..cf8d690511f 100644
--- a/gdb/target-debug.h
+++ b/gdb/target-debug.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TARGET_DEBUG_H
-#define TARGET_DEBUG_H
+#ifndef GDB_TARGET_DEBUG_H
+#define GDB_TARGET_DEBUG_H
 
 /* Printers for the debug target.  Each prints an object of a given
    type to a string that needn't be freed.  Most printers are macros,
@@ -264,4 +264,4 @@ target_debug_print_x86_xsave_layout (const x86_xsave_layout &layout)
 #undef POFFS
   gdb_puts (" }", gdb_stdlog);
 }
-#endif /* TARGET_DEBUG_H */
+#endif /* GDB_TARGET_DEBUG_H */
diff --git a/gdb/target-descriptions.h b/gdb/target-descriptions.h
index 54c1f234f06..833a367bc9a 100644
--- a/gdb/target-descriptions.h
+++ b/gdb/target-descriptions.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TARGET_DESCRIPTIONS_H
-#define TARGET_DESCRIPTIONS_H 1
+#ifndef GDB_TARGET_DESCRIPTIONS_H
+#define GDB_TARGET_DESCRIPTIONS_H
 #include "gdbsupport/tdesc.h"
 #include "gdbarch.h"
 
@@ -238,4 +238,4 @@ void record_xml_tdesc (const char *xml_file,
 }
 #endif
 
-#endif /* TARGET_DESCRIPTIONS_H */
+#endif /* GDB_TARGET_DESCRIPTIONS_H */
diff --git a/gdb/target-float.h b/gdb/target-float.h
index a649f5ceb86..0b9cd7a8409 100644
--- a/gdb/target-float.h
+++ b/gdb/target-float.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TARGET_FLOAT_H
-#define TARGET_FLOAT_H
+#ifndef GDB_TARGET_FLOAT_H
+#define GDB_TARGET_FLOAT_H
 
 #include "expression.h"
 
@@ -58,4 +58,4 @@ extern void target_float_binop (enum exp_opcode opcode,
 extern int target_float_compare (const gdb_byte *x, const struct type *type_x,
 				 const gdb_byte *y, const struct type *type_y);
 
-#endif /* TARGET_FLOAT_H */
+#endif /* GDB_TARGET_FLOAT_H */
diff --git a/gdb/target.h b/gdb/target.h
index c9eaff16346..c9f7d4c22d9 100644
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (TARGET_H)
-#define TARGET_H
+#ifndef GDB_TARGET_H
+#define GDB_TARGET_H
 
 struct objfile;
 struct ui_file;
@@ -2580,4 +2580,4 @@ extern void target_prepare_to_generate_core (void);
 /* See to_done_generating_core.  */
 extern void target_done_generating_core (void);
 
-#endif /* !defined (TARGET_H) */
+#endif /* GDB_TARGET_H */
diff --git a/gdb/target/resume.h b/gdb/target/resume.h
index 2f13aa9ada1..024e39b5bce 100644
--- a/gdb/target/resume.h
+++ b/gdb/target/resume.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TARGET_RESUME_H
-#define TARGET_RESUME_H
+#ifndef GDB_TARGET_RESUME_H
+#define GDB_TARGET_RESUME_H
 
 /* Ways to "resume" a thread.  */
 
@@ -34,4 +34,4 @@ enum resume_kind
   resume_stop
 };
 
-#endif /* TARGET_RESUME_H */
+#endif /* GDB_TARGET_RESUME_H */
diff --git a/gdb/target/target.h b/gdb/target/target.h
index 408db3558b0..87a3464e323 100644
--- a/gdb/target/target.h
+++ b/gdb/target/target.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TARGET_TARGET_H
-#define TARGET_TARGET_H
+#ifndef GDB_TARGET_TARGET_H
+#define GDB_TARGET_TARGET_H
 
 #include "target/waitstatus.h"
 #include "target/wait.h"
@@ -262,4 +262,4 @@ class target_terminal
   static target_terminal_state m_terminal_state;
 };
 
-#endif /* TARGET_TARGET_H */
+#endif /* GDB_TARGET_TARGET_H */
diff --git a/gdb/target/wait.h b/gdb/target/wait.h
index 304f61497aa..026a42f9a30 100644
--- a/gdb/target/wait.h
+++ b/gdb/target/wait.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TARGET_WAIT_H
-#define TARGET_WAIT_H
+#ifndef GDB_TARGET_WAIT_H
+#define GDB_TARGET_WAIT_H
 
 #include "gdbsupport/enum-flags.h"
 
@@ -34,4 +34,4 @@ enum target_wait_flag : unsigned
 
 DEF_ENUM_FLAGS_TYPE (enum target_wait_flag, target_wait_flags);
 
-#endif /* TARGET_WAIT_H */
+#endif /* GDB_TARGET_WAIT_H */
diff --git a/gdb/target/waitstatus.h b/gdb/target/waitstatus.h
index dce1a7f3175..08907f5a610 100644
--- a/gdb/target/waitstatus.h
+++ b/gdb/target/waitstatus.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TARGET_WAITSTATUS_H
-#define TARGET_WAITSTATUS_H
+#ifndef GDB_TARGET_WAITSTATUS_H
+#define GDB_TARGET_WAITSTATUS_H
 
 #include "diagnostics.h"
 #include "gdbsupport/gdb_signals.h"
@@ -470,4 +470,4 @@ enum target_stop_reason
   TARGET_STOPPED_BY_SINGLE_STEP
 };
 
-#endif /* TARGET_WAITSTATUS_H */
+#endif /* GDB_TARGET_WAITSTATUS_H */
diff --git a/gdb/terminal.h b/gdb/terminal.h
index 236ab67745b..154b4be952b 100644
--- a/gdb/terminal.h
+++ b/gdb/terminal.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (TERMINAL_H)
-#define TERMINAL_H 1
+#ifndef GDB_TERMINAL_H
+#define GDB_TERMINAL_H
 
 struct inferior;
 
@@ -43,4 +43,4 @@ extern void gdb_save_tty_state (void);
    have had a chance to alter it.  */
 extern void set_initial_gdb_ttystate (void);
 
-#endif /* !defined (TERMINAL_H) */
+#endif /* GDB_TERMINAL_H */
diff --git a/gdb/test-target.h b/gdb/test-target.h
index 54924e06994..b88c154da8f 100644
--- a/gdb/test-target.h
+++ b/gdb/test-target.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TEST_TARGET_H
-#define TEST_TARGET_H
+#ifndef GDB_TEST_TARGET_H
+#define GDB_TEST_TARGET_H
 
 #include "process-stratum-target.h"
 
@@ -62,4 +62,4 @@ class test_target_ops : public process_stratum_target
 } // namespace selftests
 #endif /* GDB_SELF_TEST */
 
-#endif /* !defined (TEST_TARGET_H) */
+#endif /* GDB_TEST_TARGET_H */
diff --git a/gdb/thread-fsm.h b/gdb/thread-fsm.h
index ed117719c0d..36efee75abc 100644
--- a/gdb/thread-fsm.h
+++ b/gdb/thread-fsm.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef THREAD_FSM_H
-#define THREAD_FSM_H
+#ifndef GDB_THREAD_FSM_H
+#define GDB_THREAD_FSM_H
 
 #include "mi/mi-common.h"
 
@@ -129,4 +129,4 @@ struct thread_fsm
   }
 };
 
-#endif /* THREAD_FSM_H */
+#endif /* GDB_THREAD_FSM_H */
diff --git a/gdb/thread-iter.h b/gdb/thread-iter.h
index a2fd9891a57..89537213ac0 100644
--- a/gdb/thread-iter.h
+++ b/gdb/thread-iter.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef THREAD_ITER_H
-#define THREAD_ITER_H
+#ifndef GDB_THREAD_ITER_H
+#define GDB_THREAD_ITER_H
 
 #include "gdbsupport/filtered-iterator.h"
 #include "gdbsupport/iterator-range.h"
@@ -249,4 +249,4 @@ class all_non_exited_threads_range
   ptid_t m_filter_ptid;
 };
 
-#endif /* THREAD_ITER_H */
+#endif /* GDB_THREAD_ITER_H */
diff --git a/gdb/tic6x-tdep.h b/gdb/tic6x-tdep.h
index 886e1b8b309..03a8a3ebb55 100644
--- a/gdb/tic6x-tdep.h
+++ b/gdb/tic6x-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TIC6X_TDEP_H
-#define TIC6X_TDEP_H
+#ifndef GDB_TIC6X_TDEP_H
+#define GDB_TIC6X_TDEP_H
 
 #include "gdbarch.h"
 
@@ -57,4 +57,4 @@ struct tic6x_gdbarch_tdep : gdbarch_tdep_base
   int has_gp = 0; /* Has general purpose registers A16 - A31 and B16 - B31.  */
 };
 
-#endif /* TIC6X_TDEP_H */
+#endif /* GDB_TIC6X_TDEP_H */
diff --git a/gdb/tid-parse.h b/gdb/tid-parse.h
index b7bd920f48a..ad45f216350 100644
--- a/gdb/tid-parse.h
+++ b/gdb/tid-parse.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TID_PARSE_H
-#define TID_PARSE_H
+#ifndef GDB_TID_PARSE_H
+#define GDB_TID_PARSE_H
 
 #include "cli/cli-utils.h"
 
@@ -186,4 +186,4 @@ class tid_range_parser
 extern int tid_is_in_list (const char *list, int default_inferior,
 			   int inf_num, int thr_num);
 
-#endif /* TID_PARSE_H */
+#endif /* GDB_TID_PARSE_H */
diff --git a/gdb/tilegx-tdep.h b/gdb/tilegx-tdep.h
index 893035a6273..5430281bed5 100644
--- a/gdb/tilegx-tdep.h
+++ b/gdb/tilegx-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TILEGX_TDEP_H
-#define TILEGX_TDEP_H
+#ifndef GDB_TILEGX_TDEP_H
+#define GDB_TILEGX_TDEP_H
 
 /* TILE-Gx has 56 general purpose registers (R0 - R52, TP, SP, LR),
    plus 8 special general purpose registers (network and ZERO),
@@ -107,4 +107,4 @@ enum tilegx_regnum
 
 enum { tilegx_reg_size = 8 };
 
-#endif /* tilegx-tdep.h */
+#endif /* GDB_TILEGX_TDEP_H */
diff --git a/gdb/top.h b/gdb/top.h
index 68c637a03d8..c142f1d9363 100644
--- a/gdb/top.h
+++ b/gdb/top.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TOP_H
-#define TOP_H
+#ifndef GDB_TOP_H
+#define GDB_TOP_H
 
 #include "gdbsupport/event-loop.h"
 #include "gdbsupport/next-iterator.h"
@@ -109,4 +109,4 @@ extern bool check_quiet_mode ();
 
 extern void unbuffer_stream (FILE *stream);
 
-#endif
+#endif /* GDB_TOP_H */
diff --git a/gdb/tracectf.h b/gdb/tracectf.h
index 08a681cb8cf..9f821c5314c 100644
--- a/gdb/tracectf.h
+++ b/gdb/tracectf.h
@@ -17,9 +17,9 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CTF_H
-#define CTF_H
+#ifndef GDB_TRACECTF_H
+#define GDB_TRACECTF_H
 
 extern struct trace_file_writer *ctf_trace_file_writer_new (void);
 
-#endif
+#endif /* GDB_TRACECTF_H */
diff --git a/gdb/tracefile.h b/gdb/tracefile.h
index 90967eff855..028f70dabd3 100644
--- a/gdb/tracefile.h
+++ b/gdb/tracefile.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TRACEFILE_H
-#define TRACEFILE_H 1
+#ifndef GDB_TRACEFILE_H
+#define GDB_TRACEFILE_H
 
 #include "tracepoint.h"
 #include "target.h"
@@ -151,4 +151,4 @@ class tracefile_target : public process_stratum_target
 
 extern void tracefile_fetch_registers (struct regcache *regcache, int regno);
 
-#endif /* TRACEFILE_H */
+#endif /* GDB_TRACEFILE_H */
diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h
index 5e6ea67c8d2..1b9e03efc7a 100644
--- a/gdb/tracepoint.h
+++ b/gdb/tracepoint.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (TRACEPOINT_H)
-#define TRACEPOINT_H 1
+#ifndef GDB_TRACEPOINT_H
+#define GDB_TRACEPOINT_H
 
 #include "breakpoint.h"
 #include "memrange.h"
@@ -432,4 +432,4 @@ extern struct bp_location *get_traceframe_location (int *stepping_frame_p);
 /* Command element for the 'while-stepping' command.  */
 extern cmd_list_element *while_stepping_cmd_element;
 
-#endif	/* TRACEPOINT_H */
+#endif /* GDB_TRACEPOINT_H */
diff --git a/gdb/trad-frame.h b/gdb/trad-frame.h
index ca8792baa17..40a3f74d44a 100644
--- a/gdb/trad-frame.h
+++ b/gdb/trad-frame.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TRAD_FRAME_H
-#define TRAD_FRAME_H
+#ifndef GDB_TRAD_FRAME_H
+#define GDB_TRAD_FRAME_H
 
 #include "frame.h"
 
@@ -203,4 +203,4 @@ struct value *trad_frame_get_prev_register (const frame_info_ptr &this_frame,
 					    trad_frame_saved_reg this_saved_regs[],
 					    int regnum);
 
-#endif
+#endif /* GDB_TRAD_FRAME_H */
diff --git a/gdb/tramp-frame.h b/gdb/tramp-frame.h
index d9e54f5981a..a7288c1889c 100644
--- a/gdb/tramp-frame.h
+++ b/gdb/tramp-frame.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TRAMP_FRAME_H
-#define TRAMP_FRAME_H
+#ifndef GDB_TRAMP_FRAME_H
+#define GDB_TRAMP_FRAME_H
 
 #include "frame.h"
 #include "frame-unwind.h"	/* For frame_prev_arch_ftype.  */
@@ -85,4 +85,4 @@ struct tramp_frame
 void tramp_frame_prepend_unwinder (struct gdbarch *gdbarch,
 				   const struct tramp_frame *tramp);
 
-#endif
+#endif /* GDB_TRAMP_FRAME_H */
diff --git a/gdb/tui/tui-command.h b/gdb/tui/tui-command.h
index 2dc579bce30..0f6553845a2 100644
--- a/gdb/tui/tui-command.h
+++ b/gdb/tui/tui-command.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TUI_TUI_COMMAND_H
-#define TUI_TUI_COMMAND_H
+#ifndef GDB_TUI_TUI_COMMAND_H
+#define GDB_TUI_TUI_COMMAND_H
 
 #include "tui/tui-data.h"
 
@@ -58,4 +58,4 @@ struct tui_cmd_window
 /* Refresh the command window.  */
 extern void tui_refresh_cmd_win (void);
 
-#endif /* TUI_TUI_COMMAND_H */
+#endif /* GDB_TUI_TUI_COMMAND_H */
diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
index ce9c1a8a95a..4ff9fa64aa7 100644
--- a/gdb/tui/tui-data.h
+++ b/gdb/tui/tui-data.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TUI_TUI_DATA_H
-#define TUI_TUI_DATA_H
+#ifndef GDB_TUI_TUI_DATA_H
+#define GDB_TUI_TUI_DATA_H
 
 #include "tui/tui.h"
 #include "gdb_curses.h"
@@ -325,4 +325,4 @@ extern struct tui_win_info *tui_prev_win (struct tui_win_info *);
 
 extern unsigned int tui_tab_width;
 
-#endif /* TUI_TUI_DATA_H */
+#endif /* GDB_TUI_TUI_DATA_H */
diff --git a/gdb/tui/tui-disasm.h b/gdb/tui/tui-disasm.h
index 0aef091069b..a5a240fddf1 100644
--- a/gdb/tui/tui-disasm.h
+++ b/gdb/tui/tui-disasm.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TUI_TUI_DISASM_H
-#define TUI_TUI_DISASM_H
+#ifndef GDB_TUI_TUI_DISASM_H
+#define GDB_TUI_TUI_DISASM_H
 
 #include "tui/tui.h"
 #include "tui/tui-data.h"
@@ -66,4 +66,4 @@ struct tui_disasm_window : public tui_source_window_base
 
 extern void tui_get_begin_asm_address (struct gdbarch **, CORE_ADDR *);
 
-#endif /* TUI_TUI_DISASM_H */
+#endif /* GDB_TUI_TUI_DISASM_H */
diff --git a/gdb/tui/tui-file.h b/gdb/tui/tui-file.h
index b723f3974ea..6178a90a6c6 100644
--- a/gdb/tui/tui-file.h
+++ b/gdb/tui/tui-file.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TUI_TUI_FILE_H
-#define TUI_TUI_FILE_H
+#ifndef GDB_TUI_TUI_FILE_H
+#define GDB_TUI_TUI_FILE_H
 
 #include "ui-file.h"
 
@@ -41,4 +41,4 @@ class tui_file : public stdio_file
   bool m_buffered;
 };
 
-#endif /* TUI_TUI_FILE_H */
+#endif /* GDB_TUI_TUI_FILE_H */
diff --git a/gdb/tui/tui-hooks.h b/gdb/tui/tui-hooks.h
index 97683826544..21ba169713c 100644
--- a/gdb/tui/tui-hooks.h
+++ b/gdb/tui/tui-hooks.h
@@ -17,10 +17,10 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TUI_TUI_HOOKS_H
-#define TUI_TUI_HOOKS_H
+#ifndef GDB_TUI_TUI_HOOKS_H
+#define GDB_TUI_TUI_HOOKS_H
 
 extern void tui_install_hooks (void);
 extern void tui_remove_hooks (void);
 
-#endif /* TUI_TUI_HOOKS_H */
+#endif /* GDB_TUI_TUI_HOOKS_H */
diff --git a/gdb/tui/tui-io.h b/gdb/tui/tui-io.h
index 9e7eecdf5f4..66b3b90dfe3 100644
--- a/gdb/tui/tui-io.h
+++ b/gdb/tui/tui-io.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TUI_TUI_IO_H
-#define TUI_TUI_IO_H
+#ifndef GDB_TUI_TUI_IO_H
+#define GDB_TUI_TUI_IO_H
 
 #include "gdb_curses.h"
 
@@ -60,4 +60,4 @@ extern cli_ui_out *tui_old_uiout;
    next line.  */
 extern void tui_inject_newline_into_command_window ();
 
-#endif /* TUI_TUI_IO_H */
+#endif /* GDB_TUI_TUI_IO_H */
diff --git a/gdb/tui/tui-layout.h b/gdb/tui/tui-layout.h
index f621f9cea55..d1dc9bfd904 100644
--- a/gdb/tui/tui-layout.h
+++ b/gdb/tui/tui-layout.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TUI_TUI_LAYOUT_H
-#define TUI_TUI_LAYOUT_H
+#ifndef GDB_TUI_TUI_LAYOUT_H
+#define GDB_TUI_TUI_LAYOUT_H
 
 #include "ui-file.h"
 
@@ -418,4 +418,4 @@ using known_window_names_range
 
 extern known_window_names_range all_known_window_names ();
 
-#endif /* TUI_TUI_LAYOUT_H */
+#endif /* GDB_TUI_TUI_LAYOUT_H */
diff --git a/gdb/tui/tui-location.h b/gdb/tui/tui-location.h
index db558a4e147..8e83b26996b 100644
--- a/gdb/tui/tui-location.h
+++ b/gdb/tui/tui-location.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TUI_TUI_LOCATION_H
-#define TUI_TUI_LOCATION_H
+#ifndef GDB_TUI_TUI_LOCATION_H
+#define GDB_TUI_TUI_LOCATION_H
 
 #include "tui/tui.h"
 #include "tui/tui.h"
@@ -90,4 +90,4 @@ struct tui_location_tracker
 
 extern tui_location_tracker tui_location;
 
-#endif /* TUI_TUI_LOCATION_H */
+#endif /* GDB_TUI_TUI_LOCATION_H */
diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h
index 07b951316b6..eea5ca6d061 100644
--- a/gdb/tui/tui-regs.h
+++ b/gdb/tui/tui-regs.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TUI_TUI_REGS_H
-#define TUI_TUI_REGS_H
+#ifndef GDB_TUI_TUI_REGS_H
+#define GDB_TUI_TUI_REGS_H
 
 #include "tui/tui-data.h"
 #include "reggroups.h"
@@ -145,4 +145,4 @@ struct tui_data_window : public tui_win_info
   gdbarch *m_gdbarch = nullptr;
 };
 
-#endif /* TUI_TUI_REGS_H */
+#endif /* GDB_TUI_TUI_REGS_H */
diff --git a/gdb/tui/tui-source.h b/gdb/tui/tui-source.h
index 6d4ad4e39c2..4312b928740 100644
--- a/gdb/tui/tui-source.h
+++ b/gdb/tui/tui-source.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TUI_TUI_SOURCE_H
-#define TUI_TUI_SOURCE_H
+#ifndef GDB_TUI_TUI_SOURCE_H
+#define GDB_TUI_TUI_SOURCE_H
 
 #include "tui/tui-data.h"
 #include "tui-winsource.h"
@@ -84,4 +84,4 @@ struct tui_source_window : public tui_source_window_base
   gdb::unique_xmalloc_ptr<char> m_fullname;
 };
 
-#endif /* TUI_TUI_SOURCE_H */
+#endif /* GDB_TUI_TUI_SOURCE_H */
diff --git a/gdb/tui/tui-status.h b/gdb/tui/tui-status.h
index 0af44664104..b4c8a2bd407 100644
--- a/gdb/tui/tui-status.h
+++ b/gdb/tui/tui-status.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TUI_TUI_STATUS_H
-#define TUI_TUI_STATUS_H
+#ifndef GDB_TUI_TUI_STATUS_H
+#define GDB_TUI_TUI_STATUS_H
 
 #include "tui/tui-data.h"
 
@@ -53,4 +53,4 @@ struct tui_status_window
 extern void tui_show_status_content (void);
 extern void tui_show_frame_info (const frame_info_ptr &);
 
-#endif /* TUI_TUI_STATUS_H */
+#endif /* GDB_TUI_TUI_STATUS_H */
diff --git a/gdb/tui/tui-win.h b/gdb/tui/tui-win.h
index 9b03d01c430..15219930149 100644
--- a/gdb/tui/tui-win.h
+++ b/gdb/tui/tui-win.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TUI_TUI_WIN_H
-#define TUI_TUI_WIN_H
+#ifndef GDB_TUI_TUI_WIN_H
+#define GDB_TUI_TUI_WIN_H
 
 #include "tui/tui-data.h"
 
@@ -61,4 +61,4 @@ extern bool style_tui_current_position;
 /* Whether to replace the spaces in the left margin with '_' and '0'.  */
 extern bool tui_left_margin_verbose;
 
-#endif /* TUI_TUI_WIN_H */
+#endif /* GDB_TUI_TUI_WIN_H */
diff --git a/gdb/tui/tui-wingeneral.h b/gdb/tui/tui-wingeneral.h
index 6bee433689e..c36f32de7e4 100644
--- a/gdb/tui/tui-wingeneral.h
+++ b/gdb/tui/tui-wingeneral.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TUI_TUI_WINGENERAL_H
-#define TUI_TUI_WINGENERAL_H
+#ifndef GDB_TUI_TUI_WINGENERAL_H
+#define GDB_TUI_TUI_WINGENERAL_H
 
 #include "gdb_curses.h"
 
@@ -53,4 +53,4 @@ class tui_suppress_output
    suppressed via tui_suppress_output, do not call wrefresh.  */
 extern void tui_wrefresh (WINDOW *win);
 
-#endif /* TUI_TUI_WINGENERAL_H */
+#endif /* GDB_TUI_TUI_WINGENERAL_H */
diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h
index 646597306f2..7effb5694e3 100644
--- a/gdb/tui/tui-winsource.h
+++ b/gdb/tui/tui-winsource.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TUI_TUI_WINSOURCE_H
-#define TUI_TUI_WINSOURCE_H
+#ifndef GDB_TUI_TUI_WINSOURCE_H
+#define GDB_TUI_TUI_WINSOURCE_H
 
 #include "tui/tui-data.h"
 #include "symtab.h"
@@ -365,4 +365,4 @@ extern std::string tui_copy_source_line (const char **ptr,
 /* Constant definitions. */
 #define SCROLL_THRESHOLD 2	/* Threshold for lazy scroll.  */
 
-#endif /* TUI_TUI_WINSOURCE_H */
+#endif /* GDB_TUI_TUI_WINSOURCE_H */
diff --git a/gdb/tui/tui.h b/gdb/tui/tui.h
index 00295107eac..1bcaa2f4099 100644
--- a/gdb/tui/tui.h
+++ b/gdb/tui/tui.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TUI_TUI_H
-#define TUI_TUI_H
+#ifndef GDB_TUI_TUI_H
+#define GDB_TUI_TUI_H
 
 /* Flag to control tui debugging.  */
 
@@ -98,4 +98,4 @@ extern void tui_set_key_mode (enum tui_key_mode mode);
 
 extern bool tui_active;
 
-#endif /* TUI_TUI_H */
+#endif /* GDB_TUI_TUI_H */
diff --git a/gdb/type-stack.h b/gdb/type-stack.h
index faef3c85f67..87c0fe20c5a 100644
--- a/gdb/type-stack.h
+++ b/gdb/type-stack.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TYPE_STACK_H
-#define TYPE_STACK_H
+#ifndef GDB_TYPE_STACK_H
+#define GDB_TYPE_STACK_H
 
 #include "gdbtypes.h"
 #include <vector>
@@ -203,4 +203,4 @@ struct type_stack
   std::vector<union type_stack_elt> m_elements;
 };
 
-#endif /* TYPE_STACK_H */
+#endif /* GDB_TYPE_STACK_H */
diff --git a/gdb/typeprint.h b/gdb/typeprint.h
index e14d70efa2d..91b64f3e728 100644
--- a/gdb/typeprint.h
+++ b/gdb/typeprint.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TYPEPRINT_H
-#define TYPEPRINT_H
+#ifndef GDB_TYPEPRINT_H
+#define GDB_TYPEPRINT_H
 
 #include "gdbsupport/gdb_obstack.h"
 
@@ -181,4 +181,4 @@ extern void val_print_not_allocated (struct ui_file *stream);
 
 extern void val_print_not_associated (struct ui_file *stream);
 
-#endif
+#endif /* GDB_TYPEPRINT_H */
diff --git a/gdb/ui-file.h b/gdb/ui-file.h
index 96864409375..627e51ae84c 100644
--- a/gdb/ui-file.h
+++ b/gdb/ui-file.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef UI_FILE_H
-#define UI_FILE_H
+#ifndef GDB_UI_FILE_H
+#define GDB_UI_FILE_H
 
 #include <string>
 #include "ui-style.h"
@@ -467,4 +467,4 @@ class timestamped_file : public wrapped_file
   bool m_needs_timestamp = true;
 };
 
-#endif
+#endif /* GDB_UI_FILE_H */
diff --git a/gdb/ui-out.h b/gdb/ui-out.h
index 5b6ddd55063..67f6b18576f 100644
--- a/gdb/ui-out.h
+++ b/gdb/ui-out.h
@@ -20,8 +20,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef UI_OUT_H
-#define UI_OUT_H 1
+#ifndef GDB_UI_OUT_H
+#define GDB_UI_OUT_H
 
 #include <vector>
 
@@ -654,4 +654,4 @@ struct buffered_streams
   std::optional<buffering_file> m_buffered_uiout;
 };
 
-#endif /* UI_OUT_H */
+#endif /* GDB_UI_OUT_H */
diff --git a/gdb/ui-style.h b/gdb/ui-style.h
index 1b7b5fafb9d..53ac2897c78 100644
--- a/gdb/ui-style.h
+++ b/gdb/ui-style.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef UI_STYLE_H
-#define UI_STYLE_H
+#ifndef GDB_UI_STYLE_H
+#define GDB_UI_STYLE_H
 
 /* Styles that can be applied to a ui_file.  */
 struct ui_file_style
@@ -250,4 +250,4 @@ struct ui_file_style
 
 extern bool skip_ansi_escape (const char *buf, int *n_read);
 
-#endif /* UI_STYLE_H */
+#endif /* GDB_UI_STYLE_H */
diff --git a/gdb/ui.h b/gdb/ui.h
index 95cf273473a..ec3a6c5fbae 100644
--- a/gdb/ui.h
+++ b/gdb/ui.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef UI_H
-#define UI_H
+#ifndef GDB_UI_H
+#define GDB_UI_H
 
 #include "gdbsupport/event-loop.h"
 #include "gdbsupport/intrusive_list.h"
@@ -229,4 +229,4 @@ ui_range all_uis ()
   return ui_range (ui_list);
 }
 
-#endif /* UI_H */
+#endif /* GDB_UI_H */
diff --git a/gdb/user-regs.h b/gdb/user-regs.h
index baa3581a0ba..67a28dd429e 100644
--- a/gdb/user-regs.h
+++ b/gdb/user-regs.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef USER_REGS_H
-#define USER_REGS_H
+#ifndef GDB_USER_REGS_H
+#define GDB_USER_REGS_H
 
 /* Implement both builtin, and architecture specific, per-frame user
    visible registers.
@@ -69,4 +69,4 @@ extern void user_reg_add_builtin (const char *name,
 extern void user_reg_add (struct gdbarch *gdbarch, const char *name, 
 			  user_reg_read_ftype *read, const void *baton);
 
-#endif
+#endif /* GDB_USER_REGS_H */
diff --git a/gdb/utils.h b/gdb/utils.h
index 96350890a97..2dc36f42ed1 100644
--- a/gdb/utils.h
+++ b/gdb/utils.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef UTILS_H
-#define UTILS_H
+#ifndef GDB_UTILS_H
+#define GDB_UTILS_H
 
 #include "exceptions.h"
 #include "gdbsupport/array-view.h"
@@ -475,4 +475,4 @@ struct deferred_warnings final : public warning_hook_handler_type
   std::vector<string_file> m_warnings;
 };
 
-#endif /* UTILS_H */
+#endif /* GDB_UTILS_H */
diff --git a/gdb/valprint.h b/gdb/valprint.h
index 4f194b77008..834e9d97ffd 100644
--- a/gdb/valprint.h
+++ b/gdb/valprint.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef VALPRINT_H
-#define VALPRINT_H
+#ifndef GDB_VALPRINT_H
+#define GDB_VALPRINT_H
 
 #include "cli/cli-option.h"
 
@@ -337,4 +337,4 @@ extern void common_val_print_checked
    const struct value_print_options *options,
    const struct language_defn *language);
 
-#endif
+#endif /* GDB_VALPRINT_H */
diff --git a/gdb/value.h b/gdb/value.h
index 9d7e88d9433..8fc9550f11f 100644
--- a/gdb/value.h
+++ b/gdb/value.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (VALUE_H)
-#define VALUE_H 1
+#ifndef GDB_VALUE_H
+#define GDB_VALUE_H
 
 #include "frame.h"
 #include "extension.h"
@@ -1704,4 +1704,4 @@ void pseudo_to_concat_raw (const frame_info_ptr &next_frame,
 			   int raw_reg_1_num, int raw_reg_2_num,
 			   int raw_reg_3_num);
 
-#endif /* !defined (VALUE_H) */
+#endif /* GDB_VALUE_H */
diff --git a/gdb/varobj-iter.h b/gdb/varobj-iter.h
index 4254f8b549e..46e25e797c8 100644
--- a/gdb/varobj-iter.h
+++ b/gdb/varobj-iter.h
@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef VAROBJ_ITER_H
-#define VAROBJ_ITER_H
+#ifndef GDB_VAROBJ_ITER_H
+#define GDB_VAROBJ_ITER_H
 
 /* A node or item of varobj, composed of the name and the value.  */
 
@@ -39,4 +39,4 @@ struct varobj_iter
   virtual std::unique_ptr<varobj_item> next () = 0;
 };
 
-#endif /* VAROBJ_ITER_H */
+#endif /* GDB_VAROBJ_ITER_H */
diff --git a/gdb/varobj.h b/gdb/varobj.h
index 426c3b7d628..9d19f53fb3e 100644
--- a/gdb/varobj.h
+++ b/gdb/varobj.h
@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef VAROBJ_H
-#define VAROBJ_H 1
+#ifndef GDB_VAROBJ_H
+#define GDB_VAROBJ_H
 
 #include "symtab.h"
 #include "gdbtypes.h"
@@ -355,4 +355,4 @@ extern void varobj_restrict_range (const std::vector<varobj *> &children,
 
 extern bool varobj_default_is_path_expr_parent (const struct varobj *var);
 
-#endif /* VAROBJ_H */
+#endif /* GDB_VAROBJ_H */
diff --git a/gdb/vax-tdep.h b/gdb/vax-tdep.h
index 72b072d692d..fbc35d97c4e 100644
--- a/gdb/vax-tdep.h
+++ b/gdb/vax-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef VAX_TDEP_H
-#define VAX_TDEP_H
+#ifndef GDB_VAX_TDEP_H
+#define GDB_VAX_TDEP_H
 
 /* Register numbers of various important registers.  */
 
@@ -36,4 +36,4 @@ enum vax_regnum
 /* Number of machine registers.  */
 #define VAX_NUM_REGS 17
 
-#endif /* vax-tdep.h */
+#endif /* GDB_VAX_TDEP_H */
diff --git a/gdb/windows-nat.h b/gdb/windows-nat.h
index 3fbb1ea35df..b36e7f45512 100644
--- a/gdb/windows-nat.h
+++ b/gdb/windows-nat.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef WINDOWS_NAT_H
-#define WINDOWS_NAT_H
+#ifndef GDB_WINDOWS_NAT_H
+#define GDB_WINDOWS_NAT_H
 
 /* A pointer to a function that should return non-zero iff REGNUM
    corresponds to one of the segment registers.  */
@@ -36,4 +36,4 @@ int amd64_windows_segment_register_p (int regnum);
 extern const int amd64_mappings[];
 #endif
 
-#endif
+#endif /* GDB_WINDOWS_NAT_H */
diff --git a/gdb/windows-tdep.h b/gdb/windows-tdep.h
index f122f7aaa61..abb25331938 100644
--- a/gdb/windows-tdep.h
+++ b/gdb/windows-tdep.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef WINDOWS_TDEP_H
-#define WINDOWS_TDEP_H
+#ifndef GDB_WINDOWS_TDEP_H
+#define GDB_WINDOWS_TDEP_H
 
 #include "frame-unwind.h"
 
@@ -75,4 +75,4 @@ struct cygwin_sigwrapper_frame_unwind : public frame_unwind
   gdb::array_view<const gdb::array_view<const gdb_byte>> patterns_list;
 };
 
-#endif
+#endif /* GDB_WINDOWS_TDEP_H */
diff --git a/gdb/x86-bsd-nat.h b/gdb/x86-bsd-nat.h
index 7b1ba7a1f44..b1745448ece 100644
--- a/gdb/x86-bsd-nat.h
+++ b/gdb/x86-bsd-nat.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef X86_BSD_NAT_H
-#define X86_BSD_NAT_H
+#ifndef GDB_X86_BSD_NAT_H
+#define GDB_X86_BSD_NAT_H
 
 #include "x86-nat.h"
 
@@ -43,4 +43,4 @@ class x86bsd_nat_target : public BaseTarget
 };
 #endif /* HAVE_PT_GETDBREGS */
 
-#endif /* x86-bsd-nat.h */
+#endif /* GDB_X86_BSD_NAT_H */
diff --git a/gdb/x86-fbsd-nat.h b/gdb/x86-fbsd-nat.h
index a202e77c788..66f2b2f61b2 100644
--- a/gdb/x86-fbsd-nat.h
+++ b/gdb/x86-fbsd-nat.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef X86_FBSD_NAT_H
-#define X86_FBSD_NAT_H
+#ifndef GDB_X86_FBSD_NAT_H
+#define GDB_X86_FBSD_NAT_H
 
 #include <sys/ptrace.h>
 
@@ -53,4 +53,4 @@ class x86_fbsd_nat_target : public x86bsd_nat_target<fbsd_nat_target>
 #endif
 };
 
-#endif /* x86-bsd-nat.h */
+#endif /* GDB_X86_FBSD_NAT_H */
diff --git a/gdb/x86-linux-nat.h b/gdb/x86-linux-nat.h
index 4efe5461847..3c2241bb0b6 100644
--- a/gdb/x86-linux-nat.h
+++ b/gdb/x86-linux-nat.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef X86_LINUX_NAT_H
-#define X86_LINUX_NAT_H 1
+#ifndef GDB_X86_LINUX_NAT_H
+#define GDB_X86_LINUX_NAT_H
 
 #include "gdb_proc_service.h"
 #include "linux-nat.h"
@@ -92,4 +92,4 @@ struct x86_linux_nat_target : public x86_nat_target<linux_nat_target>
 extern ps_err_e x86_linux_get_thread_area (pid_t pid, void *addr,
 					   unsigned int *base_addr);
 
-#endif
+#endif /* GDB_X86_LINUX_NAT_H */
diff --git a/gdb/x86-nat.h b/gdb/x86-nat.h
index f07cefa027d..1b8fdd38325 100644
--- a/gdb/x86-nat.h
+++ b/gdb/x86-nat.h
@@ -20,8 +20,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef X86_NAT_H
-#define X86_NAT_H 1
+#ifndef GDB_X86_NAT_H
+#define GDB_X86_NAT_H
 
 #include "breakpoint.h"
 #include "nat/x86-dregs.h"
@@ -114,4 +114,4 @@ struct x86_nat_target : public BaseTarget
   { return x86_stopped_by_hw_breakpoint (); }
 };
 
-#endif /* X86_NAT_H */
+#endif /* GDB_X86_NAT_H */
diff --git a/gdb/x86-tdep.h b/gdb/x86-tdep.h
index 7ab47814d41..2b5853adb8a 100644
--- a/gdb/x86-tdep.h
+++ b/gdb/x86-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef X86_TDEP_H
-#define X86_TDEP_H
+#ifndef GDB_X86_TDEP_H
+#define GDB_X86_TDEP_H
 
 /* Checks whether PC lies in an indirect branch thunk using registers
    REGISTER_NAMES[LO] (inclusive) to REGISTER_NAMES[HI] (exclusive).  */
@@ -27,4 +27,4 @@ extern bool x86_in_indirect_branch_thunk (CORE_ADDR pc,
 					  const char * const *register_names,
 					  int lo, int hi);
 
-#endif /* x86-tdep.h */
+#endif /* GDB_X86_TDEP_H */
diff --git a/gdb/xcoffread.h b/gdb/xcoffread.h
index 8bc729e3dff..7528dec4a6c 100644
--- a/gdb/xcoffread.h
+++ b/gdb/xcoffread.h
@@ -16,11 +16,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef XCOFFREAD_H
-#define XCOFFREAD_H
+#ifndef GDB_XCOFFREAD_H
+#define GDB_XCOFFREAD_H
 
 extern CORE_ADDR xcoff_get_toc_offset (struct objfile *);
 
 extern int xcoff_get_n_import_files (bfd *abfd);
 
-#endif /* XCOFFREAD_H */
+#endif /* GDB_XCOFFREAD_H */
diff --git a/gdb/xml-builtin.h b/gdb/xml-builtin.h
index 417771ea4e9..463e0fb16e0 100644
--- a/gdb/xml-builtin.h
+++ b/gdb/xml-builtin.h
@@ -17,12 +17,12 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef XML_BUILTIN_H
-#define XML_BUILTIN_H
+#ifndef GDB_XML_BUILTIN_H
+#define GDB_XML_BUILTIN_H
 
 /* The text of compiled-in XML documents, from xml-builtin.c
    (generated).  */
 
 extern const char *const xml_builtin[][2];
 
-#endif /* XML_BUILTIN_H */
+#endif /* GDB_XML_BUILTIN_H */
diff --git a/gdb/xml-support.h b/gdb/xml-support.h
index b9bac7a10c2..f2860a20d6b 100644
--- a/gdb/xml-support.h
+++ b/gdb/xml-support.h
@@ -18,8 +18,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#ifndef XML_SUPPORT_H
-#define XML_SUPPORT_H
+#ifndef GDB_XML_SUPPORT_H
+#define GDB_XML_SUPPORT_H
 
 #include "gdbsupport/gdb_obstack.h"
 #include "gdbsupport/xml-utils.h"
@@ -233,4 +233,4 @@ ULONGEST gdb_xml_parse_ulongest (struct gdb_xml_parser *parser,
 extern std::optional<gdb::char_vector> xml_fetch_content_from_file
     (const char *filename, const char *dirname);
 
-#endif
+#endif /* GDB_XML_SUPPORT_H */
diff --git a/gdb/xml-syscall.h b/gdb/xml-syscall.h
index 60cfb71ada2..579805d9394 100644
--- a/gdb/xml-syscall.h
+++ b/gdb/xml-syscall.h
@@ -18,8 +18,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef XML_SYSCALL_H
-#define XML_SYSCALL_H 1
+#ifndef GDB_XML_SYSCALL_H
+#define GDB_XML_SYSCALL_H
 
 /* Function used to set the name of the file which contains
    information about the system calls present in the current
@@ -66,4 +66,4 @@ bool get_syscalls_by_group (struct gdbarch *gdbarch, const char *group,
 
 const char **get_syscall_group_names (struct gdbarch *gdbarch);
 
-#endif /* XML_SYSCALL_H */
+#endif /* GDB_XML_SYSCALL_H */
diff --git a/gdb/xml-tdesc.h b/gdb/xml-tdesc.h
index cd6e79cc24f..ec71c682f86 100644
--- a/gdb/xml-tdesc.h
+++ b/gdb/xml-tdesc.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef XML_TDESC_H
-#define XML_TDESC_H
+#ifndef GDB_XML_TDESC_H
+#define GDB_XML_TDESC_H
 
 #include <optional>
 #include <string>
@@ -49,4 +49,4 @@ std::optional<std::string> target_fetch_description_xml (target_ops *ops);
 
 const struct target_desc *string_read_description_xml (const char *xml);
 
-#endif /* XML_TDESC_H */
+#endif /* GDB_XML_TDESC_H */
diff --git a/gdb/xtensa-tdep.h b/gdb/xtensa-tdep.h
index b76ed137380..832b4fbf33a 100644
--- a/gdb/xtensa-tdep.h
+++ b/gdb/xtensa-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef XTENSA_TDEP_H
-#define XTENSA_TDEP_H
+#ifndef GDB_XTENSA_TDEP_H
+#define GDB_XTENSA_TDEP_H
 
 #include "arch/xtensa.h"
 #include "gdbarch.h"
@@ -249,4 +249,4 @@ struct xtensa_gdbarch_tdep : gdbarch_tdep_base
    data structure to their corresponding register in the AR register 
    file (see xtensa-tdep.c).  */
 
-#endif /* XTENSA_TDEP_H */
+#endif /* GDB_XTENSA_TDEP_H */
diff --git a/gdb/yy-remap.h b/gdb/yy-remap.h
index d52a59d11b9..9a6c399b855 100644
--- a/gdb/yy-remap.h
+++ b/gdb/yy-remap.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef YY_REMAP_H
-#define YY_REMAP_H
+#ifndef GDB_YY_REMAP_H
+#define GDB_YY_REMAP_H
 
 /* Remap normal yacc parser interface names (yyparse, yylex, yyerror,
    etc), as well as gratuitiously global symbol names, so we can have
@@ -97,4 +97,4 @@
 # define YYFPRINTF parser_fprintf
 #endif
 
-#endif /* YY_REMAP_H */
+#endif /* GDB_YY_REMAP_H */
diff --git a/gdb/z80-tdep.h b/gdb/z80-tdep.h
index 4b36024d1f0..19a7d046f7a 100644
--- a/gdb/z80-tdep.h
+++ b/gdb/z80-tdep.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef Z80_TDEP_H
-#define Z80_TDEP_H
+#ifndef GDB_Z80_TDEP_H
+#define GDB_Z80_TDEP_H
 
 /* Register pair constants
    Order optimized for gdb-stub implementation
@@ -49,4 +49,4 @@ enum z80_regnum
 #define EZ80_NUM_REGS	(Z80_NUM_REGS + 1)
 #define EZ80_REG_BYTES	(EZ80_NUM_REGS*3)
 
-#endif /* z80-tdep.h */
+#endif /* GDB_Z80_TDEP_H */
diff --git a/gdbserver/linux-aarch32-tdesc.h b/gdbserver/linux-aarch32-tdesc.h
index ff1c45fa1c1..173eac24389 100644
--- a/gdbserver/linux-aarch32-tdesc.h
+++ b/gdbserver/linux-aarch32-tdesc.h
@@ -26,4 +26,4 @@ const target_desc * aarch32_linux_read_description ();
 
 bool is_aarch32_linux_description (const target_desc *tdesc);
 
-#endif /* linux-aarch32-tdesc.h.  */
+#endif /* GDBSERVER_LINUX_AARCH32_TDESC_H */
diff --git a/gdbserver/linux-arm-tdesc.h b/gdbserver/linux-arm-tdesc.h
index 76a30c3c73a..bf12c8f5b68 100644
--- a/gdbserver/linux-arm-tdesc.h
+++ b/gdbserver/linux-arm-tdesc.h
@@ -28,4 +28,4 @@ const target_desc * arm_linux_read_description (arm_fp_type fp_type);
 
 arm_fp_type arm_linux_get_tdesc_fp_type (const target_desc *tdesc);
 
-#endif /* linux-arm-tdesc.h.  */
+#endif /* GDBSERVER_LINUX_ARM_TDESC_H */
diff --git a/gdbsupport/agent.h b/gdbsupport/agent.h
index e5a1fed84b9..305ed70fff2 100644
--- a/gdbsupport/agent.h
+++ b/gdbsupport/agent.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_AGENT_H
-#define COMMON_AGENT_H
+#ifndef GDBSUPPORT_AGENT_H
+#define GDBSUPPORT_AGENT_H
 
 #include "gdbsupport/preprocessor.h"
 
@@ -65,4 +65,4 @@ bool agent_capability_check (enum agent_capa);
 
 void agent_capability_invalidate (void);
 
-#endif /* COMMON_AGENT_H */
+#endif /* GDBSUPPORT_AGENT_H */
diff --git a/gdbsupport/array-view.h b/gdbsupport/array-view.h
index 93842a40ec1..a61e09e882c 100644
--- a/gdbsupport/array-view.h
+++ b/gdbsupport/array-view.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_ARRAY_VIEW_H
-#define COMMON_ARRAY_VIEW_H
+#ifndef GDBSUPPORT_ARRAY_VIEW_H
+#define GDBSUPPORT_ARRAY_VIEW_H
 
 #include "traits.h"
 #include <algorithm>
@@ -294,4 +294,4 @@ make_array_view (U *array, size_t size) noexcept
 
 } /* namespace gdb */
 
-#endif
+#endif /* GDBSUPPORT_ARRAY_VIEW_H */
diff --git a/gdbsupport/break-common.h b/gdbsupport/break-common.h
index 95ab3e290ba..1202231be0c 100644
--- a/gdbsupport/break-common.h
+++ b/gdbsupport/break-common.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_BREAK_COMMON_H
-#define COMMON_BREAK_COMMON_H
+#ifndef GDBSUPPORT_BREAK_COMMON_H
+#define GDBSUPPORT_BREAK_COMMON_H
 
 enum target_hw_bp_type
   {
@@ -28,4 +28,4 @@ enum target_hw_bp_type
     hw_execute = 3		/* Execute HW breakpoint */
   };
 
-#endif /* COMMON_BREAK_COMMON_H */
+#endif /* GDBSUPPORT_BREAK_COMMON_H */
diff --git a/gdbsupport/btrace-common.h b/gdbsupport/btrace-common.h
index bf57bc1615e..1888b242f70 100644
--- a/gdbsupport/btrace-common.h
+++ b/gdbsupport/btrace-common.h
@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_BTRACE_COMMON_H
-#define COMMON_BTRACE_COMMON_H
+#ifndef GDBSUPPORT_BTRACE_COMMON_H
+#define GDBSUPPORT_BTRACE_COMMON_H
 
 /* Branch tracing (btrace) is a per-thread control-flow execution trace of the
    inferior.  For presentation purposes, the branch trace is represented as a
@@ -276,4 +276,4 @@ extern const char *btrace_format_short_string (enum btrace_format format);
 extern int btrace_data_append (struct btrace_data *dst,
 			       const struct btrace_data *src);
 
-#endif /* COMMON_BTRACE_COMMON_H */
+#endif /* GDBSUPPORT_BTRACE_COMMON_H */
diff --git a/gdbsupport/byte-vector.h b/gdbsupport/byte-vector.h
index 54f4cc2edf2..0586d40016e 100644
--- a/gdbsupport/byte-vector.h
+++ b/gdbsupport/byte-vector.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_BYTE_VECTOR_H
-#define COMMON_BYTE_VECTOR_H
+#ifndef GDBSUPPORT_BYTE_VECTOR_H
+#define GDBSUPPORT_BYTE_VECTOR_H
 
 #include "gdbsupport/def-vector.h"
 
@@ -60,4 +60,4 @@ using char_vector = gdb::def_vector<char>;
 
 } /* namespace gdb */
 
-#endif /* COMMON_DEF_VECTOR_H */
+#endif /* GDBSUPPORT_BYTE_VECTOR_H */
diff --git a/gdbsupport/cleanups.h b/gdbsupport/cleanups.h
index 985cf81ff7d..12b7774763c 100644
--- a/gdbsupport/cleanups.h
+++ b/gdbsupport/cleanups.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_CLEANUPS_H
-#define COMMON_CLEANUPS_H
+#ifndef GDBSUPPORT_CLEANUPS_H
+#define GDBSUPPORT_CLEANUPS_H
 
 #include <functional>
 
@@ -27,4 +27,4 @@ extern void add_final_cleanup (std::function<void ()> &&func);
 /* Run all the registered functions.  */
 extern void do_final_cleanups ();
 
-#endif /* COMMON_CLEANUPS_H */
+#endif /* GDBSUPPORT_CLEANUPS_H */
diff --git a/gdbsupport/common-debug.h b/gdbsupport/common-debug.h
index b41d6a401cc..6c793dc33d4 100644
--- a/gdbsupport/common-debug.h
+++ b/gdbsupport/common-debug.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_COMMON_DEBUG_H
-#define COMMON_COMMON_DEBUG_H
+#ifndef GDBSUPPORT_COMMON_DEBUG_H
+#define GDBSUPPORT_COMMON_DEBUG_H
 
 #include <optional>
 #include "gdbsupport/preprocessor.h"
@@ -271,4 +271,4 @@ make_scoped_debug_start_end (PT &&pred, const char *module, const char *func,
 				   __func__, "enter", "exit",	\
 				   nullptr)
 
-#endif /* COMMON_COMMON_DEBUG_H */
+#endif /* GDBSUPPORT_COMMON_DEBUG_H */
diff --git a/gdbsupport/common-defs.h b/gdbsupport/common-defs.h
index 6120719480b..07315956514 100644
--- a/gdbsupport/common-defs.h
+++ b/gdbsupport/common-defs.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_COMMON_DEFS_H
-#define COMMON_COMMON_DEFS_H
+#ifndef GDBSUPPORT_COMMON_DEFS_H
+#define GDBSUPPORT_COMMON_DEFS_H
 
 #include <gdbsupport/config.h>
 
@@ -217,4 +217,4 @@
 #define HAVE_USEFUL_SBRK 1
 #endif
 
-#endif /* COMMON_COMMON_DEFS_H */
+#endif /* GDBSUPPORT_COMMON_DEFS_H */
diff --git a/gdbsupport/common-exceptions.h b/gdbsupport/common-exceptions.h
index ffc02d2107f..124c41d1acd 100644
--- a/gdbsupport/common-exceptions.h
+++ b/gdbsupport/common-exceptions.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_COMMON_EXCEPTIONS_H
-#define COMMON_COMMON_EXCEPTIONS_H
+#ifndef GDBSUPPORT_COMMON_EXCEPTIONS_H
+#define GDBSUPPORT_COMMON_EXCEPTIONS_H
 
 #include <setjmp.h>
 #include <new>
@@ -359,4 +359,4 @@ extern void throw_quit (const char *fmt, ...)
 extern void throw_forced_quit (const char *fmt, ...)
      ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF (1, 2);
 
-#endif /* COMMON_COMMON_EXCEPTIONS_H */
+#endif /* GDBSUPPORT_COMMON_EXCEPTIONS_H */
diff --git a/gdbsupport/common-gdbthread.h b/gdbsupport/common-gdbthread.h
index d149f8eed41..289cc8f1b30 100644
--- a/gdbsupport/common-gdbthread.h
+++ b/gdbsupport/common-gdbthread.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_COMMON_GDBTHREAD_H
-#define COMMON_COMMON_GDBTHREAD_H
+#ifndef GDBSUPPORT_COMMON_GDBTHREAD_H
+#define GDBSUPPORT_COMMON_GDBTHREAD_H
 
 struct process_stratum_target;
 
@@ -25,4 +25,4 @@ struct process_stratum_target;
 extern void switch_to_thread (process_stratum_target *proc_target,
 			      ptid_t ptid);
 
-#endif /* COMMON_COMMON_GDBTHREAD_H */
+#endif /* GDBSUPPORT_COMMON_GDBTHREAD_H */
diff --git a/gdbsupport/common-inferior.h b/gdbsupport/common-inferior.h
index bc6afd65f2b..299c159678b 100644
--- a/gdbsupport/common-inferior.h
+++ b/gdbsupport/common-inferior.h
@@ -18,8 +18,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_COMMON_INFERIOR_H
-#define COMMON_COMMON_INFERIOR_H
+#ifndef GDBSUPPORT_COMMON_INFERIOR_H
+#define GDBSUPPORT_COMMON_INFERIOR_H
 
 #include "gdbsupport/array-view.h"
 
@@ -62,4 +62,4 @@ extern bool startup_with_shell;
 extern std::string
 construct_inferior_arguments (gdb::array_view<char * const>);
 
-#endif /* COMMON_COMMON_INFERIOR_H */
+#endif /* GDBSUPPORT_COMMON_INFERIOR_H */
diff --git a/gdbsupport/common-regcache.h b/gdbsupport/common-regcache.h
index f8704c16939..caf4662e7e5 100644
--- a/gdbsupport/common-regcache.h
+++ b/gdbsupport/common-regcache.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_COMMON_REGCACHE_H
-#define COMMON_COMMON_REGCACHE_H
+#ifndef GDBSUPPORT_COMMON_REGCACHE_H
+#define GDBSUPPORT_COMMON_REGCACHE_H
 
 struct reg_buffer_common;
 
@@ -120,4 +120,4 @@ struct reg_buffer_common
   virtual bool raw_compare (int regnum, const void *buf, int offset) const = 0;
 };
 
-#endif /* COMMON_COMMON_REGCACHE_H */
+#endif /* GDBSUPPORT_COMMON_REGCACHE_H */
diff --git a/gdbsupport/common-types.h b/gdbsupport/common-types.h
index 19d3f49ca0f..10d5f38ae4a 100644
--- a/gdbsupport/common-types.h
+++ b/gdbsupport/common-types.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_COMMON_TYPES_H
-#define COMMON_COMMON_TYPES_H
+#ifndef GDBSUPPORT_COMMON_TYPES_H
+#define GDBSUPPORT_COMMON_TYPES_H
 
 #include <inttypes.h>
 
@@ -53,4 +53,4 @@ typedef uint64_t ULONGEST;
 
 enum tribool { TRIBOOL_UNKNOWN = -1, TRIBOOL_FALSE = 0, TRIBOOL_TRUE = 1 };
 
-#endif /* COMMON_COMMON_TYPES_H */
+#endif /* GDBSUPPORT_COMMON_TYPES_H */
diff --git a/gdbsupport/common-utils.h b/gdbsupport/common-utils.h
index 23cd40c0207..42c129b643c 100644
--- a/gdbsupport/common-utils.h
+++ b/gdbsupport/common-utils.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_COMMON_UTILS_H
-#define COMMON_COMMON_UTILS_H
+#ifndef GDBSUPPORT_COMMON_UTILS_H
+#define GDBSUPPORT_COMMON_UTILS_H
 
 #include <string>
 #include <vector>
@@ -242,4 +242,4 @@ struct string_view_hash
 
 } /* namespace gdb */
 
-#endif /* COMMON_COMMON_UTILS_H */
+#endif /* GDBSUPPORT_COMMON_UTILS_H */
diff --git a/gdbsupport/def-vector.h b/gdbsupport/def-vector.h
index b9aa663c688..3db6a2fedc9 100644
--- a/gdbsupport/def-vector.h
+++ b/gdbsupport/def-vector.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_DEF_VECTOR_H
-#define COMMON_DEF_VECTOR_H
+#ifndef GDBSUPPORT_DEF_VECTOR_H
+#define GDBSUPPORT_DEF_VECTOR_H
 
 #include <vector>
 #include "gdbsupport/default-init-alloc.h"
@@ -33,4 +33,4 @@ template<typename T> using def_vector
 
 } /* namespace gdb */
 
-#endif /* COMMON_DEF_VECTOR_H */
+#endif /* GDBSUPPORT_DEF_VECTOR_H */
diff --git a/gdbsupport/default-init-alloc.h b/gdbsupport/default-init-alloc.h
index 5ed9715b64c..e84110f128a 100644
--- a/gdbsupport/default-init-alloc.h
+++ b/gdbsupport/default-init-alloc.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_DEFAULT_INIT_ALLOC_H
-#define COMMON_DEFAULT_INIT_ALLOC_H
+#ifndef GDBSUPPORT_DEFAULT_INIT_ALLOC_H
+#define GDBSUPPORT_DEFAULT_INIT_ALLOC_H
 
 #if __cplusplus >= 202002L
 #include <memory_resource>
@@ -75,4 +75,4 @@ class default_init_allocator : public A
 
 } /* namespace gdb */
 
-#endif /* COMMON_DEFAULT_INIT_ALLOC_H */
+#endif /* GDBSUPPORT_DEFAULT_INIT_ALLOC_H */
diff --git a/gdbsupport/enum-flags.h b/gdbsupport/enum-flags.h
index 50780043477..b2858b83efe 100644
--- a/gdbsupport/enum-flags.h
+++ b/gdbsupport/enum-flags.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_ENUM_FLAGS_H
-#define COMMON_ENUM_FLAGS_H
+#ifndef GDBSUPPORT_ENUM_FLAGS_H
+#define GDBSUPPORT_ENUM_FLAGS_H
 
 #include "traits.h"
 
@@ -493,4 +493,4 @@ enum_flags<E>::to_string (const string_mapping (&mapping)[N]) const
 
 #endif /* __cplusplus */
 
-#endif /* COMMON_ENUM_FLAGS_H */
+#endif /* GDBSUPPORT_ENUM_FLAGS_H */
diff --git a/gdbsupport/environ.h b/gdbsupport/environ.h
index e46050b0350..6ac9f75d94e 100644
--- a/gdbsupport/environ.h
+++ b/gdbsupport/environ.h
@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_ENVIRON_H
-#define COMMON_ENVIRON_H
+#ifndef GDBSUPPORT_ENVIRON_H
+#define GDBSUPPORT_ENVIRON_H
 
 #include <vector>
 #include <set>
@@ -100,4 +100,4 @@ class gdb_environ
   std::set<std::string> m_user_unset_env;
 };
 
-#endif /* COMMON_ENVIRON_H */
+#endif /* GDBSUPPORT_ENVIRON_H */
diff --git a/gdbsupport/errors.h b/gdbsupport/errors.h
index d8daed0f5f2..4570221f879 100644
--- a/gdbsupport/errors.h
+++ b/gdbsupport/errors.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_ERRORS_H
-#define COMMON_ERRORS_H
+#ifndef GDBSUPPORT_ERRORS_H
+#define GDBSUPPORT_ERRORS_H
 
 /* A problem was detected, but the requested operation can still
    proceed.  A warning message is constructed using a printf- or
@@ -129,4 +129,4 @@ extern void throw_winerror_with_name (const char *string, ULONGEST err)
 
 #endif /* USE_WIN32API */
 
-#endif /* COMMON_ERRORS_H */
+#endif /* GDBSUPPORT_ERRORS_H */
diff --git a/gdbsupport/event-loop.h b/gdbsupport/event-loop.h
index 9155658e8f9..80f471066c8 100644
--- a/gdbsupport/event-loop.h
+++ b/gdbsupport/event-loop.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef EVENT_LOOP_H
-#define EVENT_LOOP_H
+#ifndef GDBSUPPORT_EVENT_LOOP_H
+#define GDBSUPPORT_EVENT_LOOP_H
 
 /* An event loop listens for events from multiple event sources.  When
    an event arrives, it is queued and processed by calling the
@@ -145,4 +145,4 @@ extern debug_event_loop_kind debug_event_loop;
     } \
   while (0)
 
-#endif /* EVENT_LOOP_H */
+#endif /* GDBSUPPORT_EVENT_LOOP_H */
diff --git a/gdbsupport/event-pipe.h b/gdbsupport/event-pipe.h
index fb5dd3a8833..7262403e267 100644
--- a/gdbsupport/event-pipe.h
+++ b/gdbsupport/event-pipe.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_EVENT_PIPE_H
-#define COMMON_EVENT_PIPE_H
+#ifndef GDBSUPPORT_EVENT_PIPE_H
+#define GDBSUPPORT_EVENT_PIPE_H
 
 /* An event pipe used as a waitable file in the event loop in place of
    some other event associated with a signal.  The handler for the
@@ -57,4 +57,4 @@ class event_pipe
   int m_fds[2] = { -1, -1 };
 };
 
-#endif /* COMMON_EVENT_PIPE_H */
+#endif /* GDBSUPPORT_EVENT_PIPE_H */
diff --git a/gdbsupport/fileio.h b/gdbsupport/fileio.h
index 2e7469d771b..7e4c361d14f 100644
--- a/gdbsupport/fileio.h
+++ b/gdbsupport/fileio.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_FILEIO_H
-#define COMMON_FILEIO_H
+#ifndef GDBSUPPORT_FILEIO_H
+#define GDBSUPPORT_FILEIO_H
 
 #include <sys/stat.h>
 
@@ -186,4 +186,4 @@ host_to_fileio_time (time_t num, fio_time_t fnum)
 
 extern void host_to_fileio_stat (struct stat *st, struct fio_stat *fst);
 
-#endif /* COMMON_FILEIO_H */
+#endif /* GDBSUPPORT_FILEIO_H */
diff --git a/gdbsupport/filestuff.h b/gdbsupport/filestuff.h
index e2ee141d46f..549987bc29c 100644
--- a/gdbsupport/filestuff.h
+++ b/gdbsupport/filestuff.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_FILESTUFF_H
-#define COMMON_FILESTUFF_H
+#ifndef GDBSUPPORT_FILESTUFF_H
+#define GDBSUPPORT_FILESTUFF_H
 
 #include <dirent.h>
 #include <fcntl.h>
@@ -137,4 +137,4 @@ extern std::optional<std::string> read_text_file_to_string (const char *path);
 
 extern std::string read_remainder_of_file (FILE *file);
 
-#endif /* COMMON_FILESTUFF_H */
+#endif /* GDBSUPPORT_FILESTUFF_H */
diff --git a/gdbsupport/filtered-iterator.h b/gdbsupport/filtered-iterator.h
index 12e5e6cd577..f801f9614da 100644
--- a/gdbsupport/filtered-iterator.h
+++ b/gdbsupport/filtered-iterator.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_FILTERED_ITERATOR_H
-#define COMMON_FILTERED_ITERATOR_H
+#ifndef GDBSUPPORT_FILTERED_ITERATOR_H
+#define GDBSUPPORT_FILTERED_ITERATOR_H
 
 #include <type_traits>
 
@@ -89,4 +89,4 @@ class filtered_iterator
   BaseIterator m_end {};
 };
 
-#endif /* COMMON_FILTERED_ITERATOR_H */
+#endif /* GDBSUPPORT_FILTERED_ITERATOR_H */
diff --git a/gdbsupport/format.h b/gdbsupport/format.h
index 68504b4475c..b1f0c46d4c2 100644
--- a/gdbsupport/format.h
+++ b/gdbsupport/format.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_FORMAT_H
-#define COMMON_FORMAT_H
+#ifndef GDBSUPPORT_FORMAT_H
+#define GDBSUPPORT_FORMAT_H
 
 #include <string_view>
 
@@ -101,4 +101,4 @@ class format_pieces
   gdb::unique_xmalloc_ptr<char> m_storage;
 };
 
-#endif /* COMMON_FORMAT_H */
+#endif /* GDBSUPPORT_FORMAT_H */
diff --git a/gdbsupport/forward-scope-exit.h b/gdbsupport/forward-scope-exit.h
index 6dd22722595..d4a3fc00cf8 100644
--- a/gdbsupport/forward-scope-exit.h
+++ b/gdbsupport/forward-scope-exit.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_FORWARD_SCOPE_EXIT_H
-#define COMMON_FORWARD_SCOPE_EXIT_H
+#ifndef GDBSUPPORT_FORWARD_SCOPE_EXIT_H
+#define GDBSUPPORT_FORWARD_SCOPE_EXIT_H
 
 #include "gdbsupport/scope-exit.h"
 #include <functional>
@@ -120,4 +120,4 @@ class forward_scope_exit<Function, function, Res (Args...)>
 #define FORWARD_SCOPE_EXIT(FUNC) \
   detail::forward_scope_exit<decltype (FUNC), FUNC, decltype (FUNC)>
 
-#endif /* COMMON_FORWARD_SCOPE_EXIT_H */
+#endif /* GDBSUPPORT_FORWARD_SCOPE_EXIT_H */
diff --git a/gdbsupport/function-view.h b/gdbsupport/function-view.h
index 9d852c2a378..f8262068174 100644
--- a/gdbsupport/function-view.h
+++ b/gdbsupport/function-view.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_FUNCTION_VIEW_H
-#define COMMON_FUNCTION_VIEW_H
+#ifndef GDBSUPPORT_FUNCTION_VIEW_H
+#define GDBSUPPORT_FUNCTION_VIEW_H
 
 /* function_view is a polymorphic type-erasing wrapper class that
    encapsulates a non-owning reference to arbitrary callable objects.
@@ -448,4 +448,4 @@ auto make_function_view (Callable &&callable)
 
 } /* namespace gdb */
 
-#endif
+#endif /* GDBSUPPORT_FUNCTION_VIEW_H */
diff --git a/gdbsupport/gdb-checked-static-cast.h b/gdbsupport/gdb-checked-static-cast.h
index 97843fab225..e8909b9206f 100644
--- a/gdbsupport/gdb-checked-static-cast.h
+++ b/gdbsupport/gdb-checked-static-cast.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_GDB_CHECKED_STATIC_CAST_H
-#define COMMON_GDB_CHECKED_STATIC_CAST_H
+#ifndef GDBSUPPORT_GDB_CHECKED_STATIC_CAST_H
+#define GDBSUPPORT_GDB_CHECKED_STATIC_CAST_H
 
 #include "gdbsupport/traits.h"
 
@@ -80,4 +80,4 @@ checked_static_cast (V &v)
 
 }
 
-#endif /* COMMON_GDB_CHECKED_STATIC_CAST_H */
+#endif /* GDBSUPPORT_GDB_CHECKED_STATIC_CAST_H */
diff --git a/gdbsupport/gdb-dlfcn.h b/gdbsupport/gdb-dlfcn.h
index 24481d94e5c..654db794638 100644
--- a/gdbsupport/gdb-dlfcn.h
+++ b/gdbsupport/gdb-dlfcn.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GDB_DLFCN_H
-#define GDB_DLFCN_H
+#ifndef GDBSUPPORT_GDB_DLFCN_H
+#define GDBSUPPORT_GDB_DLFCN_H
 
 /* A deleter that closes an open dynamic library.  */
 
@@ -48,4 +48,4 @@ void *gdb_dlsym (const gdb_dlhandle_up &handle, const char *symbol);
 
 int is_dl_available(void);
 
-#endif /* GDB_DLFCN_H */
+#endif /* GDBSUPPORT_GDB_DLFCN_H */
diff --git a/gdbsupport/gdb-safe-ctype.h b/gdbsupport/gdb-safe-ctype.h
index a91e54a3e65..f8968ef7e7c 100644
--- a/gdbsupport/gdb-safe-ctype.h
+++ b/gdbsupport/gdb-safe-ctype.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GDB_SAFE_CTYPE_H
-#define GDB_SAFE_CTYPE_H
+#ifndef GDBSUPPORT_GDB_SAFE_CTYPE_H
+#define GDBSUPPORT_GDB_SAFE_CTYPE_H
 
 /* After safe-ctype.h is included, we can no longer use the host's
    ctype routines.  Trying to do so results in compile errors.  Code
@@ -46,4 +46,4 @@ gdb_isprint (int ch)
 #include <locale>
 #include "safe-ctype.h"
 
-#endif
+#endif /* GDBSUPPORT_GDB_SAFE_CTYPE_H */
diff --git a/gdbsupport/gdb_assert.h b/gdbsupport/gdb_assert.h
index 2b5e6557424..dd0e1e2286e 100644
--- a/gdbsupport/gdb_assert.h
+++ b/gdbsupport/gdb_assert.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_GDB_ASSERT_H
-#define COMMON_GDB_ASSERT_H
+#ifndef GDBSUPPORT_GDB_ASSERT_H
+#define GDBSUPPORT_GDB_ASSERT_H
 
 #include "errors.h"
 
@@ -43,4 +43,4 @@
   internal_error_loc (__FILE__, __LINE__, _("%s: " message), __func__, \
 		      ##__VA_ARGS__)
 
-#endif /* COMMON_GDB_ASSERT_H */
+#endif /* GDBSUPPORT_GDB_ASSERT_H */
diff --git a/gdbsupport/gdb_file.h b/gdbsupport/gdb_file.h
index 645ecb9f75c..41bbbbc51b1 100644
--- a/gdbsupport/gdb_file.h
+++ b/gdbsupport/gdb_file.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GDBSUPPORT_GDB_FILE
-#define GDBSUPPORT_GDB_FILE
+#ifndef GDBSUPPORT_GDB_FILE_H
+#define GDBSUPPORT_GDB_FILE_H
 
 #include <memory>
 #include <stdio.h>
@@ -34,4 +34,4 @@ struct gdb_file_deleter
 
 typedef std::unique_ptr<FILE, gdb_file_deleter> gdb_file_up;
 
-#endif
+#endif /* GDBSUPPORT_GDB_FILE_H */
diff --git a/gdbsupport/gdb_locale.h b/gdbsupport/gdb_locale.h
index 58524857879..dcdb064a917 100644
--- a/gdbsupport/gdb_locale.h
+++ b/gdbsupport/gdb_locale.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_GDB_LOCALE_H
-#define COMMON_GDB_LOCALE_H
+#ifndef GDBSUPPORT_GDB_LOCALE_H
+#define GDBSUPPORT_GDB_LOCALE_H
 
 #ifdef HAVE_LOCALE_H
 # include <locale.h>
@@ -40,4 +40,4 @@
 #include <langinfo.h>
 #endif
 
-#endif /* COMMON_GDB_LOCALE_H */
+#endif /* GDBSUPPORT_GDB_LOCALE_H */
diff --git a/gdbsupport/gdb_obstack.h b/gdbsupport/gdb_obstack.h
index 7b3bb05bc00..d40182441f8 100644
--- a/gdbsupport/gdb_obstack.h
+++ b/gdbsupport/gdb_obstack.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (GDB_OBSTACK_H)
-#define GDB_OBSTACK_H 1
+#ifndef GDBSUPPORT_GDB_OBSTACK_H
+#define GDBSUPPORT_GDB_OBSTACK_H
 
 #include "obstack.h"
 
@@ -157,4 +157,4 @@ struct allocate_on_obstack
   void operator delete[] (void *memory) {}
 };
 
-#endif
+#endif /* GDBSUPPORT_GDB_OBSTACK_H */
diff --git a/gdbsupport/gdb_proc_service.h b/gdbsupport/gdb_proc_service.h
index 52f77a8a5c5..0009702b978 100644
--- a/gdbsupport/gdb_proc_service.h
+++ b/gdbsupport/gdb_proc_service.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_GDB_PROC_SERVICE_H
-#define COMMON_GDB_PROC_SERVICE_H
+#ifndef GDBSUPPORT_GDB_PROC_SERVICE_H
+#define GDBSUPPORT_GDB_PROC_SERVICE_H
 
 #include <sys/types.h>
 
@@ -199,4 +199,4 @@ PS_EXPORT (ps_lsetxregs);
 PS_EXPORT (ps_plog);
 #endif
 
-#endif /* COMMON_GDB_PROC_SERVICE_H */
+#endif /* GDBSUPPORT_GDB_PROC_SERVICE_H */
diff --git a/gdbsupport/gdb_ref_ptr.h b/gdbsupport/gdb_ref_ptr.h
index 8a90cb10b05..df2b3d80815 100644
--- a/gdbsupport/gdb_ref_ptr.h
+++ b/gdbsupport/gdb_ref_ptr.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_GDB_REF_PTR_H
-#define COMMON_GDB_REF_PTR_H
+#ifndef GDBSUPPORT_GDB_REF_PTR_H
+#define GDBSUPPORT_GDB_REF_PTR_H
 
 #include <cstddef>
 
@@ -225,4 +225,4 @@ inline bool operator!= (const std::nullptr_t, const ref_ptr<T, Policy> &rhs)
 
 }
 
-#endif /* COMMON_GDB_REF_PTR_H */
+#endif /* GDBSUPPORT_GDB_REF_PTR_H */
diff --git a/gdbsupport/gdb_regex.h b/gdbsupport/gdb_regex.h
index aeb1bb922a9..76264e5a0c9 100644
--- a/gdbsupport/gdb_regex.h
+++ b/gdbsupport/gdb_regex.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GDB_REGEX_H
-#define GDB_REGEX_H 1
+#ifndef GDBSUPPORT_GDB_REGEX_H
+#define GDBSUPPORT_GDB_REGEX_H
 
 # include "xregex.h"
 
@@ -54,4 +54,4 @@ class compiled_regex
   regex_t m_pattern;
 };
 
-#endif /* not GDB_REGEX_H */
+#endif /* GDBSUPPORT_GDB_REGEX_H */
diff --git a/gdbsupport/gdb_select.h b/gdbsupport/gdb_select.h
index 9f7350a904a..b229a25478c 100644
--- a/gdbsupport/gdb_select.h
+++ b/gdbsupport/gdb_select.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined(GDB_SELECT_H)
-#define GDB_SELECT_H
+#ifndef GDBSUPPORT_GDB_SELECT_H
+#define GDBSUPPORT_GDB_SELECT_H
 
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
@@ -48,4 +48,4 @@ extern int interruptible_select (int n,
 				 fd_set *exceptfds,
 				 struct timeval *timeout);
 
-#endif /* !defined(GDB_SELECT_H) */
+#endif /* GDBSUPPORT_GDB_SELECT_H */
diff --git a/gdbsupport/gdb_setjmp.h b/gdbsupport/gdb_setjmp.h
index e994226cbea..2482990671d 100644
--- a/gdbsupport/gdb_setjmp.h
+++ b/gdbsupport/gdb_setjmp.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_GDB_SETJMP_H
-#define COMMON_GDB_SETJMP_H
+#ifndef GDBSUPPORT_GDB_SETJMP_H
+#define GDBSUPPORT_GDB_SETJMP_H
 
 #include <setjmp.h>
 
@@ -33,4 +33,4 @@
 #define SIGLONGJMP(buf,val)	longjmp((buf), (val))
 #endif
 
-#endif /* COMMON_GDB_SETJMP_H */
+#endif /* GDBSUPPORT_GDB_SETJMP_H */
diff --git a/gdbsupport/gdb_signals.h b/gdbsupport/gdb_signals.h
index 7a71f0d8f99..2f9237aea46 100644
--- a/gdbsupport/gdb_signals.h
+++ b/gdbsupport/gdb_signals.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_GDB_SIGNALS_H
-#define COMMON_GDB_SIGNALS_H
+#ifndef GDBSUPPORT_GDB_SIGNALS_H
+#define GDBSUPPORT_GDB_SIGNALS_H
 
 #include "gdb/signals.h"
 
@@ -55,4 +55,4 @@ extern const char *gdb_signal_to_name (enum gdb_signal);
 /* Given a name (SIGHUP, etc.), return its signal.  */
 enum gdb_signal gdb_signal_from_name (const char *);
 
-#endif /* COMMON_GDB_SIGNALS_H */
+#endif /* GDBSUPPORT_GDB_SIGNALS_H */
diff --git a/gdbsupport/gdb_splay_tree.h b/gdbsupport/gdb_splay_tree.h
index 873ad8e27f3..05be2f1dc4e 100644
--- a/gdbsupport/gdb_splay_tree.h
+++ b/gdbsupport/gdb_splay_tree.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_GDB_SPLAY_TREE_H
-#define COMMON_GDB_SPLAY_TREE_H
+#ifndef GDBSUPPORT_GDB_SPLAY_TREE_H
+#define GDBSUPPORT_GDB_SPLAY_TREE_H
 
 #include "splay-tree.h"
 
@@ -39,4 +39,4 @@ struct splay_tree_deleter
 typedef std::unique_ptr<splay_tree_s, gdb::splay_tree_deleter>
     gdb_splay_tree_up;
 
-#endif /* COMMON_GDB_SPLAY_TREE_H */
+#endif /* GDBSUPPORT_GDB_SPLAY_TREE_H */
diff --git a/gdbsupport/gdb_sys_time.h b/gdbsupport/gdb_sys_time.h
index 63c93445121..ca93fc8d293 100644
--- a/gdbsupport/gdb_sys_time.h
+++ b/gdbsupport/gdb_sys_time.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_GDB_SYS_TIME_H
-#define COMMON_GDB_SYS_TIME_H
+#ifndef GDBSUPPORT_GDB_SYS_TIME_H
+#define GDBSUPPORT_GDB_SYS_TIME_H
 
 #include <sys/time.h>
 
@@ -35,4 +35,4 @@
 # undef gettimeofday
 #endif
 
-#endif /* COMMON_GDB_SYS_TIME_H */
+#endif /* GDBSUPPORT_GDB_SYS_TIME_H */
diff --git a/gdbsupport/gdb_tilde_expand.h b/gdbsupport/gdb_tilde_expand.h
index fbd410dd133..12ae9cc73a7 100644
--- a/gdbsupport/gdb_tilde_expand.h
+++ b/gdbsupport/gdb_tilde_expand.h
@@ -17,10 +17,10 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_GDB_TILDE_EXPAND_H
-#define COMMON_GDB_TILDE_EXPAND_H
+#ifndef GDBSUPPORT_GDB_TILDE_EXPAND_H
+#define GDBSUPPORT_GDB_TILDE_EXPAND_H
 
 /* Perform tilde expansion on DIR, and return the full path.  */
 extern std::string gdb_tilde_expand (const char *dir);
 
-#endif /* COMMON_GDB_TILDE_EXPAND_H */
+#endif /* GDBSUPPORT_GDB_TILDE_EXPAND_H */
diff --git a/gdbsupport/gdb_unique_ptr.h b/gdbsupport/gdb_unique_ptr.h
index 19b1581dab5..a40e1b133da 100644
--- a/gdbsupport/gdb_unique_ptr.h
+++ b/gdbsupport/gdb_unique_ptr.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_GDB_UNIQUE_PTR_H
-#define COMMON_GDB_UNIQUE_PTR_H
+#ifndef GDBSUPPORT_GDB_UNIQUE_PTR_H
+#define GDBSUPPORT_GDB_UNIQUE_PTR_H
 
 #include <memory>
 #include <string>
@@ -93,4 +93,4 @@ operator+ (const std::string &lhs, const gdb::unique_xmalloc_ptr<char> &rhs)
   return lhs + rhs.get ();
 }
 
-#endif /* COMMON_GDB_UNIQUE_PTR_H */
+#endif /* GDBSUPPORT_GDB_UNIQUE_PTR_H */
diff --git a/gdbsupport/gdb_unlinker.h b/gdbsupport/gdb_unlinker.h
index 2da65fe45e8..2b9044290fe 100644
--- a/gdbsupport/gdb_unlinker.h
+++ b/gdbsupport/gdb_unlinker.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_GDB_UNLINKER_H
-#define COMMON_GDB_UNLINKER_H
+#ifndef GDBSUPPORT_GDB_UNLINKER_H
+#define GDBSUPPORT_GDB_UNLINKER_H
 
 namespace gdb
 {
@@ -57,4 +57,4 @@ class unlinker
 
 }
 
-#endif /* COMMON_GDB_UNLINKER_H */
+#endif /* GDBSUPPORT_GDB_UNLINKER_H */
diff --git a/gdbsupport/gdb_vecs.h b/gdbsupport/gdb_vecs.h
index 47083cead38..22c165c8a55 100644
--- a/gdbsupport/gdb_vecs.h
+++ b/gdbsupport/gdb_vecs.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_GDB_VECS_H
-#define COMMON_GDB_VECS_H
+#ifndef GDBSUPPORT_GDB_VECS_H
+#define GDBSUPPORT_GDB_VECS_H
 
 /* Split STR, a list of DELIMITER-separated fields, into a char pointer vector.
 
@@ -85,4 +85,4 @@ ordered_remove (std::vector<T> &vec, typename std::vector<T>::size_type ix)
   return removed;
 }
 
-#endif /* COMMON_GDB_VECS_H */
+#endif /* GDBSUPPORT_GDB_VECS_H */
diff --git a/gdbsupport/gdb_wait.h b/gdbsupport/gdb_wait.h
index c6348dbcb1c..590dcea6a12 100644
--- a/gdbsupport/gdb_wait.h
+++ b/gdbsupport/gdb_wait.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_GDB_WAIT_H
-#define COMMON_GDB_WAIT_H
+#ifndef GDBSUPPORT_GDB_WAIT_H
+#define GDBSUPPORT_GDB_WAIT_H
 
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
@@ -128,4 +128,4 @@ extern int windows_status_to_termsig (unsigned long);
 #define __WCLONE	0x80000000 /* Wait for cloned process.  */
 #endif
 
-#endif /* COMMON_GDB_WAIT_H */
+#endif /* GDBSUPPORT_GDB_WAIT_H */
diff --git a/gdbsupport/hash_enum.h b/gdbsupport/hash_enum.h
index 5ef0e15c9ff..5771686dc1d 100644
--- a/gdbsupport/hash_enum.h
+++ b/gdbsupport/hash_enum.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_HASH_ENUM_H
-#define COMMON_HASH_ENUM_H
+#ifndef GDBSUPPORT_HASH_ENUM_H
+#define GDBSUPPORT_HASH_ENUM_H
 
 /* A hasher for enums, which was missing in C++11:
     http://www.open-std.org/jtc1/sc22/wg21/docs/lwg-defects.html#2148
@@ -42,4 +42,4 @@ struct hash_enum
 
 } /* namespace gdb */
 
-#endif /* COMMON_HASH_ENUM_H */
+#endif /* GDBSUPPORT_HASH_ENUM_H */
diff --git a/gdbsupport/host-defs.h b/gdbsupport/host-defs.h
index 6e7a08524f9..5298089ba15 100644
--- a/gdbsupport/host-defs.h
+++ b/gdbsupport/host-defs.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_HOST_DEFS_H
-#define COMMON_HOST_DEFS_H
+#ifndef GDBSUPPORT_HOST_DEFS_H
+#define GDBSUPPORT_HOST_DEFS_H
 
 #include <limits.h>
 
@@ -58,4 +58,4 @@
 #define SLASH_STRING "/"
 #endif
 
-#endif /* COMMON_HOST_DEFS_H */
+#endif /* GDBSUPPORT_HOST_DEFS_H */
diff --git a/gdbsupport/job-control.h b/gdbsupport/job-control.h
index 977276d95ce..2b99d69d2bb 100644
--- a/gdbsupport/job-control.h
+++ b/gdbsupport/job-control.h
@@ -18,8 +18,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_JOB_CONTROL_H
-#define COMMON_JOB_CONTROL_H
+#ifndef GDBSUPPORT_JOB_CONTROL_H
+#define GDBSUPPORT_JOB_CONTROL_H
 
 /* Do we have job control?  Can be assumed to always be the same
    within a given run of GDB.  Use in gdb/inflow.c and
@@ -35,4 +35,4 @@ extern int gdb_setpgid ();
    JOB_CONTROL.  */
 extern void have_job_control ();
 
-#endif /* COMMON_JOB_CONTROL_H */
+#endif /* GDBSUPPORT_JOB_CONTROL_H */
diff --git a/gdbsupport/netstuff.h b/gdbsupport/netstuff.h
index f0df5fe7671..ae8f9bbd9da 100644
--- a/gdbsupport/netstuff.h
+++ b/gdbsupport/netstuff.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_NETSTUFF_H
-#define COMMON_NETSTUFF_H
+#ifndef GDBSUPPORT_NETSTUFF_H
+#define GDBSUPPORT_NETSTUFF_H
 
 #include <string>
 
@@ -73,4 +73,4 @@ extern parsed_connection_spec
 extern parsed_connection_spec parse_connection_spec (const char *spec,
 						     struct addrinfo *hint);
 
-#endif /* COMMON_NETSTUFF_H */
+#endif /* GDBSUPPORT_NETSTUFF_H */
diff --git a/gdbsupport/next-iterator.h b/gdbsupport/next-iterator.h
index 772083482ee..6bacb58752a 100644
--- a/gdbsupport/next-iterator.h
+++ b/gdbsupport/next-iterator.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_NEXT_ITERATOR_H
-#define COMMON_NEXT_ITERATOR_H
+#ifndef GDBSUPPORT_NEXT_ITERATOR_H
+#define GDBSUPPORT_NEXT_ITERATOR_H
 
 #include "gdbsupport/iterator-range.h"
 
@@ -77,4 +77,4 @@ struct next_iterator
 template <typename T>
 using next_range = iterator_range<next_iterator<T>>;
 
-#endif /* COMMON_NEXT_ITERATOR_H */
+#endif /* GDBSUPPORT_NEXT_ITERATOR_H */
diff --git a/gdbsupport/observable.h b/gdbsupport/observable.h
index 41e0ba385c9..b386bbcee29 100644
--- a/gdbsupport/observable.h
+++ b/gdbsupport/observable.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_OBSERVABLE_H
-#define COMMON_OBSERVABLE_H
+#ifndef GDBSUPPORT_OBSERVABLE_H
+#define GDBSUPPORT_OBSERVABLE_H
 
 #include <algorithm>
 #include <functional>
@@ -248,4 +248,4 @@ class observable
 
 } /* namespace gdb */
 
-#endif /* COMMON_OBSERVABLE_H */
+#endif /* GDBSUPPORT_OBSERVABLE_H */
diff --git a/gdbsupport/offset-type.h b/gdbsupport/offset-type.h
index 256703cab4d..181e224253e 100644
--- a/gdbsupport/offset-type.h
+++ b/gdbsupport/offset-type.h
@@ -45,8 +45,8 @@
 
    However, unlike pointers, you can't deference offset types.  */
 
-#ifndef COMMON_OFFSET_TYPE_H
-#define COMMON_OFFSET_TYPE_H
+#ifndef GDBSUPPORT_OFFSET_TYPE_H
+#define GDBSUPPORT_OFFSET_TYPE_H
 
 /* Declare TYPE as being an offset type.  This declares the type and
    enables the operators defined below.  */
@@ -130,4 +130,4 @@ operator- (E lhs, E rhs)
   return static_cast<underlying> (lhs) - static_cast<underlying> (rhs);
 }
 
-#endif /* COMMON_OFFSET_TYPE_H */
+#endif /* GDBSUPPORT_OFFSET_TYPE_H */
diff --git a/gdbsupport/packed.h b/gdbsupport/packed.h
index 5c817d4c9cc..37f02d26373 100644
--- a/gdbsupport/packed.h
+++ b/gdbsupport/packed.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef PACKED_H
-#define PACKED_H
+#ifndef GDBSUPPORT_PACKED_H
+#define GDBSUPPORT_PACKED_H
 
 #include "traits.h"
 #include <atomic>
@@ -163,4 +163,4 @@ PACKED_ATOMIC_OP (<=)
 
 #undef PACKED_ATOMIC_OP
 
-#endif
+#endif /* GDBSUPPORT_PACKED_H */
diff --git a/gdbsupport/pathstuff.h b/gdbsupport/pathstuff.h
index 170a2c5e724..fc516505017 100644
--- a/gdbsupport/pathstuff.h
+++ b/gdbsupport/pathstuff.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_PATHSTUFF_H
-#define COMMON_PATHSTUFF_H
+#ifndef GDBSUPPORT_PATHSTUFF_H
+#define GDBSUPPORT_PATHSTUFF_H
 
 #include "gdbsupport/byte-vector.h"
 #include "gdbsupport/array-view.h"
@@ -162,4 +162,4 @@ extern gdb::char_vector make_temp_filename (const std::string &f);
 /* String containing the current directory (what getwd would return).  */
 extern char *current_directory;
 
-#endif /* COMMON_PATHSTUFF_H */
+#endif /* GDBSUPPORT_PATHSTUFF_H */
diff --git a/gdbsupport/poison.h b/gdbsupport/poison.h
index 7b4f8e8a178..66f0fcf53b8 100644
--- a/gdbsupport/poison.h
+++ b/gdbsupport/poison.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_POISON_H
-#define COMMON_POISON_H
+#ifndef GDBSUPPORT_POISON_H
+#define GDBSUPPORT_POISON_H
 
 #include "traits.h"
 #include "obstack.h"
@@ -237,4 +237,4 @@ non-POD data type.");
 #undef XOBNEWVEC
 #define XOBNEWVEC(O, T, N) xobnewvec<T> (O, N)
 
-#endif /* COMMON_POISON_H */
+#endif /* GDBSUPPORT_POISON_H */
diff --git a/gdbsupport/preprocessor.h b/gdbsupport/preprocessor.h
index 96b3b94bf35..23177d5d82e 100644
--- a/gdbsupport/preprocessor.h
+++ b/gdbsupport/preprocessor.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_PREPROCESSOR_H
-#define COMMON_PREPROCESSOR_H
+#ifndef GDBSUPPORT_PREPROCESSOR_H
+#define GDBSUPPORT_PREPROCESSOR_H
 
 /* Generally useful preprocessor bits.  */
 
@@ -32,4 +32,4 @@
    includes commas to another macro.  */
 #define ESC_PARENS(...) __VA_ARGS__
 
-#endif /* COMMON_PREPROCESSOR_H */
+#endif /* GDBSUPPORT_PREPROCESSOR_H */
diff --git a/gdbsupport/print-utils.h b/gdbsupport/print-utils.h
index 510cc63bc89..9b915acb8e3 100644
--- a/gdbsupport/print-utils.h
+++ b/gdbsupport/print-utils.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_PRINT_UTILS_H
-#define COMMON_PRINT_UTILS_H
+#ifndef GDBSUPPORT_PRINT_UTILS_H
+#define GDBSUPPORT_PRINT_UTILS_H
 
 /* How many characters (including the terminating null byte) fit in a
    cell.  */
@@ -82,4 +82,4 @@ extern const char *host_address_to_string_1 (const void *addr);
 
 extern char *get_print_cell (void);
 
-#endif /* COMMON_PRINT_UTILS_H */
+#endif /* GDBSUPPORT_PRINT_UTILS_H */
diff --git a/gdbsupport/ptid.h b/gdbsupport/ptid.h
index fef9749ee80..f502efe7484 100644
--- a/gdbsupport/ptid.h
+++ b/gdbsupport/ptid.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_PTID_H
-#define COMMON_PTID_H
+#ifndef GDBSUPPORT_PTID_H
+#define GDBSUPPORT_PTID_H
 
 /* The ptid struct is a collection of the various "ids" necessary for
    identifying the inferior process/thread being debugged.  This
@@ -182,4 +182,4 @@ extern const ptid_t null_ptid;
 
 extern const ptid_t minus_one_ptid;
 
-#endif /* COMMON_PTID_H */
+#endif /* GDBSUPPORT_PTID_H */
diff --git a/gdbsupport/refcounted-object.h b/gdbsupport/refcounted-object.h
index 9cdf0f10729..42bf71a0309 100644
--- a/gdbsupport/refcounted-object.h
+++ b/gdbsupport/refcounted-object.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_REFCOUNTED_OBJECT_H
-#define COMMON_REFCOUNTED_OBJECT_H
+#ifndef GDBSUPPORT_REFCOUNTED_OBJECT_H
+#define GDBSUPPORT_REFCOUNTED_OBJECT_H
 
 /* Base class of intrusively reference-countable objects.
    Incrementing and decrementing the reference count is an external
@@ -84,4 +84,4 @@ struct refcounted_object_delete_ref_policy
   }
 };
 
-#endif /* COMMON_REFCOUNTED_OBJECT_H */
+#endif /* GDBSUPPORT_REFCOUNTED_OBJECT_H */
diff --git a/gdbsupport/rsp-low.h b/gdbsupport/rsp-low.h
index 801df0ebc0c..e91c79e822f 100644
--- a/gdbsupport/rsp-low.h
+++ b/gdbsupport/rsp-low.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_RSP_LOW_H
-#define COMMON_RSP_LOW_H
+#ifndef GDBSUPPORT_RSP_LOW_H
+#define GDBSUPPORT_RSP_LOW_H
 
 /* Convert number NIB to a hex digit.  */
 
@@ -81,4 +81,4 @@ extern int remote_escape_output (const gdb_byte *buffer, int len_units,
 extern int remote_unescape_input (const gdb_byte *buffer, int len,
 				  gdb_byte *out_buf, int out_maxlen);
 
-#endif /* COMMON_RSP_LOW_H */
+#endif /* GDBSUPPORT_RSP_LOW_H */
diff --git a/gdbsupport/run-time-clock.h b/gdbsupport/run-time-clock.h
index 8176151add9..f4328543945 100644
--- a/gdbsupport/run-time-clock.h
+++ b/gdbsupport/run-time-clock.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_RUN_TIME_CLOCK_H
-#define COMMON_RUN_TIME_CLOCK_H
+#ifndef GDBSUPPORT_RUN_TIME_CLOCK_H
+#define GDBSUPPORT_RUN_TIME_CLOCK_H
 
 #include <chrono>
 
@@ -72,4 +72,4 @@ struct run_time_clock
 		   system_cpu_time_clock::time_point &system) noexcept;
 };
 
-#endif /* COMMON_RUN_TIME_CLOCK_H */
+#endif /* GDBSUPPORT_RUN_TIME_CLOCK_H */
diff --git a/gdbsupport/safe-iterator.h b/gdbsupport/safe-iterator.h
index f69f3896758..f31f92f6c24 100644
--- a/gdbsupport/safe-iterator.h
+++ b/gdbsupport/safe-iterator.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_SAFE_ITERATOR_H
-#define COMMON_SAFE_ITERATOR_H
+#ifndef GDBSUPPORT_SAFE_ITERATOR_H
+#define GDBSUPPORT_SAFE_ITERATOR_H
 
 #include <type_traits>
 
@@ -136,4 +136,4 @@ class basic_safe_range
   Range m_range;
 };
 
-#endif /* COMMON_SAFE_ITERATOR_H */
+#endif /* GDBSUPPORT_SAFE_ITERATOR_H */
diff --git a/gdbsupport/scope-exit.h b/gdbsupport/scope-exit.h
index 86b2969f817..c3d27d7c77a 100644
--- a/gdbsupport/scope-exit.h
+++ b/gdbsupport/scope-exit.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_SCOPE_EXIT_H
-#define COMMON_SCOPE_EXIT_H
+#ifndef GDBSUPPORT_SCOPE_EXIT_H
+#define GDBSUPPORT_SCOPE_EXIT_H
 
 #include <functional>
 #include <type_traits>
@@ -165,4 +165,4 @@ operator+ (scope_exit_lhs, EF &&rhs)
 #define SCOPE_EXIT \
   auto CONCAT(scope_exit_, __LINE__) = ::detail::scope_exit_lhs () + [&] ()
 
-#endif /* COMMON_SCOPE_EXIT_H */
+#endif /* GDBSUPPORT_SCOPE_EXIT_H */
diff --git a/gdbsupport/scoped_fd.h b/gdbsupport/scoped_fd.h
index aa214b2c1c1..240685a927b 100644
--- a/gdbsupport/scoped_fd.h
+++ b/gdbsupport/scoped_fd.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_SCOPED_FD_H
-#define COMMON_SCOPED_FD_H
+#ifndef GDBSUPPORT_SCOPED_FD_H
+#define GDBSUPPORT_SCOPED_FD_H
 
 #include <unistd.h>
 #include "gdb_file.h"
@@ -84,4 +84,4 @@ class scoped_fd
   int m_fd;
 };
 
-#endif /* COMMON_SCOPED_FD_H */
+#endif /* GDBSUPPORT_SCOPED_FD_H */
diff --git a/gdbsupport/scoped_ignore_signal.h b/gdbsupport/scoped_ignore_signal.h
index 74fc69057a8..2fecd58466d 100644
--- a/gdbsupport/scoped_ignore_signal.h
+++ b/gdbsupport/scoped_ignore_signal.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SCOPED_IGNORE_SIGNAL_H
-#define SCOPED_IGNORE_SIGNAL_H
+#ifndef GDBSUPPORT_SCOPED_IGNORE_SIGNAL_H
+#define GDBSUPPORT_SCOPED_IGNORE_SIGNAL_H
 
 #include <signal.h>
 
@@ -118,4 +118,4 @@ using scoped_ignore_sigpipe = scoped_ignore_signal<SIGPIPE, true>;
 using scoped_ignore_sigpipe = scoped_ignore_signal_nop;
 #endif
 
-#endif /* SCOPED_IGNORE_SIGNAL_H */
+#endif /* GDBSUPPORT_SCOPED_IGNORE_SIGNAL_H */
diff --git a/gdbsupport/scoped_ignore_sigttou.h b/gdbsupport/scoped_ignore_sigttou.h
index de2e40a6492..bb4e86d5b21 100644
--- a/gdbsupport/scoped_ignore_sigttou.h
+++ b/gdbsupport/scoped_ignore_sigttou.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef SCOPED_IGNORE_SIGTTOU_H
-#define SCOPED_IGNORE_SIGTTOU_H
+#ifndef GDBSUPPORT_SCOPED_IGNORE_SIGTTOU_H
+#define GDBSUPPORT_SCOPED_IGNORE_SIGTTOU_H
 
 #include "gdbsupport/scoped_ignore_signal.h"
 #include "gdbsupport/job-control.h"
@@ -84,4 +84,4 @@ using scoped_ignore_sigttou = scoped_ignore_signal_nop;
 
 #endif
 
-#endif /* SCOPED_IGNORE_SIGTTOU_H */
+#endif /* GDBSUPPORT_SCOPED_IGNORE_SIGTTOU_H */
diff --git a/gdbsupport/scoped_mmap.h b/gdbsupport/scoped_mmap.h
index 8383b8933b5..ea2f4fd3af5 100644
--- a/gdbsupport/scoped_mmap.h
+++ b/gdbsupport/scoped_mmap.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_SCOPED_MMAP_H
-#define COMMON_SCOPED_MMAP_H
+#ifndef GDBSUPPORT_SCOPED_MMAP_H
+#define GDBSUPPORT_SCOPED_MMAP_H
 
 #ifdef HAVE_SYS_MMAN_H
 
@@ -88,4 +88,4 @@ scoped_mmap mmap_file (const char *filename);
 
 #endif /* HAVE_SYS_MMAN_H */
 
-#endif /* COMMON_SCOPED_MMAP_H */
+#endif /* GDBSUPPORT_SCOPED_MMAP_H */
diff --git a/gdbsupport/scoped_restore.h b/gdbsupport/scoped_restore.h
index 96fe5256f80..5833b928fe3 100644
--- a/gdbsupport/scoped_restore.h
+++ b/gdbsupport/scoped_restore.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_SCOPED_RESTORE_H
-#define COMMON_SCOPED_RESTORE_H
+#ifndef GDBSUPPORT_SCOPED_RESTORE_H
+#define GDBSUPPORT_SCOPED_RESTORE_H
 
 /* Base class for scoped_restore_tmpl.  */
 class scoped_restore_base
@@ -115,4 +115,4 @@ scoped_restore_tmpl<T> make_scoped_restore (T *var, T2 value)
   return scoped_restore_tmpl<T> (var, value);
 }
 
-#endif /* COMMON_SCOPED_RESTORE_H */
+#endif /* GDBSUPPORT_SCOPED_RESTORE_H */
diff --git a/gdbsupport/search.h b/gdbsupport/search.h
index 42a9fd23083..f8c003bf6df 100644
--- a/gdbsupport/search.h
+++ b/gdbsupport/search.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_SEARCH_H
-#define COMMON_SEARCH_H
+#ifndef GDBSUPPORT_SEARCH_H
+#define GDBSUPPORT_SEARCH_H
 
 #include "gdbsupport/function-view.h"
 
@@ -39,4 +39,4 @@ extern int simple_search_memory
    ULONGEST pattern_len,
    CORE_ADDR *found_addrp);
 
-#endif /* COMMON_SEARCH_H */
+#endif /* GDBSUPPORT_SEARCH_H */
diff --git a/gdbsupport/selftest.h b/gdbsupport/selftest.h
index 41d1210a5a5..cbbdd01093d 100644
--- a/gdbsupport/selftest.h
+++ b/gdbsupport/selftest.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_SELFTEST_H
-#define COMMON_SELFTEST_H
+#ifndef GDBSUPPORT_SELFTEST_H
+#define GDBSUPPORT_SELFTEST_H
 
 #include "gdbsupport/array-view.h"
 #include "gdbsupport/function-view.h"
@@ -93,4 +93,4 @@ extern void reset ();
       error (_("self-test failed at %s:%d"), __FILE__, __LINE__);	\
   } while (0)
 
-#endif /* COMMON_SELFTEST_H */
+#endif /* GDBSUPPORT_SELFTEST_H */
diff --git a/gdbsupport/signals-state-save-restore.h b/gdbsupport/signals-state-save-restore.h
index 132aaa8c522..e01ac36fe99 100644
--- a/gdbsupport/signals-state-save-restore.h
+++ b/gdbsupport/signals-state-save-restore.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_SIGNALS_STATE_SAVE_RESTORE_H
-#define COMMON_SIGNALS_STATE_SAVE_RESTORE_H
+#ifndef GDBSUPPORT_SIGNALS_STATE_SAVE_RESTORE_H
+#define GDBSUPPORT_SIGNALS_STATE_SAVE_RESTORE_H
 
 /* Save/restore the signal actions of all signals, and the signal
    mask.
@@ -37,4 +37,4 @@ extern void save_original_signals_state (bool quiet);
 
 extern void restore_original_signals_state (void);
 
-#endif /* COMMON_SIGNALS_STATE_SAVE_RESTORE_H */
+#endif /* GDBSUPPORT_SIGNALS_STATE_SAVE_RESTORE_H */
diff --git a/gdbsupport/symbol.h b/gdbsupport/symbol.h
index 3e1dc9d29d3..de439c07179 100644
--- a/gdbsupport/symbol.h
+++ b/gdbsupport/symbol.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_SYMBOL_H
-#define COMMON_SYMBOL_H
+#ifndef GDBSUPPORT_SYMBOL_H
+#define GDBSUPPORT_SYMBOL_H
 
 struct objfile;
 
@@ -34,4 +34,4 @@ struct objfile;
 extern int find_minimal_symbol_address (const char *name, CORE_ADDR *addr,
 					struct objfile *objfile);
 
-#endif /* COMMON_SYMBOL_H */
+#endif /* GDBSUPPORT_SYMBOL_H */
diff --git a/gdbsupport/tdesc.h b/gdbsupport/tdesc.h
index fa9431b5b65..dc2d45278d1 100644
--- a/gdbsupport/tdesc.h
+++ b/gdbsupport/tdesc.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_TDESC_H
-#define COMMON_TDESC_H
+#ifndef GDBSUPPORT_TDESC_H
+#define GDBSUPPORT_TDESC_H
 
 struct tdesc_feature;
 struct tdesc_type;
@@ -462,4 +462,4 @@ class print_xml_feature : public tdesc_element_visitor
   int m_depth;
 };
 
-#endif /* COMMON_TDESC_H */
+#endif /* GDBSUPPORT_TDESC_H */
diff --git a/gdbsupport/traits.h b/gdbsupport/traits.h
index 92fe59f34af..600f89ede65 100644
--- a/gdbsupport/traits.h
+++ b/gdbsupport/traits.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_TRAITS_H
-#define COMMON_TRAITS_H
+#ifndef GDBSUPPORT_TRAITS_H
+#define GDBSUPPORT_TRAITS_H
 
 #include <type_traits>
 
@@ -143,4 +143,4 @@ template<typename Condition>
 using Requires = typename std::enable_if<Condition::value, void>::type;
 }
 
-#endif /* COMMON_TRAITS_H */
+#endif /* GDBSUPPORT_TRAITS_H */
diff --git a/gdbsupport/underlying.h b/gdbsupport/underlying.h
index d9c5696a4cd..a3e7e3fca85 100644
--- a/gdbsupport/underlying.h
+++ b/gdbsupport/underlying.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_UNDERLYING_H
-#define COMMON_UNDERLYING_H
+#ifndef GDBSUPPORT_UNDERLYING_H
+#define GDBSUPPORT_UNDERLYING_H
 
 #include <type_traits>
 
@@ -29,4 +29,4 @@ to_underlying (E val) noexcept
   return static_cast<typename std::underlying_type<E>::type> (val);
 }
 
-#endif
+#endif /* GDBSUPPORT_UNDERLYING_H */
diff --git a/gdbsupport/valid-expr.h b/gdbsupport/valid-expr.h
index 6d2b481c6e1..ef51958dc09 100644
--- a/gdbsupport/valid-expr.h
+++ b/gdbsupport/valid-expr.h
@@ -23,8 +23,8 @@
    right type.  This is mainly used to verify that some utility's API
    is really as safe as intended.  */
 
-#ifndef COMMON_VALID_EXPR_H
-#define COMMON_VALID_EXPR_H
+#ifndef GDBSUPPORT_VALID_EXPR_H
+#define GDBSUPPORT_VALID_EXPR_H
 
 #include "gdbsupport/preprocessor.h"
 #include "gdbsupport/traits.h"
@@ -108,4 +108,4 @@
 			ESC_PARENS (T1, T2, T3, T4, T5, T6),		\
 			VALID, EXPR_TYPE, EXPR)
 
-#endif /* COMMON_VALID_EXPR_H */
+#endif /* GDBSUPPORT_VALID_EXPR_H */
diff --git a/gdbsupport/version.h b/gdbsupport/version.h
index 7c60a963919..052d613d47e 100644
--- a/gdbsupport/version.h
+++ b/gdbsupport/version.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_VERSION_H
-#define COMMON_VERSION_H
+#ifndef GDBSUPPORT_VERSION_H
+#define GDBSUPPORT_VERSION_H
 
 /* Version number of GDB, as a string.  */
 extern const char version[];
@@ -28,4 +28,4 @@ extern const char host_name[];
 /* Canonical target name as a string.  */
 extern const char target_name[];
 
-#endif /* COMMON_VERSION_H */
+#endif /* GDBSUPPORT_VERSION_H */
diff --git a/gdbsupport/x86-xstate.h b/gdbsupport/x86-xstate.h
index 89c1143fbe1..ed8aeccece2 100644
--- a/gdbsupport/x86-xstate.h
+++ b/gdbsupport/x86-xstate.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_X86_XSTATE_H
-#define COMMON_X86_XSTATE_H
+#ifndef GDBSUPPORT_X86_XSTATE_H
+#define GDBSUPPORT_X86_XSTATE_H
 
 /* The extended state feature IDs in the state component bitmap.  */
 #define X86_XSTATE_X87_ID	0
@@ -120,4 +120,4 @@ constexpr bool operator!= (const x86_xsave_layout &lhs,
 
 #define I387_MXCSR_INIT_VAL 0x1f80
 
-#endif /* COMMON_X86_XSTATE_H */
+#endif /* GDBSUPPORT_X86_XSTATE_H */
diff --git a/gdbsupport/xml-utils.h b/gdbsupport/xml-utils.h
index c1f21b9b8ec..d68f4c98018 100644
--- a/gdbsupport/xml-utils.h
+++ b/gdbsupport/xml-utils.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMMON_XML_UTILS_H
-#define COMMON_XML_UTILS_H
+#ifndef GDBSUPPORT_XML_UTILS_H
+#define GDBSUPPORT_XML_UTILS_H
 
 /* Return a string with special characters from TEXT replaced by entity
    references.  */
@@ -40,4 +40,4 @@ extern void xml_escape_text_append (std::string &result, const char *text);
 void string_xml_appendf (std::string &buffer, const char *format, ...)
   ATTRIBUTE_PRINTF (2, 3);
 
-#endif /* COMMON_XML_UTILS_H */
+#endif /* GDBSUPPORT_XML_UTILS_H */

-- 
2.43.0


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

* Re: [PATCH v2 2/4] Add an include-checking script
  2024-04-18 15:41 ` [PATCH v2 2/4] Add an include-checking script Tom Tromey
@ 2024-04-18 19:25   ` Simon Marchi
  2024-04-19 14:54     ` Tom Tromey
  0 siblings, 1 reply; 8+ messages in thread
From: Simon Marchi @ 2024-04-18 19:25 UTC (permalink / raw)
  To: Tom Tromey, gdb-patches



On 2024-04-18 11:41, Tom Tromey wrote:
> This adds a new Python script that checks the header guards of all gdb
> source files.  It enforces a fairly strict formatting and naming
> scheme.
> 
> In particular, for a file "x/y-z.h" (relative to the repository root),
> the include guard will be named "X_Y_Z_H".  Only the '#ifndef' form is
> allowed, not "#if !defined(...)".  The trailing comment on the
> "#endif" is also required.
> 
> The script also tries to update files that appear to have the required
> lines if they are in the wrong form or use the wrong name.
> ---
>  gdb/check-include-guards.py | 125 ++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 125 insertions(+)
> 
> diff --git a/gdb/check-include-guards.py b/gdb/check-include-guards.py
> new file mode 100755
> index 00000000000..5c61fc90bb0
> --- /dev/null
> +++ b/gdb/check-include-guards.py
> @@ -0,0 +1,125 @@
> +#!/usr/bin/env python3
> +
> +# Copyright (C) 2024 Free Software Foundation, Inc.
> +#
> +# This file is part of GDB.
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; either version 3 of the License, or
> +# (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +# GNU General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program.  If not, see <http://www.gnu.org/licenses/>.
> +
> +# This is intended to be run from pre-commit.  You can also run it by
> +# hand by passing repository-relative filenames to it, like:
> +#   ./gdb/check-include-guards.py gdb/*.h
> +
> +
> +import glob
> +import re
> +import sys
> +
> +status = 0
> +
> +DEF = re.compile("^#ifndef ([A-Za-z0-9_]+)\n")
> +OLDDEF = re.compile("^#if !defined *\\(([A-Za-z0-9_]+)\\)\n")
> +
> +
> +def failure(filename, ndx, text):
> +    print(filename + ":" + str(ndx + 1) + ": " + text)
> +    global status
> +    status = 1
> +
> +
> +def headers(dirname):
> +    return glob.iglob(dirname + "/*.h")

This appears to be the same code as in v1, did you forget to commit your
changes or something like that?  You replied that you removed this
unused function, but here it is.

Simon

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

* Re: [PATCH v2 2/4] Add an include-checking script
  2024-04-18 19:25   ` Simon Marchi
@ 2024-04-19 14:54     ` Tom Tromey
  2024-04-19 15:03       ` Tom Tromey
  0 siblings, 1 reply; 8+ messages in thread
From: Tom Tromey @ 2024-04-19 14:54 UTC (permalink / raw)
  To: Simon Marchi; +Cc: Tom Tromey, gdb-patches

>> +def headers(dirname):
>> +    return glob.iglob(dirname + "/*.h")

Simon> This appears to be the same code as in v1, did you forget to commit your
Simon> changes or something like that?  You replied that you removed this
Simon> unused function, but here it is.

I am not sure what's happening.  The function is definitely not here.

I wonder if this is some b4 thing since I modified the branch in a weird
way.  I'll try again with b4 but if that fails again I will re-send the
normal way.  And I guess stop using b4.

Tom

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

* Re: [PATCH v2 2/4] Add an include-checking script
  2024-04-19 14:54     ` Tom Tromey
@ 2024-04-19 15:03       ` Tom Tromey
  0 siblings, 0 replies; 8+ messages in thread
From: Tom Tromey @ 2024-04-19 15:03 UTC (permalink / raw)
  To: Tom Tromey; +Cc: Simon Marchi, gdb-patches

Tom> I wonder if this is some b4 thing since I modified the branch in a weird
Tom> way.  I'll try again with b4 but if that fails again I will re-send the
Tom> normal way.  And I guess stop using b4.

Yeah, b4 is sending from my backup branch for some reason.
I'll re-send using git send-email.

Tom

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

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

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-18 15:41 [PATCH v2 0/4] Add include guard checker and reformatter Tom Tromey
2024-04-18 15:41 ` [PATCH v2 1/4] Fix some minor header file irregularities Tom Tromey
2024-04-18 15:41 ` [PATCH v2 2/4] Add an include-checking script Tom Tromey
2024-04-18 19:25   ` Simon Marchi
2024-04-19 14:54     ` Tom Tromey
2024-04-19 15:03       ` Tom Tromey
2024-04-18 15:41 ` [PATCH v2 3/4] Add check-include-guards.py to pre-commit Tom Tromey
2024-04-18 15:41 ` [PATCH v2 4/4] Run check-include-guards.py Tom Tromey

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).