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

* remove more global.h references

* .bss

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

src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.h

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

src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c

@@ -5,6 +5,16 @@
  */
 
 #include "z_eff_ss_bomb2.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 rScale regs[0]

src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.h

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

src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c

@@ -5,6 +5,16 @@
  */
 
 #include "z_eff_ss_bubble.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 "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define rScale regs[0]

src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.h

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

src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c

@@ -5,6 +5,14 @@
  */
 
 #include "z_eff_ss_d_fire.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "segmented_address.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64skin_matrix.h"
+
 #include "assets/objects/object_dodongo/object_dodongo.h"
 
 #define rScale regs[0]

src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.h

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

src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c

@@ -5,6 +5,15 @@
  */
 
 #include "z_eff_ss_dead_db.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "segmented_address.h"
+#include "sfx.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64skin_matrix.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define rScale regs[0]

src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.h

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

src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c

@@ -5,6 +5,15 @@
  */
 
 #include "z_eff_ss_dead_dd.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64skin_matrix.h"
+
+#include "global.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define rScale regs[0]

src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.h

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

src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c

@@ -5,6 +5,13 @@
  */
 
 #include "z_eff_ss_dead_ds.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "sys_matrix.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define rScale regs[0]

src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.h

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

src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c

@@ -5,6 +5,16 @@
  */
 
 #include "z_eff_ss_dt_bubble.h"
+
+#include "libc64/qrand.h"
+#include "color.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "segmented_address.h"
+#include "sys_matrix.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define rPrimColorR regs[0]

src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.h

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

src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c

@@ -5,6 +5,17 @@
  */
 
 #include "z_eff_ss_dust.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 rPrimColorR regs[0]

src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.h

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

src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c

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

src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.h

