diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c
index 8d8be7bbda..b433b51b99 100644
--- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c
+++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_bg_heavy_block.h"
+#include "global.h"
 #include "assets/objects/object_heavy_object/object_heavy_object.h"
 #include "quake.h"
 #include "terminal.h"
diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h
index 62c783fe52..a93f5cc3a0 100644
--- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h
+++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h
@@ -2,11 +2,11 @@
 #define Z_BG_HEAVY_BLOCK_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct BgHeavyBlock;
 
-typedef void (*BgHeavyBlockActionFunc)(struct BgHeavyBlock*, PlayState*);
+typedef void (*BgHeavyBlockActionFunc)(struct BgHeavyBlock*, struct PlayState*);
 
 typedef struct BgHeavyBlock {
     /* 0x0000 */ DynaPolyActor dyna;
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
index 063173c306..11525d2fc2 100644
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
+++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
@@ -1,4 +1,5 @@
 #include "z_demo_kankyo.h"
+#include "global.h"
 #include "versions.h"
 #include "z64cutscene_commands.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h
index f56184bb33..06501904ac 100644
--- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h
+++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h
@@ -2,11 +2,11 @@
 #define Z_DEMO_KANKYO_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct DemoKankyo;
 
-typedef void (*DemoKankyoActionFunc)(struct DemoKankyo*, PlayState*);
+typedef void (*DemoKankyoActionFunc)(struct DemoKankyo*, struct PlayState*);
 
 typedef enum DemoKankyoType {
     /* 0x00 */ DEMOKANKYO_BLUE_RAIN,
diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
index 36c2b4b9d7..18175f1618 100644
--- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
+++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_elf_msg.h"
+#include "global.h"
 #include "terminal.h"
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"
 
diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h
index ba523060f1..c95cbb527f 100644
--- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h
+++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h
@@ -2,11 +2,11 @@
 #define Z_ELF_MSG_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct ElfMsg;
 
-typedef void (*ElfMsgActionFunc)(struct ElfMsg*, PlayState*);
+typedef void (*ElfMsgActionFunc)(struct ElfMsg*, struct PlayState*);
 
 typedef struct ElfMsg {
     /* 0x0000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
index fcf51b77e0..34bc646bd6 100644
--- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
+++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_arrow.h"
+#include "global.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5)
diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h
index 6c5b874a42..ba974c2105 100644
--- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h
+++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h
@@ -2,11 +2,12 @@
 #define Z_EN_ARROW_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
+#include "z64player.h"
 
 struct EnArrow;
 
-typedef void (*EnArrowActionFunc)(struct EnArrow*, PlayState*);
+typedef void (*EnArrowActionFunc)(struct EnArrow*, struct PlayState*);
 
 typedef struct EnArrow {
     /* 0x0000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.c b/src/overlays/actors/ovl_En_Boom/z_en_boom.c
index 74b04f88b0..56f6bd3452 100644
--- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c
+++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_boom.h"
+#include "global.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5)
diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.h b/src/overlays/actors/ovl_En_Boom/z_en_boom.h
index 4284063726..7a211880a4 100644
--- a/src/overlays/actors/ovl_En_Boom/z_en_boom.h
+++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.h
@@ -2,11 +2,12 @@
 #define Z_EN_BOOM_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
+#include "z64player.h"
 
 struct EnBoom;
 
-typedef void (*EnBoomActionFunc)(struct EnBoom*, PlayState*);
+typedef void (*EnBoomActionFunc)(struct EnBoom*, struct PlayState*);
 
 typedef struct EnBoom {
     /* 0x0000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.c b/src/overlays/actors/ovl_En_Box/z_en_box.c
index 770132358a..012ab4fd60 100644
--- a/src/overlays/actors/ovl_En_Box/z_en_box.c
+++ b/src/overlays/actors/ovl_En_Box/z_en_box.c
@@ -1,4 +1,5 @@
 #include "z_en_box.h"
+#include "global.h"
 #include "overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h"
 #include "assets/objects/object_box/object_box.h"
 
diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.h b/src/overlays/actors/ovl_En_Box/z_en_box.h
index 5dd3040c5f..1604b0d1bc 100644
--- a/src/overlays/actors/ovl_En_Box/z_en_box.h
+++ b/src/overlays/actors/ovl_En_Box/z_en_box.h
@@ -2,14 +2,14 @@
 #define Z_EN_BOX_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 #define ENBOX_TREASURE_FLAG_UNK_MIN 20
 #define ENBOX_TREASURE_FLAG_UNK_MAX 32
 
 struct EnBox;
 
-typedef void (*EnBoxActionFunc)(struct EnBox*, PlayState*);
+typedef void (*EnBoxActionFunc)(struct EnBox*, struct PlayState*);
 
 typedef enum EnBoxType {
     /*
diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c
index bf1dc7ea2b..c89a882321 100644
--- a/src/overlays/actors/ovl_En_Door/z_en_door.c
+++ b/src/overlays/actors/ovl_En_Door/z_en_door.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_door.h"
+#include "global.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
 #include "assets/objects/object_hidan_objects/object_hidan_objects.h"
diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.h b/src/overlays/actors/ovl_En_Door/z_en_door.h
index 608702b6f3..4b4f95c466 100644
--- a/src/overlays/actors/ovl_En_Door/z_en_door.h
+++ b/src/overlays/actors/ovl_En_Door/z_en_door.h
@@ -2,7 +2,7 @@
 #define Z_EN_DOOR_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 /**
  * Actor Parameters
@@ -46,7 +46,7 @@ typedef enum EnDoorType {
 
 struct EnDoor;
 
-typedef void (*EnDoorActionFunc)(struct EnDoor*, PlayState*);
+typedef void (*EnDoorActionFunc)(struct EnDoor*, struct PlayState*);
 
 typedef struct EnDoor {
     /* 0x0000 */ DOOR_ACTOR_BASE;
diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.c b/src/overlays/actors/ovl_En_Elf/z_en_elf.c
index ea5643fc85..a3e4bb5e17 100644
--- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c
+++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_elf.h"
+#include "global.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS (ACTOR_FLAG_4 | ACTOR_FLAG_5 | ACTOR_FLAG_25)
diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.h b/src/overlays/actors/ovl_En_Elf/z_en_elf.h
index 106e3a5580..2190065f71 100644
--- a/src/overlays/actors/ovl_En_Elf/z_en_elf.h
+++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.h
@@ -2,13 +2,14 @@
 #define Z_EN_ELF_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
+#include "z64light.h"
 #include "overlays/actors/ovl_Elf_Msg/z_elf_msg.h"
 
 struct EnElf;
 
-typedef void (*EnElfActionFunc)(struct EnElf*, PlayState*);
-typedef void (*EnElfUnkFunc)(struct EnElf*, PlayState*);
+typedef void (*EnElfActionFunc)(struct EnElf*, struct PlayState*);
+typedef void (*EnElfUnkFunc)(struct EnElf*, struct PlayState*);
 
 typedef struct EnElf {
     /* 0x0000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c
index e86d8de3b6..ccc27510e2 100644
--- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c
+++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_fish.h"
+#include "global.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "terminal.h"
 
diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.h b/src/overlays/actors/ovl_En_Fish/z_en_fish.h
index 001d161766..01cdbd0b36 100644
--- a/src/overlays/actors/ovl_En_Fish/z_en_fish.h
+++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.h
@@ -2,11 +2,11 @@
 #define Z_EN_FISH_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct EnFish;
 
-typedef void (*EnFishActionFunc)(struct EnFish*, PlayState*);
+typedef void (*EnFishActionFunc)(struct EnFish*, struct PlayState*);
 
 typedef struct EnFish {
     /* 0x0000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c
index 6760bdda2a..fb57ef0148 100644
--- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c
+++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_horse.h"
+#include "global.h"
 #include "versions.h"
 #include "overlays/actors/ovl_En_In/z_en_in.h"
 #include "assets/objects/object_horse/object_horse.h"
diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.h b/src/overlays/actors/ovl_En_Horse/z_en_horse.h
index a0618973a0..e4c98beb2e 100644
--- a/src/overlays/actors/ovl_En_Horse/z_en_horse.h
+++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.h
@@ -2,7 +2,8 @@
 #define Z_EN_HORSE_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
+#include "z64skin.h"
 
 typedef enum EnHorseAction {
     /*  0 */ ENHORSE_ACT_FROZEN,
@@ -89,7 +90,7 @@ typedef enum HorseType {
     /* 1 */ HORSE_HNI
 } HorseType;
 
-typedef void (*EnHorsePostdrawFunc)(struct EnHorse*, PlayState*);
+typedef void (*EnHorsePostdrawFunc)(struct EnHorse*, struct PlayState*);
 
 typedef struct EnHorse {
     /* 0x0000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.c b/src/overlays/actors/ovl_En_Insect/z_en_insect.c
index b98c864f9f..991c9de3ca 100644
--- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c
+++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_insect.h"
+#include "global.h"
 #include "terminal.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.h b/src/overlays/actors/ovl_En_Insect/z_en_insect.h
index 6ed7b95860..31d2c1d050 100644
--- a/src/overlays/actors/ovl_En_Insect/z_en_insect.h
+++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.h
@@ -2,12 +2,12 @@
 #define Z_EN_INSECT_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 #include "overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h"
 
 struct EnInsect;
 
-typedef void (*EnInsectActionFunc)(struct EnInsect*, PlayState*);
+typedef void (*EnInsectActionFunc)(struct EnInsect*, struct PlayState*);
 
 #define INSECT_FLAG_0 (1 << 0)
 #define INSECT_FLAG_1 (1 << 1)
diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c
index 86db9ebfe6..e909134128 100644
--- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c
+++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_obj_makekinsuta.h"
+#include "global.h"
 #include "terminal.h"
 
 #define FLAGS ACTOR_FLAG_4
diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h
index 5cd76798c1..0ac9b7ab84 100644
--- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h
+++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.h
@@ -2,11 +2,11 @@
 #define Z_OBJ_MAKEKINSUTA_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64actor.h"
 
 struct ObjMakekinsuta;
 
-typedef void (*ObjMakekinsutaActionFunc)(struct ObjMakekinsuta*, PlayState*);
+typedef void (*ObjMakekinsutaActionFunc)(struct ObjMakekinsuta*, struct PlayState*);
 
 typedef struct ObjMakekinsuta {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c
index 4db11c613d..e80ff26f5f 100644
--- a/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/src/overlays/actors/ovl_player_actor/z_player.c
@@ -11,7 +11,6 @@
 
 #include "overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h"
 #include "overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h"
-#include "overlays/actors/ovl_Door_Shutter/z_door_shutter.h"
 #include "overlays/actors/ovl_En_Boom/z_en_boom.h"
 #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h"
 #include "overlays/actors/ovl_En_Box/z_en_box.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h
index be8d70bccd..f3c1ea6168 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h
@@ -2,7 +2,9 @@
 #define Z_EFF_SS_FHGFLASH_H
 
 #include "ultra64.h"
-#include "global.h"
+#include "z64math.h"
+
+struct Actor;
 
 typedef struct EffectSsFhgFlashInitParams {
     /* 0x00 */ Vec3f pos;
@@ -10,7 +12,7 @@ typedef struct EffectSsFhgFlashInitParams {
     /* 0x18 */ Vec3f accel;
     /* 0x24 */ s16 scale;
     /* 0x26 */ u8 param;
-    /* 0x28 */ Actor* actor;
+    /* 0x28 */ struct Actor* actor;
     /* 0x2C */ u8 type;
 } EffectSsFhgFlashInitParams; // size = 0x30