diff --git a/include/functions.h b/include/functions.h
index 573dfff44c..5e9c68f519 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -3,13 +3,6 @@
 
 #include "z64.h"
 
-Actor* Item_DropCollectible(PlayState* play, Vec3f* spawnPos, u32 params);
-Actor* Item_DropCollectible2(PlayState* play, Vec3f* spawnPos, s32 params);
-void Item_DropCollectibleRandom(PlayState* play, Actor* fromActor, Vec3f* spawnPos, s16 params);
-s32 func_800A8150(s32 index);
-s32 func_800A817C(s32 index);
-bool Item_CanDropBigFairy(PlayState* play, s32 index, s32 collectibleFlag);
-
 // Ideally these two prototypes would be in z64actor.h, but they use PlayerItemAction which would require including z64player.h there.
 s32 Actor_OfferTalkExchange(Actor* actor, struct PlayState* play, f32 xzRange, f32 yRange, PlayerItemAction exchangeItemAction);
 s32 Actor_OfferTalkExchangeEquiCylinder(Actor* actor, struct PlayState* play, f32 radius, PlayerItemAction exchangeItemAction);
diff --git a/include/z64actor.h b/include/z64actor.h
index ef4e113110..4a510531a5 100644
--- a/include/z64actor.h
+++ b/include/z64actor.h
@@ -76,9 +76,9 @@ typedef struct {
 #define BGCHECKFLAG_GROUND_STRICT (1 << 7) // Similar to BGCHECKFLAG_GROUND but with no velocity check and is cleared every frame
 #define BGCHECKFLAG_CRUSHED (1 << 8) // Crushed between a floor and ceiling (triggers a void for player)
 #define BGCHECKFLAG_PLAYER_WALL_INTERACT (1 << 9) // Only set/used by player, related to interacting with walls
-#define BGCHECKFLAG_PLAYER_400 (1 << 10) // 
-#define BGCHECKFLAG_PLAYER_800 (1 << 11) // 
-#define BGCHECKFLAG_PLAYER_1000 (1 << 12) // 
+#define BGCHECKFLAG_PLAYER_400 (1 << 10) //
+#define BGCHECKFLAG_PLAYER_800 (1 << 11) //
+#define BGCHECKFLAG_PLAYER_1000 (1 << 12) //
 
 // Flags for Actor_UpdateBgCheckInfo
 #define UPDBGCHECKINFO_FLAG_1 (1 << 0) // check wall
@@ -179,82 +179,6 @@ typedef struct DynaPolyActor {
     /* 0x158 */ u8 interactFlags;
 } DynaPolyActor; // size = 0x15C
 
-typedef enum Item00Type {
-    /* 0x00 */ ITEM00_RUPEE_GREEN,
-    /* 0x01 */ ITEM00_RUPEE_BLUE,
-    /* 0x02 */ ITEM00_RUPEE_RED,
-    /* 0x03 */ ITEM00_RECOVERY_HEART,
-    /* 0x04 */ ITEM00_BOMBS_A,
-    /* 0x05 */ ITEM00_ARROWS_10,
-    /* 0x06 */ ITEM00_HEART_PIECE,
-    /* 0x07 */ ITEM00_HEART_CONTAINER,
-    /* 0x08 */ ITEM00_ARROWS_30,
-    /* 0x09 */ ITEM00_ARROWS_40,
-    /* 0x0A */ ITEM00_ARROWS_50,
-    /* 0x0B */ ITEM00_BOMBS_B,
-    /* 0x0C */ ITEM00_DEKU_NUTS_1,
-    /* 0x0D */ ITEM00_DEKU_STICK,
-    /* 0x0E */ ITEM00_MAGIC_JAR_BIG,
-    /* 0x0F */ ITEM00_MAGIC_JAR_SMALL,
-    /* 0x10 */ ITEM00_MASK,
-    /* 0x11 */ ITEM00_SMALL_KEY,
-    /* 0x12 */ ITEM00_FLEXIBLE,
-    /* 0x13 */ ITEM00_RUPEE_HUGE,
-    /* 0x14 */ ITEM00_RUPEE_PURPLE,
-    /* 0x15 */ ITEM00_3_HEARTS,
-    /* 0x16 */ ITEM00_SHIELD_HERO,
-    /* 0x17 */ ITEM00_DEKU_NUTS_10,
-    /* 0x18 */ ITEM00_NOTHING,
-    /* 0x19 */ ITEM00_BOMBS_0,
-    /* 0x1A */ ITEM00_BIG_FAIRY,
-    /* 0x1B */ ITEM00_MAP,
-    /* 0x1C */ ITEM00_COMPASS,
-    /* 0x1D */ ITEM00_MUSHROOM_CLOUD,
-
-    /* 0xFF */ ITEM00_NO_DROP = -1
-} Item00Type;
-
-struct EnItem00;
-
-typedef void (*EnItem00ActionFunc)(struct EnItem00*, struct PlayState*);
-
-#define ENITEM00_GET_8000(thisx) ((thisx)->params & 0x8000)
-#define ENITEM00_GET_7F00(thisx) (((thisx)->params & 0x7F00) >> 8)
-
-typedef struct EnItem00 {
-    /* 0x000 */ Actor actor;
-    /* 0x144 */ EnItem00ActionFunc actionFunc;
-    /* 0x148 */ s16 collectibleFlag;
-    /* 0x14A */ s16 getItemId;
-    /* 0x14C */ s16 unk14C;
-    /* 0x14E */ s16 unk14E;
-    /* 0x150 */ s16 unk150;
-    /* 0x152 */ s16 unk152;
-    /* 0x154 */ f32 unk154;
-    /* 0x158 */ ColliderCylinder collider;
-    /* 0x1A4 */ s8 unk1A4;
-} EnItem00; // size = 0x1A8
-
-struct EnAObj;
-
-typedef void (*EnAObjActionFunc)(struct EnAObj*, struct PlayState*);
-
-typedef struct EnAObj {
-    /* 0x000 */ Actor actor;
-    /* 0x144 */ EnAObjActionFunc actionFunc;
-    /* 0x148 */ ColliderCylinder collision;
-} EnAObj; // size = 0x194
-
-typedef enum {
-    /* 0 */ AOBJ_SIGNPOST_OBLONG,
-    /* 1 */ AOBJ_SIGNPOST_ARROW
-} AObjType;
-
-#define AOBJ_GET_TEXTID(thisx) ((((thisx)->params >> 8) & 0xFF) | 0x300)
-#define AOBJ_GET_TYPE(thisx) (((thisx)->params & 0xFF) - 9)
-
-#define AOBJ_PARAMS(textId, type) ((((textId - 0x300) & 0xFF) << 8) | (type + 9))
-
 typedef enum {
     /* 0x00 */ ACTORCAT_SWITCH,
     /* 0x01 */ ACTORCAT_BG,
diff --git a/include/z64horse.h b/include/z64horse.h
index bae4398680..690460fe9f 100644
--- a/include/z64horse.h
+++ b/include/z64horse.h
@@ -2,16 +2,18 @@
 #define Z64_HORSE_H
 
 #include "ultra64.h"
-#include "z64.h"
 
+struct ActorContext;
+struct Player;
+struct PlayState;
 
-s32 Horse_GetJumpingFencePathIndex(PlayState* play);
-s32 Horse_CopyPointFromPathList(PlayState* play, s32 pathIndex, s32 pointIndex, Vec3s* dst, s16* arg4);
+s32 Horse_GetJumpingFencePathIndex(struct PlayState* play);
+s32 Horse_CopyPointFromPathList(struct PlayState* play, s32 pathIndex, s32 pointIndex, Vec3s* dst, s16* arg4);
 s32 Horse_IsValidSpawn(s16 sceneId);
-void Horse_ResetHorseData(PlayState* play);
-void Horse_Spawn(PlayState* play, Player* player);
+void Horse_ResetHorseData(struct PlayState* play);
+void Horse_Spawn(struct PlayState* play, struct Player* player);
 void Horse_RotateToPoint(Actor* actor, Vec3f* pos, s16 turnYaw);
-s32 Horse_IsActive(PlayState* play, ActorContext* actorCtx);
+s32 Horse_IsActive(struct PlayState* play, struct ActorContext* actorCtx);
 
 
 extern s32 gHorseIsMounted;
diff --git a/include/z64scene.h b/include/z64scene.h
index 89dc8ad4e7..b36cb72129 100644
--- a/include/z64scene.h
+++ b/include/z64scene.h
@@ -872,7 +872,7 @@ typedef enum {
 #define SCENE_CMD_MINIMAP_INFO SCENE_CMD_MAP_DATA
 #define SCENE_CMD_MINIMAP_COMPASS_ICON_INFO SCENE_CMD_MAP_DATA_CHESTS
 
-void Scene_ResetTransitionActorList(GameState* gameState, TransitionActorList* transitionActors);
+void Scene_ResetTransitionActorList(struct GameState* gameState, TransitionActorList* transitionActors);
 void Scene_SetExitFade(struct PlayState* play);
 s32 Scene_ExecuteCommands(struct PlayState* play, SceneCmd* sceneCmd);
 u16 Entrance_Create(s32 scene, s32 spawn, s32 layer);
diff --git a/include/z_en_a_obj.h b/include/z_en_a_obj.h
new file mode 100644
index 0000000000..5c1b22b7c5
--- /dev/null
+++ b/include/z_en_a_obj.h
@@ -0,0 +1,26 @@
+#ifndef Z_EN_A_OBJ_H
+#define Z_EN_A_OBJ_H
+
+#include "z64actor.h"
+
+typedef enum {
+    /* 0 */ AOBJ_SIGNPOST_OBLONG,
+    /* 1 */ AOBJ_SIGNPOST_ARROW
+} AObjType;
+
+struct EnAObj;
+
+typedef void (*EnAObjActionFunc)(struct EnAObj*, struct PlayState*);
+
+typedef struct EnAObj {
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnAObjActionFunc actionFunc;
+    /* 0x148 */ ColliderCylinder collision;
+} EnAObj; // size = 0x194
+
+#define AOBJ_GET_TEXTID(thisx) ((((thisx)->params >> 8) & 0xFF) | 0x300)
+#define AOBJ_GET_TYPE(thisx) (((thisx)->params & 0xFF) - 9)
+
+#define AOBJ_PARAMS(textId, type) ((((textId - 0x300) & 0xFF) << 8) | (type + 9))
+
+#endif
diff --git a/include/z_en_hy_code.h b/include/z_en_hy_code.h
index 6b3dc401f5..43fb3c01df 100644
--- a/include/z_en_hy_code.h
+++ b/include/z_en_hy_code.h
@@ -1,12 +1,14 @@
 #ifndef Z64ENHY_CODE_H
 #define Z64ENHY_CODE_H
 
-#include "global.h"
-#include "overlays/actors/ovl_En_Door/z_en_door.h"
+#include "z64actor.h"
 
+struct EnDoor;
 struct EnHy;
+struct Path;
+struct PlayState;
 
-//! @note: any actor that uses the EnHy system should 
+//! @note: any actor that uses the EnHy system should
 //! have a skeleton that aligns with the enum below.
 typedef enum EnHyLimb {
     /* 0x00 */ ENHY_LIMB_NONE,
@@ -55,7 +57,7 @@ typedef enum {
     /* 21 */ ENHY_ANIM_MAX
 } EnHyAnimation;
 
-typedef void (*EnHyActionFunc)(struct EnHy*, PlayState*);
+typedef void (*EnHyActionFunc)(struct EnHy*, struct PlayState*);
 
 typedef enum EnHyBodyPart {
     /*  0 */ ENHY_BODYPART_0,
@@ -89,7 +91,7 @@ typedef struct EnHy {
     /* 0x1E0 */ u16 textId;
     /* 0x1E2 */ u8 waitingOnInit;
     /* 0x1E3 */ u8 msgFading;
-    /* 0x1E4 */ Path* path;
+    /* 0x1E4 */ struct Path* path;
     /* 0x1E8 */ s16 curPoint;
     /* 0x1EC */ Vec3f leftFootPos;
     /* 0x1F8 */ Vec3f rightFootPos;
@@ -116,19 +118,19 @@ extern s8 gEnHyParentShadowBodyParts[];
 extern u8 gEnHyShadowSizes[];
 
 s32 EnHy_ChangeAnim(SkelAnime* skelAnime, s16 animIndex);
-EnDoor* EnHy_FindNearestDoor(Actor* actor, PlayState* play);
-void EnHy_ChangeObjectAndAnim(EnHy* enHy, PlayState* play, s16 animIndex);
-s32 EnHy_UpdateSkelAnime(EnHy* enHy, PlayState* play);
+struct EnDoor* EnHy_FindNearestDoor(Actor* actor, struct PlayState* play);
+void EnHy_ChangeObjectAndAnim(EnHy* enHy, struct PlayState* play, s16 animIndex);
+s32 EnHy_UpdateSkelAnime(EnHy* enHy, struct PlayState* play);
 void EnHy_Blink(EnHy* enHy, s32 eyeTexMaxIndex);
-s32 EnHy_Init(EnHy* enHy, PlayState* play, FlexSkeletonHeader* skeletonHeaderSeg, s16 animIndex);
-void func_800F0BB4(EnHy* enHy, PlayState* play, EnDoor* door, s16 arg3, s16 arg4);
-s32 func_800F0CE4(EnHy* enHy, PlayState* play, ActorFunc draw, s16 arg3, s16 arg4, f32 arg5);
-s32 func_800F0DD4(EnHy* enHy, PlayState* play, s16 arg2, s16 arg3);
-s32 EnHy_SetPointFowards(EnHy* enHy, PlayState* play, f32 gravity, s16 animIndex);
-s32 EnHy_SetPointBackwards(EnHy* enHy, PlayState* play, s16 animIndex);
+s32 EnHy_Init(EnHy* enHy, struct PlayState* play, FlexSkeletonHeader* skeletonHeaderSeg, s16 animIndex);
+void func_800F0BB4(EnHy* enHy, struct PlayState* play, struct EnDoor* door, s16 arg3, s16 arg4);
+s32 func_800F0CE4(EnHy* enHy, struct PlayState* play, ActorFunc draw, s16 arg3, s16 arg4, f32 arg5);
+s32 func_800F0DD4(EnHy* enHy, struct PlayState* play, s16 arg2, s16 arg3);
+s32 EnHy_SetPointFowards(EnHy* enHy, struct PlayState* play, f32 gravity, s16 animIndex);
+s32 EnHy_SetPointBackwards(EnHy* enHy, struct PlayState* play, s16 animIndex);
 s32 EnHy_MoveForwards(EnHy* enHy, f32 speedTarget);
 s32 EnHy_MoveBackwards(EnHy* enHy, f32 speedTarget);
-void EnHy_UpdateCollider(EnHy* enHy, PlayState* play);
-s32 EnHy_PlayWalkingSound(EnHy* enHy, PlayState* play, f32 distAboveThreshold);
+void EnHy_UpdateCollider(EnHy* enHy, struct PlayState* play);
+s32 EnHy_PlayWalkingSound(EnHy* enHy, struct PlayState* play, f32 distAboveThreshold);
 
 #endif // Z_EN_HY_CODE_H
diff --git a/include/z_en_item00.h b/include/z_en_item00.h
new file mode 100644
index 0000000000..f947a24e78
--- /dev/null
+++ b/include/z_en_item00.h
@@ -0,0 +1,71 @@
+#ifndef Z_EN_ITEM00_H
+#define Z_EN_ITEM00_H
+
+#include "ultra64.h"
+#include "z64actor.h"
+
+typedef enum Item00Type {
+    /* 0x00 */ ITEM00_RUPEE_GREEN,
+    /* 0x01 */ ITEM00_RUPEE_BLUE,
+    /* 0x02 */ ITEM00_RUPEE_RED,
+    /* 0x03 */ ITEM00_RECOVERY_HEART,
+    /* 0x04 */ ITEM00_BOMBS_A,
+    /* 0x05 */ ITEM00_ARROWS_10,
+    /* 0x06 */ ITEM00_HEART_PIECE,
+    /* 0x07 */ ITEM00_HEART_CONTAINER,
+    /* 0x08 */ ITEM00_ARROWS_30,
+    /* 0x09 */ ITEM00_ARROWS_40,
+    /* 0x0A */ ITEM00_ARROWS_50,
+    /* 0x0B */ ITEM00_BOMBS_B,
+    /* 0x0C */ ITEM00_DEKU_NUTS_1,
+    /* 0x0D */ ITEM00_DEKU_STICK,
+    /* 0x0E */ ITEM00_MAGIC_JAR_BIG,
+    /* 0x0F */ ITEM00_MAGIC_JAR_SMALL,
+    /* 0x10 */ ITEM00_MASK,
+    /* 0x11 */ ITEM00_SMALL_KEY,
+    /* 0x12 */ ITEM00_FLEXIBLE,
+    /* 0x13 */ ITEM00_RUPEE_HUGE,
+    /* 0x14 */ ITEM00_RUPEE_PURPLE,
+    /* 0x15 */ ITEM00_3_HEARTS,
+    /* 0x16 */ ITEM00_SHIELD_HERO,
+    /* 0x17 */ ITEM00_DEKU_NUTS_10,
+    /* 0x18 */ ITEM00_NOTHING,
+    /* 0x19 */ ITEM00_BOMBS_0,
+    /* 0x1A */ ITEM00_BIG_FAIRY,
+    /* 0x1B */ ITEM00_MAP,
+    /* 0x1C */ ITEM00_COMPASS,
+    /* 0x1D */ ITEM00_MUSHROOM_CLOUD,
+
+    /* 0xFF */ ITEM00_NO_DROP = -1
+} Item00Type;
+
+struct EnItem00;
+struct PlayState;
+
+typedef void (*EnItem00ActionFunc)(struct EnItem00*, struct PlayState*);
+
+#define ENITEM00_GET_8000(thisx) ((thisx)->params & 0x8000)
+#define ENITEM00_GET_7F00(thisx) (((thisx)->params & 0x7F00) >> 8)
+
+typedef struct EnItem00 {
+    /* 0x000 */ Actor actor;
+    /* 0x144 */ EnItem00ActionFunc actionFunc;
+    /* 0x148 */ s16 collectibleFlag;
+    /* 0x14A */ s16 getItemId;
+    /* 0x14C */ s16 unk14C;
+    /* 0x14E */ s16 unk14E;
+    /* 0x150 */ s16 unk150;
+    /* 0x152 */ s16 unk152;
+    /* 0x154 */ f32 unk154;
+    /* 0x158 */ ColliderCylinder collider;
+    /* 0x1A4 */ s8 unk1A4;
+} EnItem00; // size = 0x1A8
+
+Actor* Item_DropCollectible(struct PlayState* play, Vec3f* spawnPos, u32 params);
+Actor* Item_DropCollectible2(struct PlayState* play, Vec3f* spawnPos, s32 params);
+void Item_DropCollectibleRandom(struct PlayState* play, Actor* fromActor, Vec3f* spawnPos, s16 params);
+s32 func_800A8150(s32 index);
+s32 func_800A817C(s32 index);
+bool Item_CanDropBigFairy(struct PlayState* play, s32 index, s32 collectibleFlag);
+
+#endif
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index 95c6cdcaf7..6397474eee 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -13,6 +13,14 @@ static s16 sBssPad;
 u8 gDisablePlayerCsActionStartPos;
 s16 gDungeonBossWarpSceneId;
 
+#include "macros.h"
+#include "regs.h"
+#include "seqcmd.h"
+#include "sequence.h"
+#include "sfx.h"
+#include "z64lib.h"
+#include "z64ocarina.h"
+#include "z64play.h"
 #include "z64quake.h"
 #include "z64rumble.h"
 #include "z64shrink_window.h"
diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c
index 92b1d4b67f..1d164b55be 100644
--- a/src/code/z_en_a_keep.c
+++ b/src/code/z_en_a_keep.c
@@ -1,3 +1,8 @@
+#include "z_en_a_obj.h"
+#include "gfx.h"
+#include "ichain.h"
+#include "z64play.h"
+
 #include "global.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/code/z_en_hy_code.c b/src/code/z_en_hy_code.c
index 86d182c66c..be3a58a053 100644
--- a/src/code/z_en_hy_code.c
+++ b/src/code/z_en_hy_code.c
@@ -5,6 +5,13 @@
 
 #include "z_en_hy_code.h"
 #include "overlays/actors/ovl_En_Door/z_en_door.h"
+
+#include "segmented_address.h"
+#include "sfx.h"
+#include "macros.h"
+#include "z64play.h"
+#include "z64subs.h"
+
 #include "assets/objects/object_aob/object_aob.h"
 #include "assets/objects/object_bba/object_bba.h"
 #include "assets/objects/object_bji/object_bji.h"
diff --git a/src/code/z_en_item00.c b/src/code/z_en_item00.c
index 64a17eadd4..4d4cdfeb8e 100644
--- a/src/code/z_en_item00.c
+++ b/src/code/z_en_item00.c
@@ -1,11 +1,24 @@
-#include "global.h"
-#include "attributes.h"
-#include "overlays/actors/ovl_En_Elforg/z_en_elforg.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
-#include "assets/objects/object_gi_hearts/object_gi_hearts.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"
 #include "overlays/actors/ovl_En_Elforg/z_en_elforg.h"
 
+#include "libc64/qrand.h"
+#include "attributes.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "macros.h"
+#include "rand.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z64effect.h"
+#include "z64lib.h"
+#include "z64play.h"
+
+#include "global.h"
+#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/object_gi_hearts/object_gi_hearts.h"
+
 #define FLAGS 0x00000000
 
 void EnItem00_Init(Actor* thisx, PlayState* play);
diff --git a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c
index 67241ceeae..9f20c8d597 100644
--- a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c
+++ b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.c
@@ -6,6 +6,13 @@
 
 #include "z_bg_danpei_movebg.h"
 
+#include "gfx.h"
+#include "ichain.h"
+#include "macros.h"
+#include "segmented_address.h"
+#include "sfx.h"
+#include "z64play.h"
+
 #include "assets/objects/object_d_lift/object_d_lift.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED)
diff --git a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.h b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.h
index 2de90c2e97..4b96f80cde 100644
--- a/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.h
+++ b/src/overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.h
@@ -1,11 +1,12 @@
 #ifndef Z_BG_DANPEI_MOVEBG_H
 #define Z_BG_DANPEI_MOVEBG_H
 
-#include "global.h"
+#include "z64actor.h"
+#include "z64subs.h"
 
 struct BgDanpeiMovebg;
 
-typedef void (*BgDanpeiMovebgActionFunc)(struct BgDanpeiMovebg*, PlayState*);
+typedef void (*BgDanpeiMovebgActionFunc)(struct BgDanpeiMovebg*, struct PlayState*);
 
 #define BGDANPEIMOVEBG_GET_PATH_INDEX(thisx) ((thisx)->params & 0x7F)
 #define BGDANPEIMOVEBG_GET_TYPE(thisx)       (((thisx)->params >> 0xE) & 3)
diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
index 5d705e6a31..0f879d9047 100644
--- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
+++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
@@ -6,6 +6,7 @@
 
 #include "z_bg_dy_yoseizo.h"
 #include "overlays/actors/ovl_Demo_Effect/z_demo_effect.h"
+#include "overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
 
diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h
index 6fd5750f0d..7a5890de45 100644
--- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h
+++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h
@@ -1,13 +1,14 @@
 #ifndef Z_BG_DY_YOSEIZO_H
 #define Z_BG_DY_YOSEIZO_H
 
+#include "z64actor.h"
 #include "global.h"
-#include "overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h"
 #include "assets/objects/object_dy_obj/object_dy_obj.h"
 
 struct BgDyYoseizo;
+struct EnDyExtra;
 
-typedef void (*BgDyYoseizoActionFunc)(struct BgDyYoseizo*, PlayState*);
+typedef void (*BgDyYoseizoActionFunc)(struct BgDyYoseizo*, struct PlayState*);
 
 #define GREAT_FAIRY_GET_SWITCHFLAG(thisx) (((thisx)->params & 0xFE00) >> 9)
 #define GREAT_FAIRY_GET_TYPE(thisx) ((thisx)->params & 0xF)
@@ -47,7 +48,7 @@ typedef struct BgDyYoseizo {
     /* 0x0234 */ Vec3s morphTable[GREAT_FAIRY_LIMB_MAX];
     /* 0x02DC */ Vec3s headRot;
     /* 0x02DC */ Vec3s torsoRot;
-    /* 0x02E8 */ EnDyExtra* beam;
+    /* 0x02E8 */ struct EnDyExtra* beam;
     /* 0x02EC */ f32 unk2EC; // unused
     /* 0x02F0 */ f32 unk2F0;
     /* 0x02F4 */ f32 unk2F4;
diff --git a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c
index 1e94ffc895..ae48844408 100644
--- a/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c
+++ b/src/overlays/actors/ovl_Bg_Icicle/z_bg_icicle.c
@@ -5,6 +5,8 @@
  */
 
 #include "z_bg_icicle.h"
+#include "z_en_item00.h"
+
 #include "assets/objects/object_icicle/object_icicle.h"
 
 #define FLAGS 0x00000000
diff --git a/src/overlays/actors/ovl_Boss_01/z_boss_01.c b/src/overlays/actors/ovl_Boss_01/z_boss_01.c
index 2b5f44389e..e7ac0d6a6e 100644
--- a/src/overlays/actors/ovl_Boss_01/z_boss_01.c
+++ b/src/overlays/actors/ovl_Boss_01/z_boss_01.c
@@ -26,6 +26,7 @@
  */
 
 #include "z_boss_01.h"
+#include "z_en_item00.h"
 #include "z64rumble.h"
 #include "z64shrink_window.h"
 #include "attributes.h"
diff --git a/src/overlays/actors/ovl_Boss_05/z_boss_05.c b/src/overlays/actors/ovl_Boss_05/z_boss_05.c
index 0cfd6fc171..794332f801 100644
--- a/src/overlays/actors/ovl_Boss_05/z_boss_05.c
+++ b/src/overlays/actors/ovl_Boss_05/z_boss_05.c
@@ -28,6 +28,7 @@
  */
 
 #include "z_boss_05.h"
+#include "z_en_item00.h"
 #include "attributes.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE)
diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
index 06d2424d7b..2d8163264f 100644
--- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
+++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
@@ -6,6 +6,15 @@
 
 #include "z_demo_effect.h"
 #include "attributes.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "macros.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z64lib.h"
+#include "z64play.h"
+
+#include "global.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/object_efc_tw/object_efc_tw.h"
 
diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h
index 538f6bc1e9..cd8dee87fb 100644
--- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h
+++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h
@@ -1,12 +1,13 @@
 #ifndef Z_DEMO_EFFECT_H
 #define Z_DEMO_EFFECT_H
 
-#include "global.h"
+#include "z64actor.h"
 #include "z64curve.h"
 
 struct DemoEffect;
+struct PlayState;
 
-typedef void (*DemoEffectActionFunc)(struct DemoEffect*, PlayState*);
+typedef void (*DemoEffectActionFunc)(struct DemoEffect*, struct PlayState*);
 
 #define DEMO_EFFECT_GET_TYPE(thisx) ((thisx)->params & 0xFF)
 
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 61f7efe598..029d065993 100644
--- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
+++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
@@ -7,6 +7,9 @@
 #include "z_elf_msg.h"
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"
 
+#include "ichain.h"
+#include "z64play.h"
+
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED)
 
 void ElfMsg_Init(Actor* thisx, PlayState* play);
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 b512af2dee..b9f34c7d2b 100644
--- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h
+++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h
@@ -1,15 +1,16 @@
 #ifndef Z_ELF_MSG_H
 #define Z_ELF_MSG_H
 
-#include "global.h"
+#include "z64actor.h"
 
 #define ELFMSG_GET_FF(thisx) ((thisx)->params & 0xFF)
 #define ELFMSG_GET_SWITCH_FLAG(thisx) (((thisx)->params & 0x7F00) >> 8)
 #define ELFMSG_GET_8000(thisx) ((thisx)->params & 0x8000)
 
 struct ElfMsg;
+struct PlayState;
 
-typedef void (*ElfMsgActionFunc)(struct ElfMsg*, PlayState*);
+typedef void (*ElfMsgActionFunc)(struct ElfMsg*, struct PlayState*);
 
 typedef struct ElfMsg {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c
index b59ca62d5d..d8832df34a 100644
--- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c
+++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c
@@ -5,6 +5,8 @@
  */
 
 #include "z_elf_msg2.h"
+#include "ichain.h"
+#include "z64play.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED)
 
diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h
index aa717800b9..10dd767045 100644
--- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h
+++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h
@@ -1,14 +1,15 @@
 #ifndef Z_ELF_MSG2_H
 #define Z_ELF_MSG2_H
 
-#include "global.h"
+#include "z64actor.h"
 
 #define ELFMSG2_GET_SWITCH_FLAG(thisx) (((thisx)->params >> 8) & 0x7F)
 #define ELFMSG2_GET_FF(thisx) ((thisx)->params & 0xFF)
 
 struct ElfMsg2;
+struct PlayState;
 
-typedef void (*ElfMsg2ActionFunc)(struct ElfMsg2*, PlayState*);
+typedef void (*ElfMsg2ActionFunc)(struct ElfMsg2*, struct PlayState*);
 
 typedef struct ElfMsg2 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c
index 8e47605aa1..d29b05c94d 100644
--- a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c
+++ b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.c
@@ -7,6 +7,9 @@
 #include "z_elf_msg3.h"
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"
 
+#include "ichain.h"
+#include "z64play.h"
+
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED)
 
 void ElfMsg3_Init(Actor* thisx, PlayState* play);
diff --git a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.h b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.h
index 6b1c24671c..c997d172fe 100644
--- a/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.h
+++ b/src/overlays/actors/ovl_Elf_Msg3/z_elf_msg3.h
@@ -1,15 +1,16 @@
 #ifndef Z_ELF_MSG3_H
 #define Z_ELF_MSG3_H
 
-#include "global.h"
+#include "z64actor.h"
 
 #define ELFMSG3_GET_SWITCH_FLAG(thisx) (((thisx)->params & 0x7F00) >> 8)
 #define ELFMSG3_GET_FF(thisx) ((thisx)->params & 0xFF)
 #define ELFMSG3_GET_8000(thisx) ((thisx)->params & 0x8000)
 
 struct ElfMsg3;
+struct PlayState;
 
-typedef void (*ElfMsg3ActionFunc)(struct ElfMsg3*, PlayState*);
+typedef void (*ElfMsg3ActionFunc)(struct ElfMsg3*, struct PlayState*);
 
 typedef struct ElfMsg3 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c
index 01d70ead5c..5f8b81ab73 100644
--- a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c
+++ b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.c
@@ -8,6 +8,9 @@
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"
 #include "overlays/actors/ovl_Elf_Msg5/z_elf_msg5.h"
 
+#include "ichain.h"
+#include "z64play.h"
+
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED)
 
 void ElfMsg4_Init(Actor* thisx, PlayState* play);
diff --git a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.h b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.h
index 1e4b78f29b..2f2507e16e 100644
--- a/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.h
+++ b/src/overlays/actors/ovl_Elf_Msg4/z_elf_msg4.h
@@ -1,15 +1,16 @@
 #ifndef Z_ELF_MSG4_H
 #define Z_ELF_MSG4_H
 
-#include "global.h"
+#include "z64actor.h"
 
 #define ELFMSG4_GET_SWITCH_FLAG(thisx) (((thisx)->params & 0x7F00) >> 8)
 #define ELFMSG4_GET_8000(thisx) ((thisx)->params & 0x8000)
 #define ELFMSG4_GET_TEXT(thisx) ((thisx)->params & 0xFF)
 
 struct ElfMsg4;
+struct PlayState;
 
-typedef void (*ElfMsg4ActionFunc)(struct ElfMsg4*, PlayState*);
+typedef void (*ElfMsg4ActionFunc)(struct ElfMsg4*, struct PlayState*);
 
 typedef struct ElfMsg4 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c
index 8441bbb52a..ca284a31e6 100644
--- a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c
+++ b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.c
@@ -6,6 +6,9 @@
 
 #include "z_elf_msg5.h"
 
+#include "ichain.h"
+#include "z64play.h"
+
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED)
 
 void ElfMsg5_Init(Actor* thisx, PlayState* play);
diff --git a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.h b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.h
index e1e54ca643..fa9e029ff7 100644
--- a/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.h
+++ b/src/overlays/actors/ovl_Elf_Msg5/z_elf_msg5.h
@@ -1,14 +1,15 @@
 #ifndef Z_ELF_MSG5_H
 #define Z_ELF_MSG5_H
 
-#include "global.h"
+#include "z64actor.h"
 
 #define ELFMSG5_GET_SWITCH_FLAG(thisx) (((thisx)->params >> 8) & 0x7F)
 #define ELFMSG5_GET_FF(thisx) ((thisx)->params & 0xFF)
 
 struct ElfMsg5;
+struct PlayState;
 
-typedef void (*ElfMsg5ActionFunc)(struct ElfMsg5*, PlayState*);
+typedef void (*ElfMsg5ActionFunc)(struct ElfMsg5*, struct PlayState*);
 
 typedef struct ElfMsg5 {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c
index ae7de6cc6f..3c0a3247dd 100644
--- a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c
+++ b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.c
@@ -7,6 +7,9 @@
 #include "z_elf_msg6.h"
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"
 
+#include "ichain.h"
+#include "z64play.h"
+
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED)
 
 void ElfMsg6_Init(Actor* thisx, PlayState* play);
diff --git a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.h b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.h
index 640c359877..83d412ea07 100644
--- a/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.h
+++ b/src/overlays/actors/ovl_Elf_Msg6/z_elf_msg6.h
@@ -1,11 +1,12 @@
 #ifndef Z_ELF_MSG6_H
 #define Z_ELF_MSG6_H
 
-#include "global.h"
+#include "z64actor.h"
 
 struct ElfMsg6;
+struct PlayState;
 
-typedef void (*ElfMsg6ActionFunc)(struct ElfMsg6*, PlayState*);
+typedef void (*ElfMsg6ActionFunc)(struct ElfMsg6*, struct PlayState*);
 
 #define ELFMSG6_GET_F(thisx) ((thisx)->params & 0xF)
 #define ELFMSG6_GET_F0(thisx) (((thisx)->params & 0xF0) >> 4)
diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c
index 84ed4b4937..9b0b31f29b 100644
--- a/src/overlays/actors/ovl_En_Am/z_en_am.c
+++ b/src/overlays/actors/ovl_En_Am/z_en_am.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_am.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Bom/z_en_bom.h"
 #include "overlays/actors/ovl_En_Bombf/z_en_bombf.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
diff --git a/src/overlays/actors/ovl_En_An/z_en_an.c b/src/overlays/actors/ovl_En_An/z_en_an.c
index 1acf91737f..47d1cf83b4 100644
--- a/src/overlays/actors/ovl_En_An/z_en_an.c
+++ b/src/overlays/actors/ovl_En_An/z_en_an.c
@@ -5,9 +5,23 @@
  */
 
 #include "z_en_an.h"
-#include "attributes.h"
 #include "overlays/actors/ovl_En_Door/z_en_door.h"
 
+#include "attributes.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "macros.h"
+#include "regs.h"
+#include "segmented_address.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z64lib.h"
+#include "z64msgevent.h"
+#include "z64play.h"
+#include "z64schedule.h"
+#include "z64subs.h"
+
+#include "assets/objects/object_an1/object_an1.h"
 #include "assets/objects/object_an2/object_an2.h"
 #include "assets/objects/object_an3/object_an3.h"
 #include "assets/objects/object_an4/object_an4.h"
diff --git a/src/overlays/actors/ovl_En_An/z_en_an.h b/src/overlays/actors/ovl_En_An/z_en_an.h
index 9273523b05..6f8b1da0d2 100644
--- a/src/overlays/actors/ovl_En_An/z_en_an.h
+++ b/src/overlays/actors/ovl_En_An/z_en_an.h
@@ -1,14 +1,20 @@
 #ifndef Z_EN_AN_H
 #define Z_EN_AN_H
 
+#include "unk.h"
+#include "z64actor.h"
+#include "z64msgevent.h"
+
 #include "global.h"
 #include "assets/objects/object_an1/object_an1.h"
 
 struct EnAn;
+struct Path;
+struct PlayState;
 
-typedef void (*EnAnActionFunc)(struct EnAn*, PlayState*);
-typedef void (*EnAnDialogueFunc)(struct EnAn*, PlayState*);
-typedef s32 (*MsgEventFunc)(Actor*, PlayState*);
+typedef void (*EnAnActionFunc)(struct EnAn*, struct PlayState*);
+typedef void (*EnAnDialogueFunc)(struct EnAn*, struct PlayState*);
+typedef s32 (*MsgEventFunc)(Actor*, struct PlayState*);
 
 #define ENAN_8000 0x8000
 
@@ -35,7 +41,7 @@ typedef struct EnAn {
     /* 0x188 */ EnAnActionFunc actionFunc;
     /* 0x18C */ EnAnDialogueFunc dialogueFunc;
     /* 0x190 */ ColliderCylinder collider;
-    /* 0x1DC */ Path* timePath;
+    /* 0x1DC */ struct Path* timePath;
     /* 0x1E0 */ Vec3f timePathTargetPos;
     /* 0x1EC */ f32 timePathProgress;
     /* 0x1F0 */ s32 timePathTotalTime;
diff --git a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c
index a844dca686..2c84ca82bd 100644
--- a/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c
+++ b/src/overlays/actors/ovl_En_Baguo/z_en_baguo.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_baguo.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c
index 0fd92ac0f6..d5454f208a 100644
--- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c
+++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_bb.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c
index 25a5d0483b..e41bdb37d1 100644
--- a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c
+++ b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.c
@@ -13,6 +13,16 @@
  */
 
 #include "z_en_bba_01.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "segmented_address.h"
+#include "sys_matrix.h"
+#include "z64play.h"
+#include "z64subs.h"
+
+#include "macros.h"
+#include "global.h"
 #include "assets/objects/object_bba/object_bba.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED)
diff --git a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.h b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.h
index 0cc158f2a2..1b23c1e516 100644
--- a/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.h
+++ b/src/overlays/actors/ovl_En_Bba_01/z_en_bba_01.h
@@ -2,10 +2,12 @@
 #define Z_EN_BBA_01_H
 
 #include "z_en_hy_code.h"
+#include "unk.h"
+#include "z64actor.h"
 
 struct EnBba01;
 
-typedef void (*EnBba01ActionFunc)(struct EnBba01*, PlayState*);
+typedef void (*EnBba01ActionFunc)(struct EnBba01*, struct PlayState*);
 
 #define ENBBA01_GET_PATH_INDEX(thisx) (((thisx)->params & 0x7E00) >> 9)
 
diff --git a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c
index 8222d83586..24120b6acd 100644
--- a/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c
+++ b/src/overlays/actors/ovl_En_Bbfall/z_en_bbfall.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_bbfall.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c
index ae207cf20c..533df2251f 100644
--- a/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c
+++ b/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_bigpamet.h"
+#include "z_en_item00.h"
 #include "z64quake.h"
 #include "z64rumble.h"
 #include "overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.h"
diff --git a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c
index 1a78c2668e..7b65ad85dd 100644
--- a/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c
+++ b/src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_bigslime.h"
+#include "z_en_item00.h"
 #include "z64quake.h"
 #include "z64rumble.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
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 5fd8c3b369..7845573eae 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 "z_en_item00.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c
index b9de4b872c..d4f766e0f0 100644
--- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c
+++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_bubble.h"
+#include "z_en_item00.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED)
 
diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.c b/src/overlays/actors/ovl_En_Butte/z_en_butte.c
index 2a8487425c..25edfa41a3 100644
--- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c
+++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c
@@ -6,6 +6,14 @@
 
 #include "z_en_butte.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 "macros.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z64play.h"
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.h b/src/overlays/actors/ovl_En_Butte/z_en_butte.h
index 7333005307..c8a1319b2d 100644
--- a/src/overlays/actors/ovl_En_Butte/z_en_butte.h
+++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.h
@@ -1,12 +1,15 @@
 #ifndef Z_EN_BUTTE_H
 #define Z_EN_BUTTE_H
 
+#include "z64actor.h"
+
 #include "global.h"
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
 
 struct EnButte;
+struct PlayState;
 
-typedef void (*EnButteActionFunc)(struct EnButte*, PlayState*);
+typedef void (*EnButteActionFunc)(struct EnButte*, struct PlayState*);
 
 #define BUTTERFLY_GET(thisx) ((thisx)->params)
 #define BUTTERFLY_GET_1(thisx) ((thisx)->params & 1)
diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
index bee6ead5a5..02e8056c3c 100644
--- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
+++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
@@ -6,6 +6,17 @@
 
 #include "z_en_clear_tag.h"
 #include "attributes.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "macros.h"
+#include "rand.h"
+#include "regs.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z64lib.h"
+#include "z64play.h"
+
+#include "global.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS                                                                                 \
diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h
index 9498e8e253..9b3cc96741 100644
--- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h
+++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h
@@ -1,7 +1,7 @@
 #ifndef Z_EN_CLEAR_TAG_H
 #define Z_EN_CLEAR_TAG_H
 
-#include "global.h"
+#include "z64actor.h"
 
 struct EnClearTag;
 
diff --git a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c
index f10bcde2e3..bc7886e249 100644
--- a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c
+++ b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.c
@@ -5,6 +5,18 @@
  */
 
 #include "z_en_cne_01.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "gfxalloc.h"
+#include "segmented_address.h"
+#include "sys_matrix.h"
+#include "z64play.h"
+#include "z64subs.h"
+
+#include "macros.h"
+#include "global.h"
+
 #include "assets/objects/object_cne/object_cne.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED)
diff --git a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.h b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.h
index feee462a99..5d9a0c7cb9 100644
--- a/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.h
+++ b/src/overlays/actors/ovl_En_Cne_01/z_en_cne_01.h
@@ -2,10 +2,12 @@
 #define Z_EN_CNE_01_H
 
 #include "z_en_hy_code.h"
+#include "unk.h"
 
 struct EnCne01;
+struct PlayState;
 
-typedef void (*EnCne01ActionFunc)(struct EnCne01*, PlayState*);
+typedef void (*EnCne01ActionFunc)(struct EnCne01*, struct PlayState*);
 
 #define ENCNE01_GET_PATH_INDEX(thisx) (((thisx)->params & 0x7E00) >> 9)
 
diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c
index 1a69cd77cf..70dc0d6c6a 100644
--- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c
+++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_crow.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 
 #define FLAGS \
diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
index 217281c1c7..d4e7a05a5c 100644
--- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
+++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_dekubaba.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c
index b606c63bd3..fc72a419fc 100644
--- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c
+++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_dekunuts.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 #include "overlays/actors/ovl_Obj_Etcetera/z_obj_etcetera.h"
 #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
index 398ba3fc0d..1136682235 100644
--- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
+++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_dodongo.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Bom/z_en_bom.h"
 #include "overlays/actors/ovl_En_Bombf/z_en_bombf.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
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 53dadf81ac..84594eb2a9 100644
--- a/src/overlays/actors/ovl_En_Door/z_en_door.c
+++ b/src/overlays/actors/ovl_En_Door/z_en_door.c
@@ -6,8 +6,21 @@
 
 #include "z_en_door.h"
 
+#include "libc64/qrand.h"
 #include "assert.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "macros.h"
+#include "sfx.h"
+#include "z64effect.h"
+#include "z64play.h"
+#include "z64schedule.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_kinsta2_obj/object_kinsta2_obj.h"
 #include "assets/objects/object_dor01/object_dor01.h"
 #include "assets/objects/object_dor02/object_dor02.h"
@@ -20,7 +33,6 @@
 #include "assets/objects/object_wdor05/object_wdor05.h"
 #include "assets/objects/object_numa_obj/object_numa_obj.h"
 #include "assets/objects/object_kaizoku_obj/object_kaizoku_obj.h"
-#include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED)
 
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 c0797cba8d..8708f4830d 100644
--- a/src/overlays/actors/ovl_En_Door/z_en_door.h
+++ b/src/overlays/actors/ovl_En_Door/z_en_door.h
@@ -1,8 +1,10 @@
 #ifndef Z_EN_DOOR_H
 #define Z_EN_DOOR_H
 
-#include "global.h"
+#include "z64actor.h"
 #include "z64door.h"
+
+#include "global.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 /**
@@ -37,8 +39,9 @@
  */
 
 struct EnDoor;
+struct PlayState;
 
-typedef void (*EnDoorActionFunc)(struct EnDoor*, PlayState*);
+typedef void (*EnDoorActionFunc)(struct EnDoor*, struct PlayState*);
 
 typedef enum EnDoorType {
     /* 0 */ ENDOOR_TYPE_WHOLE_DAY, // Allows to specify the door may be closed for full specific days. Which days the door is closed is controlled by the "half day bit index" part of the parameter
diff --git a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c
index d4441493b6..4a8c4bc5d6 100644
--- a/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c
+++ b/src/overlays/actors/ovl_En_Dragon/z_en_dragon.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_dragon.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Ot/z_en_ot.h"
 
 #define FLAGS                                                                                 \
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 e7e2006db0..69d4d57f7d 100644
--- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c
+++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c
@@ -5,8 +5,22 @@
  */
 
 #include "z_en_elf.h"
+#include "libc64/qrand.h"
 #include "attributes.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "macros.h"
+#include "rand.h"
+#include "regs.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z64effect.h"
 #include "z64elf_message.h"
+#include "z64play.h"
+
+#include "global.h"
+#include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
 
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 a6c5df9736..abf421feb9 100644
--- a/src/overlays/actors/ovl_En_Elf/z_en_elf.h
+++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.h
@@ -1,13 +1,16 @@
 #ifndef Z_EN_ELF_H
 #define Z_EN_ELF_H
 
+#include "z64actor.h"
+#include "z64light.h"
+
 #include "global.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.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*);
 
 #define FAIRY_GET_TYPE(thisx) ((thisx)->params & 0xF)
 #define FAIRY_GET_BOOL_PARAM(thisx) ((thisx)->params & 0x100)
diff --git a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.h b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.h
index 90f73a8a6e..7f3e1004e9 100644
--- a/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.h
+++ b/src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.h
@@ -1,23 +1,24 @@
 #ifndef Z_EN_ELFGRP_H
 #define Z_EN_ELFGRP_H
 
-#include "global.h"
-#include "overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h"
+#include "z64actor.h"
 
 struct EnElfgrp;
+struct PlayState;
 
-typedef void (*EnElfgrpActionFunc)(struct EnElfgrp*, PlayState*);
+typedef void (*EnElfgrpActionFunc)(struct EnElfgrp*, struct PlayState*);
 
 #define ENELFGRP_GET_TYPE(thisx) ((thisx)->params & 0xF) //!< Same type as Great Fairies
 #define ENELFGRP_GET_SWITCH_FLAG_PARAMS(thisx) (((thisx)->params & 0xFE00) >> 9)
 #define ENELFGRP_GET_SWITCHFLAG_ROT(thisx) ((thisx)->home.rot.z)
 
+// Corresponds to GreatFairyType
 typedef enum ElfgrpType {
-    /* 0 */ ENELFGRP_TYPE_MAGIC = GREAT_FAIRY_TYPE_MAGIC,
-    /* 1 */ ENELFGRP_TYPE_POWER = GREAT_FAIRY_TYPE_POWER,
-    /* 2 */ ENELFGRP_TYPE_WISDOM = GREAT_FAIRY_TYPE_WISDOM,
-    /* 3 */ ENELFGRP_TYPE_COURAGE = GREAT_FAIRY_TYPE_COURAGE,
-    /* 4 */ ENELFGRP_TYPE_KINDNESS = GREAT_FAIRY_TYPE_KINDNESS,
+    /* 0 */ ENELFGRP_TYPE_MAGIC,
+    /* 1 */ ENELFGRP_TYPE_POWER,
+    /* 2 */ ENELFGRP_TYPE_WISDOM,
+    /* 3 */ ENELFGRP_TYPE_COURAGE,
+    /* 4 */ ENELFGRP_TYPE_KINDNESS,
     /* 5 */ ENELFGRP_TYPE_MAX
 } ElfgrpType;
 
diff --git a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.h b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.h
index d52465a8d9..46c2eaea06 100644
--- a/src/overlays/actors/ovl_En_Elforg/z_en_elforg.h
+++ b/src/overlays/actors/ovl_En_Elforg/z_en_elforg.h
@@ -1,8 +1,9 @@
 #ifndef Z_EN_ELFORG_H
 #define Z_EN_ELFORG_H
 
+#include "z64actor.h"
+
 #include "global.h"
-#include "overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define STRAY_FAIRY_TYPE(thisx) ((thisx)->params & 0xF)
@@ -30,19 +31,20 @@ typedef enum StrayFairyType {
     /* 8 */ STRAY_FAIRY_TYPE_RETURNING_TO_FOUNTAIN // The ones you "turn in" by walking into a Fairy Fountain
 } StrayFairyType;
 
-// Corresponds to the Great Fairy types
+// Corresponds to GreatFairyType
 typedef enum StrayFairyArea {
-    /* 0 */ STRAY_FAIRY_AREA_CLOCK_TOWN = GREAT_FAIRY_TYPE_MAGIC,
-    /* 1 */ STRAY_FAIRY_AREA_WOODFALL = GREAT_FAIRY_TYPE_POWER,
-    /* 2 */ STRAY_FAIRY_AREA_SNOWHEAD = GREAT_FAIRY_TYPE_WISDOM,
-    /* 3 */ STRAY_FAIRY_AREA_GREAT_BAY = GREAT_FAIRY_TYPE_COURAGE,
-    /* 4 */ STRAY_FAIRY_AREA_STONE_TOWER = GREAT_FAIRY_TYPE_KINDNESS,
+    /* 0 */ STRAY_FAIRY_AREA_CLOCK_TOWN,
+    /* 1 */ STRAY_FAIRY_AREA_WOODFALL,
+    /* 2 */ STRAY_FAIRY_AREA_SNOWHEAD,
+    /* 3 */ STRAY_FAIRY_AREA_GREAT_BAY,
+    /* 4 */ STRAY_FAIRY_AREA_STONE_TOWER,
     /* 5 */ STRAY_FAIRY_AREA_MAX
 } StrayFairyArea;
 
 struct EnElforg;
+struct PlayState;
 
-typedef void (*EnElforgActionFunc)(struct EnElforg*, PlayState*);
+typedef void (*EnElforgActionFunc)(struct EnElforg*, struct PlayState*);
 
 typedef struct EnElforg {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_En_Famos/z_en_famos.c b/src/overlays/actors/ovl_En_Famos/z_en_famos.c
index 48313a7c89..ff720de8eb 100644
--- a/src/overlays/actors/ovl_En_Famos/z_en_famos.c
+++ b/src/overlays/actors/ovl_En_Famos/z_en_famos.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_famos.h"
+#include "z_en_item00.h"
 #include "z64rumble.h"
 #include "overlays/actors/ovl_En_Bom/z_en_bom.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c
index 8bf4c520e9..4e480dd531 100644
--- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c
+++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_firefly.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 #include "overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h"
 
diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
index 534e58cce4..4259a5e93e 100644
--- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
+++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_floormas.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER)
diff --git a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c
index 4edcec2f12..e592da70ee 100644
--- a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c
+++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.c
@@ -5,7 +5,18 @@
  */
 
 #include "z_en_fsn.h"
+#include "libc64/qrand.h"
 #include "attributes.h"
+#include "controller.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z64lib.h"
+#include "z64play.h"
+#include "z64subs.h"
+
+#include "global.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED)
diff --git a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.h b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.h
index 4465ecb944..65a8f9ba32 100644
--- a/src/overlays/actors/ovl_En_Fsn/z_en_fsn.h
+++ b/src/overlays/actors/ovl_En_Fsn/z_en_fsn.h
@@ -1,8 +1,10 @@
 #ifndef Z_EN_FSN_H
 #define Z_EN_FSN_H
 
-#include "global.h"
+#include "z64actor.h"
 #include "overlays/actors/ovl_En_GirlA/z_en_girla.h"
+
+#include "global.h"
 #include "assets/objects/object_fsn/object_fsn.h"
 
 #define ENFSN_IS_BACKROOM(thisx) ((thisx)->params & 1)
@@ -16,8 +18,9 @@
 #define ENFSN_LIMB_MAX FSN_LIMB_MAX + 1 // Note: adding 1 to FSN_LIMB_MAX due to bug in the skeleton, see bug in object_fsn.xml
 
 struct EnFsn;
+struct PlayState;
 
-typedef void (*EnFsnActionFunc)(struct EnFsn*, PlayState*);
+typedef void (*EnFsnActionFunc)(struct EnFsn*, struct PlayState*);
 
 typedef struct EnFsn {
     /* 0x000 */ Actor actor;
diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c
index ea574255fd..563bcc7e69 100644
--- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c
+++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_fz.h"
+#include "z_en_item00.h"
 #include "attributes.h"
 #include "overlays/actors/ovl_En_Wiz/z_en_wiz.h"
 #include "assets/objects/object_fz/object_fz.h"
diff --git a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c
index 1968fd5042..1f11873391 100644
--- a/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c
+++ b/src/overlays/actors/ovl_En_Gakufu/z_en_gakufu.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_gakufu.h"
+#include "z_en_item00.h"
 #include "assets/interface/parameter_static/parameter_static.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_UPDATE_DURING_OCARINA)
diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
index 7673633b39..fe1f3bc5d2 100644
--- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
+++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c
@@ -6,6 +6,12 @@
 
 #include "z_en_girla.h"
 
+#include "macros.h"
+#include "sys_matrix.h"
+#include "z64play.h"
+
+#include "global.h"
+
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED)
 
 void EnGirlA_Init(Actor* thisx, PlayState* play);
diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h
index f289e31d54..4d6581df95 100644
--- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h
+++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h
@@ -1,14 +1,15 @@
 #ifndef Z_EN_GIRLA_H
 #define Z_EN_GIRLA_H
 
-#include "global.h"
+#include "z64actor.h"
 
 struct EnGirlA;
+struct PlayState;
 
-typedef void (*EnGirlAActionFunc)(struct EnGirlA*, PlayState*);
-typedef void (*EnGirlADrawFunc)(struct Actor*, PlayState*, s32);
-typedef s32 (*EnGirlACanBuyFunc)(PlayState*, struct EnGirlA*);
-typedef void (*EnGirlAShopActionFunc)(PlayState*, struct EnGirlA*); // Buying/Restocking
+typedef void (*EnGirlAActionFunc)(struct EnGirlA*, struct PlayState*);
+typedef void (*EnGirlADrawFunc)(struct Actor*, struct PlayState*, s32);
+typedef s32 (*EnGirlACanBuyFunc)(struct PlayState*, struct EnGirlA*);
+typedef void (*EnGirlAShopActionFunc)(struct PlayState*, struct EnGirlA*); // Buying/Restocking
 
 typedef struct ShopItemEntry {
     /* 0x00 */ s16 objectId;
@@ -107,8 +108,8 @@ typedef enum {
     /* 0x2B */ SI_MAX
 } EnGirlAShopItemId;
 
-/* 
-* Shopkeeper Common Defines 
+/*
+* Shopkeeper Common Defines
 */
 #define CURSOR_INVALID 0xFF
 #define COL_CHAN_MIX(c1, c2, m) (c1 - (s32)(c2 * m)) & 0xFF
diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c
index b421279fb3..cb50c26ebe 100644
--- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c
+++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c
@@ -6,6 +6,16 @@
 
 #include "z_en_gm.h"
 #include "attributes.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "macros.h"
+#include "regs.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z64lib.h"
+#include "z64play.h"
+#include "z64schedule.h"
+#include "z64subs.h"
 #include "overlays/actors/ovl_En_Door/z_en_door.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED)
diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.h b/src/overlays/actors/ovl_En_Gm/z_en_gm.h
index 8c584331db..56523acde7 100644
--- a/src/overlays/actors/ovl_En_Gm/z_en_gm.h
+++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.h
@@ -1,13 +1,16 @@
 #ifndef Z_EN_GM_H
 #define Z_EN_GM_H
 
-#include "global.h"
+#include "z64actor.h"
+#include "z64msgevent.h"
 #include "assets/objects/object_in2/object_in2.h"
 
 struct EnGm;
+struct Path;
+struct PlayState;
 
-typedef void (*EnGmActionFunc)(struct EnGm*, PlayState*);
-typedef void (*EnGmUnkFunc2)(struct EnGm*, PlayState*);
+typedef void (*EnGmActionFunc)(struct EnGm*, struct PlayState*);
+typedef void (*EnGmUnkFunc2)(struct EnGm*, struct PlayState*);
 
 #define ENGM_GET_PATH_INDEX(thisx) ((thisx)->params & 0xFF)
 
@@ -20,7 +23,7 @@ typedef struct EnGm {
     /* 0x18C */ EnGmUnkFunc2 unk_18C;
     /* 0x190 */ ColliderCylinder colliderCylinder;
     /* 0x1DC */ ColliderSphere colliderSphere;
-    /* 0x234 */ Path* timePath;
+    /* 0x234 */ struct Path* timePath;
     /* 0x238 */ Vec3f timePathTargetPos;
     /* 0x244 */ f32 timePathProgress;
     /* 0x248 */ s32 timePathTotalTime;
diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
index a3cddbd2b2..1eee03441b 100644
--- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
+++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_goroiwa.h"
+#include "z_en_item00.h"
 #include "z64quake.h"
 #include "assets/objects/object_goroiwa/object_goroiwa.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
diff --git a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c
index c2840cc08e..fab76975c6 100644
--- a/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c
+++ b/src/overlays/actors/ovl_En_Grasshopper/z_en_grasshopper.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_grasshopper.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.c b/src/overlays/actors/ovl_En_Gs/z_en_gs.c
index 7398df4871..6d0e7c534f 100644
--- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c
+++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c
@@ -5,10 +5,24 @@
  */
 
 #include "z_en_gs.h"
-#include "z64voice.h"
-#include "attributes.h"
 #include "overlays/actors/ovl_En_Bom/z_en_bom.h"
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"
+#include "attributes.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "macros.h"
+#include "rand.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z64effect.h"
+#include "z64lib.h"
+#include "z64ocarina.h"
+#include "z64play.h"
+#include "z64subs.h"
+#include "z64voice.h"
+
+#include "global.h"
 #include "assets/objects/object_gs/object_gs.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.h b/src/overlays/actors/ovl_En_Gs/z_en_gs.h
index ffeb3083e6..d8cd81da75 100644
--- a/src/overlays/actors/ovl_En_Gs/z_en_gs.h
+++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.h
@@ -1,11 +1,12 @@
 #ifndef Z_EN_GS_H
 #define Z_EN_GS_H
 
-#include "global.h"
+#include "z64actor.h"
 
 struct EnGs;
+struct PlayState;
 
-typedef void (*EnGsActionFunc)(struct EnGs*, PlayState*);
+typedef void (*EnGsActionFunc)(struct EnGs*, struct PlayState*);
 
 #define ENGS_GET_1F(thisx) ((thisx)->params & 0x1F)
 #define ENGS_GET_SWITCH_FLAG(thisx) (((thisx)->params >> 5) & 0x7F)
diff --git a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c
index 64f8da1acd..98b7f411f6 100644
--- a/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c
+++ b/src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_hint_skb.h"
+#include "z_en_item00.h"
 #include "attributes.h"
 #include "overlays/actors/ovl_En_Part/z_en_part.h"
 #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
diff --git a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c
index d0ed117f0c..8552d7f96a 100644
--- a/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c
+++ b/src/overlays/actors/ovl_En_Hit_Tag/z_en_hit_tag.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_hit_tag.h"
+#include "z_en_item00.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED)
 
diff --git a/src/overlays/actors/ovl_En_Ig/z_en_ig.c b/src/overlays/actors/ovl_En_Ig/z_en_ig.c
index d80329ea10..4f2a7a8ca9 100644
--- a/src/overlays/actors/ovl_En_Ig/z_en_ig.c
+++ b/src/overlays/actors/ovl_En_Ig/z_en_ig.c
@@ -5,8 +5,19 @@
  */
 
 #include "z_en_ig.h"
-#include "attributes.h"
 #include "overlays/actors/ovl_En_Door/z_en_door.h"
+#include "attributes.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "macros.h"
+#include "regs.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z64lib.h"
+#include "z64play.h"
+#include "z64schedule.h"
+#include "z64subs.h"
+#include "assets/objects/object_dai/object_dai.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED)
 
diff --git a/src/overlays/actors/ovl_En_Ig/z_en_ig.h b/src/overlays/actors/ovl_En_Ig/z_en_ig.h
index 0c16bebb11..ee06501309 100644
--- a/src/overlays/actors/ovl_En_Ig/z_en_ig.h
+++ b/src/overlays/actors/ovl_En_Ig/z_en_ig.h
@@ -1,13 +1,16 @@
 #ifndef Z_EN_IG_H
 #define Z_EN_IG_H
 
-#include "global.h"
+#include "z64actor.h"
+#include "z64msgevent.h"
 #include "assets/objects/object_dai/object_dai.h"
 
 struct EnIg;
+struct Path;
+struct PlayState;
 
-typedef void (*EnIgActionFunc)(struct EnIg*, PlayState*);
-typedef void (*EnIgUnkFunc2)(struct EnIg*, PlayState*);
+typedef void (*EnIgActionFunc)(struct EnIg*, struct PlayState*);
+typedef void (*EnIgUnkFunc2)(struct EnIg*, struct PlayState*);
 
 #define ENIG_GET_PATH_INDEX(thisx) ((thisx)->params & 0xFF)
 
@@ -19,7 +22,7 @@ typedef struct EnIg {
     /* 0x190 */ MtxF unk_190;
     /* 0x1D0 */ ColliderCylinder collider1;
     /* 0x21C */ ColliderSphere collider2;
-    /* 0x274 */ Path* timePath;
+    /* 0x274 */ struct Path* timePath;
     /* 0x278 */ Vec3f timePathTargetPos;
     /* 0x284 */ f32 timePathProgress;
     /* 0x288 */ s32 timePathTotalTime;
diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c
index 0f9164d65e..66454553bc 100644
--- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c
+++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_ik.h"
+#include "z_en_item00.h"
 #include "z64rumble.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 
diff --git a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c
index 7a92ad8910..0fe6ff0b79 100644
--- a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c
+++ b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.c
@@ -30,13 +30,34 @@
  */
 
 #include "z_en_invadepoh.h"
-
-#include "sys_cfb.h"
-#include "z64horse.h"
-#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 #include "overlays/actors/ovl_En_Door/z_en_door.h"
 
+#include "libc64/qrand.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "regs.h"
+#include "seqcmd.h"
+#include "sequence.h"
+#include "sfx.h"
+#include "sys_cfb.h"
+#include "sys_matrix.h"
+#include "z64effect.h"
+#include "z64horse.h"
+#include "z64lib.h"
+#include "z64play.h"
+
+#include "global.h"
+
+#include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/object_cow/object_cow.h"
+#include "assets/objects/object_dog/object_dog.h"
+#include "assets/objects/object_ma1/object_ma1.h"
+#include "assets/objects/object_ma2/object_ma2.h"
+#include "assets/objects/object_uch/object_uch.h"
+
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED)
 
 #define ALIEN_COUNT 8
diff --git a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.h b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.h
index 077a0b4f1e..b70cd5b1cf 100644
--- a/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.h
+++ b/src/overlays/actors/ovl_En_Invadepoh/z_en_invadepoh.h
@@ -1,6 +1,8 @@
 #ifndef Z_EN_INVADEPOH_H
 #define Z_EN_INVADEPOH_H
 
+#include "unk.h"
+#include "z64actor.h"
 #include "global.h"
 #include "assets/objects/object_cow/object_cow.h"
 #include "assets/objects/object_dog/object_dog.h"
@@ -10,10 +12,11 @@
 
 struct EnInvadepoh;
 struct EnInvadepohEffect;
+struct PlayState;
 
-typedef void (*EnInvadepohActionFunc)(struct EnInvadepoh* this, PlayState* play);
-typedef void (*EnInvadepohInitFunc)(struct EnInvadepoh* this, PlayState* play);
-typedef void (*EnInvadepohDestroyFunc)(struct EnInvadepoh* this, PlayState* play);
+typedef void (*EnInvadepohActionFunc)(struct EnInvadepoh* this, struct PlayState* play);
+typedef void (*EnInvadepohInitFunc)(struct EnInvadepoh* this, struct PlayState* play);
+typedef void (*EnInvadepohDestroyFunc)(struct EnInvadepoh* this, struct PlayState* play);
 typedef void (*EnInvadepohEffectUpdateFunc)(struct EnInvadepohEffect* warpEffect);
 
 #define EN_INVADEPOH_GET_INDEX(thisx) ((thisx)->params & 7)
@@ -52,7 +55,7 @@ typedef enum EnInvadepohAlienAbductorIndex {
     /* 1 */ EN_INVADEPOH_ALIEN_ABDUCTOR_INDEX_COW_1,
     /* 2 */ EN_INVADEPOH_ALIEN_ABDUCTOR_INDEX_COW_2,
     /* 3 */ EN_INVADEPOH_ALIEN_ABDUCTOR_INDEX_COW_MAX,
-    
+
     // Any alien abductor with an index of 3 or higher will be carrying Romani
     /* 3 */ EN_INVADEPOH_ALIEN_ABDUCTOR_INDEX_ROMANI = 3
 } EnInvadepohAlienAbductorIndex;
diff --git a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c
index e0110493de..3250ab86cb 100644
--- a/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c
+++ b/src/overlays/actors/ovl_En_Invisible_Ruppe/z_en_invisible_ruppe.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_invisible_ruppe.h"
+#include "z_en_item00.h"
 
 #define FLAGS 0x00000000
 
diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
index 0b2006329c..d6be691984 100644
--- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
+++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_ishi.h"
+#include "z_en_item00.h"
 #include "z64quake.h"
 #include "z64rumble.h"
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
diff --git a/src/overlays/actors/ovl_En_Kame/z_en_kame.c b/src/overlays/actors/ovl_En_Kame/z_en_kame.c
index cd043ffd9f..8c0c9b2f1f 100644
--- a/src/overlays/actors/ovl_En_Kame/z_en_kame.c
+++ b/src/overlays/actors/ovl_En_Kame/z_en_kame.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_kame.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_HOOKSHOT_PULLS_PLAYER)
diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
index f1c7a36bf2..7f7e042910 100644
--- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
+++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_kanban.h"
+#include "z_en_item00.h"
 #include "attributes.h"
 #include "assets/objects/object_kanban/object_kanban.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c
index 0a4d36905b..237ed031b8 100644
--- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c
+++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_karebaba.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
index 003fbc751a..6b80666c99 100644
--- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
+++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_kusa.h"
+#include "z_en_item00.h"
 #include "assets/objects/object_kusa/object_kusa.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
diff --git a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c
index 13f71541c0..b831c7939e 100644
--- a/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c
+++ b/src/overlays/actors/ovl_En_Kusa2/z_en_kusa2.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_kusa2.h"
+#include "z_en_item00.h"
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c
index 2376556919..cd13adc7fd 100644
--- a/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c
+++ b/src/overlays/actors/ovl_En_Minideath/z_en_minideath.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_minideath.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Death/z_en_death.h"
 #include "assets/objects/object_death/object_death.h"
 
diff --git a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c
index baf1ebd968..ad548b5bd4 100644
--- a/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c
+++ b/src/overlays/actors/ovl_En_Mkk/z_en_mkk.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_mkk.h"
+#include "z_en_item00.h"
 #include "assets/objects/object_mkk/object_mkk.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE)
diff --git a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c
index bd0abea0e1..f7bcafc4aa 100644
--- a/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c
+++ b/src/overlays/actors/ovl_En_Neo_Reeba/z_en_neo_reeba.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_neo_reeba.h"
+#include "z_en_item00.h"
 #include "attributes.h"
 #include "assets/objects/object_rb/object_rb.h"
 
diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c
index 9c7ad459e1..9af0596dda 100644
--- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c
+++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c
@@ -11,6 +11,7 @@
  */
 
 #include "z_en_okuta.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE)
diff --git a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c
index 2607390655..3c487581b3 100644
--- a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c
+++ b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.c
@@ -8,6 +8,16 @@
 #include "overlays/actors/ovl_En_Bom/z_en_bom.h"
 #include "overlays/actors/ovl_En_Door/z_en_door.h"
 
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "macros.h"
+#include "segmented_address.h"
+#include "sequence.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z64lib.h"
+#include "z64play.h"
+
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED)
 
 void EnPamera_Init(Actor* thisx, PlayState* play);
diff --git a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.h b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.h
index 1630f79f59..a48a7b0c17 100644
--- a/src/overlays/actors/ovl_En_Pamera/z_en_pamera.h
+++ b/src/overlays/actors/ovl_En_Pamera/z_en_pamera.h
@@ -1,13 +1,15 @@
 #ifndef Z_EN_PAMERA_H
 #define Z_EN_PAMERA_H
 
-#include "global.h"
+#include "z64actor.h"
+#include "unk.h"
 #include "assets/objects/object_pamera/object_pamera.h"
 
 struct EnPamera;
+struct PlayState;
 
-typedef void (*EnPameraActionFunc)(struct EnPamera*, PlayState*);
-typedef void (*EnPameraSetupFunc)(struct EnPamera*, PlayState*);
+typedef void (*EnPameraActionFunc)(struct EnPamera*, struct PlayState*);
+typedef void (*EnPameraSetupFunc)(struct EnPamera*, struct PlayState*);
 
 #define PAMELA_GET_PATH_INDEX(thisx) (((thisx)->params & 0xFF0) >> 4)
 #define PAMELA_GET_F000(thisx) (((thisx)->params & 0xF000) >> 0xC)
@@ -21,7 +23,7 @@ typedef struct EnPamera {
     /* 0x1DC */ Vec3s* pathPoints;
     /* 0x1E0 */ s32 waypointIndex;
     /* 0x1E4 */ s32 pathCount;
-    /* 0x1E8 */ s32 additionalPathIndex; 
+    /* 0x1E8 */ s32 additionalPathIndex;
     /* 0x1EC */ s32 unk_1EC;
     /* 0x1F0 */ Vec3s jointTable[PAMELA_LIMB_MAX];
     /* 0x27A */ Vec3s morphTable[PAMELA_LIMB_MAX];
diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c
index 001dd514f3..0a92405dfa 100644
--- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c
+++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_peehat.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Bom/z_en_bom.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 #include "overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.h"
diff --git a/src/overlays/actors/ovl_En_Pm/z_en_pm.c b/src/overlays/actors/ovl_En_Pm/z_en_pm.c
index 64854dbb40..a30914827a 100644
--- a/src/overlays/actors/ovl_En_Pm/z_en_pm.c
+++ b/src/overlays/actors/ovl_En_Pm/z_en_pm.c
@@ -6,6 +6,16 @@
 
 #include "z_en_pm.h"
 #include "attributes.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "macros.h"
+#include "regs.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z64lib.h"
+#include "z64play.h"
+#include "z64schedule.h"
+#include "z64subs.h"
 #include "overlays/actors/ovl_En_Door/z_en_door.h"
 
 #define FLAGS                                                                                  \
diff --git a/src/overlays/actors/ovl_En_Pm/z_en_pm.h b/src/overlays/actors/ovl_En_Pm/z_en_pm.h
index 5b81fba7da..5828526aae 100644
--- a/src/overlays/actors/ovl_En_Pm/z_en_pm.h
+++ b/src/overlays/actors/ovl_En_Pm/z_en_pm.h
@@ -1,13 +1,16 @@
 #ifndef Z_EN_PM_H
 #define Z_EN_PM_H
 
-#include "global.h"
+#include "z64actor.h"
+#include "z64msgevent.h"
 #include "assets/objects/object_mm/object_mm.h"
 
 struct EnPm;
+struct Path;
+struct PlayState;
 
-typedef void (*EnPmActionFunc)(struct EnPm*, PlayState*);
-typedef s32 (*EnPmFunc2)(struct EnPm*, PlayState*);
+typedef void (*EnPmActionFunc)(struct EnPm*, struct PlayState*);
+typedef s32 (*EnPmFunc2)(struct EnPm*, struct PlayState*);
 
 #define ENPM_GET_PATH_INDEX(thisx) ((thisx)->params & 0xFF)
 
@@ -18,7 +21,7 @@ typedef struct EnPm {
     /* 0x18C */ EnPmFunc2 unk_18C;
     /* 0x190 */ ColliderCylinder colliderCylinder;
     /* 0x1DC */ ColliderSphere colliderSphere;
-    /* 0x234 */ Path* timePath;
+    /* 0x234 */ struct Path* timePath;
     /* 0x238 */ Vec3f timePathTargetPos;
     /* 0x244 */ f32 timePathProgress;
     /* 0x248 */ s32 timePathTotalTime;
diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
index 8f8eca94c4..b1f0c4d2c6 100644
--- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
+++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_po_sisters.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Pp/z_en_pp.c b/src/overlays/actors/ovl_En_Pp/z_en_pp.c
index f71bb29219..0fb524cbfc 100644
--- a/src/overlays/actors/ovl_En_Pp/z_en_pp.c
+++ b/src/overlays/actors/ovl_En_Pp/z_en_pp.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_pp.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c
index 654ca783f0..42a25a760a 100644
--- a/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c
+++ b/src/overlays/actors/ovl_En_Pr2/z_en_pr2.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_pr2.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Encount1/z_en_encount1.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_UPDATE_CULLING_DISABLED)
diff --git a/src/overlays/actors/ovl_En_Rat/z_en_rat.c b/src/overlays/actors/ovl_En_Rat/z_en_rat.c
index 12f91d1316..5251ff7209 100644
--- a/src/overlays/actors/ovl_En_Rat/z_en_rat.c
+++ b/src/overlays/actors/ovl_En_Rat/z_en_rat.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_rat.h"
+#include "z_en_item00.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "overlays/actors/ovl_En_Bom/z_en_bom.h"
 
diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.c b/src/overlays/actors/ovl_En_Rd/z_en_rd.c
index 12b11a8c13..2b79e22158 100644
--- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c
+++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c
@@ -23,6 +23,7 @@
  */
 
 #include "z_en_rd.h"
+#include "z_en_item00.h"
 #include "z64rumble.h"
 #include "attributes.h"
 #include "assets/objects/object_rd/object_rd.h"
diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c
index 3e8e56bb99..cbfdbc5eb9 100644
--- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c
+++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c
@@ -5,6 +5,8 @@
  */
 
 #include "z_en_rr.h"
+#include "z_en_item00.h"
+
 #include "z64rumble.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 #include "assets/objects/object_rr/object_rr.h"
diff --git a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c
index 31f505b27c..a61421c781 100644
--- a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c
+++ b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c
@@ -5,6 +5,8 @@
  */
 
 #include "z_en_ruppecrow.h"
+#include "z_en_item00.h"
+
 #include "assets/objects/object_crow/object_crow.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED | ACTOR_FLAG_CAN_ATTACH_TO_ARROW)
diff --git a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h
index e6132cb514..3038d1f7cb 100644
--- a/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h
+++ b/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h
@@ -2,6 +2,8 @@
 #define Z_EN_RUPPECROW_H
 
 #include "global.h"
+#include "z_en_item00.h"
+#include "z64actor.h"
 #include "assets/objects/object_crow/object_crow.h"
 
 #define ENRUPPECROW_GET_PATH_INDEX(thisx) (((thisx)->params & 0xFC00) >> 0xA)
@@ -11,8 +13,10 @@
 #define ENRUPPECROW_RUPEE_COUNT 20
 
 struct EnRuppecrow;
+struct Path;
+struct PlayState;
 
-typedef void (*EnRuppecrowActionFunc)(struct EnRuppecrow*, PlayState*);
+typedef void (*EnRuppecrowActionFunc)(struct EnRuppecrow*, struct PlayState*);
 
 typedef enum EnRuppecrowBodyPart {
     /* 0 */ ENRUPPECROW_BODYPART_0,
@@ -30,7 +34,7 @@ typedef struct EnRuppecrow {
     /* 0x1DC */ UNK_TYPE1 unk_1DC[0x4];
     /* 0x1E0 */ Vec3s jointTable[OBJECT_CROW_LIMB_MAX];
     /* 0x216 */ Vec3s morphTable[OBJECT_CROW_LIMB_MAX];
-    /* 0x24C */ Path* path;
+    /* 0x24C */ struct Path* path;
     /* 0x250 */ s32 currentPoint;
     /* 0x254 */ ColliderJntSph collider;
     /* 0x274 */ ColliderJntSphElement colliderElements[1];
@@ -39,7 +43,7 @@ typedef struct EnRuppecrow {
     /* 0x2BC */ s16 rupeeIndex;
     /* 0x2BE */ s16 yOffset;
     /* 0x2C0 */ UNK_TYPE1 unk_2C0[0x4];
-    /* 0x2C4 */ u8 currentEffect; 
+    /* 0x2C4 */ u8 currentEffect;
     /* 0x2C8 */ f32 unk_2C8; // set but not used
     /* 0x2CC */ f32 unk_2CC; // set but not used
     /* 0x2D0 */ f32 iceSfxTimer;
diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c
index 4f10b78a47..ac33839962 100644
--- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c
+++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_sb.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Part/z_en_part.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE)
diff --git a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c
index 1d87637b8b..481ca737c0 100644
--- a/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c
+++ b/src/overlays/actors/ovl_En_Scopecoin/z_en_scopecoin.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_scopecoin.h"
+#include "z_en_item00.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c
index 9420c467d8..0943a1df86 100644
--- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c
+++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_skb.h"
+#include "z_en_item00.h"
 #include "attributes.h"
 #include "overlays/actors/ovl_En_Encount4/z_en_encount4.h"
 #include "overlays/actors/ovl_En_Part/z_en_part.h"
diff --git a/src/overlays/actors/ovl_En_Slime/z_en_slime.c b/src/overlays/actors/ovl_En_Slime/z_en_slime.c
index 5fd92bddf7..3cf7ef247b 100644
--- a/src/overlays/actors/ovl_En_Slime/z_en_slime.c
+++ b/src/overlays/actors/ovl_En_Slime/z_en_slime.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_slime.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 
 #define FLAGS                                                                                 \
diff --git a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c
index 49ca062fe1..bea2c9f45f 100644
--- a/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c
+++ b/src/overlays/actors/ovl_En_Snowman/z_en_snowman.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_snowman.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE)
diff --git a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c
index 9dd323134b..95d55eb0b5 100644
--- a/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c
+++ b/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_snowwd.h"
+#include "z_en_item00.h"
 #include "assets/objects/object_snowwd/object_snowwd.h"
 
 #define FLAGS 0x00000000
diff --git a/src/overlays/actors/ovl_En_St/z_en_st.c b/src/overlays/actors/ovl_En_St/z_en_st.c
index ef352e956c..652e12c087 100644
--- a/src/overlays/actors/ovl_En_St/z_en_st.c
+++ b/src/overlays/actors/ovl_En_St/z_en_st.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_st.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c
index c8a5642bc5..2aa1a88e28 100644
--- a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c
+++ b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.c
@@ -8,8 +8,24 @@
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 #include "overlays/actors/ovl_En_Door/z_en_door.h"
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"
+#include "overlays/actors/ovl_En_Fsn/z_en_fsn.h"
 #include "overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h"
 
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "macros.h"
+#include "rand.h"
+#include "regs.h"
+#include "seqcmd.h"
+#include "sequence.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z64effect.h"
+#include "z64lib.h"
+#include "z64play.h"
+#include "z64schedule.h"
+#include "z64subs.h"
+
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_UPDATE_CULLING_DISABLED)
 
 void EnSuttari_Init(Actor* thisx, PlayState* play);
diff --git a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.h b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.h
index bfb87a2cf4..4df1b09864 100644
--- a/src/overlays/actors/ovl_En_Suttari/z_en_suttari.h
+++ b/src/overlays/actors/ovl_En_Suttari/z_en_suttari.h
@@ -1,13 +1,18 @@
 #ifndef Z_EN_SUTTARI_H
 #define Z_EN_SUTTARI_H
 
+#include "unk.h"
+#include "z64actor.h"
+
 #include "global.h"
 #include "assets/objects/object_boj/object_boj.h"
-#include "overlays/actors/ovl_En_Fsn/z_en_fsn.h"
 
+struct EnFsn;
 struct EnSuttari;
+struct Path;
+struct PlayState;
 
-typedef void (*EnSuttariActionFunc)(struct EnSuttari*, PlayState*);
+typedef void (*EnSuttariActionFunc)(struct EnSuttari*, struct PlayState*);
 
 #define ENSUTTARI_GET_PATH_INDEX(thisx) (((thisx)->params & 0x7E00) >> 9)
 
@@ -15,7 +20,7 @@ typedef void (*EnSuttariActionFunc)(struct EnSuttari*, PlayState*);
 
 typedef struct EnSuttari {
     /* 0x000 */ Actor actor;
-    /* 0x144 */ EnFsn* enFsn;
+    /* 0x144 */ struct EnFsn* enFsn;
     /* 0x148 */ EnSuttariActionFunc actionFunc;
     /* 0x14C */ UNK_TYPE1 unk_14C[0x4];
     /* 0x150 */ SkelAnime skelAnime;
@@ -25,7 +30,7 @@ typedef struct EnSuttari {
     /* 0x1E6 */ u16 flags2;
     /* 0x1E8 */ u16 textId;
     /* 0x1EA */ UNK_TYPE1 unk_1EA[0x2];
-    /* 0x1EC */ Path* paths[2];
+    /* 0x1EC */ struct Path* paths[2];
     /* 0x1F4 */ s32 unk1F4[2];
     /* 0x1FC */ UNK_TYPE1 unk_1FC[0x1A];
     /* 0x216 */ Vec3s jointTable[OBJECT_BOJ_LIMB_MAX];
@@ -42,7 +47,7 @@ typedef struct EnSuttari {
     /* 0x3F4 */ s16 unk3F4;
     /* 0x3F6 */ s16 unk3F6;
     /* 0x3F8 */ Vec3f unk3F8;
-    /* 0x404 */ Path* timePath;
+    /* 0x404 */ struct Path* timePath;
     /* 0x408 */ Vec3f timePathTargetPos;
     /* 0x414 */ f32 timePathProgress;
     /* 0x418 */ s32 timePathTotalTime;
diff --git a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c
index 152a7d1197..1868942d0a 100644
--- a/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c
+++ b/src/overlays/actors/ovl_En_Tanron3/z_en_tanron3.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_tanron3.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_Boss_03/z_boss_03.h"
 #include "assets/objects/object_boss03/object_boss03.h"
 
diff --git a/src/overlays/actors/ovl_En_Test3/z_en_test3.c b/src/overlays/actors/ovl_En_Test3/z_en_test3.c
index 03b9af56cd..2b689e7fe2 100644
--- a/src/overlays/actors/ovl_En_Test3/z_en_test3.c
+++ b/src/overlays/actors/ovl_En_Test3/z_en_test3.c
@@ -5,12 +5,27 @@
  */
 
 #include "z_en_test3.h"
-
-#include "zelda_arena.h"
-
-#include "assets/objects/object_test3/object_test3.h"
 #include "overlays/actors/ovl_En_Door/z_en_door.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "macros.h"
+#include "regs.h"
+#include "seqcmd.h"
+#include "sequence.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "zelda_arena.h"
+#include "z64effect.h"
+#include "z64lib.h"
+#include "z64play.h"
+#include "z64schedule.h"
+#include "z64skin_matrix.h"
+#include "z64subs.h"
+
+#include "global.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
+#include "assets/objects/object_test3/object_test3.h"
 #include "assets/objects/object_mask_ki_tan/object_mask_ki_tan.h"
 
 #pragma increment_block_number "n64-us:128"
diff --git a/src/overlays/actors/ovl_En_Test3/z_en_test3.h b/src/overlays/actors/ovl_En_Test3/z_en_test3.h
index 1b36566837..ab89a0c9c7 100644
--- a/src/overlays/actors/ovl_En_Test3/z_en_test3.h
+++ b/src/overlays/actors/ovl_En_Test3/z_en_test3.h
@@ -1,11 +1,14 @@
 #ifndef Z_EN_TEST3_H
 #define Z_EN_TEST3_H
 
-#include "global.h"
+#include "z64actor.h"
+#include "z64player.h"
 
 struct EnTest3;
+struct Path;
+struct PlayState;
 
-typedef void (*EnTest3ActionFunc)(struct EnTest3*, PlayState*);
+typedef void (*EnTest3ActionFunc)(struct EnTest3*, struct PlayState*);
 
 #define KAFEI_GET_PATH_INDEX(thisx) ((thisx)->params & 0x1F)
 #define KAFEI_GET_PARAM_1E0(thisx) (((thisx)->params >> 5) & 0xF)
@@ -19,7 +22,7 @@ typedef struct {
 typedef struct EnTest3 {
     /* 0x000 */ Player player;
     /* 0xD78 */ EnTest3_struct_D78* unk_D78;
-    /* 0xD7C */ Path* unk_D7C;
+    /* 0xD7C */ struct Path* unk_D7C;
     /* 0xD80 */ s32 unk_D80;
     /* 0xD84 */ f32 unk_D84;
     /* 0xD88 */ s8 scheduleResult;
diff --git a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c
index d214f5ebcd..afd43b6bdb 100644
--- a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c
+++ b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.c
@@ -4,6 +4,7 @@
  * Description: Takkuri
  */
 #include "z_en_thiefbird.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 
 #define FLAGS                                                                                                        \
diff --git a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h
index fb79f8037e..1a811c62bb 100644
--- a/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h
+++ b/src/overlays/actors/ovl_En_Thiefbird/z_en_thiefbird.h
@@ -5,8 +5,10 @@
 #include "assets/objects/object_thiefbird/object_thiefbird.h"
 
 struct EnThiefbird;
+struct EnItem00;
+struct PlayState;
 
-typedef void (*EnThiefbirdActionFunc)(struct EnThiefbird*, PlayState*);
+typedef void (*EnThiefbirdActionFunc)(struct EnThiefbird*, struct PlayState*);
 
 typedef struct {
     /* 0x00 */ Vec3f unk_00;
@@ -54,7 +56,7 @@ typedef struct EnThiefbird {
     /* 0x3E0 */ f32 unk_3E0;
     /* 0x3E4 */ Gfx* unk_3E4;
     /* 0x3E8 */ Gfx* unk_3E8;
-    /* 0x3EC */ EnItem00* unk_3EC;
+    /* 0x3EC */ struct EnItem00* unk_3EC;
     /* 0x3F0 */ EnThiefbirdUnkStruct unk_3F0[40];
 } EnThiefbird; // size = 0x990
 
diff --git a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c
index 99f902e445..965439f49b 100644
--- a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c
+++ b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.c
@@ -10,6 +10,10 @@
 
 #include "z_en_time_tag.h"
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"
+#include "macros.h"
+#include "sfx.h"
+#include "z64ocarina.h"
+#include "z64play.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED)
 
diff --git a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h
index 33f6d414ee..b8843f4470 100644
--- a/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h
+++ b/src/overlays/actors/ovl_En_Time_Tag/z_en_time_tag.h
@@ -1,11 +1,12 @@
 #ifndef Z_EN_TIME_TAG_H
 #define Z_EN_TIME_TAG_H
 
-#include "global.h"
+#include "z64actor.h"
 
 struct EnTimeTag;
+struct PlayState;
 
-typedef void (*EnTimeTagActionFunc)(struct EnTimeTag*, PlayState*);
+typedef void (*EnTimeTagActionFunc)(struct EnTimeTag*, struct PlayState*);
 
 #define TIMETAG_GET_TYPE(thisx) (((thisx)->params & 0xE000) >> 0xD)
 
diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c
index 4366a6ccf3..f4a6ad5c7d 100644
--- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c
+++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_tite.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR)
diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/src/overlays/actors/ovl_En_Tk/z_en_tk.c
index 95d0fcfa97..c5ad70315b 100644
--- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c
+++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c
@@ -5,10 +5,24 @@
  */
 
 #include "z_en_tk.h"
-#include "attributes.h"
 #include "overlays/actors/ovl_Bg_Danpei_Movebg/z_bg_danpei_movebg.h"
 #include "overlays/actors/ovl_En_Door/z_en_door.h"
 
+#include "libc64/qrand.h"
+#include "attributes.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "macros.h"
+#include "regs.h"
+#include "sfx.h"
+#include "sys_matrix.h"
+#include "z64lib.h"
+#include "z64play.h"
+#include "z64schedule.h"
+#include "assets/objects/object_tk/object_tk.h"
+
+#include "global.h"
+
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)
 
 void EnTk_Init(Actor* thisx, PlayState* play);
diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.h b/src/overlays/actors/ovl_En_Tk/z_en_tk.h
index 302d7674a9..6097d59436 100644
--- a/src/overlays/actors/ovl_En_Tk/z_en_tk.h
+++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.h
@@ -1,13 +1,16 @@
 #ifndef Z_EN_TK_H
 #define Z_EN_TK_H
 
-#include "global.h"
+#include "unk.h"
+#include "z64actor.h"
 #include "assets/objects/object_tk/object_tk.h"
 
 struct EnTk;
+struct Path;
+struct PlayState;
 
-typedef void (*EnTkActionFunc)(struct EnTk*, PlayState*);
-typedef void (*EnTkUnkFunc)(struct EnTk*, PlayState*);
+typedef void (*EnTkActionFunc)(struct EnTk*, struct PlayState*);
+typedef void (*EnTkUnkFunc)(struct EnTk*, struct PlayState*);
 
 #define ENTK_GET_F(thisx) ((thisx)->params & 0xF)
 #define ENTK_GET_SWITCH_FLAG(thisx) (((thisx)->params >> 4) & 0x7F)
@@ -52,7 +55,7 @@ typedef struct EnTk {
     /* 0x324 */ Vec3f unk_324[6];
     /* 0x36C */ s32 unk_36C;
     /* 0x370 */ UNK_TYPE1 unk370[0x58];
-    /* 0x3C8 */ Path* timePath;
+    /* 0x3C8 */ struct Path* timePath;
     /* 0x3CC */ u8 scheduleResult;
     /* 0x3CE */ u16 unk_3CE;
     /* 0x3D0 */ s32 timePathTimeSpeed;
diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c
index 757b3b2f48..3952daa067 100644
--- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c
+++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_tubo_trap.h"
+#include "z_en_item00.h"
 #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
 
 #define FLAGS 0x00000000
diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c
index fd92e6943b..3ba9a8de72 100644
--- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c
+++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_vm.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Bom/z_en_bom.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
index e5cc827d90..3684ca8c5f 100644
--- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
+++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_wallmas.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 #include "overlays/actors/ovl_En_Encount1/z_en_encount1.h"
 #include "overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h"
diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/src/overlays/actors/ovl_En_Wf/z_en_wf.c
index 2f8cd7770b..96cfc5748d 100644
--- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c
+++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_wf.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h"
 #include "overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 #include "overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h"
diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c
index cd113cfe50..e40484799c 100644
--- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c
+++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_en_wood02.h"
+#include "z_en_item00.h"
 #include "attributes.h"
 #include "assets/objects/object_wood02/object_wood02.h"
 
diff --git a/src/overlays/actors/ovl_En_Zov/z_en_zov.c b/src/overlays/actors/ovl_En_Zov/z_en_zov.c
index bad7ab6762..5a7afaf5ec 100644
--- a/src/overlays/actors/ovl_En_Zov/z_en_zov.c
+++ b/src/overlays/actors/ovl_En_Zov/z_en_zov.c
@@ -6,6 +6,14 @@
 
 #include "z_en_zov.h"
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "macros.h"
+#include "seqcmd.h"
+#include "sequence.h"
+#include "sys_matrix.h"
+#include "z64lib.h"
+#include "z64play.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)
 
diff --git a/src/overlays/actors/ovl_En_Zov/z_en_zov.h b/src/overlays/actors/ovl_En_Zov/z_en_zov.h
index 3b8144cb64..463b3b64e4 100644
--- a/src/overlays/actors/ovl_En_Zov/z_en_zov.h
+++ b/src/overlays/actors/ovl_En_Zov/z_en_zov.h
@@ -1,13 +1,13 @@
 #ifndef Z_EN_ZOV_H
 #define Z_EN_ZOV_H
 
-#include "global.h"
+#include "z64actor.h"
 #include "z64snap.h"
 #include "assets/objects/object_zov/object_zov.h"
 
 struct EnZov;
 
-typedef void (*EnZovActionFunc)(struct EnZov*, PlayState*);
+typedef void (*EnZovActionFunc)(struct EnZov*, struct PlayState*);
 
 #define ENZOV_GET_F(thisx) ((thisx)->params & 0xF)
 #define ENZOV_GET_FE00(thisx) (((thisx)->params & 0xFE00) >> 9)
diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
index 4c13ea6a8e..dbaeb9a3a8 100644
--- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
+++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c
@@ -5,6 +5,8 @@
  */
 
 #include "z_item_etcetera.h"
+#include "z64play.h"
+#include "global.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED)
 
diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h
index 92cda8710b..dc7b7d92bc 100644
--- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h
+++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h
@@ -1,14 +1,14 @@
 #ifndef Z_ITEM_ETCETERA_H
 #define Z_ITEM_ETCETERA_H
 
-#include "global.h"
+#include "z64actor.h"
 
 struct ItemEtcetera;
 
 #define ITEMETCETERA_GET_FF(thisx) ((thisx)->params & 0xFF)
 #define ITEMETCETERA_GET_TREASUREFLAG(thisx) (((thisx)->params >> 8) & 0x1F)
 
-typedef void (*ItemEtceteraActionFunc)(struct ItemEtcetera*, PlayState*);
+typedef void (*ItemEtceteraActionFunc)(struct ItemEtcetera*, struct PlayState*);
 
 typedef enum {
     /* 0x0 */ ITEM_ETC_BOTTLE_1,
diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
index 5025bf25bb..7c943e4b3a 100644
--- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
+++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_obj_comb.h"
+#include "z_en_item00.h"
 #include "assets/objects/object_comb/object_comb.h"
 
 #define FLAGS 0x00000000
diff --git a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c
index ef051de4f3..0cee797ba2 100644
--- a/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c
+++ b/src/overlays/actors/ovl_Obj_Dora/z_obj_dora.c
@@ -5,6 +5,8 @@
  */
 
 #include "z_obj_dora.h"
+#include "z_en_item00.h"
+
 #include "assets/objects/object_dora/object_dora.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED)
diff --git a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c
index e04f3f9c18..7fbf47c41b 100644
--- a/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c
+++ b/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c
@@ -4,6 +4,7 @@
  * Description: Breakable Pot With Grass
  */
 #include "z_obj_flowerpot.h"
+#include "z_en_item00.h"
 #include "assets/objects/object_flowerpot/object_flowerpot.h"
 
 #define FLAGS 0x00000000
diff --git a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c
index 069cafaa86..4a8a00553d 100644
--- a/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c
+++ b/src/overlays/actors/ovl_Obj_Grass/z_obj_grass.c
@@ -7,6 +7,7 @@
  */
 
 #include "z_obj_grass.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c
index 9032204095..166b819e08 100644
--- a/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c
+++ b/src/overlays/actors/ovl_Obj_Grass_Carry/z_obj_grass_carry.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_obj_grass_carry.h"
+#include "z_en_item00.h"
 #include "assets/objects/gameplay_field_keep/gameplay_field_keep.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 #include "overlays/actors/ovl_Obj_Grass/z_obj_grass.h"
diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
index a5cbc61d72..bdf897bbfa 100644
--- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
+++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c
@@ -5,6 +5,8 @@
  */
 
 #include "z_obj_kibako.h"
+#include "z_en_item00.h"
+
 #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
 #include "assets/objects/object_kibako/object_kibako.h"
 
diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c
index 5f0ead6fb3..7eea20a4cb 100644
--- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c
+++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c
@@ -5,6 +5,8 @@
  */
 
 #include "z_obj_kibako2.h"
+#include "z_en_item00.h"
+
 #include "assets/objects/object_kibako2/object_kibako2.h"
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
 
diff --git a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c
index 03a414551b..c4fe770b70 100644
--- a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c
+++ b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c
@@ -6,6 +6,13 @@
 
 #include "z_obj_lightblock.h"
 #include "overlays/actors/ovl_Demo_Effect/z_demo_effect.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "ichain.h"
+#include "sys_matrix.h"
+#include "z64play.h"
+
 #include "assets/objects/object_lightblock/object_lightblock.h"
 
 #define FLAGS 0x00000000
diff --git a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.h b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.h
index c1c1bcbb7f..648d1351fa 100644
--- a/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.h
+++ b/src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.h
@@ -1,14 +1,15 @@
 #ifndef Z_OBJ_LIGHTBLOCK_H
 #define Z_OBJ_LIGHTBLOCK_H
 
-#include "global.h"
+#include "z64actor.h"
 
 #define LIGHTBLOCK_TYPE(thisx) ((thisx)->params & 1)
 #define LIGHTBLOCK_GET_DESTROYED_SWITCH_FLAG(thisx) (((thisx)->params >> 8) & 0x7F)
 
 struct ObjLightblock;
+struct PlayState;
 
-typedef void (*ObjLightblockActionFunc)(struct ObjLightblock*, PlayState*);
+typedef void (*ObjLightblockActionFunc)(struct ObjLightblock*, struct PlayState*);
 
 typedef struct ObjLightblock {
     /* 0x000 */ DynaPolyActor dyna;
diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c
index 6a974685c2..0defd4d09b 100644
--- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c
+++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_obj_mure3.h"
+#include "z_en_item00.h"
 
 #define FLAGS 0x00000000
 
diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h
index fb79e34408..f7d03e0598 100644
--- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h
+++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h
@@ -7,14 +7,16 @@
 #define OBJMURE3_PARAM_RUPEEINDEX(thisx) (((thisx)->params >> 13) & 7)
 
 struct ObjMure3;
+struct EnItem00;
+struct PlayState;
 
-typedef void (*ObjMure3ActionFunc)(struct ObjMure3*, PlayState*);
-typedef void (*ObjMure3SpawnFunc)(struct ObjMure3*, PlayState*);
+typedef void (*ObjMure3ActionFunc)(struct ObjMure3*, struct PlayState*);
+typedef void (*ObjMure3SpawnFunc)(struct ObjMure3*, struct PlayState*);
 
 typedef struct ObjMure3 {
     /* 0x000 */ Actor actor;
     /* 0x144 */ ObjMure3ActionFunc actionFunc;
-    /* 0x148 */ EnItem00* unk148[6];
+    /* 0x148 */ struct EnItem00* unk148[6];
     /* 0x160 */ Actor* unk160;
     /* 0x164 */ u16 unk164;
 } ObjMure3; // size = 0x168
diff --git a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c
index 9bc67cd215..8f6dec94e2 100644
--- a/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c
+++ b/src/overlays/actors/ovl_Obj_Snowball/z_obj_snowball.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_obj_snowball.h"
+#include "z_en_item00.h"
 #include "assets/objects/object_goroiwa/object_goroiwa.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
diff --git a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c
index 1608ec88c1..588d99920d 100644
--- a/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c
+++ b/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_obj_snowball2.h"
+#include "z_en_item00.h"
 #include "assets/objects/object_goroiwa/object_goroiwa.h"
 
 #define FLAGS (ACTOR_FLAG_THROW_ONLY)
diff --git a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c
index 586698e520..8a3c0afaa5 100644
--- a/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c
+++ b/src/overlays/actors/ovl_Obj_Swprize/z_obj_swprize.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_obj_swprize.h"
+#include "z_en_item00.h"
 
 #define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED)
 
diff --git a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c
index 6077ba7f8c..de028fd024 100644
--- a/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c
+++ b/src/overlays/actors/ovl_Obj_Taru/z_obj_taru.c
@@ -5,6 +5,7 @@
  */
 
 #include "z_obj_taru.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Sw/z_en_sw.h"
 #include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
 #include "overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h"
diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
index c5c75ca23a..5fe70162eb 100644
--- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
+++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
@@ -5,7 +5,9 @@
  */
 
 #include "z_obj_tsubo.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_En_Sw/z_en_sw.h"
+
 #include "assets/objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h"
 #include "assets/objects/object_tsubo/object_tsubo.h"
 #include "assets/objects/object_racetsubo/object_racetsubo.h"
diff --git a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c
index 7c47607d5b..91d7d93c78 100644
--- a/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c
+++ b/src/overlays/actors/ovl_Obj_Yasi/z_obj_yasi.c
@@ -5,6 +5,8 @@
  */
 
 #include "z_obj_yasi.h"
+#include "z_en_item00.h"
+
 #include "assets/objects/object_obj_yasi/object_obj_yasi.h"
 
 #define FLAGS 0x00000000
diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c
index 3d87fa1f32..cf59f24afc 100644
--- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c
+++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c
@@ -5,8 +5,13 @@
  */
 
 #include "z_shot_sun.h"
+#include "z_en_item00.h"
 #include "overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h"
 #include "overlays/actors/ovl_En_Elf/z_en_elf.h"
+#include "macros.h"
+#include "sfx.h"
+#include "z64ocarina.h"
+#include "z64play.h"
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)
 
diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h
index ad94fda730..abc761e522 100644
--- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h
+++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h
@@ -1,7 +1,7 @@
 #ifndef Z_SHOT_SUN_H
 #define Z_SHOT_SUN_H
 
-#include "global.h"
+#include "z64actor.h"
 
 #define SHOTSUN_GET_TYPE(thisx) ((thisx)->params & 0xFF)
 #define SHOTSUN_FAIRY_SPAWNER_SUNS 0x40
@@ -9,7 +9,7 @@
 
 struct ShotSun;
 
-typedef void (*ShotSunActionFunc)(struct ShotSun*, PlayState*);
+typedef void (*ShotSunActionFunc)(struct ShotSun*, struct PlayState*);
 
 typedef struct ShotSun {
     /* 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 f283a243a1..b1f32ccbd7 100644
--- a/src/overlays/actors/ovl_player_actor/z_player.c
+++ b/src/overlays/actors/ovl_player_actor/z_player.c
@@ -34,6 +34,7 @@
 #include "overlays/actors/ovl_En_Torch2/z_en_torch2.h"
 #include "overlays/actors/ovl_En_Zoraegg/z_en_zoraegg.h"
 #include "overlays/actors/ovl_Obj_Aqua/z_obj_aqua.h"
+#include "z_en_item00.h"
 
 #include "overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.h"
 #include "overlays/effects/ovl_Effect_Ss_G_Splash/z_eff_ss_g_splash.h"
diff --git a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c
index fd98cb9e2a..50b413b5b6 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c
+++ b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c
@@ -5,6 +5,15 @@
  */
 
 #include "z_eff_ss_solder_srch_ball.h"
+
+#include "gfx.h"
+#include "gfx_setupdl.h"
+#include "sys_matrix.h"
+#include "z64lib.h"
+#include "z64effect.h"
+#include "z64play.h"
+
+#include "global.h"
 #include "assets/objects/gameplay_keep/gameplay_keep.h"
 
 #define rFlags regs[0]
diff --git a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h
index 5c250a7af2..a9a27376e9 100644
--- a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h
+++ b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.h
@@ -1,7 +1,8 @@
 #ifndef _Z64_EFFECT_SS_SOLDER_SRCH_BALL_H_
 #define _Z64_EFFECT_SS_SOLDER_SRCH_BALL_H_
 
-#include "global.h"
+#include "ultra64.h"
+#include "z64math.h"
 
 #define SOLDERSRCHBALL_INVISIBLE (1 << 0)
 #define SOLDERSRCHBALL_SMALL_DETECT_RADIUS (1 << 1)