From 13e671e38150f2003584e8049b874c2facfbc12d Mon Sep 17 00:00:00 2001
From: Carlo Caione <ccaione@baylibre.com>
Date: Sat, 9 Nov 2019 18:48:15 +0000
Subject: [PATCH] arch: arm: Fix header guards

Fix the header guards for the ARM header files to reflect the new code
location.

Signed-off-by: Carlo Caione <ccaione@baylibre.com>
---
 arch/arm/core/aarch32/cortex_m/mpu/arm_core_mpu_dev.h    | 6 +++---
 arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v7_internal.h | 6 +++---
 arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v8_internal.h | 6 +++---
 arch/arm/core/aarch32/cortex_m/vector_table.h            | 6 +++---
 arch/arm/include/aarch32/cortex_m/cmse.h                 | 6 +++---
 arch/arm/include/aarch32/cortex_m/exc.h                  | 6 +++---
 arch/arm/include/aarch32/cortex_m/stack.h                | 6 +++---
 arch/arm/include/aarch32/cortex_m/tz.h                   | 6 +++---
 include/arch/arm/aarch32/arch.h                          | 6 +++---
 include/arch/arm/aarch32/asm_inline.h                    | 6 +++---
 include/arch/arm/aarch32/asm_inline_gcc.h                | 6 +++---
 include/arch/arm/aarch32/cortex_m/cmsis.h                | 6 +++---
 include/arch/arm/aarch32/cortex_m/memory_map.h           | 6 +++---
 include/arch/arm/aarch32/cortex_m/mpu/arm_mpu.h          | 6 +++---
 include/arch/arm/aarch32/cortex_m/mpu/nxp_mpu.h          | 6 +++---
 include/arch/arm/aarch32/cortex_r/sys_io.h               | 6 +++---
 include/arch/arm/aarch32/error.h                         | 6 +++---
 include/arch/arm/aarch32/exc.h                           | 6 +++---
 include/arch/arm/aarch32/irq.h                           | 6 +++---
 include/arch/arm/aarch32/misc.h                          | 6 +++---
 include/arch/arm/aarch32/nmi.h                           | 6 +++---
 include/arch/arm/aarch32/syscall.h                       | 6 +++---
 include/arch/arm/aarch32/thread.h                        | 6 +++---
 23 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/arch/arm/core/aarch32/cortex_m/mpu/arm_core_mpu_dev.h b/arch/arm/core/aarch32/cortex_m/mpu/arm_core_mpu_dev.h
index 88f2392e98b..7b43cceab77 100644
--- a/arch/arm/core/aarch32/cortex_m/mpu/arm_core_mpu_dev.h
+++ b/arch/arm/core/aarch32/cortex_m/mpu/arm_core_mpu_dev.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_CORE_MPU_DEV_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_CORE_MPU_DEV_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_CORE_MPU_DEV_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_CORE_MPU_DEV_H_
 
 #include <zephyr/types.h>
 
@@ -268,4 +268,4 @@ int arm_core_mpu_buffer_validate(void *addr, size_t size, int write);
 }
 #endif
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_CORE_MPU_DEV_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_CORE_MPU_DEV_H_ */
diff --git a/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v7_internal.h b/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v7_internal.h
index 49a702ec6d2..f953ed3663a 100644
--- a/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v7_internal.h
+++ b/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v7_internal.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_ARCH_ARM_CORE_CORTEX_M_MPU_ARM_MPU_V7_INTERNAL_H_
-#define ZEPHYR_ARCH_ARM_CORE_CORTEX_M_MPU_ARM_MPU_V7_INTERNAL_H_
+#ifndef ZEPHYR_ARCH_ARM_CORE_AARCH32_CORTEX_M_MPU_ARM_MPU_V7_INTERNAL_H_
+#define ZEPHYR_ARCH_ARM_CORE_AARCH32_CORTEX_M_MPU_ARM_MPU_V7_INTERNAL_H_
 
 
 #define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
@@ -316,4 +316,4 @@ static int mpu_configure_dynamic_mpu_regions(const struct k_mem_partition
 	return mpu_reg_index;
 }
 
