7 files changed, 23 insertions, 6 deletions
diff --git a/src/boot/assert.c b/src/boot/assert.c
index e58f2cc1e..661f7db87 100644
--- a/src/boot/assert.c
+++ b/src/boot/assert.c
@@ -1,4 +1,5 @@
-#include "global.h"
+#include "libc64/sprintf.h"
+#include "assert.h"
 #include "fault.h"
 
 NORETURN void __assert(const char* assertion, const char* file, int line) {
diff --git a/src/boot/boot_main.c b/src/boot/boot_main.c
index 4bd5b5bd0..75c1b9cf8 100644
--- a/src/boot/boot_main.c
+++ b/src/boot/boot_main.c
@@ -1,11 +1,14 @@
-#include "global.h"
 #include "boot.h"
 #include "stack.h"
+#include "stackcheck.h"
 #if PLATFORM_N64
 #include "cic6105.h"
 #endif
+#include "z_locale.h"
 #include "z64thread.h"
 
+#include "global.h"
+
 #pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:128"
 
 StackEntry sBootThreadInfo;
diff --git a/src/boot/cic6105.c b/src/boot/cic6105.c
index 7f76e99c3..29b04f2a8 100644
--- a/src/boot/cic6105.c
+++ b/src/boot/cic6105.c
@@ -1,7 +1,9 @@
 #pragma increment_block_number "ntsc-1.2:0"
-
 #include "global.h"
+#include "audiomgr.h"
 #include "cic6105.h"
+#include "regs.h"
+#include "sched.h"
 #include "fault.h"
 
 s32 func_80001714(void);
diff --git a/src/boot/idle.c b/src/boot/idle.c
index ffc6de34b..be4c9f7cb 100644
--- a/src/boot/idle.c
+++ b/src/boot/idle.c
@@ -1,4 +1,5 @@
 #include "buffers.h"
+#include "main.h"
 #include "segment_symbols.h"
 #include "stack.h"
 #include "stackcheck.h"
diff --git a/src/boot/is_debug.c b/src/boot/is_debug.c
index 1f8938f9d..912b75984 100644
--- a/src/boot/is_debug.c
+++ b/src/boot/is_debug.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "attributes.h"
 
 typedef struct ISVDbg {
     /* 0x00 */ u32 magic; // "IS64"
diff --git a/src/boot/z_locale.c b/src/boot/z_locale.c
index b6ce255c6..f54be014b 100644
--- a/src/boot/z_locale.c
+++ b/src/boot/z_locale.c
@@ -1,8 +1,14 @@
-#include "global.h"
+#include "libu64/debug.h"
+#include "alignment.h"
+#include "line_numbers.h"
+#include "padmgr.h"
 #include "region.h"
 #include "terminal.h"
 #include "versions.h"
-#include "line_numbers.h"
+#include "z_locale.h"
+
+#include "macros.h"
+#include "global.h"
 
 s32 gCurrentRegion = 0;
 
diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c
index b8d527619..7cbf00994 100644
--- a/src/boot/z_std_dma.c
+++ b/src/boot/z_std_dma.c
@@ -19,6 +19,9 @@
  * to be uncompressed and the request queue and address translation is skipped.
  */
 #include "libc64/sleep.h"
+#include "libc64/sprintf.h"
+#include "libu64/debug.h"
+#include "attributes.h"
 #include "fault.h"
 #include "line_numbers.h"
 #if PLATFORM_N64
@@ -33,7 +36,7 @@
 #include "global.h"
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
-                               "ntsc-1.2:86 pal-1.0:84 pal-1.1:84"
+                               "ntsc-1.2:12 pal-1.0:10 pal-1.1:10"
 
 StackEntry sDmaMgrStackInfo;
 OSMesgQueue sDmaMgrMsgQueue;