Normalize include guards in gdb

While working on my other scripts to deal with gdb headers, I noticed that some files were missing include guards. I wrote a script to add the missing ones, but found that using the obvious names for the guards ran into clashes -- for example, gdb/nat/linux-nat.h used "LINUX_NAT_H", but this was also the script's choice for gdb/linux-nat.h. So, I changed the script to normalize all include guards in gdb. This patch is the result. As usual the script is available here: https://github.com/tromey/gdb-refactoring-scripts Tested by rebuilding; I also ran it through "Fedora-x86_64-m64" on the buildbot. gdb/ChangeLog 2019-02-07 Tom Tromey <tom@tromey.com> * yy-remap.h: Add include guard. * xtensa-tdep.h: Add include guard. * xcoffread.h: Rename include guard. * varobj-iter.h: Add include guard. * tui/tui.h: Rename include guard. * tui/tui-winsource.h: Rename include guard. * tui/tui-wingeneral.h: Rename include guard. * tui/tui-windata.h: Rename include guard. * tui/tui-win.h: Rename include guard. * tui/tui-stack.h: Rename include guard. * tui/tui-source.h: Rename include guard. * tui/tui-regs.h: Rename include guard. * tui/tui-out.h: Rename include guard. * tui/tui-layout.h: Rename include guard. * tui/tui-io.h: Rename include guard. * tui/tui-hooks.h: Rename include guard. * tui/tui-file.h: Rename include guard. * tui/tui-disasm.h: Rename include guard. * tui/tui-data.h: Rename include guard. * tui/tui-command.h: Rename include guard. * tic6x-tdep.h: Add include guard. * target/waitstatus.h: Rename include guard. * target/wait.h: Rename include guard. * target/target.h: Rename include guard. * target/resume.h: Rename include guard. * target-float.h: Rename include guard. * stabsread.h: Add include guard. * rs6000-tdep.h: Add include guard. * riscv-fbsd-tdep.h: Add include guard. * regformats/regdef.h: Rename include guard. * record.h: Rename include guard. * python/python.h: Rename include guard. * python/python-internal.h: Rename include guard. * python/py-stopevent.h: Rename include guard. * python/py-ref.h: Rename include guard. * python/py-record.h: Rename include guard. * python/py-record-full.h: Rename include guard. * python/py-record-btrace.h: Rename include guard. * python/py-instruction.h: Rename include guard. * python/py-events.h: Rename include guard. * python/py-event.h: Rename include guard. * procfs.h: Add include guard. * proc-utils.h: Add include guard. * p-lang.h: Add include guard. * or1k-tdep.h: Rename include guard. * observable.h: Rename include guard. * nto-tdep.h: Rename include guard. * nat/x86-linux.h: Rename include guard. * nat/x86-linux-dregs.h: Rename include guard. * nat/x86-gcc-cpuid.h: Add include guard. * nat/x86-dregs.h: Rename include guard. * nat/x86-cpuid.h: Rename include guard. * nat/ppc-linux.h: Rename include guard. * nat/mips-linux-watch.h: Rename include guard. * nat/linux-waitpid.h: Rename include guard. * nat/linux-ptrace.h: Rename include guard. * nat/linux-procfs.h: Rename include guard. * nat/linux-osdata.h: Rename include guard. * nat/linux-nat.h: Rename include guard. * nat/linux-namespaces.h: Rename include guard. * nat/linux-btrace.h: Rename include guard. * nat/glibc_thread_db.h: Rename include guard. * nat/gdb_thread_db.h: Rename include guard. * nat/gdb_ptrace.h: Rename include guard. * nat/fork-inferior.h: Rename include guard. * nat/amd64-linux-siginfo.h: Rename include guard. * nat/aarch64-sve-linux-sigcontext.h: Rename include guard. * nat/aarch64-sve-linux-ptrace.h: Rename include guard. * nat/aarch64-linux.h: Rename include guard. * nat/aarch64-linux-hw-point.h: Rename include guard. * mn10300-tdep.h: Add include guard. * mips-linux-tdep.h: Add include guard. * mi/mi-parse.h: Rename include guard. * mi/mi-out.h: Rename include guard. * mi/mi-main.h: Rename include guard. * mi/mi-interp.h: Rename include guard. * mi/mi-getopt.h: Rename include guard. * mi/mi-console.h: Rename include guard. * mi/mi-common.h: Rename include guard. * mi/mi-cmds.h: Rename include guard. * mi/mi-cmd-break.h: Rename include guard. * m2-lang.h: Add include guard. * location.h: Rename include guard. * linux-record.h: Rename include guard. * linux-nat.h: Add include guard. * linux-fork.h: Add include guard. * i386-darwin-tdep.h: Rename include guard. * hppa-linux-offsets.h: Add include guard. * guile/guile.h: Rename include guard. * guile/guile-internal.h: Rename include guard. * gnu-nat.h: Rename include guard. * gdb-stabs.h: Rename include guard. * frv-tdep.h: Add include guard. * f-lang.h: Add include guard. * event-loop.h: Add include guard. * darwin-nat.h: Rename include guard. * cp-abi.h: Rename include guard. * config/sparc/nm-sol2.h: Rename include guard. * config/nm-nto.h: Rename include guard. * config/nm-linux.h: Add include guard. * config/i386/nm-i386gnu.h: Rename include guard. * config/djgpp/nl_types.h: Rename include guard. * config/djgpp/langinfo.h: Rename include guard. * compile/gcc-cp-plugin.h: Add include guard. * compile/gcc-c-plugin.h: Add include guard. * compile/compile.h: Rename include guard. * compile/compile-object-run.h: Rename include guard. * compile/compile-object-load.h: Rename include guard. * compile/compile-internal.h: Rename include guard. * compile/compile-cplus.h: Rename include guard. * compile/compile-c.h: Rename include guard. * common/xml-utils.h: Rename include guard. * common/x86-xstate.h: Rename include guard. * common/version.h: Rename include guard. * common/vec.h: Rename include guard. * common/tdesc.h: Rename include guard. * common/selftest.h: Rename include guard. * common/scoped_restore.h: Rename include guard. * common/scoped_mmap.h: Rename include guard. * common/scoped_fd.h: Rename include guard. * common/safe-iterator.h: Rename include guard. * common/run-time-clock.h: Rename include guard. * common/refcounted-object.h: Rename include guard. * common/queue.h: Rename include guard. * common/ptid.h: Rename include guard. * common/print-utils.h: Rename include guard. * common/preprocessor.h: Rename include guard. * common/pathstuff.h: Rename include guard. * common/observable.h: Rename include guard. * common/netstuff.h: Rename include guard. * common/job-control.h: Rename include guard. * common/host-defs.h: Rename include guard. * common/gdb_wait.h: Rename include guard. * common/gdb_vecs.h: Rename include guard. * common/gdb_unlinker.h: Rename include guard. * common/gdb_unique_ptr.h: Rename include guard. * common/gdb_tilde_expand.h: Rename include guard. * common/gdb_sys_time.h: Rename include guard. * common/gdb_string_view.h: Rename include guard. * common/gdb_splay_tree.h: Rename include guard. * common/gdb_setjmp.h: Rename include guard. * common/gdb_ref_ptr.h: Rename include guard. * common/gdb_optional.h: Rename include guard. * common/gdb_locale.h: Rename include guard. * common/gdb_assert.h: Rename include guard. * common/filtered-iterator.h: Rename include guard. * common/filestuff.h: Rename include guard. * common/fileio.h: Rename include guard. * common/environ.h: Rename include guard. * common/common-utils.h: Rename include guard. * common/common-types.h: Rename include guard. * common/common-regcache.h: Rename include guard. * common/common-inferior.h: Rename include guard. * common/common-gdbthread.h: Rename include guard. * common/common-exceptions.h: Rename include guard. * common/common-defs.h: Rename include guard. * common/common-debug.h: Rename include guard. * common/cleanups.h: Rename include guard. * common/buffer.h: Rename include guard. * common/btrace-common.h: Rename include guard. * common/break-common.h: Rename include guard. * cli/cli-utils.h: Rename include guard. * cli/cli-style.h: Rename include guard. * cli/cli-setshow.h: Rename include guard. * cli/cli-script.h: Rename include guard. * cli/cli-interp.h: Rename include guard. * cli/cli-decode.h: Rename include guard. * cli/cli-cmds.h: Rename include guard. * charset-list.h: Add include guard. * buildsym-legacy.h: Rename include guard. * bfin-tdep.h: Add include guard. * ax.h: Rename include guard. * arm-linux-tdep.h: Add include guard. * arm-fbsd-tdep.h: Add include guard. * arch/xtensa.h: Rename include guard. * arch/tic6x.h: Add include guard. * arch/i386.h: Add include guard. * arch/arm.h: Rename include guard. * arch/arm-linux.h: Rename include guard. * arch/arm-get-next-pcs.h: Rename include guard. * arch/amd64.h: Add include guard. * arch/aarch64-insn.h: Rename include guard. * arch-utils.h: Rename include guard. * annotate.h: Add include guard. * amd64-darwin-tdep.h: Rename include guard. * aarch64-linux-tdep.h: Add include guard. * aarch64-fbsd-tdep.h: Add include guard. * aarch32-linux-nat.h: Add include guard. gdb/gdbserver/ChangeLog 2019-02-07 Tom Tromey <tom@tromey.com> * x86-tdesc.h: Rename include guard. * x86-low.h: Add include guard. * wincecompat.h: Rename include guard. * win32-low.h: Add include guard. * utils.h: Rename include guard. * tracepoint.h: Rename include guard. * tdesc.h: Rename include guard. * target.h: Rename include guard. * server.h: Rename include guard. * remote-utils.h: Rename include guard. * regcache.h: Rename include guard. * nto-low.h: Rename include guard. * notif.h: Add include guard. * mem-break.h: Rename include guard. * lynx-low.h: Add include guard. * linux-x86-tdesc.h: Add include guard. * linux-s390-tdesc.h: Add include guard. * linux-ppc-tdesc-init.h: Add include guard. * linux-low.h: Add include guard. * linux-aarch64-tdesc.h: Add include guard. * linux-aarch32-low.h: Add include guard. * inferiors.h: Rename include guard. * i387-fp.h: Rename include guard. * hostio.h: Rename include guard. * gdbthread.h: Rename include guard. * gdb_proc_service.h: Rename include guard. * event-loop.h: Rename include guard. * dll.h: Rename include guard. * debug.h: Rename include guard. * ax.h: Rename include guard.
author: Tom Tromey <tom@tromey.com> 2019-01-27 12:51:36 -0700
committer: Tom Tromey <tom@tromey.com> 2019-02-07 03:27:23 -0700
commit: 1a5c25988eabb35e0e40ea484b1eea029d9b7f53 (patch)
tree: 84c6f820847657cbb3a320ad7e1603cc42b2c3d9 /gdb
parent: 31528deca52123a5a6dee19d47bee94dff041325 (diff)
download: binutils-gdb-1a5c25988eabb35e0e40ea484b1eea029d9b7f53.tar.gz
220 files changed, 974 insertions, 530 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c5c08ec0329..c17d05ade8c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,194 @@
+2019-02-07  Tom Tromey  <tom@tromey.com>
+
+	* yy-remap.h: Add include guard.
+	* xtensa-tdep.h: Add include guard.
+	* xcoffread.h: Rename include guard.
+	* varobj-iter.h: Add include guard.
+	* tui/tui.h: Rename include guard.
+	* tui/tui-winsource.h: Rename include guard.
+	* tui/tui-wingeneral.h: Rename include guard.
+	* tui/tui-windata.h: Rename include guard.
+	* tui/tui-win.h: Rename include guard.
+	* tui/tui-stack.h: Rename include guard.
+	* tui/tui-source.h: Rename include guard.
+	* tui/tui-regs.h: Rename include guard.
+	* tui/tui-out.h: Rename include guard.
+	* tui/tui-layout.h: Rename include guard.
+	* tui/tui-io.h: Rename include guard.
+	* tui/tui-hooks.h: Rename include guard.
+	* tui/tui-file.h: Rename include guard.
+	* tui/tui-disasm.h: Rename include guard.
+	* tui/tui-data.h: Rename include guard.
+	* tui/tui-command.h: Rename include guard.
+	* tic6x-tdep.h: Add include guard.
+	* target/waitstatus.h: Rename include guard.
+	* target/wait.h: Rename include guard.
+	* target/target.h: Rename include guard.
+	* target/resume.h: Rename include guard.
+	* target-float.h: Rename include guard.
+	* stabsread.h: Add include guard.
+	* rs6000-tdep.h: Add include guard.
+	* riscv-fbsd-tdep.h: Add include guard.
+	* regformats/regdef.h: Rename include guard.
+	* record.h: Rename include guard.
+	* python/python.h: Rename include guard.
+	* python/python-internal.h: Rename include guard.
+	* python/py-stopevent.h: Rename include guard.
+	* python/py-ref.h: Rename include guard.
+	* python/py-record.h: Rename include guard.
+	* python/py-record-full.h: Rename include guard.
+	* python/py-record-btrace.h: Rename include guard.
+	* python/py-instruction.h: Rename include guard.
+	* python/py-events.h: Rename include guard.
+	* python/py-event.h: Rename include guard.
+	* procfs.h: Add include guard.
+	* proc-utils.h: Add include guard.
+	* p-lang.h: Add include guard.
+	* or1k-tdep.h: Rename include guard.
+	* observable.h: Rename include guard.
+	* nto-tdep.h: Rename include guard.
+	* nat/x86-linux.h: Rename include guard.
+	* nat/x86-linux-dregs.h: Rename include guard.
+	* nat/x86-gcc-cpuid.h: Add include guard.
+	* nat/x86-dregs.h: Rename include guard.
+	* nat/x86-cpuid.h: Rename include guard.
+	* nat/ppc-linux.h: Rename include guard.
+	* nat/mips-linux-watch.h: Rename include guard.
+	* nat/linux-waitpid.h: Rename include guard.
+	* nat/linux-ptrace.h: Rename include guard.
+	* nat/linux-procfs.h: Rename include guard.
+	* nat/linux-osdata.h: Rename include guard.
+	* nat/linux-nat.h: Rename include guard.
+	* nat/linux-namespaces.h: Rename include guard.
+	* nat/linux-btrace.h: Rename include guard.
+	* nat/glibc_thread_db.h: Rename include guard.
+	* nat/gdb_thread_db.h: Rename include guard.
+	* nat/gdb_ptrace.h: Rename include guard.
+	* nat/fork-inferior.h: Rename include guard.
+	* nat/amd64-linux-siginfo.h: Rename include guard.
+	* nat/aarch64-sve-linux-sigcontext.h: Rename include guard.
+	* nat/aarch64-sve-linux-ptrace.h: Rename include guard.
+	* nat/aarch64-linux.h: Rename include guard.
+	* nat/aarch64-linux-hw-point.h: Rename include guard.
+	* mn10300-tdep.h: Add include guard.
+	* mips-linux-tdep.h: Add include guard.
+	* mi/mi-parse.h: Rename include guard.
+	* mi/mi-out.h: Rename include guard.
+	* mi/mi-main.h: Rename include guard.
+	* mi/mi-interp.h: Rename include guard.
+	* mi/mi-getopt.h: Rename include guard.
+	* mi/mi-console.h: Rename include guard.
+	* mi/mi-common.h: Rename include guard.
+	* mi/mi-cmds.h: Rename include guard.
+	* mi/mi-cmd-break.h: Rename include guard.
+	* m2-lang.h: Add include guard.
+	* location.h: Rename include guard.
+	* linux-record.h: Rename include guard.
+	* linux-nat.h: Add include guard.
+	* linux-fork.h: Add include guard.
+	* i386-darwin-tdep.h: Rename include guard.
+	* hppa-linux-offsets.h: Add include guard.
+	* guile/guile.h: Rename include guard.
+	* guile/guile-internal.h: Rename include guard.
+	* gnu-nat.h: Rename include guard.
+	* gdb-stabs.h: Rename include guard.
+	* frv-tdep.h: Add include guard.
+	* f-lang.h: Add include guard.
+	* event-loop.h: Add include guard.
+	* darwin-nat.h: Rename include guard.
+	* cp-abi.h: Rename include guard.
+	* config/sparc/nm-sol2.h: Rename include guard.
+	* config/nm-nto.h: Rename include guard.
+	* config/nm-linux.h: Add include guard.
+	* config/i386/nm-i386gnu.h: Rename include guard.
+	* config/djgpp/nl_types.h: Rename include guard.
+	* config/djgpp/langinfo.h: Rename include guard.
+	* compile/gcc-cp-plugin.h: Add include guard.
+	* compile/gcc-c-plugin.h: Add include guard.
+	* compile/compile.h: Rename include guard.
+	* compile/compile-object-run.h: Rename include guard.
+	* compile/compile-object-load.h: Rename include guard.
+	* compile/compile-internal.h: Rename include guard.
+	* compile/compile-cplus.h: Rename include guard.
+	* compile/compile-c.h: Rename include guard.
+	* common/xml-utils.h: Rename include guard.
+	* common/x86-xstate.h: Rename include guard.
+	* common/version.h: Rename include guard.
+	* common/vec.h: Rename include guard.
+	* common/tdesc.h: Rename include guard.
+	* common/selftest.h: Rename include guard.
+	* common/scoped_restore.h: Rename include guard.
+	* common/scoped_mmap.h: Rename include guard.
+	* common/scoped_fd.h: Rename include guard.
+	* common/safe-iterator.h: Rename include guard.
+	* common/run-time-clock.h: Rename include guard.
+	* common/refcounted-object.h: Rename include guard.
+	* common/queue.h: Rename include guard.
+	* common/ptid.h: Rename include guard.
+	* common/print-utils.h: Rename include guard.
+	* common/preprocessor.h: Rename include guard.
+	* common/pathstuff.h: Rename include guard.
+	* common/observable.h: Rename include guard.
+	* common/netstuff.h: Rename include guard.
+	* common/job-control.h: Rename include guard.
+	* common/host-defs.h: Rename include guard.
+	* common/gdb_wait.h: Rename include guard.
+	* common/gdb_vecs.h: Rename include guard.
+	* common/gdb_unlinker.h: Rename include guard.
+	* common/gdb_unique_ptr.h: Rename include guard.
+	* common/gdb_tilde_expand.h: Rename include guard.
+	* common/gdb_sys_time.h: Rename include guard.
+	* common/gdb_string_view.h: Rename include guard.
+	* common/gdb_splay_tree.h: Rename include guard.
+	* common/gdb_setjmp.h: Rename include guard.
+	* common/gdb_ref_ptr.h: Rename include guard.
+	* common/gdb_optional.h: Rename include guard.
+	* common/gdb_locale.h: Rename include guard.
+	* common/gdb_assert.h: Rename include guard.
+	* common/filtered-iterator.h: Rename include guard.
+	* common/filestuff.h: Rename include guard.
+	* common/fileio.h: Rename include guard.
+	* common/environ.h: Rename include guard.
+	* common/common-utils.h: Rename include guard.
+	* common/common-types.h: Rename include guard.
+	* common/common-regcache.h: Rename include guard.
+	* common/common-inferior.h: Rename include guard.
+	* common/common-gdbthread.h: Rename include guard.
+	* common/common-exceptions.h: Rename include guard.
+	* common/common-defs.h: Rename include guard.
+	* common/common-debug.h: Rename include guard.
+	* common/cleanups.h: Rename include guard.
+	* common/buffer.h: Rename include guard.
+	* common/btrace-common.h: Rename include guard.
+	* common/break-common.h: Rename include guard.
+	* cli/cli-utils.h: Rename include guard.
+	* cli/cli-style.h: Rename include guard.
+	* cli/cli-setshow.h: Rename include guard.
+	* cli/cli-script.h: Rename include guard.
+	* cli/cli-interp.h: Rename include guard.
+	* cli/cli-decode.h: Rename include guard.
+	* cli/cli-cmds.h: Rename include guard.
+	* charset-list.h: Add include guard.
+	* buildsym-legacy.h: Rename include guard.
+	* bfin-tdep.h: Add include guard.
+	* ax.h: Rename include guard.
+	* arm-linux-tdep.h: Add include guard.
+	* arm-fbsd-tdep.h: Add include guard.
+	* arch/xtensa.h: Rename include guard.
+	* arch/tic6x.h: Add include guard.
+	* arch/i386.h: Add include guard.
+	* arch/arm.h: Rename include guard.
+	* arch/arm-linux.h: Rename include guard.
+	* arch/arm-get-next-pcs.h: Rename include guard.
+	* arch/amd64.h: Add include guard.
+	* arch/aarch64-insn.h: Rename include guard.
+	* arch-utils.h: Rename include guard.
+	* annotate.h: Add include guard.
+	* amd64-darwin-tdep.h: Rename include guard.
+	* aarch64-linux-tdep.h: Add include guard.
+	* aarch64-fbsd-tdep.h: Add include guard.
+	* aarch32-linux-nat.h: Add include guard.
+
 2019-02-06  Philippe Waroquiers  <philippe.waroquiers@skynet.be>
 
 	* macrotab.c (macro_define_internal): New function that
