diff --git a/include/arm11/firm.h b/include/arm11/firm.h
index 4f40ef6..eddf3a4 100644
--- a/include/arm11/firm.h
+++ b/include/arm11/firm.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "types.h"
-
 
 
 noreturn void firm_launch(void);
diff --git a/include/arm11/gpio.h b/include/arm11/gpio.h
index 66feb29..98749d5 100644
--- a/include/arm11/gpio.h
+++ b/include/arm11/gpio.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "types.h"
-
 
 
 /**
diff --git a/include/arm11/hid.h b/include/arm11/hid.h
index 5d118cd..82f65c2 100644
--- a/include/arm11/hid.h
+++ b/include/arm11/hid.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "types.h"
-
 
 #define HID_KEY_MASK_ALL          ((KEY_SHELL << 1) - 1)
 #define HID_VERBOSE_MODE_BUTTONS  (KEY_SELECT | KEY_START)
diff --git a/include/arm11/i2c.h b/include/arm11/i2c.h
index 0b1c798..22c185c 100644
--- a/include/arm11/i2c.h
+++ b/include/arm11/i2c.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "types.h"
-
 
 
 // general i2c routines
diff --git a/include/arm11/interrupt.h b/include/arm11/interrupt.h
index 2693406..ff30068 100644
--- a/include/arm11/interrupt.h
+++ b/include/arm11/interrupt.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "types.h"
-
 
 typedef enum
 {
@@ -84,7 +82,7 @@
  * @param[in]  id       The interrupt ID. Must be <16.
  * @param[in]  cpuMask  The CPU mask. Each of the 4 bits stands for 1 core.
  */
-void softwareInterrupt(Interrupt id, u8 cpuMask);
+void IRQ_softwareInterrupt(Interrupt id, u8 cpuMask);
 
 
 static inline void waitForInterrupt(void)
diff --git a/include/arm11/start.h b/include/arm11/start.h
index 378d275..4af0ddd 100644
--- a/include/arm11/start.h
+++ b/include/arm11/start.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "types.h"
-
 
 
 void clearMem(u32 *adr, u32 size);
diff --git a/include/cache.h b/include/cache.h
index 1e68d3e..3208c56 100644
--- a/include/cache.h
+++ b/include/cache.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "types.h"
-
 
 
 void invalidateICache(void);
diff --git a/include/gfx.h b/include/gfx.h
index 940d983..cc68a3a 100644
--- a/include/gfx.h
+++ b/include/gfx.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "mem_map.h"
-#include "types.h"
 
 
 #define SCREEN_HEIGHT_TOP   (240)
diff --git a/include/pxi.h b/include/pxi.h
index 56f30ae..74b127b 100644
--- a/include/pxi.h
+++ b/include/pxi.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "mem_map.h"
-#include "types.h"
 
 
 #ifdef ARM9
diff --git a/include/types.h b/include/types.h
index 89d6554..417395d 100644
--- a/include/types.h
+++ b/include/types.h
@@ -1,11 +1,8 @@
 #pragma once
 
-#include <stdio.h>
 #include <stdint.h>
 #include <inttypes.h>
 #include <stdbool.h>
-#include <stdalign.h>    // alignas(alignment_in_bytes)
-#include <stdnoreturn.h> // noreturn keyword
 
 
 
diff --git a/include/util.h b/include/util.h
index b566094..a5958d2 100644
--- a/include/util.h
+++ b/include/util.h
@@ -1,15 +1,15 @@
 #pragma once
 
 #include <ctype.h>
-#include "types.h"
+
 
 #define min(a,b)	(u32) a < (u32) b ? (u32) a : (u32) b
 
 #define arrayEntries(array)	sizeof(array)/sizeof(*array)
 
 
-void wait(u32 cycles);
 
+void wait(u32 cycles);
 
 // case insensitive string compare function
 int strnicmp(const char *str1, const char *str2, u32 len);
