Reduce overlay dependencies on global.h (4) (#2456)

* remove more global.h references

* .bss

include/z64game.h

@@ -3,7 +3,7 @@
 // This file is named "game" after game.c for now, this may change later with the system name
 
 #include "ultra64/ultratypes.h"
-#include "padmgr.h"
+#include "libu64/pad.h"
 #include "tha.h"
 
 struct GraphicsContext;

include/z64view.h

@@ -1,6 +1,7 @@
 #ifndef Z64VIEW_H
 #define Z64VIEW_H
 
+#include "macros.h"
 #include "ultra64.h"
 #include "z64math.h"
 

include/z_lib.h

@@ -2,7 +2,7 @@
 #define Z_LIB_H
 
 #include "libc/stddef.h"
-#include "padmgr.h"
+#include "libu64/pad.h"
 #include "z64math.h"
 #include "color.h"
 

src/code/sys_math3d.c

@@ -5,8 +5,8 @@
 #include "macros.h"
 #include "sys_math3d.h"
 
-#pragma increment_block_number "gc-eu:97 gc-eu-mq:97 gc-jp:97 gc-jp-ce:97 gc-jp-mq:97 gc-us:97 gc-us-mq:97 ique-cn:97" \
-                               "ntsc-1.0:80 ntsc-1.1:80 ntsc-1.2:79 pal-1.0:80 pal-1.1:80"
+#pragma increment_block_number "gc-eu:120 gc-eu-mq:120 gc-jp:120 gc-jp-ce:120 gc-jp-mq:120 gc-us:120 gc-us-mq:120" \
+                               "ique-cn:120 ntsc-1.0:96 ntsc-1.1:96 ntsc-1.2:96 pal-1.0:96 pal-1.1:96"
 
 s32 Math3D_LineVsLineClosestTwoPoints(Vec3f* lineAPointA, Vec3f* lineAPointB, Vec3f* lineBPointA, Vec3f* lineBPointB,
                                       Vec3f* lineAClosestToB, Vec3f* lineBClosestToA);

src/code/z_collision_check.c

@@ -16,7 +16,7 @@
 #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:96 ntsc-1.1:96 ntsc-1.2:96 pal-1.0:96 pal-1.1:96"
+                               "ique-cn:128 ntsc-1.0:104 ntsc-1.1:104 ntsc-1.2:104 pal-1.0:104 pal-1.1:104"
 
 typedef s32 (*ColChkResetFunc)(PlayState*, Collider*);
 typedef void (*ColChkApplyFunc)(PlayState*, CollisionCheckContext*, Collider*);

src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c

@@ -5,6 +5,18 @@
  */
 
 #include "z_bg_hidan_sima.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "rumble.h"
+#include "segmented_address.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h

@@ -2,11 +2,11 @@
 #define Z_BG_HIDAN_SIMA_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgHidanSima;
 
-typedef void (*BgHidanSimaActionFunc)(struct BgHidanSima*, PlayState*);
+typedef void (*BgHidanSimaActionFunc)(struct BgHidanSima*, struct PlayState*);
 
 typedef struct BgHidanSima {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c

@@ -5,6 +5,11 @@
  */
 
 #include "z_bg_hidan_syoku.h"
+
+#include "ichain.h"
+#include "sfx.h"
+#include "z64play.h"
+
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.h

@@ -2,11 +2,11 @@
 #define Z_BG_HIDAN_SYOKU_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgHidanSyoku;
 
-typedef void (*BgHidanSyokuActionFunc)(struct BgHidanSyoku*, PlayState*);
+typedef void (*BgHidanSyokuActionFunc)(struct BgHidanSyoku*, struct PlayState*);
 
 typedef struct BgHidanSyoku {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c

@@ -5,6 +5,16 @@
  */
 
 #include "z_bg_ice_objects.h"
+
+#include "libc64/qrand.h"
+#include "ichain.h"
+#include "rand.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/object_ice_objects/object_ice_objects.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h

@@ -2,11 +2,11 @@
 #define Z_BG_ICE_OBJECTS_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgIceObjects;
 
-typedef void (*BgIceObjectsActionFunc) (struct BgIceObjects*, PlayState*);
+typedef void (*BgIceObjectsActionFunc) (struct BgIceObjects*, struct PlayState*);
 
 typedef struct BgIceObjects {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c

@@ -5,6 +5,17 @@
  */
 
 #include "z_bg_ice_shelter.h"
+
+#include "libc64/qrand.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/object_ice_objects/object_ice_objects.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h

@@ -2,11 +2,11 @@
 #define Z_BG_ICE_SHELTER_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgIceShelter;
 
-typedef void (*BgIceShelterActionFunc)(struct BgIceShelter*, PlayState*);
+typedef void (*BgIceShelterActionFunc)(struct BgIceShelter*, struct PlayState*);
 
 typedef enum RedIceType {
     /* 0 */ RED_ICE_LARGE,    // Large red ice block

src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c

@@ -5,6 +5,13 @@
  */
 
 #include "z_bg_ice_shutter.h"
+
+#include "ichain.h"
+#include "one_point_cutscene.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_ice_objects/object_ice_objects.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h

@@ -2,11 +2,11 @@
 #define Z_BG_ICE_SHUTTER_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgIceShutter;
 
-typedef void (*BgIceShutterActionFunc)(struct BgIceShutter*, PlayState*);
+typedef void (*BgIceShutterActionFunc)(struct BgIceShutter*, struct PlayState*);
 
 typedef struct BgIceShutter {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c

@@ -5,6 +5,15 @@
  */
 
 #include "z_bg_ice_turara.h"
+
+#include "libc64/qrand.h"
+#include "ichain.h"
+#include "rand.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/object_ice_objects/object_ice_objects.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h

@@ -2,11 +2,11 @@
 #define Z_BG_ICE_TURARA_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgIceTurara;
 
-typedef void (*BgIceTuraraActionFunc)(struct BgIceTurara*, PlayState*);
+typedef void (*BgIceTuraraActionFunc)(struct BgIceTurara*, struct PlayState*);
 
 typedef enum BgIceTuraraType {
     /* 0 */ TURARA_STALAGMITE,

src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c

@@ -5,6 +5,13 @@
  */
 
 #include "z_bg_ingate.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_ingate/object_ingate.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h

@@ -2,11 +2,11 @@
 #define Z_BG_INGATE_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgInGate;
 
-typedef void (*BgInGateActionFunc)(struct BgInGate*, PlayState*);
+typedef void (*BgInGateActionFunc)(struct BgInGate*, struct PlayState*);
 
 typedef struct BgInGate {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c

@@ -5,6 +5,12 @@
  */
 
 #include "z_bg_jya_1flift.h"
+
+#include "ichain.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_jya_obj/object_jya_obj.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h

@@ -2,11 +2,11 @@
 #define Z_BG_JYA_1FLIFT_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgJya1flift;
 
-typedef void (*BgJya1fliftActionFunc)(struct BgJya1flift*, PlayState*);
+typedef void (*BgJya1fliftActionFunc)(struct BgJya1flift*, struct PlayState*);
 
 typedef struct BgJya1flift {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c

@@ -5,6 +5,12 @@
  */
 
 #include "z_bg_jya_amishutter.h"
+
+#include "ichain.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_jya_obj/object_jya_obj.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.h

@@ -2,7 +2,7 @@
 #define Z_BG_JYA_AMISHUTTER_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgJyaAmishutter;
 

src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c

@@ -5,6 +5,13 @@
  */
 
 #include "z_bg_jya_bigmirror.h"
+#include "overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "sys_matrix.h"
+#include "z64play.h"
+
 #include "assets/objects/object_jya_obj/object_jya_obj.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h

@@ -2,8 +2,7 @@
 #define Z_BG_JYA_BIGMIRROR_H
 
 #include "ultra64.h"
-#include "global.h"
-#include "overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h"
+#include "z64actor.h"
 
 #define BIGMIR_PUZZLE_COBRA1_SOLVED (1 << 0)
 #define BIGMIR_PUZZLE_COBRA2_SOLVED (1 << 1)
@@ -15,7 +14,7 @@
 struct BgJyaBigmirror;
 
 typedef struct BigmirrorCobra {
-    /* 0x00 */ BgJyaCobra* cobra;
+    /* 0x00 */ struct BgJyaCobra* cobra;
     /* 0x04 */ s16 rotY;
 } BigmirrorCobra; // size = 0x08
 

src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c

@@ -5,6 +5,15 @@
  */
 
 #include "z_bg_jya_block.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "segmented_address.h"
+#include "sys_matrix.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h

@@ -2,7 +2,7 @@
 #define Z_BG_JYA_BLOCK_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgJyaBlock;
 

src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c

@@ -1,5 +1,17 @@
 #include "z_bg_jya_bombchuiwa.h"
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
+
+#include "libc64/qrand.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "one_point_cutscene.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/object_jya_obj/object_jya_obj.h"
 #define FLAGS ACTOR_FLAG_ATTENTION_ENABLED
 

src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h

@@ -2,11 +2,11 @@
 #define Z_BG_JYA_BOMBCHUIWA_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgJyaBombchuiwa;
 
-typedef void (*BgJyaBombchuiwaActionFunc)(struct BgJyaBombchuiwa*, PlayState*);
+typedef void (*BgJyaBombchuiwaActionFunc)(struct BgJyaBombchuiwa*, struct PlayState*);
 
 typedef struct BgJyaBombchuiwa {
     /* 0x0000 */ Actor actor;

src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c

@@ -6,8 +6,15 @@
 
 #include "z_bg_jya_bombiwa.h"
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
-#include "assets/objects/object_jya_obj/object_jya_obj.h"
+
+#include "libc64/qrand.h"
+#include "ichain.h"
+#include "sfx.h"
 #include "terminal.h"
+#include "z64effect.h"
+#include "z64play.h"
+
+#include "assets/objects/object_jya_obj/object_jya_obj.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h

@@ -2,7 +2,7 @@
 #define Z_BG_JYA_BOMBIWA_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 
 struct BgJyaBombiwa;

src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c

@@ -1,8 +1,18 @@
 #include "z_bg_jya_cobra.h"
 #include "overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h"
 #include "overlays/actors/ovl_Mir_Ray/z_mir_ray.h"
-#include "assets/objects/object_jya_obj/object_jya_obj.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "sfx.h"
+#include "sys_matrix.h"
 #include "terminal.h"
+#include "z_lib.h"
+#include "z64play.h"
+#include "z64player.h"
+
+#include "assets/objects/object_jya_obj/object_jya_obj.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 

src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h

@@ -2,11 +2,11 @@
 #define Z_BG_JYA_COBRA_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgJyaCobra;
 
-typedef void (*BgJyaCobraActionFunc)(struct BgJyaCobra*, PlayState*);
+typedef void (*BgJyaCobraActionFunc)(struct BgJyaCobra*, struct PlayState*);
 
 #define COBRA_SHADOW_TEX_WIDTH 64
 #define COBRA_SHADOW_TEX_HEIGHT 64

src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c

@@ -6,6 +6,13 @@
  */
 
 #include "z_bg_jya_goroiwa.h"
+
+#include "ichain.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/object_goroiwa/object_goroiwa.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h

@@ -2,11 +2,11 @@
 #define Z_BG_JYA_GOROIWA_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgJyaGoroiwa;
 
-typedef void (*BgJyaGoroiwaFunc)(struct BgJyaGoroiwa*, PlayState*);
+typedef void (*BgJyaGoroiwaFunc)(struct BgJyaGoroiwa*, struct PlayState*);
 
 typedef struct BgJyaGoroiwa {
     /* 0x0000 */ Actor actor;

src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c

@@ -6,6 +6,14 @@
 
 #include "z_bg_jya_haheniron.h"
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
+
+#include "libc64/qrand.h"
+#include "ichain.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/object_jya_iron/object_jya_iron.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h

@@ -2,11 +2,11 @@
 #define Z_BG_JYA_HAHENIRON_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgJyaHaheniron;
 
-typedef void (*BgJyaHahenironActionFunc)(struct BgJyaHaheniron*, PlayState*);
+typedef void (*BgJyaHahenironActionFunc)(struct BgJyaHaheniron*, struct PlayState*);
 
 typedef struct BgJyaHaheniron {
     /* 0x0000 */ Actor actor;

src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c

@@ -5,8 +5,15 @@
  */
 
 #include "z_bg_jya_kanaami.h"
-#include "assets/objects/object_jya_obj/object_jya_obj.h"
+
+#include "ichain.h"
+#include "one_point_cutscene.h"
 #include "quake.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64play.h"
+
+#include "assets/objects/object_jya_obj/object_jya_obj.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.h

@@ -2,11 +2,11 @@
 #define Z_BG_JYA_KANAAMI_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgJyaKanaami;
 
-typedef void (*BgJyaKanaamiActionFunc)(struct BgJyaKanaami*, PlayState*);
+typedef void (*BgJyaKanaamiActionFunc)(struct BgJyaKanaami*, struct PlayState*);
 
 typedef struct BgJyaKanaami {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c

@@ -5,6 +5,13 @@
  */
 
 #include "z_bg_jya_lift.h"
+
+#include "ichain.h"
+#include "one_point_cutscene.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_jya_obj/object_jya_obj.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h

@@ -2,10 +2,10 @@
 #define Z_BG_JYA_LIFT_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgJyaLift;
-typedef void (*BgJyaLiftActionFunc)(struct BgJyaLift*, PlayState*);
+typedef void (*BgJyaLiftActionFunc)(struct BgJyaLift*, struct PlayState*);
 
 typedef struct BgJyaLift {
     /* 0x000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c

@@ -6,6 +6,19 @@
 
 #include "z_bg_jya_megami.h"
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
+
+#include "libc64/qrand.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "one_point_cutscene.h"
+#include "segmented_address.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/object_jya_obj/object_jya_obj.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h

@@ -2,11 +2,11 @@
 #define Z_BG_JYA_MEGAMI_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgJyaMegami;
 
-typedef void (*BgJyaMegamiActionFunc)(struct BgJyaMegami*, PlayState*);
+typedef void (*BgJyaMegamiActionFunc)(struct BgJyaMegami*, struct PlayState*);
 
 typedef struct BgJyaMegamiPiece {
     /* 0x00 */ Vec3f pos;

src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c

@@ -5,8 +5,15 @@
  */
 
 #include "z_bg_jya_zurerukabe.h"
-#include "assets/objects/object_jya_obj/object_jya_obj.h"
+
+#include "ichain.h"
+#include "sfx.h"
 #include "terminal.h"
+#include "z_lib.h"
+#include "z64play.h"
+#include "z64player.h"
+
+#include "assets/objects/object_jya_obj/object_jya_obj.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 

src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h

@@ -2,11 +2,11 @@
 #define Z_BG_JYA_ZURERUKABE_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgJyaZurerukabe;
 
-typedef void (*BgJyaZurerukabeActionFunc)(struct BgJyaZurerukabe*, PlayState*);
+typedef void (*BgJyaZurerukabeActionFunc)(struct BgJyaZurerukabe*, struct PlayState*);
 
 typedef struct BgJyaZurerukabe {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c

@@ -5,6 +5,15 @@
  */
 
 #include "z_bg_menkuri_eye.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_menkuri_objects/object_menkuri_objects.h"
 
 #define FLAGS ACTOR_FLAG_DRAW_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h

@@ -2,7 +2,7 @@
 #define Z_BG_MENKURI_EYE_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgMenkuriEye;
 

src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c

@@ -5,6 +5,11 @@
  */
 
 #include "z_bg_menkuri_kaiten.h"
+
+#include "ichain.h"
+#include "sfx.h"
+#include "z64play.h"
+
 #include "assets/objects/object_menkuri_objects/object_menkuri_objects.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.h

@@ -2,7 +2,7 @@
 #define Z_BG_MENKURI_KAITEN_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgMenkuriKaiten;
 

src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c

@@ -5,6 +5,9 @@
  */
 
 #include "z_bg_menkuri_nisekabe.h"
+
+#include "z64play.h"
+
 #include "assets/objects/object_menkuri_objects/object_menkuri_objects.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.h

@@ -2,7 +2,7 @@
 #define Z_BG_MENKURI_NISEKABE_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgMenkuriNisekabe;
 

src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c

@@ -6,6 +6,16 @@
 
 #include "z_bg_mizu_bwall.h"
 #include "overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h"
+
+#include "libc64/qrand.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_mizu_objects/object_mizu_objects.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h

@@ -2,11 +2,11 @@
 #define Z_BG_MIZU_BWALL_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgMizuBwall;
 
-typedef void (*BgMizuBwallActionFunc)(struct BgMizuBwall*, PlayState*);
+typedef void (*BgMizuBwallActionFunc)(struct BgMizuBwall*, struct PlayState*);
 
 typedef struct BgMizuBwall {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c

@@ -6,6 +6,16 @@
 
 #include "z_bg_mizu_movebg.h"
 #include "overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "segmented_address.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_mizu_objects/object_mizu_objects.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h

@@ -2,7 +2,7 @@
 #define Z_BG_MIZU_MOVEBG_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 typedef enum BgMizuMovebgType {
     /* 0 */ MIZUMOVEBG_TYPE_FLOATING_PLATFORM_OUTSIDE_CENTER_PILLAR,
@@ -18,7 +18,7 @@ typedef enum BgMizuMovebgType {
 
 struct BgMizuMovebg;
 
-typedef void (*BgMizuMovebgActionFunc)(struct BgMizuMovebg*, PlayState*);
+typedef void (*BgMizuMovebgActionFunc)(struct BgMizuMovebg*, struct PlayState*);
 
 typedef struct BgMizuMovebg {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c

@@ -1,4 +1,15 @@
 #include "z_bg_mizu_shutter.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "one_point_cutscene.h"
+#include "rumble.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_mizu_objects/object_mizu_objects.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h

@@ -2,7 +2,7 @@
 #define Z_BG_MIZU_SHUTTER_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 #define BGMIZUSHUTTER_GET_SIZE(thisx)   PARAMS_GET_U((u16)(thisx)->params, 12, 4)
 #define BGMIZUSHUTTER_GET_TIMER(thisx)  PARAMS_GET_U((u16)(thisx)->params,  6, 6)
@@ -12,7 +12,7 @@
 
 struct BgMizuShutter;
 
-typedef void (*BgMizuShutterActionFunc)(struct BgMizuShutter*, PlayState*);
+typedef void (*BgMizuShutterActionFunc)(struct BgMizuShutter*, struct PlayState*);
 
 typedef struct BgMizuShutter {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c

@@ -5,6 +5,12 @@
  */
 
 #include "z_bg_mizu_uzu.h"
+
+#include "ichain.h"
+#include "sfx.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/object_mizu_objects/object_mizu_objects.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.h

@@ -2,11 +2,11 @@
 #define Z_BG_MIZU_UZU_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgMizuUzu;
 
-typedef void (*BgMizuUzuActionFunc)(struct BgMizuUzu*, PlayState*);
+typedef void (*BgMizuUzuActionFunc)(struct BgMizuUzu*, struct PlayState*);
 
 typedef struct BgMizuUzu {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c

@@ -5,6 +5,18 @@
  */
 
 #include "z_bg_mizu_water.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "one_point_cutscene.h"
+#include "regs.h"
+#include "rumble.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_mizu_objects/object_mizu_objects.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h

@@ -2,11 +2,11 @@
 #define Z_BG_MIZU_WATER_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgMizuWater;
 
-typedef void (*BgMizuWaterActionFunc)(struct BgMizuWater*, PlayState*);
+typedef void (*BgMizuWaterActionFunc)(struct BgMizuWater*, struct PlayState*);
 
 typedef struct BgMizuWater {
     /* 0x0000 */ Actor actor;

src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c

@@ -5,6 +5,14 @@
  */
 
 #include "z_bg_mjin.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "segmented_address.h"
+#include "sys_matrix.h"
+#include "z64play.h"
+
 #include "assets/objects/object_mjin/object_mjin.h"
 #include "assets/objects/object_mjin_wind/object_mjin_wind.h"
 #include "assets/objects/object_mjin_soul/object_mjin_soul.h"

src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h

@@ -2,11 +2,11 @@
 #define Z_BG_MJIN_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgMjin;
 
-typedef void (*BgMjinActionFunc)(struct BgMjin*, PlayState*);
+typedef void (*BgMjinActionFunc)(struct BgMjin*, struct PlayState*);
 
 typedef struct BgMjin {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c

@@ -5,8 +5,18 @@
  */
 
 #include "z_bg_mori_bigst.h"
-#include "assets/objects/object_mori_objects/object_mori_objects.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "one_point_cutscene.h"
 #include "quake.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z64play.h"
+#include "z64player.h"
+
+#include "assets/objects/object_mori_objects/object_mori_objects.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 

src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h

@@ -2,11 +2,11 @@
 #define Z_BG_MORI_BIGST_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgMoriBigst;
 
-typedef void (*BgMoriBigstActionFunc)(struct BgMoriBigst*, PlayState*);
+typedef void (*BgMoriBigstActionFunc)(struct BgMoriBigst*, struct PlayState*);
 
 typedef struct BgMoriBigst {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c

@@ -1,4 +1,15 @@
 #include "z_bg_mori_elevator.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "one_point_cutscene.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z64audio.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/object_mori_objects/object_mori_objects.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h

@@ -2,11 +2,11 @@
 #define Z_BG_MORI_ELEVATOR_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgMoriElevator;
 
-typedef void (*BgMoriElevatorActionFunc)(struct BgMoriElevator*, PlayState*);
+typedef void (*BgMoriElevatorActionFunc)(struct BgMoriElevator*, struct PlayState*);
 
 typedef struct BgMoriElevator {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c

@@ -5,6 +5,20 @@
  */
 
 #include "z_bg_po_event.h"
+
+#include "libc64/qrand.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "one_point_cutscene.h"
+#include "rand.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/object_po_sisters/object_po_sisters.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h

@@ -2,11 +2,11 @@
 #define Z_BG_PO_EVENT_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgPoEvent;
 
-typedef void (*BgPoEventActionFunc)(struct BgPoEvent*, PlayState*);
+typedef void (*BgPoEventActionFunc)(struct BgPoEvent*, struct PlayState*);
 
 typedef struct BgPoEvent {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Boss_Fd/z_boss_fd_colchk.inc.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "z64collision_check.h"
 
 static ColliderJntSphElementInit sJntSphItemsInit[19] = {
     {

src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2_colchk.inc.c

@@ -1,4 +1,4 @@
-#include "global.h"
+#include "z64collision_check.h"
 
 static ColliderJntSphElementInit sJntSphElementsInit[9] = {
     {

src/overlays/actors/ovl_Boss_Mo/z_boss_mo_colchk.inc.c

@@ -1,5 +1,4 @@
-#include "global.h"
-#include "z_boss_mo.h"
+#include "z64collision_check.h"
 
 static ColliderJntSphElementInit sJntSphElementsInit[19] = {
     {

src/overlays/actors/ovl_Boss_Sst/z_boss_sst_colchk.inc.c

@@ -1,4 +1,4 @@
-#include "z_boss_sst.h"
+#include "z64collision_check.h"
 
 static ColliderJntSphElementInit sJntSphItemsInitHand[11] = {
     {

src/overlays/actors/ovl_En_Elf/z_en_elf.c

@@ -5,7 +5,28 @@
  */
 
 #include "z_en_elf.h"
+#include "overlays/actors/ovl_Elf_Msg/z_elf_msg.h"
+
+#include "libc64/qrand.h"
+#include "libu64/debug.h"
+#include "attributes.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "rand.h"
+#include "regs.h"
+#include "sfx.h"
+#include "sys_math.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64audio.h"
+#include "z64effect.h"
+#include "z64light.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "global.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)

src/overlays/actors/ovl_En_Elf/z_en_elf.h

@@ -4,7 +4,6 @@
 #include "ultra64.h"
 #include "z64actor.h"
 #include "z64light.h"
-#include "overlays/actors/ovl_Elf_Msg/z_elf_msg.h"
 
 struct EnElf;
 
@@ -23,7 +22,7 @@ typedef struct EnElf {
     /* 0x0278 */ LightInfo lightInfoNoGlow;
     /* 0x0288 */ LightNode* lightNodeNoGlow;
     /* 0x028C */ Vec3f unk_28C;
-    /* 0x0298 */ ElfMsg* elfMsg;
+    /* 0x0298 */ struct ElfMsg* elfMsg;
     /* 0x029C */ f32 unk_29C;
     /* 0x02A0 */ f32 unk_2A0;
     /* 0x02A4 */ f32 unk_2A4;

src/overlays/actors/ovl_En_GirlA/z_en_girla.c

@@ -5,8 +5,13 @@
  */
 
 #include "z_en_girla.h"
+
+#include "rand.h"
+#include "sys_matrix.h"
 #include "terminal.h"
+#include "z_lib.h"
 #include "z64draw.h"
+#include "z64play.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED)
 

src/overlays/actors/ovl_En_GirlA/z_en_girla.h

@@ -2,14 +2,14 @@
 #define Z_EN_GIRLA_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct EnGirlA;
 
-typedef void (*EnGirlAActionFunc)(struct EnGirlA*, PlayState*);
-typedef void (*EnGirlA2Func)(PlayState*, struct EnGirlA*);
-typedef void (*EnGirlA3Func)(Actor*, PlayState*, s32);
-typedef s32 (*EnGirlA4Func)(PlayState*, struct EnGirlA*);
+typedef void (*EnGirlAActionFunc)(struct EnGirlA*, struct PlayState*);
+typedef void (*EnGirlA2Func)(struct PlayState*, struct EnGirlA*);
+typedef void (*EnGirlA3Func)(Actor*, struct PlayState*, s32);
+typedef s32 (*EnGirlA4Func)(struct PlayState*, struct EnGirlA*);
 
 typedef struct EnGirlA {
     /* 0x0000 */ Actor actor;

src/overlays/actors/ovl_En_Horse/z_en_horse.c

@@ -5,10 +5,32 @@
  */
 
 #include "z_en_horse.h"
-#include "z64horse.h"
-#include "global.h"
-#include "versions.h"
 #include "overlays/actors/ovl_En_In/z_en_in.h"
+
+#include "libc64/math64.h"
+#include "libc64/qrand.h"
+#include "controller.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "regs.h"
+#include "rumble.h"
+#include "segmented_address.h"
+#include "seqcmd.h"
+#include "sequence.h"
+#include "sfx.h"
+#include "sys_math3d.h"
+#include "versions.h"
+#include "z_lib.h"
+#include "z64audio.h"
+#include "z64effect.h"
+#include "z64horse.h"
+#include "z64play.h"
+#include "z64player.h"
+#include "z64skin_matrix.h"
+
+#include "global.h"
+
 #include "assets/objects/object_horse/object_horse.h"
 #include "assets/objects/object_hni/object_hni.h"
 #include "assets/scenes/overworld/spot09/spot09_scene.h"

src/overlays/actors/ovl_En_In/z_en_in.c

@@ -1,6 +1,23 @@
 #include "z_en_in.h"
-#include "versions.h"
 #include "overlays/actors/ovl_En_Horse/z_en_horse.h"
+
+#include "libc64/qrand.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "letterbox.h"
+#include "regs.h"
+#include "segmented_address.h"
+#include "sequence.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "versions.h"
+#include "z_lib.h"
+#include "z64audio.h"
+#include "z64play.h"
+#include "z64player.h"
+
+#include "global.h"
+
 #include "assets/objects/object_in/object_in.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED)

src/overlays/actors/ovl_En_In/z_en_in.h

@@ -2,11 +2,11 @@
 #define Z_EN_IN_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct EnIn;
 
-typedef void (*EnInActionFunc)(struct EnIn*, PlayState*);
+typedef void (*EnInActionFunc)(struct EnIn*, struct PlayState*);
 
 typedef enum IngoLimb {
     /* 0x00 */ INGO_LIMB_NONE,

src/overlays/actors/ovl_En_Ossan/z_en_ossan.c

@@ -1,5 +1,21 @@
 #include "z_en_ossan.h"
+#include "overlays/actors/ovl_En_Elf/z_en_elf.h"
+#include "overlays/actors/ovl_En_GirlA/z_en_girla.h"
+#include "overlays/actors/ovl_En_Tana/z_en_tana.h"
+
+#include "libc64/qrand.h"
+#include "controller.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "regs.h"
+#include "segmented_address.h"
+#include "sfx.h"
 #include "terminal.h"
+#include "z_lib.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_ossan/object_ossan.h"
 #include "assets/objects/object_oF1d_map/object_oF1d_map.h"
@@ -7,7 +23,6 @@
 #include "assets/objects/object_zo/object_zo.h"
 #include "assets/objects/object_rs/object_rs.h"
 #include "assets/objects/object_ds2/object_ds2.h"
-#include "overlays/actors/ovl_En_Elf/z_en_elf.h"
 #include "assets/objects/object_masterkokiri/object_masterkokiri.h"
 #include "assets/objects/object_km1/object_km1.h"
 #include "assets/objects/object_mastergolon/object_mastergolon.h"

src/overlays/actors/ovl_En_Ossan/z_en_ossan.h

@@ -2,17 +2,15 @@
 #define Z_EN_OSSAN_H
 
 #include "ultra64.h"
-#include "global.h"
-#include "overlays/actors/ovl_En_Tana/z_en_tana.h"
-#include "overlays/actors/ovl_En_GirlA/z_en_girla.h"
+#include "z64actor.h"
 
 struct EnOssan;
 
-typedef void (*EnOssanActionFunc)(struct EnOssan*, PlayState*);
-typedef void (*EnOssanTalkOwnerFunc)(PlayState*);
-typedef void (*EnOssanInitFunc)(struct EnOssan*, PlayState*);
+typedef void (*EnOssanActionFunc)(struct EnOssan*, struct PlayState*);
+typedef void (*EnOssanTalkOwnerFunc)(struct PlayState*);
+typedef void (*EnOssanInitFunc)(struct EnOssan*, struct PlayState*);
 typedef s16 (*EnOssanGetGirlAParamsFunc)(s16);
-typedef void (*EnOssanStateFunc)(struct EnOssan*, PlayState*, Player*);
+typedef void (*EnOssanStateFunc)(struct EnOssan*, struct PlayState*, struct Player*);
 
 typedef struct StickDirectionPrompt {
     /* 0x00 */ u32 stickColorR;
@@ -37,7 +35,7 @@ typedef struct EnOssan {
     /* 0x0000 */ Actor actor;
     /* 0x014C */ SkelAnime skelAnime;
     /* 0x0190 */ EnOssanActionFunc actionFunc;
-    /* 0x0194 */ void (*obj3ToSeg6Func)(struct EnOssan*, PlayState*);
+    /* 0x0194 */ void (*obj3ToSeg6Func)(struct EnOssan*, struct PlayState*);
     /* 0x0198 */ ColliderCylinder collider; // unused
     /* 0x01E4 */ s16 timer;
     /* 0x01E6 */ s16 delayTimer;
@@ -53,11 +51,11 @@ typedef struct EnOssan {
     /* 0x01F8 */ void (*blinkFunc)(struct EnOssan*);
     /* 0x01FC */ s16 stateFlag;
     /* 0x01FE */ s16 tempStateFlag;
-    /* 0x0200 */ EnGirlA* shelfSlots[8];
+    /* 0x0200 */ struct EnGirlA* shelfSlots[8];
     // Shelves are indexed as such:
     /* 7 5  3 1 */
     /* 6 4  2 0 */
-    /* 0x0220 */ EnTana* shelves;
+    /* 0x0220 */ struct EnTana* shelves;
     /* 0x0224 */ s32 stickAccumX;
     /* 0x0228 */ s32 stickAccumY;
     /* 0x022C */ u8 moveHorizontal;

src/overlays/actors/ovl_En_Part/z_en_part.c

@@ -5,6 +5,20 @@
  */
 
 #include "z_en_part.h"
+
+#include "libc64/qrand.h"
+#include "attributes.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "rand.h"
+#include "segmented_address.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/object_tite/object_tite.h"
 #include "assets/objects/object_ik/object_ik.h"
 

src/overlays/actors/ovl_En_Part/z_en_part.h

@@ -2,11 +2,11 @@
 #define Z_EN_PART_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct EnPart;
 
-typedef void (*EnPartActionFunc)(struct EnPart*, PlayState*);
+typedef void (*EnPartActionFunc)(struct EnPart*, struct PlayState*);
 
 typedef struct EnPart {
     /* 0x000 */ Actor actor;

src/overlays/actors/ovl_En_Tana/z_en_tana.c

@@ -5,6 +5,13 @@
  */
 
 #include "z_en_tana.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "segmented_address.h"
+#include "sys_matrix.h"
+#include "z64play.h"
+
 #include "assets/objects/object_shop_dungen/object_shop_dungen.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)

src/overlays/actors/ovl_En_Tana/z_en_tana.h

@@ -2,7 +2,7 @@
 #define Z_EN_TANA_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct EnTana;
 

src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c

@@ -6,6 +6,7 @@
 
 #include "z_item_inbox.h"
 #include "z64draw.h"
+#include "z64play.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)
 

src/overlays/actors/ovl_Item_Inbox/z_item_inbox.h

@@ -2,11 +2,11 @@
 #define Z_ITEM_INBOX_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct ItemInbox;
 
-typedef void (*ItemInboxActionFunc)(struct ItemInbox*, PlayState*);
+typedef void (*ItemInboxActionFunc)(struct ItemInbox*, struct PlayState*);
 
 typedef struct ItemInbox {
     /* 0x0000 */ Actor actor;

src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c

@@ -5,7 +5,14 @@
  */
 
 #include "z_item_ocarina.h"
+
+#include "libu64/debug.h"
+#include "segmented_address.h"
+#include "sfx.h"
 #include "z64draw.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/scenes/overworld/spot00/spot00_scene.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h

@@ -2,11 +2,11 @@
 #define Z_ITEM_OCARINA_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct ItemOcarina;
 
-typedef void (*ItemOcarinaActionFunc)(struct ItemOcarina*, PlayState*);
+typedef void (*ItemOcarinaActionFunc)(struct ItemOcarina*, struct PlayState*);
 
 typedef struct ItemOcarina {
     /* 0x0000 */ Actor actor;

src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c

@@ -5,6 +5,19 @@
  */
 
 #include "z_mir_ray.h"
+
+#include "libu64/debug.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "sfx.h"
+#include "sys_math3d.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64light.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/object_mir_ray/object_mir_ray.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h

@@ -2,7 +2,8 @@
 #define Z_MIR_RAY_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
+#include "z64light.h"
 
 struct MirRay;
 
@@ -22,7 +23,7 @@ typedef struct MirRayDataEntry {
 typedef struct MirRayShieldReflection {
     /* 0x00 */ Vec3f pos;
     /* 0x0C */ MtxF mtx;
-    /* 0x4C */ CollisionPoly* reflectionPoly;
+    /* 0x4C */ struct CollisionPoly* reflectionPoly;
     /* 0x50 */ u8 opacity;
 } MirRayShieldReflection; // size = 0x54
 

src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c

@@ -7,6 +7,10 @@
 #include "z_obj_mure.h"
 #include "overlays/actors/ovl_En_Insect/z_en_insect.h"
 
+#include "libc64/qrand.h"
+#include "ichain.h"
+#include "z64play.h"
+
 #define FLAGS 0
 
 void ObjMure_Init(Actor* thisx, PlayState* play);

src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h

@@ -2,11 +2,11 @@
 #define Z_OBJ_MURE_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct ObjMure;
 
-typedef void (*ObjMureActionFunc)(struct ObjMure*, PlayState*);
+typedef void (*ObjMureActionFunc)(struct ObjMure*, struct PlayState*);
 
 #define OBJMURE_MAX_SPAWNS 15
 

src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c

@@ -6,6 +6,14 @@
 
 #include "z_oceff_storm.h"
 
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "sys_matrix.h"
+#include "z64play.h"
+#include "z64player.h"
+
+#include "global.h"
+
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
 
 void OceffStorm_Init(Actor* thisx, PlayState* play);

src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h

@@ -2,11 +2,11 @@
 #define Z_OCEFF_STORM_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct OceffStorm;
 
-typedef void (*OceffStormActionFunc)(struct OceffStorm*, PlayState*);
+typedef void (*OceffStormActionFunc)(struct OceffStorm*, struct PlayState*);
 
 typedef struct OceffStorm {
     /* 0x0000 */ Actor actor;

src/overlays/actors/ovl_player_actor/z_player.c

@@ -4,12 +4,6 @@
  * Description: Link
  */
 
-#include "ultra64.h"
-#include "global.h"
-#include "quake.h"
-#include "versions.h"
-#include "z_en_item00.h"
-
 #include "overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h"
 #include "overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h"
 #include "overlays/actors/ovl_En_Boom/z_en_boom.h"
@@ -21,6 +15,38 @@
 #include "overlays/actors/ovl_En_Horse/z_en_horse.h"
 #include "overlays/actors/ovl_En_Insect/z_en_insect.h"
 #include "overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h"
+
+#include "libc64/qrand.h"
+#include "libu64/debug.h"
+#include "controller.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "letterbox.h"
+#include "map.h"
+#include "one_point_cutscene.h"
+#include "quake.h"
+#include "rand.h"
+#include "regs.h"
+#include "rumble.h"
+#include "sequence.h"
+#include "sfx.h"
+#include "sys_math.h"
+#include "sys_math3d.h"
+#include "sys_matrix.h"
+#include "ultra64.h"
+#include "versions.h"
+#include "z_en_item00.h"
+#include "z_lib.h"
+#include "zelda_arena.h"
+#include "z64audio.h"
+#include "z64effect.h"
+#include "z64ocarina.h"
+#include "z64play.h"
+#include "z64skin_matrix.h"
+
+#include "global.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_link_child/object_link_child.h"
 

src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c

@@ -5,6 +5,15 @@
  */
 
 #include "z_eff_ss_blast.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "segmented_address.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define rInnerColorR regs[0]

src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.h

@@ -2,7 +2,8 @@
 #define Z_EFF_SS_BLAST_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "color.h"
+#include "z64math.h"
 
 typedef struct EffectSsBlastParams {
     /* 0x00 */ Vec3f pos;

src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c

@@ -5,6 +5,17 @@
  */
 
 #include "z_eff_ss_bomb.h"
+
+#include "libc64/qrand.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "segmented_address.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64skin_matrix.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define EFFSSBOMB_LIFESPAN 20