diff --git a/gdb/aarch32-linux-nat.h b/gdb/aarch32-linux-nat.h
index 29d79642365..093211c812a 100644
--- a/gdb/aarch32-linux-nat.h
+++ b/gdb/aarch32-linux-nat.h
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef AARCH32_LINUX_NAT_H
+#define AARCH32_LINUX_NAT_H
+
 /* Fetch and store VFP Registers.  The kernel object has space for 32
    64-bit registers, and the FPSCR.  This is even when on a VFPv2 or
    VFPv3D16 target.  */
@@ -32,3 +35,5 @@ void aarch32_vfp_regcache_supply (struct regcache *regcache, gdb_byte *regs,
 void aarch32_vfp_regcache_collect (const struct regcache *regcache,
 				   gdb_byte *regs,
 				   const int vfp_register_count);
+
+#endif /* AARCH32_LINUX_NAT_H */
diff --git a/gdb/aarch64-fbsd-tdep.h b/gdb/aarch64-fbsd-tdep.h
index 37c0cfc48be..ebe671a70ed 100644
--- a/gdb/aarch64-fbsd-tdep.h
+++ b/gdb/aarch64-fbsd-tdep.h
@@ -17,6 +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 AARCH64_FBSD_TDEP_H
+#define AARCH64_FBSD_TDEP_H
+
 #include "regset.h"
 
 /* The general-purpose regset consists of 30 X registers, plus LR, SP,
@@ -31,3 +34,5 @@
 
 extern const struct regset aarch64_fbsd_gregset;
 extern const struct regset aarch64_fbsd_fpregset;
+
+#endif /* AARCH64_FBSD_TDEP_H */
diff --git a/gdb/aarch64-linux-tdep.h b/gdb/aarch64-linux-tdep.h
index f8d6104b133..814222ead0c 100644
--- a/gdb/aarch64-linux-tdep.h
+++ b/gdb/aarch64-linux-tdep.h
@@ -18,6 +18,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 AARCH64_LINUX_TDEP_H
+#define AARCH64_LINUX_TDEP_H
+
 #include "regset.h"
 
 /* The general-purpose regset consists of 31 X registers, plus SP, PC,
@@ -32,3 +35,5 @@
 
 extern const struct regset aarch64_linux_gregset;
 extern const struct regset aarch64_linux_fpregset;
+
+#endif /* AARCH64_LINUX_TDEP_H */
diff --git a/gdb/amd64-darwin-tdep.h b/gdb/amd64-darwin-tdep.h
index d9848e9631c..90dc26f8165 100644
--- a/gdb/amd64-darwin-tdep.h
+++ b/gdb/amd64-darwin-tdep.h
@@ -16,8 +16,9 @@
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-#ifndef __AMD64_DARWIN_TDEP_H__
-#define __AMD64_DARWIN_TDEP_H__
+
+#ifndef AMD64_DARWIN_TDEP_H
+#define AMD64_DARWIN_TDEP_H
 
 /* Mapping between the general-purpose registers in Darwin x86-64 thread
    state and GDB's register cache layout.
@@ -25,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 /* AMD64_DARWIN_TDEP_H */
diff --git a/gdb/annotate.h b/gdb/annotate.h
index 03e744791c2..4a9e1b58f28 100644
--- a/gdb/annotate.h
+++ b/gdb/annotate.h
@@ -16,6 +16,9 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef ANNOTATE_H
+#define ANNOTATE_H
+
 #include "symtab.h"
 #include "gdbtypes.h"
 
@@ -110,3 +113,5 @@ extern void annotate_array_section_end (void);
 
 extern void (*deprecated_annotate_signalled_hook) (void);
 extern void (*deprecated_annotate_signal_hook) (void);
+
+#endif /* ANNOTATE_H */
diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h
index 7db358f0f5a..155cf5cfe30 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 GDBARCH_UTILS_H
-#define GDBARCH_UTILS_H
+#ifndef ARCH_UTILS_H
+#define ARCH_UTILS_H
 
 struct gdbarch;
 struct frame_info;
@@ -271,4 +271,4 @@ extern bool default_in_indirect_branch_thunk (gdbarch *gdbarch,
 extern ULONGEST default_type_align (struct gdbarch *gdbarch,
 				    struct type *type);
 
-#endif
+#endif /* ARCH_UTILS_H */
diff --git a/gdb/arch/aarch64-insn.h b/gdb/arch/aarch64-insn.h
index 43120ccca32..4492594c1b9 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 AARCH64_INSN_H
-#define AARCH64_INSN_H 1
+#ifndef ARCH_AARCH64_INSN_H
+#define ARCH_AARCH64_INSN_H
 
 extern int aarch64_debug;
 
@@ -321,4 +321,4 @@ int aarch64_emit_load_store (uint32_t *buf, uint32_t size,
 			     struct aarch64_register rn,
 			     struct aarch64_memory_operand operand);
 
-#endif
+#endif /* ARCH_AARCH64_INSN_H */
diff --git a/gdb/arch/amd64.h b/gdb/arch/amd64.h
index 9431e08f0b3..1e02c5235f1 100644
--- a/gdb/arch/amd64.h
+++ b/gdb/arch/amd64.h
@@ -15,8 +15,13 @@
    You 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
+
 #include "common/tdesc.h"
 #include <stdint.h>
 
 target_desc *amd64_create_target_description (uint64_t xcr0, bool is_x32,
 					      bool is_linux, bool segments);
+
+#endif /* ARCH_AMD64_H */
diff --git a/gdb/arch/arm-get-next-pcs.h b/gdb/arch/arm-get-next-pcs.h
index 59f0316bfae..7c5ad5e365e 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 ARM_GET_NEXT_PCS_H
-#define ARM_GET_NEXT_PCS_H 1
+#ifndef ARCH_ARM_GET_NEXT_PCS_H
+#define ARCH_ARM_GET_NEXT_PCS_H
 
 #include <vector>
 
@@ -64,4 +64,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 /* ARM_GET_NEXT_PCS_H */
+#endif /* ARCH_ARM_GET_NEXT_PCS_H */
diff --git a/gdb/arch/arm-linux.h b/gdb/arch/arm-linux.h
index d5ee140ac47..04d3f23ff41 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 ARM_LINUX_H
-#define ARM_LINUX_H
+#ifndef ARCH_ARM_LINUX_H
+#define ARCH_ARM_LINUX_H
 
 /* The index to access CSPR in user_regs defined in GLIBC.  */
 #define ARM_CPSR_GREGNUM 16
@@ -78,4 +78,5 @@ struct arm_get_next_pcs;
 
 CORE_ADDR arm_linux_get_next_pcs_fixup (struct arm_get_next_pcs *self,
 					CORE_ADDR pc);
-#endif /* ARM_LINUX_H */
+
+#endif /* ARCH_ARM_LINUX_H */
diff --git a/gdb/arch/arm.h b/gdb/arch/arm.h
index 21d45c5bebf..c1785425e8c 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 ARM_H
-#define ARM_H
+#ifndef ARCH_ARM_H
+#define ARCH_ARM_H
 
 /* Register numbers of various important registers.  */
 
@@ -146,4 +146,4 @@ unsigned long shifted_reg_val (struct regcache *regcache,
 			       unsigned long pc_val,
 			       unsigned long status_reg);
 
-#endif
+#endif /* ARCH_ARM_H */
diff --git a/gdb/arch/i386.h b/gdb/arch/i386.h
index a6a801b8189..fa854380809 100644
--- a/gdb/arch/i386.h
+++ b/gdb/arch/i386.h
@@ -15,7 +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 ARCH_I386_H
+#define ARCH_I386_H
+
 #include "common/tdesc.h"
 #include <stdint.h>
 
 target_desc *i386_create_target_description (uint64_t xcr0, bool is_linux);
+
+#endif /* ARCH_I386_H */
diff --git a/gdb/arch/tic6x.h b/gdb/arch/tic6x.h
index e1c819d34b6..36dadb38491 100644
--- a/gdb/arch/tic6x.h
+++ b/gdb/arch/tic6x.h
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef ARCH_TIC6X_H
+#define ARCH_TIC6X_H
+
 enum c6x_feature
 {
   C6X_CORE,
@@ -24,3 +27,5 @@ enum c6x_feature
 };
 
 target_desc *tic6x_create_target_description (enum c6x_feature feature);
+
+#endif /* ARCH_TIC6X_H */
diff --git a/gdb/arch/xtensa.h b/gdb/arch/xtensa.h
index 044d0c9cb9d..9a6fa33fb63 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 XTENSA_H
-#define XTENSA_H
+#ifndef ARCH_XTENSA_H
+#define 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
+#endif /* ARCH_XTENSA_H */
diff --git a/gdb/arm-fbsd-tdep.h b/gdb/arm-fbsd-tdep.h
index 986118e2861..754d683cd5c 100644
--- a/gdb/arm-fbsd-tdep.h
+++ b/gdb/arm-fbsd-tdep.h
@@ -17,6 +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 ARM_FBSD_TDEP_H
+#define ARM_FBSD_TDEP_H
+
 #include "regset.h"
 
 /* The general-purpose regset consists of 13 R registers, plus SP, LR,
@@ -38,3 +41,5 @@ extern const struct regset arm_fbsd_vfpregset;
 
 extern const struct target_desc *
 arm_fbsd_read_description_auxv (struct target_ops *target);
+
+#endif /* ARM_FBSD_TDEP_H */
diff --git a/gdb/arm-linux-tdep.h b/gdb/arm-linux-tdep.h
index 405996b56e7..8f430481489 100644
--- a/gdb/arm-linux-tdep.h
+++ b/gdb/arm-linux-tdep.h
@@ -17,6 +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 ARM_LINUX_TDEP_H
+#define ARM_LINUX_TDEP_H
+
 struct regset;
 struct regcache;
 
@@ -64,3 +67,4 @@ void arm_linux_collect_nwfpe (const struct regset *regset,
 #define HWCAP_VFPv3     8192
 #define HWCAP_VFPv3D16  16384
 
+#endif /* ARM_LINUX_TDEP_H */
diff --git a/gdb/ax.h b/gdb/ax.h
index e203a4b8f8a..d16098b8c9c 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 AGENTEXPR_H
-#define AGENTEXPR_H
+#ifndef AX_H
+#define AX_H
 
 #include "common/vec.h"
 
@@ -267,4 +267,4 @@ extern struct aop_map aop_map[];
 
 extern void ax_reqs (struct agent_expr *ax);
 
-#endif /* AGENTEXPR_H */
+#endif /* AX_H */
diff --git a/gdb/bfin-tdep.h b/gdb/bfin-tdep.h
index ece0d06bba5..99eb4b4cb72 100644
--- a/gdb/bfin-tdep.h
+++ b/gdb/bfin-tdep.h
@@ -19,6 +19,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 BFIN_TDEP_H
+#define BFIN_TDEP_H
+
 enum gdb_regnum {
   /* Core Registers */
   BFIN_R0_REGNUM = 0,
@@ -99,3 +102,5 @@ struct gdbarch_tdep
 
 /* Return the Blackfin ABI associated with GDBARCH.  */
 extern enum bfin_abi bfin_abi (struct gdbarch *gdbarch);
+
+#endif /* BFIN_TDEP_H */
diff --git a/gdb/buildsym-legacy.h b/gdb/buildsym-legacy.h
index 2c1bfff70af..55b41a40a24 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/>.  */
 
-#if !defined (LEGACY_BUILDSYM_H)
-#define LEGACY_BUILDSYM_H 1
+#ifndef BUILDSYM_LEGACY_H
+#define BUILDSYM_LEGACY_H
 
 #include "buildsym.h"
 
@@ -179,4 +179,4 @@ extern struct pending **get_global_symbols ();
 
 extern struct buildsym_compunit *get_buildsym_compunit ();
 
-#endif /* defined (LEGACY_BUILDSYM_H) */
+#endif /* BUILDSYM_LEGACY_H */
diff --git a/gdb/charset-list.h b/gdb/charset-list.h
index 37c4bbc4e53..8ec1f1b4e42 100644
--- a/gdb/charset-list.h
+++ b/gdb/charset-list.h
@@ -17,6 +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 CHARSET_LIST_H
+#define CHARSET_LIST_H
+
 /* Note that the first entry must always be "auto".
    The remaining entries were created by running this script:
    
@@ -1188,3 +1191,5 @@
 "WINSAMI2", \
 "WS2", \
 "YU",
+
+#endif /* CHARSET_LIST_H */
diff --git a/gdb/cli/cli-cmds.h b/gdb/cli/cli-cmds.h
index cc29929fc59..63b8c4018ce 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/>.  */
 
-#if !defined (CLI_CMDS_H)
-#define CLI_CMDS_H 1
+#ifndef CLI_CLI_CMDS_H
+#define CLI_CLI_CMDS_H
 
 #include "common/filestuff.h"
 #include "common/gdb_optional.h"
@@ -142,4 +142,4 @@ extern gdb::optional<open_script>
 extern int source_verbose;
 extern int trace_commands;
 
-#endif /* !defined (CLI_CMDS_H) */
+#endif /* CLI_CLI_CMDS_H */
diff --git a/gdb/cli/cli-decode.h b/gdb/cli/cli-decode.h
index 39329f04fbf..c53683d95c0 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/>.  */
 
-#if !defined (CLI_DECODE_H)
-#define CLI_DECODE_H 1
+#ifndef CLI_CLI_DECODE_H
+#define CLI_CLI_DECODE_H
 
 /* This file defines the private interfaces for any code implementing
    command internals.  */
@@ -270,4 +270,4 @@ extern int cli_user_command_p (struct cmd_list_element *);
 
 extern int find_command_name_length (const char *);
 
-#endif /* !defined (CLI_DECODE_H) */
+#endif /* CLI_CLI_DECODE_H */
diff --git a/gdb/cli/cli-interp.h b/gdb/cli/cli-interp.h
index b87432d18fd..77d73a23d04 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_INTERP_H
-#define CLI_INTERP_H 1
+#ifndef CLI_CLI_INTERP_H
+#define CLI_CLI_INTERP_H
 
 #include "interps.h"
 
@@ -60,4 +60,4 @@ extern void cli_interpreter_pre_command_loop (struct interp *self);
 extern int should_print_stop_to_console (struct interp *interp,
 					 struct thread_info *tp);
 
-#endif
+#endif /* CLI_CLI_INTERP_H */
diff --git a/gdb/cli/cli-script.h b/gdb/cli/cli-script.h
index 246c5ae3cf7..e76e794be57 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/>.  */
 
-#if !defined (CLI_SCRIPT_H)
-#define CLI_SCRIPT_H 1
+#ifndef CLI_CLI_SCRIPT_H
+#define CLI_CLI_SCRIPT_H
 
 struct ui_file;
 struct cmd_list_element;
@@ -168,4 +168,4 @@ extern void print_command_trace (const char *cmd, ...)
 
 extern void reset_command_nest_depth (void);
 
-#endif /* !defined (CLI_SCRIPT_H) */
+#endif /* CLI_CLI_SCRIPT_H */
diff --git a/gdb/cli/cli-setshow.h b/gdb/cli/cli-setshow.h
index 078d47a4ce7..e4d13c3510d 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/>.  */
 
-#if !defined (CLI_SETSHOW_H)
-#define CLI_SETSHOW_H 1
+#ifndef CLI_CLI_SETSHOW_H
+#define CLI_CLI_SETSHOW_H
 
 struct cmd_list_element;
 
@@ -31,4 +31,4 @@ extern void do_show_command (const char *arg, int from_tty,
 extern void cmd_show_list (struct cmd_list_element *list, int from_tty,
 			   const char *prefix);
 
-#endif /* !defined (CLI_SETSHOW_H) */
+#endif /* CLI_CLI_SETSHOW_H */
diff --git a/gdb/cli/cli-style.h b/gdb/cli/cli-style.h
index 07830f9dfd3..287bad7d201 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_STYLE_H
-#define CLI_STYLE_H
+#ifndef CLI_CLI_STYLE_H
+#define CLI_CLI_STYLE_H
 
 #include "ui-file.h"
 
@@ -96,4 +96,4 @@ extern cli_style_option address_style;
 /* True if styling is enabled.  */
 extern int cli_styling;
 
-#endif /* CLI_STYLE_H */
+#endif /* CLI_CLI_STYLE_H */
diff --git a/gdb/cli/cli-utils.h b/gdb/cli/cli-utils.h
index 1ab879df9d5..d0161db0916 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_UTILS_H
-#define CLI_UTILS_H
+#ifndef CLI_CLI_UTILS_H
+#define CLI_CLI_UTILS_H
 
 /* *PP is a string denoting a number.  Get the number.  Advance *PP
    after the string and any trailing whitespace.
@@ -238,4 +238,5 @@ struct qcs_flags
 
 extern bool parse_flags_qcs (const char *which_command, const char **str,
 			     qcs_flags *flags);
-#endif /* CLI_UTILS_H */
+
+#endif /* CLI_CLI_UTILS_H */
diff --git a/gdb/common/break-common.h b/gdb/common/break-common.h
index 4375fe32088..d85cadf442a 100644
--- a/gdb/common/break-common.h
+++ b/gdb/common/break-common.h
@@ -16,8 +16,9 @@
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-#ifndef BREAK_COMMON_H
-#define BREAK_COMMON_H 1
+
+#ifndef COMMON_BREAK_COMMON_H
+#define COMMON_BREAK_COMMON_H
 
 enum target_hw_bp_type
   {
@@ -27,4 +28,4 @@ enum target_hw_bp_type
     hw_execute = 3		/* Execute HW breakpoint */
   };
 
-#endif
+#endif /* COMMON_BREAK_COMMON_H */
diff --git a/gdb/common/btrace-common.h b/gdb/common/btrace-common.h
index 284adf613fc..0b18924882c 100644
--- a/gdb/common/btrace-common.h
+++ b/gdb/common/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 BTRACE_COMMON_H
-#define BTRACE_COMMON_H
+#ifndef COMMON_BTRACE_COMMON_H
+#define COMMON_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
@@ -254,4 +254,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 /* BTRACE_COMMON_H */
+#endif /* COMMON_BTRACE_COMMON_H */
diff --git a/gdb/common/buffer.h b/gdb/common/buffer.h
index 66b770acce8..8b24b54d0eb 100644
--- a/gdb/common/buffer.h
+++ b/gdb/common/buffer.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef BUFFER_H
-#define BUFFER_H
+#ifndef COMMON_BUFFER_H
+#define COMMON_BUFFER_H
 
 struct buffer
 {
@@ -65,4 +65,4 @@ void buffer_xml_printf (struct buffer *buffer, const char *format, ...)
 #define buffer_grow_str0(BUFFER,STRING)			\
   buffer_grow (BUFFER, STRING, strlen (STRING) + 1)
 
-#endif
+#endif /* COMMON_BUFFER_H */
diff --git a/gdb/common/cleanups.h b/gdb/common/cleanups.h
index 4d5c9fa6fbf..f49bcb40d14 100644
--- a/gdb/common/cleanups.h
+++ b/gdb/common/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 CLEANUPS_H
-#define CLEANUPS_H
+#ifndef COMMON_CLEANUPS_H
+#define COMMON_CLEANUPS_H
 
 /* Outside of cleanups.c, this is an opaque type.  */
 struct cleanup;
@@ -66,4 +66,4 @@ extern void restore_final_cleanups (struct cleanup *);
    to pass to do_cleanups.  */
 extern void null_cleanup (void *);
 
-#endif /* CLEANUPS_H */
+#endif /* COMMON_CLEANUPS_H */
diff --git a/gdb/common/common-debug.h b/gdb/common/common-debug.h
index 5cf8230c032..d5bfc9eb3ae 100644
--- a/gdb/common/common-debug.h
+++ b/gdb/common/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_DEBUG_H
-#define COMMON_DEBUG_H
+#ifndef COMMON_COMMON_DEBUG_H
+#define COMMON_COMMON_DEBUG_H
 
 /* Set to nonzero to enable debugging of hardware breakpoint/
    watchpoint support code.  */
@@ -38,4 +38,4 @@ extern void debug_printf (const char *format, ...)
 extern void debug_vprintf (const char *format, va_list ap)
      ATTRIBUTE_PRINTF (1, 0);
 
-#endif /* COMMON_DEBUG_H */
+#endif /* COMMON_COMMON_DEBUG_H */
diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h
index e574de5ed66..732693d65cc 100644
--- a/gdb/common/common-defs.h
+++ b/gdb/common/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_DEFS_H
-#define COMMON_DEFS_H
+#ifndef COMMON_COMMON_DEFS_H
+#define COMMON_COMMON_DEFS_H
 
 #include "config.h"
 
@@ -127,4 +127,4 @@ extern char *current_directory;
 #define HAVE_USEFUL_SBRK 1
 #endif
 
-#endif /* COMMON_DEFS_H */
+#endif /* COMMON_COMMON_DEFS_H */
diff --git a/gdb/common/common-exceptions.h b/gdb/common/common-exceptions.h
index 0f03dc202b3..471e7c5cf81 100644
--- a/gdb/common/common-exceptions.h
+++ b/gdb/common/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_EXCEPTIONS_H
-#define COMMON_EXCEPTIONS_H
+#ifndef COMMON_COMMON_EXCEPTIONS_H
+#define COMMON_COMMON_EXCEPTIONS_H
 
 #include <setjmp.h>
 #include <new>
@@ -338,4 +338,4 @@ extern void throw_quit (const char *fmt, ...)
 /* A pre-defined non-exception.  */
 extern const struct gdb_exception exception_none;
 
-#endif /* COMMON_EXCEPTIONS_H */
+#endif /* COMMON_COMMON_EXCEPTIONS_H */
diff --git a/gdb/common/common-gdbthread.h b/gdb/common/common-gdbthread.h
index b7e93bed9af..d692be209cd 100644
--- a/gdb/common/common-gdbthread.h
+++ b/gdb/common/common-gdbthread.h
@@ -16,10 +16,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_GDBTHREAD_H
-#define COMMON_GDBTHREAD_H
+#ifndef COMMON_COMMON_GDBTHREAD_H
+#define COMMON_COMMON_GDBTHREAD_H
 
 /* Switch from one thread to another.  */
 extern void switch_to_thread (ptid_t ptid);
 
-#endif /* ! COMMON_GDBTHREAD_H */
+#endif /* COMMON_COMMON_GDBTHREAD_H */
diff --git a/gdb/common/common-inferior.h b/gdb/common/common-inferior.h
index 7e8e7368b89..72e4bd9eac3 100644
--- a/gdb/common/common-inferior.h
+++ b/gdb/common/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_INFERIOR_H
-#define COMMON_INFERIOR_H
+#ifndef COMMON_COMMON_INFERIOR_H
+#define COMMON_COMMON_INFERIOR_H
 
 /* Return the exec wrapper to be used when starting the inferior, or NULL
    otherwise.  */
@@ -38,4 +38,4 @@ extern const char *get_inferior_cwd ();
    the directory.  */
 extern void set_inferior_cwd (const char *cwd);
 
-#endif /* ! COMMON_INFERIOR_H */
+#endif /* COMMON_COMMON_INFERIOR_H */
diff --git a/gdb/common/common-regcache.h b/gdb/common/common-regcache.h
index 938bb290cd4..95ce64a91f9 100644
--- a/gdb/common/common-regcache.h
+++ b/gdb/common/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_REGCACHE_H
-#define COMMON_REGCACHE_H
+#ifndef COMMON_COMMON_REGCACHE_H
+#define COMMON_COMMON_REGCACHE_H
 
 /* This header is a stopgap until we have an independent regcache.  */
 
@@ -82,4 +82,4 @@ struct reg_buffer_common
   virtual bool raw_compare (int regnum, const void *buf, int offset) const = 0;
 };
 
-#endif /* COMMON_REGCACHE_H */
+#endif /* COMMON_COMMON_REGCACHE_H */
diff --git a/gdb/common/common-types.h b/gdb/common/common-types.h
index dcce0c35b84..ed73f6f990a 100644
--- a/gdb/common/common-types.h
+++ b/gdb/common/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_TYPES_H
-#define COMMON_TYPES_H
+#ifndef COMMON_COMMON_TYPES_H
+#define COMMON_COMMON_TYPES_H
 
 #ifdef GDBSERVER
 
@@ -63,4 +63,4 @@ typedef unsigned long long ULONGEST;
 
 enum tribool { TRIBOOL_UNKNOWN = -1, TRIBOOL_FALSE = 0, TRIBOOL_TRUE = 1 };
 
-#endif /* COMMON_TYPES_H */
+#endif /* COMMON_COMMON_TYPES_H */
diff --git a/gdb/common/common-utils.h b/gdb/common/common-utils.h
index b2cb51692eb..52bf3437b1c 100644
--- a/gdb/common/common-utils.h
+++ b/gdb/common/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_UTILS_H
-#define COMMON_UTILS_H
+#ifndef COMMON_COMMON_UTILS_H
+#define COMMON_COMMON_UTILS_H
 
 #include <string>
 #include <vector>
@@ -178,4 +178,4 @@ in_inclusive_range (T value, T low, T high)
 extern ULONGEST align_up (ULONGEST v, int n);
 extern ULONGEST align_down (ULONGEST v, int n);
 
-#endif
+#endif /* COMMON_COMMON_UTILS_H */
diff --git a/gdb/common/environ.h b/gdb/common/environ.h
index 29d534f54a0..8a6b907c9b4 100644
--- a/gdb/common/environ.h
+++ b/gdb/common/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/>.  */
 
-#if !defined (ENVIRON_H)
-#define ENVIRON_H 1
+#ifndef COMMON_ENVIRON_H
+#define COMMON_ENVIRON_H
 
 #include <vector>
 #include <set>
@@ -100,4 +100,4 @@ private:
   std::set<std::string> m_user_unset_env;
 };
 
-#endif /* defined (ENVIRON_H) */
+#endif /* COMMON_ENVIRON_H */
diff --git a/gdb/common/fileio.h b/gdb/common/fileio.h
index 755985360af..7a2e7c2817e 100644
--- a/gdb/common/fileio.h
+++ b/gdb/common/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 FILEIO_H
-#define FILEIO_H
+#ifndef COMMON_FILEIO_H
+#define COMMON_FILEIO_H
 
 #include "gdb/fileio.h"
 #include <sys/stat.h>
@@ -70,4 +70,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 /* FILEIO_H */
+#endif /* COMMON_FILEIO_H */
diff --git a/gdb/common/filestuff.h b/gdb/common/filestuff.h
index 1c5000570e7..7e95b9ca2d4 100644
--- a/gdb/common/filestuff.h
+++ b/gdb/common/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 FILESTUFF_H
-#define FILESTUFF_H
+#ifndef COMMON_FILESTUFF_H
+#define COMMON_FILESTUFF_H
 
 #include <dirent.h>
 #include <fcntl.h>
@@ -143,4 +143,4 @@ extern bool is_regular_file (const char *name, int *errno_ptr);
 
 extern bool mkdir_recursive (const char *dir);
 
-#endif /* FILESTUFF_H */
+#endif /* COMMON_FILESTUFF_H */
diff --git a/gdb/common/filtered-iterator.h b/gdb/common/filtered-iterator.h
index 7d7aa3a0be0..e1b486d6f08 100644
--- a/gdb/common/filtered-iterator.h
+++ b/gdb/common/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 FILTERED_ITERATOR_H
-#define FILTERED_ITERATOR_H
+#ifndef COMMON_FILTERED_ITERATOR_H
+#define COMMON_FILTERED_ITERATOR_H
 
 /* A filtered iterator.  This wraps BaseIterator and automatically
    skips elements that FilterFunc filters out.  Requires that
@@ -84,4 +84,4 @@ private:
   BaseIterator m_end {};
 };
 
-#endif /* FILTERED_ITERATOR_H */
+#endif /* COMMON_FILTERED_ITERATOR_H */
diff --git a/gdb/common/gdb_assert.h b/gdb/common/gdb_assert.h
index f59f2293164..a719d878990 100644
--- a/gdb/common/gdb_assert.h
+++ b/gdb/common/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 GDB_ASSERT_H
-#define GDB_ASSERT_H
+#ifndef COMMON_GDB_ASSERT_H
+#define COMMON_GDB_ASSERT_H
 
 /* A static assertion.  This will cause a compile-time error if EXPR,
    which must be a compile-time constant, is false.  */
@@ -56,4 +56,4 @@
   internal_error (__FILE__, __LINE__, _(message))
 #endif
 
-#endif /* gdb_assert.h */
+#endif /* COMMON_GDB_ASSERT_H */
diff --git a/gdb/common/gdb_locale.h b/gdb/common/gdb_locale.h
index fb3d6c58398..4e59b4f16cb 100644
--- a/gdb/common/gdb_locale.h
+++ b/gdb/common/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 GDB_LOCALE_H
-#define GDB_LOCALE_H
+#ifndef COMMON_GDB_LOCALE_H
+#define COMMON_GDB_LOCALE_H
 
 #ifdef HAVE_LOCALE_H
 # include <locale.h>
@@ -40,4 +40,4 @@
 #include <langinfo.h>
 #endif
 
-#endif /* GDB_LOCALE_H */
+#endif /* COMMON_GDB_LOCALE_H */
diff --git a/gdb/common/gdb_optional.h b/gdb/common/gdb_optional.h
index acb1045a826..7ca5725636e 100644
--- a/gdb/common/gdb_optional.h
+++ b/gdb/common/gdb_optional.h
@@ -17,8 +17,8 @@
    You 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_OPTIONAL_H
-#define GDB_OPTIONAL_H
+#ifndef COMMON_GDB_OPTIONAL_H
+#define COMMON_GDB_OPTIONAL_H
 
 #include "common/traits.h"
 
@@ -216,4 +216,4 @@ private:
 
 }
 
-#endif /* GDB_OPTIONAL_H */
+#endif /* COMMON_GDB_OPTIONAL_H */
diff --git a/gdb/common/gdb_ref_ptr.h b/gdb/common/gdb_ref_ptr.h
index 65afe952984..b104556cc5f 100644
--- a/gdb/common/gdb_ref_ptr.h
+++ b/gdb/common/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 GDB_REF_PTR_H
-#define GDB_REF_PTR_H
+#ifndef COMMON_GDB_REF_PTR_H
+#define COMMON_GDB_REF_PTR_H
 
 #include <cstddef>
 
@@ -225,4 +225,4 @@ inline bool operator!= (const std::nullptr_t, const ref_ptr<T, Policy> &rhs)
 
 }
 
-#endif /* GDB_REF_PTR_H */
+#endif /* COMMON_GDB_REF_PTR_H */
diff --git a/gdb/common/gdb_setjmp.h b/gdb/common/gdb_setjmp.h
index 1597dad5fc3..d4ebbfa8f2a 100644
--- a/gdb/common/gdb_setjmp.h
+++ b/gdb/common/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 GDB_SETJMP_H
-#define GDB_SETJMP_H
+#ifndef COMMON_GDB_SETJMP_H
+#define COMMON_GDB_SETJMP_H
 
 #include <setjmp.h>
 
@@ -31,4 +31,4 @@
 #define SIGLONGJMP(buf,val)	longjmp((buf), (val))
 #endif
 
-#endif /* GDB_SETJMP_H */
+#endif /* COMMON_GDB_SETJMP_H */
diff --git a/gdb/common/gdb_splay_tree.h b/gdb/common/gdb_splay_tree.h
index a3fc4679bad..90b05cdce17 100644
--- a/gdb/common/gdb_splay_tree.h
+++ b/gdb/common/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 GDB_SPLAY_TREE_H
-#define GDB_SPLAY_TREE_H
+#ifndef COMMON_GDB_SPLAY_TREE_H
+#define COMMON_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 /* ! GDB_SPLAY_TREE_H */
+#endif /* COMMON_GDB_SPLAY_TREE_H */
diff --git a/gdb/common/gdb_string_view.h b/gdb/common/gdb_string_view.h
index 001f1af6cda..68f7f7de36b 100644
--- a/gdb/common/gdb_string_view.h
+++ b/gdb/common/gdb_string_view.h
@@ -1,5 +1,9 @@
 // Components for manipulating non-owning sequences of characters -*- C++ -*-
 
+
+#ifndef COMMON_GDB_STRING_VIEW_H
+#define COMMON_GDB_STRING_VIEW_H
+
 // Note: This file has been stolen from the gcc repo
 // (libstdc++-v3/include/experimental/string_view) and has local modifications.
 
@@ -29,8 +33,6 @@
 // N3762 basic_string_view library
 //
 
-#ifndef GDB_STRING_VIEW_H
-#define GDB_STRING_VIEW_H 1
 
 #if __cplusplus >= 201703L
 
@@ -557,4 +559,4 @@ namespace gdb {
 
 #endif // __cplusplus < 201703L
 
-#endif /* GDB_STRING_VIEW_H */
+#endif /* COMMON_GDB_STRING_VIEW_H */
diff --git a/gdb/common/gdb_sys_time.h b/gdb/common/gdb_sys_time.h
index 7b4ee572534..66c2bb355ff 100644
--- a/gdb/common/gdb_sys_time.h
+++ b/gdb/common/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 GDB_SYS_TIME_H
-#define GDB_SYS_TIME_H
+#ifndef COMMON_GDB_SYS_TIME_H
+#define COMMON_GDB_SYS_TIME_H
 
 #include <sys/time.h>
 
@@ -35,4 +35,4 @@
 # undef gettimeofday
 #endif
 
-#endif /* #ifndef GDB_SYS_TIME_H */
+#endif /* COMMON_GDB_SYS_TIME_H */
diff --git a/gdb/common/gdb_tilde_expand.h b/gdb/common/gdb_tilde_expand.h
index 4f4c239c03b..b181b6a3e15 100644
--- a/gdb/common/gdb_tilde_expand.h
+++ b/gdb/common/gdb_tilde_expand.h
@@ -17,8 +17,8 @@
    You 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_TILDE_EXPAND_H
-#define GDB_TILDE_EXPAND_H
+#ifndef COMMON_GDB_TILDE_EXPAND_H
+#define COMMON_GDB_TILDE_EXPAND_H
 
 /* Perform path expansion (i.e., tilde expansion) on DIR, and return
    the full path.  */
@@ -28,4 +28,4 @@ extern std::string gdb_tilde_expand (const char *dir);
    gdb::unique_xmalloc_ptr<char>.  */
 extern gdb::unique_xmalloc_ptr<char> gdb_tilde_expand_up (const char *dir);
 
-#endif /* ! GDB_TILDE_EXPAND_H */
+#endif /* COMMON_GDB_TILDE_EXPAND_H */
diff --git a/gdb/common/gdb_unique_ptr.h b/gdb/common/gdb_unique_ptr.h
index 1e8ceb49fe4..327e1279296 100644
--- a/gdb/common/gdb_unique_ptr.h
+++ b/gdb/common/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 GDB_UNIQUE_PTR_H
-#define GDB_UNIQUE_PTR_H 1
+#ifndef COMMON_GDB_UNIQUE_PTR_H
+#define COMMON_GDB_UNIQUE_PTR_H
 
 #include <memory>
 
@@ -49,4 +49,4 @@ template<typename T> using unique_xmalloc_ptr
 
 } /* namespace gdb */
 
-#endif /* GDB_UNIQUE_PTR_H */
+#endif /* COMMON_GDB_UNIQUE_PTR_H */
diff --git a/gdb/common/gdb_unlinker.h b/gdb/common/gdb_unlinker.h
index e3be44bca00..193c2f847c9 100644
--- a/gdb/common/gdb_unlinker.h
+++ b/gdb/common/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 GDB_UNLINKER_H
-#define GDB_UNLINKER_H
+#ifndef COMMON_GDB_UNLINKER_H
+#define COMMON_GDB_UNLINKER_H
 
 namespace gdb
 {
@@ -57,4 +57,4 @@ class unlinker
 
 }
 
-#endif /* GDB_UNLINKER_H */
+#endif /* COMMON_GDB_UNLINKER_H */
diff --git a/gdb/common/gdb_vecs.h b/gdb/common/gdb_vecs.h
index 86803d4cb38..017bf9383dc 100644
--- a/gdb/common/gdb_vecs.h
+++ b/gdb/common/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 GDB_VECS_H
-#define GDB_VECS_H
+#ifndef COMMON_GDB_VECS_H
+#define COMMON_GDB_VECS_H
 
 #include "vec.h"
 
@@ -86,4 +86,4 @@ ordered_remove (std::vector<T> &vec, typename std::vector<T>::size_type ix)
   return removed;
 }
 
-#endif /* GDB_VECS_H */
+#endif /* COMMON_GDB_VECS_H */
diff --git a/gdb/common/gdb_wait.h b/gdb/common/gdb_wait.h
index b65dcd25a74..b3b752cf3a2 100644
--- a/gdb/common/gdb_wait.h
+++ b/gdb/common/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 GDB_WAIT_H
-#define GDB_WAIT_H
+#ifndef COMMON_GDB_WAIT_H
+#define COMMON_GDB_WAIT_H
 
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h> /* POSIX */
@@ -110,4 +110,4 @@
 #define __WCLONE	0x80000000 /* Wait for cloned process.  */
 #endif
 
-#endif
+#endif /* COMMON_GDB_WAIT_H */
diff --git a/gdb/common/host-defs.h b/gdb/common/host-defs.h
index e6878c97faf..dedd9b6fa99 100644
--- a/gdb/common/host-defs.h
+++ b/gdb/common/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 HOST_DEFS_H
-#define HOST_DEFS_H
+#ifndef COMMON_HOST_DEFS_H
+#define COMMON_HOST_DEFS_H
 
 #include <limits.h>
 
@@ -58,4 +58,4 @@
 #define SLASH_STRING "/"
 #endif
 
-#endif /* HOST_DEFS_H */
+#endif /* COMMON_HOST_DEFS_H */
diff --git a/gdb/common/job-control.h b/gdb/common/job-control.h
index 1d9cae01016..56eba97b9ee 100644
--- a/gdb/common/job-control.h
+++ b/gdb/common/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 JOB_CONTROL_H
-#define JOB_CONTROL_H
+#ifndef COMMON_JOB_CONTROL_H
+#define COMMON_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 /* ! JOB_CONTROL_H */
+#endif /* COMMON_JOB_CONTROL_H */
diff --git a/gdb/common/netstuff.h b/gdb/common/netstuff.h
index c0f85542094..0d39fb5eea8 100644
--- a/gdb/common/netstuff.h
+++ b/gdb/common/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 NETSTUFF_H
-#define NETSTUFF_H
+#ifndef COMMON_NETSTUFF_H
+#define COMMON_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 /* ! NETSTUFF_H */
+#endif /* COMMON_NETSTUFF_H */
diff --git a/gdb/common/observable.h b/gdb/common/observable.h
index 911013033e9..205c30382c6 100644
--- a/gdb/common/observable.h
+++ b/gdb/common/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/>.  */
 
-#if !defined (GDB_COMMON_OBSERVABLE_H)
-#define GDB_COMMON_OBSERVABLE_H
+#ifndef COMMON_OBSERVABLE_H
+#define COMMON_OBSERVABLE_H
 
 #include <algorithm>
 #include <functional>
@@ -116,4 +116,4 @@ private:
 
 } /* namespace gdb */
 