-#endif	/* ZEPHYR_ARCH_ARM_CORE_CORTEX_M_MPU_ARM_MPU_V7_INTERNAL_H_ */
+#endif	/* ZEPHYR_ARCH_ARM_CORE_AARCH32_CORTEX_M_MPU_ARM_MPU_V7_INTERNAL_H_ */
diff --git a/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v8_internal.h b/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v8_internal.h
index ca88d61d267..81d0d9bc432 100644
--- a/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v8_internal.h
+++ b/arch/arm/core/aarch32/cortex_m/mpu/arm_mpu_v8_internal.h
@@ -5,8 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_ARCH_ARM_CORE_CORTEX_M_MPU_ARM_MPU_V8_INTERNAL_H_
-#define ZEPHYR_ARCH_ARM_CORE_CORTEX_M_MPU_ARM_MPU_V8_INTERNAL_H_
+#ifndef ZEPHYR_ARCH_ARM_CORE_AARCH32_CORTEX_M_MPU_ARM_MPU_V8_INTERNAL_H_
+#define ZEPHYR_ARCH_ARM_CORE_AARCH32_CORTEX_M_MPU_ARM_MPU_V8_INTERNAL_H_
 
 #include <aarch32/cortex_m/cmse.h>
 #define LOG_LEVEL CONFIG_MPU_LOG_LEVEL
@@ -583,4 +583,4 @@ static int mpu_configure_dynamic_mpu_regions(const struct k_mem_partition
 	return mpu_reg_index;
 }
 
-#endif	/* ZEPHYR_ARCH_ARM_CORE_CORTEX_M_MPU_ARM_MPU_V8_INTERNAL_H_ */
+#endif	/* ZEPHYR_ARCH_ARM_CORE_AARCH32_CORTEX_M_MPU_ARM_MPU_V8_INTERNAL_H_ */
diff --git a/arch/arm/core/aarch32/cortex_m/vector_table.h b/arch/arm/core/aarch32/cortex_m/vector_table.h
index 4c6bc89de35..7ce019178a7 100644
--- a/arch/arm/core/aarch32/cortex_m/vector_table.h
+++ b/arch/arm/core/aarch32/cortex_m/vector_table.h
@@ -18,8 +18,8 @@
  * No other symbol has the same format, so they are easy to spot.
  */
 
-#ifndef ZEPHYR_ARCH_ARM_CORE_CORTEX_M_VECTOR_TABLE_H_
-#define ZEPHYR_ARCH_ARM_CORE_CORTEX_M_VECTOR_TABLE_H_
+#ifndef ZEPHYR_ARCH_ARM_CORE_AARCH32_CORTEX_M_VECTOR_TABLE_H_
+#define ZEPHYR_ARCH_ARM_CORE_AARCH32_CORTEX_M_VECTOR_TABLE_H_
 
 #ifdef _ASMLANGUAGE
 
@@ -67,4 +67,4 @@ extern void *_vector_table[];
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_ARCH_ARM_CORE_CORTEX_M_VECTOR_TABLE_H_ */
+#endif /* ZEPHYR_ARCH_ARM_CORE_AARCH32_CORTEX_M_VECTOR_TABLE_H_ */
diff --git a/arch/arm/include/aarch32/cortex_m/cmse.h b/arch/arm/include/aarch32/cortex_m/cmse.h
index 527123d053c..6aed9a520cd 100644
--- a/arch/arm/include/aarch32/cortex_m/cmse.h
+++ b/arch/arm/include/aarch32/cortex_m/cmse.h
@@ -11,8 +11,8 @@
  * CMSE API for Cortex-M23/M33 CPUs.
  */
 
-#ifndef ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_CMSE_H_
-#define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_CMSE_H_
+#ifndef ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_CMSE_H_
+#define ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_CMSE_H_
 
 #ifdef _ASMLANGUAGE
 
