diff --git a/ports/zephyr/common/memfault_platform_coredump_regions.c b/ports/zephyr/common/memfault_platform_coredump_regions.c
index f0c98856e..5fc13f0e5 100644
--- a/ports/zephyr/common/memfault_platform_coredump_regions.c
+++ b/ports/zephyr/common/memfault_platform_coredump_regions.c
@@ -15,7 +15,7 @@
 #include "memfault/ports/zephyr/version.h"
 
 #if MEMFAULT_ZEPHYR_VERSION_GT(2, 1)
-  #include <arch/arm/aarch32/cortex_m/cmsis.h>
+  #include <cmsis_core.h>
 #else
   #include <arch/arm/cortex_m/cmsis.h>
 #endif
diff --git a/ports/zephyr/v2.4/memfault_fault_handler.c b/ports/zephyr/v2.4/memfault_fault_handler.c
index 286c8eb32..535f7a916 100644
--- a/ports/zephyr/v2.4/memfault_fault_handler.c
+++ b/ports/zephyr/v2.4/memfault_fault_handler.c
@@ -23,7 +23,7 @@
 // Starting in v3.4, the handler set function was renamed and the declaration
 // added to a public header
 #if MEMFAULT_ZEPHYR_VERSION_GT(3, 3)
-  #include <arch/arm/aarch32/nmi.h>
+  #include <cmsis_core.h>
   #define MEMFAULT_ZEPHYR_NMI_HANDLER_SET z_arm_nmi_set_handler
 #else
   #define MEMFAULT_ZEPHYR_NMI_HANDLER_SET z_NmiHandlerSet