Run check-include-guards.py

This patch is the result of running check-include-guards.py on the
current tree.  Running it a second time causes no changes.

Reviewed-By: Tom de Vries <tdevries@suse.de>

gdb/aarch32-linux-nat.h

@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AARCH32_LINUX_NAT_H
-#define AARCH32_LINUX_NAT_H
+#ifndef GDB_AARCH32_LINUX_NAT_H
+#define GDB_AARCH32_LINUX_NAT_H
 
 void aarch32_gp_regcache_supply (struct regcache *regcache, uint32_t *regs,
 				 int arm_apcs_32);
@@ -31,4 +31,4 @@ void aarch32_vfp_regcache_collect (const struct regcache *regcache,
 				   gdb_byte *regs,
 				   const int vfp_register_count);
 
-#endif /* AARCH32_LINUX_NAT_H */
+#endif /* GDB_AARCH32_LINUX_NAT_H */

gdb/aarch32-tdep.h

@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AARCH32_TDEP_H
-#define AARCH32_TDEP_H
+#ifndef GDB_AARCH32_TDEP_H
+#define GDB_AARCH32_TDEP_H
 
 struct target_desc;
 
@@ -24,4 +24,4 @@ struct target_desc;
 
 const target_desc *aarch32_read_description (bool tls);
 
-#endif /* aarch32-tdep.h.  */
+#endif /* GDB_AARCH32_TDEP_H */

gdb/aarch64-fbsd-tdep.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AARCH64_FBSD_TDEP_H
-#define AARCH64_FBSD_TDEP_H
+#ifndef GDB_AARCH64_FBSD_TDEP_H
+#define GDB_AARCH64_FBSD_TDEP_H
 
 #include "regset.h"
 
@@ -39,4 +39,4 @@ extern const struct regset aarch64_fbsd_gregset;
 extern const struct regset aarch64_fbsd_fpregset;
 extern const struct regset aarch64_fbsd_tls_regset;
 
-#endif /* AARCH64_FBSD_TDEP_H */
+#endif /* GDB_AARCH64_FBSD_TDEP_H */

gdb/aarch64-linux-tdep.h

@@ -18,8 +18,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AARCH64_LINUX_TDEP_H
-#define AARCH64_LINUX_TDEP_H
+#ifndef GDB_AARCH64_LINUX_TDEP_H
+#define GDB_AARCH64_LINUX_TDEP_H
 
 #include "regset.h"
 
@@ -45,4 +45,4 @@ extern const struct regset aarch64_linux_fpregset;
 /* Matches HWCAP_PACA in kernel header arch/arm64/include/uapi/asm/hwcap.h.  */
 #define AARCH64_HWCAP_PACA (1 << 30)
 
-#endif /* AARCH64_LINUX_TDEP_H */
+#endif /* GDB_AARCH64_LINUX_TDEP_H */

gdb/aarch64-nat.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AARCH64_NAT_H
-#define AARCH64_NAT_H
+#ifndef GDB_AARCH64_NAT_H
+#define GDB_AARCH64_NAT_H
 
 #include "breakpoint.h"
 #include "nat/aarch64-hw-point.h"
@@ -98,4 +98,4 @@ struct aarch64_nat_target : public BaseTarget
   { return start <= addr && start + length - 1 >= addr; }
 };
 
-#endif /* AARCH64_NAT_H */
+#endif /* GDB_AARCH64_NAT_H */

gdb/aarch64-ravenscar-thread.h

@@ -17,11 +17,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AARCH64_RAVENSCAR_THREAD_H
-#define AARCH64_RAVENSCAR_THREAD_H
+#ifndef GDB_AARCH64_RAVENSCAR_THREAD_H
+#define GDB_AARCH64_RAVENSCAR_THREAD_H
 
 struct gdbarch;
 
 extern void register_aarch64_ravenscar_ops (struct gdbarch *gdbarch);
 
-#endif
+#endif /* GDB_AARCH64_RAVENSCAR_THREAD_H */

gdb/aarch64-tdep.h

@@ -19,8 +19,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#ifndef AARCH64_TDEP_H
-#define AARCH64_TDEP_H
+#ifndef GDB_AARCH64_TDEP_H
+#define GDB_AARCH64_TDEP_H
 
 #include "arch/aarch64.h"
 #include "displaced-stepping.h"
@@ -211,4 +211,4 @@ std::optional<CORE_ADDR> aarch64_mte_get_atag (CORE_ADDR address);
 CORE_ADDR aarch64_remove_non_address_bits (struct gdbarch *gdbarch,
 					   CORE_ADDR pointer);
 
-#endif /* aarch64-tdep.h */
+#endif /* GDB_AARCH64_TDEP_H */

gdb/ada-exp.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ADA_EXP_H
-#define ADA_EXP_H
+#ifndef GDB_ADA_EXP_H
+#define GDB_ADA_EXP_H
 
 #include "expop.h"
 
@@ -991,4 +991,4 @@ public:
 
 } /* namespace expr */
 
-#endif /* ADA_EXP_H */
+#endif /* GDB_ADA_EXP_H */

gdb/ada-lang.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (ADA_LANG_H)
-#define ADA_LANG_H 1
+#ifndef GDB_ADA_LANG_H
+#define GDB_ADA_LANG_H
 
 class frame_info_ptr;
 struct inferior;
@@ -437,4 +437,4 @@ extern struct type *ada_index_type (struct type *type, int n,
 
 extern void ada_clear_symbol_cache (program_space *pspace);
 
-#endif
+#endif /* GDB_ADA_LANG_H */

gdb/addrmap.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ADDRMAP_H
-#define ADDRMAP_H
+#ifndef GDB_ADDRMAP_H
+#define GDB_ADDRMAP_H
 
 #include "gdbsupport/function-view.h"
 #include "gdbsupport/gdb_obstack.h"
@@ -229,4 +229,4 @@ void addrmap_dump (struct addrmap *map, struct ui_file *outfile,
 					    const void *value)>
 		     annotate_value = nullptr);
 
-#endif /* ADDRMAP_H */
+#endif /* GDB_ADDRMAP_H */

gdb/alpha-bsd-tdep.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ALPHA_BSD_TDEP_H
-#define ALPHA_BSD_TDEP_H
+#ifndef GDB_ALPHA_BSD_TDEP_H
+#define GDB_ALPHA_BSD_TDEP_H
 
 #include "gdbarch.h"
 
@@ -39,4 +39,4 @@ void alphanbsd_iterate_over_regset_sections (struct gdbarch *gdbarch,
 					     void *cb_data,
 					     const struct regcache *regcache);
 
-#endif /* alpha-bsd-tdep.h */
+#endif /* GDB_ALPHA_BSD_TDEP_H */

gdb/alpha-tdep.h

@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ALPHA_TDEP_H
-#define ALPHA_TDEP_H
+#ifndef GDB_ALPHA_TDEP_H
+#define GDB_ALPHA_TDEP_H
 
 #include "gdbarch.h"
 
@@ -121,4 +121,4 @@ extern void alpha_supply_fp_regs (struct regcache *, int,
 extern void alpha_fill_fp_regs (const struct regcache *,
 				int, void *, void *);
 
-#endif /* ALPHA_TDEP_H */
+#endif /* GDB_ALPHA_TDEP_H */

gdb/amd-dbgapi-target.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AMD_DBGAPI_TARGET_H
-#define AMD_DBGAPI_TARGET_H 1
+#ifndef GDB_AMD_DBGAPI_TARGET_H
+#define GDB_AMD_DBGAPI_TARGET_H
 
 #include "gdbsupport/observable.h"
 
@@ -113,4 +113,4 @@ get_status_string (amd_dbgapi_status_t status)
   return ret;
 }
 