-#endif /* GDB_COMMON_OBSERVABLE_H */
+#endif /* COMMON_OBSERVABLE_H */
diff --git a/gdb/common/pathstuff.h b/gdb/common/pathstuff.h
index d43f337550f..c264e788840 100644
--- a/gdb/common/pathstuff.h
+++ b/gdb/common/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 PATHSTUFF_H
-#define PATHSTUFF_H
+#ifndef COMMON_PATHSTUFF_H
+#define COMMON_PATHSTUFF_H
 
 #include "common/byte-vector.h"
 
@@ -86,4 +86,4 @@ extern const char *get_shell ();
 
 extern gdb::char_vector make_temp_filename (const std::string &f);
 
-#endif /* PATHSTUFF_H */
+#endif /* COMMON_PATHSTUFF_H */
diff --git a/gdb/common/preprocessor.h b/gdb/common/preprocessor.h
index a7c33d0978e..cb735c34bbe 100644
--- a/gdb/common/preprocessor.h
+++ b/gdb/common/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_PREPROC_H
-#define COMMON_PREPROC_H
+#ifndef COMMON_PREPROCESSOR_H
+#define COMMON_PREPROCESSOR_H
 
 /* Generally useful preprocessor bits.  */
 
@@ -32,4 +32,4 @@
    includes commas to another macro.  */
 #define ESC_PARENS(...) __VA_ARGS__
 
