diff --git a/include/arch/arm/aarch32/arch.h b/include/arch/arm/aarch32/arch.h
index 2fe531c619b..8e1b210d12f 100644
--- a/include/arch/arm/aarch32/arch.h
+++ b/include/arch/arm/aarch32/arch.h
@@ -184,10 +184,10 @@ extern "C" {
 /* Legacy case: retain containing extern "C" with C++ */
 #ifdef CONFIG_ARM_MPU
 #ifdef CONFIG_CPU_HAS_ARM_MPU
-#include <arch/arm/aarch32/cortex_m/mpu/arm_mpu.h>
+#include <arch/arm/aarch32/mpu/arm_mpu.h>
 #endif /* CONFIG_CPU_HAS_ARM_MPU */
 #ifdef CONFIG_CPU_HAS_NXP_MPU
-#include <arch/arm/aarch32/cortex_m/mpu/nxp_mpu.h>
+#include <arch/arm/aarch32/mpu/nxp_mpu.h>
 #endif /* CONFIG_CPU_HAS_NXP_MPU */
 #endif /* CONFIG_ARM_MPU */
 
diff --git a/include/arch/arm/aarch32/mpu/arm_mpu.h b/include/arch/arm/aarch32/mpu/arm_mpu.h
index 413d669d08c..e0078d2665b 100644
--- a/include/arch/arm/aarch32/mpu/arm_mpu.h
+++ b/include/arch/arm/aarch32/mpu/arm_mpu.h
@@ -10,11 +10,11 @@
 	defined(CONFIG_CPU_CORTEX_M3) || \
 	defined(CONFIG_CPU_CORTEX_M4) || \
 	defined(CONFIG_CPU_CORTEX_M7)
-#include <arch/arm/aarch32/cortex_m/mpu/arm_mpu_v7m.h>
+#include <arch/arm/aarch32/mpu/arm_mpu_v7m.h>
 #elif defined(CONFIG_CPU_CORTEX_M23) || \
 	defined(CONFIG_CPU_CORTEX_M33) || \
 	defined(CONFIG_CPU_CORTEX_M55)
-#include <arch/arm/aarch32/cortex_m/mpu/arm_mpu_v8m.h>
+#include <arch/arm/aarch32/mpu/arm_mpu_v8m.h>
 #else
 #error "Unsupported ARM CPU"
 #endif
diff --git a/soc/arm/common/cortex_m/arm_mpu_mem_cfg.h b/soc/arm/common/cortex_m/arm_mpu_mem_cfg.h
index bdbe54a3d1b..dfe14b22e5a 100644
--- a/soc/arm/common/cortex_m/arm_mpu_mem_cfg.h
+++ b/soc/arm/common/cortex_m/arm_mpu_mem_cfg.h
@@ -6,7 +6,7 @@
 #ifndef _ARM_CORTEX_M_MPU_MEM_CFG_H_
 #define _ARM_CORTEX_M_MPU_MEM_CFG_H_
 
-#include <arch/arm/aarch32/cortex_m/mpu/arm_mpu.h>
+#include <arch/arm/aarch32/mpu/arm_mpu.h>
 
 #if !defined(CONFIG_ARMV8_M_BASELINE) && !defined(CONFIG_ARMV8_M_MAINLINE)
 
diff --git a/soc/arm/common/cortex_m/arm_mpu_regions.c b/soc/arm/common/cortex_m/arm_mpu_regions.c
index 409546b49b0..6ba05377ba5 100644
--- a/soc/arm/common/cortex_m/arm_mpu_regions.c
+++ b/soc/arm/common/cortex_m/arm_mpu_regions.c
@@ -5,7 +5,7 @@
  */
 
 #include <sys/slist.h>
-#include <arch/arm/aarch32/cortex_m/mpu/arm_mpu.h>
+#include <arch/arm/aarch32/mpu/arm_mpu.h>
 
 #include "arm_mpu_mem_cfg.h"
 
diff --git a/soc/arm/nxp_kinetis/k6x/nxp_mpu_regions.c b/soc/arm/nxp_kinetis/k6x/nxp_mpu_regions.c
index 926fb939b71..9be34e692b6 100644
--- a/soc/arm/nxp_kinetis/k6x/nxp_mpu_regions.c
+++ b/soc/arm/nxp_kinetis/k6x/nxp_mpu_regions.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <soc.h>
-#include <arch/arm/aarch32/cortex_m/mpu/nxp_mpu.h>
+#include <arch/arm/aarch32/mpu/nxp_mpu.h>
 
 static const struct nxp_mpu_region mpu_regions[] = {
 	/* Region 0 */
diff --git a/soc/arm/nxp_kinetis/k8x/nxp_mpu_regions.c b/soc/arm/nxp_kinetis/k8x/nxp_mpu_regions.c
index 4407ce2ff55..fef9e18a2e9 100644
--- a/soc/arm/nxp_kinetis/k8x/nxp_mpu_regions.c
+++ b/soc/arm/nxp_kinetis/k8x/nxp_mpu_regions.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <soc.h>
-#include <arch/arm/aarch32/cortex_m/mpu/nxp_mpu.h>
+#include <arch/arm/aarch32/mpu/nxp_mpu.h>
 
 static const struct nxp_mpu_region mpu_regions[] = {
 	/* Region 0 */
diff --git a/soc/arm/nxp_kinetis/ke1xf/nxp_mpu_regions.c b/soc/arm/nxp_kinetis/ke1xf/nxp_mpu_regions.c
index 4407ce2ff55..fef9e18a2e9 100644
--- a/soc/arm/nxp_kinetis/ke1xf/nxp_mpu_regions.c
+++ b/soc/arm/nxp_kinetis/ke1xf/nxp_mpu_regions.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 #include <soc.h>
-#include <arch/arm/aarch32/cortex_m/mpu/nxp_mpu.h>
+#include <arch/arm/aarch32/mpu/nxp_mpu.h>
 
 static const struct nxp_mpu_region mpu_regions[] = {
 	/* Region 0 */