-#endif /* AMD_DBGAPI_TARGET_H */
+#endif /* GDB_AMD_DBGAPI_TARGET_H */

gdb/amd64-bsd-nat.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AMD64_BSD_NAT_H
-#define AMD64_BSD_NAT_H
+#ifndef GDB_AMD64_BSD_NAT_H
+#define GDB_AMD64_BSD_NAT_H
 
 #include "x86-bsd-nat.h"
 
@@ -41,4 +41,4 @@ public:
   { amd64bsd_store_inferior_registers (regcache, regnum); }
 };
 
-#endif /* i386-bsd-nat.h */
+#endif /* GDB_AMD64_BSD_NAT_H */

gdb/amd64-darwin-tdep.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AMD64_DARWIN_TDEP_H
-#define AMD64_DARWIN_TDEP_H
+#ifndef GDB_AMD64_DARWIN_TDEP_H
+#define GDB_AMD64_DARWIN_TDEP_H
 
 /* Mapping between the general-purpose registers in Darwin x86-64 thread
    state and GDB's register cache layout.
@@ -26,4 +26,4 @@
 extern int amd64_darwin_thread_state_reg_offset[];
 extern const int amd64_darwin_thread_state_num_regs;
 
-#endif /* AMD64_DARWIN_TDEP_H */
+#endif /* GDB_AMD64_DARWIN_TDEP_H */

gdb/amd64-fbsd-tdep.h

@@ -17,11 +17,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AMD64_FBSD_TDEP_H
-#define AMD64_FBSD_TDEP_H
+#ifndef GDB_AMD64_FBSD_TDEP_H
+#define GDB_AMD64_FBSD_TDEP_H
 
 #include "regset.h"
 
 extern const struct regset amd64_fbsd_gregset;
 
-#endif /* AMD64_FBSD_TDEP_H */
+#endif /* GDB_AMD64_FBSD_TDEP_H */

gdb/amd64-linux-tdep.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AMD64_LINUX_TDEP_H
-#define AMD64_LINUX_TDEP_H
+#ifndef GDB_AMD64_LINUX_TDEP_H
+#define GDB_AMD64_LINUX_TDEP_H
 
 /* Like for i386 GNU/Linux, there is an extra "register"
    used to control syscall restarting.  */
@@ -586,4 +586,4 @@ enum amd64_x32_syscall {
   amd64_x32_sys_getsockopt = (amd64_x32_syscall_bit + 542),
 };
 
-#endif /* amd64-linux-tdep.h */
+#endif /* GDB_AMD64_LINUX_TDEP_H */

gdb/amd64-nat.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AMD64_NAT_H
-#define AMD64_NAT_H 1
+#ifndef GDB_AMD64_NAT_H
+#define GDB_AMD64_NAT_H
 
 struct regcache;
 
@@ -49,4 +49,4 @@ extern void amd64_supply_native_gregset (struct regcache *regcache,
 extern void amd64_collect_native_gregset (const struct regcache *regcache,
 					  void *gregs, int regnum);
 
-#endif /* amd64-nat.h */
+#endif /* GDB_AMD64_NAT_H */

gdb/amd64-ravenscar-thread.h

@@ -17,11 +17,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AMD64_RAVENSCAR_THREAD_H
-#define AMD64_RAVENSCAR_THREAD_H
+#ifndef GDB_AMD64_RAVENSCAR_THREAD_H
+#define GDB_AMD64_RAVENSCAR_THREAD_H
 
 struct gdbarch;
 
 extern void register_amd64_ravenscar_ops (struct gdbarch *gdbarch);
 
-#endif /* AMD64_RAVENSCAR_THREAD_H */
+#endif /* GDB_AMD64_RAVENSCAR_THREAD_H */

gdb/amd64-tdep.h

@@ -18,8 +18,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AMD64_TDEP_H
-#define AMD64_TDEP_H
+#ifndef GDB_AMD64_TDEP_H
+#define GDB_AMD64_TDEP_H
 
 struct gdbarch;
 class frame_info_ptr;
@@ -146,4 +146,4 @@ extern int amd64nbsd_r_reg_offset[];
 /* Variables exported from amd64-obsd-tdep.c.  */
 extern int amd64obsd_r_reg_offset[];
 
-#endif /* amd64-tdep.h */
+#endif /* GDB_AMD64_TDEP_H */

gdb/amdgpu-tdep.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AMDGPU_TDEP_H
-#define AMDGPU_TDEP_H
+#ifndef GDB_AMDGPU_TDEP_H
+#define GDB_AMDGPU_TDEP_H
 
 #include "gdbarch.h"
 
@@ -90,4 +90,4 @@ bool is_amdgpu_arch (struct gdbarch *gdbarch);
 
 amdgpu_gdbarch_tdep *get_amdgpu_gdbarch_tdep (gdbarch *arch);
 
-#endif /* AMDGPU_TDEP_H */
+#endif /* GDB_AMDGPU_TDEP_H */

gdb/annotate.h

@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ANNOTATE_H
-#define ANNOTATE_H
+#ifndef GDB_ANNOTATE_H
+#define GDB_ANNOTATE_H
 
 #include "symtab.h"
 #include "gdbtypes.h"
@@ -140,4 +140,4 @@ extern void annotate_array_section_end (void);
 extern void (*deprecated_annotate_signalled_hook) (void);
 extern void (*deprecated_annotate_signal_hook) (void);
 
-#endif /* ANNOTATE_H */
+#endif /* GDB_ANNOTATE_H */

gdb/arc-linux-tdep.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARC_LINUX_TDEP_H
-#define ARC_LINUX_TDEP_H
+#ifndef GDB_ARC_LINUX_TDEP_H
+#define GDB_ARC_LINUX_TDEP_H
 
 #include "gdbarch.h"
 #include "regset.h"
@@ -49,4 +49,4 @@ void arc_linux_collect_v2_regset (const struct regset *regset,
 				  const struct regcache *regcache,
 				  int regnum, void *v2_regs, size_t size);
 
-#endif /* ARC_LINUX_TDEP_H */
+#endif /* GDB_ARC_LINUX_TDEP_H */

gdb/arc-tdep.h

@@ -18,8 +18,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARC_TDEP_H
-#define ARC_TDEP_H
+#ifndef GDB_ARC_TDEP_H
+#define GDB_ARC_TDEP_H
 
 /* Need disassemble_info.  */
 #include "dis-asm.h"
@@ -205,4 +205,4 @@ CORE_ADDR arc_insn_get_linear_next_pc (const struct arc_instruction &insn);
 arc_arch_features arc_arch_features_create (const bfd *abfd,
 					    const unsigned long mach);
 
-#endif /* ARC_TDEP_H */
+#endif /* GDB_ARC_TDEP_H */

gdb/arch-utils.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_UTILS_H
-#define ARCH_UTILS_H
+#ifndef GDB_ARCH_UTILS_H
+#define GDB_ARCH_UTILS_H
 
 #include "gdbarch.h"
 
@@ -325,4 +325,4 @@ extern enum return_value_convention default_gdbarch_return_value
       struct regcache *regcache, struct value **read_value,
       const gdb_byte *writebuf);
 
