diff --git a/arch/arm/core/mpu/arm_core_mpu_dev.h b/arch/arm/core/mpu/arm_core_mpu_dev.h
index ec0126e6e9..fd56131d7d 100644
--- a/arch/arm/core/mpu/arm_core_mpu_dev.h
+++ b/arch/arm/core/mpu/arm_core_mpu_dev.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#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_
+#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_
 
 #include <zephyr/types.h>
 #include <kernel_arch_data.h>
@@ -269,4 +269,4 @@ int arm_core_mpu_buffer_validate(void *addr, size_t size, int write);
 }
 #endif
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MPU_ARM_CORE_MPU_DEV_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MPU_ARM_CORE_MPU_DEV_H_ */
diff --git a/include/zephyr/arch/arm/arch.h b/include/zephyr/arch/arm/arch.h
index 01284a675c..d3a64e9ef8 100644
--- a/include/zephyr/arch/arm/arch.h
+++ b/include/zephyr/arch/arm/arch.h
@@ -13,8 +13,8 @@
  * (include/arm/cpu.h)
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ARCH_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ARCH_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ARCH_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_ARCH_H_
 
 /* Add include for DTS generated information */
 #include <zephyr/devicetree.h>
@@ -279,4 +279,4 @@ enum k_fatal_error_reason_arch {
 }
 #endif
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ARCH_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_ARCH_H_ */
diff --git a/include/zephyr/arch/arm/arch_inlines.h b/include/zephyr/arch/arm/arch_inlines.h
index acc3d2e958..f5149799ad 100644
--- a/include/zephyr/arch/arm/arch_inlines.h
+++ b/include/zephyr/arch/arm/arch_inlines.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ARCH_INLINES_H
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ARCH_INLINES_H
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ARCH_INLINES_H
+#define ZEPHYR_INCLUDE_ARCH_ARM_ARCH_INLINES_H
 
 #include <zephyr/kernel_structs.h>
 #if defined(CONFIG_CPU_AARCH32_CORTEX_R) || defined(CONFIG_CPU_AARCH32_CORTEX_A)
@@ -41,4 +41,4 @@ static ALWAYS_INLINE unsigned int arch_num_cpus(void)
 	return CONFIG_MP_MAX_NUM_CPUS;
 }
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ARCH_INLINES_H */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_ARCH_INLINES_H */
diff --git a/include/zephyr/arch/arm/asm_inline.h b/include/zephyr/arch/arm/asm_inline.h
index c083adcd47..fe36fb2d0e 100644
--- a/include/zephyr/arch/arm/asm_inline.h
+++ b/include/zephyr/arch/arm/asm_inline.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ASM_INLINE_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ASM_INLINE_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_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_AARCH32_ASM_INLINE_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_H_ */
diff --git a/include/zephyr/arch/arm/asm_inline_gcc.h b/include/zephyr/arch/arm/asm_inline_gcc.h
index 604dd4f088..77729149e3 100644
--- a/include/zephyr/arch/arm/asm_inline_gcc.h
+++ b/include/zephyr/arch/arm/asm_inline_gcc.h
@@ -8,8 +8,8 @@
 
 /* Either public functions or macros or invoked by public functions */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ASM_INLINE_GCC_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ASM_INLINE_GCC_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_GCC_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_GCC_H_
 
 /*
  * The file must not be included directly
@@ -126,4 +126,4 @@ static ALWAYS_INLINE bool arch_irq_unlocked(unsigned int key)
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ASM_INLINE_GCC_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_ASM_INLINE_GCC_H_ */
diff --git a/include/zephyr/arch/arm/cortex_a_r/cpu.h b/include/zephyr/arch/arm/cortex_a_r/cpu.h
index 806d28247a..61e520ffc2 100644
--- a/include/zephyr/arch/arm/cortex_a_r/cpu.h
+++ b/include/zephyr/arch/arm/cortex_a_r/cpu.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_A_R_CPU_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_A_R_CPU_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_A_R_CPU_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_A_R_CPU_H_
 
 #if defined(CONFIG_ARM_MPU)
 #include <zephyr/arch/arm/cortex_a_r/mpu.h>
