diff --git a/firmware/baseband/event_m4.cpp b/firmware/baseband/event_m4.cpp
index ca0038e7..50b0c0b7 100644
--- a/firmware/baseband/event_m4.cpp
+++ b/firmware/baseband/event_m4.cpp
@@ -21,9 +21,6 @@
 
 #include "event_m4.hpp"
 
-#include "lpc43xx_cpp.hpp"
-using namespace lpc43xx;
-
 #include "ch.h"
 
 Thread* thread_event_loop = nullptr;
@@ -31,19 +28,3 @@ Thread* thread_event_loop = nullptr;
 void events_initialize(Thread* const event_loop_thread) {
 	thread_event_loop = event_loop_thread;
 }
-
-extern "C" {
-
-CH_IRQ_HANDLER(MAPP_IRQHandler) {
-	CH_IRQ_PROLOGUE();
-
-	chSysLockFromIsr();
-	events_flag_isr(EVT_MASK_BASEBAND);
-	chSysUnlockFromIsr();
-
-	creg::m0apptxevent::clear();
-
-	CH_IRQ_EPILOGUE();
-}
-
-}
diff --git a/firmware/baseband/main.cpp b/firmware/baseband/main.cpp
index fcf9de57..8a8852b5 100755
--- a/firmware/baseband/main.cpp
+++ b/firmware/baseband/main.cpp
@@ -117,6 +117,22 @@ static void shutdown() {
 	halt();
 }
 
+extern "C" {
+
+CH_IRQ_HANDLER(MAPP_IRQHandler) {
+	CH_IRQ_PROLOGUE();
+
+	chSysLockFromIsr();
+	events_flag_isr(EVT_MASK_BASEBAND);
+	chSysUnlockFromIsr();
+
+	creg::m0apptxevent::clear();
+
+	CH_IRQ_EPILOGUE();
+}
+
+}
+
 class EventDispatcher {
 public:
 	void run() {