Reduce overlay dependencies on global.h (2) (#2442)

* reduce overlay dependencies on global.h

* merge cleanup

* more missed headers

include/z64interface.h

@@ -1,6 +1,7 @@
 #ifndef Z64INTERFACE_H
 #define Z64INTERFACE_H
 
+#include "ultra64.h"
 #include "z64dma.h"
 #include "z64view.h"
 

include/z64view.h

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

src/code/sys_cfb.c

@@ -1,5 +1,8 @@
-#include "global.h"
+#include "ultra64.h"
+#include "libu64/debug.h"
+#include "attributes.h"
 #include "line_numbers.h"
+#include "global.h"
 
 #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \
                                "pal-1.1:128"

src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c

@@ -7,9 +7,16 @@
 #include "z_arrow_fire.h"
 #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h"
 
+#include "libu64/debug.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 "global.h"
+#include "z64.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
 

src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c

@@ -7,9 +7,16 @@
 #include "z_arrow_ice.h"
 #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h"
 
+#include "libu64/debug.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 "global.h"
+#include "z64.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
 

src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c

@@ -7,9 +7,16 @@
 #include "z_arrow_light.h"
 #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h"
 
+#include "libu64/debug.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 "global.h"
+#include "z64.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
 

src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c

@@ -5,6 +5,12 @@
  */
 
 #include "z_bg_bombwall.h"
+#include "libc64/qrand.h"
+#include "ichain.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
 
 #define FLAGS ACTOR_FLAG_IGNORE_POINT_LIGHTS

src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h

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

src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c

@@ -5,6 +5,19 @@
  */
 
 #include "z_bg_breakwall.h"
+
+#include "libc64/qrand.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "rand.h"
+#include "regs.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/scenes/dungeons/ddan/ddan_scene.h"
 #include "assets/objects/object_bwall/object_bwall.h"
 #include "assets/objects/object_kingdodongo/object_kingdodongo.h"

src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h

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

src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c

@@ -5,6 +5,14 @@
  */
 
 #include "z_bg_ddan_jd.h"
+
+#include "ichain.h"
+#include "one_point_cutscene.h"
+#include "rand.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_ddan_objects/object_ddan_objects.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h

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

src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c

@@ -5,6 +5,16 @@
  */
 
 #include "z_bg_ddan_kd.h"
+
+#include "libc64/qrand.h"
+#include "ichain.h"
+#include "one_point_cutscene.h"
+#include "rand.h"
+#include "rumble.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_ddan_objects/object_ddan_objects.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h

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

src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c

@@ -6,6 +6,20 @@
 
 #include "z_bg_dodoago.h"
 #include "overlays/actors/ovl_En_Bom/z_en_bom.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "macros.h"
+#include "one_point_cutscene.h"
+#include "rand.h"
+#include "rumble.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/object_ddan_objects/object_ddan_objects.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h

@@ -2,7 +2,7 @@
 #define Z_BG_DODOAGO_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 typedef enum BgDodoagoEye {
     /* 0 */ BGDODOAGO_EYE_LEFT,
@@ -11,7 +11,7 @@ typedef enum BgDodoagoEye {
 
 struct BgDodoago;
 
-typedef void (*BgDodoagoActionFunc)(struct BgDodoago*, PlayState*);
+typedef void (*BgDodoagoActionFunc)(struct BgDodoago*, struct PlayState*);
 
 typedef struct BgDodoago {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c

@@ -5,10 +5,25 @@
  */
 
 #include "z_bg_dy_yoseizo.h"
-#include "assets/objects/object_dy_obj/object_dy_obj.h"
+#include "overlays/actors/ovl_Demo_Effect/z_demo_effect.h"
+
+#include "libc64/qrand.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "one_point_cutscene.h"
+#include "rand.h"
+#include "regs.h"
+#include "segmented_address.h"
+#include "sfx.h"
+#include "sys_matrix.h"
 #include "terminal.h"
 #include "versions.h"
-#include "overlays/actors/ovl_Demo_Effect/z_demo_effect.h"
+#include "z_lib.h"
+#include "z64ocarina.h"
+#include "z64play.h"
+#include "z64player.h"
+
+#include "assets/objects/object_dy_obj/object_dy_obj.h"
 #include "assets/scenes/indoors/yousei_izumi_yoko/yousei_izumi_yoko_scene.h"
 #include "assets/scenes/indoors/daiyousei_izumi/daiyousei_izumi_scene.h"
 

src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h

@@ -2,13 +2,13 @@
 #define Z_BG_DY_YOSEIZO_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 #include "overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h"
 #include "overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h"
 
 struct BgDyYoseizo;
 
-typedef void (*BgDyYoseizoActionFunc)(struct BgDyYoseizo*, PlayState*);
+typedef void (*BgDyYoseizoActionFunc)(struct BgDyYoseizo*, struct PlayState*);
 
 #define BG_DY_YOSEIZO_EFFECT_COUNT 200
 

src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c

@@ -6,7 +6,18 @@
 
 #include "z_bg_ganon_otyuka.h"
 #include "overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "rand.h"
+#include "sfx.h"
+#include "sys_matrix.h"
 #include "terminal.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64player.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
 

src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h

@@ -2,7 +2,7 @@
 #define Z_BG_GANON_OTYUKA_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 #define OTYUKA_SIDE_EAST (1 << 0)
 #define OTYUKA_SIDE_WEST (1 << 1)
@@ -12,7 +12,7 @@
 
 struct BgGanonOtyuka;
 
-typedef void (*BgGanonOtyukaActionFunc)(struct BgGanonOtyuka*, PlayState*);
+typedef void (*BgGanonOtyukaActionFunc)(struct BgGanonOtyuka*, struct PlayState*);
 
 typedef struct BgGanonOtyuka {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c

@@ -5,8 +5,16 @@
  */
 
 #include "z_bg_gate_shutter.h"
-#include "assets/objects/object_spot01_matoyab/object_spot01_matoyab.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "sfx.h"
+#include "sys_matrix.h"
 #include "terminal.h"
+#include "z_lib.h"
+#include "z64play.h"
+
+#include "assets/objects/object_spot01_matoyab/object_spot01_matoyab.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h

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

src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c

@@ -5,6 +5,15 @@
  */
 
 #include "z_bg_gjyo_bridge.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/object_gjyo_objects/object_gjyo_objects.h"
 #include "assets/scenes/overworld/ganon_tou/ganon_tou_scene.h"
 

src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h

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

src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c

@@ -5,6 +5,12 @@
  */
 
 #include "z_bg_gnd_darkmeiro.h"
+
+#include "gfx.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h

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

src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c

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

src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h

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

src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c

@@ -5,6 +5,17 @@
  */
 
 #include "z_bg_gnd_iceblock.h"
+
+#include "libc64/qrand.h"
+#include "libu64/debug.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_demo_kekkai/object_demo_kekkai.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h

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

src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c

@@ -5,6 +5,9 @@
  */
 
 #include "z_bg_gnd_nisekabe.h"
+
+#include "z64play.h"
+
 #include "assets/objects/object_demo_kekkai/object_demo_kekkai.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h

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

src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c

@@ -5,8 +5,19 @@
  */
 
 #include "z_bg_gnd_soulmeiro.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_demo_kekkai/object_demo_kekkai.h"
-#include "global.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h

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

src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c

@@ -5,6 +5,16 @@
  */
 
 #include "z_bg_haka.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_haka/object_haka.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h

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

src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c

@@ -5,6 +5,18 @@
  */
 
 #include "z_bg_haka_gate.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 "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_haka_objects/object_haka_objects.h"
 

src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h

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

src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c

@@ -5,9 +5,20 @@
  */
 
 #include "z_bg_haka_huta.h"
-#include "assets/objects/object_hakach_objects/object_hakach_objects.h"
 #include "overlays/actors/ovl_En_Rd/z_en_rd.h"
+
+#include "libc64/qrand.h"
+#include "ichain.h"
+#include "one_point_cutscene.h"
 #include "quake.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_hakach_objects/object_hakach_objects.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED
 

src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h

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

src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c

@@ -5,6 +5,12 @@
  */
 
 #include "z_bg_haka_megane.h"
+
+#include "ichain.h"
+#include "z64play.h"
+
+#include "z64.h"
+
 #include "assets/objects/object_hakach_objects/object_hakach_objects.h"
 #include "assets/objects/object_haka_objects/object_haka_objects.h"
 

src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h

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

src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c

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

src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h

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

src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c

@@ -5,6 +5,14 @@
  */
 
 #include "z_bg_haka_sgami.h"
+
+#include "ichain.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/object_haka_objects/object_haka_objects.h"
 #include "assets/objects/object_ice_objects/object_ice_objects.h"
 

src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h

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

src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c

@@ -5,6 +5,17 @@
  */
 
 #include "z_bg_haka_ship.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 "z64skin_matrix.h"
+
 #include "assets/objects/object_haka_objects/object_haka_objects.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h

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

src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c

@@ -5,6 +5,17 @@
  */
 
 #include "z_bg_haka_trap.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 "z64player.h"
+#include "z64skin_matrix.h"
+
 #include "assets/objects/object_haka_objects/object_haka_objects.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h

@@ -2,7 +2,7 @@
 #define Z_BG_HAKA_TRAP_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 typedef enum HakaTrapType {
     /* 0x00 */ HAKA_TRAP_GUILLOTINE_SLOW,
@@ -15,7 +15,7 @@ typedef enum HakaTrapType {
 
 struct BgHakaTrap;
 
-typedef void (*BgHakaTrapActionFunc)(struct BgHakaTrap*, PlayState*);
+typedef void (*BgHakaTrapActionFunc)(struct BgHakaTrap*, struct PlayState*);
 
 typedef struct BgHakaTrap {
     /* 0x0000 */ DynaPolyActor dyna;

src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c

@@ -5,6 +5,19 @@
  */
 
 #include "z_bg_haka_tubo.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 "global.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_haka_objects/object_haka_objects.h"
 

src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h

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

src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c

@@ -5,6 +5,15 @@
  */
 
 #include "z_bg_haka_water.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_hakach_objects/object_hakach_objects.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h

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

src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c

@@ -5,6 +5,16 @@
  */
 
 #include "z_bg_haka_zou.h"
+
+#include "libc64/qrand.h"
+#include "ichain.h"
+#include "one_point_cutscene.h"
+#include "rand.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/object_hakach_objects/object_hakach_objects.h"
 #include "assets/objects/object_haka_objects/object_haka_objects.h"
 

src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h

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

src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c

@@ -5,10 +5,25 @@
  */
 
 #include "z_bg_heavy_block.h"
-#include "global.h"
-#include "assets/objects/object_heavy_object/object_heavy_object.h"
+
+#include "libu64/debug.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "one_point_cutscene.h"
 #include "quake.h"
+#include "rand.h"
+#include "rumble.h"
+#include "sfx.h"
+#include "sys_math.h"
+#include "sys_matrix.h"
 #include "terminal.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64player.h"
+
+#include "assets/objects/object_heavy_object/object_heavy_object.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c

@@ -5,6 +5,16 @@
  */
 
 #include "z_bg_hidan_curtain.h"
+
+#include "libc64/qrand.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/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h

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

src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c

@@ -5,6 +5,16 @@
  */
 
 #include "z_bg_hidan_dalm.h"
+
+#include "libc64/qrand.h"
+#include "ichain.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_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h

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

src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c

@@ -5,6 +5,16 @@
  */
 
 #include "z_bg_hidan_firewall.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.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_Firewall/z_bg_hidan_firewall.h

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

src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c

@@ -5,6 +5,12 @@
  */
 
 #include "z_bg_hidan_fslift.h"
+
+#include "ichain.h"
+#include "sfx.h"
+#include "z_lib.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_Fslift/z_bg_hidan_fslift.h

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

src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c

@@ -6,6 +6,18 @@
  */
 
 #include "z_bg_hidan_fwbig.h"
+
+#include "ichain.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "one_point_cutscene.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/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 

src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h

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

src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c

@@ -5,9 +5,21 @@
  */
 
 #include "z_bg_hidan_hamstep.h"
-#include "versions.h"
-#include "assets/objects/object_hidan_objects/object_hidan_objects.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "one_point_cutscene.h"
 #include "quake.h"
+#include "regs.h"
+#include "rumble.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "versions.h"
+#include "z_lib.h"
+#include "z64play.h"
+
+#include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS 0
 

src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h

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

src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c

@@ -5,6 +5,13 @@
  */
 
 #include "z_bg_hidan_hrock.h"
+
+#include "ichain.h"
+#include "rumble.h"
+#include "sfx.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.h

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

src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c

@@ -5,6 +5,16 @@
  */
 
 #include "z_bg_hidan_kousi.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_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS ACTOR_FLAG_UPDATE_CULLING_DISABLED

src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h

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

src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c

@@ -5,8 +5,19 @@
  */
 
 #include "z_bg_hidan_kowarerukabe.h"
-#include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.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/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.h

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

src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c

@@ -5,6 +5,19 @@
  */
 
 #include "z_bg_hidan_rock.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 "z64skin_matrix.h"
+
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.h

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

src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

@@ -5,6 +5,16 @@
  */
 
 #include "z_bg_hidan_rsekizou.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_hidan_objects/object_hidan_objects.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h

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

src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c

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

src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.h

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

src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c

@@ -5,6 +5,16 @@
  */
 
 #include "z_bg_spot08_iceblock.h"
+
+#include "libc64/math64.h"
+#include "libc64/qrand.h"
+#include "ichain.h"
+#include "sys_math3d.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/object_spot08_obj/object_spot08_obj.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.h

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

src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c

@@ -1,10 +1,32 @@
 #include "z_boss_ganon.h"
-#include "versions.h"
-#include "assets/overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.h"
 #include "overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.h"
 #include "overlays/actors/ovl_En_Zl3/z_en_zl3.h"
 #include "overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h"
 #include "overlays/actors/ovl_En_Bom/z_en_bom.h"
+
+#include "libc64/math64.h"
+#include "libc64/qrand.h"
+#include "attributes.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "rand.h"
+#include "rumble.h"
+#include "segmented_address.h"
+#include "seqcmd.h"
+#include "sequence.h"
+#include "sfx.h"
+#include "sys_math.h"
+#include "sys_matrix.h"
+#include "versions.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64player.h"
+
+#include "global.h"
+
+#include "assets/overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.h"
 #include "assets/objects/object_ganon/object_ganon.h"
 #include "assets/objects/object_ganon_anime1/object_ganon_anime1.h"
 #include "assets/objects/object_ganon_anime2/object_ganon_anime2.h"

src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h

@@ -2,11 +2,11 @@
 #define Z_BOSS_GANON_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BossGanon;
 
-typedef void (*BossGanonActionFunc)(struct BossGanon*, PlayState*);
+typedef void (*BossGanonActionFunc)(struct BossGanon*, struct PlayState*);
 
 typedef enum GanondorfLimb {
     /*  0 */ GANONDORF_LIMB_NONE,

src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c

@@ -1,8 +1,26 @@
 #include "z_boss_ganon2.h"
-#include "versions.h"
 #include "overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h"
 #include "overlays/actors/ovl_Demo_Gj/z_demo_gj.h"
 #include "overlays/actors/ovl_En_Zl3/z_en_zl3.h"
+
+#include "libc64/qrand.h"
+#include "attributes.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "rand.h"
+#include "rumble.h"
+#include "segmented_address.h"
+#include "seqcmd.h"
+#include "sequence.h"
+#include "sfx.h"
+#include "sys_math.h"
+#include "sys_matrix.h"
+#include "versions.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/object_ganon/object_ganon.h"
 #include "assets/objects/object_ganon2/object_ganon2.h"
 #include "assets/objects/object_ganon_anime3/object_ganon_anime3.h"

src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h

@@ -2,11 +2,11 @@
 #define Z_BOSS_GANON2_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BossGanon2;
 
-typedef void (*BossGanon2ActionFunc)(struct BossGanon2*, PlayState*);
+typedef void (*BossGanon2ActionFunc)(struct BossGanon2*, struct PlayState*);
 
 typedef enum GanonLimb {
     /*  0 */ GANON_LIMB_NONE,

src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c

@@ -1,6 +1,26 @@
 #include "z_demo_effect.h"
+
+#include "libc64/math64.h"
+#include "libc64/qrand.h"
+#include "attributes.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "rand.h"
+#include "segmented_address.h"
+#include "sequence.h"
+#include "sfx.h"
+#include "sys_math.h"
+#include "sys_matrix.h"
 #include "terminal.h"
 #include "versions.h"
+#include "z_lib.h"
+#include "z64audio.h"
+#include "z64curve.h"
+#include "z64effect.h"
+#include "z64play.h"
+
+#include "global.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_efc_crystal_light/object_efc_crystal_light.h"
 #include "assets/objects/object_efc_fire_ball/object_efc_fire_ball.h"

src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h

@@ -2,11 +2,12 @@
 #define Z_DEMO_EFFECT_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
+#include "z64curve.h"
 
 struct DemoEffect;
 
-typedef void (*DemoEffectFunc)(struct DemoEffect*, PlayState*);
+typedef void (*DemoEffectFunc)(struct DemoEffect*, struct PlayState*);
 
 typedef struct DemoEffectFireBall {
     /* 0x00 */ u8 timer;

src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c

@@ -5,8 +5,23 @@
  */
 
 #include "z_demo_gj.h"
-#include "assets/objects/object_gj/object_gj.h"
+
+#include "libc64/math64.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 "z64player.h"
+
+#include "global.h"
+
+#include "assets/objects/object_gj/object_gj.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
 

src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h

@@ -2,7 +2,7 @@
 #define Z_DEMO_GJ_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 #include "overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h"
 

src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c

@@ -1,4 +1,18 @@
 #include "z_door_warp1.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "one_point_cutscene.h"
+#include "seqcmd.h"
+#include "sequence.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64light.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/object_warp1/object_warp1.h"
 
 #define FLAGS 0

src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h

@@ -2,7 +2,8 @@
 #define Z_DOOR_WARP1_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
+#include "z64light.h"
 
 struct DoorWarp1;
 
@@ -31,7 +32,7 @@ typedef enum DoorWarp1RutoState {
     /* 5 */ WARP_BLUE_RUTO_STATE_WARPING    // set by warp, after closing dialog
 } DoorWarp1RutoState;
 
-typedef void (*DoorWarp1ActionFunc)(struct DoorWarp1*, PlayState*);
+typedef void (*DoorWarp1ActionFunc)(struct DoorWarp1*, struct PlayState*);
 
 typedef struct DoorWarp1 {
     /* 0x0000 */ Actor actor;

src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c

@@ -5,8 +5,17 @@
  */
 
 #include "z_en_dy_extra.h"
-#include "assets/objects/object_dy_obj/object_dy_obj.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "segmented_address.h"
+#include "sfx.h"
+#include "sys_matrix.h"
 #include "terminal.h"
+#include "z_lib.h"
+#include "z64play.h"
+
+#include "assets/objects/object_dy_obj/object_dy_obj.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
 

src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h

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

src/overlays/actors/ovl_En_Encount2/z_en_encount2.c

@@ -1,7 +1,18 @@
 #include "z_en_encount2.h"
 #include "overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h"
+
+#include "libc64/qrand.h"
+#include "attributes.h"
+#include "gfx.h"
 #include "quake.h"
+#include "rand.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_efc_star_field/object_efc_star_field.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

src/overlays/actors/ovl_En_Encount2/z_en_encount2.h

@@ -2,11 +2,11 @@
 #define Z_EN_ENCOUNT2_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct EnEncount2;
 
-typedef void (*EnEncount2ActionFunc)(struct EnEncount2*, PlayState*);
+typedef void (*EnEncount2ActionFunc)(struct EnEncount2*, struct PlayState*);
 
 #define EN_ENCOUNT2_EFFECT_COUNT 50
 

src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c

@@ -1,6 +1,21 @@
 #include "z_en_fire_rock.h"
 #include "overlays/actors/ovl_En_Encount2/z_en_encount2.h"
+
+#include "attributes.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "rand.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 "z64player.h"
+
+#include "global.h"
+
 #include "assets/objects/object_efc_star_field/object_efc_star_field.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h

@@ -2,7 +2,7 @@
 #define Z_EN_FIRE_ROCK_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 #include "overlays/actors/ovl_En_Encount2/z_en_encount2.h"
 
@@ -17,7 +17,7 @@ typedef enum EnFireRockType {
 
 struct EnFireRock;
 
-typedef void (*EnFireRockActionFunc)(struct EnFireRock*, PlayState*);
+typedef void (*EnFireRockActionFunc)(struct EnFireRock*, struct PlayState*);
 
 typedef struct EnFireRock {
     /* 0x0000 */ Actor actor;

src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c

@@ -5,6 +5,15 @@
  */
 
 #include "z_en_ganon_mant.h"
+
+#include "gfx.h"
+#include "rand.h"
+#include "segmented_address.h"
+#include "sys_math.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64play.h"
+
 #include "overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)