@@ -116,4 +116,4 @@
 	 (((_aff1) & SGIR_AFF_MASK) << SGIR_AFF1_SHIFT) |		\
 	 ((_tgt) & SGIR_TGT_MASK))
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_A_R_CPU_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_A_R_CPU_H_ */
diff --git a/include/zephyr/arch/arm/cortex_a_r/lib_helpers.h b/include/zephyr/arch/arm/cortex_a_r/lib_helpers.h
index 7b89ddf515..983654ce13 100644
--- a/include/zephyr/arch/arm/cortex_a_r/lib_helpers.h
+++ b/include/zephyr/arch/arm/cortex_a_r/lib_helpers.h
@@ -7,8 +7,8 @@
  *
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_A_R_LIB_HELPERS_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_A_R_LIB_HELPERS_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_A_R_LIB_HELPERS_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_A_R_LIB_HELPERS_H_
 
 #ifndef _ASMLANGUAGE
 
@@ -103,4 +103,4 @@ MAKE_REG_HELPER(ICC_IGRPEN1_EL1, 0, 12, 12, 7);
 #define wfe()	__asm__ volatile("wfe" : : : "memory")
 
 #endif /* !_ASMLANGUAGE */
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_A_R_LIB_HELPERS_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_A_R_LIB_HELPERS_H_ */
diff --git a/include/zephyr/arch/arm/cortex_a_r/sys_io.h b/include/zephyr/arch/arm/cortex_a_r/sys_io.h
index c4598302aa..888e328e6b 100644
--- a/include/zephyr/arch/arm/cortex_a_r/sys_io.h
+++ b/include/zephyr/arch/arm/cortex_a_r/sys_io.h
@@ -9,8 +9,8 @@
  * gcc builtins)
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_A_R_SYS_IO_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_A_R_SYS_IO_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_A_R_SYS_IO_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_A_R_SYS_IO_H_
 
 #ifndef _ASMLANGUAGE
 
@@ -88,4 +88,4 @@ static ALWAYS_INLINE uint64_t sys_read64(mem_addr_t addr)
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_A_R_SYS_IO_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_A_R_SYS_IO_H_ */
diff --git a/include/zephyr/arch/arm/cortex_a_r/timer.h b/include/zephyr/arch/arm/cortex_a_r/timer.h
index d513ecdffc..6cd10c5d8e 100644
--- a/include/zephyr/arch/arm/cortex_a_r/timer.h
+++ b/include/zephyr/arch/arm/cortex_a_r/timer.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_A_R_TIMER_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_A_R_TIMER_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_A_R_TIMER_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_A_R_TIMER_H_
 
 #ifdef CONFIG_ARM_ARCH_TIMER
 
@@ -149,4 +149,4 @@ static ALWAYS_INLINE uint64_t arm_arch_timer_count(void)
 
 #endif /* CONFIG_ARM_ARCH_TIMER */
 
