diff --git a/boot/zephyr/arm_cleanup.c b/boot/zephyr/arm_cleanup.c
index d58956f..3b6c71a 100644
--- a/boot/zephyr/arm_cleanup.c
+++ b/boot/zephyr/arm_cleanup.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
 #include <zephyr/toolchain.h>
 
+#include <cmsis_core.h>
 #if CONFIG_CPU_HAS_NXP_MPU
 #include <fsl_sysmpu.h>
 #endif
diff --git a/boot/zephyr/main.c b/boot/zephyr/main.c
index d8d4cff..8551649 100644
--- a/boot/zephyr/main.c
+++ b/boot/zephyr/main.c
@@ -27,11 +27,7 @@
 #include <soc.h>
 #include <zephyr/linker/linker-defs.h>
 
-#if defined(CONFIG_CPU_AARCH32_CORTEX_A) || defined(CONFIG_CPU_AARCH32_CORTEX_R)
-#include <zephyr/arch/arm/aarch32/cortex_a_r/cmsis.h>
-#elif defined(CONFIG_CPU_CORTEX_M)
-#include <zephyr/arch/arm/aarch32/cortex_m/cmsis.h>
-#endif
+#include <cmsis_core.h>
 
 #include "target.h"