diff --git a/source/arm11/exception.s b/source/arm11/exception.s
index 5719f0a..1d90e45 100644
--- a/source/arm11/exception.s
+++ b/source/arm11/exception.s
@@ -1,5 +1,4 @@
 #include "asmfunc.h"
-#include "mem_map.h"
 
 .arm
 .cpu mpcore
@@ -25,8 +24,8 @@
 
 ASM_FUNC irqHandler
 	sub lr, lr, #4
-	srsfd sp!, #31              @ Store lr and spsr on system mode stack
-	cps #31                     @ Switch to system mode
+	srsfd sp!, #31               @ Store lr and spsr on system mode stack
+	cps #31                      @ Switch to system mode
 	stmfd sp!, {r0-r3, r12, lr}
 	mov r12, #0x17000000
 	orr r12, r12, #0xE00000
@@ -34,7 +33,7 @@
 	and r1, r0, #0x7F
 	cmp r1, #32
 	ldrlo r2, =privIrqHandlerTable
-	mrclo p15, 0, r3, c0, c0, 5 @ Get CPU ID
+	mrclo p15, 0, r3, c0, c0, 5  @ Get CPU ID
 	andlo r3, r3, #3
 	addlo r2, r2, r3, lsl #7
 	ldrhs r2, =irqHandlerTable
@@ -50,4 +49,4 @@
 irqHandler_skip_processing:
 	str r0, [r12, #0x110]        @ REG_CPU_II_EOI
 	ldmfd sp!, {r0-r3, r12, lr}
-	rfefd sp!                   @ Restore lr (pc) and spsr (cpsr)
+	rfefd sp!                    @ Restore lr (pc) and spsr (cpsr)
diff --git a/source/arm11/firm.c b/source/arm11/firm.c
index 40123ef..b031aa8 100644
--- a/source/arm11/firm.c
+++ b/source/arm11/firm.c
@@ -1,3 +1,4 @@
+#include <stdnoreturn.h>
 #include <string.h>
 #include "types.h"
 #include "mem_map.h"
diff --git a/source/arm11/hid.c b/source/arm11/hid.c
index 1e14da9..e9fa240 100644
--- a/source/arm11/hid.c
+++ b/source/arm11/hid.c
@@ -2,8 +2,9 @@
  *  Original code from ctrulib
  */
 
-#include "mem_map.h"
 #include "types.h"
+#include "mem_map.h"
+#include "arm11/hid.h"
 #include "arm11/i2c.h"
 #include "arm11/interrupt.h"
 #include "arm11/gpio.h"
@@ -34,8 +35,8 @@
 	homeShellState |= (state & 4)<<19;
 	homeShellState |= (state & 0x20)<<17;
 
-	if(homeShellState & 1u<<21) homeShellState ^= (state & 8)<<18;
-	if(homeShellState & 1u<<22) homeShellState ^= (state & 0x40)<<16;
+	if(homeShellState & KEY_HOME) homeShellState ^= (state & 8)<<18;
+	if(homeShellState & KEY_SHELL) homeShellState ^= (state & 0x40)<<16;
 }
 
 u32 hidGetPowerButton(void)
diff --git a/source/arm11/interrupt.c b/source/arm11/interrupt.c
index b10acff..bcf22f5 100644
--- a/source/arm11/interrupt.c
+++ b/source/arm11/interrupt.c
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include "types.h"
 #include "mem_map.h"
 #include "arm11/interrupt.h"
@@ -162,7 +163,7 @@
 	leaveCriticalSection();
 }
 
-void softwareInterrupt(Interrupt id, u8 cpuMask)
+void IRQ_softwareInterrupt(Interrupt id, u8 cpuMask)
 {
 	REG_GID_SW_INT = (u32)cpuMask<<16 | id;
 }