@@ -2,10 +2,10 @@
 #define Z_EFF_SS_EN_FIRE_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64math.h"
 
 typedef struct EffectSsEnFireInitParams {
-    /* 0x00 */ Actor* actor;
+    /* 0x00 */ struct Actor* actor;
     /* 0x04 */ Vec3f pos;
     /* 0x10 */ s16 scale;
     /* 0x12 */ s16 unk_12;

src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c

@@ -5,7 +5,17 @@
  */
 
 #include "z_eff_ss_en_ice.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "rand.h"
+#include "sys_math.h"
+#include "sys_matrix.h"
 #include "versions.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define rLifespan regs[0]

src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.h

@@ -2,10 +2,11 @@
 #define Z_EFF_SS_EN_ICE_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "color.h"
+#include "z64math.h"
 
 typedef struct EffectSsEnIceInitParams {
-    /* 0x00 */ Actor* actor;
+    /* 0x00 */ struct Actor* actor;
     /* 0x04 */ Vec3f pos;
     /* 0x10 */ f32 scale;
     /* 0x14 */ Vec3f velocity;

src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c

@@ -5,6 +5,14 @@
  */
 
 #include "z_eff_ss_extra.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "segmented_address.h"
+#include "sys_matrix.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/object_yabusame_point/object_yabusame_point.h"
 
 #define rObjectSlot regs[0]

src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.h

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

src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c

@@ -5,6 +5,14 @@
  */
 
 #include "z_eff_ss_fcircle.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define rUnused regs[3] // probably supposed to be an alpha

src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.h

@@ -2,10 +2,10 @@
 #define Z_EFF_SS_FCIRCLE_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64math.h"
 
 typedef struct EffectSsFcircleInitParams {
-    /* 0x00 */ Actor* actor;
+    /* 0x00 */ struct Actor* actor;
     /* 0x04 */ Vec3f pos;
     /* 0x10 */ s16 radius;
     /* 0x12 */ s16 height;

src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c

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

src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.h

@@ -2,10 +2,11 @@
 #define Z_EFF_SS_FIRE_TAIL_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "color.h"
+#include "z64math.h"
 
 typedef struct EffectSsFireTailInitParams {
-    /* 0x00 */ Actor* actor;
+    /* 0x00 */ struct Actor* actor;
     /* 0x04 */ Vec3f pos;
     /* 0x10 */ f32 scale;
     /* 0x14 */ Vec3f unk_14;

src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.c

@@ -5,6 +5,11 @@
  */
 
 #include "z_eff_ss_g_fire.h"
+
+#include "segmented_address.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 u32 EffectSsGFire_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx);

src/overlays/effects/ovl_Effect_Ss_G_Fire/z_eff_ss_g_fire.h

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

src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.c

@@ -5,6 +5,12 @@
  */
 
 #include "z_eff_ss_g_magma.h"
+
+#include "libc64/qrand.h"
+#include "segmented_address.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 u32 EffectSsGMagma_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx);

src/overlays/effects/ovl_Effect_Ss_G_Magma/z_eff_ss_g_magma.h

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

src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c

@@ -5,6 +5,14 @@
  */
 
 #include "z_eff_ss_g_magma2.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "segmented_address.h"
+#include "sys_matrix.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/object_kingdodongo/object_kingdodongo.h"
 
 #define rPrimColorR regs[0]

src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.h

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

src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c

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

src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.h

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

src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c

@@ -5,6 +5,16 @@
  */
 
 #include "z_eff_ss_g_spk.h"
+
+#include "libc64/qrand.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "segmented_address.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64skin_matrix.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define rPrimColorR regs[0]

src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.h

@@ -2,10 +2,11 @@
 #define Z_EFF_SS_G_SPK_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "color.h"
+#include "z64math.h"
 
 typedef struct EffectSsGSpkInitParams {
-    /* 0x00 */ Actor* actor;
+    /* 0x00 */ struct Actor* actor;
     /* 0x04 */ Vec3f pos;
     /* 0x10 */ Vec3f velocity;
     /* 0x1C */ Vec3f accel;

src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.c

@@ -5,6 +5,11 @@
  */
 
 #include "z_eff_ss_g_splash.h"
+
+#include "segmented_address.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 //! @bug the reuse of regs[11] means that EffectSs_DrawGEffect will treat the type as an object slot (`rgObjectSlot`)

src/overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h

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

src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c

@@ -5,6 +5,15 @@
  */
 
 #include "z_eff_ss_ice_piece.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "rand.h"
+#include "sys_math.h"
+#include "sys_matrix.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define rLifespan regs[0]

src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.h

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

src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c

@@ -5,6 +5,15 @@
  */
 
 #include "z_eff_ss_ice_smoke.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/object_fz/object_fz.h"
 
 #define rObjectSlot regs[0]

src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.h

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

src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c

@@ -5,6 +5,14 @@
  */
 
 #include "z_eff_ss_k_fire.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "rand.h"
+#include "sys_matrix.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define rAlpha regs[0]

src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.h

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

src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c

@@ -5,6 +5,18 @@
  */
 
 #include "z_eff_ss_kirakira.h"
+
+#include "libc64/qrand.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "rand.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 rRotSpeed regs[0]

src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.h

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

src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c

@@ -5,6 +5,17 @@
  */
 
 #include "z_eff_ss_lightning.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 rPrimColorR regs[0]

src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.h

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

src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c

@@ -5,6 +5,18 @@
  */
 
 #include "z_eff_ss_sibuki.h"
+
+#include "libc64/qrand.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "regs.h"
+#include "segmented_address.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define rPrimColorR regs[0]

src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.h

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

src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c

@@ -5,6 +5,14 @@
  */
 
 #include "z_eff_ss_sibuki2.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "segmented_address.h"
+#include "sys_matrix.h"
+#include "z64effect.h"
+#include "z64play.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define rPrimColorR regs[0]

src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.h

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

src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c

@@ -6,6 +6,11 @@
 
 #include "z_eff_ss_solder_srch_ball.h"
 
+#include "z64bgcheck.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #define rUnused regs[1]
 
 u32 EffectSsSolderSrchBall_Init(PlayState* play, u32 index, EffectSs* this, void* initParamsx);

src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h

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

src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c

@@ -5,6 +5,15 @@
  */
 
 #include "z_eff_ss_stick.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "sys_matrix.h"
+#include "z_lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64player.h"
+
 #include "assets/objects/object_link_boy/object_link_boy.h"
 #include "assets/objects/object_link_child/object_link_child.h"
 

src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.h

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

src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c

@@ -5,6 +5,17 @@
  */
 
 #include "z_eff_ss_stone1.h"
+
+#include "color.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "regs.h"
+#include "segmented_address.h"
+#include "sys_matrix.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64skin_matrix.h"
+
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define rReg0 regs[0]

src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.h

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