diff --git a/macros/src/codegen/pre_init.rs b/macros/src/codegen/pre_init.rs
index 948dae54b5..605171b804 100644
--- a/macros/src/codegen/pre_init.rs
+++ b/macros/src/codegen/pre_init.rs
@@ -75,7 +75,7 @@ pub fn codegen(
 
         // NOTE unmask the interrupt *after* setting its priority: changing the priority of a pended
         // interrupt is implementation defined
-        stmts.push(quote!(core.NVIC.enable(#device::#interrupt::#name);));
+        stmts.push(quote!(rtfm::export::NVIC::unmask(#device::#interrupt::#name);));
     }
 
     // cross-spawn barriers: now that priorities have been set and the interrupts have been unmasked
diff --git a/src/export.rs b/src/export.rs
index 572068ce22..96c444bf46 100644
--- a/src/export.rs
+++ b/src/export.rs
@@ -9,7 +9,7 @@ pub use cortex_m::register::basepri;
 pub use cortex_m::{
     asm::wfi,
     interrupt,
-    peripheral::{scb::SystemHandler, syst::SystClkSource, DWT},
+    peripheral::{scb::SystemHandler, syst::SystClkSource, DWT, NVIC},
     Peripherals,
 };
 use heapless::spsc::{MultiCore, SingleCore};