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/common
parent: 31528deca52123a5a6dee19d47bee94dff041325 (diff)
download: gdb-1a5c25988eabb35e0e40ea484b1eea029d9b7f53.zip
gdb-1a5c25988eabb35e0e40ea484b1eea029d9b7f53.tar.gz
gdb-1a5c25988eabb35e0e40ea484b1eea029d9b7f53.tar.bz2
50 files changed, 154 insertions, 150 deletions
diff --git a/gdb/common/break-common.h b/gdb/common/break-common.h
index 4375fe3..d85cadf 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 284adf6..0b18924 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 66b770a..8b24b54 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 4d5c9fa..f49bcb4 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 5cf8230..d5bfc9e 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 e574de5..732693d 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 0f03dc2..471e7c5 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 b7e93be..d692be2 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 7e8e736..72e4bd9 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 938bb29..95ce64a 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 dcce0c3..ed73f6f 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 b2cb516..52bf343 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 29d534f..8a6b907 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 7559853..7a2e7c2 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 1c50005..7e95b9c 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 7d7aa3a..e1b486d 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 f59f229..a719d87 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 fb3d6c5..4e59b4f 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 acb1045..7ca5725 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 65afe95..b104556 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 1597dad..d4ebbfa 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 a3fc467..90b05cd 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 001f1af..68f7f7d 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 7b4ee57..66c2bb3 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 4f4c239..b181b6a 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 1e8ceb4..327e127 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 e3be44b..193c2f8 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 86803d4..017bf93 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 b65dcd2..b3b752c 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 e6878c9..dedd9b6 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 1d9cae0..56eba97 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 c0f8554..0d39fb5 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 9110130..205c303 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 d43f337..c264e78 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 a7c33d0..cb735c3 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 152bc59..815b14c 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 16d1b64..31440c8 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 ed95ce7..3bc9c7e 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 629d728..4bf7fcf 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 2522ca3..9c15dd7 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 18027c6..89aec01 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 87b1f42..bdd22f5 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 1c9d102..763f40e 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 127752e..54c3ff5 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 0922bca..c566ec5 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 4db5473..a0bc633 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 d4e4c02..8ac146d 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 c804f47..9e840e7 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 7f378bd..4ce8f61 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 4cc47d9..747e8c8 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 */
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/common
parent	31528deca52123a5a6dee19d47bee94dff041325 (diff)
download	gdb-1a5c25988eabb35e0e40ea484b1eea029d9b7f53.zip gdb-1a5c25988eabb35e0e40ea484b1eea029d9b7f53.tar.gz gdb-1a5c25988eabb35e0e40ea484b1eea029d9b7f53.tar.bz2