diff --git a/include/arm11/firm.h b/include/arm11/firm.h
index eddf3a4..4f40ef6 100644
--- a/include/arm11/firm.h
+++ b/include/arm11/firm.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "types.h"
+
 
 
 noreturn void firm_launch(void);
diff --git a/include/arm11/gpio.h b/include/arm11/gpio.h
index 98749d5..66feb29 100644
--- a/include/arm11/gpio.h
+++ b/include/arm11/gpio.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "types.h"
+
 
 
 /**
diff --git a/include/arm11/hid.h b/include/arm11/hid.h
index 82f65c2..5d118cd 100644
--- a/include/arm11/hid.h
+++ b/include/arm11/hid.h
@@ -1,5 +1,7 @@
 #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 22c185c..0b1c798 100644
--- a/include/arm11/i2c.h
+++ b/include/arm11/i2c.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "types.h"
+
 
 
 // general i2c routines
diff --git a/include/arm11/interrupt.h b/include/arm11/interrupt.h
index ff30068..72af27e 100644
--- a/include/arm11/interrupt.h
+++ b/include/arm11/interrupt.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "types.h"
+
 
 typedef enum
 {
diff --git a/include/arm11/start.h b/include/arm11/start.h
index 4af0ddd..378d275 100644
--- a/include/arm11/start.h
+++ b/include/arm11/start.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "types.h"
+
 
 
 void clearMem(u32 *adr, u32 size);
diff --git a/include/cache.h b/include/cache.h
index 3208c56..1e68d3e 100644
--- a/include/cache.h
+++ b/include/cache.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "types.h"
+
 
 
 void invalidateICache(void);
diff --git a/include/gfx.h b/include/gfx.h
index cc68a3a..940d983 100644
--- a/include/gfx.h
+++ b/include/gfx.h
@@ -1,6 +1,7 @@
 #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 74b127b..56f30ae 100644
--- a/include/pxi.h
+++ b/include/pxi.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "mem_map.h"
+#include "types.h"
 
 
 #ifdef ARM9
diff --git a/include/types.h b/include/types.h
index 417395d..89d6554 100644
--- a/include/types.h
+++ b/include/types.h
@@ -1,8 +1,11 @@
 #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 a5958d2..b566094 100644
--- a/include/util.h
+++ b/include/util.h
@@ -1,16 +1,16 @@
 #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);
 
+
 // 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 1d90e45..681cf87 100644
--- a/source/arm11/exception.s
+++ b/source/arm11/exception.s
@@ -1,4 +1,5 @@
 #include "asmfunc.h"
+#include "mem_map.h"
 
 .arm
 .cpu mpcore
diff --git a/source/arm11/firm.c b/source/arm11/firm.c
index b031aa8..40123ef 100644
--- a/source/arm11/firm.c
+++ b/source/arm11/firm.c
@@ -1,4 +1,3 @@
-#include <stdnoreturn.h>
 #include <string.h>
 #include "types.h"
 #include "mem_map.h"
diff --git a/source/arm11/interrupt.c b/source/arm11/interrupt.c
index bcf22f5..6b85b80 100644
--- a/source/arm11/interrupt.c
+++ b/source/arm11/interrupt.c
@@ -1,4 +1,3 @@
-#include <stdio.h>
 #include "types.h"
 #include "mem_map.h"
 #include "arm11/interrupt.h"
diff --git a/source/arm11/main.c b/source/arm11/main.c
index 4701add..0414255 100644
--- a/source/arm11/main.c
+++ b/source/arm11/main.c
@@ -1,4 +1,3 @@
-#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 2396f8e..387ec81 100644
--- a/source/arm11/power.c
+++ b/source/arm11/power.c
@@ -1,4 +1,3 @@
-#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 3734166..3bd6627 100644
--- a/source/arm11/pxi.c
+++ b/source/arm11/pxi.c
@@ -1,4 +1,3 @@
-#include <stdnoreturn.h>
 #include "types.h"
 #include "pxi.h"
 #include "arm11/interrupt.h"
diff --git a/source/arm9/config.c b/source/arm9/config.c
index cb64ac3..d9aeb06 100644
--- a/source/arm9/config.c
+++ b/source/arm9/config.c
@@ -3,7 +3,6 @@
 
 #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 8c83a1b..451ca37 100644
--- a/source/arm9/crypto.c
+++ b/source/arm9/crypto.c
@@ -4,7 +4,6 @@
  */
 
 #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 783bd38..f5e5be7 100644