@@ -450,4 +450,4 @@ int arm_cmse_addr_range_nonsecure_readwrite_ok(u32_t addr, u32_t size,
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_CMSE_H_ */
+#endif /* ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_CMSE_H_ */
diff --git a/arch/arm/include/aarch32/cortex_m/exc.h b/arch/arm/include/aarch32/cortex_m/exc.h
index c8edbbc1fd0..355782e6c2f 100644
--- a/arch/arm/include/aarch32/cortex_m/exc.h
+++ b/arch/arm/include/aarch32/cortex_m/exc.h
@@ -11,8 +11,8 @@
  * Exception/interrupt context helpers.
  */
 
-#ifndef ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_EXC_H_
-#define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_EXC_H_
+#ifndef ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_EXC_H_
+#define ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_EXC_H_
 
 #include <arch/cpu.h>
 
@@ -157,4 +157,4 @@ static ALWAYS_INLINE void z_arm_clear_faults(void)
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_EXC_H_ */
+#endif /* ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_EXC_H_ */
diff --git a/arch/arm/include/aarch32/cortex_m/stack.h b/arch/arm/include/aarch32/cortex_m/stack.h
index c37ac9705e3..f95c88f1c1f 100644
--- a/arch/arm/include/aarch32/cortex_m/stack.h
+++ b/arch/arm/include/aarch32/cortex_m/stack.h
@@ -11,8 +11,8 @@
  * Stack helper functions.
  */
 
-#ifndef ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_STACK_H_
-#define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_STACK_H_
+#ifndef ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_STACK_H_
+#define ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_STACK_H_
 
 #ifdef _ASMLANGUAGE
 
@@ -69,4 +69,4 @@ static ALWAYS_INLINE void z_arm_interrupt_stack_setup(void)
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_STACK_H_ */
+#endif /* ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_STACK_H_ */
diff --git a/arch/arm/include/aarch32/cortex_m/tz.h b/arch/arm/include/aarch32/cortex_m/tz.h
index b73ad81259e..dab11cd34c7 100644
--- a/arch/arm/include/aarch32/cortex_m/tz.h
+++ b/arch/arm/include/aarch32/cortex_m/tz.h
@@ -11,8 +11,8 @@
  * TrustZone API for Cortex-M23/M33 CPUs implementing the Security Extension.
  */
 
-#ifndef ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_TZ_H_
-#define ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_TZ_H_
+#ifndef ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_TZ_H_
+#define ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_TZ_H_
 
 #ifdef _ASMLANGUAGE
 
@@ -347,4 +347,4 @@ typedef void __attribute__((cmse_nonsecure_call)) (*tz_ns_func_ptr_t) (void);
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_ARCH_ARM_INCLUDE_CORTEX_M_TZ_H_ */
+#endif /* ZEPHYR_ARCH_ARM_INCLUDE_AARCH32_CORTEX_M_TZ_H_ */
diff --git a/include/arch/arm/aarch32/arch.h b/include/arch/arm/aarch32/arch.h
index bdf15e2a381..c11f2b4d70e 100644
--- a/include/arch/arm/aarch32/arch.h
+++ b/include/arch/arm/aarch32/arch.h
@@ -13,8 +13,8 @@
  * (include/arm/cpu.h)
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ARCH_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_ARCH_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ARCH_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ARCH_H_
 
 /* Add include for DTS generated information */
 #include <generated_dts_board.h>
@@ -256,4 +256,4 @@ extern "C" {
 }
 #endif
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_ARCH_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ARCH_H_ */
diff --git a/include/arch/arm/aarch32/asm_inline.h b/include/arch/arm/aarch32/asm_inline.h
index e8c64eaa470..db045ca83bb 100644
--- a/include/arch/arm/aarch32/asm_inline.h
+++ b/include/arch/arm/aarch32/asm_inline.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ASM_INLINE_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ASM_INLINE_H_
 
 /*
  * The file must not be included directly
@@ -20,4 +20,4 @@
 #include <arch/arm/asm_inline_other.h>
 #endif
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ASM_INLINE_H_ */
diff --git a/include/arch/arm/aarch32/asm_inline_gcc.h b/include/arch/arm/aarch32/asm_inline_gcc.h
index 958aa5026b6..f2d881d656b 100644
--- a/include/arch/arm/aarch32/asm_inline_gcc.h
+++ b/include/arch/arm/aarch32/asm_inline_gcc.h
@@ -8,8 +8,8 @@
 
 /* Either public functions or macros or invoked by public functions */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_GCC_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_GCC_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ASM_INLINE_GCC_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ASM_INLINE_GCC_H_
 
 /*
  * The file must not be included directly
@@ -112,4 +112,4 @@ static ALWAYS_INLINE bool arch_irq_unlocked(unsigned int key)
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_GCC_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ASM_INLINE_GCC_H_ */
diff --git a/include/arch/arm/aarch32/cortex_m/cmsis.h b/include/arch/arm/aarch32/cortex_m/cmsis.h
index 768d51222c5..ea15511088c 100644
--- a/include/arch/arm/aarch32/cortex_m/cmsis.h
+++ b/include/arch/arm/aarch32/cortex_m/cmsis.h
@@ -11,8 +11,8 @@
  * This header contains the interface to the ARM CMSIS Core headers.
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_CMSIS_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_CMSIS_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_CMSIS_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_CMSIS_H_
 
 #include <soc.h>
 
@@ -114,4 +114,4 @@ typedef enum {
 #error "Unknown Cortex-M device"
 #endif
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_CMSIS_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_CMSIS_H_ */
diff --git a/include/arch/arm/aarch32/cortex_m/memory_map.h b/include/arch/arm/aarch32/cortex_m/memory_map.h
index 782754068ec..e5b9dd3ff0c 100644
--- a/include/arch/arm/aarch32/cortex_m/memory_map.h
+++ b/include/arch/arm/aarch32/cortex_m/memory_map.h
@@ -12,8 +12,8 @@
  * processors.
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MEMORY_MAP_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MEMORY_MAP_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MEMORY_MAP_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MEMORY_MAP_H_
 
 #include <sys/util.h>
 
@@ -107,4 +107,4 @@
 #define _VENDOR_BASE_ADDR         0xE0100000
 #define _VENDOR_END_ADDR          0xFFFFFFFF
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MEMORY_MAP_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MEMORY_MAP_H_ */
diff --git a/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu.h b/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu.h
index f87c190ba98..72b0f51ac7d 100644
--- a/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu.h
+++ b/include/arch/arm/aarch32/cortex_m/mpu/arm_mpu.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_MPU_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_MPU_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_MPU_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_MPU_H_
 
 #if defined(CONFIG_CPU_CORTEX_M0PLUS) || \
 	defined(CONFIG_CPU_CORTEX_M3) || \
@@ -57,4 +57,4 @@ extern const struct arm_mpu_config mpu_config;
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_MPU_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_MPU_H_ */
diff --git a/include/arch/arm/aarch32/cortex_m/mpu/nxp_mpu.h b/include/arch/arm/aarch32/cortex_m/mpu/nxp_mpu.h
index 7e44d068b0d..41034528741 100644
--- a/include/arch/arm/aarch32/cortex_m/mpu/nxp_mpu.h
+++ b/include/arch/arm/aarch32/cortex_m/mpu/nxp_mpu.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_NXP_MPU_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_NXP_MPU_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_NXP_MPU_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_NXP_MPU_H_
 
 #ifndef _ASMLANGUAGE
 
@@ -270,4 +270,4 @@ extern const struct nxp_mpu_config mpu_config;
 		"start address of the partition must align with minimum MPU \
 		 region size.")
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_NXP_MPU_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_NXP_MPU_H_ */
diff --git a/include/arch/arm/aarch32/cortex_r/sys_io.h b/include/arch/arm/aarch32/cortex_r/sys_io.h
index 197d289d3f9..6c3040eda62 100644
--- a/include/arch/arm/aarch32/cortex_r/sys_io.h
+++ b/include/arch/arm/aarch32/cortex_r/sys_io.h
@@ -9,8 +9,8 @@
  * gcc builtins)
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_R_SYS_IO_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_R_SYS_IO_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_SYS_IO_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_SYS_IO_H_
 
 #ifndef _ASMLANGUAGE
 
