7 files changed, 14 insertions, 4 deletions
diff --git a/src/code/db_camera.c b/src/code/db_camera.c
index eb0a0d805..5da144096 100644
--- a/src/code/db_camera.c
+++ b/src/code/db_camera.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "z64debug_display.h"
+#include "z64olib.h"
 
 #define DEBUG_CAM_CONTROLLER_PORT 2
 
diff --git a/src/code/main.c b/src/code/main.c
index e654bb05c..73d9f796a 100644
--- a/src/code/main.c
+++ b/src/code/main.c
@@ -24,7 +24,7 @@ extern struct IrqMgr gIrqMgr;
 #endif
 
 #pragma increment_block_number "gc-eu:144 gc-eu-mq:144 gc-jp:144 gc-jp-ce:144 gc-jp-mq:144 gc-us:144 gc-us-mq:144" \
-                               "ique-cn:160 ntsc-1.0:136 ntsc-1.1:136 ntsc-1.2:136 pal-1.0:134 pal-1.1:134"
+                               "ique-cn:160 ntsc-1.0:137 ntsc-1.1:137 ntsc-1.2:137 pal-1.0:135 pal-1.1:135"
 
 extern u8 _buffersSegmentEnd[];
 
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index 9fb036573..2f768f35f 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -2,6 +2,7 @@
 #include "global.h"
 #include "quake.h"
 #include "terminal.h"
+#include "z64olib.h"
 #include "overlays/actors/ovl_En_Horse/z_en_horse.h"
 
 #pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index 6d3518aae..012ecdb74 100644
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@@ -1,5 +1,5 @@
 #pragma increment_block_number "gc-eu:224 gc-eu-mq:224 gc-jp:208 gc-jp-ce:208 gc-jp-mq:208 gc-us:208 gc-us-mq:208" \
-                               "ique-cn:208 ntsc-1.0:208 ntsc-1.1:208 ntsc-1.2:208 pal-1.0:232 pal-1.1:232"
+                               "ique-cn:208 ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:232 pal-1.1:232"
 
 #include "global.h"
 #include "ultra64.h"
diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c
index 04ffc2f46..344d3aee2 100644
--- a/src/code/z_onepointdemo.c
+++ b/src/code/z_onepointdemo.c
@@ -2,6 +2,7 @@
 #include "quake.h"
 #include "terminal.h"
 #include "versions.h"
+#include "z64olib.h"
 #include "overlays/actors/ovl_En_Sw/z_en_sw.h"
 
 static s16 sDisableAttention = false;
diff --git a/src/code/z_path.c b/src/code/z_path.c
index d27530eb3..7afe07aab 100644
--- a/src/code/z_path.c
+++ b/src/code/z_path.c
@@ -1,4 +1,7 @@
-#include "global.h"
+#include "ultra64.h"
+#include "libc64/math64.h"
+#include "segmented_address.h"
+#include "z64play.h"
 
 Path* Path_GetByIndex(PlayState* play, s16 index, s16 max) {
     Path* path;
diff --git a/src/code/z_quake.c b/src/code/z_quake.c
index 4c318b938..2e83a7c10 100644
--- a/src/code/z_quake.c
+++ b/src/code/z_quake.c
@@ -1,6 +1,10 @@
-#include "global.h"
+#include "libc64/qrand.h"
+#include "macros.h"
 #include "quake.h"
 #include "terminal.h"
+#include "z_lib.h"
+#include "z64olib.h"
+#include "z64play.h"
 
 typedef struct QuakeRequest {
     /* 0x00 */ s16 index;