8 files changed, 20 insertions, 7 deletions
diff --git a/src/boot/boot_main.c b/src/boot/boot_main.c
index cbaa418ed..811c75d35 100644
--- a/src/boot/boot_main.c
+++ b/src/boot/boot_main.c
@@ -1,7 +1,9 @@
 #include "boot.h"
 
+#include "carthandle.h"
 #include "idle.h"
 #include "is_debug.h"
+#include "segment_symbols.h"
 #include "stack.h"
 #include "stackcheck.h"
 #if PLATFORM_N64
diff --git a/src/boot/build.c b/src/boot/build.c
index 31e48096b..035e685db 100644
--- a/src/boot/build.c
+++ b/src/boot/build.c
@@ -1,3 +1,5 @@
+#include "build.h"
+
 #include "versions.h"
 
 const char gBuildCreator[] = BUILD_CREATOR;
diff --git a/src/boot/carthandle.c b/src/boot/carthandle.c
index 16d3160b5..9a4cf542d 100644
--- a/src/boot/carthandle.c
+++ b/src/boot/carthandle.c
@@ -1,3 +1,3 @@
-#include "ultra64.h"
+#include "carthandle.h"
 
 OSPiHandle* gCartHandle = NULL;
diff --git a/src/boot/cic6105.c b/src/boot/cic6105.c
index 29b04f2a8..81c0af99c 100644
--- a/src/boot/cic6105.c
+++ b/src/boot/cic6105.c
@@ -1,10 +1,13 @@
-#pragma increment_block_number "ntsc-1.2:0"
-#include "global.h"
+#pragma increment_block_number "ntsc-1.0:132 ntsc-1.1:132 ntsc-1.2:132 pal-1.0:132 pal-1.1:132"
+
 #include "audiomgr.h"
+#include "build.h"
 #include "cic6105.h"
+#include "fault.h"
 #include "regs.h"
 #include "sched.h"
-#include "fault.h"
+
+#include "global.h"
 
 s32 func_80001714(void);
 
diff --git a/src/boot/idle.c b/src/boot/idle.c
index c56489137..190130c02 100644
--- a/src/boot/idle.c
+++ b/src/boot/idle.c
@@ -1,4 +1,5 @@
 #include "buffers.h"
+#include "build.h"
 #include "idle.h"
 #include "main.h"
 #include "segment_symbols.h"
diff --git a/src/boot/viconfig.c b/src/boot/viconfig.c
index ae50922e6..5bb525aa3 100644
--- a/src/boot/viconfig.c
+++ b/src/boot/viconfig.c
@@ -1,5 +1,7 @@
-#include "global.h"
 #include "terminal.h"
+#include "idle.h"
+
+#include "global.h"
 
 s8 D_80009430 = 1;
 vu8 gViConfigBlack = true;
diff --git a/src/boot/z_locale.c b/src/boot/z_locale.c
index 46d65042d..fcf544388 100644
--- a/src/boot/z_locale.c
+++ b/src/boot/z_locale.c
@@ -1,5 +1,6 @@
 #include "libu64/debug.h"
 #include "alignment.h"
+#include "carthandle.h"
 #include "line_numbers.h"
 #include "padmgr.h"
 #include "region.h"
diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c
index 275ab35c2..2e742ec92 100644
--- a/src/boot/z_std_dma.c
+++ b/src/boot/z_std_dma.c
@@ -22,7 +22,9 @@
 #include "libc64/sprintf.h"
 #include "libu64/debug.h"
 #include "attributes.h"
+#include "carthandle.h"
 #include "fault.h"
+#include "idle.h"
 #if PLATFORM_IQUE
 #include "inflate.h"
 #endif
@@ -41,8 +43,8 @@
 
 #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:22" \
-                               "pal-1.0:20 pal-1.1:20"
+#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:36" \
+                               "pal-1.0:34 pal-1.1:34"
 
 StackEntry sDmaMgrStackInfo;
 OSMesgQueue sDmaMgrMsgQueue;