@@ -159,4 +159,4 @@ static ALWAYS_INLINE
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_R_SYS_IO_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_R_SYS_IO_H_ */
diff --git a/include/arch/arm/aarch32/error.h b/include/arch/arm/aarch32/error.h
index 3c9046bc455..8d7e2a09716 100644
--- a/include/arch/arm/aarch32/error.h
+++ b/include/arch/arm/aarch32/error.h
@@ -11,8 +11,8 @@
  * ARM-specific kernel error handling interface. Included by arm/arch.h.
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ERROR_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_ERROR_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ERROR_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ERROR_H_
 
 #include <arch/arm/aarch32/syscall.h>
 #include <arch/arm/aarch32/exc.h>
@@ -62,4 +62,4 @@ do { \
 }
 #endif
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_ERROR_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ERROR_H_ */
diff --git a/include/arch/arm/aarch32/exc.h b/include/arch/arm/aarch32/exc.h
index cec89492c0e..821654fede8 100644
--- a/include/arch/arm/aarch32/exc.h
+++ b/include/arch/arm/aarch32/exc.h
@@ -11,8 +11,8 @@
  * ARM-specific kernel exception handling interface. Included by arm/arch.h.
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_EXC_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_EXC_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_EXC_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_EXC_H_
 
 /* for assembler, only works with constants */
 #define Z_EXC_PRIO(pri) (((pri) << (8 - DT_NUM_IRQ_PRIO_BITS)) & 0xff)