diff --git a/source/arm11/main.c b/source/arm11/main.c
index 0414255..4701add 100644
--- a/source/arm11/main.c
+++ b/source/arm11/main.c
@@ -1,3 +1,4 @@
+#include <stdnoreturn.h>
 #include "types.h"
 #include "arm11/hardware.h"
 #include "arm11/interrupt.h"
diff --git a/source/arm11/power.c b/source/arm11/power.c
index 387ec81..2396f8e 100644
--- a/source/arm11/power.c
+++ b/source/arm11/power.c
@@ -1,3 +1,4 @@
+#include <stdnoreturn.h>
 #include "types.h"
 #include "util.h"
 #include "arm11/i2c.h"
diff --git a/source/arm11/pxi.c b/source/arm11/pxi.c
index d194c1b..3734166 100644
--- a/source/arm11/pxi.c
+++ b/source/arm11/pxi.c
@@ -1,3 +1,4 @@
+#include <stdnoreturn.h>
 #include "types.h"
 #include "pxi.h"
 #include "arm11/interrupt.h"
@@ -17,7 +18,7 @@
 	while((REG_PXI_SYNC11 & 0xFFu) != 9u);
 	REG_PXI_SYNC11 |= 11u<<8;
 
-	IRQ_registerHandler(IRQ_PXI_SYNC, 14, 0, true, pxiIrqHandler);
+	IRQ_registerHandler(IRQ_PXI_SYNC, 13, 0, true, pxiIrqHandler);
 }
 
 static void pxiIrqHandler(UNUSED u32 intSource)
diff --git a/source/arm9/config.c b/source/arm9/config.c
index d9aeb06..cb64ac3 100644
--- a/source/arm9/config.c
+++ b/source/arm9/config.c
@@ -3,6 +3,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdnoreturn.h>
 #include <string.h>
 #include <ctype.h>
 #include "types.h"
diff --git a/source/arm9/crypto.c b/source/arm9/crypto.c
index 451ca37..8c83a1b 100644
--- a/source/arm9/crypto.c
+++ b/source/arm9/crypto.c
@@ -4,6 +4,7 @@
  */
 
 #include <assert.h>
+#include <stdalign.h>
 #include <string.h>
 #include "mem_map.h"
 #include "types.h"
diff --git a/source/arm9/debug.c b/source/arm9/debug.c
index f5e5be7..783bd38 100644
--- a/source/arm9/debug.c
+++ b/source/arm9/debug.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdnoreturn.h>
 #include <string.h>
 #include "types.h"
 #include "mem_map.h"
diff --git a/source/arm9/dev.c b/source/arm9/dev.c
index 4bfa259..92b552b 100644
--- a/source/arm9/dev.c
+++ b/source/arm9/dev.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdnoreturn.h>
 #include <string.h>
 #include <assert.h>
 #include "types.h"
diff --git a/source/arm9/firm.c b/source/arm9/firm.c
index b63ba36..b17d884 100644
--- a/source/arm9/firm.c
+++ b/source/arm9/firm.c
@@ -1,5 +1,6 @@
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdnoreturn.h>
+#include <stdlib.h>
 #include <string.h>
 #include "types.h"
 // we need the arm11 mem map information
diff --git a/source/arm9/firmwriter.c b/source/arm9/firmwriter.c
index ab76bf8..fd167c4 100644
--- a/source/arm9/firmwriter.c
+++ b/source/arm9/firmwriter.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdnoreturn.h>
 #include <string.h>
 #include "types.h"
 #include "mem_map.h"
diff --git a/source/arm9/interrupt.c b/source/arm9/interrupt.c
index 03ee744..f53ab9e 100644
--- a/source/arm9/interrupt.c
+++ b/source/arm9/interrupt.c
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include "types.h"
 #include "mem_map.h"
 #include "arm9/interrupt.h"
diff --git a/source/arm9/main.c b/source/arm9/main.c
index bc4c40b..768efae 100644
--- a/source/arm9/main.c
+++ b/source/arm9/main.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <string.h>
+#include <stdnoreturn.h>
 #include <stdlib.h>
 #include "mem_map.h"
 #include "types.h"
