cleanup headers

41 files changed, 82 insertions, 44 deletions

diff --git a/src/manager/angryStatueManager.c b/src/manager/angryStatueManager.c
index c24d026e..ad6744c6 100644
--- a/src/manager/angryStatueManager.c
+++ b/src/manager/angryStatueManager.c
@@ -6,10 +6,14 @@
  */
 #include "manager/angryStatueManager.h"
 #include "flags.h"
-#include "functions.h"
 #include "object.h"
+#include "asm.h"
+
+#include "sound.h"
 #include "room.h"
 
+#include "player.h"
+
 void sub_0805D11C(AngryStatueManager*);
 void AngryStatueManager_Init(AngryStatueManager*);
 void AngryStatueManager_Action1(AngryStatueManager*);
diff --git a/src/manager/armosInteriorManager.c b/src/manager/armosInteriorManager.c
index 98587f46..392e80ec 100644
--- a/src/manager/armosInteriorManager.c
+++ b/src/manager/armosInteriorManager.c
@@ -8,8 +8,8 @@
 #include "common.h"
 #include "entity.h"
 #include "flags.h"
-#include "functions.h"
 #include "sound.h"
+#include "room.h"
 
 bool32 sub_0805C920(ArmosInteriorManager*);
 void ArmosInteriorManager_Init(ArmosInteriorManager*);
diff --git a/src/manager/bombableWallManager.c b/src/manager/bombableWallManager.c
index e0343063..18347fa1 100644
--- a/src/manager/bombableWallManager.c
+++ b/src/manager/bombableWallManager.c
@@ -7,10 +7,11 @@
 #include "manager/bombableWallManager.h"
 #include "entity.h"
 #include "flags.h"
-#include "functions.h"
 #include "game.h"
 #include "object.h"
+#include "asm.h"
 #include "sound.h"
+#include "room.h"
 #include "tiles.h"
 
 u32 BombableWallManager_GetBombableType(u32 tilePos, u32 layer);
diff --git a/src/manager/bridgeManager.c b/src/manager/bridgeManager.c
index 17e91f91..0070ed04 100644
--- a/src/manager/bridgeManager.c
+++ b/src/manager/bridgeManager.c
@@ -6,8 +6,8 @@
  */
 #include "manager/bridgeManager.h"
 #include "flags.h"
-#include "functions.h"
 #include "sound.h"
+#include "player.h"
 
 void BridgeManager_Init(BridgeManager*);
 void BridgeManager_Action1(BridgeManager*);
diff --git a/src/manager/cloudOverlayManager.c b/src/manager/cloudOverlayManager.c
index a9313b45..021da0f3 100644
--- a/src/manager/cloudOverlayManager.c
+++ b/src/manager/cloudOverlayManager.c
@@ -8,7 +8,7 @@
 #include "area.h"
 #include "screen.h"
 #include "game.h"
-#include "functions.h"
+#include "room.h"
 
 void CloudOverlayManager_OnEnterRoom(CloudOverlayManager*);
 void CloudOverlayManager_OnExitRoom(CloudOverlayManager*);
diff --git a/src/manager/cloudStaircaseTransitionManager.c b/src/manager/cloudStaircaseTransitionManager.c
index d8a47d63..3926f1ed 100644
--- a/src/manager/cloudStaircaseTransitionManager.c
+++ b/src/manager/cloudStaircaseTransitionManager.c
@@ -7,7 +7,8 @@
 #include "manager/cloudStaircaseTransitionManager.h"
 #include "asm.h"
 #include "common.h"
