diff --git a/firmware/application/Makefile b/firmware/application/Makefile
index bd488ea74..ab0e616c2 100755
--- a/firmware/application/Makefile
+++ b/firmware/application/Makefile
@@ -118,7 +118,6 @@ CSRC = $(PORTSRC) \
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
 CPPSRC = main.cpp \
-         irq_ipc.cpp \
          irq_lcd_frame.cpp \
          irq_controls.cpp \
          irq_rtc.cpp \
diff --git a/firmware/application/irq_ipc.cpp b/firmware/application/irq_ipc.cpp
deleted file mode 100644
index 5ee5a97e3..000000000
--- a/firmware/application/irq_ipc.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "irq_ipc.hpp"
-
-#include "event.hpp"
-
-#include "ch.h"
-#include "hal.h"
-
-#include "lpc43xx_cpp.hpp"
-using namespace lpc43xx;
-
-extern "C" {
-
-CH_IRQ_HANDLER(M4Core_IRQHandler) {
-	CH_IRQ_PROLOGUE();
-
-	chSysLockFromIsr();
-	events_flag_isr(EVT_MASK_APPLICATION);
-	chSysUnlockFromIsr();
-
-	creg::m4txevent::clear();
-
-	CH_IRQ_EPILOGUE();
-}
-
-}
diff --git a/firmware/application/irq_ipc.hpp b/firmware/application/irq_ipc.hpp
deleted file mode 100644
index de768c80f..000000000
--- a/firmware/application/irq_ipc.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
- *
- * This file is part of PortaPack.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef __IRQ_IPC_H__
-#define __IRQ_IPC_H__
-
-#endif/*__IRQ_IPC_H__*/
diff --git a/firmware/application/main.cpp b/firmware/application/main.cpp
index b40fff241..e5bcde2d6 100755
--- a/firmware/application/main.cpp
+++ b/firmware/application/main.cpp
@@ -33,7 +33,6 @@
 #include "ui_painter.hpp"
 #include "ui_navigation.hpp"
 
-#include "irq_ipc.hpp"
 #include "irq_lcd_frame.hpp"
 #include "irq_controls.hpp"
 #include "irq_rtc.hpp"
@@ -55,6 +54,22 @@ using namespace lpc43xx;
 
 #include <string.h>
 
+extern "C" {
+
+CH_IRQ_HANDLER(M4Core_IRQHandler) {
+	CH_IRQ_PROLOGUE();
+
+	chSysLockFromIsr();
+	events_flag_isr(EVT_MASK_APPLICATION);
+	chSysUnlockFromIsr();
+
+	creg::m4txevent::clear();
+
+	CH_IRQ_EPILOGUE();
+}
+
+}
+
 class EventDispatcher {
 public:
 	EventDispatcher(