-#endif  /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_A_R_TIMER_H_ */
+#endif  /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_A_R_TIMER_H_ */
diff --git a/include/zephyr/arch/arm/cortex_m/fpu.h b/include/zephyr/arch/arm/cortex_m/fpu.h
index 17f75cec50..cf01fddf4f 100644
--- a/include/zephyr/arch/arm/cortex_m/fpu.h
+++ b/include/zephyr/arch/arm/cortex_m/fpu.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_FPU_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_FPU_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_FPU_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_FPU_H_
 
 struct fpu_ctx_full {
 	uint32_t caller_saved[16];
@@ -17,4 +17,4 @@ struct fpu_ctx_full {
 void z_arm_save_fp_context(struct fpu_ctx_full *buffer);
 void z_arm_restore_fp_context(const struct fpu_ctx_full *buffer);
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_FPU_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_FPU_H_ */
diff --git a/include/zephyr/arch/arm/cortex_m/memory_map.h b/include/zephyr/arch/arm/cortex_m/memory_map.h
index 8231027301..b73a77f10e 100644
--- a/include/zephyr/arch/arm/cortex_m/memory_map.h
+++ b/include/zephyr/arch/arm/cortex_m/memory_map.h
@@ -12,8 +12,8 @@
  * processors.
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MEMORY_MAP_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MEMORY_MAP_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MEMORY_MAP_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MEMORY_MAP_H_
 
 #include <zephyr/sys/util.h>
 
@@ -110,4 +110,4 @@
 #define _VENDOR_BASE_ADDR         0xE0100000
 #define _VENDOR_END_ADDR          0xFFFFFFFF
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_MEMORY_MAP_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_MEMORY_MAP_H_ */
diff --git a/include/zephyr/arch/arm/cortex_m/nvic.h b/include/zephyr/arch/arm/cortex_m/nvic.h
index caececd3c0..947bfb6eaf 100644
--- a/include/zephyr/arch/arm/cortex_m/nvic.h
+++ b/include/zephyr/arch/arm/cortex_m/nvic.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_NVIC_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_NVIC_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_NVIC_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_NVIC_H_
 
 #include <zephyr/devicetree.h>
 
@@ -25,4 +25,4 @@
 
 #define NUM_IRQ_PRIO_BITS DT_PROP(NVIC_NODEID, arm_num_irq_priority_bits)
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_NVIC_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_CORTEX_M_NVIC_H_ */
diff --git a/include/zephyr/arch/arm/error.h b/include/zephyr/arch/arm/error.h
index afd3495fcb..a30c674c4f 100644
--- a/include/zephyr/arch/arm/error.h
+++ b/include/zephyr/arch/arm/error.h
@@ -12,8 +12,8 @@
  * arm/arch.h.
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ERROR_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ERROR_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ERROR_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_ERROR_H_
 
 #include <zephyr/arch/arm/syscall.h>
 #include <zephyr/arch/arm/exception.h>
@@ -83,4 +83,4 @@ do { \
 }
 #endif
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_ERROR_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_ERROR_H_ */
diff --git a/include/zephyr/arch/arm/irq.h b/include/zephyr/arch/arm/irq.h
index 357c91a83a..42a2a364fb 100644
--- a/include/zephyr/arch/arm/irq.h
+++ b/include/zephyr/arch/arm/irq.h
@@ -13,8 +13,8 @@
  * arm/arch.h.
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_IRQ_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_IRQ_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_IRQ_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_IRQ_H_
 
 #include <zephyr/sw_isr_table.h>
 #include <stdbool.h>
@@ -254,4 +254,4 @@ typedef enum {
 }
 #endif
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_IRQ_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_IRQ_H_ */
diff --git a/include/zephyr/arch/arm/misc.h b/include/zephyr/arch/arm/misc.h
index ab67a35e94..99f99b59b2 100644
--- a/include/zephyr/arch/arm/misc.h
+++ b/include/zephyr/arch/arm/misc.h
@@ -11,8 +11,8 @@
  * ARM AArch32-specific kernel miscellaneous interface. Included by arm/arch.h.
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_MISC_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_MISC_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_MISC_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_MISC_H_
 
 #ifdef __cplusplus
 extern "C" {
@@ -66,4 +66,4 @@ void z_arm_on_enter_cpu_idle_prepare(void);
 }
 #endif
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_MISC_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_MISC_H_ */
diff --git a/include/zephyr/arch/arm/mpu/arm_mpu.h b/include/zephyr/arch/arm/mpu/arm_mpu.h
index 857465a482..9a8ffc7a72 100644
--- a/include/zephyr/arch/arm/mpu/arm_mpu.h
+++ b/include/zephyr/arch/arm/mpu/arm_mpu.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_MPU_ARM_MPU_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_MPU_ARM_MPU_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_MPU_ARM_MPU_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_MPU_ARM_MPU_H_
 
 #if defined(CONFIG_CPU_CORTEX_M0PLUS) || \
 	defined(CONFIG_CPU_CORTEX_M3) || \
@@ -74,4 +74,4 @@ extern const struct arm_mpu_config mpu_config;
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_MPU_ARM_MPU_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_MPU_ARM_MPU_H_ */
diff --git a/include/zephyr/arch/arm/mpu/nxp_mpu.h b/include/zephyr/arch/arm/mpu/nxp_mpu.h
index d1f5882bfe..b955656580 100644
--- a/include/zephyr/arch/arm/mpu/nxp_mpu.h
+++ b/include/zephyr/arch/arm/mpu/nxp_mpu.h
@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_MPU_NXP_MPU_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_MPU_NXP_MPU_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_MPU_NXP_MPU_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_MPU_NXP_MPU_H_
 
 #ifndef _ASMLANGUAGE
 
@@ -266,4 +266,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_AARCH32_MPU_NXP_MPU_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_MPU_NXP_MPU_H_ */
diff --git a/include/zephyr/arch/arm/nmi.h b/include/zephyr/arch/arm/nmi.h
index a4bd85802c..33f4608424 100644
--- a/include/zephyr/arch/arm/nmi.h
+++ b/include/zephyr/arch/arm/nmi.h
@@ -10,11 +10,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_NMI_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_NMI_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_NMI_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_NMI_H_
 
 #if !defined(_ASMLANGUAGE) && defined(CONFIG_RUNTIME_NMI)
 extern void z_arm_nmi_set_handler(void (*pHandler)(void));
 #endif
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_NMI_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_NMI_H_ */
diff --git a/include/zephyr/arch/arm/syscall.h b/include/zephyr/arch/arm/syscall.h
index a4e067307e..e07dab12a9 100644
--- a/include/zephyr/arch/arm/syscall.h
+++ b/include/zephyr/arch/arm/syscall.h
@@ -13,8 +13,8 @@
  * (include/arch/syscall.h)
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_SYSCALL_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_SYSCALL_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_SYSCALL_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_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_AARCH32_SYSCALL_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_SYSCALL_H_ */
diff --git a/include/zephyr/arch/arm/thread.h b/include/zephyr/arch/arm/thread.h
index b4d34b137c..139f606809 100644
--- a/include/zephyr/arch/arm/thread.h
+++ b/include/zephyr/arch/arm/thread.h
@@ -16,8 +16,8 @@
  * necessary to instantiate instances of struct k_thread.
  */
 
-#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_THREAD_H_
-#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_THREAD_H_
+#ifndef ZEPHYR_INCLUDE_ARCH_ARM_THREAD_H_
+#define ZEPHYR_INCLUDE_ARCH_ARM_THREAD_H_
 
 #ifndef _ASMLANGUAGE
 #include <zephyr/types.h>
@@ -143,4 +143,4 @@ typedef struct _thread_arch _thread_arch_t;
 
 #endif /* _ASMLANGUAGE */
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_THREAD_H_ */
+#endif /* ZEPHYR_INCLUDE_ARCH_ARM_THREAD_H_ */
diff --git a/modules/cmsis/cmsis_core.h b/modules/cmsis/cmsis_core.h
index 04e5566cc0..4f57c68213 100644
--- a/modules/cmsis/cmsis_core.h
+++ b/modules/cmsis/cmsis_core.h
@@ -12,4 +12,4 @@
 #include "cmsis_core_a_r.h"
 #endif
 
-#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH32_CORTEX_M_CMSIS_H_ */
+#endif /* ZEPHYR_MODULES_CMSIS_CMSIS_H_ */