Reduce overlay dependencies on global.h (7) (#2472)

* z64env_flags, z64quest_hint_commands

* z64cutscene_spline, z64save.h moved from z64.h

* bss

* pr suggestion

* bss

* suggestions

45 files changed, 345 insertions, 82 deletions

diff --git a/src/code/code_n64dd_800AD4C0.c b/src/code/code_n64dd_800AD4C0.c
index 3f1488c66..34dcdb3bb 100644
--- a/src/code/code_n64dd_800AD4C0.c
+++ b/src/code/code_n64dd_800AD4C0.c
@@ -1,6 +1,8 @@
-#include "global.h"
 #include "fault.h"
 #include "n64dd.h"
+#include "z64save.h"
+
+#include "global.h"
 
 n64ddStruct_800FEE70_pointers D_800FEE70 = {
     func_801C7C1C,
diff --git a/src/code/db_camera.c b/src/code/db_camera.c
index 5da144096..bc9fa468c 100644
--- a/src/code/db_camera.c
+++ b/src/code/db_camera.c
@@ -1,6 +1,19 @@
 #include "global.h"
+#include "libu64/gfxprint.h"
+#include "attributes.h"
+#include "controller.h"
+#include "letterbox.h"
+#include "mempak.h"
+#include "regs.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64camera.h"
+#include "z64cutscene.h"
+#include "z64cutscene_spline.h"
 #include "z64debug_display.h"
 #include "z64olib.h"
+#include "z64play.h"
+#include "z64save.h"
 
 #define DEBUG_CAM_CONTROLLER_PORT 2
 
diff --git a/src/code/fault_gc.c b/src/code/fault_gc.c
index 3bd75ed5c..a8597a60b 100644
--- a/src/code/fault_gc.c
+++ b/src/code/fault_gc.c
@@ -40,16 +40,22 @@
  * DPad-Up may be pressed to enable sending fault pages over osSyncPrintf as well as displaying them on-screen.
  * DPad-Down disables sending fault pages over osSyncPrintf.
  */
-#pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-eu-mq-dbg:160 gc-jp:160 gc-jp-ce:160 gc-jp-mq:160 gc-us:160" \
-                               "gc-us-mq:160 ique-cn:160"
+#pragma increment_block_number "gc-eu:96 gc-eu-mq:96 gc-eu-mq-dbg:96 gc-jp:112 gc-jp-ce:112 gc-jp-mq:112 gc-us:112" \
+                               "gc-us-mq:112 ique-cn:112"
 
 #include "global.h"
+#include "libc64/sleep.h"
+#include "libc64/sprintf.h"
 #include "alloca.h"
+#include "controller.h"
 #include "fault.h"
 #include "stack.h"
+#include "stackcheck.h"
 #include "terminal.h"
 #include "z64thread.h"
 
+#include "macros.h"
+
 void Fault_Init(void);
 void Fault_SetOsSyncPrintfEnabled(u32 enabled);
 void Fault_DrawRecImpl(s32 xStart, s32 yStart, s32 xEnd, s32 yEnd, u16 color);
diff --git a/src/code/fault_n64.c b/src/code/fault_n64.c
index 373c20ef9..ecfc87f10 100644
--- a/src/code/fault_n64.c
+++ b/src/code/fault_n64.c
@@ -1,13 +1,19 @@
-#pragma increment_block_number "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
-
-#include "global.h"
-#include "fault.h"
 #include "libc64/os_malloc.h"
+#include "libc64/sleep.h"
+#include "libc64/sprintf.h"
+#include "controller.h"
+#include "fault.h"
+#include "padmgr.h"
+#include "segmented_address.h"
 #include "stack.h"
+#include "stackcheck.h"
 #include "terminal.h"
 #include "z64thread.h"
 
-#pragma increment_block_number "ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
+#include "macros.h"
+#include "global.h"
+
+#pragma increment_block_number "ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
 
 typedef struct FaultMgr {
     OSThread thread;
diff --git a/src/code/flg_set.c b/src/code/flg_set.c
index de5b2a3d3..5f4316d7f 100644
--- a/src/code/flg_set.c
+++ b/src/code/flg_set.c
@@ -1,4 +1,10 @@
-#include "global.h"
+#include "libu64/gfxprint.h"
+#include "libu64/pad.h"
+#include "gfx.h"
+#include "gfxalloc.h"
+#include "controller.h"
+#include "z64play.h"
+#include "z64save.h"
 
 typedef struct FlagSetEntry {
     /* 0x00 */ u16* value;
diff --git a/src/code/graph.c b/src/code/graph.c
index c77ef7108..dfa1dc2f2 100644
--- a/src/code/graph.c
+++ b/src/code/graph.c
@@ -1,16 +1,24 @@
-#include "global.h"
+#include "libc64/malloc.h"
+#include "libc64/sprintf.h"
+#include "libu64/debug.h"
+#include "gfx.h"
 #include "fault.h"
+#include "line_numbers.h"
+#include "regs.h"
 #include "sys_ucode.h"
 #include "terminal.h"
 #include "ucode_disas.h"
 #include "versions.h"
-#include "line_numbers.h"
+#include "z64save.h"
+
+#include "macros.h"
+#include "global.h"
 
 #define GFXPOOL_HEAD_MAGIC 0x1234
 #define GFXPOOL_TAIL_MAGIC 0x5678
 
-#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.0:160" \
-                               "ntsc-1.1:160 ntsc-1.2:160 pal-1.0:160 pal-1.1:160"
+#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.0:192" \
+                               "ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
 
 /**
  * The time at which the previous `Graph_Update` ended.
diff --git a/src/code/jpegdecoder.c b/src/code/jpegdecoder.c
index a29752511..338c6b15d 100644
--- a/src/code/jpegdecoder.c
+++ b/src/code/jpegdecoder.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "jpeg.h"
 
 s32 JpegDecoder_ProcessMcu(JpegHuffmanTable* hTable0, JpegHuffmanTable* hTable1, u16* mcu, s16* unk);
 s32 JpegDecoder_ParseNextSymbol(JpegHuffmanTable* hTable, s16* outCoeff, s8* outZeroCount);
diff --git a/src/code/jpegutils.c b/src/code/jpegutils.c
index 00c040609..7f5442fd9 100644
--- a/src/code/jpegutils.c
+++ b/src/code/jpegutils.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "jpeg.h"
 
 void JpegUtils_ProcessQuantizationTable(u8* dqt, JpegQuantizationTable* qt, u8 count) {
     u8 i;
diff --git a/src/code/main.c b/src/code/main.c
index 1699a3c07..4a55baf43 100644
--- a/src/code/main.c
+++ b/src/code/main.c
@@ -24,8 +24,8 @@ extern struct IrqMgr gIrqMgr;
 #endif
 #include "z64thread.h"
 
-#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:133 ntsc-1.1:133 ntsc-1.2:133 pal-1.0:131 pal-1.1:131"
+#pragma increment_block_number "gc-eu:96 gc-eu-mq:96 gc-jp:96 gc-jp-ce:96 gc-jp-mq:96 gc-us:96 gc-us-mq:96 ique-cn:96" \
+                               "ntsc-1.0:78 ntsc-1.1:78 ntsc-1.2:78 pal-1.0:76 pal-1.1:76"
 
 extern u8 _buffersSegmentEnd[];
 
diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c
index d282e3495..c8a6fee43 100644
--- a/src/code/speed_meter.c
+++ b/src/code/speed_meter.c
@@ -1,4 +1,4 @@
-#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" \
+#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
                                "ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
 
 #include "global.h"
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index b6a5c4956..155389b53 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -18,6 +18,7 @@
 #include "z64light.h"
 #include "z64horse.h"
 #include "z64play.h"
+#include "z64save.h"
 #include "z64skin_matrix.h"
 
 #include "global.h"
diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c
index 8caacb940..f89840fb6 100644
--- a/src/code/z_bgcheck.c
+++ b/src/code/z_bgcheck.c
@@ -2,7 +2,7 @@
 #include "terminal.h"
 #include "line_numbers.h"
 
-#pragma increment_block_number "ntsc-1.0:120 ntsc-1.1:120 ntsc-1.2:120"
+#pragma increment_block_number "ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64"
 
 u16 DynaSSNodeList_GetNextNodeIdx(DynaSSNodeList* nodeList);
 void BgCheck_GetStaticLookupIndicesFromPos(CollisionContext* colCtx, Vec3f* pos, Vec3i* sector);
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index 6b0f502ae..21ba635c8 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -1,12 +1,13 @@
 #include "ultra64.h"
-#include "global.h"
 #include "quake.h"
 #include "terminal.h"
+#include "z64cutscene_spline.h"
 #include "z64olib.h"
+#include "z64save.h"
 #include "overlays/actors/ovl_En_Horse/z_en_horse.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" \
-                               "ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
+#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" \
+                               "ique-cn:192 ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192"
 
 s16 Camera_RequestSettingImpl(Camera* camera, s16 requestedSetting, s16 flags);
 s32 Camera_RequestModeImpl(Camera* camera, s16 requestedMode, u8 forceModeChange);
@@ -3640,7 +3641,7 @@ s32 Camera_KeepOn3(Camera* camera) {
 }
 
 #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" \
-                               "ique-cn:128 ntsc-1.0:134 ntsc-1.1:134 ntsc-1.2:134 pal-1.0:132 pal-1.1:132"
+                               "ique-cn:128 ntsc-1.0:117 ntsc-1.1:117 ntsc-1.2:117 pal-1.0:115 pal-1.1:115"
 
 s32 Camera_KeepOn4(Camera* camera) {
     static Vec3f D_8015BD50;
diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c
index 6096966e2..e05bb44d1 100644
--- a/src/code/z_collision_check.c
+++ b/src/code/z_collision_check.c
@@ -15,8 +15,7 @@
 #include "overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.h"
 #include "z_lib.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" \
-                               "ique-cn:128 ntsc-1.0:104 ntsc-1.1:104 ntsc-1.2:104 pal-1.0:104 pal-1.1:104"
+#pragma increment_block_number "ique-cn:0 ntsc-1.0:248 ntsc-1.1:248 ntsc-1.2:248 pal-1.0:248 pal-1.1:248"
 
 typedef s32 (*ColChkResetFunc)(PlayState*, Collider*);
 typedef void (*ColChkApplyFunc)(PlayState*, CollisionCheckContext*, Collider*);
diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c
index 7671ba1c0..a8193c3af 100644
--- a/src/code/z_common_data.c
+++ b/src/code/z_common_data.c
@@ -1,9 +1,14 @@
-#include "global.h"
 #include "region.h"
+#include "sequence.h"
 #include "versions.h"
+#include "z64environment.h"
+#include "z64save.h"
+#include "z64transition.h"
+
+#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.0:176 ntsc-1.1:176 ntsc-1.2:176 pal-1.0:176 pal-1.1:176"
+#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.0:176" \
+                               "ntsc-1.1:176 ntsc-1.2:176 pal-1.0:192 pal-1.1:192"
 
 ALIGNED(16) SaveContext gSaveContext;
 #if PLATFORM_IQUE
diff --git a/src/code/z_construct.c b/src/code/z_construct.c
index fa0f4a38d..dacec26d9 100644
--- a/src/code/z_construct.c
+++ b/src/code/z_construct.c
@@ -1,5 +1,10 @@
 #include "global.h"
+#include "map.h"
+#include "regs.h"
 #include "versions.h"
+#include "z64ocarina.h"
+#include "z64play.h"
+#include "z64save.h"
 
 void Interface_Destroy(PlayState* play) {
     Map_Destroy(play);
diff --git a/src/code/z_cutscene_spline.c b/src/code/z_cutscene_spline.c
index 421f9a280..d95b2ca7f 100644
--- a/src/code/z_cutscene_spline.c
+++ b/src/code/z_cutscene_spline.c
@@ -1,4 +1,8 @@
-#include "global.h"
+#include "ultra64.h"
+#include "z64math.h"
+#include "z64camera.h"
+#include "z64cutscene_spline.h"
+#include "macros.h"
 
 // The code in this file is very similar to a spline system used in Super Mario 64 for cutscene camera movement
 
diff --git a/src/code/z_debug.c b/src/code/z_debug.c
index c4333f787..70d108e16 100644
--- a/src/code/z_debug.c
+++ b/src/code/z_debug.c
@@ -1,4 +1,15 @@
-#include "global.h"
+#include "libc64/malloc.h"
+#include "libu64/gfxprint.h"
+#include "libu64/pad.h"
+#include "color.h"
+#include "controller.h"
+#include "gfx.h"
+#include "gfxalloc.h"
+#include "regs.h"
+#include "rumble.h"
+#include "ultra64.h"
+
+#include "macros.h"
 
 typedef struct DebugCamTextBufferEntry {
     /* 0x0 */ u8 x;
@@ -13,7 +24,7 @@ typedef struct InputCombo {
 } InputCombo; // size = 0x4
 
 #pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-jp:160 gc-jp-ce:160 gc-jp-mq:160 gc-us:160 gc-us-mq:160" \
-                               "ique-cn:128 ntsc-1.0:160 ntsc-1.1:160 ntsc-1.2:160 pal-1.0:160 pal-1.1:160"
+                               "ique-cn:160 ntsc-1.0:160 ntsc-1.1:160 ntsc-1.2:160 pal-1.0:160 pal-1.1:160"
 
 RegEditor* gRegEditor;
 
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index 6e35b8255..9db96e052 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -1,11 +1,29 @@
-#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.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
+#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 ique-cn:0" \
+                               "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
 #include "global.h"
-#include "quake.h"
-#include "z64camera.h"
+#include "libu64/gfxprint.h"
+#include "controller.h"
+#include "gfx.h"
+#include "gfxalloc.h"
+#include "letterbox.h"
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "regs.h"
+#include "rumble.h"
+#include "quake.h"
+#include "segmented_address.h"
+#include "seqcmd.h"
+#include "sequence.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64audio.h"
+#include "z64camera.h"
+#include "z64cutscene.h"
+#include "z64cutscene_flags.h"
+#include "z64play.h"
+#include "z64player.h"
+#include "z64save.h"
 
 #include "assets/scenes/indoors/tokinoma/tokinoma_scene.h"
 
@@ -126,8 +144,8 @@ u16 gCamAtSplinePointsAppliedFrame;
 u16 gCamEyePointAppliedFrame;
 u16 gCamAtPointAppliedFrame;
 
-#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:188 gc-jp-ce:188 gc-jp-mq:0 gc-us:188 gc-us-mq:0" \
-                               "ntsc-1.0:128 ntsc-1.1:80 ntsc-1.2:80 pal-1.0:80 pal-1.1:80"
+#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" \
+                               "ique-cn:128 ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
 
 // Cam ID to return to when a scripted cutscene is finished
 s16 sReturnToCamId;
diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c
index c90b4ee6f..7b3cf1c55 100644
--- a/src/code/z_elf_message.c
+++ b/src/code/z_elf_message.c
@@ -1,5 +1,9 @@
-#include "global.h"
+#include "libu64/debug.h"
+#include "rand.h"
+#include "z64play.h"
+#include "z64player.h"
 #include "z64quest_hint_commands.h"
+#include "z64save.h"
 
 QuestHintCmd sChildSariaQuestHints[] = {
     QUEST_HINT_STRENGTH_UPG(SKIP, 0, false, 3),
diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c
index e91f09ac0..afd6a41f4 100644
--- a/src/code/z_en_item00.c
+++ b/src/code/z_en_item00.c
@@ -17,6 +17,7 @@
 #include "z64item.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/code/z_env_flags.c b/src/code/z_env_flags.c
index d277a5f75..9ad7e7a02 100644
--- a/src/code/z_env_flags.c
+++ b/src/code/z_env_flags.c
@@ -1,4 +1,5 @@
 #include "ultra64.h"
+#include "z64cutscene_flags.h"
 #include "z64play.h"
 
 void CutsceneFlags_UnsetAll(PlayState* play) {
diff --git a/src/code/z_fbdemo_fade.c b/src/code/z_fbdemo_fade.c
index d2cb382f0..3375628cb 100644
--- a/src/code/z_fbdemo_fade.c
+++ b/src/code/z_fbdemo_fade.c
@@ -1,5 +1,12 @@
-#include "global.h"
+#include "ultra64.h"
+#include "main.h"
+#include "regs.h"
 #include "terminal.h"
+#include "z_lib.h"
+#include "z64save.h"
+#include "z64transition_instances.h"
+
+#include "macros.h"
 
 typedef enum TransitionFadeDirection {
     /* 0 */ TRANS_FADE_DIR_IN,
diff --git a/src/code/z_fbdemo_wipe1.c b/src/code/z_fbdemo_wipe1.c
index e008f6861..a3418e91a 100644
--- a/src/code/z_fbdemo_wipe1.c
+++ b/src/code/z_fbdemo_wipe1.c
@@ -1,4 +1,6 @@
-#include "global.h"
+#include "gfx.h"
+#include "z64save.h"
+#include "z64transition_instances.h"
 
 typedef enum TransitionWipeDirection {
     /* 0 */ TRANS_WIPE_DIR_IN,
diff --git a/src/code/z_game_over.c b/src/code/z_game_over.c
index f0390a961..20814a4c7 100644
--- a/src/code/z_game_over.c
+++ b/src/code/z_game_over.c
@@ -1,7 +1,14 @@
+#include "letterbox.h"
+#include "regs.h"
+#include "rumble.h"
+#include "sequence.h"
+#include "versions.h"
 #include "z64game_over.h"
+#include "z64play.h"
+#include "z64save.h"
 
+#include "macros.h"
 #include "global.h"
-#include "versions.h"
 
 void GameOver_Init(PlayState* play) {
     play->gameOverCtx.state = GAMEOVER_INACTIVE;
diff --git a/src/code/z_horse.c b/src/code/z_horse.c
index f6f55c9d0..800f72c73 100644
--- a/src/code/z_horse.c
+++ b/src/code/z_horse.c
@@ -4,7 +4,8 @@
 #include "z64horse.h"
 #include "z64play.h"
 #include "z64player.h"
-#include "src/overlays/actors/ovl_En_Horse/z_en_horse.h"
+#include "z64save.h"
+#include "overlays/actors/ovl_En_Horse/z_en_horse.h"
 
 /**
  * Tests if the player horse can be spawned
diff --git a/src/code/z_inventory.c b/src/code/z_inventory.c
index 2f89c0565..bb4bb5f85 100644
--- a/src/code/z_inventory.c
+++ b/src/code/z_inventory.c
@@ -1,4 +1,8 @@
-#include "global.h"
+#include "ultra64.h"
+#include "z64play.h"
+#include "z64player.h"
+#include "z64save.h"
+
 #include "assets/textures/icon_item_static/icon_item_static.h"
 #include "assets/textures/icon_item_24_static/icon_item_24_static.h"
 #include "assets/textures/parameter_static/parameter_static.h"
diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c
index 9983b9b32..f1017342a 100644
--- a/src/code/z_kaleido_scope_call.c
+++ b/src/code/z_kaleido_scope_call.c
@@ -1,8 +1,14 @@
-#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" \
-                               "ique-cn:192 ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:224 pal-1.1:224"
+#pragma increment_block_number "gc-eu:160 gc-eu-mq:160 gc-jp:160 gc-jp-ce:160 gc-jp-mq:160 gc-us:160 gc-us-mq:160" \
+                               "ique-cn:160 ntsc-1.0:160 ntsc-1.1:160 ntsc-1.2:160 pal-1.0:160 pal-1.1:160"
 
-#include "global.h"
+#include "libu64/debug.h"
+#include "kaleido_manager.h"
+#include "letterbox.h"
+#include "regs.h"
 #include "terminal.h"
+#include "z64play.h"
+
+#include "global.h"
 
 void (*sKaleidoScopeUpdateFunc)(PlayState* play);
 void (*sKaleidoScopeDrawFunc)(PlayState* play);
diff --git a/src/code/z_kaleido_setup.c b/src/code/z_kaleido_setup.c
index 075a13dcd..cc1621947 100644
--- a/src/code/z_kaleido_setup.c
+++ b/src/code/z_kaleido_setup.c
@@ -1,7 +1,12 @@
-#include "global.h"
+#include "controller.h"
+#include "letterbox.h"
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "regs.h"
+#include "z64audio.h"
+#include "z64play.h"
+#include "z64save.h"
 
 /*
  * The following three arrays are effectively unused.
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index 012ecdb74..8e835bdd4 100644
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@@ -1,12 +1,16 @@
-#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:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:232 pal-1.1:232"
+#pragma increment_block_number "gc-eu:64 gc-eu-mq:64 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ique-cn:0" \
+                               "ntsc-1.0:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:64 pal-1.1:64"
 
 #include "global.h"
 #include "ultra64.h"
+#include "seqcmd.h"
+#include "sequence.h"
 #include "terminal.h"
 #include "versions.h"
 
+#include "z64cutscene.h"
 #include "z64frame_advance.h"
+#include "z64save.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
@@ -214,8 +218,8 @@ s16 sLightningFlashAlpha;
 s16 sSunDepthTestX;
 s16 sSunDepthTestY;
 
-#pragma increment_block_number "gc-eu:240 gc-eu-mq:240 gc-jp:224 gc-jp-ce:224 gc-jp-mq:224 gc-us:224 gc-us-mq:224" \
-                               "ique-cn:224 ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:240 pal-1.1:240"
+#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" \
+                               "ique-cn:128 ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
 
 LightNode* sNGameOverLightNode;
 LightInfo sNGameOverLightInfo;
diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c
index efe7b92b8..1395580d0 100644
--- a/src/code/z_lifemeter.c
+++ b/src/code/z_lifemeter.c
@@ -1,4 +1,14 @@
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64play.h"
+#include "z64player.h"
+#include "z64save.h"
+
 #include "global.h"
+
 #include "assets/textures/parameter_static/parameter_static.h"
 
 static s16 sHeartsPrimColors[3][3] = {
diff --git a/src/code/z_map_data.c b/src/code/z_map_data.c
index 24721c623..502eb43c3 100644
--- a/src/code/z_map_data.c
+++ b/src/code/z_map_data.c
@@ -1,4 +1,5 @@
-#include "global.h"
+#include "map.h"
+#include "z64save.h"
 
 static s16 sFloorTexIndexOffset[10][8] = {
     { 0, 0, 0, 0, 2, 4, 6, 8 }, { 0, 0, 0, 0, 0, 0, 0, 2 },
diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c
index 8c19635d6..78371084b 100644
--- a/src/code/z_map_exp.c
+++ b/src/code/z_map_exp.c
@@ -1,10 +1,22 @@
-#include "global.h"
-#include "terminal.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
-#include "assets/textures/parameter_static/parameter_static.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "controller.h"
+#include "map.h"
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "regs.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "terminal.h"
+#include "z64play.h"
+#include "z64player.h"
+#include "z64save.h"
+
+#include "global.h"
+
+#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/textures/parameter_static/parameter_static.h"
 
 MapData* gMapData;
 
diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c
index 4d0ab0411..72d245ce8 100644
--- a/src/code/z_map_mark.c
+++ b/src/code/z_map_mark.c
@@ -1,9 +1,16 @@
-#include "global.h"
+#include "libu64/debug.h"
+#include "romfile.h"
+#include "segment_symbols.h"
 #include "terminal.h"
 #include "assets/textures/parameter_static/parameter_static.h"
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "z64map_mark.h"
+#include "z64play.h"
+#include "z64save.h"
+
+#include "global.h"
 
 typedef struct MapMarkInfo {
     /* 0x00 */ void* texture;
diff --git a/src/code/z_message.c b/src/code/z_message.c
index a2c275b8e..01ecf6f0c 100644
--- a/src/code/z_message.c
+++ b/src/code/z_message.c
@@ -1,14 +1,30 @@
-#include "global.h"
+#include "libu64/gfxprint.h"
+#include "attributes.h"
+#include "controller.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "gfxalloc.h"
 #include "message_data_static.h"
-#include "terminal.h"
-#include "versions.h"
-#include "assets/textures/parameter_static/parameter_static.h"
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "segment_symbols.h"
+#include "sequence.h"
+#include "regs.h"
+#include "terminal.h"
+#include "versions.h"
+#include "z64audio.h"
+#include "z64ocarina.h"
+#include "z64play.h"
+#include "z64player.h"
+#include "z64save.h"
+
+#include "global.h"
+
+#include "assets/textures/parameter_static/parameter_static.h"
 
 #pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
-                               "ntsc-1.0:80 ntsc-1.1:80 ntsc-1.2:80 pal-1.0:128 pal-1.1:128"
+                               "ntsc-1.0:144 ntsc-1.1:144 ntsc-1.2:144 pal-1.0:128 pal-1.1:128"
 
 #if !PLATFORM_IQUE
 #define MSG_BUF_DECODED (msgCtx->msgBufDecoded)
diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c
index 344d3aee2..6a4c896ac 100644
--- a/src/code/z_onepointdemo.c
+++ b/src/code/z_onepointdemo.c
@@ -1,8 +1,15 @@
-#include "global.h"
+#include "libc64/math64.h"
+#include "libc64/qrand.h"
+#include "one_point_cutscene.h"
 #include "quake.h"
+#include "sfx.h"
 #include "terminal.h"
 #include "versions.h"
+#include "z_lib.h"
 #include "z64olib.h"
+#include "z64play.h"
+#include "z64player.h"
+#include "z64save.h"
 #include "overlays/actors/ovl_En_Sw/z_en_sw.h"
 
 static s16 sDisableAttention = false;
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index 91225aae2..1a25f6751 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -1,7 +1,26 @@
-#include "global.h"
+#include "attributes.h"
+#include "controller.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "main.h"
+#include "map.h"
+#include "regs.h"
+#include "segment_symbols.h"
+#include "segmented_address.h"
+#include "sequence.h"
+#include "sfx.h"
+#include "sys_matrix.h"
 #include "terminal.h"
 #include "versions.h"
+#include "z64audio.h"
 #include "z64horse.h"
+#include "z64ocarina.h"
+#include "z64play.h"
+#include "z64player.h"
+#include "z64save.h"
+
+#include "global.h"
+
 #include "assets/textures/parameter_static/parameter_static.h"
 #include "assets/textures/do_action_static/do_action_static.h"
 #include "assets/textures/icon_item_static/icon_item_static.h"
diff --git a/src/code/z_play.c b/src/code/z_play.c
index ac271a93e..4e724601f 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -1,18 +1,39 @@
-
-#include "global.h"
+#include "libu64/debug.h"
+#include "controller.h"
 #include "fault.h"
-#include "quake.h"
-#include "terminal.h"
-#include "versions.h"
+#include "gfx.h"
+#include "gfxalloc.h"
+#include "kaleido_manager.h"
+#include "letterbox.h"
 #include "line_numbers.h"
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
-
+#include "one_point_cutscene.h"
+#include "quake.h"
+#include "regs.h"
+#include "rumble.h"
+#include "segmented_address.h"
+#include "sequence.h"
+#include "sfx.h"
+#include "sys_math3d.h"
+#include "sys_matrix.h"
+#include "terminal.h"
+#include "versions.h"
+#include "zelda_arena.h"
+#include "z64cutscene_flags.h"
 #include "z64debug_display.h"
+#include "z64effect.h"
 #include "z64frame_advance.h"
+#include "z64light.h"
+#include "z64play.h"
+#include "z64player.h"
+#include "z64save.h"
+
+#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"
+#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" \
+                               "ique-cn:192 ntsc-1.0:64 ntsc-1.1:64 ntsc-1.2:64 pal-1.0:64 pal-1.1:64"
 
 TransitionTile gTransitionTile;
 s32 gTransitionTileState;
diff --git a/src/code/z_player_call.c b/src/code/z_player_call.c
index b922f5663..2874522df 100644
--- a/src/code/z_player_call.c
+++ b/src/code/z_player_call.c
@@ -4,7 +4,7 @@
     (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED | \
      ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_CAN_PRESS_SWITCHES)
 
-#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" \
+#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
                                "ntsc-1.2:128 pal-1.1:128"
 
 void (*sPlayerCallInitFunc)(Actor* thisx, PlayState* play);
diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c
index 0e34ff571..adefea26a 100644
--- a/src/code/z_player_lib.c
+++ b/src/code/z_player_lib.c
@@ -1,12 +1,24 @@
-#include "global.h"
+#include "libc64/math64.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "regs.h"
+#include "segmented_address.h"
+#include "sys_matrix.h"
 #include "versions.h"
+#include "z_lib.h"
 #include "z64draw.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64player.h"
+#include "z64save.h"
+#include "z64skin_matrix.h"
 
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_link_boy/object_link_boy.h"
 #include "assets/objects/object_link_child/object_link_child.h"
 
-#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128"
+#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
+                               "pal-1.0:0 pal-1.1:0"
 
 typedef struct BowSlingshotStringData {
     /* 0x00 */ Gfx* dList;
diff --git a/src/code/z_room.c b/src/code/z_room.c
index 4050248b3..ce8f452f9 100644
--- a/src/code/z_room.c
+++ b/src/code/z_room.c
@@ -1,12 +1,27 @@
-#include "global.h"
+#include "libu64/debug.h"
+#include "ultra64/gs2dex.h"
 #include "fault.h"
-#include "sys_ucode.h"
-#include "terminal.h"
-#include "versions.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "jpeg.h"
 #include "line_numbers.h"
+#include "map.h"
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "regs.h"
+#include "segmented_address.h"
+#include "sys_matrix.h"
+#include "sys_ucode.h"
+#include "terminal.h"
+#include "versions.h"
+#include "z64audio.h"
+#include "z64play.h"
+#include "z64player.h"
+#include "z64save.h"
+#include "z64skin_matrix.h"
+
+#include "global.h"
 
 Vec3f D_801270A0 = { 0.0f, 0.0f, 0.0f };
 
diff --git a/src/code/z_scene.c b/src/code/z_scene.c
index e285587d9..4b40a3b0c 100644
--- a/src/code/z_scene.c
+++ b/src/code/z_scene.c
@@ -1,6 +1,8 @@
 #include "global.h"
+#include "seqcmd.h"
 #include "terminal.h"
 #include "versions.h"
+#include "z64save.h"
 
 SceneCmdHandlerFunc sSceneCmdHandlers[SCENE_CMD_ID_MAX];
 RomFile sNaviQuestHintFiles[];
diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c
index a6a08ccd1..8b4a57e89 100644
--- a/src/code/z_scene_table.c
+++ b/src/code/z_scene_table.c
@@ -1,10 +1,22 @@
-#include "global.h"
-#include "quake.h"
-#include "versions.h"
-#include "z64frame_advance.h"
+#include "libc64/qrand.h"
+#include "gfx.h"
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "quake.h"
+#include "regs.h"
+#include "segment_symbols.h"
+#include "segmented_address.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "versions.h"
+#include "z_lib.h"
+#include "z64frame_advance.h"
+#include "z64play.h"
+#include "z64player.h"
+#include "z64save.h"
+
+#include "global.h"
 
 #include "assets/scenes/indoors/miharigoya/miharigoya_scene.h"
 #include "assets/scenes/indoors/souko/souko_scene.h"
diff --git a/src/code/z_sram.c b/src/code/z_sram.c
index da453d46c..ab25ffeb2 100644
--- a/src/code/z_sram.c
+++ b/src/code/z_sram.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "terminal.h"
 #include "versions.h"
+#include "z64save.h"
 
 #define SLOT_SIZE (sizeof(SaveContext) + 0x28)
 #define CHECKSUM_SIZE (sizeof(Save) / 2)
diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c
index 2e7953362..cd8c1b2b8 100644
--- a/src/code/z_vr_box.c
+++ b/src/code/z_vr_box.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "terminal.h"
 #include "z64environment.h"
+#include "z64save.h"
 
 typedef struct SkyboxFaceParams {
     /* 0x000 */ s32 xStart;