-#endif /* ARCH_UTILS_H */
+#endif /* GDB_ARCH_UTILS_H */

gdb/arch/aarch32.h

@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_AARCH32_H
-#define ARCH_AARCH32_H
+#ifndef GDB_ARCH_AARCH32_H
+#define GDB_ARCH_AARCH32_H
 
 #include "gdbsupport/tdesc.h"
 
@@ -24,4 +24,4 @@
 
 target_desc *aarch32_create_target_description (bool tls);
 
-#endif /* aarch32.h.  */
+#endif /* GDB_ARCH_AARCH32_H */

gdb/arch/aarch64-insn.h

@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_AARCH64_INSN_H
-#define ARCH_AARCH64_INSN_H
+#ifndef GDB_ARCH_AARCH64_INSN_H
+#define GDB_ARCH_AARCH64_INSN_H
 
 extern bool aarch64_debug;
 
@@ -356,4 +356,4 @@ int aarch64_emit_load_store (uint32_t *buf, uint32_t size,
 			     struct aarch64_register rn,
 			     struct aarch64_memory_operand operand);
 
-#endif /* ARCH_AARCH64_INSN_H */
+#endif /* GDB_ARCH_AARCH64_INSN_H */

gdb/arch/aarch64-mte-linux.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_AARCH64_MTE_LINUX_H
-#define ARCH_AARCH64_MTE_LINUX_H
+#ifndef GDB_ARCH_AARCH64_MTE_LINUX_H
+#define GDB_ARCH_AARCH64_MTE_LINUX_H
 
 
 /* Feature check for Memory Tagging Extension.  */
@@ -53,4 +53,4 @@ extern void aarch64_mte_pack_tags (gdb::byte_vector &tags);
    first unpacked element.  Otherwise leave it in the unpacked vector.  */
 extern void aarch64_mte_unpack_tags (gdb::byte_vector &tags, bool skip_first);
 
-#endif /* ARCH_AARCH64_MTE_LINUX_H */
+#endif /* GDB_ARCH_AARCH64_MTE_LINUX_H */

gdb/arch/aarch64-mte.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_AARCH64_MTE_H
-#define ARCH_AARCH64_MTE_H
+#ifndef GDB_ARCH_AARCH64_MTE_H
+#define GDB_ARCH_AARCH64_MTE_H
 
 
 /* We have one tag per 16 bytes of memory.  */
@@ -48,4 +48,4 @@ extern CORE_ADDR aarch64_mte_set_ltag (CORE_ADDR address, CORE_ADDR tag);
    It is always possible to get the logical tag.  */
 extern CORE_ADDR aarch64_mte_get_ltag (CORE_ADDR address);
 
-#endif /* ARCH_AARCH64_MTE_H */
+#endif /* GDB_ARCH_AARCH64_MTE_H */

gdb/arch/aarch64-scalable-linux.h

@@ -18,8 +18,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_AARCH64_SCALABLE_LINUX_H
-#define ARCH_AARCH64_SCALABLE_LINUX_H
+#ifndef GDB_ARCH_AARCH64_SCALABLE_LINUX_H
+#define GDB_ARCH_AARCH64_SCALABLE_LINUX_H
 
 #include "gdbsupport/common-regcache.h"
 
@@ -55,4 +55,4 @@
    is empty (zero).  Return FALSE otherwise.  */
 extern bool sve_state_is_empty (const struct reg_buffer_common *reg_buf);
 
-#endif /* ARCH_AARCH64_SCALABLE_LINUX_H */
+#endif /* GDB_ARCH_AARCH64_SCALABLE_LINUX_H */

gdb/arch/aarch64.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_AARCH64_H
-#define ARCH_AARCH64_H
+#ifndef GDB_ARCH_AARCH64_H
+#define GDB_ARCH_AARCH64_H
 
 #include "gdbsupport/tdesc.h"
 
@@ -230,4 +230,4 @@ enum aarch64_regnum
 /* Size of the SME2 ZT0 register in bytes.  */
 #define AARCH64_SME2_ZT0_SIZE 64
 
-#endif /* ARCH_AARCH64_H */
+#endif /* GDB_ARCH_AARCH64_H */

gdb/arch/amd64-linux-tdesc.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_AMD64_LINUX_TDESC_H
-#define ARCH_AMD64_LINUX_TDESC_H
+#ifndef GDB_ARCH_AMD64_LINUX_TDESC_H
+#define GDB_ARCH_AMD64_LINUX_TDESC_H
 
 struct target_desc;
 
@@ -27,4 +27,4 @@ struct target_desc;
 extern const target_desc *amd64_linux_read_description (uint64_t xcr0,
 							bool is_x32);
 
-#endif /* ARCH_AMD64_LINUX_TDESC_H */
+#endif /* GDB_ARCH_AMD64_LINUX_TDESC_H */

gdb/arch/amd64.h

@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_AMD64_H
-#define ARCH_AMD64_H
+#ifndef GDB_ARCH_AMD64_H
+#define GDB_ARCH_AMD64_H
 
 #include "gdbsupport/tdesc.h"
 #include <stdint.h>
@@ -24,4 +24,4 @@
 target_desc *amd64_create_target_description (uint64_t xcr0, bool is_x32,
 					      bool is_linux, bool segments);
 
-#endif /* ARCH_AMD64_H */
+#endif /* GDB_ARCH_AMD64_H */

gdb/arch/arc.h

@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_ARC_H
-#define ARCH_ARC_H
+#ifndef GDB_ARCH_ARC_H
+#define GDB_ARCH_ARC_H
 
 #include "gdbsupport/tdesc.h"
 
@@ -84,4 +84,4 @@ const target_desc *arc_lookup_target_description
 #endif /* GDBSERVER */
 
 
-#endif /* ARCH_ARC_H */
+#endif /* GDB_ARCH_ARC_H */

gdb/arch/arm-get-next-pcs.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_ARM_GET_NEXT_PCS_H
-#define ARCH_ARM_GET_NEXT_PCS_H
+#ifndef GDB_ARCH_ARM_GET_NEXT_PCS_H
+#define GDB_ARCH_ARM_GET_NEXT_PCS_H
 
 #include <vector>
 