@@ -72,4 +72,4 @@ extern void z_arm_exc_exit(void);
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_EXC_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_EXC_H_ */
diff --git a/include/arch/arm/aarch32/irq.h b/include/arch/arm/aarch32/irq.h
index 84be39d6aa5..dd4f78d897b 100644
--- a/include/arch/arm/aarch32/irq.h
+++ b/include/arch/arm/aarch32/irq.h
@@ -11,8 +11,8 @@
  * ARM-specific kernel interrupt handling interface. Included by arm/arch.h.
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_IRQ_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_IRQ_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_IRQ_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_IRQ_H_
 
 #include <irq.h>
 #include <sw_isr_table.h>
@@ -153,4 +153,4 @@ extern void _isr_wrapper(void);
 }
 #endif
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_IRQ_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_IRQ_H_ */
diff --git a/include/arch/arm/aarch32/misc.h b/include/arch/arm/aarch32/misc.h
index 35f5886bc8b..d085308cf4c 100644
--- a/include/arch/arm/aarch32/misc.h
+++ b/include/arch/arm/aarch32/misc.h
@@ -11,8 +11,8 @@
  * ARM-specific kernel miscellaneous interface. Included by arm/arch.h.
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_MISC_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_MISC_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_MISC_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_MISC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -37,4 +37,4 @@ static ALWAYS_INLINE void arch_nop(void)
 }
 #endif
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_MISC_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_MISC_H_ */
diff --git a/include/arch/arm/aarch32/nmi.h b/include/arch/arm/aarch32/nmi.h
index 00ed6718610..9d4459fe417 100644
--- a/include/arch/arm/aarch32/nmi.h
+++ b/include/arch/arm/aarch32/nmi.h
@@ -10,8 +10,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_NMI_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_NMI_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_NMI_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_NMI_H_
 
 #ifndef _ASMLANGUAGE
 #ifdef CONFIG_RUNTIME_NMI
@@ -22,4 +22,4 @@ extern void z_arm_nmi_init(void);
 #endif
 #endif
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_NMI_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_NMI_H_ */
diff --git a/include/arch/arm/aarch32/syscall.h b/include/arch/arm/aarch32/syscall.h
index f98ce56ca09..b4c63ea9c99 100644
--- a/include/arch/arm/aarch32/syscall.h
+++ b/include/arch/arm/aarch32/syscall.h
@@ -13,8 +13,8 @@
  * (include/arch/syscall.h)
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_SYSCALL_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_SYSCALL_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_SYSCALL_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_SYSCALL_H_
 
 #define _SVC_CALL_CONTEXT_SWITCH	0
 #define _SVC_CALL_IRQ_OFFLOAD		1
@@ -184,4 +184,4 @@ static inline bool arch_is_user_context(void)
 
 #endif /* _ASMLANGUAGE */
 #endif /* CONFIG_USERSPACE */
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_SYSCALL_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_SYSCALL_H_ */
diff --git a/include/arch/arm/aarch32/thread.h b/include/arch/arm/aarch32/thread.h
index 8ab66cb27a9..6f6b6559650 100644
--- a/include/arch/arm/aarch32/thread.h
+++ b/include/arch/arm/aarch32/thread.h
@@ -16,8 +16,8 @@
  * necessary to instantiate instances of struct k_thread.
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_THREAD_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_THREAD_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_THREAD_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_THREAD_H_
 
 #ifndef _ASMLANGUAGE
 #include <zephyr/types.h>
@@ -92,4 +92,4 @@ typedef struct _thread_arch _thread_arch_t;
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_THREAD_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_THREAD_H_ */