diff --git a/include/arm9/interrupt.h b/include/arm9/interrupt.h
index f966948..0fa6367 100644
--- a/include/arm9/interrupt.h
+++ b/include/arm9/interrupt.h
@@ -1,14 +1,8 @@
 #pragma once
 
-#include "mem_map.h"
 #include "types.h"
 
 
-#define IRQ_REGS_BASE  (IO_MEM_ARM9_ONLY + 0x1000)
-#define REG_IRQ_IE     *((vu32*)(IRQ_REGS_BASE + 0x00))
-#define REG_IRQ_IF     *((vu32*)(IRQ_REGS_BASE + 0x04))
-
-
 typedef enum
 {
 	IRQ_DMAC_1_0      = 0,  // DMAC_1 = NDMA
diff --git a/source/arm9/crypto.c b/source/arm9/crypto.c
index 7f5533b..7bb54db 100644
--- a/source/arm9/crypto.c
+++ b/source/arm9/crypto.c
@@ -151,7 +151,7 @@
 	REG_NDMA1_CNT = NDMA_REPEATING_MODE | NDMA_STARTUP_AES_OUT |
 	                NDMA_SRC_UPDATE_FIXED | NDMA_DST_UPDATE_INC;
 
-	REG_IRQ_IE |= 1u<<IRQ_AES;
+	IRQ_registerHandler(IRQ_AES, NULL);
 
 	setupKeys();
 }
diff --git a/source/arm9/interrupt.c b/source/arm9/interrupt.c
index d3ccadc..c5880a0 100644
--- a/source/arm9/interrupt.c
+++ b/source/arm9/interrupt.c
@@ -1,7 +1,13 @@
 #include "types.h"
+#include "mem_map.h"
 #include "arm9/interrupt.h"
 
 
+#define IRQ_REGS_BASE  (IO_MEM_ARM9_ONLY + 0x1000)
+#define REG_IRQ_IE     *((vu32*)(IRQ_REGS_BASE + 0x00))
+#define REG_IRQ_IF     *((vu32*)(IRQ_REGS_BASE + 0x04))
+
+
 void (*irqHandlerTable[32])(void);
 
 
diff --git a/source/arm9/ndma.c b/source/arm9/ndma.c
index 281aa3b..311a443 100644
--- a/source/arm9/ndma.c
+++ b/source/arm9/ndma.c
@@ -19,7 +19,7 @@
 
 	REG_NDMA_GLOBAL_CNT = NDMA_ROUND_ROBIN(32);
 
-	REG_IRQ_IE |= 1u<<IRQ_DMAC_1_7;
+	IRQ_registerHandler(IRQ_DMAC_1_7, NULL);
 }
 
 void NDMA_copyAsync(u32 *dest, const u32 *source, u32 size)
diff --git a/source/arm9/pxi.c b/source/arm9/pxi.c
index d4f5833..2d824b9 100644
--- a/source/arm9/pxi.c
+++ b/source/arm9/pxi.c
@@ -12,7 +12,7 @@
 	REG_PXI_SYNC9 |= 9u<<8;
 	while((REG_PXI_SYNC9 & 0xFFu) != 11u);
 
-	REG_IRQ_IE |= 1u<<IRQ_PXI_SYNC;
+	IRQ_registerHandler(IRQ_PXI_SYNC, NULL);
 }
 
 void PXI_sendWord(u32 val)
diff --git a/source/arm9/timer.c b/source/arm9/timer.c
index 8966db5..5a446da 100644
--- a/source/arm9/timer.c
+++ b/source/arm9/timer.c
@@ -32,8 +32,6 @@
 	{
 		REG_TIMER_CNT(i) = 0;
 	}
-
-	REG_IRQ_IE |= 1u<<IRQ_TIMER_3;
 }
 
 void TIMER_start(Timer timer, TimerPrescaler prescaler, u16 ticks, bool enableIrq)