-#endif /* COMMON_PREPROC */
+#endif /* COMMON_PREPROCESSOR_H */
diff --git a/gdb/common/print-utils.h b/gdb/common/print-utils.h
index 152bc5956c5..815b14cbed3 100644
--- a/gdb/common/print-utils.h
+++ b/gdb/common/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_CELLS_H
-#define COMMON_CELLS_H
+#ifndef COMMON_PRINT_UTILS_H
+#define COMMON_PRINT_UTILS_H
 
 /* How many characters (including the terminating null byte) fit in a
    cell.  */
@@ -79,4 +79,4 @@ extern const char *host_address_to_string_1 (const void *addr);
 
 extern char *get_print_cell (void);
 
-#endif /* COMMON_CELLS_H */
+#endif /* COMMON_PRINT_UTILS_H */
diff --git a/gdb/common/ptid.h b/gdb/common/ptid.h
index 16d1b64ce00..31440c8d7cd 100644
--- a/gdb/common/ptid.h
+++ b/gdb/common/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 PTID_H
-#define PTID_H
+#ifndef COMMON_PTID_H
+#define COMMON_PTID_H
 
 /* The ptid struct is a collection of the various "ids" necessary for
    identifying the inferior process/thread being debugged.  This
@@ -152,4 +152,4 @@ extern ptid_t null_ptid;
 
 extern ptid_t minus_one_ptid;
 
-#endif
+#endif /* COMMON_PTID_H */
diff --git a/gdb/common/queue.h b/gdb/common/queue.h
index ed95ce7771a..3bc9c7e212a 100644
--- a/gdb/common/queue.h
+++ b/gdb/common/queue.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef QUEUE_H
-#define QUEUE_H
+#ifndef COMMON_QUEUE_H
+#define COMMON_QUEUE_H
 
 /* These macros implement functions and structs for a general queue.
    Macro 'DEFINE_QUEUE_P(TYPEDEF)' is to define the new queue type for
@@ -295,4 +295,4 @@ extern void							\
   queue_ ## TYPE ## _remove_elem (QUEUE (TYPE) *q,		\
 				  QUEUE_ITER (TYPE) *iter);	\
 
-#endif /* QUEUE_H */
+#endif /* COMMON_QUEUE_H */
diff --git a/gdb/common/refcounted-object.h b/gdb/common/refcounted-object.h
index 629d728102d..4bf7fcf1c94 100644
--- a/gdb/common/refcounted-object.h
+++ b/gdb/common/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 REFCOUNTED_OBJECT_H
-#define REFCOUNTED_OBJECT_H
+#ifndef COMMON_REFCOUNTED_OBJECT_H
+#define COMMON_REFCOUNTED_OBJECT_H
 
 /* Base class of intrusively reference-countable objects.
    Incrementing and decrementing the reference count is an external
@@ -67,4 +67,4 @@ struct refcounted_object_ref_policy
   }
 };
 
-#endif /* REFCOUNTED_OBJECT_H */
+#endif /* COMMON_REFCOUNTED_OBJECT_H */
diff --git a/gdb/common/run-time-clock.h b/gdb/common/run-time-clock.h
index 2522ca396b2..9c15dd7ab12 100644
--- a/gdb/common/run-time-clock.h
+++ b/gdb/common/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 RUN_TIME_CLOCK_H
-#define RUN_TIME_CLOCK_H
+#ifndef COMMON_RUN_TIME_CLOCK_H
+#define COMMON_RUN_TIME_CLOCK_H
 
 #include <chrono>
 
@@ -72,4 +72,4 @@ struct run_time_clock
 		   system_cpu_time_clock::time_point &system) noexcept;
 };
 
-#endif
+#endif /* COMMON_RUN_TIME_CLOCK_H */
diff --git a/gdb/common/safe-iterator.h b/gdb/common/safe-iterator.h
index 18027c680e6..89aec01884f 100644
--- a/gdb/common/safe-iterator.h
+++ b/gdb/common/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 SAFE_ITERATOR_H
-#define SAFE_ITERATOR_H
+#ifndef COMMON_SAFE_ITERATOR_H
+#define COMMON_SAFE_ITERATOR_H
 
 /* A forward iterator that wraps Iterator, such that when iterating
    with iterator IT, it is possible to delete *IT without invalidating
@@ -90,4 +90,4 @@ private:
   Iterator m_end {};
 };
 
-#endif /* SAFE_ITERATOR_H */
+#endif /* COMMON_SAFE_ITERATOR_H */
diff --git a/gdb/common/scoped_fd.h b/gdb/common/scoped_fd.h
index 87b1f42fc06..bdd22f595a5 100644
--- a/gdb/common/scoped_fd.h
+++ b/gdb/common/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 SCOPED_FD_H
-#define SCOPED_FD_H
+#ifndef COMMON_SCOPED_FD_H
+#define COMMON_SCOPED_FD_H
 
 #include <unistd.h>
 #include "filestuff.h"
@@ -84,4 +84,4 @@ private:
   int m_fd;
 };
 
-#endif /* SCOPED_FD_H */
+#endif /* COMMON_SCOPED_FD_H */
diff --git a/gdb/common/scoped_mmap.h b/gdb/common/scoped_mmap.h
index 1c9d1025c26..763f40e201c 100644
--- a/gdb/common/scoped_mmap.h
+++ b/gdb/common/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 SCOPED_MMAP_H
-#define SCOPED_MMAP_H
+#ifndef COMMON_SCOPED_MMAP_H
+#define COMMON_SCOPED_MMAP_H
 
 #include "config.h"
 
@@ -92,4 +92,5 @@ private:
 scoped_mmap mmap_file (const char *filename);
 
 #endif /* HAVE_SYS_MMAN_H */
-#endif /* SCOPED_MMAP_H */
+
+#endif /* COMMON_SCOPED_MMAP_H */
diff --git a/gdb/common/scoped_restore.h b/gdb/common/scoped_restore.h
index 127752e99b6..54c3ff5f8a5 100644
--- a/gdb/common/scoped_restore.h
+++ b/gdb/common/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 SCOPED_RESTORE_H
-#define SCOPED_RESTORE_H
+#ifndef COMMON_SCOPED_RESTORE_H
+#define COMMON_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 /* SCOPED_RESTORE_H */
+#endif /* COMMON_SCOPED_RESTORE_H */
diff --git a/gdb/common/selftest.h b/gdb/common/selftest.h
index 0922bca9140..c566ec5f3db 100644
--- a/gdb/common/selftest.h
+++ b/gdb/common/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 SELFTEST_H
-#define SELFTEST_H
+#ifndef COMMON_SELFTEST_H
+#define COMMON_SELFTEST_H
 
 /* A test is just a function that does some checks and throws an
    exception if something has gone wrong.  */
@@ -70,4 +70,4 @@ extern void for_each_selftest (for_each_selftest_ftype func);
       error (_("self-test failed at %s:%d"), __FILE__, __LINE__);	\
   } while (0)
 
-#endif /* SELFTEST_H */
+#endif /* COMMON_SELFTEST_H */
diff --git a/gdb/common/tdesc.h b/gdb/common/tdesc.h
index 4db547303c5..a0bc6339e26 100644
--- a/gdb/common/tdesc.h
+++ b/gdb/common/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 ARCH_TDESC_H
-#define ARCH_TDESC_H 1
+#ifndef COMMON_TDESC_H
+#define COMMON_TDESC_H
 
 struct tdesc_feature;
 struct tdesc_type;
@@ -404,4 +404,4 @@ private:
   std::string *m_buffer;
 };
 
-#endif /* ARCH_TDESC_H */
+#endif /* COMMON_TDESC_H */
diff --git a/gdb/common/vec.h b/gdb/common/vec.h
index d4e4c027042..8ac146d4903 100644
--- a/gdb/common/vec.h
+++ b/gdb/common/vec.h
@@ -17,8 +17,8 @@
    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_VEC_H)
-#define GDB_VEC_H
+#ifndef COMMON_VEC_H
+#define COMMON_VEC_H
 
 #include "diagnostics.h"
 
@@ -1147,4 +1147,4 @@ static inline T *VEC_OP (T,safe_insert)					  \
   return VEC_OP (T,quick_insert) (*vec_, ix_, obj_ VEC_ASSERT_PASS);	  \
 }
 
-#endif /* GDB_VEC_H */
+#endif /* COMMON_VEC_H */
diff --git a/gdb/common/version.h b/gdb/common/version.h
index c804f472eaa..9e840e72b4d 100644
--- a/gdb/common/version.h
+++ b/gdb/common/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 VERSION_H
-#define VERSION_H
+#ifndef COMMON_VERSION_H
+#define COMMON_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 /* #ifndef VERSION_H */
+#endif /* COMMON_VERSION_H */
diff --git a/gdb/common/x86-xstate.h b/gdb/common/x86-xstate.h
index 7f378bd9d8a..4ce8f61e394 100644
--- a/gdb/common/x86-xstate.h
+++ b/gdb/common/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 X86_XSTATE_H
-#define X86_XSTATE_H 1
+#ifndef COMMON_X86_XSTATE_H
+#define COMMON_X86_XSTATE_H
 
 /* The extended state feature bits.  */
 #define X86_XSTATE_X87		(1ULL << 0)
@@ -85,4 +85,4 @@
 
 #define I387_MXCSR_INIT_VAL 0x1f80
 
-#endif /* X86_XSTATE_H */
+#endif /* COMMON_X86_XSTATE_H */
diff --git a/gdb/common/xml-utils.h b/gdb/common/xml-utils.h
index 4cc47d9c2f5..747e8c8a481 100644
--- a/gdb/common/xml-utils.h
+++ b/gdb/common/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 XML_UTILS_H
-#define XML_UTILS_H
+#ifndef COMMON_XML_UTILS_H
+#define COMMON_XML_UTILS_H
 
 /* Return a string with special characters from TEXT replaced by entity
    references.  */
@@ -30,4 +30,4 @@ extern std::string xml_escape_text (const char *text);
 
 extern void xml_escape_text_append (std::string *result, const char *text);
 
-#endif
+#endif /* COMMON_XML_UTILS_H */
diff --git a/gdb/compile/compile-c.h b/gdb/compile/compile-c.h
index ecb69df00aa..b5a2194dbbb 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 GDB_COMPILE_C_H
-#define GDB_COMPILE_C_H
+#ifndef COMPILE_COMPILE_C_H
+#define COMPILE_COMPILE_C_H
 
 #include "common/enum-flags.h"
 #include "gcc-c-plugin.h"
@@ -92,4 +92,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 /* GDB_COMPILE_C_H  */
+#endif /* COMPILE_COMPILE_C_H */
diff --git a/gdb/compile/compile-cplus.h b/gdb/compile/compile-cplus.h
index 89799425734..e5ea7d7c81a 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 GDB_COMPILE_CPLUS_H
-#define GDB_COMPILE_CPLUS_H
+#ifndef COMPILE_COMPILE_CPLUS_H
+#define COMPILE_COMPILE_CPLUS_H
 
 #include "common/enum-flags.h"
 #include "gcc-cp-plugin.h"
@@ -202,4 +202,4 @@ private:
 enum gcc_cp_symbol_kind get_method_access_flag (const struct type *type,
 						int fni, int num);
 
-#endif /* GDB_COMPILE_CPLUS_H  */
+#endif /* COMPILE_COMPILE_CPLUS_H */
diff --git a/gdb/compile/compile-internal.h b/gdb/compile/compile-internal.h
index 90e829259d9..406a369d683 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 GDB_COMPILE_INTERNAL_H
-#define GDB_COMPILE_INTERNAL_H
+#ifndef COMPILE_COMPILE_INTERNAL_H
+#define COMPILE_COMPILE_INTERNAL_H
 
 #include "gcc-c-interface.h"
 
@@ -207,4 +207,4 @@ private:
   std::string m_object_file;
 };
 
-#endif /* GDB_COMPILE_INTERNAL_H */
+#endif /* COMPILE_COMPILE_INTERNAL_H */
diff --git a/gdb/compile/compile-object-load.h b/gdb/compile/compile-object-load.h
index 33cc2927c1a..730164faa43 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 GDB_COMPILE_OBJECT_LOAD_H
-#define GDB_COMPILE_OBJECT_LOAD_H
+#ifndef COMPILE_COMPILE_OBJECT_LOAD_H
+#define COMPILE_COMPILE_OBJECT_LOAD_H
 
 #include "compile-internal.h"
 #include <list>
@@ -82,4 +82,4 @@ extern struct compile_module *compile_object_load
    enum compile_i_scope_types scope, void *scope_data);
 extern void munmap_list_free (struct munmap_list *head);
 
-#endif /* GDB_COMPILE_OBJECT_LOAD_H */
+#endif /* COMPILE_COMPILE_OBJECT_LOAD_H */
diff --git a/gdb/compile/compile-object-run.h b/gdb/compile/compile-object-run.h
index 0124095b24a..f8c1ef454c4 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 GDB_COMPILE_OBJECT_RUN_H
-#define GDB_COMPILE_OBJECT_RUN_H
+#ifndef COMPILE_COMPILE_OBJECT_RUN_H
+#define COMPILE_COMPILE_OBJECT_RUN_H
 
 #include "compile-object-load.h"
 
 extern void compile_object_run (struct compile_module *module);
 
-#endif /* GDB_COMPILE_OBJECT_RUN_H */
+#endif /* COMPILE_COMPILE_OBJECT_RUN_H */
diff --git a/gdb/compile/compile.h b/gdb/compile/compile.h
index 88bd8d8591f..127d8675bd4 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 GDB_COMPILE_H
-#define GDB_COMPILE_H
+#ifndef COMPILE_COMPILE_H
+#define COMPILE_COMPILE_H
 
 struct ui_file;
 struct gdbarch;
@@ -106,4 +106,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 /* GDB_COMPILE_H */
+#endif /* COMPILE_COMPILE_H */
diff --git a/gdb/compile/gcc-c-plugin.h b/gdb/compile/gcc-c-plugin.h
index 9ec78e2725c..12869f3cf9c 100644
--- a/gdb/compile/gcc-c-plugin.h
+++ b/gdb/compile/gcc-c-plugin.h
@@ -17,6 +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 COMPILE_GCC_C_PLUGIN_H
+#define COMPILE_GCC_C_PLUGIN_H
+
 #include "compile-internal.h"
 
 /* A class representing the C plug-in.  */
@@ -64,3 +67,5 @@ private:
   /* The GCC C context.  */
   struct gcc_c_context *m_context;
 };
+
+#endif /* COMPILE_GCC_C_PLUGIN_H */
diff --git a/gdb/compile/gcc-cp-plugin.h b/gdb/compile/gcc-cp-plugin.h
index f7ba494f340..0f0d01f1daf 100644
--- a/gdb/compile/gcc-cp-plugin.h
+++ b/gdb/compile/gcc-cp-plugin.h
@@ -17,6 +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 COMPILE_GCC_CP_PLUGIN_H
+#define COMPILE_GCC_CP_PLUGIN_H
+
 /* A class representing the GCC C++ plug-in.  */
 
 #include "gcc-cp-interface.h"
@@ -83,3 +86,5 @@ private:
   /* The GCC C++ context.  */
   struct gcc_cp_context *m_context;
 };
+
+#endif /* COMPILE_GCC_CP_PLUGIN_H */
diff --git a/gdb/config/djgpp/langinfo.h b/gdb/config/djgpp/langinfo.h
index 2c4a900dd2d..6a692024185 100644
--- a/gdb/config/djgpp/langinfo.h
+++ b/gdb/config/djgpp/langinfo.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef _LANGINFO_H
-#define _LANGINFO_H
+#ifndef CONFIG_DJGPP_LANGINFO_H
+#define CONFIG_DJGPP_LANGINFO_H
 
 #include <nl_types.h>
 