-#include "functions.h"
+#include "room.h"
+#include "player.h"
 
 void CloudStaircaseTransitionManager_Main(CloudStaircaseTransitionManager* this) {
     if (super->action == 0) {
diff --git a/src/manager/delayedEntityLoadManager.c b/src/manager/delayedEntityLoadManager.c
index 0a13bf40..1509c95b 100644
--- a/src/manager/delayedEntityLoadManager.c
+++ b/src/manager/delayedEntityLoadManager.c
@@ -8,7 +8,11 @@
 #include "room.h"
 #include "npc.h"
 #include "area.h"
+#include "flags.h"
+#include "script.h"
+#include "save.h"
 #include "asm.h"
+#include "object.h"
 
 typedef struct {
     Manager base;
diff --git a/src/manager/diggingCaveEntranceManager.c b/src/manager/diggingCaveEntranceManager.c
index ce428a2b..d7b37a73 100644
--- a/src/manager/diggingCaveEntranceManager.c
+++ b/src/manager/diggingCaveEntranceManager.c
@@ -7,11 +7,13 @@
 #include "manager/diggingCaveEntranceManager.h"
 #include "area.h"
 #include "asm.h"
-#include "functions.h"
 #include "player.h"
 #include "room.h"
 #include "scroll.h"
 #include "tiles.h"
+#ifndef  EU
+#include "structures.h"
+#endif
 
 void DiggingCaveEntranceManager_Main(DiggingCaveEntranceManager*);
 void DiggingCaveEntranceManager_Init(DiggingCaveEntranceManager*);
diff --git a/src/manager/enterRoomTextboxManager.c b/src/manager/enterRoomTextboxManager.c
index 61276437..f456714c 100644
--- a/src/manager/enterRoomTextboxManager.c
+++ b/src/manager/enterRoomTextboxManager.c
@@ -8,10 +8,10 @@
 #include "area.h"
 #include "common.h"
 #include "fileselect.h"
-#include "functions.h"
 #include "game.h"
 #include "message.h"
 #include "screen.h"
+#include "structures.h"
 
 const u16 gUnk_08108DE8[] = { 0,     0x70b, 0x70c, 0x70d, 0x70e, 0x70f, 0x710, 0x711, 0x712, 0x713, 0x714,
                               0x715, 0x716, 0x717, 0x718, 0x719, 0x71a, 0x71b, 0x71c, 0x71d, 0x71e, 0x71f,
diff --git a/src/manager/entitySpawnManager.c b/src/manager/entitySpawnManager.c
index 6303d998..f9868310 100644
--- a/src/manager/entitySpawnManager.c
+++ b/src/manager/entitySpawnManager.c
@@ -9,9 +9,9 @@
 #include "manager/entitySpawnManager.h"
 #include "entity.h"
 #include "flags.h"
-#include "functions.h"
 #include "room.h"
 #include "sound.h"
+#include "player.h"
 
 void EntitySpawnManager_Main(EntitySpawnManager* this) {
     if (super->action == 0) {
diff --git a/src/manager/ezloHintManager.c b/src/manager/ezloHintManager.c
index eb2a666a..f5b93933 100644
--- a/src/manager/ezloHintManager.c
+++ b/src/manager/ezloHintManager.c
@@ -9,7 +9,7 @@
 #include "asm.h"
 #include "entity.h"
 #include "flags.h"
-#include "functions.h"
+#include "player.h"
 
 static void EzloHintManager_Init(EzloHintManager*);
 static void EzloHintManager_Action1(EzloHintManager*);
diff --git a/src/manager/flameManager.c b/src/manager/flameManager.c
index a363ebe0..1132dc5a 100644
--- a/src/manager/flameManager.c
+++ b/src/manager/flameManager.c
@@ -8,9 +8,9 @@
  */
 #include "manager/flameManager.h"
 #include "asm.h"
-#include "functions.h"
 #include "room.h"
 #include "tiles.h"
+#include "player.h"
 
 void FlameManager_Main(FlameManager* this) {
     if (super->action == 0) {
diff --git a/src/manager/goronMerchantShopManager.c b/src/manager/goronMerchantShopManager.c
index ff1d1b56..f4004c8e 100644
--- a/src/manager/goronMerchantShopManager.c
+++ b/src/manager/goronMerchantShopManager.c
@@ -10,6 +10,7 @@
 #include "flags.h"
 #include "item.h"
 #include "object.h"
+#include "room.h"
 #include "object/itemForSale.h"
 
 typedef struct {
diff --git a/src/manager/holeManager.c b/src/manager/holeManager.c
index 3772ceb1..ced8e4b9 100644
--- a/src/manager/holeManager.c
+++ b/src/manager/holeManager.c
@@ -8,12 +8,14 @@
 #include "common.h"
 #include "flags.h"
 #include "object.h"
+#include "asm.h"
+#include "player.h"
 #include "room.h"
 #include "screen.h"
 #include "game.h"
 #include "manager/lightManager.h"
 #include "assets/gfx_offsets.h"
-#include "functions.h"
+#include "structures.h"
 
 typedef enum {
     HOLE_TRANSITION_ABSOLUTE,
diff --git a/src/manager/horizontalMinishPathBackgroundManager.c b/src/manager/horizontalMinishPathBackgroundManager.c
index 1f07763f..7af97dde 100644
--- a/src/manager/horizontalMinishPathBackgroundManager.c
+++ b/src/manager/horizontalMinishPathBackgroundManager.c
@@ -8,7 +8,8 @@
 #include "common.h"
 #include "screen.h"
 #include "game.h"
-#include "functions.h"
+#include "structures.h"
+#include "room.h"
 
 void sub_08057F20(HorizontalMinishPathBackgroundManager*);
 void HorizontalMinishPathBackgroundManager_OnEnterRoom(HorizontalMinishPathBackgroundManager*);
diff --git a/src/manager/hyruleTownTileSetManager.c b/src/manager/hyruleTownTileSetManager.c
index 2d19ac6d..8fa8b77b 100644
--- a/src/manager/hyruleTownTileSetManager.c
+++ b/src/manager/hyruleTownTileSetManager.c
@@ -13,7 +13,7 @@
 #include "tiles.h"
 #include "game.h"
 #include "assets/gfx_offsets.h"
-#include "functions.h"
+#include "player.h"
 
 void HyruleTownTileSetManager_UpdateLoadGfxGroups(HyruleTownTileSetManager*);
 void HyruleTownTileSetManager_OnEnterRoom(HyruleTownTileSetManager*);
diff --git a/src/manager/lightLevelSetManager.c b/src/manager/lightLevelSetManager.c
index 26350020..7aad3428 100644
--- a/src/manager/lightLevelSetManager.c
+++ b/src/manager/lightLevelSetManager.c
@@ -6,9 +6,11 @@
  */
 #include "manager/lightLevelSetManager.h"
 #include "flags.h"
-#include "functions.h"
 #include "game.h"
 #include "object.h"
+#include "asm.h"
+#include "effects.h"
+#include "player.h"
 #include "room.h"
 #include "tiles.h"
 
@@ -115,7 +117,7 @@ void LightLevelSetManager_Type3(LightLevelSetManager* this) {
 
         default:
             if (--this->field_0x22 == 0) {
-                CreateDustAt(*(s16*)&this->field_0x38, *(s16*)&this->field_0x3a, super->type2);
+                CreateDeathFxAt(*(s16*)&this->field_0x38, *(s16*)&this->field_0x3a, super->type2);
                 ClearFlag(this->field_0x3e);
                 RestorePrevTileEntity(this->field_0x20, super->type2);
                 ChangeLightLevel(-super->timer);
diff --git a/src/manager/lightManager.c b/src/manager/lightManager.c
index cb96636d..a27d3b5a 100644
--- a/src/manager/lightManager.c
+++ b/src/manager/lightManager.c
@@ -7,7 +7,6 @@
 #include "manager/lightManager.h"
 #include "area.h"
 #include "common.h"
-#include "functions.h"
 #include "game.h"
 #include "main.h"
 #include "physics.h"
diff --git a/src/manager/lightRayManager.c b/src/manager/lightRayManager.c
index 65fd416b..93e21ddd 100644
--- a/src/manager/lightRayManager.c
+++ b/src/manager/lightRayManager.c
@@ -9,10 +9,12 @@
  */
 #include "manager/lightRayManager.h"
 #include "common.h"
-#include "functions.h"
 #include "main.h"
 #include "screen.h"
 #include "game.h"
+#include "structures.h"
+#include "player.h"
+#include "physics.h"
 
 extern void DisableVBlankDMA(void);
 
diff --git a/src/manager/manager29.c b/src/manager/manager29.c
index bd079e1c..ca3cd3a5 100644
--- a/src/manager/manager29.c
+++ b/src/manager/manager29.c
@@ -7,7 +7,8 @@
 #include "manager/manager29.h"
 #include "asm.h"
 #include "flags.h"
-#include "functions.h"
+#include "room.h"
+#include "player.h"
 
 bool32 sub_0805CF80(Manager29* this);
 void sub_0805CBD0(Manager29* this);
diff --git a/src/manager/minishPortalManager.c b/src/manager/minishPortalManager.c
index 2d13eb1e..74276e46 100644
--- a/src/manager/minishPortalManager.c
+++ b/src/manager/minishPortalManager.c
@@ -8,8 +8,9 @@
 #include "area.h"
 #include "asm.h"
 #include "flags.h"
-#include "functions.h"
 #include "object.h"
+#include "common.h"
+#include "effects.h"
 #include "player.h"
 #include "room.h"
 #include "sound.h"
@@ -43,7 +44,7 @@ void MinishPortalManager_Main(MinishPortalManager* this) {
                 }
             }
             if (GetActTileAtRoomCoords(this->unk_38, this->unk_3a, super->timer) == ACT_TILE_61) {
-                CreateMagicSparkles(this->unk_38 + gRoomControls.origin_x, this->unk_3a + gRoomControls.origin_y,
+                CreateMagicSparklesFxAt(this->unk_38 + gRoomControls.origin_x, this->unk_3a + gRoomControls.origin_y,
                                     super->timer);
                 if (super->subtimer == 0) {
                     super->subtimer = 1;
@@ -57,7 +58,7 @@ void MinishPortalManager_Main(MinishPortalManager* this) {
     }
 }
 
-void CreateMagicSparkles(u32 baseX, u32 baseY, u32 layer) {
+void CreateMagicSparklesFxAt(u32 baseX, u32 baseY, u32 layer) {
     u32 r;
     int offsetX, offsetY;
     Entity* spark;
diff --git a/src/manager/minishRaftersBackgroundManager.c b/src/manager/minishRaftersBackgroundManager.c
index c3a9d629..183000af 100644
--- a/src/manager/minishRaftersBackgroundManager.c
+++ b/src/manager/minishRaftersBackgroundManager.c
@@ -8,7 +8,7 @@
 #include "common.h"
 #include "room.h"
 #include "game.h"
-#include "functions.h"
+#include "structures.h"
 
 void MinishRaftersBackgroundManager_OnEnterRoom(MinishRaftersBackgroundManager*);
 void sub_08058210(MinishRaftersBackgroundManager*);
diff --git a/src/manager/minishSizedEntranceManager.c b/src/manager/minishSizedEntranceManager.c
index 3cac2f1f..a2bbf028 100644
--- a/src/manager/minishSizedEntranceManager.c
+++ b/src/manager/minishSizedEntranceManager.c
@@ -6,8 +6,8 @@
  * screen.
  */
 #include "manager/minishSizedEntranceManager.h"
-#include "functions.h"
 #include "object.h"
+#include "flags.h"
 #include "room.h"
 #include "asm.h"
 
diff --git a/src/manager/minishVillageTileSetManager.c b/src/manager/minishVillageTileSetManager.c
index 95cb7cc4..81c93ae8 100644
--- a/src/manager/minishVillageTileSetManager.c
+++ b/src/manager/minishVillageTileSetManager.c
@@ -10,7 +10,7 @@
 #include "main.h"
 #include "game.h"
 #include "assets/gfx_offsets.h"
-#include "functions.h"
+#include "structures.h"
 
 void MinishVillageTileSetManager_OnEnterRoom(void*);
 bool32 MinishVillageTileSetManager_UpdateRoomGfxGroup(MinishVillageTileSetManager*);
diff --git a/src/manager/miscManager.c b/src/manager/miscManager.c
index bcb7bce9..93889ec9 100644
--- a/src/manager/miscManager.c
+++ b/src/manager/miscManager.c
@@ -6,16 +6,23 @@
  */
 #include "manager/miscManager.h"
 #include "area.h"
-#include "common.h"
 #include "flags.h"
-#include "functions.h"
 #include "item.h"
 #include "message.h"
 #include "object.h"
+#include "asm.h"
+#include "effects.h"
+#include "physics.h"
 #include "player.h"
 #include "room.h"
+#include "script.h"
 #include "sound.h"
 #include "tiles.h"
+#include "scroll.h"
+#include "subtask.h"
+#if defined(USA) || defined(DEMO_USA) || defined(DEMO_JP)
+#include "common.h"
+#endif
 
 void MiscManager_Type0(MiscManager*);
 void MiscManager_Type1(MiscManager*);
@@ -229,7 +236,7 @@ void MiscManager_Type5(MiscManager* this) {
     switch (super->action) {
         default:
             if (!--super->timer) {
-                CreateDustAt(this->x, this->y, super->type2);
+                CreateDeathFxAt(this->x, this->y, super->type2);
                 RestorePrevTileEntity(TILE_LOCAL(this->x, this->y), super->type2);
                 SoundReq(SFX_TASK_COMPLETE);
                 DeleteThisEntity();
diff --git a/src/manager/moveableObjectManager.c b/src/manager/moveableObjectManager.c
index 21756299..5cf898fa 100644
--- a/src/manager/moveableObjectManager.c
+++ b/src/manager/moveableObjectManager.c
@@ -9,6 +9,7 @@
 #include "manager/moveableObjectManager.h"
 #include "flags.h"
 #include "room.h"
+#include "object.h"
 
 void MoveableObjectManager_Main(MoveableObjectManager* this) {
     Entity* object = CreateObject(super->timer, super->type, super->type2);
diff --git a/src/manager/pushableFurnitureManager.c b/src/manager/pushableFurnitureManager.c
index f701bc42..260c0348 100644
--- a/src/manager/pushableFurnitureManager.c
+++ b/src/manager/pushableFurnitureManager.c
@@ -8,6 +8,7 @@
 
 #include "flags.h"
 #include "object.h"
+#include "player.h"
 #include "object/pushableFurniture.h"
 #include "room.h"
 
diff --git a/src/manager/rollingBarrelManager.c b/src/manager/rollingBarrelManager.c
index 303108a5..f8209f6e 100644
--- a/src/manager/rollingBarrelManager.c
+++ b/src/manager/rollingBarrelManager.c
@@ -15,7 +15,7 @@
 #include "screen.h"
 #include "sound.h"
 #include "game.h"
-#include "functions.h"
+#include "asm.h"
 
 extern struct BgAffineDstData gUnk_02017AA0[];
 extern struct BgAffineDstData gUnk_02017BA0[];
diff --git a/src/manager/secretManager.c b/src/manager/secretManager.c
index ca2ec125..f0ec19e2 100644
--- a/src/manager/secretManager.c
+++ b/src/manager/secretManager.c
@@ -9,8 +9,8 @@
 #include "manager/secretManager.h"
 #include "entity.h"
 #include "flags.h"
-#include "functions.h"
 #include "sound.h"
+#include "structures.h"
 
 void SecretManager_Type0_Action2(SecretManager*);
 void SecretManager_Type0(SecretManager*);
diff --git a/src/manager/specialWarpManager.c b/src/manager/specialWarpManager.c
index f62ac451..cba10388 100644
--- a/src/manager/specialWarpManager.c
+++ b/src/manager/specialWarpManager.c
@@ -6,7 +6,8 @@
  */
 #include "manager/specialWarpManager.h"
 #include "asm.h"
-#include "functions.h"
+#include "room.h"
+#include "player.h"
 
 void SpecialWarpManager_Main(SpecialWarpManager* this) {
     u32 collisionLayer;
diff --git a/src/manager/staticBackgroundManager.c b/src/manager/staticBackgroundManager.c
index de3c8f3d..1ee959fe 100644
--- a/src/manager/staticBackgroundManager.c
+++ b/src/manager/staticBackgroundManager.c
@@ -8,7 +8,7 @@
 #include "common.h"
 #include "screen.h"
 #include "game.h"
-#include "functions.h"
+#include "room.h"
 
 void StaticBackgroundManager_OnEnterRoom(StaticBackgroundManager*);
 void sub_0805B448(StaticBackgroundManager*);
diff --git a/src/manager/templeOfDropletsManager.c b/src/manager/templeOfDropletsManager.c
index dbdbc5cb..1c9987a5 100644
--- a/src/manager/templeOfDropletsManager.c
+++ b/src/manager/templeOfDropletsManager.c
@@ -8,10 +8,12 @@
 #include "enemy.h"
 #include "flags.h"
 #include "object.h"
+#include "common.h"
+#include "room.h"
+#include "player.h"
 #include "screen.h"
 #include "sound.h"
 #include "game.h"
-#include "functions.h"
 #include "structures.h"
 
 static const u16 gUnk_081085B8[] = { 0x1008, 0x1007, 0x1006, 0x1005, 0x1006, 0x1007, 0x1008, 0x1009,
diff --git a/src/manager/tileChangeObserveManager.c b/src/manager/tileChangeObserveManager.c
index 7a05a853..08b46b14 100644
--- a/src/manager/tileChangeObserveManager.c
+++ b/src/manager/tileChangeObserveManager.c
@@ -9,7 +9,6 @@
  */
 #include "manager/tileChangeObserveManager.h"
 #include "flags.h"
-#include "functions.h"
 #include "room.h"
 
 void TileChangeObserveManager_Init(TileChangeObserveManager*);
diff --git a/src/manager/tilePuzzleManager.c b/src/manager/tilePuzzleManager.c
index 766e2c6d..2da91901 100644
--- a/src/manager/tilePuzzleManager.c
+++ b/src/manager/tilePuzzleManager.c
@@ -10,9 +10,10 @@
 #include "manager/tilePuzzleManager.h"
 #include "asm.h"
 #include "flags.h"
-#include "functions.h"
 #include "sound.h"
 #include "tiles.h"
+#include "room.h"
+#include "player.h"
 
 enum { INIT, IN_PROGRESS, FAILED, SUCCEEDED };
 
diff --git a/src/manager/vaati3BackgroundManager.c b/src/manager/vaati3BackgroundManager.c
index d2fb85ed..2b2e838b 100644
--- a/src/manager/vaati3BackgroundManager.c
+++ b/src/manager/vaati3BackgroundManager.c
@@ -10,7 +10,6 @@
 #include "room.h"
 #include "screen.h"
 #include "game.h"
-#include "functions.h"
 
 void Vaati3BackgroundManager_OnEnterRoom(Vaati3BackgroundManager*);
 
diff --git a/src/manager/vaati3InsideArmManager.c b/src/manager/vaati3InsideArmManager.c
index 579ce58b..43402c28 100644
--- a/src/manager/vaati3InsideArmManager.c
+++ b/src/manager/vaati3InsideArmManager.c
@@ -5,7 +5,6 @@
  * @brief Manages the inside of the arms of Vaati3.
  */
 #include "manager/vaati3InsideArmManager.h"
-#include "functions.h"
 #include "screenTransitions.h"
 #include "sound.h"
 #include "structures.h"
diff --git a/src/manager/vaati3StartManager.c b/src/manager/vaati3StartManager.c
index 097f3afa..8804a640 100644
--- a/src/manager/vaati3StartManager.c
+++ b/src/manager/vaati3StartManager.c
@@ -8,14 +8,17 @@
 #include "area.h"
 #include "enemy.h"
 #include "flags.h"
-#include "functions.h"
 #include "message.h"
 #include "object.h"
-#include "save.h"
+#include "room.h"
+#include "player.h"
 #include "screen.h"
 #include "screenTransitions.h"
 #include "sound.h"
-#include "structures.h"
+#include "scroll.h"
+#if !defined(EU) && !defined(JP)
+#include "save.h"
+#endif
 
 void sub_0805E094(void);
 void Vaati3StartManager_Type0(Vaati3StartManager*);
diff --git a/src/manager/vaatiAppearingManager.c b/src/manager/vaatiAppearingManager.c
index 6eabadd8..930c0bd5 100644
--- a/src/manager/vaatiAppearingManager.c
+++ b/src/manager/vaatiAppearingManager.c
@@ -7,11 +7,11 @@
 #include "manager/vaatiAppearingManager.h"
 #include "area.h"
 #include "common.h"
-#include "functions.h"
 #include "game.h"
 #include "main.h"
 #include "room.h"
 #include "screen.h"
+#include "physics.h"
 
 void sub_0805D9D8(VaatiAppearingManager*);
 void VaatiAppearingManager_Action3(VaatiAppearingManager*);
diff --git a/src/manager/verticalMinishPathBackgroundManager.c b/src/manager/verticalMinishPathBackgroundManager.c
index c599eae0..a5d18429 100644
--- a/src/manager/verticalMinishPathBackgroundManager.c
+++ b/src/manager/verticalMinishPathBackgroundManager.c
@@ -6,9 +6,10 @@
  */
 #include "manager/verticalMinishPathBackgroundManager.h"
 #include "common.h"
-#include "functions.h"
 #include "game.h"
 #include "screen.h"
+#include "room.h"
+
 extern void VerticalMinishPathBackgroundManager_OnEnterRoom(void*);
 extern void sub_0805754C(VerticalMinishPathBackgroundManager*);
 
diff --git a/src/manager/waterfallBottomManager.c b/src/manager/waterfallBottomManager.c
index a9e7196e..47000615 100644
--- a/src/manager/waterfallBottomManager.c
+++ b/src/manager/waterfallBottomManager.c
@@ -7,8 +7,9 @@
 #include "manager/waterfallBottomManager.h"
 #include "asm.h"
 #include "entity.h"
-#include "functions.h"
+#include "player.h"
 #include "tiles.h"
+#include "room.h"
 
 void WaterfallBottomManager_Main(WaterfallBottomManager* this) {
     SetTile(SPECIAL_TILE_20, TILE_POS(3, 23), LAYER_BOTTOM);
diff --git a/src/manager/weatherChangeManager.c b/src/manager/weatherChangeManager.c
index fdddd1d6..d5da1664 100644
--- a/src/manager/weatherChangeManager.c
+++ b/src/manager/weatherChangeManager.c
@@ -13,7 +13,9 @@
 #include "screen.h"
 #include "sound.h"
 #include "game.h"
-#include "functions.h"
+#include "manager/staticBackgroundManager.h"
+#include "player.h"
+#include "structures.h"
 
 void WeatherChangeManager_OnEnterRoom(WeatherChangeManager*);
 void sub_08059608(WeatherChangeManager*);