diff --git a/source/arm9/menu.c b/source/arm9/menu.c
index 092ada0..c7c53d4 100644
--- a/source/arm9/menu.c
+++ b/source/arm9/menu.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdnoreturn.h>
 #include <stdlib.h>
 #include <string.h>
 #include "types.h"
diff --git a/source/arm9/menu_credits.c b/source/arm9/menu_credits.c
index 5bff0f2..055315a 100644
--- a/source/arm9/menu_credits.c
+++ b/source/arm9/menu_credits.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <stdnoreturn.h>
+#include <string.h>
 #include "types.h"
 #include "mem_map.h"
 #include "arm9/console.h"
diff --git a/source/arm9/menu_filebrowse.c b/source/arm9/menu_filebrowse.c
index 31894ca..2954f6f 100644
--- a/source/arm9/menu_filebrowse.c
+++ b/source/arm9/menu_filebrowse.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdnoreturn.h>
 #include <stdlib.h>
 #include <string.h>
 #include "types.h"
diff --git a/source/arm9/menu_firmloader.c b/source/arm9/menu_firmloader.c
index 098ade5..670aae7 100644
--- a/source/arm9/menu_firmloader.c
+++ b/source/arm9/menu_firmloader.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <stdnoreturn.h>
+#include <string.h>
 #include "types.h"
 #include "mem_map.h"
 #include "arm9/console.h"
diff --git a/source/arm9/menu_nand.c b/source/arm9/menu_nand.c
index f319eb2..a092ce3 100644
--- a/source/arm9/menu_nand.c
+++ b/source/arm9/menu_nand.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdnoreturn.h>
 #include "types.h"
 #include "mem_map.h"
 #include "arm9/console.h"
diff --git a/source/arm9/menu_options.c b/source/arm9/menu_options.c
index 8471fd7..b05008e 100644
--- a/source/arm9/menu_options.c
+++ b/source/arm9/menu_options.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <stdnoreturn.h>
+#include <string.h>
 #include "types.h"
 #include "mem_map.h"
 #include "arm9/console.h"
diff --git a/source/arm9/menu_update.c b/source/arm9/menu_update.c
index 96df2fe..b7350fa 100644
--- a/source/arm9/menu_update.c
+++ b/source/arm9/menu_update.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdnoreturn.h>
 #include <string.h>
 #include "types.h"
 #include "mem_map.h"
diff --git a/source/arm9/partitions.c b/source/arm9/partitions.c
index bb031b5..421fb50 100644
--- a/source/arm9/partitions.c
+++ b/source/arm9/partitions.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdnoreturn.h>
 #include <string.h>
 #include "fatfs/ff.h"
 #include "arm9/debug.h"
diff --git a/source/arm9/pxi.c b/source/arm9/pxi.c
index 2d824b9..e8d7179 100644
--- a/source/arm9/pxi.c
+++ b/source/arm9/pxi.c
@@ -1,3 +1,4 @@
+#include <stdio.h>
 #include "types.h"
 #include "pxi.h"
 #include "arm9/interrupt.h"
diff --git a/source/arm9/ui.c b/source/arm9/ui.c
index d12ff38..6942955 100644
--- a/source/arm9/ui.c
+++ b/source/arm9/ui.c
@@ -1,7 +1,8 @@
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
 #include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdnoreturn.h>
+#include <string.h>
 #include "types.h"
 #include "util.h"
 #include "arm9/hid.h"
diff --git a/source/util.c b/source/util.c
index c4cc818..44a1a6d 100644
--- a/source/util.c
+++ b/source/util.c
@@ -1,5 +1,8 @@
-#include "util.h"
 #include <string.h>
+#include "types.h"
+#include "util.h"
+
+
 
 void wait(u32 cycles)
 {