@@ -32,4 +32,4 @@ enum {
 
 extern char *nl_langinfo (nl_item);
 
-#endif /* _LANGINFO_H */
+#endif /* CONFIG_DJGPP_LANGINFO_H */
diff --git a/gdb/config/djgpp/nl_types.h b/gdb/config/djgpp/nl_types.h
index fc9445f6a56..f0020b5adb6 100644
--- a/gdb/config/djgpp/nl_types.h
+++ b/gdb/config/djgpp/nl_types.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 _NL_TYPES_H
-#define _NL_TYPES_H
+#ifndef CONFIG_DJGPP_NL_TYPES_H
+#define CONFIG_DJGPP_NL_TYPES_H
 
 typedef int nl_item;
 
-#endif	/* _NL_TYPES_H */
+#endif /* CONFIG_DJGPP_NL_TYPES_H */
diff --git a/gdb/config/i386/nm-i386gnu.h b/gdb/config/i386/nm-i386gnu.h
index 8c157c256f4..99f3fc79a08 100644
--- a/gdb/config/i386/nm-i386gnu.h
+++ b/gdb/config/i386/nm-i386gnu.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 NM_I386GNU_H
-#define NM_I386GNU_H
+#ifndef CONFIG_I386_NM_I386GNU_H
+#define CONFIG_I386_NM_I386GNU_H
 
 #include <unistd.h>
 #include <mach.h>
@@ -34,4 +34,4 @@ extern char *gnu_target_pid_to_str (int pid);
 #define THREAD_STATE_CLEAR_TRACED(state) \
   	((((struct i386_thread_state *) (state))->efl &= ~0x100), 1)
 
-#endif /* nm-i386gnu.h */
+#endif /* CONFIG_I386_NM_I386GNU_H */
diff --git a/gdb/config/nm-linux.h b/gdb/config/nm-linux.h
index bc3e360390a..76502ff632c 100644
--- a/gdb/config/nm-linux.h
+++ b/gdb/config/nm-linux.h
@@ -17,8 +17,13 @@
    You 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
+
 /* Use elf_gregset_t and elf_fpregset_t, rather than
    gregset_t and fpregset_t.  */
 
 #define GDB_GREGSET_T  elf_gregset_t
 #define GDB_FPREGSET_T elf_fpregset_t
+
+#endif /* CONFIG_NM_LINUX_H */
diff --git a/gdb/config/nm-nto.h b/gdb/config/nm-nto.h
index 6ee68866770..2d43ffaae4b 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 NM_NTO_H
-#define NM_NTO_H
+#ifndef CONFIG_NM_NTO_H
+#define CONFIG_NM_NTO_H
 
 /* Setup the valid realtime signal range.  */
 #define REALTIME_LO 41
 #define REALTIME_HI 56
 
-#endif /* NM_NTO_H */
+#endif /* CONFIG_NM_NTO_H */
diff --git a/gdb/config/sparc/nm-sol2.h b/gdb/config/sparc/nm-sol2.h
index fdae224b530..02cd9d09a25 100644
--- a/gdb/config/sparc/nm-sol2.h
+++ b/gdb/config/sparc/nm-sol2.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 NM_SOL2_H
-#define NM_SOL2_H
+#ifndef CONFIG_SPARC_NM_SOL2_H
+#define CONFIG_SPARC_NM_SOL2_H
 
 #define GDB_GREGSET_T prgregset_t
 #define GDB_FPREGSET_T prfpregset_t
 
-#endif /* nm-sol2.h */
+#endif /* CONFIG_SPARC_NM_SOL2_H */
diff --git a/gdb/cp-abi.h b/gdb/cp-abi.h
index fa17770d8bf..3cbf19cd511 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_ 1
+#ifndef CP_ABI_H
+#define CP_ABI_H
 
 struct fn_field;
 struct type;
@@ -253,5 +253,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
-
+#endif /* CP_ABI_H */
diff --git a/gdb/darwin-nat.h b/gdb/darwin-nat.h
index e4d8a5dbed5..f33e25316f5 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 DARWIN_NAT_H
+#define DARWIN_NAT_H
 
 #include "inf-child.h"
 #include <mach/mach.h>
@@ -201,4 +201,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 /* DARWIN_NAT_H */
diff --git a/gdb/event-loop.h b/gdb/event-loop.h
index c4f594643ec..99b776618bd 100644
--- a/gdb/event-loop.h
+++ b/gdb/event-loop.h
@@ -17,6 +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 EVENT_LOOP_H
+#define 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
    appropriate event handler.  The event loop then continues to listen
@@ -127,3 +130,5 @@ extern void mark_async_event_handler (struct async_event_handler *handler);
 extern void clear_async_event_handler (struct async_event_handler *handler);
 
 extern void initialize_async_signal_handlers (void);
+
+#endif /* EVENT_LOOP_H */
diff --git a/gdb/f-lang.h b/gdb/f-lang.h
index cab06f9806d..a4ae6a726d9 100644
--- a/gdb/f-lang.h
+++ b/gdb/f-lang.h
@@ -20,6 +20,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 F_LANG_H
+#define F_LANG_H
+
 struct type_print_options;
 struct parser_state;
 
@@ -79,3 +82,4 @@ struct builtin_f_type
 /* Return the Fortran type table for the specified architecture.  */
 extern const struct builtin_f_type *builtin_f_type (struct gdbarch *gdbarch);
 
+#endif /* F_LANG_H */
diff --git a/gdb/frv-tdep.h b/gdb/frv-tdep.h
index 551ca6b4a60..6b5cc7f90dd 100644
--- a/gdb/frv-tdep.h
+++ b/gdb/frv-tdep.h
@@ -16,6 +16,9 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef FRV_TDEP_H
+#define FRV_TDEP_H
+
 /* Enumerate the possible ABIs for FR-V.  */
 enum frv_abi
   {
@@ -118,3 +121,4 @@ CORE_ADDR frv_fetch_objfile_link_map (struct objfile *objfile);
 struct target_so_ops;
 extern struct target_so_ops frv_so_ops;
 
+#endif /* FRV_TDEP_H */
diff --git a/gdb/gdb-stabs.h b/gdb/gdb-stabs.h
index 6ee073d32a3..3b64d328f5c 100644
--- a/gdb/gdb-stabs.h
+++ b/gdb/gdb-stabs.h
@@ -17,14 +17,15 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef GDB_STABS_H
+#define 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
    these `symbol-type-specific' customizations of the generic data
    structures makes the stabs-oriented symbol readers able to call
    each others' functions as required.  */
 
-#if !defined (GDBSTABS_H)
-#define GDBSTABS_H
 
 /* The tag used to find the DBX info attached to an objfile.  This is
    global because it is referenced by several modules.  */
@@ -73,4 +74,4 @@ struct dbx_symfile_info
 #define DBX_BSS_SECTION(o)	(DBX_SYMFILE_INFO(o)->bss_section)
 #define DBX_STAB_SECTION(o)	(DBX_SYMFILE_INFO(o)->stab_section)
 
-#endif /* GDBSTABS_H */
+#endif /* GDB_STABS_H */
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index be9a26302b2..17593cb8c24 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,36 @@
+2019-02-07  Tom Tromey  <tom@tromey.com>
+
+	* x86-tdesc.h: Rename include guard.
+	* x86-low.h: Add include guard.
+	* wincecompat.h: Rename include guard.
+	* win32-low.h: Add include guard.
+	* utils.h: Rename include guard.
+	* tracepoint.h: Rename include guard.
+	* tdesc.h: Rename include guard.
+	* target.h: Rename include guard.
+	* server.h: Rename include guard.
+	* remote-utils.h: Rename include guard.
+	* regcache.h: Rename include guard.
+	* nto-low.h: Rename include guard.
+	* notif.h: Add include guard.
+	* mem-break.h: Rename include guard.
+	* lynx-low.h: Add include guard.
+	* linux-x86-tdesc.h: Add include guard.
+	* linux-s390-tdesc.h: Add include guard.
+	* linux-ppc-tdesc-init.h: Add include guard.
+	* linux-low.h: Add include guard.
+	* linux-aarch64-tdesc.h: Add include guard.
+	* linux-aarch32-low.h: Add include guard.
+	* inferiors.h: Rename include guard.
+	* i387-fp.h: Rename include guard.
+	* hostio.h: Rename include guard.
+	* gdbthread.h: Rename include guard.
+	* gdb_proc_service.h: Rename include guard.
+	* event-loop.h: Rename include guard.
+	* dll.h: Rename include guard.
+	* debug.h: Rename include guard.
+	* ax.h: Rename include guard.
+
 2018-01-30  Szabolcs Nagy  <szabolcs.nagy@arm.com>
 
 	PR gdb/23985
diff --git a/gdb/gdbserver/ax.h b/gdb/gdbserver/ax.h
index fd968341ce8..3e9fd8f795c 100644
--- a/gdb/gdbserver/ax.h
+++ b/gdb/gdbserver/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/>.  */
 
-#if !defined (AX_H)
-#define AX_H 1
+#ifndef GDBSERVER_AX_H
+#define GDBSERVER_AX_H
 
 #include "regcache.h"
 
@@ -142,4 +142,4 @@ struct emit_ops
 extern CORE_ADDR current_insn_ptr;
 extern int emit_error;
 
-#endif /* AX_H */
+#endif /* GDBSERVER_AX_H */
diff --git a/gdb/gdbserver/debug.h b/gdb/gdbserver/debug.h
index 041945a317e..e40f28c7716 100644
--- a/gdb/gdbserver/debug.h
+++ b/gdb/gdbserver/debug.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 DEBUG_H
-#define DEBUG_H
+#ifndef GDBSERVER_DEBUG_H
+#define GDBSERVER_DEBUG_H
 
 /* We declare debug format variables here, and debug_threads but no other
    debug content variables (e.g., not remote_debug) because while this file
@@ -51,4 +51,4 @@ void do_debug_exit (const char *function_name);
   do { } while (0)
 #endif
 
-#endif /* DEBUG_H */
+#endif /* GDBSERVER_DEBUG_H */
diff --git a/gdb/gdbserver/dll.h b/gdb/gdbserver/dll.h
index 4dad56b7410..fd45d73d5f3 100644
--- a/gdb/gdbserver/dll.h
+++ b/gdb/gdbserver/dll.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 DLL_H
-#define DLL_H
+#ifndef GDBSERVER_DLL_H
+#define GDBSERVER_DLL_H
 
 #include <list>
 
@@ -37,4 +37,4 @@ extern void clear_dlls (void);
 extern void loaded_dll (const char *name, CORE_ADDR base_addr);
 extern void unloaded_dll (const char *name, CORE_ADDR base_addr);
 
-#endif /* DLL_H */
+#endif /* GDBSERVER_DLL_H */
diff --git a/gdb/gdbserver/event-loop.h b/gdb/gdbserver/event-loop.h
index 39135a427b8..a09a6ad4355 100644
--- a/gdb/gdbserver/event-loop.h
+++ b/gdb/gdbserver/event-loop.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 EVENT_LOOP_H
-#define EVENT_LOOP_H
+#ifndef GDBSERVER_EVENT_LOOP_H
+#define GDBSERVER_EVENT_LOOP_H
 
 typedef void *gdb_client_data;
 typedef int (handler_func) (int, gdb_client_data);
@@ -33,4 +33,4 @@ extern void delete_callback_event (int id);
 extern void start_event_loop (void);
 extern void initialize_event_loop (void);
 
-#endif /* EVENT_LOOP_H */
+#endif /* GDBSERVER_EVENT_LOOP_H */
diff --git a/gdb/gdbserver/gdb_proc_service.h b/gdb/gdbserver/gdb_proc_service.h
index 03e6a068d59..626bc164fe3 100644
--- a/gdb/gdbserver/gdb_proc_service.h
+++ b/gdb/gdbserver/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 GDBSERVER_GDB_PROC_SERVICE_H
+#define GDBSERVER_GDB_PROC_SERVICE_H
 
 #include "common/gdb_proc_service.h"
 
@@ -28,4 +28,4 @@ struct ps_prochandle
      current inferior.  */
 };
 
-#endif /* gdb_proc_service.h */
+#endif /* GDBSERVER_GDB_PROC_SERVICE_H */
diff --git a/gdb/gdbserver/gdbthread.h b/gdb/gdbserver/gdbthread.h
index fcd02029e7d..44ed3c4723c 100644
--- a/gdb/gdbserver/gdbthread.h
+++ b/gdb/gdbserver/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 GDB_THREAD_H
-#define GDB_THREAD_H
+#ifndef GDBSERVER_GDBTHREAD_H
+#define GDBSERVER_GDBTHREAD_H
 
 #include "common/common-gdbthread.h"
 #include "inferiors.h"
@@ -224,4 +224,4 @@ lwpid_of (const thread_info *thread)
   return thread->id.lwp ();
 }
 
-#endif /* GDB_THREAD_H */
+#endif /* GDBSERVER_GDBTHREAD_H */
diff --git a/gdb/gdbserver/hostio.h b/gdb/gdbserver/hostio.h
index acddef2bed8..17a2bea6e66 100644
--- a/gdb/gdbserver/hostio.h
+++ b/gdb/gdbserver/hostio.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 HOSTIO_H
-#define HOSTIO_H
+#ifndef GDBSERVER_HOSTIO_H
+#define GDBSERVER_HOSTIO_H
 
 /* Per-connection setup.  */
 extern void hostio_handle_new_gdb_connection (void);
@@ -28,4 +28,4 @@ extern int handle_vFile (char *, int, int *);
 /* Functions from hostio-errno.c.  */
 extern void hostio_last_error_from_errno (char *own_buf);
 
-#endif /* HOSTIO_H */
+#endif /* GDBSERVER_HOSTIO_H */
diff --git a/gdb/gdbserver/i387-fp.h b/gdb/gdbserver/i387-fp.h
index f3319924721..e5eaedfe2fa 100644
--- a/gdb/gdbserver/i387-fp.h
+++ b/gdb/gdbserver/i387-fp.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 I387_FP_H
-#define I387_FP_H
+#ifndef GDBSERVER_I387_FP_H
+#define GDBSERVER_I387_FP_H
 
 void i387_cache_to_fsave (struct regcache *regcache, void *buf);
 void i387_fsave_to_cache (struct regcache *regcache, const void *buf);
@@ -30,4 +30,4 @@ void i387_xsave_to_cache (struct regcache *regcache, const void *buf);
 
 extern unsigned long long x86_xcr0;
 
-#endif /* I387_FP_H */
+#endif /* GDBSERVER_I387_FP_H */
diff --git a/gdb/gdbserver/inferiors.h b/gdb/gdbserver/inferiors.h
index b2a18663354..cf284b807bb 100644
--- a/gdb/gdbserver/inferiors.h
+++ b/gdb/gdbserver/inferiors.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 INFERIORS_H
-#define INFERIORS_H
+#ifndef GDBSERVER_INFERIORS_H
+#define GDBSERVER_INFERIORS_H
 
 #include "common/gdb_vecs.h"
 #include <list>
@@ -144,4 +144,4 @@ void *thread_target_data (struct thread_info *);
 struct regcache *thread_regcache_data (struct thread_info *);
 void set_thread_regcache_data (struct thread_info *, struct regcache *);
 
-#endif /* INFERIORS_H */
+#endif /* GDBSERVER_INFERIORS_H */
diff --git a/gdb/gdbserver/linux-aarch32-low.h b/gdb/gdbserver/linux-aarch32-low.h
index 64f6848fee5..44e626c7199 100644
--- a/gdb/gdbserver/linux-aarch32-low.h
+++ b/gdb/gdbserver/linux-aarch32-low.h
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef GDBSERVER_LINUX_AARCH32_LOW_H
+#define GDBSERVER_LINUX_AARCH32_LOW_H
+
 extern struct regs_info regs_info_aarch32;
 
 void arm_fill_gregset (struct regcache *regcache, void *buf);
@@ -34,3 +37,5 @@ void init_registers_arm_with_neon (void);
 int arm_is_thumb_mode (void);
 
 extern const struct target_desc *tdesc_arm_with_neon;
+
+#endif /* GDBSERVER_LINUX_AARCH32_LOW_H */
diff --git a/gdb/gdbserver/linux-aarch64-tdesc.h b/gdb/gdbserver/linux-aarch64-tdesc.h
index a23b6b6dd6e..7ce81506636 100644
--- a/gdb/gdbserver/linux-aarch64-tdesc.h
+++ b/gdb/gdbserver/linux-aarch64-tdesc.h
@@ -17,8 +17,13 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef GDBSERVER_LINUX_AARCH64_TDESC_H
+#define GDBSERVER_LINUX_AARCH64_TDESC_H
+
 const target_desc * aarch64_linux_read_description (uint64_t vq);
 
 #if GDB_SELF_TEST
 void initialize_low_tdesc ();
 #endif
+
+#endif /* GDBSERVER_LINUX_AARCH64_TDESC_H */
diff --git a/gdb/gdbserver/linux-low.h b/gdb/gdbserver/linux-low.h
index b99236f7d93..d09390dd99d 100644
--- a/gdb/gdbserver/linux-low.h
+++ b/gdb/gdbserver/linux-low.h
@@ -16,6 +16,9 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef GDBSERVER_LINUX_LOW_H
+#define GDBSERVER_LINUX_LOW_H
+
 #include "nat/linux-nat.h"
 #include "nat/gdb_thread_db.h"
 #include <signal.h>
@@ -430,3 +433,5 @@ void thread_db_notice_clone (struct thread_info *parent_thr, ptid_t child_ptid);
 bool thread_db_thread_handle (ptid_t ptid, gdb_byte **handle, int *handle_len);
 
 extern int have_ptrace_getregset;
+
+#endif /* GDBSERVER_LINUX_LOW_H */
diff --git a/gdb/gdbserver/linux-ppc-tdesc-init.h b/gdb/gdbserver/linux-ppc-tdesc-init.h
index 16f5b9ca9ea..4f9a7c5009b 100644
--- a/gdb/gdbserver/linux-ppc-tdesc-init.h
+++ b/gdb/gdbserver/linux-ppc-tdesc-init.h
@@ -17,6 +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 GDBSERVER_LINUX_PPC_TDESC_INIT_H
+#define GDBSERVER_LINUX_PPC_TDESC_INIT_H
+
 /* Note: since IPA obviously knows what ABI it's running on (32 vs 64),
    it's sufficient to pass only the register set here.  This, together with
    the ABI known at IPA compile time, maps to a tdesc.  */
@@ -105,3 +108,5 @@ void init_registers_powerpc_isa207_vsx64l (void);
 void init_registers_powerpc_isa207_htm_vsx64l (void);
 
 #endif
+
+#endif /* GDBSERVER_LINUX_PPC_TDESC_INIT_H */
diff --git a/gdb/gdbserver/linux-s390-tdesc.h b/gdb/gdbserver/linux-s390-tdesc.h
index cf1021a83fd..dc05fcdfe01 100644
--- a/gdb/gdbserver/linux-s390-tdesc.h
+++ b/gdb/gdbserver/linux-s390-tdesc.h
@@ -17,6 +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 GDBSERVER_LINUX_S390_TDESC_H
+#define GDBSERVER_LINUX_S390_TDESC_H
+
 /* Note: since IPA obviously knows what ABI it's running on (s390 vs s390x),
    it's sufficient to pass only the register set here.  This, together with
    the ABI known at IPA compile time, maps to a tdesc.  */
@@ -109,3 +112,5 @@ void init_registers_s390_gs_linux64 (void);
 extern const struct target_desc *tdesc_s390_gs_linux64;
 
 #endif
+
+#endif /* GDBSERVER_LINUX_S390_TDESC_H */
diff --git a/gdb/gdbserver/linux-x86-tdesc.h b/gdb/gdbserver/linux-x86-tdesc.h
index ac4199e4fdf..5f1fb18458c 100644
--- a/gdb/gdbserver/linux-x86-tdesc.h
+++ b/gdb/gdbserver/linux-x86-tdesc.h
@@ -18,6 +18,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 GDBSERVER_LINUX_X86_TDESC_H
+#define GDBSERVER_LINUX_X86_TDESC_H
+
 /* Note: since IPA obviously knows what ABI it's running on (i386 vs x86_64
    vs x32), it's sufficient to pass only the register set here.  This,
    together with the ABI known at IPA compile time, maps to a tdesc.  */
@@ -51,3 +54,5 @@ const struct target_desc *amd64_linux_read_description (uint64_t xcr0,
 const struct target_desc *i386_linux_read_description (uint64_t xcr0);
 
 void initialize_low_tdesc ();
+
+#endif /* GDBSERVER_LINUX_X86_TDESC_H */
diff --git a/gdb/gdbserver/lynx-low.h b/gdb/gdbserver/lynx-low.h
index 8a842040bf5..506d6cb1047 100644
--- a/gdb/gdbserver/lynx-low.h
+++ b/gdb/gdbserver/lynx-low.h
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef GDBSERVER_LYNX_LOW_H
+#define GDBSERVER_LYNX_LOW_H
+
 struct regcache;
 struct target_desc;
 
@@ -52,3 +55,5 @@ extern struct lynx_target_ops the_low_target;
 /* The inferior's target description.  This is a global because the
    LynxOS ports support neither bi-arch nor multi-process.  */
 extern const struct target_desc *lynx_tdesc;
+
+#endif /* GDBSERVER_LYNX_LOW_H */
diff --git a/gdb/gdbserver/mem-break.h b/gdb/gdbserver/mem-break.h
index 49cdfeaa25b..d2d75104f33 100644
--- a/gdb/gdbserver/mem-break.h
+++ b/gdb/gdbserver/mem-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 MEM_BREAK_H
-#define MEM_BREAK_H
+#ifndef GDBSERVER_MEM_BREAK_H
+#define GDBSERVER_MEM_BREAK_H
 
 #include "common/break-common.h"
 
@@ -276,4 +276,4 @@ int remove_memory_breakpoint (struct raw_breakpoint *bp);
 void clone_all_breakpoints (struct thread_info *child_thread,
 			    const struct thread_info *parent_thread);
 
-#endif /* MEM_BREAK_H */
+#endif /* GDBSERVER_MEM_BREAK_H */
diff --git a/gdb/gdbserver/notif.h b/gdb/gdbserver/notif.h
index add55360ddd..7d0767935bc 100644
--- a/gdb/gdbserver/notif.h
+++ b/gdb/gdbserver/notif.h
@@ -16,6 +16,9 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef GDBSERVER_NOTIF_H
+#define GDBSERVER_NOTIF_H
+
 #include "target.h"
 #include "common/queue.h"
 
@@ -62,3 +65,5 @@ void notif_event_enque (struct notif_server *notif,
 			struct notif_event *event);
 
 void initialize_notif (void);
+
+#endif /* GDBSERVER_NOTIF_H */
diff --git a/gdb/gdbserver/nto-low.h b/gdb/gdbserver/nto-low.h
index 6114525c8ea..61981c6ce66 100644
--- a/gdb/gdbserver/nto-low.h
+++ b/gdb/gdbserver/nto-low.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 NTO_LOW_H
-#define NTO_LOW_H
+#ifndef GDBSERVER_NTO_LOW_H
+#define GDBSERVER_NTO_LOW_H
 
 struct target_desc;
 
@@ -46,5 +46,4 @@ extern struct nto_target_ops the_low_target;
    LynxOS ports support neither bi-arch nor multi-process.  */
 extern const struct target_desc *nto_tdesc;
 
-#endif
-
+#endif /* GDBSERVER_NTO_LOW_H */
diff --git a/gdb/gdbserver/regcache.h b/gdb/gdbserver/regcache.h
index 98c3131624e..5ee44788dcd 100644
--- a/gdb/gdbserver/regcache.h
+++ b/gdb/gdbserver/regcache.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 REGCACHE_H
-#define REGCACHE_H
+#ifndef GDBSERVER_REGCACHE_H
+#define GDBSERVER_REGCACHE_H
 
 #include "common/common-regcache.h"
 
@@ -138,4 +138,4 @@ void collect_register_by_name (struct regcache *regcache,
 ULONGEST regcache_raw_get_unsigned_by_name (struct regcache *regcache,
 					    const char *name);
 
-#endif /* REGCACHE_H */
+#endif /* GDBSERVER_REGCACHE_H */
diff --git a/gdb/gdbserver/remote-utils.h b/gdb/gdbserver/remote-utils.h
index ca176b7ddda..587afdb0283 100644
--- a/gdb/gdbserver/remote-utils.h
+++ b/gdb/gdbserver/remote-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 REMOTE_UTILS_H
-#define REMOTE_UTILS_H
+#ifndef GDBSERVER_REMOTE_UTILS_H
+#define GDBSERVER_REMOTE_UTILS_H
 
 extern int remote_debug;
 
@@ -69,4 +69,4 @@ int relocate_instruction (CORE_ADDR *to, CORE_ADDR oldloc);
 
 void monitor_output (const char *msg);
 
-#endif /* REMOTE_UTILS_H */
+#endif /* GDBSERVER_REMOTE_UTILS_H */
diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index 26d0dfb0ebf..400001addd3 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.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 SERVER_H
-#define SERVER_H
+#ifndef GDBSERVER_SERVER_H
+#define GDBSERVER_SERVER_H
 
 #include "common/common-defs.h"
 
@@ -205,4 +205,4 @@ client_state &get_client_state ();
 #include "gdbthread.h"
 #include "inferiors.h"
 
-#endif /* SERVER_H */
+#endif /* GDBSERVER_SERVER_H */
diff --git a/gdb/gdbserver/target.h b/gdb/gdbserver/target.h
index 225edd05df6..a4c9ad49106 100644
--- a/gdb/gdbserver/target.h
+++ b/gdb/gdbserver/target.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 TARGET_H
-#define TARGET_H
+#ifndef GDBSERVER_TARGET_H
+#define GDBSERVER_TARGET_H
 
 #include <sys/types.h> /* for mode_t */
 #include "target/target.h"
@@ -737,4 +737,4 @@ int target_can_do_hardware_single_step (void);
 
 int default_breakpoint_kind_from_pc (CORE_ADDR *pcptr);
 
-#endif /* TARGET_H */
+#endif /* GDBSERVER_TARGET_H */
diff --git a/gdb/gdbserver/tdesc.h b/gdb/gdbserver/tdesc.h
index fe66408e15c..8ccacbb7ed4 100644
--- a/gdb/gdbserver/tdesc.h
+++ b/gdb/gdbserver/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 TDESC_H
-#define TDESC_H
+#ifndef GDBSERVER_TDESC_H
+#define GDBSERVER_TDESC_H
 
 #include "common/tdesc.h"
 
@@ -93,4 +93,4 @@ void init_target_desc (struct target_desc *tdesc,
 
 const struct target_desc *current_target_desc (void);
 
-#endif /* TDESC_H */
+#endif /* GDBSERVER_TDESC_H */
diff --git a/gdb/gdbserver/tracepoint.h b/gdb/gdbserver/tracepoint.h
index 7ed67dc0705..9560cdf89a3 100644
--- a/gdb/gdbserver/tracepoint.h
+++ b/gdb/gdbserver/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/>.  */
 
-#ifndef TRACEPOINT_H
-#define TRACEPOINT_H
+#ifndef GDBSERVER_TRACEPOINT_H
+#define GDBSERVER_TRACEPOINT_H
 
 /* Size for a small buffer to report problems from the in-process
    agent back to GDBserver.  */
@@ -192,4 +192,4 @@ CORE_ADDR get_get_tsv_func_addr (void);
    function in the IPA.  */
 CORE_ADDR get_set_tsv_func_addr (void);
 
-#endif /* TRACEPOINT_H */
+#endif /* GDBSERVER_TRACEPOINT_H */
diff --git a/gdb/gdbserver/utils.h b/gdb/gdbserver/utils.h
index 5437faa6e81..2bc7a6ecab9 100644
--- a/gdb/gdbserver/utils.h
+++ b/gdb/gdbserver/utils.h
@@ -16,10 +16,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 UTILS_H
-#define UTILS_H
+#ifndef GDBSERVER_UTILS_H
+#define GDBSERVER_UTILS_H
 
 char *paddress (CORE_ADDR addr);
 char *pfildes (gdb_fildes_t fd);
 
-#endif /* UTILS_H */
+#endif /* GDBSERVER_UTILS_H */
diff --git a/gdb/gdbserver/win32-low.h b/gdb/gdbserver/win32-low.h
index 9f8cf0c9e65..815c1b04669 100644
--- a/gdb/gdbserver/win32-low.h
+++ b/gdb/gdbserver/win32-low.h
@@ -16,6 +16,9 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef GDBSERVER_WIN32_LOW_H
+#define GDBSERVER_WIN32_LOW_H
+
 #include <windows.h>
 
 struct target_desc;
@@ -115,3 +118,5 @@ extern char * strwinerror (DWORD error);
 /* in wincecompat.c */
 
 extern void to_back_slashes (char *);
+
+#endif /* GDBSERVER_WIN32_LOW_H */
diff --git a/gdb/gdbserver/wincecompat.h b/gdb/gdbserver/wincecompat.h
index 797bed68cc3..c4bc316c87c 100644
--- a/gdb/gdbserver/wincecompat.h
+++ b/gdb/gdbserver/wincecompat.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 WINCECOMPAT_H
-#define WINCECOMPAT_H
+#ifndef GDBSERVER_WINCECOMPAT_H
+#define GDBSERVER_WINCECOMPAT_H
 
 #include <windows.h>
 
@@ -27,4 +27,4 @@
 extern char * strwinerror (DWORD error);
 #define strerror strwinerror
 
-#endif
+#endif /* GDBSERVER_WINCECOMPAT_H */
diff --git a/gdb/gdbserver/x86-low.h b/gdb/gdbserver/x86-low.h
index d7ec4b4cf36..9f4a80a846f 100644
--- a/gdb/gdbserver/x86-low.h
+++ b/gdb/gdbserver/x86-low.h
@@ -17,8 +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 GDBSERVER_X86_LOW_H
+#define GDBSERVER_X86_LOW_H
 
 #include "nat/x86-dregs.h"
 
 /* Initialize STATE.  */
 extern void x86_low_init_dregs (struct x86_debug_reg_state *state);
+
+#endif /* GDBSERVER_X86_LOW_H */
diff --git a/gdb/gdbserver/x86-tdesc.h b/gdb/gdbserver/x86-tdesc.h
index cd0919d6292..0f01cc8f975 100644
--- a/gdb/gdbserver/x86-tdesc.h
+++ b/gdb/gdbserver/x86-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 X86_TDESC_H
-#define X86_TDESC_H
+#ifndef GDBSERVER_X86_TDESC_H
+#define GDBSERVER_X86_TDESC_H
 
 /* The "expedite" registers for x86 targets.  Since whether the
    variable is used depends on host/configuration, we mark it
@@ -29,4 +29,4 @@ static const char *i386_expedite_regs[] ATTRIBUTE_UNUSED
 static const char *amd64_expedite_regs[] = {"rbp", "rsp", "rip", NULL};
 #endif
 
-#endif /* X86_TDESC_H */
+#endif /* GDBSERVER_X86_TDESC_H */
diff --git a/gdb/gnu-nat.h b/gdb/gnu-nat.h
index 34558c26aa6..9df479c8506 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 GNU_NAT_H
+#define GNU_NAT_H
 
 #include <unistd.h>
 #include <mach.h>
@@ -135,4 +135,4 @@ struct gnu_nat_target : public inf_child_target
   void stop (ptid_t) override;
 };
 
-#endif /* __GNU_NAT_H__ */
+#endif /* GNU_NAT_H */
diff --git a/gdb/guile/guile-internal.h b/gdb/guile/guile-internal.h
index a807c539430..d05f4680adf 100644
--- a/gdb/guile/guile-internal.h
+++ b/gdb/guile/guile-internal.h
@@ -17,11 +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 GUILE_GUILE_INTERNAL_H
+#define GUILE_GUILE_INTERNAL_H
+
 /* See README file in this directory for implementation notes, coding
    conventions, et.al.  */
 
-#ifndef GDB_GUILE_INTERNAL_H
-#define GDB_GUILE_INTERNAL_H
 
 #include "hashtab.h"
 #include "extension-priv.h"
@@ -692,4 +693,4 @@ gdbscm_wrap (Function &&func, Args &&... args)
   return result;
 }
 
-#endif /* GDB_GUILE_INTERNAL_H */
+#endif /* GUILE_GUILE_INTERNAL_H */
diff --git a/gdb/guile/guile.h b/gdb/guile/guile.h
index 55544aba357..a1d9b24875f 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 GDB_GUILE_H
-#define GDB_GUILE_H
+#ifndef GUILE_GUILE_H
+#define 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 /* GDB_GUILE_H */
+#endif /* GUILE_GUILE_H */
diff --git a/gdb/hppa-linux-offsets.h b/gdb/hppa-linux-offsets.h
index d6c3c2354d5..29ec394ae92 100644
--- a/gdb/hppa-linux-offsets.h
+++ b/gdb/hppa-linux-offsets.h
@@ -17,6 +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_LINUX_OFFSETS_H
+#define HPPA_LINUX_OFFSETS_H
+
 #define PT_PSW offsetof(struct pt_regs, gr[ 0])
 #define PT_GR1 offsetof(struct pt_regs, gr[ 1])
 #define PT_GR2 offsetof(struct pt_regs, gr[ 2])
@@ -101,3 +104,5 @@
 #define PT_IIR offsetof(struct pt_regs, iir)
 #define PT_ISR offsetof(struct pt_regs, isr)
 #define PT_IOR offsetof(struct pt_regs, ior)
+
+#endif /* HPPA_LINUX_OFFSETS_H */
diff --git a/gdb/i386-darwin-tdep.h b/gdb/i386-darwin-tdep.h
index 35f419aca1d..5855271af55 100644
--- a/gdb/i386-darwin-tdep.h
+++ b/gdb/i386-darwin-tdep.h
@@ -16,8 +16,9 @@
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-#ifndef __I386_DARWIN_TDEP_H__
-#define __I386_DARWIN_TDEP_H__
+
+#ifndef I386_DARWIN_TDEP_H
+#define I386_DARWIN_TDEP_H
 
 #include "frame.h"
 
@@ -28,4 +29,4 @@ extern const int i386_darwin_thread_state_num_regs;
 
 int darwin_dwarf_signal_frame_p (struct gdbarch *, struct frame_info *);
 
-#endif /* __I386_DARWIN_TDEP_H__ */
+#endif /* I386_DARWIN_TDEP_H */
diff --git a/gdb/linux-fork.h b/gdb/linux-fork.h
index bad97771adb..e6f130438cf 100644
--- a/gdb/linux-fork.h
+++ b/gdb/linux-fork.h
@@ -17,6 +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 LINUX_FORK_H
+#define LINUX_FORK_H
+
 struct fork_info;
 extern struct fork_info *add_fork (pid_t);
 extern struct fork_info *find_fork_pid (pid_t);
@@ -25,3 +28,5 @@ extern void linux_fork_mourn_inferior (void);
 extern void linux_fork_detach (int);
 extern int forks_exist_p (void);
 extern int linux_fork_checkpointing_p (int);
+
+#endif /* LINUX_FORK_H */
diff --git a/gdb/linux-nat.h b/gdb/linux-nat.h
index 16f8a584bde..40e0f2cb29b 100644
--- a/gdb/linux-nat.h
+++ b/gdb/linux-nat.h
@@ -17,6 +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 LINUX_NAT_H
+#define LINUX_NAT_H
+
 #include "nat/linux-nat.h"
 #include "inf-ptrace.h"
 #include "target.h"
@@ -322,3 +325,5 @@ void linux_nat_switch_fork (ptid_t new_ptid);
    Return 1 if it was retrieved successfully, 0 otherwise (*SIGINFO is
    uninitialized in such case).  */
 int linux_nat_get_siginfo (ptid_t ptid, siginfo_t *siginfo);
+
+#endif /* LINUX_NAT_H */
diff --git a/gdb/linux-record.h b/gdb/linux-record.h
index 7060e55fad8..b0bd2852155 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 LINUX_RECORD_H
+#define LINUX_RECORD_H
 
 struct linux_record_tdep
 {
@@ -546,4 +546,5 @@ enum gdb_syscall {
 extern int record_linux_system_call (enum gdb_syscall num, 
 				     struct regcache *regcache,
 				     struct linux_record_tdep *tdep);
-#endif /* _LINUX_RECORD_H_ */
+
+#endif /* LINUX_RECORD_H */
diff --git a/gdb/location.h b/gdb/location.h
index 1033365cd2a..fcacc965e86 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 LOCATIONS_H
-#define LOCATIONS_H 1
+#ifndef LOCATION_H
+#define LOCATION_H
 
 struct language_defn;
 struct event_location;
@@ -285,4 +285,5 @@ extern int event_location_empty_p (const struct event_location *location);
 extern void
   set_event_location_string (struct event_location *location,
 			     const char *string);
-#endif /* LOCATIONS_H */
+
+#endif /* LOCATION_H */
diff --git a/gdb/m2-lang.h b/gdb/m2-lang.h
index 19d458c246d..96058bb4f48 100644
--- a/gdb/m2-lang.h
+++ b/gdb/m2-lang.h
@@ -17,6 +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 M2_LANG_H
+#define M2_LANG_H
+
 struct type_print_options;
 struct parser_state;
 
@@ -54,3 +57,4 @@ struct builtin_m2_type
 /* Return the Modula-2 type table for the specified architecture.  */
 extern const struct builtin_m2_type *builtin_m2_type (struct gdbarch *gdbarch);
 
+#endif /* M2_LANG_H */
diff --git a/gdb/mi/mi-cmd-break.h b/gdb/mi/mi-cmd-break.h
index 3b69061a9e2..a68080d580b 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_CMD_BREAK_H
-#define MI_CMD_BREAK_H
+#ifndef MI_MI_CMD_BREAK_H
+#define MI_MI_CMD_BREAK_H
 
 #include "common/scoped_restore.h"
 
@@ -27,5 +27,4 @@
    catchpoint.  */
 scoped_restore_tmpl<int> setup_breakpoint_reporting (void);
 
-#endif
-
+#endif /* MI_MI_CMD_BREAK_H */
diff --git a/gdb/mi/mi-cmds.h b/gdb/mi/mi-cmds.h
index af38363cfc4..7b22ce78134 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_CMDS_H
-#define MI_CMDS_H
+#ifndef MI_MI_CMDS_H
+#define MI_MI_CMDS_H
 
 enum print_values {
    PRINT_NO_VALUES,
@@ -162,4 +162,4 @@ extern int mi_debug_p;
 
 extern void mi_execute_command (const char *cmd, int from_tty);
 
-#endif
+#endif /* MI_MI_CMDS_H */
diff --git a/gdb/mi/mi-common.h b/gdb/mi/mi-common.h
index 1589f8d2d31..4fb2d75c0e5 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_COMMON_H
-#define MI_COMMON_H
+#ifndef MI_MI_COMMON_H
+#define MI_MI_COMMON_H
 
 #include "interps.h"
 
@@ -90,4 +90,4 @@ public:
   struct ui_out *cli_uiout;
 };
 
-#endif
+#endif /* MI_MI_COMMON_H */
diff --git a/gdb/mi/mi-console.h b/gdb/mi/mi-console.h
index 90e592f4a94..e7a1c355f09 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_CONSOLE_H
-#define MI_CONSOLE_H
+#ifndef MI_MI_CONSOLE_H
+#define 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 @@ private:
   char m_quote;
 };
 
-#endif
+#endif /* MI_MI_CONSOLE_H */
diff --git a/gdb/mi/mi-getopt.h b/gdb/mi/mi-getopt.h
index 7a6d34be0af..1513bb5571f 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_GETOPT_H
-#define MI_GETOPT_H
+#ifndef MI_MI_GETOPT_H
+#define 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.  */
@@ -74,5 +74,5 @@ extern int mi_getopt_allow_unknown (const char *prefix, int argc,
    and the appropriate error message is displayed by mi_getopt.  */
 
 extern int mi_valid_noargs (const char *prefix, int argc, char **argv);
-				
-#endif
+
+#endif /* MI_MI_GETOPT_H */
diff --git a/gdb/mi/mi-interp.h b/gdb/mi/mi-interp.h
index 2ea3e6e04f7..b1897d9d80c 100644
--- a/gdb/mi/mi-interp.h
+++ b/gdb/mi/mi-interp.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 MI_INTERP_H
-#define MI_INTERP_H
+#ifndef MI_MI_INTERP_H
+#define MI_MI_INTERP_H
 
 /* Output the shared object attributes to UIOUT.  */
 
 void mi_output_solib_attribs (ui_out *uiout, struct so_list *solib);
 
-#endif
+#endif /* MI_MI_INTERP_H */
diff --git a/gdb/mi/mi-main.h b/gdb/mi/mi-main.h
index a81aa9c2de1..72ddab9427c 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_MAIN_H
-#define MI_MAIN_H
+#ifndef MI_MI_MAIN_H
+#define MI_MI_MAIN_H
 
 struct ui_file;
 
@@ -54,5 +54,4 @@ struct mi_suppress_notification
 };
 extern struct mi_suppress_notification mi_suppress_notification;
 
-#endif
-
+#endif /* MI_MI_MAIN_H */
diff --git a/gdb/mi/mi-out.h b/gdb/mi/mi-out.h
index 237872ffc0c..0c74eaf80fd 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_OUT_H
-#define MI_OUT_H 1
+#ifndef MI_MI_OUT_H
+#define MI_MI_OUT_H
 
 #include <vector>
 
@@ -95,4 +95,4 @@ int mi_version (ui_out *uiout);
 void mi_out_put (ui_out *uiout, struct ui_file *stream);
 void mi_out_rewind (ui_out *uiout);
 
-#endif /* MI_OUT_H */
+#endif /* MI_MI_OUT_H */
diff --git a/gdb/mi/mi-parse.h b/gdb/mi/mi-parse.h
index d9d36fb501b..2262ff56f96 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_PARSE_H
-#define MI_PARSE_H
+#ifndef MI_MI_PARSE_H
+#define MI_MI_PARSE_H
 
 #include "common/run-time-clock.h"
 #include <chrono>
@@ -79,4 +79,4 @@ extern std::unique_ptr<struct mi_parse> mi_parse (const char *cmd,
 
 enum print_values mi_parse_print_values (const char *name);
 
-#endif
+#endif /* MI_MI_PARSE_H */
diff --git a/gdb/mips-linux-tdep.h b/gdb/mips-linux-tdep.h
index 39d471b9fa6..0683b7ce65f 100644
--- a/gdb/mips-linux-tdep.h
+++ b/gdb/mips-linux-tdep.h
@@ -17,6 +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 MIPS_LINUX_TDEP_H
+#define MIPS_LINUX_TDEP_H
+
 /* Copied from <asm/elf.h>.  */
 #define ELF_NGREG       45
 #define ELF_NFPREG      33
@@ -109,3 +112,5 @@ extern struct target_desc *tdesc_mips_linux;
 extern struct target_desc *tdesc_mips64_linux;
 extern struct target_desc *tdesc_mips_dsp_linux;
 extern struct target_desc *tdesc_mips64_dsp_linux;
+
+#endif /* MIPS_LINUX_TDEP_H */
diff --git a/gdb/mn10300-tdep.h b/gdb/mn10300-tdep.h
index e9bcbe4296d..c0b374e4ce7 100644
--- a/gdb/mn10300-tdep.h
+++ b/gdb/mn10300-tdep.h
@@ -17,6 +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 MN10300_TDEP_H
+#define MN10300_TDEP_H
+
 enum {
   E_D0_REGNUM = 0,
   E_D1_REGNUM = 1,
@@ -77,3 +80,5 @@ struct gdbarch_tdep
 };
 
 #define AM33_MODE(gdbarch) (gdbarch_tdep (gdbarch)->am33_mode)
+
+#endif /* MN10300_TDEP_H */
diff --git a/gdb/nat/aarch64-linux-hw-point.h b/gdb/nat/aarch64-linux-hw-point.h
index a84058e67d6..5d9c2a1c80b 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 AARCH64_LINUX_HW_POINT_H
-#define AARCH64_LINUX_HW_POINT_H 1
+#ifndef NAT_AARCH64_LINUX_HW_POINT_H
+#define NAT_AARCH64_LINUX_HW_POINT_H
 
 #include "common/break-common.h" /* For enum target_hw_bp_type.  */
 
@@ -197,4 +197,4 @@ struct aarch64_debug_reg_state *aarch64_get_debug_reg_state (pid_t pid);
 
 int aarch64_linux_region_ok_for_watchpoint (CORE_ADDR addr, int len);
 
-#endif /* AARCH64_LINUX_HW_POINT_H */
+#endif /* NAT_AARCH64_LINUX_HW_POINT_H */
diff --git a/gdb/nat/aarch64-linux.h b/gdb/nat/aarch64-linux.h
index 9f4ee8dab21..bc3c1f7f2db 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 AARCH64_LINUX_H
-#define AARCH64_LINUX_H 1
+#ifndef NAT_AARCH64_LINUX_H
+#define NAT_AARCH64_LINUX_H
 
 #include <signal.h>
 
@@ -129,4 +129,4 @@ ps_err_e aarch64_ps_get_thread_area (struct ps_prochandle *ph,
 				       lwpid_t lwpid, int idx, void **base,
 				       int is_64bit_p);
 
-#endif /* AARCH64_LINUX_H */
+#endif /* NAT_AARCH64_LINUX_H */
diff --git a/gdb/nat/aarch64-sve-linux-ptrace.h b/gdb/nat/aarch64-sve-linux-ptrace.h
index 2ccb4d4776c..167fc8ef3cf 100644
--- a/gdb/nat/aarch64-sve-linux-ptrace.h
+++ b/gdb/nat/aarch64-sve-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 AARCH64_SVE_LINUX_PTRACE_H
-#define AARCH64_SVE_LINUX_PTRACE_H
+#ifndef NAT_AARCH64_SVE_LINUX_PTRACE_H
+#define NAT_AARCH64_SVE_LINUX_PTRACE_H
 
 #include <signal.h>
 #include <sys/utsname.h>
@@ -55,4 +55,4 @@ extern void
 aarch64_sve_regs_copy_from_reg_buf (const struct reg_buffer_common *reg_buf,
 				    void *buf);
 
-#endif /* aarch64-sve-linux-ptrace.h */
+#endif /* NAT_AARCH64_SVE_LINUX_PTRACE_H */
diff --git a/gdb/nat/aarch64-sve-linux-sigcontext.h b/gdb/nat/aarch64-sve-linux-sigcontext.h
index b2aa23298d6..875c12cd96c 100644
--- a/gdb/nat/aarch64-sve-linux-sigcontext.h
+++ b/gdb/nat/aarch64-sve-linux-sigcontext.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 AARCH64_SVE_LINUX_SIGCONTEXT_H
-#define AARCH64_SVE_LINUX_SIGCONTEXT_H
+#ifndef NAT_AARCH64_SVE_LINUX_SIGCONTEXT_H
+#define NAT_AARCH64_SVE_LINUX_SIGCONTEXT_H
 
 #define SVE_MAGIC	0x53564501
 
@@ -264,5 +264,4 @@ struct user_sve_header {
 		  SVE_PT_SVE_OFFSET + SVE_PT_SVE_SIZE(vq, flags)	\
 		: SVE_PT_FPSIMD_OFFSET + SVE_PT_FPSIMD_SIZE(vq, flags))
 
-
-#endif /* AARCH64_SVE_LINUX_SIGCONTEXT_H */
+#endif /* NAT_AARCH64_SVE_LINUX_SIGCONTEXT_H */
diff --git a/gdb/nat/amd64-linux-siginfo.h b/gdb/nat/amd64-linux-siginfo.h
index 9aa6ae99928..50d7fdc884f 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 AMD64_LINUX_SIGINFO_H
-#define AMD64_LINUX_SIGINFO_H 1
+#ifndef NAT_AMD64_LINUX_SIGINFO_H
+#define NAT_AMD64_LINUX_SIGINFO_H
 
 #include <signal.h>  /* For siginfo_t.  */
 
@@ -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
+#endif /* NAT_AMD64_LINUX_SIGINFO_H */
diff --git a/gdb/nat/fork-inferior.h b/gdb/nat/fork-inferior.h
index 6d46dfcae3c..1d0519fb26c 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 FORK_INFERIOR_H
-#define FORK_INFERIOR_H
+#ifndef NAT_FORK_INFERIOR_H
+#define NAT_FORK_INFERIOR_H
 
 #include <string>
 
@@ -103,4 +103,4 @@ extern void trace_start_error (const char *fmt, ...)
 extern void trace_start_error_with_name (const char *string)
   ATTRIBUTE_NORETURN;
 
-#endif /* ! FORK_INFERIOR_H */
+#endif /* NAT_FORK_INFERIOR_H */
diff --git a/gdb/nat/gdb_ptrace.h b/gdb/nat/gdb_ptrace.h
index 289921aaaba..d75c7700bfa 100644
--- a/gdb/nat/gdb_ptrace.h
+++ b/gdb/nat/gdb_ptrace.h
@@ -16,9 +16,9 @@
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-   
-#ifndef GDB_PTRACE_H
-#define GDB_PTRACE_H
+
+#ifndef NAT_GDB_PTRACE_H
+#define 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
@@ -150,4 +150,4 @@ extern PTRACE_TYPE_RET ptrace();
          ptrace ((PTRACE_TYPE_ARG1) request, pid, addr, data)
 #endif
 
-#endif /* gdb_ptrace.h */
+#endif /* NAT_GDB_PTRACE_H */
diff --git a/gdb/nat/gdb_thread_db.h b/gdb/nat/gdb_thread_db.h
index 2c903bc42f2..b55ba8dd7db 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 GDB_THREAD_DB_H
-#define GDB_THREAD_DB_H 1
+#ifndef NAT_GDB_THREAD_DB_H
+#define 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 /* GDB_THREAD_DB_H */
+#endif /* NAT_GDB_THREAD_DB_H */
diff --git a/gdb/nat/glibc_thread_db.h b/gdb/nat/glibc_thread_db.h
index 97423a44ffb..598805deef2 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 _THREAD_DB_H
-#define _THREAD_DB_H	1
+#ifndef NAT_GLIBC_THREAD_DB_H
+#define 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	/* thread_db.h */
+#endif /* NAT_GLIBC_THREAD_DB_H */
diff --git a/gdb/nat/linux-btrace.h b/gdb/nat/linux-btrace.h
index 2876a8eb651..df7b0d27c7e 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 LINUX_BTRACE_H
-#define LINUX_BTRACE_H
+#ifndef NAT_LINUX_BTRACE_H
+#define NAT_LINUX_BTRACE_H
 
 #include "common/btrace-common.h"
 #include "common/vec.h"
@@ -119,4 +119,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 /* LINUX_BTRACE_H */
+#endif /* NAT_LINUX_BTRACE_H */
diff --git a/gdb/nat/linux-namespaces.h b/gdb/nat/linux-namespaces.h
index 72db9e59a97..166b11cbdca 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 LINUX_NAMESPACES_H
-#define LINUX_NAMESPACES_H
+#ifndef NAT_LINUX_NAMESPACES_H
+#define NAT_LINUX_NAMESPACES_H
 
 /* Set to nonzero 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 /* LINUX_NAMESPACES_H */
+#endif /* NAT_LINUX_NAMESPACES_H */
diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h
index 30f759048be..1e32dd9eb6b 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 LINUX_NAT_H
-#define LINUX_NAT_H
+#ifndef NAT_LINUX_NAT_H
+#define NAT_LINUX_NAT_H
 
 #include "target/waitstatus.h"
 
@@ -90,4 +90,4 @@ extern void linux_stop_lwp (struct lwp_info *lwp);
 
 extern int lwp_is_stepping (struct lwp_info *lwp);
 
-#endif /* LINUX_NAT_H */
+#endif /* NAT_LINUX_NAT_H */
diff --git a/gdb/nat/linux-osdata.h b/gdb/nat/linux-osdata.h
index 91e94d4f01c..44cb63cb4fb 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 COMMON_LINUX_OSDATA_H
-#define COMMON_LINUX_OSDATA_H
+#ifndef NAT_LINUX_OSDATA_H
+#define 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
+#endif /* NAT_LINUX_OSDATA_H */
diff --git a/gdb/nat/linux-procfs.h b/gdb/nat/linux-procfs.h
index ecae5aa19a4..1bc66212152 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 COMMON_LINUX_PROCFS_H
-#define COMMON_LINUX_PROCFS_H
+#ifndef NAT_LINUX_PROCFS_H
+#define NAT_LINUX_PROCFS_H
 
 #include <unistd.h>
 
@@ -85,4 +85,4 @@ extern char *linux_proc_pid_to_exec_file (int pid);
 
 extern void linux_proc_init_warnings ();
 
-#endif /* COMMON_LINUX_PROCFS_H */
+#endif /* NAT_LINUX_PROCFS_H */
diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h
index f18f5a5d8ae..cfb12178a42 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 COMMON_LINUX_PTRACE_H
-#define COMMON_LINUX_PTRACE_H
+#ifndef NAT_LINUX_PTRACE_H
+#define NAT_LINUX_PTRACE_H
 
 struct buffer;
 
@@ -196,4 +196,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 /* COMMON_LINUX_PTRACE_H */
+#endif /* NAT_LINUX_PTRACE_H */
diff --git a/gdb/nat/linux-waitpid.h b/gdb/nat/linux-waitpid.h
index df998a95880..cdec1bff6f1 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 LINUX_WAITPID_H
-#define LINUX_WAITPID_H
+#ifndef NAT_LINUX_WAITPID_H
+#define 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 char *status_to_str (int status);
 
-#endif /* LINUX_WAITPID_H */
+#endif /* NAT_LINUX_WAITPID_H */
diff --git a/gdb/nat/mips-linux-watch.h b/gdb/nat/mips-linux-watch.h
index 222b5cfd71b..35e8d9d461e 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 MIPS_LINUX_WATCH_H
-#define MIPS_LINUX_WATCH_H 1
+#ifndef NAT_MIPS_LINUX_WATCH_H
+#define NAT_MIPS_LINUX_WATCH_H
 
 #include <asm/ptrace.h>
 #include "common/break-common.h"
@@ -115,4 +115,5 @@ uint32_t mips_linux_watch_type_to_irw (enum target_hw_bp_type type);
 int mips_linux_read_watch_registers (long lwpid,
 				     struct pt_watch_regs *watch_readback,
 				     int *watch_readback_valid, int force);
-#endif
+
+#endif /* NAT_MIPS_LINUX_WATCH_H */
diff --git a/gdb/nat/ppc-linux.h b/gdb/nat/ppc-linux.h
index 059b99465ba..f1561b3b357 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 PPC_LINUX_H
-#define PPC_LINUX_H 1
+#ifndef NAT_PPC_LINUX_H
+#define NAT_PPC_LINUX_H
 
 #include <asm/ptrace.h>
 #include <asm/cputable.h>
@@ -165,4 +165,4 @@
 /* Return the wordsize of the target, either 4 or 8 bytes.  */
 int ppc_linux_target_wordsize (int tid);
 
-#endif
+#endif /* NAT_PPC_LINUX_H */
diff --git a/gdb/nat/x86-cpuid.h b/gdb/nat/x86-cpuid.h
index fbfb1848168..2a143278934 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 X86_CPUID_COMMON_H
-#define X86_CPUID_COMMON_H
+#ifndef NAT_X86_CPUID_H
+#define NAT_X86_CPUID_H
 
 /* Always include the header for the cpu bit defines.  */
 #include "x86-gcc-cpuid.h"
@@ -60,4 +60,4 @@ x86_cpuid (unsigned int __level,
 
 #endif /* i386 && x86_64 */
 
-#endif /* X86_CPUID_COMMON_H */
+#endif /* NAT_X86_CPUID_H */
diff --git a/gdb/nat/x86-dregs.h b/gdb/nat/x86-dregs.h
index 67384a2e449..e8a2e0099e8 100644
--- a/gdb/nat/x86-dregs.h
+++ b/gdb/nat/x86-dregs.h
@@ -17,6 +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 NAT_X86_DREGS_H
+#define NAT_X86_DREGS_H
+
 /* Support for hardware watchpoints and breakpoints using the x86
    debug registers.
 
@@ -29,8 +32,6 @@
    counts, and allow to watch regions up to 16 bytes long
    (32 bytes on 64 bit hosts).  */
 
-#ifndef X86_DREGS_H
-#define X86_DREGS_H 1
 
 #include "common/break-common.h" /* target_hw_bp_type */
 
@@ -132,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 /* X86_DREGS_H */
+#endif /* NAT_X86_DREGS_H */
diff --git a/gdb/nat/x86-gcc-cpuid.h b/gdb/nat/x86-gcc-cpuid.h
index ec71c3f4048..21cfa197971 100644
--- a/gdb/nat/x86-gcc-cpuid.h
+++ b/gdb/nat/x86-gcc-cpuid.h
@@ -2,6 +2,10 @@
  * Helper cpuid.h file copied from gcc-6.0.0.  Code in gdb should not
  * 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
+
 /*
  * Copyright (C) 2007-2019 Free Software Foundation, Inc.
  *
@@ -268,3 +272,5 @@ __get_cpuid_count (unsigned int __leaf, unsigned int __subleaf,
   __cpuid_count (__leaf, __subleaf, *__eax, *__ebx, *__ecx, *__edx);
   return 1;
 }
+
+#endif /* NAT_X86_GCC_CPUID_H */
diff --git a/gdb/nat/x86-linux-dregs.h b/gdb/nat/x86-linux-dregs.h
index 056f9366350..e6086977f3c 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 X86_LINUX_DREGS_H
-#define X86_LINUX_DREGS_H
+#ifndef NAT_X86_LINUX_DREGS_H
+#define 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 /* X86_LINUX_DREGS_H */
+#endif /* NAT_X86_LINUX_DREGS_H */
diff --git a/gdb/nat/x86-linux.h b/gdb/nat/x86-linux.h
index 0b13bb76ec2..7d4fbbca7a2 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 X86_LINUX_H
-#define X86_LINUX_H
+#ifndef NAT_X86_LINUX_H
+#define 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 /* X86_LINUX_H */
+#endif /* NAT_X86_LINUX_H */
diff --git a/gdb/nto-tdep.h b/gdb/nto-tdep.h
index fe8caa14cf2..5127ab3f9ed 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 NTO_TDEP_H
+#define NTO_TDEP_H
 
 #include "solist.h"
 #include "osabi.h"
@@ -191,4 +191,4 @@ LONGEST nto_read_auxv_from_initial_stack (CORE_ADDR inital_stack,
 
 struct nto_inferior_data *nto_inferior_data (struct inferior *inf);
 
-#endif
+#endif /* NTO_TDEP_H */
diff --git a/gdb/observable.h b/gdb/observable.h
index fbbabaccb04..999ecfbc353 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/>.  */
 
-#if !defined (GDB_OBSERVER_H)
-#define GDB_OBSERVER_H
+#ifndef OBSERVABLE_H
+#define OBSERVABLE_H
 
 #include "common/observable.h"
 
@@ -232,4 +232,4 @@ extern observable<user_selected_what> user_selected_context_changed;
 
 } /* namespace gdb */
 
-#endif /* GDB_OBSERVER_H */
+#endif /* OBSERVABLE_H */
diff --git a/gdb/or1k-tdep.h b/gdb/or1k-tdep.h
index 75a81e5c2ba..e66c4a16c5f 100644
--- a/gdb/or1k-tdep.h
+++ b/gdb/or1k-tdep.h
@@ -16,9 +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 OR1K_TDEP_H
+#define OR1K_TDEP_H
 
 #ifndef TARGET_OR1K
 #define TARGET_OR1K
@@ -53,4 +52,4 @@
 #define OR1K_NUM_TAP_RECORDS         8
 #define OR1K_FRAME_RED_ZONE_SIZE     2536
 
-#endif /* OR1K_TDEP__H */
+#endif /* OR1K_TDEP_H */
diff --git a/gdb/p-lang.h b/gdb/p-lang.h
index 4f97ab69f73..7d1d285bd94 100644
--- a/gdb/p-lang.h
+++ b/gdb/p-lang.h
@@ -17,6 +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 P_LANG_H
+#define P_LANG_H
+
 /* This file is derived from c-lang.h */
 
 struct value;
@@ -80,3 +83,5 @@ extern void pascal_object_print_value_fields (struct type *, const gdb_byte *,
 extern int pascal_object_is_vtbl_ptr_type (struct type *);
 
 extern int pascal_object_is_vtbl_member (struct type *);
+
+#endif /* P_LANG_H */
diff --git a/gdb/proc-utils.h b/gdb/proc-utils.h
index 7cd83720bd7..83514738dc4 100644
--- a/gdb/proc-utils.h
+++ b/gdb/proc-utils.h
@@ -16,6 +16,9 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef PROC_UTILS_H
+#define PROC_UTILS_H
+
 /* From proc-why.c */
 
 /*
@@ -113,3 +116,5 @@ extern  void  procfs_note      (const char *, const char *, int);
 /* Define the type (and more importantly the width) of the control
    word used to write to the /proc/PID/ctl file.  */
 typedef long procfs_ctl_t;
+
+#endif /* PROC_UTILS_H */
diff --git a/gdb/procfs.h b/gdb/procfs.h
index 8bbc1e5a921..d92a5e8603c 100644
--- a/gdb/procfs.h
+++ b/gdb/procfs.h
@@ -17,6 +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 PROCFS_H
+#define PROCFS_H
+
 /* Return a ptid for which we guarantee we will be able to find a
    'live' procinfo.  */
 
@@ -28,3 +31,4 @@ struct ssd;
 extern struct ssd *procfs_find_LDT_entry (ptid_t);
 #endif
 
+#endif /* PROCFS_H */
diff --git a/gdb/python/py-event.h b/gdb/python/py-event.h
index 07b99d26857..fb8057c2b03 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 GDB_PY_EVENT_H
-#define GDB_PY_EVENT_H
+#ifndef PYTHON_PY_EVENT_H
+#define PYTHON_PY_EVENT_H
 
 #include "py-events.h"
 #include "command.h"
@@ -83,4 +83,4 @@ extern int evpy_add_attribute (PyObject *event,
 int gdbpy_initialize_event_generic (PyTypeObject *type, const char *name)
   CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION;
 
-#endif /* GDB_PY_EVENT_H */
+#endif /* PYTHON_PY_EVENT_H */
diff --git a/gdb/python/py-events.h b/gdb/python/py-events.h
index a5501c3ff47..7d357ad3ca3 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 GDB_PY_EVENTS_H
-#define GDB_PY_EVENTS_H
+#ifndef PYTHON_PY_EVENTS_H
+#define 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 int evregpy_no_listeners_p (eventregistry_object *registry);
 
-#endif /* GDB_PY_EVENTS_H */
+#endif /* PYTHON_PY_EVENTS_H */
diff --git a/gdb/python/py-instruction.h b/gdb/python/py-instruction.h
index eb19208c123..d0d5306b0a7 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 GDB_PY_INSTRUCTION_H
-#define GDB_PY_INSTRUCTION_H
+#ifndef PYTHON_PY_INSTRUCTION_H
+#define PYTHON_PY_INSTRUCTION_H
 
 #include "python-internal.h"
 
@@ -27,4 +27,4 @@
    (str) and "size" (int) that must be overriden by sub classes.  */
 extern PyTypeObject py_insn_type;
 
-#endif /* GDB_PY_INSTRUCTION_H */
+#endif /* PYTHON_PY_INSTRUCTION_H */
diff --git a/gdb/python/py-record-btrace.h b/gdb/python/py-record-btrace.h
index d6d4a744f9e..1d8560dace3 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 GDB_PY_RECORD_BTRACE_H
-#define GDB_PY_RECORD_BTRACE_H
+#ifndef PYTHON_PY_RECORD_BTRACE_H
+#define 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 /* GDB_PY_RECORD_BTRACE_H */
+#endif /* PYTHON_PY_RECORD_BTRACE_H */
diff --git a/gdb/python/py-record-full.h b/gdb/python/py-record-full.h
index d6529df735e..e00244146ed 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 GDB_PY_RECORD_FULL_H
-#define GDB_PY_RECORD_FULL_H
+#ifndef PYTHON_PY_RECORD_FULL_H
+#define 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 /* GDB_PY_RECORD_FULL_H */
+#endif /* PYTHON_PY_RECORD_FULL_H */
diff --git a/gdb/python/py-record.h b/gdb/python/py-record.h
index 5d838fb4c86..74da1bdc4d6 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 GDB_PY_RECORD_H
-#define GDB_PY_RECORD_H
+#ifndef PYTHON_PY_RECORD_H
+#define 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 /* GDB_PY_RECORD_H */
+#endif /* PYTHON_PY_RECORD_H */
diff --git a/gdb/python/py-ref.h b/gdb/python/py-ref.h
index bf7a8271e7a..15280f6fbf5 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 GDB_PYTHON_REF_H
-#define GDB_PYTHON_REF_H
+#ifndef PYTHON_PY_REF_H
+#define PYTHON_PY_REF_H
 
 #include "common/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 /* GDB_PYTHON_REF_H */
+#endif /* PYTHON_PY_REF_H */
diff --git a/gdb/python/py-stopevent.h b/gdb/python/py-stopevent.h
index f2dffbe6f8d..c6b7a7b32b7 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 GDB_PY_STOPEVENT_H
-#define GDB_PY_STOPEVENT_H
+#ifndef PYTHON_PY_STOPEVENT_H
+#define PYTHON_PY_STOPEVENT_H
 
 #include "py-event.h"
 
@@ -33,4 +33,4 @@ extern gdbpy_ref<> create_breakpoint_event_object (PyObject *breakpoint_list,
 
 extern gdbpy_ref<> create_signal_event_object (enum gdb_signal stop_signal);
 
-#endif /* GDB_PY_STOPEVENT_H */
+#endif /* PYTHON_PY_STOPEVENT_H */
diff --git a/gdb/python/python-internal.h b/gdb/python/python-internal.h
index b157d22aa1f..3cb9ebc1eec 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 GDB_PYTHON_INTERNAL_H
-#define GDB_PYTHON_INTERNAL_H
+#ifndef PYTHON_PYTHON_INTERNAL_H
+#define PYTHON_PYTHON_INTERNAL_H
 
 #include "extension.h"
 #include "extension-priv.h"
@@ -801,4 +801,4 @@ struct varobj;
 struct varobj_iter *py_varobj_get_iterator (struct varobj *var,
 					    PyObject *printer);
 
-#endif /* GDB_PYTHON_INTERNAL_H */
+#endif /* PYTHON_PYTHON_INTERNAL_H */
diff --git a/gdb/python/python.h b/gdb/python/python.h
index 2c02b95ab99..10cd90d00e1 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 GDB_PYTHON_H
-#define GDB_PYTHON_H
+#ifndef PYTHON_PYTHON_H
+#define PYTHON_PYTHON_H
 
 #include "extension.h"
 
@@ -28,4 +28,4 @@ extern const struct extension_language_defn extension_language_python;
 /* Command element for the 'python' command.  */
 extern cmd_list_element *python_cmd_element;
 
-#endif /* GDB_PYTHON_H */
+#endif /* PYTHON_PYTHON_H */
diff --git a/gdb/record.h b/gdb/record.h
index a97d92f48fb..03f96e8ab78 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 RECORD_H
+#define RECORD_H
 
 #include "target/waitstatus.h" /* For enum target_stop_reason.  */
 #include "common/enum-flags.h"
@@ -113,4 +113,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 /* RECORD_H */
diff --git a/gdb/regformats/regdef.h b/gdb/regformats/regdef.h
index 8729374c14a..df9c5e40282 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 REGDEF_H
-#define REGDEF_H
+#ifndef REGFORMATS_REGDEF_H
+#define REGFORMATS_REGDEF_H
 
 struct reg
 {
@@ -60,4 +60,4 @@ struct reg
   }
 };
 
-#endif /* REGDEF_H */
+#endif /* REGFORMATS_REGDEF_H */
diff --git a/gdb/riscv-fbsd-tdep.h b/gdb/riscv-fbsd-tdep.h
index 367030675a9..d1a5a04f472 100644
--- a/gdb/riscv-fbsd-tdep.h
+++ b/gdb/riscv-fbsd-tdep.h
@@ -17,6 +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 RISCV_FBSD_TDEP_H
+#define RISCV_FBSD_TDEP_H
+
 #include "regset.h"
 
 /* The general-purpose regset consists of 31 X registers, EPC, and
@@ -31,3 +34,5 @@
 
 extern const struct regset riscv_fbsd_gregset;
 extern const struct regset riscv_fbsd_fpregset;
+
+#endif /* RISCV_FBSD_TDEP_H */
diff --git a/gdb/rs6000-tdep.h b/gdb/rs6000-tdep.h
index d31d467851d..fb04d650c68 100644
--- a/gdb/rs6000-tdep.h
+++ b/gdb/rs6000-tdep.h
@@ -15,6 +15,10 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef RS6000_TDEP_H
+#define RS6000_TDEP_H
+
 /* Minimum possible text address in AIX.  */
 #define AIX_TEXT_SEGMENT_BASE 0x10000000
 
+#endif /* RS6000_TDEP_H */
diff --git a/gdb/stabsread.h b/gdb/stabsread.h
index b872aadb878..fc989bc8994 100644
--- a/gdb/stabsread.h
+++ b/gdb/stabsread.h
@@ -16,6 +16,9 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef STABSREAD_H
+#define STABSREAD_H
+
 struct objfile;
 enum language;
 
@@ -219,3 +222,5 @@ extern void init_header_files (void);
    to.  Get these symbols from the minimal symbol table.  */
 
 extern void scan_file_globals (struct objfile *objfile);
+
+#endif /* STABSREAD_H */
diff --git a/gdb/target-float.h b/gdb/target-float.h
index 59c13aecf2f..c809daafebd 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 TYPED_FLOAT_H
-#define TYPED_FLOAT_H
+#ifndef TARGET_FLOAT_H
+#define 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
+#endif /* TARGET_FLOAT_H */
diff --git a/gdb/target/resume.h b/gdb/target/resume.h
index 4834c0d82d8..50219d6ed71 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 RESUME_H
-#define RESUME_H
+#ifndef TARGET_RESUME_H
+#define TARGET_RESUME_H
 
 /* Ways to "resume" a thread.  */
 
@@ -34,4 +34,4 @@ enum resume_kind
   resume_stop
 };
 
-#endif /* RESUME_H */
+#endif /* TARGET_RESUME_H */
diff --git a/gdb/target/target.h b/gdb/target/target.h
index f7b8ce9dc62..3e90839fa9b 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_COMMON_H
-#define TARGET_COMMON_H
+#ifndef TARGET_TARGET_H
+#define TARGET_TARGET_H
 
 #include "target/waitstatus.h"
 /* This header is a stopgap until more code is shared.  */
@@ -209,4 +209,4 @@ private:
   static target_terminal_state m_terminal_state;
 };
 
-#endif /* TARGET_COMMON_H */
+#endif /* TARGET_TARGET_H */
diff --git a/gdb/target/wait.h b/gdb/target/wait.h
index 47f294d8d7b..fed34b98a9a 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 WAIT_H
-#define WAIT_H
+#ifndef TARGET_WAIT_H
+#define TARGET_WAIT_H
 
 /* Options that can be passed to target_wait.  */
 
@@ -27,4 +27,4 @@
    event.  */
 #define TARGET_WNOHANG 1
 
-#endif /* WAIT_H */
+#endif /* TARGET_WAIT_H */
diff --git a/gdb/target/waitstatus.h b/gdb/target/waitstatus.h
index 5563b0b6495..8f48599e9e8 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 WAITSTATUS_H
-#define WAITSTATUS_H
+#ifndef TARGET_WAITSTATUS_H
+#define TARGET_WAITSTATUS_H
 
 #include "common/gdb_signals.h"
 
@@ -148,4 +148,4 @@ enum target_stop_reason
 /* Return a pretty printed form of target_waitstatus.  */
 std::string target_waitstatus_to_string (const struct target_waitstatus *);
 
-#endif /* WAITSTATUS_H */
+#endif /* TARGET_WAITSTATUS_H */
diff --git a/gdb/tic6x-tdep.h b/gdb/tic6x-tdep.h
index 3854f47f7d8..f6f76be8e9b 100644
--- a/gdb/tic6x-tdep.h
+++ b/gdb/tic6x-tdep.h
@@ -17,6 +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 TIC6X_TDEP_H
+#define TIC6X_TDEP_H
+
 enum
 {
   TIC6X_A4_REGNUM = 4,
@@ -51,3 +54,5 @@ struct gdbarch_tdep
 
   int has_gp; /* Has general purpose registers A16 - A31 and B16 - B31.  */
 };
+
+#endif /* TIC6X_TDEP_H */
diff --git a/gdb/tui/tui-command.h b/gdb/tui/tui-command.h
index d9834586313..80f69caf61b 100644
--- a/gdb/tui/tui-command.h
+++ b/gdb/tui/tui-command.h
@@ -19,12 +19,12 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef TUI_COMMAND_H
-#define TUI_COMMAND_H
+#ifndef TUI_TUI_COMMAND_H
+#define TUI_TUI_COMMAND_H
 
 extern unsigned int tui_dispatch_ctrl_char (unsigned int);
 
 /* Refresh the command window.  */
 extern void tui_refresh_cmd_win (void);
 
-#endif
+#endif /* TUI_TUI_COMMAND_H */
diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h
index 06542411e0a..acefb23bb6d 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_DATA_H
-#define TUI_DATA_H
+#ifndef TUI_TUI_DATA_H
+#define TUI_TUI_DATA_H
 
 #include "tui/tui.h"	/* For enum tui_win_type.  */
 #include "gdb_curses.h"	/* For WINDOW.  */
@@ -344,4 +344,4 @@ extern void tui_add_to_source_windows (struct tui_win_info *);
 
 extern unsigned int tui_tab_width;
 
-#endif /* TUI_DATA_H */
+#endif /* TUI_TUI_DATA_H */
diff --git a/gdb/tui/tui-disasm.h b/gdb/tui/tui-disasm.h
index d974303803d..b7325917435 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_DISASM_H
-#define TUI_DISASM_H
+#ifndef TUI_TUI_DISASM_H
+#define TUI_TUI_DISASM_H
 
 #include "tui/tui.h"		/* For enum tui_status.  */
 #include "tui/tui-data.h"	/* For enum tui_scroll_direction.  */
@@ -32,4 +32,4 @@ extern void tui_vertical_disassem_scroll (enum tui_scroll_direction,
 					  int);
 extern void tui_get_begin_asm_address (struct gdbarch **, CORE_ADDR *);
 
-#endif
+#endif /* TUI_TUI_DISASM_H */
diff --git a/gdb/tui/tui-file.h b/gdb/tui/tui-file.h
index d7d733319cf..44d66b56d81 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_FILE_H
-#define TUI_FILE_H
+#ifndef TUI_TUI_FILE_H
+#define TUI_TUI_FILE_H
 
 #include "ui-file.h"
 
@@ -33,4 +33,4 @@ public:
   void flush () override;
 };
 
-#endif
+#endif /* TUI_TUI_FILE_H */
diff --git a/gdb/tui/tui-hooks.h b/gdb/tui/tui-hooks.h
index ea5857119e4..e7e62d76aed 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_HOOKS_H
-#define TUI_HOOKS_H
+#ifndef TUI_TUI_HOOKS_H
+#define TUI_TUI_HOOKS_H
 
 extern void tui_install_hooks (void);
 extern void tui_remove_hooks (void);
 
-#endif
+#endif /* TUI_TUI_HOOKS_H */
diff --git a/gdb/tui/tui-io.h b/gdb/tui/tui-io.h
index 698b5387fb9..8165b5bdfc1 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_IO_H
-#define TUI_IO_H
+#ifndef TUI_TUI_IO_H
+#define TUI_TUI_IO_H
 
 #include "gdb_curses.h"
 
@@ -51,4 +51,4 @@ extern char *tui_expand_tabs (const char *, int);
 extern struct ui_out *tui_out;
 extern cli_ui_out *tui_old_uiout;
 
-#endif
+#endif /* TUI_TUI_IO_H */
diff --git a/gdb/tui/tui-layout.h b/gdb/tui/tui-layout.h
index 362d7de355e..bc21d2999e4 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_LAYOUT_H
-#define TUI_LAYOUT_H
+#ifndef TUI_TUI_LAYOUT_H
+#define TUI_TUI_LAYOUT_H
 
 #include "tui/tui.h"
 #include "tui/tui-data.h"
@@ -32,4 +32,4 @@ extern int tui_default_win_viewport_height (enum tui_win_type,
 					    enum tui_layout_type);
 extern enum tui_status tui_set_layout (enum tui_layout_type);
 
-#endif /*TUI_LAYOUT_H */
+#endif /* TUI_TUI_LAYOUT_H */
diff --git a/gdb/tui/tui-out.h b/gdb/tui/tui-out.h
index ffda6ccdeed..10311c92556 100644
--- a/gdb/tui/tui-out.h
+++ b/gdb/tui/tui-out.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_OUT_H
-#define TUI_OUT_H
+#ifndef TUI_TUI_OUT_H
+#define TUI_TUI_OUT_H
 
 #include "cli-out.h"
 
@@ -45,4 +45,4 @@ private:
 
 extern tui_ui_out *tui_out_new (struct ui_file *stream);
 
-#endif
+#endif /* TUI_TUI_OUT_H */
diff --git a/gdb/tui/tui-regs.h b/gdb/tui/tui-regs.h
index 6bd6a63ed2e..54b1b0870f7 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_REGS_H
-#define TUI_REGS_H
+#ifndef TUI_TUI_REGS_H
+#define TUI_TUI_REGS_H
 
 #include "tui/tui-data.h"  /* For struct tui_register_display_type.  */
 
@@ -33,4 +33,4 @@ extern int tui_first_reg_element_inline (int);
 extern int tui_line_from_reg_element_no (int);
 extern int tui_first_reg_element_no_inline (int lineno);
 
-#endif
+#endif /* TUI_TUI_REGS_H */
diff --git a/gdb/tui/tui-source.h b/gdb/tui/tui-source.h
index 7499534d51b..40fdac5c381 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_SOURCE_H
-#define TUI_SOURCE_H
+#ifndef TUI_TUI_SOURCE_H
+#define TUI_TUI_SOURCE_H
 
 #include "tui/tui-data.h"
 
@@ -39,4 +39,4 @@ extern int tui_source_is_displayed (const char *);
 extern void tui_vertical_source_scroll (enum tui_scroll_direction,
 					int);
 
-#endif
+#endif /* TUI_TUI_SOURCE_H */
diff --git a/gdb/tui/tui-stack.h b/gdb/tui/tui-stack.h
index c8728feb34d..0a88f49932e 100644
--- a/gdb/tui/tui-stack.h
+++ b/gdb/tui/tui-stack.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_STACK_H
-#define TUI_STACK_H
+#ifndef TUI_TUI_STACK_H
+#define TUI_TUI_STACK_H
 
 struct frame_info;
 
@@ -28,4 +28,4 @@ extern void tui_update_locator_fullname (const char *);
 extern void tui_show_locator_content (void);
 extern int tui_show_frame_info (struct frame_info *);
 
-#endif
+#endif /* TUI_TUI_STACK_H */
diff --git a/gdb/tui/tui-win.h b/gdb/tui/tui-win.h
index dec25d5493f..98c497eb07d 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_WIN_H
-#define TUI_WIN_H
+#ifndef TUI_TUI_WIN_H
+#define TUI_TUI_WIN_H
 
 #include "tui/tui-data.h"
 
@@ -59,4 +59,4 @@ struct cmd_list_element **tui_get_cmd_list (void);
 /* Set a TUI variable.  */
 void tui_set_var_cmd (char *, int, struct cmd_list_element *);
 
-#endif
+#endif /* TUI_TUI_WIN_H */
diff --git a/gdb/tui/tui-windata.h b/gdb/tui/tui-windata.h
index bc17754e1bc..63fca0dd287 100644
--- a/gdb/tui/tui-windata.h
+++ b/gdb/tui/tui-windata.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_WINDATA_H
-#define TUI_WINDATA_H
+#ifndef TUI_TUI_WINDATA_H
+#define TUI_TUI_WINDATA_H
 
 #include "tui/tui-data.h"
 
@@ -36,4 +36,4 @@ extern void tui_display_data_from (int, int);
 extern void tui_vertical_data_scroll (enum tui_scroll_direction, 
 				      int);
 
-#endif
+#endif /* TUI_TUI_WINDATA_H */
diff --git a/gdb/tui/tui-wingeneral.h b/gdb/tui/tui-wingeneral.h
index 769573393d6..73b10d21311 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_WINGENERAL_H
-#define TUI_WINGENERAL_H
+#ifndef TUI_TUI_WINGENERAL_H
+#define TUI_TUI_WINGENERAL_H
 
 #include "gdb_curses.h"
 
@@ -41,4 +41,4 @@ extern void tui_refresh_all (struct tui_win_info **);
 extern void tui_delete_win (WINDOW *window);
 extern void tui_refresh_win (struct tui_gen_win_info *);
 
-#endif
+#endif /* TUI_TUI_WINGENERAL_H */
diff --git a/gdb/tui/tui-winsource.h b/gdb/tui/tui-winsource.h
index ca46858f12d..db33a4f73ef 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_SOURCEWIN_H
-#define TUI_SOURCEWIN_H
+#ifndef TUI_TUI_WINSOURCE_H
+#define TUI_TUI_WINSOURCE_H
 
 #include "tui/tui-data.h"
 
@@ -76,4 +76,4 @@ extern int tui_addr_is_displayed (CORE_ADDR,
 /* Constant definitions. */
 #define SCROLL_THRESHOLD 2	/* Threshold for lazy scroll.  */
 
-#endif
+#endif /* TUI_TUI_WINSOURCE_H */
diff --git a/gdb/tui/tui.h b/gdb/tui/tui.h
index 95dd182cc7d..5b8be0cd481 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_H
-#define TUI_H
+#ifndef TUI_TUI_H
+#define TUI_TUI_H
 
 struct ui_file;
 
@@ -96,4 +96,4 @@ extern void tui_show_source (const char *fullname, int line);
 /* tui-layout.c */
 extern enum tui_status tui_set_layout_by_name (const char *);
 
-#endif
+#endif /* TUI_TUI_H */
diff --git a/gdb/varobj-iter.h b/gdb/varobj-iter.h
index 5350bc54e48..bc613af63c4 100644
--- a/gdb/varobj-iter.h
+++ b/gdb/varobj-iter.h
@@ -14,6 +14,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 VAROBJ_ITER_H
+#define VAROBJ_ITER_H
+
 /* A node or item of varobj, composed of the name and the value.  */
 
 typedef struct varobj_item
@@ -70,3 +73,5 @@ struct varobj_iter_ops
 	  xfree (ITER);		       \
 	}				       \
     } while (0)
+
+#endif /* VAROBJ_ITER_H */
diff --git a/gdb/xcoffread.h b/gdb/xcoffread.h
index 26cf4e42bb0..a110a81d695 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 XCOFF_READ_H
-#define XCOFF_READ_H
+#ifndef XCOFFREAD_H
+#define XCOFFREAD_H
 
 extern CORE_ADDR xcoff_get_toc_offset (struct objfile *);
 
 extern int xcoff_get_n_import_files (bfd *abfd);
 
-#endif /* xcoffread.h */
+#endif /* XCOFFREAD_H */
diff --git a/gdb/xtensa-tdep.h b/gdb/xtensa-tdep.h
index 389f3cb51ed..5d24a591bc3 100644
--- a/gdb/xtensa-tdep.h
+++ b/gdb/xtensa-tdep.h
@@ -17,6 +17,8 @@
    You 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
 
 #include "arch/xtensa.h"
 
@@ -291,3 +293,4 @@ struct gdbarch_tdep
    data structure to their corresponding register in the AR register 
    file (see xtensa-tdep.c).  */
 
+#endif /* XTENSA_TDEP_H */
diff --git a/gdb/yy-remap.h b/gdb/yy-remap.h
index 494c6083624..579b7d2aee6 100644
--- a/gdb/yy-remap.h
+++ b/gdb/yy-remap.h
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef YY_REMAP_H
+#define YY_REMAP_H
+
 /* Remap normal yacc parser interface names (yyparse, yylex, yyerror,
    etc), as well as gratuitiously global symbol names, so we can have
    multiple yacc generated parsers in gdb.  Note that these are only
@@ -90,3 +93,5 @@
 #endif
 
 #define YYFPRINTF parser_fprintf
+
+#endif /* YY_REMAP_H */
author	Tom Tromey <tom@tromey.com>	2019-01-27 12:51:36 -0700
committer	Tom Tromey <tom@tromey.com>	2019-02-07 03:27:23 -0700
commit	1a5c25988eabb35e0e40ea484b1eea029d9b7f53 (patch)
tree	84c6f820847657cbb3a320ad7e1603cc42b2c3d9 /gdb
parent	31528deca52123a5a6dee19d47bee94dff041325 (diff)
download	binutils-gdb-1a5c25988eabb35e0e40ea484b1eea029d9b7f53.tar.gz