8 files changed, 31 insertions, 15 deletions
diff --git a/gdb/arch/aarch64-insn.h b/gdb/arch/aarch64-insn.h
index 43120cc..4492594 100644
--- a/gdb/arch/aarch64-insn.h
+++ b/gdb/arch/aarch64-insn.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef AARCH64_INSN_H
-#define AARCH64_INSN_H 1
+#ifndef ARCH_AARCH64_INSN_H
+#define ARCH_AARCH64_INSN_H
 
 extern int aarch64_debug;
 
@@ -321,4 +321,4 @@ int aarch64_emit_load_store (uint32_t *buf, uint32_t size,
 			     struct aarch64_register rn,
 			     struct aarch64_memory_operand operand);
 
-#endif
+#endif /* ARCH_AARCH64_INSN_H */
diff --git a/gdb/arch/amd64.h b/gdb/arch/amd64.h
index 9431e08..1e02c52 100644
--- a/gdb/arch/amd64.h
+++ b/gdb/arch/amd64.h
@@ -15,8 +15,13 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef ARCH_AMD64_H
+#define ARCH_AMD64_H
+
 #include "common/tdesc.h"
 #include <stdint.h>
 
 target_desc *amd64_create_target_description (uint64_t xcr0, bool is_x32,
 					      bool is_linux, bool segments);
+
+#endif /* ARCH_AMD64_H */
diff --git a/gdb/arch/arm-get-next-pcs.h b/gdb/arch/arm-get-next-pcs.h
index 59f0316..7c5ad5e 100644
--- a/gdb/arch/arm-get-next-pcs.h
+++ b/gdb/arch/arm-get-next-pcs.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARM_GET_NEXT_PCS_H
-#define ARM_GET_NEXT_PCS_H 1
+#ifndef ARCH_ARM_GET_NEXT_PCS_H
+#define ARCH_ARM_GET_NEXT_PCS_H
 
 #include <vector>
 
@@ -64,4 +64,4 @@ void arm_get_next_pcs_ctor (struct arm_get_next_pcs *self,
 /* Find the next possible PCs after the current instruction executes.  */
 std::vector<CORE_ADDR> arm_get_next_pcs (struct arm_get_next_pcs *self);
 
-#endif /* ARM_GET_NEXT_PCS_H */
+#endif /* ARCH_ARM_GET_NEXT_PCS_H */
diff --git a/gdb/arch/arm-linux.h b/gdb/arch/arm-linux.h
index d5ee140..04d3f23 100644
--- a/gdb/arch/arm-linux.h
+++ b/gdb/arch/arm-linux.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARM_LINUX_H
-#define ARM_LINUX_H
+#ifndef ARCH_ARM_LINUX_H
+#define ARCH_ARM_LINUX_H
 
 /* The index to access CSPR in user_regs defined in GLIBC.  */
 #define ARM_CPSR_GREGNUM 16
@@ -78,4 +78,5 @@ struct arm_get_next_pcs;
 
 CORE_ADDR arm_linux_get_next_pcs_fixup (struct arm_get_next_pcs *self,
 					CORE_ADDR pc);
-#endif /* ARM_LINUX_H */
+
+#endif /* ARCH_ARM_LINUX_H */
diff --git a/gdb/arch/arm.h b/gdb/arch/arm.h
index 21d45c5..c178542 100644
--- a/gdb/arch/arm.h
+++ b/gdb/arch/arm.h
@@ -16,8 +16,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef ARM_H
-#define ARM_H
+#ifndef ARCH_ARM_H
+#define ARCH_ARM_H
 
 /* Register numbers of various important registers.  */
 
@@ -146,4 +146,4 @@ unsigned long shifted_reg_val (struct regcache *regcache,
 			       unsigned long pc_val,
 			       unsigned long status_reg);
 
-#endif
+#endif /* ARCH_ARM_H */
diff --git a/gdb/arch/i386.h b/gdb/arch/i386.h
index a6a801b..fa85438 100644
--- a/gdb/arch/i386.h
+++ b/gdb/arch/i386.h
@@ -15,7 +15,12 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef ARCH_I386_H
+#define ARCH_I386_H
+
 #include "common/tdesc.h"
 #include <stdint.h>
 
 target_desc *i386_create_target_description (uint64_t xcr0, bool is_linux);
+
+#endif /* ARCH_I386_H */
diff --git a/gdb/arch/tic6x.h b/gdb/arch/tic6x.h
index e1c819d..36dadb3 100644
--- a/gdb/arch/tic6x.h
+++ b/gdb/arch/tic6x.h
@@ -15,6 +15,9 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef ARCH_TIC6X_H
+#define ARCH_TIC6X_H
+
 enum c6x_feature
 {
   C6X_CORE,
@@ -24,3 +27,5 @@ enum c6x_feature
 };
 
 target_desc *tic6x_create_target_description (enum c6x_feature feature);
+
+#endif /* ARCH_TIC6X_H */
diff --git a/gdb/arch/xtensa.h b/gdb/arch/xtensa.h
index 044d0c9..9a6fa33 100644
--- a/gdb/arch/xtensa.h
+++ b/gdb/arch/xtensa.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef XTENSA_H
-#define XTENSA_H
+#ifndef ARCH_XTENSA_H
+#define ARCH_XTENSA_H
 
 /* Xtensa ELF core file register set representation ('.reg' section).
    Copied from target-side ELF header <xtensa/elf.h>.  */
@@ -45,4 +45,4 @@ typedef struct
 
 #define C0_NREGS   16	/* Number of A-registers to track in call0 ABI.  */
 
-#endif
+#endif /* ARCH_XTENSA_H */