--- a/source/arm9/debug.c
+++ b/source/arm9/debug.c
@@ -1,5 +1,4 @@
 #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 92b552b..4bfa259 100644
--- a/source/arm9/dev.c
+++ b/source/arm9/dev.c
@@ -1,6 +1,5 @@
 #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 b17d884..b63ba36 100644
--- a/source/arm9/firm.c
+++ b/source/arm9/firm.c
@@ -1,6 +1,5 @@
-#include <stdio.h>
-#include <stdnoreturn.h>
 #include <stdlib.h>
+#include <stdio.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 fd167c4..ab76bf8 100644
--- a/source/arm9/firmwriter.c
+++ b/source/arm9/firmwriter.c
@@ -1,6 +1,5 @@
 #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 f53ab9e..03ee744 100644
--- a/source/arm9/interrupt.c
+++ b/source/arm9/interrupt.c
@@ -1,4 +1,3 @@
-#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 768efae..bc4c40b 100644
--- a/source/arm9/main.c
+++ b/source/arm9/main.c
@@ -1,6 +1,5 @@
 #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 c7c53d4..092ada0 100644
--- a/source/arm9/menu.c
+++ b/source/arm9/menu.c
@@ -1,5 +1,4 @@
 #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 055315a..5bff0f2 100644
--- a/source/arm9/menu_credits.c
+++ b/source/arm9/menu_credits.c
@@ -1,7 +1,6 @@
 #include <stdio.h>
-#include <stdlib.h>
-#include <stdnoreturn.h>
 #include <string.h>
+#include <stdlib.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 2954f6f..31894ca 100644
--- a/source/arm9/menu_filebrowse.c
+++ b/source/arm9/menu_filebrowse.c
@@ -1,5 +1,4 @@
 #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 670aae7..098ade5 100644
--- a/source/arm9/menu_firmloader.c
+++ b/source/arm9/menu_firmloader.c
@@ -1,7 +1,6 @@
 #include <stdio.h>
-#include <stdlib.h>
-#include <stdnoreturn.h>
 #include <string.h>
+#include <stdlib.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 a092ce3..f319eb2 100644
--- a/source/arm9/menu_nand.c
+++ b/source/arm9/menu_nand.c
@@ -1,6 +1,5 @@
 #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 b05008e..8471fd7 100644
--- a/source/arm9/menu_options.c
+++ b/source/arm9/menu_options.c
@@ -1,7 +1,6 @@
 #include <stdio.h>
-#include <stdlib.h>
-#include <stdnoreturn.h>
 #include <string.h>
+#include <stdlib.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 b7350fa..96df2fe 100644
--- a/source/arm9/menu_update.c
+++ b/source/arm9/menu_update.c
@@ -1,6 +1,5 @@
 #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 421fb50..bb031b5 100644
--- a/source/arm9/partitions.c
+++ b/source/arm9/partitions.c
@@ -1,6 +1,5 @@
 #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 e8d7179..2d824b9 100644
--- a/source/arm9/pxi.c
+++ b/source/arm9/pxi.c
@@ -1,4 +1,3 @@
-#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 6942955..d12ff38 100644
--- a/source/arm9/ui.c
+++ b/source/arm9/ui.c
@@ -1,8 +1,7 @@
-#include <stdarg.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <stdnoreturn.h>
 #include <string.h>
+#include <stdlib.h>
+#include <stdarg.h>
 #include "types.h"
 #include "util.h"
 #include "arm9/hid.h"
diff --git a/source/util.c b/source/util.c
index 44a1a6d..c4cc818 100644
--- a/source/util.c
+++ b/source/util.c
@@ -1,8 +1,5 @@
-#include <string.h>
-#include "types.h"
 #include "util.h"
-
-
+#include <string.h>
 
 void wait(u32 cycles)
 {