Reduce dependencies on global.h (9) (#2488)

* split game states

* split all GameState headers

* match fig names

* deduplicate headers from bad merge

* split z64actor.h into z64actor_profile.h, z_actor_dlftbls.h

* fix compile error

* .bss

34 files changed, 123 insertions, 58 deletions

diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c
index 6d1d33cf6..b8d527619 100644
--- a/src/boot/z_std_dma.c
+++ b/src/boot/z_std_dma.c
@@ -33,7 +33,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:76 pal-1.0:74 pal-1.1:74"
+                               "ntsc-1.2:86 pal-1.0:84 pal-1.1:84"
 
 StackEntry sDmaMgrStackInfo;
 OSMesgQueue sDmaMgrMsgQueue;
diff --git a/src/code/fault_gc.c b/src/code/fault_gc.c
index f1f100071..c70503cdd 100644
--- a/src/code/fault_gc.c
+++ b/src/code/fault_gc.c
@@ -40,8 +40,8 @@
  * 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:160 gc-eu-mq:160 gc-eu-mq-dbg:160 gc-jp:176 gc-jp-ce:176 gc-jp-mq:176 gc-us:176" \
+                               "gc-us-mq:176 ique-cn:176"
 
 #include "global.h"
 #include "libc64/sleep.h"
diff --git a/src/code/graph.c b/src/code/graph.c
index de9ecd900..288a1cee7 100644
--- a/src/code/graph.c
+++ b/src/code/graph.c
@@ -2,8 +2,8 @@
 #include "libc64/sprintf.h"
 #include "libu64/debug.h"
 
-#include "console_logo_state.h"
 #include "buffers.h"
+#include "console_logo_state.h"
 #include "gfx.h"
 #include "fault.h"
 #include "file_select_state.h"
@@ -14,10 +14,11 @@
 #include "regs.h"
 #include "setup_state.h"
 #include "sys_ucode.h"
-#include "title_setup_state.h"
 #include "terminal.h"
+#include "title_setup_state.h"
 #include "ucode_disas.h"
 #include "versions.h"
+#include "z_game_dlftbls.h"
 #include "z64save.h"
 #include "z64play.h"
 
diff --git a/src/code/main.c b/src/code/main.c
index 62cd22573..32a543a9b 100644
--- a/src/code/main.c
+++ b/src/code/main.c
@@ -28,8 +28,8 @@ extern struct IrqMgr gIrqMgr;
 
 #include "global.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:144 ntsc-1.0:129 ntsc-1.1:129 ntsc-1.2:129 pal-1.0:127 pal-1.1:127"
+#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:140 ntsc-1.1:140 ntsc-1.2:140 pal-1.0:138 pal-1.1:138"
 
 extern u8 _buffersSegmentEnd[];
 
diff --git a/src/code/title_setup.c b/src/code/title_setup.c
index 8234a562b..ba259e72a 100644
--- a/src/code/title_setup.c
+++ b/src/code/title_setup.c
@@ -1,7 +1,7 @@
+#include "console_logo_state.h"
 #include "setup_state.h"
 
 #include "global.h"
-#include "console_logo_state.h"
 
 void Setup_InitImpl(SetupState* this) {
     PRINTF(T("ゼルダ共通データ初期化\n", "Zelda common data initialization\n"));
diff --git a/src/code/z_DLF.c b/src/code/z_DLF.c
index 7934b7745..501fed21a 100644
--- a/src/code/z_DLF.c
+++ b/src/code/z_DLF.c
@@ -1,7 +1,10 @@
+#include "libc64/malloc.h"
 #include "libu64/overlay.h"
-
-#include "global.h"
 #include "terminal.h"
+#include "ultra64.h"
+#include "z_game_dlftbls.h"
+
+#include "macros.h"
 
 void Overlay_LoadGameState(GameStateOverlay* overlayEntry) {
     if (overlayEntry->loadedRamAddr != NULL) {
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 7c6249759..54807627b 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -13,8 +13,10 @@
 #include "sys_matrix.h"
 #include "terminal.h"
 #include "versions.h"
+#include "z_actor_dlftbls.h"
 #include "z_lib.h"
 #include "zelda_arena.h"
+#include "z64actor.h"
 #include "z64effect.h"
 #include "z64light.h"
 #include "z64horse.h"
@@ -32,7 +34,7 @@
 #include "assets/objects/object_bdoor/object_bdoor.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:0 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
+                               "ntsc-1.0:128 ntsc-1.1:0 ntsc-1.2:0 pal-1.0:0 pal-1.1:0"
 
 CollisionPoly* sCurCeilingPoly;
 s32 sCurCeilingBgId;
diff --git a/src/code/z_actor_dlftbls.c b/src/code/z_actor_dlftbls.c
index 52d8ad855..accce471c 100644
--- a/src/code/z_actor_dlftbls.c
+++ b/src/code/z_actor_dlftbls.c
@@ -1,5 +1,8 @@
-#include "global.h"
 #include "fault.h"
+#include "segment_symbols.h"
+#include "z_actor_dlftbls.h"
+
+#include "macros.h"
 
 // Linker symbol declarations (used in the table below)
 #define DEFINE_ACTOR(name, _1, _2, _3) DECLARE_OVERLAY_SEGMENT(name)
diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c
index b54707fd6..c5d22fd6a 100644
--- a/src/code/z_bgcheck.c
+++ b/src/code/z_bgcheck.c
@@ -11,7 +11,7 @@
 #include "z64player.h"
 #include "z64skin_matrix.h"
 
-#pragma increment_block_number "ntsc-1.0:176 ntsc-1.1:176 ntsc-1.2:176"
+#pragma increment_block_number "ntsc-1.0:184 ntsc-1.1:184 ntsc-1.2:184"
 
 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 142d23aed..d36f36b9a 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -3642,7 +3642,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:109 ntsc-1.1:109 ntsc-1.2:109 pal-1.0:107 pal-1.1:107"
+                               "ique-cn:128 ntsc-1.0:120 ntsc-1.1:120 ntsc-1.2:120 pal-1.0:118 pal-1.1:118"
 
 s32 Camera_KeepOn4(Camera* camera) {
     static Vec3f D_8015BD50;
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index 50b049fc1..bd1c41857 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -144,7 +144,7 @@ u16 gCamAtSplinePointsAppliedFrame;
 u16 gCamEyePointAppliedFrame;
 u16 gCamAtPointAppliedFrame;
 
-#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" \
+#pragma increment_block_number "gc-eu:0 gc-eu-mq:128 gc-jp:0 gc-jp-ce:0 gc-jp-mq:128 gc-us:0 gc-us-mq:128 ique-cn:0" \
                                "ntsc-1.0:128 ntsc-1.1:128 ntsc-1.2:128 pal-1.0:128 pal-1.1:128"
 
 // Cam ID to return to when a scripted cutscene is finished
diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c
index d424191d2..2acddc4bf 100644
--- a/src/code/z_effect_soft_sprite.c
+++ b/src/code/z_effect_soft_sprite.c
@@ -1,8 +1,10 @@
 #include "libu64/overlay.h"
-#include "global.h"
+#include "sfx.h"
 #include "terminal.h"
-
+#include "zelda_arena.h"
 #include "z64frame_advance.h"
+#include "z64effect.h"
+#include "z64play.h"
 
 EffectSsInfo sEffectSsInfo = { 0 }; // "EffectSS2Info"
 
diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c
index afd6a41f4..aa757f864 100644
--- a/src/code/z_en_item00.c
+++ b/src/code/z_en_item00.c
@@ -22,7 +22,7 @@
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-eu-mq-dbg:0 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128" \
-                               "gc-us-mq:128 ntsc-1.2:128"
+                               "gc-us-mq:128 ntsc-1.0:128 ntsc-1.2:128"
 
 #define FLAGS 0
 
diff --git a/src/code/z_game_dlftbls.c b/src/code/z_game_dlftbls.c
index 95969c291..57efe90df 100644
--- a/src/code/z_game_dlftbls.c
+++ b/src/code/z_game_dlftbls.c
@@ -1,11 +1,11 @@
-#include "setup_state.h"
-#include "map_select_state.h"
+#include "segment_symbols.h"
 #include "console_logo_state.h"
-#include "z64play.h"
-#include "title_setup_state.h"
 #include "file_select_state.h"
-
-#include "global.h"
+#include "map_select_state.h"
+#include "setup_state.h"
+#include "title_setup_state.h"
+#include "z_game_dlftbls.h"
+#include "z64play.h"
 
 // Linker symbol declarations (used in the table below)
 #define DEFINE_GAMESTATE(typeName, enumName, name) DECLARE_OVERLAY_SEGMENT(name)
diff --git a/src/code/z_kaleido_manager.c b/src/code/z_kaleido_manager.c
index e1d7f5529..9fa8f5ebc 100644
--- a/src/code/z_kaleido_manager.c
+++ b/src/code/z_kaleido_manager.c
@@ -1,7 +1,11 @@
+#include "libu64/debug.h"
 #include "libu64/overlay.h"
-
-#include "global.h"
+#include "kaleido_manager.h"
+#include "segment_symbols.h"
 #include "terminal.h"
+#include "z64play.h"
+
+#include "macros.h"
 
 #define KALEIDO_OVERLAY(name, nameString) \
     { NULL, ROM_FILE(ovl_##name), _ovl_##name##SegmentStart, _ovl_##name##SegmentEnd, 0, nameString, }
diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c
index 35e14433a..1d99a6f5c 100644
--- a/src/code/z_kaleido_scope_call.c
+++ b/src/code/z_kaleido_scope_call.c
@@ -1,5 +1,5 @@
-#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:224 gc-eu-mq:224 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:224 pal-1.1:224"
 
 #include "libu64/debug.h"
 #include "kaleido_manager.h"
diff --git a/src/code/z_message.c b/src/code/z_message.c
index 68d208623..1240cfed9 100644
--- a/src/code/z_message.c
+++ b/src/code/z_message.c
@@ -24,7 +24,7 @@
 #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:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:128 pal-1.1:128"
+                               "ntsc-1.0:208 ntsc-1.1:208 ntsc-1.2:208 pal-1.0:128 pal-1.1:128"
 
 #if !PLATFORM_IQUE
 #define MSG_BUF_DECODED (msgCtx->msgBufDecoded)
diff --git a/src/code/z_play.c b/src/code/z_play.c
index 095638be6..d49ae40fe 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -23,6 +23,7 @@
 #include "terminal.h"
 #include "title_setup_state.h"
 #include "versions.h"
+#include "z_actor_dlftbls.h"
 #include "zelda_arena.h"
 #include "z64cutscene_flags.h"
 #include "z64debug_display.h"
@@ -35,8 +36,8 @@
 
 #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" \
-                               "ique-cn:192 ntsc-1.0:144 ntsc-1.1:144 ntsc-1.2:144 pal-1.0:144 pal-1.1:144"
+#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ique-cn:192" \
+                               "ntsc-1.0:144 ntsc-1.1:144 ntsc-1.2:144 pal-1.0:144 pal-1.1:144"
 
 TransitionTile gTransitionTile;
 s32 gTransitionTileState;
@@ -325,7 +326,7 @@ void Play_Init(GameState* thisx) {
     Camera_OverwriteStateFlags(&this->mainCamera, CAM_STATE_CHECK_BG_ALT | CAM_STATE_CHECK_WATER | CAM_STATE_CHECK_BG |
                                                       CAM_STATE_EXTERNAL_FINISHED | CAM_STATE_CAM_FUNC_FINISH |
                                                       CAM_STATE_LOCK_MODE | CAM_STATE_DISTORTION | CAM_STATE_PLAY_INIT);
-    Sram_Init(this, &this->sramCtx);
+    Sram_Init(&this->state, &this->sramCtx);
     Regs_InitData(this);
     Message_Init(this);
     GameOver_Init(this);
diff --git a/src/code/z_prenmi.c b/src/code/z_prenmi.c
index 34712be91..bda115d46 100644
--- a/src/code/z_prenmi.c
+++ b/src/code/z_prenmi.c
@@ -1,9 +1,13 @@
+#include "gfx.h"
+#include "gfx_setupdl.h"
 #include "prenmi_state.h"
-
-#include "global.h"
+#include "regs.h"
 #include "terminal.h"
 #include "versions.h"
 
+#include "macros.h"
+#include "global.h"
+
 void func_80092320(PreNMIState* this) {
     this->state.running = false;
     this->state.init = NULL;
diff --git a/src/code/z_sample.c b/src/code/z_sample.c
index 6a5b86529..63e0836bb 100644
--- a/src/code/z_sample.c
+++ b/src/code/z_sample.c
@@ -1,6 +1,11 @@
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "controller.h"
+#include "regs.h"
 #include "sample_state.h"
-
-#include "global.h"
+#include "segment_symbols.h"
+#include "z64dma.h"
+#include "z64play.h"
 
 void Sample_HandleStateChange(SampleState* this) {
     if (CHECK_BTN_ALL(this->state.input[0].press.button, BTN_START)) {
diff --git a/src/code/z_scene.c b/src/code/z_scene.c
index 4b40a3b0c..805141ade 100644
--- a/src/code/z_scene.c
+++ b/src/code/z_scene.c
@@ -2,6 +2,7 @@
 #include "seqcmd.h"
 #include "terminal.h"
 #include "versions.h"
+#include "z_actor_dlftbls.h"
 #include "z64save.h"
 
 SceneCmdHandlerFunc sSceneCmdHandlers[SCENE_CMD_ID_MAX];
diff --git a/src/code/z_sram.c b/src/code/z_sram.c
index 2f6a3b5dc..de2f1ce72 100644
--- a/src/code/z_sram.c
+++ b/src/code/z_sram.c
@@ -1,10 +1,16 @@
 #include "file_select_state.h"
-#include "global.h"
+#include "controller.h"
 #include "terminal.h"
 #include "versions.h"
+#include "z64game.h"
+#include "z64message.h"
 #include "z64save.h"
+#include "z64scene.h"
+#include "z64sram.h"
 #include "z64ss_sram.h"
 
+#include "global.h"
+
 #define SLOT_SIZE (sizeof(SaveContext) + 0x28)
 #define CHECKSUM_SIZE (sizeof(Save) / 2)
 
@@ -1060,5 +1066,5 @@ void Sram_Alloc(GameState* gameState, SramContext* sramCtx) {
     ASSERT(sramCtx->readBuff != NULL, "sram->read_buff != NULL", "../z_sram.c", 1295);
 }
 
-void Sram_Init(PlayState* play, SramContext* sramCtx) {
+void Sram_Init(GameState* gameState, SramContext* sramCtx) {
 }
diff --git a/src/libu64/load_gc.c b/src/libu64/load_gc.c
index 8d1ff315c..6211d119b 100644
--- a/src/libu64/load_gc.c
+++ b/src/libu64/load_gc.c
@@ -1,6 +1,8 @@
 #include "libu64/overlay.h"
+#include "ultra64.h"
+#include "z64dma.h"
 
-#include "global.h"
+#include "macros.h"
 
 size_t Overlay_Load(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart, void* vramEnd, void* allocatedRamAddr) {
     s32 pad[3];
diff --git a/src/libu64/loadfragment2_gc.c b/src/libu64/loadfragment2_gc.c
index 477b7d1c2..191b2ee07 100644
--- a/src/libu64/loadfragment2_gc.c
+++ b/src/libu64/loadfragment2_gc.c
@@ -1,6 +1,7 @@
+#include "libc64/malloc.h"
 #include "libu64/overlay.h"
 
-#include "global.h"
+#include "macros.h"
 
 void* Overlay_AllocateAndLoad(uintptr_t vromStart, uintptr_t vromEnd, void* vramStart, void* vramEnd) {
     void* allocatedRamAddr = SYSTEM_ARENA_MALLOC_R((intptr_t)vramEnd - (intptr_t)vramStart, "../loadfragment2.c", 31);
diff --git a/src/libu64/loadfragment2_n64.c b/src/libu64/loadfragment2_n64.c
index b3d7751d8..015e1d1d6 100644
--- a/src/libu64/loadfragment2_n64.c
+++ b/src/libu64/loadfragment2_n64.c
@@ -6,9 +6,11 @@
  *
  * @see Overlay_Relocate
  */
+#include "libc64/malloc.h"
 #include "libu64/overlay.h"
+#include "z64dma.h"
 
-#include "global.h"
+#include "macros.h"
 
 s32 gOverlayLogSeverity = 2;
 
diff --git a/src/libu64/logseverity_gc.c b/src/libu64/logseverity_gc.c
index 940aa87cc..50c2eb4ab 100644
--- a/src/libu64/logseverity_gc.c
+++ b/src/libu64/logseverity_gc.c
@@ -1,3 +1,3 @@
-#include "global.h"
+#include "libu64/overlay.h"
 
 s32 gOverlayLogSeverity = 2;
diff --git a/src/libu64/relocation_gc.c b/src/libu64/relocation_gc.c
index a2961bcc5..9307d67cc 100644
--- a/src/libu64/relocation_gc.c
+++ b/src/libu64/relocation_gc.c
@@ -7,8 +7,10 @@
  * @see Overlay_Relocate
  */
 #include "libu64/overlay.h"
+#include "attributes.h"
+#include "ultra64.h"
 
-#include "global.h"
+#include "macros.h"
 
 // Extract MIPS register rs from an instruction word
 #define MIPS_REG_RS(insn) (((insn) >> 0x15) & 0x1F)
diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c
index bf421ecd9..15adb7bf9 100644
--- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c
+++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c
@@ -24,6 +24,8 @@
 
 #include "assets/objects/object_ddan_objects/object_ddan_objects.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"
+
 #define FLAGS 0
 
 void BgDodoago_Init(Actor* thisx, PlayState* play);
diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
index 8388bd537..1ebeaa882 100644
--- a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
+++ b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
@@ -1,7 +1,8 @@
-#include "file_select_state.h"
 #include "file_select.h"
+#include "file_select_state.h"
 
 #include "attributes.h"
+#include "controller.h"
 #include "gfx.h"
 #include "gfx_setupdl.h"
 #include "letterbox.h"
@@ -11,6 +12,8 @@
 #include "n64dd.h"
 #endif
 #include "regs.h"
+#include "rumble.h"
+#include "segment_symbols.h"
 #include "seqcmd.h"
 #include "sequence.h"
 #include "sfx.h"
diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c b/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c
index 538663066..8fe674c3a 100644
--- a/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c
+++ b/src/overlays/gamestates/ovl_file_choose/z_file_copy_erase.c
@@ -1,5 +1,5 @@
-#include "file_select_state.h"
 #include "file_select.h"
+#include "file_select_state.h"
 
 #include "controller.h"
 #include "regs.h"
diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c b/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c
index 9418e67d0..aeee6539a 100644
--- a/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c
+++ b/src/overlays/gamestates/ovl_file_choose/z_file_nameset.c
@@ -1,5 +1,5 @@
-#include "file_select_state.h"
 #include "file_select.h"
+#include "file_select_state.h"
 
 #include "controller.h"
 #include "gfx.h"
diff --git a/src/overlays/gamestates/ovl_opening/z_opening.c b/src/overlays/gamestates/ovl_opening/z_opening.c
index bcda61ce8..ad36b6e20 100644
--- a/src/overlays/gamestates/ovl_opening/z_opening.c
+++ b/src/overlays/gamestates/ovl_opening/z_opening.c
@@ -4,11 +4,15 @@
  * Description: Initializes the game into the title screen
  */
 
+#include "gfx.h"
+#include "regs.h"
+#include "sys_matrix.h"
 #include "title_setup_state.h"
-
-#include "global.h"
+#include "z64game.h"
+#include "z64play.h"
 #include "z64save.h"
 #include "z64sram.h"
+#include "z64view.h"
 
 void TitleSetup_SetupTitleScreen(TitleSetupState* this) {
     gSaveContext.gameMode = GAMEMODE_TITLE_SCREEN;
diff --git a/src/overlays/gamestates/ovl_select/z_select.c b/src/overlays/gamestates/ovl_select/z_select.c
index fea717fb7..633986cd6 100644
--- a/src/overlays/gamestates/ovl_select/z_select.c
+++ b/src/overlays/gamestates/ovl_select/z_select.c
@@ -4,21 +4,29 @@
  * Description: Debug Scene Select Menu
  */
 
-#include "map_select_state.h"
-
+#include "libc64/qrand.h"
+#include "libu64/gfxprint.h"
 #include "ultra64.h"
 #include "alloca.h"
 #include "console_logo_state.h"
+#include "controller.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "map_select_state.h"
 #if PLATFORM_N64
 #include "n64dd.h"
 #endif
+#include "regs.h"
+#include "segment_symbols.h"
 #include "seqcmd.h"
 #include "sequence.h"
+#include "sfx.h"
 #include "terminal.h"
+#include "z64play.h"
 #include "z64save.h"
 #include "z64sram.h"
 
-#include "global.h"
+#include "macros.h"
 
 void MapSelect_LoadTitle(MapSelectState* this) {
     this->state.running = false;
diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c
index 727d49a33..0470a4f52 100644
--- a/src/overlays/gamestates/ovl_title/z_title.c
+++ b/src/overlays/gamestates/ovl_title/z_title.c
@@ -4,19 +4,28 @@
  * Description: Displays the Nintendo Logo
  */
 
-#include "console_logo_state.h"
-
-#include "global.h"
-#include "alloca.h"
-#include "title_setup_state.h"
-#include "versions.h"
-
+#include "libu64/gfxprint.h"
 #if PLATFORM_N64
 #include "cic6105.h"
 #include "n64dd.h"
 #endif
+
+#include "alloca.h"
+#include "console_logo_state.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "regs.h"
+#include "segment_symbols.h"
+#include "sequence.h"
+#include "sys_matrix.h"
+#include "title_setup_state.h"
+#include "versions.h"
+#include "z64actor.h"
+#include "z64environment.h"
 #include "z64save.h"
 
+#include "global.h"
+
 #include "assets/textures/nintendo_rogo_static/nintendo_rogo_static.h"
 
 #if DEBUG_FEATURES