Reduce overlay dependencies on global.h (5) (#2466)

* remove global.h dependency from all actors

* fix compiler error

* fix another build issue

* fix bss

include/z64.h

@@ -32,7 +32,6 @@
 #include "z64math.h"
 #include "z64map_mark.h"
 #include "z64message.h"
-#include "z64olib.h"
 #include "one_point_cutscene.h"
 #include "z64pause.h"
 #include "z64play.h"

include/z64actor.h

@@ -732,6 +732,8 @@ typedef struct NpcInteractInfo {
 #define TRANSITION_ACTOR_PARAMS_INDEX_SHIFT 10
 #define GET_TRANSITION_ACTOR_INDEX(actor) PARAMS_GET_NOMASK((u16)(actor)->params, 10)
 
+extern Gfx D_80116280[];
+
 void ActorShape_Init(ActorShape* shape, f32 yOffset, ActorShadowFunc shadowDraw, f32 shadowScale);
 void ActorShadow_DrawCircle(Actor* actor, struct Lights* lights, struct PlayState* play);
 void ActorShadow_DrawWhiteCircle(Actor* actor, struct Lights* lights, struct PlayState* play);

src/code/db_camera.c

@@ -1,5 +1,6 @@
 #include "global.h"
 #include "z64debug_display.h"
+#include "z64olib.h"
 
 #define DEBUG_CAM_CONTROLLER_PORT 2
 

src/code/main.c

@@ -24,7 +24,7 @@ extern struct IrqMgr gIrqMgr;
 #endif
 
 #pragma increment_block_number "gc-eu:144 gc-eu-mq:144 gc-jp:144 gc-jp-ce:144 gc-jp-mq:144 gc-us:144 gc-us-mq:144" \
-                               "ique-cn:160 ntsc-1.0:136 ntsc-1.1:136 ntsc-1.2:136 pal-1.0:134 pal-1.1:134"
+                               "ique-cn:160 ntsc-1.0:137 ntsc-1.1:137 ntsc-1.2:137 pal-1.0:135 pal-1.1:135"
 
 extern u8 _buffersSegmentEnd[];
 

src/code/z_camera.c

@@ -2,6 +2,7 @@
 #include "global.h"
 #include "quake.h"
 #include "terminal.h"
+#include "z64olib.h"
 #include "overlays/actors/ovl_En_Horse/z_en_horse.h"
 
 #pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \

src/code/z_kankyo.c

@@ -1,5 +1,5 @@
 #pragma increment_block_number "gc-eu:224 gc-eu-mq:224 gc-jp:208 gc-jp-ce:208 gc-jp-mq:208 gc-us:208 gc-us-mq:208" \
-                               "ique-cn:208 ntsc-1.0:208 ntsc-1.1:208 ntsc-1.2:208 pal-1.0:232 pal-1.1:232"
+                               "ique-cn:208 ntsc-1.0:224 ntsc-1.1:224 ntsc-1.2:224 pal-1.0:232 pal-1.1:232"
 
 #include "global.h"
 #include "ultra64.h"

src/code/z_onepointdemo.c

@@ -2,6 +2,7 @@
 #include "quake.h"
 #include "terminal.h"
 #include "versions.h"
+#include "z64olib.h"
 #include "overlays/actors/ovl_En_Sw/z_en_sw.h"
 
 static s16 sDisableAttention = false;

src/code/z_path.c

@@ -1,4 +1,7 @@
-#include "global.h"
+#include "ultra64.h"
+#include "libc64/math64.h"
+#include "segmented_address.h"
+#include "z64play.h"
 
 Path* Path_GetByIndex(PlayState* play, s16 index, s16 max) {
     Path* path;

src/code/z_quake.c

@@ -1,6 +1,10 @@
-#include "global.h"
+#include "libc64/qrand.h"
+#include "macros.h"
 #include "quake.h"
 #include "terminal.h"
+#include "z_lib.h"
+#include "z64olib.h"
+#include "z64play.h"
 
 typedef struct QuakeRequest {
     /* 0x00 */ s16 index;

src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h

@@ -4,7 +4,6 @@
 #include "ultra64.h"
 #include "z64actor.h"
 
-
 struct BgJyaBombiwa;
 
 typedef struct BgJyaBombiwa {

src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c

@@ -5,6 +5,14 @@
  */
 
 #include "z_bg_mori_hashigo.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_mori_objects/object_mori_objects.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h

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

src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c

@@ -5,6 +5,16 @@
  */
 
 #include "z_bg_mori_hashira4.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 "z64play.h"
+
 #include "assets/objects/object_mori_objects/object_mori_objects.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h

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

src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c

@@ -5,7 +5,19 @@
  */
 
 #include "z_bg_mori_hineri.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "one_point_cutscene.h"
+#include "sfx.h"
+#include "sys_matrix.h"
 #include "versions.h"
+#include "z_lib.h"
+#include "z64curve.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_box/object_box.h"
 #include "assets/objects/object_mori_hineri1/object_mori_hineri1.h"

src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.h

@@ -2,14 +2,14 @@
 #define Z_BG_MORI_HINERI_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgMoriHineri;
 
 // Due to a unique access pattern, this param cannot use the generic "PARAMS_GET_U" macros
 #define TWISTED_HALLWAY_GET_PARAM_15(thisx) (((thisx)->params & (NBITS_TO_MASK(1) << (15))) >> ((15) - (1)))
 
-typedef void (*BgMoriHineriActionFunc)(struct BgMoriHineri*, PlayState*);
+typedef void (*BgMoriHineriActionFunc)(struct BgMoriHineri*, struct PlayState*);
 
 typedef struct BgMoriHineri {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c

@@ -5,6 +5,15 @@
  */
 
 #include "z_bg_mori_idomizu.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "one_point_cutscene.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_mori_objects/object_mori_objects.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h

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

src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c

@@ -5,6 +5,16 @@
  */
 
 #include "z_bg_mori_kaitenkabe.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 "z64player.h"
+
 #include "assets/objects/object_mori_objects/object_mori_objects.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h

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

src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c

@@ -5,8 +5,19 @@
  */
 
 #include "z_bg_mori_rakkatenjo.h"
-#include "assets/objects/object_mori_objects/object_mori_objects.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
 #include "quake.h"
+#include "rumble.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64play.h"
+#include "z64player.h"
+
+#include "assets/objects/object_mori_objects/object_mori_objects.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
 

src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h

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

src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c

@@ -5,6 +5,16 @@
  */
 
 #include "z_bg_po_syokudai.h"
+
+#include "libc64/qrand.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z64light.h"
+#include "z64play.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_syokudai/object_syokudai.h"
 

src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h

@@ -2,7 +2,8 @@
 #define Z_BG_PO_SYOKUDAI_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
+#include "z64light.h"
 
 struct BgPoSyokudai;
 

src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c

@@ -5,6 +5,14 @@
  */
 
 #include "z_bg_pushbox.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_pu_box/object_pu_box.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.h

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

src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c

@@ -5,6 +5,17 @@
  */
 
 #include "z_bg_relay_objects.h"
+
+#include "ichain.h"
+#include "rumble.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64audio.h"
+#include "z64play.h"
+#include "z64player.h"
+
+#include "global.h"
+
 #include "assets/objects/object_relay_objects/object_relay_objects.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.h

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

src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c

@@ -5,6 +5,10 @@
  */
 
 #include "z_bg_spot00_break.h"
+
+#include "ichain.h"
+#include "z64play.h"
+
 #include "assets/objects/object_spot00_break/object_spot00_break.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.h

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

src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c

@@ -5,8 +5,22 @@
  */
 
 #include "z_bg_spot00_hanebasi.h"
-#include "assets/objects/object_spot00_objects/object_spot00_objects.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 "z64light.h"
+#include "z64play.h"
+#include "z64player.h"
+
+#include "global.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/object_spot00_objects/object_spot00_objects.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 

src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h

@@ -2,11 +2,12 @@
 #define Z_BG_SPOT00_HANEBASI_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
+#include "z64light.h"
 
 struct BgSpot00Hanebasi;
 
-typedef void (*BgSpot00HanebasiActionFunc)(struct BgSpot00Hanebasi*, PlayState*);
+typedef void (*BgSpot00HanebasiActionFunc)(struct BgSpot00Hanebasi*, struct PlayState*);
 
 typedef struct BgSpot00Hanebasi {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c

@@ -5,6 +5,15 @@
  */
 
 #include "z_bg_spot01_fusya.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64audio.h"
+#include "z64play.h"
+
 #include "assets/objects/object_spot01_objects/object_spot01_objects.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.h

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

src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c

@@ -5,8 +5,19 @@
  */
 
 #include "z_bg_spot01_idohashira.h"
-#include "assets/objects/object_spot01_objects/object_spot01_objects.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "regs.h"
+#include "sfx.h"
+#include "sys_matrix.h"
 #include "terminal.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+
+#include "assets/objects/object_spot01_objects/object_spot01_objects.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 

src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.h

@@ -2,12 +2,12 @@
 #define Z_BG_SPOT01_IDOHASHIRA_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgSpot01Idohashira;
 
-typedef void (*BgSpot01IdohashiraActionFunc)(struct BgSpot01Idohashira*, PlayState*);
-typedef void (*BgSpot01IdohashiraDrawFunc)(struct BgSpot01Idohashira*, PlayState*);
+typedef void (*BgSpot01IdohashiraActionFunc)(struct BgSpot01Idohashira*, struct PlayState*);
+typedef void (*BgSpot01IdohashiraDrawFunc)(struct BgSpot01Idohashira*, struct PlayState*);
 
 typedef struct BgSpot01Idohashira {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c

@@ -5,6 +5,15 @@
  */
 
 #include "z_bg_spot01_idomizu.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_spot01_objects/object_spot01_objects.h"
 
 #define FLAGS ACTOR_FLAG_DRAW_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h

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

src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c

@@ -5,6 +5,13 @@
  */
 
 #include "z_bg_spot01_idosoko.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "sys_matrix.h"
+#include "z64play.h"
+
 #include "assets/objects/object_spot01_matoya/object_spot01_matoya.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.h

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

src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c

@@ -5,6 +5,11 @@
  */
 
 #include "z_bg_spot01_objects2.h"
+
+#include "ichain.h"
+#include "segmented_address.h"
+#include "z64play.h"
+
 #include "assets/objects/object_spot01_matoya/object_spot01_matoya.h"
 #include "assets/objects/object_spot01_matoyab/object_spot01_matoyab.h"
 

src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h

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

src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c

@@ -5,6 +5,19 @@
  */
 
 #include "z_bg_spot02_objects.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 "z64player.h"
+
 #include "assets/objects/object_spot02_objects/object_spot02_objects.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h

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

src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c

@@ -5,6 +5,16 @@
  */
 
 #include "z_bg_spot03_taki.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "one_point_cutscene.h"
+#include "segmented_address.h"
+#include "sys_matrix.h"
+#include "z64audio.h"
+#include "z64play.h"
+
 #include "assets/objects/object_spot03_object/object_spot03_object.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h

@@ -2,7 +2,7 @@
 #define Z_BG_SPOT03_TAKI_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 typedef enum BgSpot03TakiState {
     WATERFALL_CLOSED,
@@ -14,7 +14,7 @@ typedef enum BgSpot03TakiState {
 
 struct BgSpot03Taki;
 
-typedef void (*BgSpot03TakiActionFunc)(struct BgSpot03Taki*, PlayState*);
+typedef void (*BgSpot03TakiActionFunc)(struct BgSpot03Taki*, struct PlayState*);
 
 typedef struct BgSpot03Taki {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c

@@ -5,6 +5,13 @@
  */
 
 #include "z_bg_spot05_soko.h"
+
+#include "ichain.h"
+#include "one_point_cutscene.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_spot05_objects/object_spot05_objects.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.h

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

src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c

@@ -5,6 +5,18 @@
  */
 
 #include "z_bg_spot06_objects.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 "assets/objects/object_spot06_objects/object_spot06_objects.h"
 
 #define FLAGS ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR

src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h

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

src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c

@@ -5,7 +5,14 @@
  */
 
 #include "z_bg_spot07_taki.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "sys_matrix.h"
 #include "versions.h"
+#include "z64play.h"
+
 #include "assets/objects/object_spot07_object/object_spot07_object.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.h

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

src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c

@@ -5,9 +5,17 @@
  */
 
 #include "z_bg_spot08_bakudankabe.h"
-#include "assets/objects/object_spot08_obj/object_spot08_obj.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/gameplay_field_keep/gameplay_field_keep.h"
+#include "assets/objects/object_spot08_obj/object_spot08_obj.h"
 
 #define FLAGS ACTOR_FLAG_IGNORE_POINT_LIGHTS
 

src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.h

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

src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c

@@ -5,6 +5,13 @@
  */
 
 #include "z_bg_spot09_obj.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "sys_matrix.h"
+#include "z64play.h"
+
 #include "assets/objects/object_spot09_obj/object_spot09_obj.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.h

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

src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c

@@ -6,6 +6,13 @@
 
 #include "z_bg_spot11_bakudankabe.h"
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
+
+#include "libc64/qrand.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/object_spot11_obj/object_spot11_obj.h"
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
 

src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.h

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

src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c

@@ -6,6 +6,22 @@
 
 #include "z_bg_spot11_oasis.h"
 #include "overlays/actors/ovl_En_Elf/z_en_elf.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_math3d.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64player.h"
+
+#include "global.h"
+
 #include "assets/objects/object_spot11_obj/object_spot11_obj.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.h

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

src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c

@@ -5,8 +5,15 @@
  */
 
 #include "z_bg_spot12_gate.h"
-#include "assets/objects/object_spot12_obj/object_spot12_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_spot12_obj/object_spot12_obj.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.h

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

src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c

@@ -5,6 +5,13 @@
  */
 
 #include "z_bg_spot12_saku.h"
+
+#include "ichain.h"
+#include "one_point_cutscene.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_spot12_obj/object_spot12_obj.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.h

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

src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c

@@ -5,6 +5,14 @@
  */
 
 #include "z_bg_spot15_rrbox.h"
+
+#include "ichain.h"
+#include "sfx.h"
+#include "sys_math3d.h"
+#include "z_lib.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/object_spot15_obj/object_spot15_obj.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h

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

src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c

@@ -5,6 +5,13 @@
  */
 
 #include "z_bg_spot15_saku.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z64play.h"
+
 #include "assets/objects/object_spot15_obj/object_spot15_obj.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h

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

src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c

@@ -1,9 +1,24 @@
 #include "z_bg_spot16_bombstone.h"
-#include "assets/objects/object_spot16_obj/object_spot16_obj.h"
-#include "assets/objects/object_bombiwa/object_bombiwa.h"
 #include "overlays/actors/ovl_En_Bombf/z_en_bombf.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 "regs.h"
+#include "sfx.h"
+#include "sys_math3d.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64player.h"
+
+#include "assets/objects/object_spot16_obj/object_spot16_obj.h"
+#include "assets/objects/object_bombiwa/object_bombiwa.h"
+
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 
 void BgSpot16Bombstone_Init(Actor* thisx, PlayState* play);

src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h

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

src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c

@@ -5,8 +5,15 @@
  */
 
 #include "z_bg_spot16_doughnut.h"
-#include "assets/objects/object_efc_doughnut/object_efc_doughnut.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "sys_matrix.h"
 #include "terminal.h"
+#include "z64play.h"
+
+#include "assets/objects/object_efc_doughnut/object_efc_doughnut.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h

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

src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c

@@ -6,6 +6,17 @@
 
 #include "z_bg_spot17_bakudankabe.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 "sfx.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/object_spot17_obj/object_spot17_obj.h"
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
 

src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.h

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

src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c

@@ -5,6 +5,13 @@
  */
 
 #include "z_bg_spot17_funen.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "sys_matrix.h"
+#include "z64play.h"
+
 #include "assets/objects/object_spot17_obj/object_spot17_obj.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.h

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

src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c

@@ -5,6 +5,11 @@
  */
 
 #include "z_bg_spot18_futa.h"
+
+#include "ichain.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_spot18_obj/object_spot18_obj.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.h

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

src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c

@@ -6,6 +6,14 @@
  */
 
 #include "z_bg_spot18_obj.h"
+
+#include "ichain.h"
+#include "sfx.h"
+#include "sys_math3d.h"
+#include "z_lib.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/object_spot18_obj/object_spot18_obj.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.h

@@ -2,12 +2,12 @@
 #define Z_BG_SPOT18_OBJ_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgSpot18Obj;
 
-typedef void (*BgSpot18ObjActionFunc)(struct BgSpot18Obj*, PlayState*);
-typedef s32 (*BgSpot18ObjInitFunc)(struct BgSpot18Obj*, PlayState*);
+typedef void (*BgSpot18ObjActionFunc)(struct BgSpot18Obj*, struct PlayState*);
+typedef s32 (*BgSpot18ObjInitFunc)(struct BgSpot18Obj*, struct PlayState*);
 
 typedef struct BgSpot18Obj {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c

@@ -5,6 +5,13 @@
  */
 
 #include "z_bg_spot18_shutter.h"
+
+#include "ichain.h"
+#include "one_point_cutscene.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_spot18_obj/object_spot18_obj.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.h

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

src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c

@@ -5,6 +5,13 @@
  */
 
 #include "z_bg_toki_hikari.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "sys_matrix.h"
+#include "z64play.h"
+
 #include "assets/objects/object_toki_objects/object_toki_objects.h"
 
 #define FLAGS ACTOR_FLAG_DRAW_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h

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

src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c

@@ -5,6 +5,19 @@
  */
 
 #include "z_bg_toki_swd.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "seqcmd.h"
+#include "sequence.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z64play.h"
+#include "z64player.h"
+
+#include "global.h"
+
 #include "assets/objects/object_toki_objects/object_toki_objects.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h

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

src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_1.c

@@ -1,5 +1,5 @@
-#include "z_bg_toki_swd.h"
 #include "z64cutscene_commands.h"
+#include "z64player.h"
 
 // clang-format off
 CutsceneData gPullMasterSwordCs[] = {

src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_2.c

@@ -1,5 +1,5 @@
-#include "z_bg_toki_swd.h"
 #include "z64cutscene_commands.h"
+#include "z64player.h"
 
 // clang-format off
 CutsceneData gPlaceMasterSwordCs[] = {

src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_cutscene_data_3.c

@@ -1,5 +1,5 @@
-#include "z_bg_toki_swd.h"
 #include "z64cutscene_commands.h"
+#include "z64player.h"
 
 // clang-format off
 CutsceneData gRevealMasterSwordCs[] = {

src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c

@@ -5,10 +5,23 @@
  */
 
 #include "z_bg_treemouth.h"
-#include "versions.h"
-#include "assets/objects/object_spot04_objects/object_spot04_objects.h"
 #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
 
+#include "libc64/qrand.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "versions.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64player.h"
+
+#include "global.h"
+
+#include "assets/objects/object_spot04_objects/object_spot04_objects.h"
+
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
 
 void BgTreemouth_Init(Actor* thisx, PlayState* play);

src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h

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

src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth_cutscene_data.c

@@ -1,5 +1,6 @@
-#include "z_bg_treemouth.h"
+#include "sequence.h"
 #include "z64cutscene_commands.h"
+#include "z64player.h"
 
 // clang-format off
 CutsceneData gDekuTreeMeetingCs[] = {

src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c

@@ -5,6 +5,11 @@
  */
 
 #include "z_bg_umajump.h"
+
+#include "ichain.h"
+#include "regs.h"
+#include "z64play.h"
+
 #include "assets/objects/object_umajump/object_umajump.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h

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

src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c

@@ -5,9 +5,21 @@
  */
 
 #include "z_bg_vb_sima.h"
-#include "assets/objects/object_fd/object_fd.h"
 #include "overlays/actors/ovl_Boss_Fd/z_boss_fd.h"
 
+#include "libc64/qrand.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "rand.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+
+#include "assets/objects/object_fd/object_fd.h"
+
 #define FLAGS 0
 
 void BgVbSima_Init(Actor* thisx, PlayState* play);

src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h

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

src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c

@@ -5,6 +5,16 @@
  */
 
 #include "z_bg_ydan_hasi.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 "z64play.h"
+
 #include "assets/objects/object_ydan_objects/object_ydan_objects.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.h

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

src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c

@@ -5,6 +5,13 @@
  */
 
 #include "z_bg_ydan_maruta.h"
+
+#include "ichain.h"
+#include "one_point_cutscene.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_ydan_objects/object_ydan_objects.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.h

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