@@ -65,4 +65,4 @@ void arm_get_next_pcs_ctor (struct arm_get_next_pcs *self,
 /* Find the next possible PCs after the current instruction executes.  */
 std::vector<CORE_ADDR> arm_get_next_pcs (struct arm_get_next_pcs *self);
 
-#endif /* ARCH_ARM_GET_NEXT_PCS_H */
+#endif /* GDB_ARCH_ARM_GET_NEXT_PCS_H */

gdb/arch/arm-linux.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_ARM_LINUX_H
-#define ARCH_ARM_LINUX_H
+#ifndef GDB_ARCH_ARM_LINUX_H
+#define GDB_ARCH_ARM_LINUX_H
 
 /* The index to access CSPR in user_regs defined in GLIBC.  */
 #define ARM_CPSR_GREGNUM 16
@@ -79,4 +79,4 @@ struct arm_get_next_pcs;
 CORE_ADDR arm_linux_get_next_pcs_fixup (struct arm_get_next_pcs *self,
 					CORE_ADDR pc);
 
-#endif /* ARCH_ARM_LINUX_H */
+#endif /* GDB_ARCH_ARM_LINUX_H */

gdb/arch/arm.h

@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_ARM_H
-#define ARCH_ARM_H
+#ifndef GDB_ARCH_ARM_H
+#define GDB_ARCH_ARM_H
 
 #include "gdbsupport/tdesc.h"
 
@@ -227,4 +227,4 @@ target_desc *arm_create_target_description (arm_fp_type fp_type, bool tls);
 
 target_desc *arm_create_mprofile_target_description (arm_m_profile_type m_type);
 
-#endif /* ARCH_ARM_H */
+#endif /* GDB_ARCH_ARM_H */

gdb/arch/csky.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_CSKY_H
-#define ARCH_CSKY_H
+#ifndef GDB_ARCH_CSKY_H
+#define GDB_ARCH_CSKY_H
 
 #include "gdbsupport/tdesc.h"
 
@@ -26,4 +26,4 @@
 
 target_desc_up csky_create_target_description (void);
 
-#endif /* ARCH_CSKY_H */
+#endif /* GDB_ARCH_CSKY_H */

gdb/arch/i386-linux-tdesc.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_I386_LINUX_TDESC_H
-#define ARCH_I386_LINUX_TDESC_H
+#ifndef GDB_ARCH_I386_LINUX_TDESC_H
+#define GDB_ARCH_I386_LINUX_TDESC_H
 
 struct target_desc;
 
@@ -26,4 +26,4 @@ struct target_desc;
 
 extern const struct target_desc *i386_linux_read_description (uint64_t xcr0);
 
-#endif /* ARCH_I386_LINUX_TDESC_H */
+#endif /* GDB_ARCH_I386_LINUX_TDESC_H */

gdb/arch/i386.h

@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_I386_H
-#define ARCH_I386_H
+#ifndef GDB_ARCH_I386_H
+#define GDB_ARCH_I386_H
 
 #include "gdbsupport/tdesc.h"
 #include <stdint.h>
@@ -24,4 +24,4 @@
 target_desc *i386_create_target_description (uint64_t xcr0, bool is_linux,
 					     bool segments);
 
-#endif /* ARCH_I386_H */
+#endif /* GDB_ARCH_I386_H */

gdb/arch/loongarch.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_LOONGARCH_H
-#define ARCH_LOONGARCH_H
+#ifndef GDB_ARCH_LOONGARCH_H
+#define GDB_ARCH_LOONGARCH_H
 
 #include "gdbsupport/tdesc.h"
 
@@ -128,4 +128,4 @@ const target_desc *loongarch_lookup_target_description
 
 #endif /* GDBSERVER */
 
-#endif /* ARCH_LOONGARCH_H  */
+#endif /* GDB_ARCH_LOONGARCH_H */

gdb/arch/ppc-linux-common.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_PPC_LINUX_COMMON_H
-#define ARCH_PPC_LINUX_COMMON_H
+#ifndef GDB_ARCH_PPC_LINUX_COMMON_H
+#define GDB_ARCH_PPC_LINUX_COMMON_H
 
 struct target_desc;
 
@@ -75,4 +75,4 @@ const struct ppc_linux_features ppc_linux_no_features = {
 const struct target_desc * ppc_linux_match_description
 (struct ppc_linux_features features);
 
-#endif /* ARCH_PPC_LINUX_COMMON_H */
+#endif /* GDB_ARCH_PPC_LINUX_COMMON_H */

gdb/arch/ppc-linux-tdesc.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_PPC_LINUX_TDESC_H
-#define ARCH_PPC_LINUX_TDESC_H
+#ifndef GDB_ARCH_PPC_LINUX_TDESC_H
+#define GDB_ARCH_PPC_LINUX_TDESC_H
 
 struct target_desc;
 
@@ -43,4 +43,4 @@ extern const struct target_desc *tdesc_powerpc_isa205_ppr_dscr_vsx64l;
 extern const struct target_desc *tdesc_powerpc_isa207_vsx64l;
 extern const struct target_desc *tdesc_powerpc_isa207_htm_vsx64l;
 
-#endif /* ARCH_PPC_LINUX_TDESC_H */
+#endif /* GDB_ARCH_PPC_LINUX_TDESC_H */

gdb/arch/riscv.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_RISCV_H
-#define ARCH_RISCV_H
+#ifndef GDB_ARCH_RISCV_H
+#define GDB_ARCH_RISCV_H
 
 #include "gdbsupport/tdesc.h"
 
@@ -119,4 +119,4 @@ const target_desc *riscv_lookup_target_description
 #endif /* GDBSERVER */
 
 
-#endif /* ARCH_RISCV_H */
+#endif /* GDB_ARCH_RISCV_H */

gdb/arch/tic6x.h

@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_TIC6X_H
-#define ARCH_TIC6X_H
+#ifndef GDB_ARCH_TIC6X_H
+#define GDB_ARCH_TIC6X_H
 
 enum c6x_feature
 {
@@ -28,4 +28,4 @@ enum c6x_feature
 
 target_desc *tic6x_create_target_description (enum c6x_feature feature);
 
-#endif /* ARCH_TIC6X_H */
+#endif /* GDB_ARCH_TIC6X_H */

gdb/arch/x86-linux-tdesc-features.h

@@ -17,8 +17,8 @@
    You 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_X86_LINUX_TDESC_FEATURES_H
-#define ARCH_X86_LINUX_TDESC_FEATURES_H
+#ifndef GDB_ARCH_X86_LINUX_TDESC_FEATURES_H
+#define GDB_ARCH_X86_LINUX_TDESC_FEATURES_H
 
 #include "gdbsupport/x86-xstate.h"
 #include "gdbsupport/gdb_assert.h"
@@ -59,4 +59,4 @@ extern uint64_t x86_linux_tdesc_idx_to_xcr0 (int idx);
 
 #endif /* IN_PROCESS_AGENT */
 
-#endif /* ARCH_X86_LINUX_TDESC_FEATURES_H */
+#endif /* GDB_ARCH_X86_LINUX_TDESC_FEATURES_H */

gdb/arch/x86-linux-tdesc.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_X86_LINUX_TDESC_H
-#define ARCH_X86_LINUX_TDESC_H
+#ifndef GDB_ARCH_X86_LINUX_TDESC_H
+#define GDB_ARCH_X86_LINUX_TDESC_H
 
 struct target_desc;
 
@@ -34,4 +34,4 @@ struct target_desc;
 
 extern void x86_linux_post_init_tdesc (target_desc *tdesc, bool is_64bit);
 
-#endif /* ARCH_X86_LINUX_TDESC_H */
+#endif /* GDB_ARCH_X86_LINUX_TDESC_H */

gdb/arch/xtensa.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARCH_XTENSA_H
-#define ARCH_XTENSA_H
+#ifndef GDB_ARCH_XTENSA_H
+#define GDB_ARCH_XTENSA_H
 
 /* Xtensa ELF core file register set representation ('.reg' section).
    Copied from target-side ELF header <xtensa/elf.h>.  */
@@ -45,4 +45,4 @@ typedef struct
 
 #define C0_NREGS   16	/* Number of A-registers to track in call0 ABI.  */
 
-#endif /* ARCH_XTENSA_H */
+#endif /* GDB_ARCH_XTENSA_H */

gdb/arm-fbsd-tdep.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARM_FBSD_TDEP_H
-#define ARM_FBSD_TDEP_H
+#ifndef GDB_ARM_FBSD_TDEP_H
+#define GDB_ARM_FBSD_TDEP_H
 
 #include "regset.h"
 
@@ -56,4 +56,4 @@ extern const struct target_desc *
 extern const struct target_desc *
   arm_fbsd_read_description_auxv (bool tls);
 
-#endif /* ARM_FBSD_TDEP_H */
+#endif /* GDB_ARM_FBSD_TDEP_H */

gdb/arm-linux-tdep.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARM_LINUX_TDEP_H
-#define ARM_LINUX_TDEP_H
+#ifndef GDB_ARM_LINUX_TDEP_H
+#define GDB_ARM_LINUX_TDEP_H
 
 struct regset;
 struct regcache;
@@ -67,4 +67,4 @@ void arm_linux_collect_nwfpe (const struct regset *regset,
 #define HWCAP_VFPv3     8192
 #define HWCAP_VFPv3D16  16384
 
-#endif /* ARM_LINUX_TDEP_H */
+#endif /* GDB_ARM_LINUX_TDEP_H */

gdb/arm-netbsd-tdep.h

@@ -17,11 +17,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARM_NBSD_TDEP_H
-#define ARM_NBSD_TDEP_H
+#ifndef GDB_ARM_NETBSD_TDEP_H
+#define GDB_ARM_NETBSD_TDEP_H
 
 void arm_nbsd_supply_gregset
   (const struct regset *regset, struct regcache *regcache,
    int regnum, const void *gregs, size_t len);
 
-#endif
+#endif /* GDB_ARM_NETBSD_TDEP_H */

gdb/arm-tdep.h

@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARM_TDEP_H
-#define ARM_TDEP_H
+#ifndef GDB_ARM_TDEP_H
+#define GDB_ARM_TDEP_H
 
 /* Forward declarations.  */
 struct regset;
@@ -326,4 +326,4 @@ const target_desc *arm_read_description (arm_fp_type fp_type, bool tls);
    type.  */
 const target_desc *arm_read_mprofile_description (arm_m_profile_type m_type);
 
-#endif /* arm-tdep.h */
+#endif /* GDB_ARM_TDEP_H */

gdb/async-event.h

@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ASYNC_EVENT_H
-#define ASYNC_EVENT_H
+#ifndef GDB_ASYNC_EVENT_H
+#define GDB_ASYNC_EVENT_H
 
 #include "gdbsupport/event-loop.h"
 
@@ -87,4 +87,4 @@ extern void clear_async_event_handler (struct async_event_handler *handler);
 
 extern void initialize_async_signal_handlers (void);
 
-#endif /* ASYNC_EVENT_H */
+#endif /* GDB_ASYNC_EVENT_H */

gdb/auto-load.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AUTO_LOAD_H
-#define AUTO_LOAD_H 1
+#ifndef GDB_AUTO_LOAD_H
+#define GDB_AUTO_LOAD_H
 
 struct objfile;
 struct program_space;
@@ -79,4 +79,4 @@ extern bool file_is_auto_load_safe (const char *filename);
 extern bool auto_load_gdb_scripts_enabled
   (const struct extension_language_defn *extlang);
 
-#endif /* AUTO_LOAD_H */
+#endif /* GDB_AUTO_LOAD_H */

gdb/auxv.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AUXV_H
-#define AUXV_H
+#ifndef GDB_AUXV_H
+#define GDB_AUXV_H
 
 #include "target.h"
 
@@ -88,4 +88,4 @@ extern void default_print_auxv_entry (struct gdbarch *gdbarch,
 extern target_xfer_partial_ftype memory_xfer_auxv;
 
 
-#endif
+#endif /* GDB_AUXV_H */

gdb/ax-gdb.h

@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AX_GDB_H
-#define AX_GDB_H
+#ifndef GDB_AX_GDB_H
+#define GDB_AX_GDB_H
 
 #include "ax.h"
 
@@ -123,4 +123,4 @@ extern agent_expr_up gen_printf (CORE_ADDR, struct gdbarch *,
 				 CORE_ADDR, LONGEST, const char *, int,
 				 int, struct expression **);
 
-#endif /* AX_GDB_H */
+#endif /* GDB_AX_GDB_H */

gdb/ax.h

@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AX_H
-#define AX_H
+#ifndef GDB_AX_H
+#define GDB_AX_H
 
 /* It's sometimes useful to be able to debug programs that you can't
    really stop for more than a fraction of a second.  To this end, the
@@ -224,4 +224,4 @@ extern void ax_print (struct ui_file *f, struct agent_expr * EXPR);
 
 extern void ax_reqs (struct agent_expr *ax);
 
-#endif /* AX_H */
+#endif /* GDB_AX_H */

gdb/bcache.h

@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef BCACHE_H
-#define BCACHE_H 1
+#ifndef GDB_BCACHE_H
+#define GDB_BCACHE_H
 
 /* A bcache is a data structure for factoring out duplication in
    read-only structures.  You give the bcache some string of bytes S.
@@ -230,4 +230,4 @@ private:
 
 } /* namespace gdb */
 
-#endif /* BCACHE_H */
+#endif /* GDB_BCACHE_H */

gdb/bfd-target.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef BFD_TARGET_H
-#define BFD_TARGET_H
+#ifndef GDB_BFD_TARGET_H
+#define GDB_BFD_TARGET_H
 
 #include "gdb_bfd.h"
 
@@ -27,4 +27,4 @@ struct target_ops;
 /* Given an existing BFD, re-open it as a "struct target_ops".  */
 target_ops_up target_bfd_reopen (const gdb_bfd_ref_ptr &bfd);
 
-#endif
+#endif /* GDB_BFD_TARGET_H */

gdb/bfin-tdep.h

@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef BFIN_TDEP_H
-#define BFIN_TDEP_H
+#ifndef GDB_BFIN_TDEP_H
+#define GDB_BFIN_TDEP_H
 
 #include "gdbarch.h"
 
@@ -105,4 +105,4 @@ struct bfin_gdbarch_tdep : gdbarch_tdep_base
 /* Return the Blackfin ABI associated with GDBARCH.  */
 extern enum bfin_abi bfin_abi (struct gdbarch *gdbarch);
 
-#endif /* BFIN_TDEP_H */
+#endif /* GDB_BFIN_TDEP_H */

gdb/block.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef BLOCK_H
-#define BLOCK_H
+#ifndef GDB_BLOCK_H
+#define GDB_BLOCK_H
 
 #include "dictionary.h"
 #include "gdbsupport/array-view.h"
@@ -654,4 +654,4 @@ extern struct symbol *block_find_symbol (const struct block *block,
 struct blockranges *make_blockranges (struct objfile *objfile,
 				      const std::vector<blockrange> &rangevec);
 
-#endif /* BLOCK_H */
+#endif /* GDB_BLOCK_H */

gdb/break-cond-parse.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 (BREAK_COND_PARSE_H)
-#define BREAK_COND_PARSE_H 1
+#ifndef GDB_BREAK_COND_PARSE_H
+#define GDB_BREAK_COND_PARSE_H
 
 /* Given TOK, a string possibly containing a condition, thread, inferior,
    task and force-condition flag, as accepted by the 'break' command,
@@ -49,4 +49,4 @@ extern void create_breakpoint_parse_arg_string
    int *thread, int *inferior, int *task,
    gdb::unique_xmalloc_ptr<char> *rest, bool *force);
 
-#endif
+#endif /* GDB_BREAK_COND_PARSE_H */

gdb/breakpoint.h

@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (BREAKPOINT_H)
-#define BREAKPOINT_H 1
+#ifndef GDB_BREAKPOINT_H
+#define GDB_BREAKPOINT_H
 
 #include "frame.h"
 #include "value.h"
@@ -2103,4 +2103,4 @@ extern void enable_disable_bp_location (bp_location *loc, bool enable);
 
 extern void notify_breakpoint_modified (breakpoint *b);
 
-#endif /* !defined (BREAKPOINT_H) */
+#endif /* GDB_BREAKPOINT_H */

gdb/bsd-kvm.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef BSD_KVM_H
-#define BSD_KVM_H
+#ifndef GDB_BSD_KVM_H
+#define GDB_BSD_KVM_H
 
 struct pcb;
 struct regcache;
@@ -30,4 +30,4 @@ struct regcache;
 extern void
   bsd_kvm_add_target (int (*supply_pcb)(struct regcache *, struct pcb *));
 
-#endif /* bsd-kvm.h */
+#endif /* GDB_BSD_KVM_H */

gdb/bsd-uthread.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef BSD_UTHREAD_H
-#define BSD_UTHREAD_H 1
+#ifndef GDB_BSD_UTHREAD_H
+#define GDB_BSD_UTHREAD_H
 
 /* Set the function that supplies registers for an inactive thread for
    architecture GDBARCH to SUPPLY_UTHREAD.  */
@@ -35,4 +35,4 @@ extern void bsd_uthread_set_collect_uthread (struct gdbarch *gdbarch,
 			     void (*collect_uthread) (const struct regcache *,
 						      int, CORE_ADDR));
 
-#endif /* bsd-uthread.h */
+#endif /* GDB_BSD_UTHREAD_H */

gdb/bt-utils.h

@@ -18,8 +18,8 @@
 /* Support for printing a backtrace when GDB hits an error.  This is not
    for printing backtraces of the inferior, but backtraces of GDB itself.  */
 
-#ifndef BT_UTILS_H
-#define BT_UTILS_H
+#ifndef GDB_BT_UTILS_H
+#define GDB_BT_UTILS_H
 
 #ifdef HAVE_LIBBACKTRACE
 # include "backtrace.h"
@@ -75,4 +75,4 @@ extern void gdb_internal_backtrace_set_cmd (const char *args, int from_tty,
 
 extern void gdb_internal_backtrace_init_str ();
 
-#endif /* BT_UTILS_H */
+#endif /* GDB_BT_UTILS_H */

gdb/btrace.h

@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef BTRACE_H
-#define BTRACE_H
+#ifndef GDB_BTRACE_H
+#define GDB_BTRACE_H
 
 /* Branch tracing (btrace) is a per-thread control-flow execution trace of the
    inferior.  For presentation purposes, the branch trace is represented as a
@@ -535,4 +535,4 @@ extern int btrace_is_replaying (struct thread_info *tp);
 /* Return non-zero if the branch trace for TP is empty; zero otherwise.  */
 extern int btrace_is_empty (struct thread_info *tp);
 
-#endif /* BTRACE_H */
+#endif /* GDB_BTRACE_H */

gdb/build-id.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef BUILD_ID_H
-#define BUILD_ID_H
+#ifndef GDB_BUILD_ID_H
+#define GDB_BUILD_ID_H
 
 #include "gdb_bfd.h"
 #include "gdbsupport/rsp-low.h"
@@ -105,4 +105,4 @@ build_id_equal (const bfd_build_id *a, const bfd_build_id *b)
   return build_id_equal (a, b->size, b->data);
 }
 
-#endif /* BUILD_ID_H */
+#endif /* GDB_BUILD_ID_H */

gdb/buildsym-legacy.h

@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef BUILDSYM_LEGACY_H
-#define BUILDSYM_LEGACY_H
+#ifndef GDB_BUILDSYM_LEGACY_H
+#define GDB_BUILDSYM_LEGACY_H
 
 #include "buildsym.h"
 
@@ -144,4 +144,4 @@ extern struct pending **get_global_symbols ();
 
 extern struct buildsym_compunit *get_buildsym_compunit ();
 
-#endif /* BUILDSYM_LEGACY_H */
+#endif /* GDB_BUILDSYM_LEGACY_H */

gdb/buildsym.h

@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (BUILDSYM_H)
-#define BUILDSYM_H 1
+#ifndef GDB_BUILDSYM_H
+#define GDB_BUILDSYM_H
 
 #include "gdbsupport/gdb_obstack.h"
 #include "symtab.h"
@@ -456,4 +456,4 @@ extern void add_symbol_to_list (struct symbol *symbol,
 extern struct symbol *find_symbol_in_list (struct pending *list,
 					   char *name, int length);
 
-#endif /* defined (BUILDSYM_H) */
+#endif /* GDB_BUILDSYM_H */

gdb/c-exp.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef C_EXP_H
-#define C_EXP_H
+#ifndef GDB_C_EXP_H
+#define GDB_C_EXP_H
 
 #include "expop.h"
 #include "objc-lang.h"
@@ -217,4 +217,4 @@ public:
 
 }/* namespace expr */
 
-#endif /* C_EXP_H */
+#endif /* GDB_C_EXP_H */

gdb/c-lang.h

@@ -18,8 +18,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#if !defined (C_LANG_H)
-#define C_LANG_H 1
+#ifndef GDB_C_LANG_H
+#define GDB_C_LANG_H
 
 struct ui_file;
 struct language_arch_info;
@@ -174,4 +174,4 @@ extern std::string cplus_compute_program (compile_instance *inst,
 
 extern gdb::unique_xmalloc_ptr<char> c_canonicalize_name (const char *name);
 
-#endif /* !defined (C_LANG_H) */
+#endif /* GDB_C_LANG_H */

gdb/c-support.h

@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef C_SUPPORT_H
-#define C_SUPPORT_H
+#ifndef GDB_C_SUPPORT_H
+#define GDB_C_SUPPORT_H
 
 #include "safe-ctype.h"
 
@@ -43,4 +43,4 @@ c_ident_is_alnum (unsigned char ch)
   return ISALNUM (ch) || ch >= 0x80;
 }
 
-#endif /* C_SUPPORT_H */
+#endif /* GDB_C_SUPPORT_H */

gdb/cgen-remap.h

@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CGEN_REMAP_H
-#define CGEN_REMAP_H
+#ifndef GDB_CGEN_REMAP_H
+#define GDB_CGEN_REMAP_H
 
 /* Remap cgen interface names, so we can have multiple cgen generated include
    files in gdb without violating c++ ODR.  */
@@ -50,4 +50,4 @@
 #define CGEN_OPERAND		GDB_CGEN_REMAP (CGEN_OPERAND)
 #define CGEN_MAYBE_MULTI_IFLD	GDB_CGEN_REMAP (CGEN_MAYBE_MULTI_IFLD)
 
-#endif /* CGEN_REMAP_H */
+#endif /* GDB_CGEN_REMAP_H */

gdb/charset-list.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CHARSET_LIST_H
-#define CHARSET_LIST_H
+#ifndef GDB_CHARSET_LIST_H
+#define GDB_CHARSET_LIST_H
 
 /* Note that the first entry must always be "auto".
    The remaining entries were created by running this script:
@@ -1192,4 +1192,4 @@
 "WS2", \
 "YU",
 
-#endif /* CHARSET_LIST_H */
+#endif /* GDB_CHARSET_LIST_H */

gdb/charset.h

@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CHARSET_H
-#define CHARSET_H
+#ifndef GDB_CHARSET_H
+#define GDB_CHARSET_H
 
 #include "gdbsupport/def-vector.h"
 
@@ -165,4 +165,4 @@ char host_letter_to_control_character (char c);
 #define HOST_UTF32 "UTF-32LE"
 #endif
 
-#endif /* CHARSET_H */
+#endif /* GDB_CHARSET_H */

gdb/cli-out.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CLI_OUT_H
-#define CLI_OUT_H
+#ifndef GDB_CLI_OUT_H
+#define GDB_CLI_OUT_H
 
 #include "ui-out.h"
 #include <chrono>
@@ -113,4 +113,4 @@ private:
 
 extern void cli_display_match_list (char **matches, int len, int max);
 
-#endif
+#endif /* GDB_CLI_OUT_H */

gdb/cli/cli-cmds.h

@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CLI_CLI_CMDS_H
-#define CLI_CLI_CMDS_H
+#ifndef GDB_CLI_CLI_CMDS_H
+#define GDB_CLI_CLI_CMDS_H
 
 #include "gdbsupport/filestuff.h"
 #include <optional>
@@ -202,4 +202,4 @@ extern void with_command_completer_1 (const char *set_cmd_prefix,
 				      completion_tracker &tracker,
 				      const char *text);
 
-#endif /* CLI_CLI_CMDS_H */
+#endif /* GDB_CLI_CLI_CMDS_H */

gdb/cli/cli-decode.h

@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CLI_CLI_DECODE_H
-#define CLI_CLI_DECODE_H
+#ifndef GDB_CLI_CLI_DECODE_H
+#define GDB_CLI_CLI_DECODE_H
 
 /* This file defines the private interfaces for any code implementing
    command internals.  */
@@ -316,4 +316,4 @@ extern int cli_user_command_p (struct cmd_list_element *);
 
 extern int find_command_name_length (const char *);
 
-#endif /* CLI_CLI_DECODE_H */
+#endif /* GDB_CLI_CLI_DECODE_H */

gdb/cli/cli-interp.h

@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CLI_CLI_INTERP_H
-#define CLI_CLI_INTERP_H
+#ifndef GDB_CLI_CLI_INTERP_H
+#define GDB_CLI_CLI_INTERP_H
 
 #include "interps.h"
 
@@ -68,4 +68,4 @@ private:
 extern int should_print_stop_to_console (struct interp *interp,
 					 struct thread_info *tp);
 
-#endif /* CLI_CLI_INTERP_H */
+#endif /* GDB_CLI_CLI_INTERP_H */

gdb/cli/cli-option.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CLI_OPTION_H
-#define CLI_OPTION_H 1
+#ifndef GDB_CLI_CLI_OPTION_H
+#define GDB_CLI_CLI_OPTION_H
 
 #include <optional>
 #include "gdbsupport/array-view.h"
@@ -399,4 +399,4 @@ extern void add_setshow_cmds_for_options (command_class cmd_class, void *data,
 } /* namespace option */
 } /* namespace gdb */
 
-#endif /* CLI_OPTION_H */
+#endif /* GDB_CLI_CLI_OPTION_H */

gdb/cli/cli-script.h

@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CLI_CLI_SCRIPT_H
-#define CLI_CLI_SCRIPT_H
+#ifndef GDB_CLI_CLI_SCRIPT_H
+#define GDB_CLI_CLI_SCRIPT_H
 
 #include "compile/compile.h"
 #include "gdbsupport/function-view.h"
@@ -182,4 +182,4 @@ extern void print_command_trace (const char *cmd, ...)
 
 extern void reset_command_nest_depth (void);
 
-#endif /* CLI_CLI_SCRIPT_H */
+#endif /* GDB_CLI_CLI_SCRIPT_H */

gdb/cli/cli-setshow.h

@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CLI_CLI_SETSHOW_H
-#define CLI_CLI_SETSHOW_H
+#ifndef GDB_CLI_CLI_SETSHOW_H
+#define GDB_CLI_CLI_SETSHOW_H
 
 #include <string>
 
@@ -60,4 +60,4 @@ extern std::string get_setshow_command_value_string (const setting &var);
 
 extern void cmd_show_list (struct cmd_list_element *list, int from_tty);
 
-#endif /* CLI_CLI_SETSHOW_H */
+#endif /* GDB_CLI_CLI_SETSHOW_H */

gdb/cli/cli-style.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CLI_CLI_STYLE_H
-#define CLI_CLI_STYLE_H
+#ifndef GDB_CLI_CLI_STYLE_H
+#define GDB_CLI_CLI_STYLE_H
 
 #include "ui-file.h"
 #include "command.h"
@@ -160,4 +160,4 @@ extern bool disassembler_styling;
 /* True if styling is enabled.  */
 extern bool cli_styling;
 
-#endif /* CLI_CLI_STYLE_H */
+#endif /* GDB_CLI_CLI_STYLE_H */

gdb/cli/cli-utils.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CLI_CLI_UTILS_H
-#define CLI_CLI_UTILS_H
+#ifndef GDB_CLI_CLI_UTILS_H
+#define GDB_CLI_CLI_UTILS_H
 
 #include "completer.h"
 
@@ -225,4 +225,4 @@ struct qcs_flags
    message.  */
 extern void validate_flags_qcs (const char *which_command, qcs_flags *flags);
 
-#endif /* CLI_CLI_UTILS_H */
+#endif /* GDB_CLI_CLI_UTILS_H */

gdb/coff-pe-read.h

@@ -19,8 +19,8 @@
 
    Contributed by Raoul M. Gough (RaoulGough@yahoo.co.uk).  */
 
-#if !defined (COFF_PE_READ_H)
-#define COFF_PE_READ_H
+#ifndef GDB_COFF_PE_READ_H
+#define GDB_COFF_PE_READ_H
 
 class minimal_symbol_reader;
 struct objfile;
@@ -35,4 +35,4 @@ extern void read_pe_exported_syms (minimal_symbol_reader &reader,
    Returns default value 0x1000 if information is not found.  */
 extern CORE_ADDR pe_text_section_offset (struct bfd *abfd);
 
-#endif /* !defined (COFF_PE_READ_H) */
+#endif /* GDB_COFF_PE_READ_H */

gdb/command.h

@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (COMMAND_H)
-#define COMMAND_H 1
+#ifndef GDB_COMMAND_H
+#define GDB_COMMAND_H
 
 #include "gdbsupport/scoped_restore.h"
 
@@ -933,4 +933,4 @@ extern void not_just_help_class_command (const char *, int);
 extern void cmd_func (struct cmd_list_element *cmd,
 		      const char *args, int from_tty);
 
-#endif /* !defined (COMMAND_H) */
+#endif /* GDB_COMMAND_H */

gdb/compile/compile-c.h

@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMPILE_COMPILE_C_H
-#define COMPILE_COMPILE_C_H
+#ifndef GDB_COMPILE_COMPILE_C_H
+#define GDB_COMPILE_COMPILE_C_H
 
 #include "compile/compile.h"
 #include "gdbsupport/enum-flags.h"
@@ -93,4 +93,4 @@ extern std::string c_get_range_decl_name (const struct dynamic_prop *prop);
 extern gdb::unique_xmalloc_ptr<char>
   c_symbol_substitution_name (struct symbol *sym);
 
-#endif /* COMPILE_COMPILE_C_H */
+#endif /* GDB_COMPILE_COMPILE_C_H */

gdb/compile/compile-cplus.h

@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMPILE_COMPILE_CPLUS_H
-#define COMPILE_COMPILE_CPLUS_H
+#ifndef GDB_COMPILE_COMPILE_CPLUS_H
+#define GDB_COMPILE_COMPILE_CPLUS_H
 
 #include "compile/compile.h"
 #include "gdbsupport/enum-flags.h"
@@ -204,4 +204,4 @@ private:
 enum gcc_cp_symbol_kind get_method_access_flag (const struct type *type,
 						int fni, int num);
 
-#endif /* COMPILE_COMPILE_CPLUS_H */
+#endif /* GDB_COMPILE_COMPILE_CPLUS_H */

gdb/compile/compile-internal.h

@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMPILE_COMPILE_INTERNAL_H
-#define COMPILE_COMPILE_INTERNAL_H
+#ifndef GDB_COMPILE_COMPILE_INTERNAL_H
+#define GDB_COMPILE_COMPILE_INTERNAL_H
 
 #include "gcc-c-interface.h"
 #include "gdbsupport/gdb-hashtab.h"
@@ -80,4 +80,4 @@ private:
   std::string m_object_file;
 };
 
-#endif /* COMPILE_COMPILE_INTERNAL_H */
+#endif /* GDB_COMPILE_COMPILE_INTERNAL_H */

gdb/compile/compile-object-load.h

@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMPILE_COMPILE_OBJECT_LOAD_H
-#define COMPILE_COMPILE_OBJECT_LOAD_H
+#ifndef GDB_COMPILE_COMPILE_OBJECT_LOAD_H
+#define GDB_COMPILE_COMPILE_OBJECT_LOAD_H
 
 #include "compile-internal.h"
 #include "compile.h"
@@ -95,4 +95,4 @@ extern compile_module_up compile_object_load
   (const compile_file_names &fnames,
    enum compile_i_scope_types scope, void *scope_data);
 
-#endif /* COMPILE_COMPILE_OBJECT_LOAD_H */
+#endif /* GDB_COMPILE_COMPILE_OBJECT_LOAD_H */

gdb/compile/compile-object-run.h

@@ -14,11 +14,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMPILE_COMPILE_OBJECT_RUN_H
-#define COMPILE_COMPILE_OBJECT_RUN_H
+#ifndef GDB_COMPILE_COMPILE_OBJECT_RUN_H
+#define GDB_COMPILE_COMPILE_OBJECT_RUN_H
 
 #include "compile-object-load.h"
 
 extern void compile_object_run (compile_module_up &&module);
 
-#endif /* COMPILE_COMPILE_OBJECT_RUN_H */
+#endif /* GDB_COMPILE_COMPILE_OBJECT_RUN_H */

gdb/compile/compile.h

@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMPILE_COMPILE_H
-#define COMPILE_COMPILE_H
+#ifndef GDB_COMPILE_COMPILE_H
+#define GDB_COMPILE_COMPILE_H
 
 #include "gcc-c-interface.h"
 #include "gdbsupport/unordered_map.h"
@@ -262,4 +262,4 @@ extern void compile_print_value (struct value *val, void *data_voidp);
 /* Command element for the 'compile' command.  */
 extern cmd_list_element *compile_cmd_element;
 
-#endif /* COMPILE_COMPILE_H */
+#endif /* GDB_COMPILE_COMPILE_H */

gdb/compile/gcc-c-plugin.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMPILE_GCC_C_PLUGIN_H
-#define COMPILE_GCC_C_PLUGIN_H
+#ifndef GDB_COMPILE_GCC_C_PLUGIN_H
+#define GDB_COMPILE_GCC_C_PLUGIN_H
 
 #include "compile-internal.h"
 
@@ -68,4 +68,4 @@ private:
   struct gcc_c_context *m_context;
 };
 
-#endif /* COMPILE_GCC_C_PLUGIN_H */
+#endif /* GDB_COMPILE_GCC_C_PLUGIN_H */

gdb/compile/gcc-cp-plugin.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef COMPILE_GCC_CP_PLUGIN_H
-#define COMPILE_GCC_CP_PLUGIN_H
+#ifndef GDB_COMPILE_GCC_CP_PLUGIN_H
+#define GDB_COMPILE_GCC_CP_PLUGIN_H
 
 /* A class representing the GCC C++ plug-in.  */
 
@@ -87,4 +87,4 @@ private:
   struct gcc_cp_context *m_context;
 };
 
-#endif /* COMPILE_GCC_CP_PLUGIN_H */
+#endif /* GDB_COMPILE_GCC_CP_PLUGIN_H */

gdb/complaints.h

@@ -17,8 +17,8 @@
    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 (COMPLAINTS_H)
-#define COMPLAINTS_H
+#ifndef GDB_COMPLAINTS_H
+#define GDB_COMPLAINTS_H
 
 #include "gdbsupport/scoped_restore.h"
 #include <unordered_set>
@@ -109,4 +109,4 @@ private:
 
 extern void re_emit_complaints (const complaint_collection &);
 
-#endif /* !defined (COMPLAINTS_H) */
+#endif /* GDB_COMPLAINTS_H */

gdb/completer.h

@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (COMPLETER_H)
-#define COMPLETER_H 1
+#ifndef GDB_COMPLETER_H
+#define GDB_COMPLETER_H
 
 #include "gdbsupport/gdb-hashtab.h"
 #include "command.h"
@@ -734,4 +734,4 @@ extern bool skip_over_slash_fmt (completion_tracker &tracker,
 
 extern int max_completions;
 
-#endif /* defined (COMPLETER_H) */
+#endif /* GDB_COMPLETER_H */

gdb/config/nm-linux.h

@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CONFIG_NM_LINUX_H
-#define CONFIG_NM_LINUX_H
+#ifndef GDB_CONFIG_NM_LINUX_H
+#define GDB_CONFIG_NM_LINUX_H
 
 /* Use elf_gregset_t and elf_fpregset_t, rather than
    gregset_t and fpregset_t.  */
@@ -26,4 +26,4 @@
 #define GDB_GREGSET_T  elf_gregset_t
 #define GDB_FPREGSET_T elf_fpregset_t
 
-#endif /* CONFIG_NM_LINUX_H */
+#endif /* GDB_CONFIG_NM_LINUX_H */

gdb/cp-abi.h

@@ -20,8 +20,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CP_ABI_H
-#define CP_ABI_H
+#ifndef GDB_CP_ABI_H
+#define GDB_CP_ABI_H
 
 struct fn_field;
 struct type;
@@ -255,4 +255,4 @@ struct cp_abi_ops
 extern int register_cp_abi (struct cp_abi_ops *abi);
 extern void set_cp_abi_as_auto_default (const char *short_name);
 
-#endif /* CP_ABI_H */
+#endif /* GDB_CP_ABI_H */

gdb/cp-support.h

@@ -19,8 +19,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef CP_SUPPORT_H
-#define CP_SUPPORT_H
+#ifndef GDB_CP_SUPPORT_H
+#define GDB_CP_SUPPORT_H
 
 #include "symtab.h"
 #include "gdbsupport/gdb_obstack.h"
@@ -208,4 +208,4 @@ extern char *gdb_cplus_demangle_print (int options,
 
 extern const char *find_toplevel_char (const char *s, char c);
 
-#endif /* CP_SUPPORT_H */
+#endif /* GDB_CP_SUPPORT_H */