diff --git a/arch/arm/core/mpu/arm_mpu_regions.c b/arch/arm/core/mpu/arm_mpu_regions.c
index 0bf7a219c27d7..f5f725a75fb6a 100644
--- a/arch/arm/core/mpu/arm_mpu_regions.c
+++ b/arch/arm/core/mpu/arm_mpu_regions.c
@@ -7,7 +7,7 @@
 #include <zephyr/sys/slist.h>
 #include <zephyr/arch/arm/mpu/arm_mpu.h>
 
-#include <zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h>
+#include <zephyr/arch/arm/mpu/arm_mpu_mem_cfg.h>
 
 static const struct arm_mpu_region mpu_regions[] = {
 #ifdef CONFIG_XIP
diff --git a/boards/nxp/mimxrt1180_evk/cm7/mpu_regions.c b/boards/nxp/mimxrt1180_evk/cm7/mpu_regions.c
index 0671843514ddb..ef942f80fb77c 100644
--- a/boards/nxp/mimxrt1180_evk/cm7/mpu_regions.c
+++ b/boards/nxp/mimxrt1180_evk/cm7/mpu_regions.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/devicetree.h>
-#include <zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h>
+#include <zephyr/arch/arm/mpu/arm_mpu_mem_cfg.h>
 
 #define MEMORY_REGION_SIZE_KB(SIZE)    (SIZE / 1024)
 
diff --git a/include/zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h b/include/zephyr/arch/arm/mpu/arm_mpu_mem_cfg.h
similarity index 96%
rename from include/zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h
rename to include/zephyr/arch/arm/mpu/arm_mpu_mem_cfg.h
index da958a51e643f..5b52a939d2a77 100644
--- a/include/zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h
+++ b/include/zephyr/arch/arm/mpu/arm_mpu_mem_cfg.h
@@ -4,8 +4,8 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#ifndef _ARM_CORTEX_M_MPU_MEM_CFG_H_
-#define _ARM_CORTEX_M_MPU_MEM_CFG_H_
+#ifndef _INCLUDE_ZEPHYR_ARCH_ARM_MPU_MEM_CFG_H_
+#define _INCLUDE_ZEPHYR_ARCH_ARM_MPU_MEM_CFG_H_
 
 #include <zephyr/arch/arm/mpu/arm_mpu.h>
 
@@ -119,4 +119,4 @@
 
 #endif /* !ARMV8_M_BASELINE && !ARMV8_M_MAINLINE */
 
-#endif /* _ARM_CORTEX_M_MPU_MEM_CFG_H_ */
+#endif /* _INCLUDE_ZEPHYR_ARCH_ARM_MPU_MEM_CFG_H_ */
diff --git a/soc/adi/max32/mpu_regions.c b/soc/adi/max32/mpu_regions.c
index fd5c56a47e3b4..020b5cf19126f 100644
--- a/soc/adi/max32/mpu_regions.c
+++ b/soc/adi/max32/mpu_regions.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/devicetree.h>
 #include <zephyr/storage/flash_map.h>
-#include <zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h>
+#include <zephyr/arch/arm/mpu/arm_mpu_mem_cfg.h>
 
 /*
  * Define noncacheable flash region attributes using noncacheable SRAM memory
diff --git a/soc/infineon/cat1b/cyw20829/mpu_regions.c b/soc/infineon/cat1b/cyw20829/mpu_regions.c
index 6ee6078def26f..36313f9481f4b 100644
--- a/soc/infineon/cat1b/cyw20829/mpu_regions.c
+++ b/soc/infineon/cat1b/cyw20829/mpu_regions.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/devicetree.h>
-#include <zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h>
+#include <zephyr/arch/arm/mpu/arm_mpu_mem_cfg.h>
 
 #define BOOTSTRAP_SAHB_RAM_BASE_ADDRESS DT_REG_ADDR(DT_NODELABEL(sram_bootstrap_sahb))
 #define BOOTSTRAP_CBUS_RAM_BASE_ADDRESS DT_REG_ADDR(DT_NODELABEL(sram_bootstrap_cbus))
diff --git a/soc/infineon/edge/pse84/mpu_regions.c b/soc/infineon/edge/pse84/mpu_regions.c
index 137245c4b30f7..b4d285e4e341b 100644
--- a/soc/infineon/edge/pse84/mpu_regions.c
+++ b/soc/infineon/edge/pse84/mpu_regions.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/devicetree.h>
-#include <zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h>
+#include <zephyr/arch/arm/mpu/arm_mpu_mem_cfg.h>
 
 /* We are expected to give *CONFIG_SIZE* in KB, but REGION_ATTR
  * expects bytes, so we multiply by 1024 to convert.
diff --git a/soc/nordic/common/nrf54hx_nrf92x_mpu_regions.c b/soc/nordic/common/nrf54hx_nrf92x_mpu_regions.c
index a9e8b3de7a912..65814c347d710 100644
--- a/soc/nordic/common/nrf54hx_nrf92x_mpu_regions.c
+++ b/soc/nordic/common/nrf54hx_nrf92x_mpu_regions.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/devicetree.h>
-#include <zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h>
+#include <zephyr/arch/arm/mpu/arm_mpu_mem_cfg.h>
 
 #define USBHS_BASE	DT_REG_ADDR_BY_NAME(DT_NODELABEL(usbhs), core)
 #define USBHS_SIZE	DT_REG_SIZE_BY_NAME(DT_NODELABEL(usbhs), core)
diff --git a/soc/nuvoton/npcx/npcx7/mpu_regions.c b/soc/nuvoton/npcx/npcx7/mpu_regions.c
index e9d4c07330588..da8199eceb8db 100644
--- a/soc/nuvoton/npcx/npcx7/mpu_regions.c
+++ b/soc/nuvoton/npcx/npcx7/mpu_regions.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h>
+#include <zephyr/arch/arm/mpu/arm_mpu_mem_cfg.h>
 
 static const struct arm_mpu_region mpu_regions[] = {
 	MPU_REGION_ENTRY("FLASH_0_0",
diff --git a/soc/nuvoton/numaker/m55m1x/mpu_regions.c b/soc/nuvoton/numaker/m55m1x/mpu_regions.c
index 33e59b71fba18..ecf2a0a4651e8 100644
--- a/soc/nuvoton/numaker/m55m1x/mpu_regions.c
+++ b/soc/nuvoton/numaker/m55m1x/mpu_regions.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/devicetree.h>
-#include <zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h>
+#include <zephyr/arch/arm/mpu/arm_mpu_mem_cfg.h>
 
 static const struct arm_mpu_region mpu_regions[] = {
 	MPU_REGION_ENTRY("FLASH",
diff --git a/soc/nxp/imx/imx8m/m7/mpu_regions.c b/soc/nxp/imx/imx8m/m7/mpu_regions.c
index ed7deb8575abf..c7ca883882f73 100644
--- a/soc/nxp/imx/imx8m/m7/mpu_regions.c
+++ b/soc/nxp/imx/imx8m/m7/mpu_regions.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/devicetree.h>
-#include <zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h>
+#include <zephyr/arch/arm/mpu/arm_mpu_mem_cfg.h>
 
 #define REGION_MASK_BASE_ADDRESS			0x00000000U
 #define REGION_ITCM_BASE_ADDRESS			0x00000000U
diff --git a/soc/nxp/imxrt/mpu_regions.c b/soc/nxp/imxrt/mpu_regions.c
index 51ce490eff1d8..8a017dadaf174 100644
--- a/soc/nxp/imxrt/mpu_regions.c
+++ b/soc/nxp/imxrt/mpu_regions.c
@@ -7,7 +7,7 @@
 #define SDRAM_BASE_ADDR 0x80000000
 
 #include <zephyr/devicetree.h>
-#include <zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h>
+#include <zephyr/arch/arm/mpu/arm_mpu_mem_cfg.h>
 
 static const struct arm_mpu_region mpu_regions[] = {
 	/* Region 0 */
diff --git a/soc/nxp/s32/s32k3/mpu_regions.c b/soc/nxp/s32/s32k3/mpu_regions.c
index 948e28bcab7ea..10e9de27b3b0b 100644
--- a/soc/nxp/s32/s32k3/mpu_regions.c
+++ b/soc/nxp/s32/s32k3/mpu_regions.c
@@ -6,7 +6,7 @@
 
 #include <zephyr/devicetree.h>
 #include <zephyr/linker/devicetree_regions.h>
-#include <zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h>
+#include <zephyr/arch/arm/mpu/arm_mpu_mem_cfg.h>
 
 #if !defined(CONFIG_XIP)
 extern char _rom_attr[];
diff --git a/soc/renode/cortex_r8_virtual/arm_mpu_regions.c b/soc/renode/cortex_r8_virtual/arm_mpu_regions.c
index 6a9ea54ed352c..6325a7957d3c8 100644
--- a/soc/renode/cortex_r8_virtual/arm_mpu_regions.c
+++ b/soc/renode/cortex_r8_virtual/arm_mpu_regions.c
@@ -6,7 +6,7 @@
  */
 
 #include <zephyr/kernel.h>
-#include <zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h>
+#include <zephyr/arch/arm/mpu/arm_mpu_mem_cfg.h>
 
 extern const uint32_t __rom_region_start;
 extern const uint32_t __rom_region_mpu_size_bits;
diff --git a/soc/st/stm32/stm32h7rsx/mpu_regions.c b/soc/st/stm32/stm32h7rsx/mpu_regions.c
index 72995b85216e6..35dfce848cded 100644
--- a/soc/st/stm32/stm32h7rsx/mpu_regions.c
+++ b/soc/st/stm32/stm32h7rsx/mpu_regions.c
@@ -8,7 +8,7 @@
 #include <zephyr/sys/slist.h>
 #include <zephyr/arch/arm/mpu/arm_mpu.h>
 
-#include <zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h>
+#include <zephyr/arch/arm/mpu/arm_mpu_mem_cfg.h>
 
 static const struct arm_mpu_region mpu_regions[] = {
 	/* Use first region to prevent speculative access in entire memory space */
diff --git a/soc/st/stm32/stm32h7x/mpu_regions.c b/soc/st/stm32/stm32h7x/mpu_regions.c
index f77018d36caed..73eab5f1d7ad8 100644
--- a/soc/st/stm32/stm32h7x/mpu_regions.c
+++ b/soc/st/stm32/stm32h7x/mpu_regions.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/devicetree.h>
-#include <zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h>
+#include <zephyr/arch/arm/mpu/arm_mpu_mem_cfg.h>
 
 static const struct arm_mpu_region mpu_regions[] = {
 	MPU_REGION_ENTRY("FLASH", CONFIG_FLASH_BASE_ADDRESS,
diff --git a/soc/ti/k3/am6x/r5/arm_mpu_regions.c b/soc/ti/k3/am6x/r5/arm_mpu_regions.c
index 495224a0597b3..7b4357a4f39f6 100644
--- a/soc/ti/k3/am6x/r5/arm_mpu_regions.c
+++ b/soc/ti/k3/am6x/r5/arm_mpu_regions.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h>
+#include <zephyr/arch/arm/mpu/arm_mpu_mem_cfg.h>
 #include <zephyr/devicetree.h>
 #include <zephyr/kernel.h>
 #include <zephyr/arch/arm/mpu/arm_mpu.h>
diff --git a/soc/xlnx/zynqmp/arm_mpu_regions.c b/soc/xlnx/zynqmp/arm_mpu_regions.c
index 73fc8bdb073dc..57a3a2f07153b 100644
--- a/soc/xlnx/zynqmp/arm_mpu_regions.c
+++ b/soc/xlnx/zynqmp/arm_mpu_regions.c
@@ -5,7 +5,7 @@
  */
 
 #include <zephyr/kernel.h>
-#include <zephyr/arch/arm/cortex_m/arm_mpu_mem_cfg.h>
+#include <zephyr/arch/arm/mpu/arm_mpu_mem_cfg.h>
 
 extern const uint32_t __rom_region_start;
 extern const uint32_t __rom_region_mpu_size_bits;