diff --git a/include/enemy.h b/include/enemy.h
index ab3ed769..61d210ad 100644
--- a/include/enemy.h
+++ b/include/enemy.h
@@ -2,14 +2,7 @@
 #define ENEMY_H
 
 #include "global.h"
-
-#include "sound.h"
-#include "effects.h"
-#include "flags.h"
-#include "common.h"
-
 #include "entity.h"
-#include "projectile.h"
 
 #define EM_FLAG_BOSS (1 << 0)
 #define EM_FLAG_BOSS_KILLED (1 << 1)
diff --git a/include/entity.h b/include/entity.h
index a332089e..7361d119 100644
--- a/include/entity.h
+++ b/include/entity.h
@@ -3,7 +3,6 @@
 #define ENTITY_H
 
 #include "global.h"
-#include "color.h"
 #include "sprite.h"
 
 #define MAX_ENTITIES 72
diff --git a/include/main.h b/include/main.h
index 8a38f36f..03356134 100644
--- a/include/main.h
+++ b/include/main.h
@@ -6,6 +6,7 @@
 #include "script.h"
 #include "screen.h"
 #include "vram.h"
+#include "color.h"
 
 /** File signature */
 #define SIGNATURE 'MCZ3'
diff --git a/include/object.h b/include/object.h
index e2f5855d..34a85ea5 100644
--- a/include/object.h
+++ b/include/object.h
@@ -1,7 +1,6 @@
 #ifndef OBJECT_H
 #define OBJECT_H
 
-#include "global.h"
 #include "definitions.h"
 #include "entity.h"
 
diff --git a/include/room.h b/include/room.h
index 5abafd06..1802a934 100644
--- a/include/room.h
+++ b/include/room.h
@@ -3,7 +3,6 @@
 
 #include "entity.h"
 #include "droptables.h"
-#include "map.h"
 #include "transitions.h"
 
 enum RoomTransition {
diff --git a/include/screen.h b/include/screen.h
index 5a69f44c..fd0dd0b7 100644
--- a/include/screen.h
+++ b/include/screen.h
@@ -2,7 +2,6 @@
 #define SCREEN_H
 
 #include "global.h"
-#include "fade.h"
 
 typedef struct {
     /*0x00*/ u16 displayControl;
diff --git a/include/screenTransitions.h b/include/screenTransitions.h
index 2abbba93..2a28b04f 100644
--- a/include/screenTransitions.h
+++ b/include/screenTransitions.h
@@ -1,7 +1,7 @@
 #ifndef SCREENTRANSITIONS_H
 #define SCREENTRANSITIONS_H
 
-#include "room.h"
+#include "transitions.h"
 
 extern const Transition* const gWallMasterScreenTransitions[];
 extern const Transition gUnk_0813AB58;
diff --git a/src/affine.c b/src/affine.c
index e552b715..cf14f46b 100644
--- a/src/affine.c
+++ b/src/affine.c
@@ -2,7 +2,6 @@
 #include "global.h"
 #include "main.h"
 #include "room.h"
-#include "screen.h"
 
 extern u32 gFrameObjLists[];
 
diff --git a/src/backgroundAnimations.c b/src/backgroundAnimations.c
index b055bbbf..f32770b3 100644
--- a/src/backgroundAnimations.c
+++ b/src/backgroundAnimations.c
@@ -9,7 +9,7 @@
 #include "assets/gfx_offsets.h"
 #include "common.h"
 #include "gfx.h"
-#include "room.h"
+#include "fade.h"
 
 void LoadBgAnimationGfx(const BgAnimationGfx*);
 u32 GetBgAnimationTimer(const s32*);
diff --git a/src/code_08049CD4.c b/src/code_08049CD4.c
index 077c5745..c0ddc189 100644
--- a/src/code_08049CD4.c
+++ b/src/code_08049CD4.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "room.h"
 #include "enemy.h"
+#include "common.h"
 
 extern void MemFill32(u32, void*, u32);
 
diff --git a/src/collision.c b/src/collision.c
index 42f7c358..8f063d14 100644
--- a/src/collision.c
+++ b/src/collision.c
@@ -2,12 +2,12 @@
 #include "collision.h"
 #include "common.h"
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "entity.h"
 #include "global.h"
 #include "item.h"
 #include "object.h"
-#include "sound.h"
-#include "effects.h"
 #include "physics.h"
 #include "player.h"
 #include "save.h"
diff --git a/src/color.c b/src/color.c
index cf179c19..7f1b8e97 100644
--- a/src/color.c
+++ b/src/color.c
@@ -5,6 +5,7 @@
 #include "room.h"
 #include "main.h"
 #include "gfx.h"
+#include "fade.h"
 
 extern Palette gUnk_02001A3C;
 
diff --git a/src/common.c b/src/common.c
index a93fd730..0cb0da73 100644
--- a/src/common.c
+++ b/src/common.c
@@ -17,6 +17,7 @@
 #include "screen.h"
 #include "sound.h"
 #include "subtask.h"
+#include "fade.h"
 
 extern u8 gUnk_03003DE0;
 extern u8 gzHeap[0x1000];
diff --git a/src/cutscene.c b/src/cutscene.c
index dbdabec5..f76d8482 100644
--- a/src/cutscene.c
+++ b/src/cutscene.c
@@ -6,6 +6,9 @@
 #include "cutscene.h"
 
 #include "enemy.h"
+#include "sound.h"
+#include "flags.h"
+#include "common.h"
 #include "fade.h"
 #include "fileselect.h"
 #include "game.h"
@@ -13,9 +16,6 @@
 #include "menu.h"
 #include "npc.h"
 #include "object.h"
-#include "common.h"
-#include "sound.h"
-#include "flags.h"
 #include "room.h"
 #include "screen.h"
 #include "subtask.h"
diff --git a/src/debug.c b/src/debug.c
index 9ca357ad..9d2b728d 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -13,6 +13,7 @@
 #include "screen.h"
 #include "sound.h"
 #include "save.h"
+#include "fade.h"
 
 void sub_0805FA04(void);
 void sub_0805FA98(void);
diff --git a/src/demo.c b/src/demo.c
index b510a6fb..7675ef7a 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -13,9 +13,9 @@
 #include "menu.h"
 #include "message.h"
 #include "screen.h"
-#include "menu.h"
 #include "sound.h"
 #include "affine.h"
+#include "fade.h"
 
 void sub_080A30AC(void);
 void sub_080A2E40(void);
diff --git a/src/droptables.c b/src/droptables.c
index aafd0879..69deb7ee 100644
--- a/src/droptables.c
+++ b/src/droptables.c
@@ -1,4 +1,3 @@
-#include "global.h"
 #include "droptables.h"
 
 const Droptable gEnemyDroptables[] = {
diff --git a/src/enemy/acroBandits.c b/src/enemy/acroBandits.c
index 6ac2b964..8011c609 100644
--- a/src/enemy/acroBandits.c
+++ b/src/enemy/acroBandits.c
@@ -5,6 +5,8 @@
  * @brief Acro Bandits enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "player.h"
 #include "physics.h"
 #include "asm.h"
diff --git a/src/enemy/armos.c b/src/enemy/armos.c
index 04d6bdb7..5eadaaf6 100644
--- a/src/enemy/armos.c
+++ b/src/enemy/armos.c
@@ -8,6 +8,7 @@
 #include "collision.h"
 #include "common.h"
 #include "enemy.h"
+#include "sound.h"
 #include "flags.h"
 #include "physics.h"
 #include "global.h"
@@ -16,6 +17,7 @@
 #include "room.h"
 #include "player.h"
 #include "asm.h"
+#include "map.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/ballChainSoldier.c b/src/enemy/ballChainSoldier.c
index 908c7d2d..fac44fa0 100644
--- a/src/enemy/ballChainSoldier.c
+++ b/src/enemy/ballChainSoldier.c
@@ -5,6 +5,8 @@
  * @brief Ball Chain Soldier enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "projectile.h"
 #include "entity.h"
 #include "room.h"
 #include "physics.h"
diff --git a/src/enemy/beetle.c b/src/enemy/beetle.c
index 9637abb6..934e308a 100644
--- a/src/enemy/beetle.c
+++ b/src/enemy/beetle.c
@@ -5,6 +5,8 @@
  * @brief Beetle enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "player.h"
 #include "physics.h"
 #include "asm.h"
diff --git a/src/enemy/bobomb.c b/src/enemy/bobomb.c
index 131fe12f..0fc89c5c 100644
--- a/src/enemy/bobomb.c
+++ b/src/enemy/bobomb.c
@@ -7,9 +7,9 @@
 #include "asm.h"
 #include "collision.h"
 #include "enemy.h"
-#include "object.h"
 #include "sound.h"
 #include "effects.h"
+#include "object.h"
 #include "physics.h"
 #include "player.h"
 
diff --git a/src/enemy/bombarossa.c b/src/enemy/bombarossa.c
index bd9bd235..49a7d4a5 100644
--- a/src/enemy/bombarossa.c
+++ b/src/enemy/bombarossa.c
@@ -5,6 +5,8 @@
  * @brief Bombarossa enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "object.h"
 #include "asm.h"
 #include "room.h"
diff --git a/src/enemy/bowMoblin.c b/src/enemy/bowMoblin.c
index 8bbc4b5c..150d89cd 100644
--- a/src/enemy/bowMoblin.c
+++ b/src/enemy/bowMoblin.c
@@ -5,6 +5,9 @@
  * @brief Bow Moblin enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "projectile.h"
 #include "entity.h"
 #include "physics.h"
 #include "asm.h"
diff --git a/src/enemy/businessScrub.c b/src/enemy/businessScrub.c
index 54f6dd4d..c00fdd50 100644
--- a/src/enemy/businessScrub.c
+++ b/src/enemy/businessScrub.c
@@ -6,6 +6,10 @@
  */
 #include "asm.h"
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "flags.h"
+#include "projectile.h"
 #include "item.h"
 #include "kinstone.h"
 #include "message.h"
@@ -13,6 +17,7 @@
 #include "save.h"
 #include "tiles.h"
 #include "vram.h"
+#include "color.h"
 
 struct SalesOffering {
     u8 field_0x0;
diff --git a/src/enemy/businessScrubPrologue.c b/src/enemy/businessScrubPrologue.c
index fdd9646f..56a0ca38 100644
--- a/src/enemy/businessScrubPrologue.c
+++ b/src/enemy/businessScrubPrologue.c
@@ -6,6 +6,9 @@
  */
 #include "object/cutsceneMiscObject.h"
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "projectile.h"
 #include "entity.h"
 #include "script.h"
 #include "physics.h"
diff --git a/src/enemy/chaser.c b/src/enemy/chaser.c
index 14be99e2..93a042b8 100644
--- a/src/enemy/chaser.c
+++ b/src/enemy/chaser.c
@@ -5,6 +5,8 @@
  * @brief Chaser enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "functions.h"
 #include "player.h"
 #include "physics.h"
diff --git a/src/enemy/chuchu.c b/src/enemy/chuchu.c
index 19b269c1..cbc3ce55 100644
--- a/src/enemy/chuchu.c
+++ b/src/enemy/chuchu.c
@@ -6,6 +6,8 @@
  */
 #include "asm.h"
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "physics.h"
 #include "tiles.h"
 
diff --git a/src/enemy/chuchuBoss.c b/src/enemy/chuchuBoss.c
index 81bfd0c3..a7c52e03 100644
--- a/src/enemy/chuchuBoss.c
+++ b/src/enemy/chuchuBoss.c
@@ -5,11 +5,11 @@
  * @brief Chuchu Boss enemy
  */
 #include "enemy.h"
-#include "object.h"
-#include "asm.h"
-#include "common.h"
 #include "sound.h"
 #include "effects.h"
+#include "common.h"
+#include "object.h"
+#include "asm.h"
 #include "room.h"
 #include "physics.h"
 #include "player.h"
@@ -17,6 +17,7 @@
 #include "pauseMenu.h"
 #ifndef EU
 #include "vram.h"
+#include "color.h"
 #endif
 
 typedef struct {
diff --git a/src/enemy/cloudPiranha.c b/src/enemy/cloudPiranha.c
index 534c8505..ba3a1f67 100644
--- a/src/enemy/cloudPiranha.c
+++ b/src/enemy/cloudPiranha.c
@@ -6,10 +6,13 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "room.h"
 #include "physics.h"
 #include "tiles.h"
 #include "asm.h"
+#include "color.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/crow.c b/src/enemy/crow.c
index 2c51fb5d..5a3f4cc4 100644
--- a/src/enemy/crow.c
+++ b/src/enemy/crow.c
@@ -5,6 +5,7 @@
  * @brief Crow enemy
  */
 #include "enemy.h"
+#include "sound.h"
 #include "entity.h"
 #include "physics.h"
 #include "asm.h"
diff --git a/src/enemy/cuccoAggr.c b/src/enemy/cuccoAggr.c
index 7a353788..67068086 100644
--- a/src/enemy/cuccoAggr.c
+++ b/src/enemy/cuccoAggr.c
@@ -5,6 +5,9 @@
  * @brief Cucco Aggr enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "flags.h"
 #include "entity.h"
 #include "room.h"
 #include "player.h"
diff --git a/src/enemy/cuccoChickAggr.c b/src/enemy/cuccoChickAggr.c
index 30332fcb..eecb3de1 100644
--- a/src/enemy/cuccoChickAggr.c
+++ b/src/enemy/cuccoChickAggr.c
@@ -5,6 +5,8 @@
  * @brief Cucco Chick Aggr enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "player.h"
 #include "asm.h"
 
diff --git a/src/enemy/curtain.c b/src/enemy/curtain.c
index e5256714..918bdd5c 100644
--- a/src/enemy/curtain.c
+++ b/src/enemy/curtain.c
@@ -5,6 +5,8 @@
  * @brief Curtain enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "flags.h"
 #include "entity.h"
 
 void (*const Curtain_Functions[])(Entity*);
diff --git a/src/enemy/darkNut.c b/src/enemy/darkNut.c
index f174bae9..c0ff9b39 100644
--- a/src/enemy/darkNut.c
+++ b/src/enemy/darkNut.c
@@ -5,6 +5,9 @@
  * @brief Dark Nut enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "projectile.h"
 #include "asm.h"
 
 typedef struct {
diff --git a/src/enemy/doorMimic.c b/src/enemy/doorMimic.c
index c7932157..bc906e07 100644
--- a/src/enemy/doorMimic.c
+++ b/src/enemy/doorMimic.c
@@ -6,11 +6,11 @@
  */
 #include "enemy.h"
 #include "sound.h"
+#include "effects.h"
+#include "common.h"
 #include "tiles.h"
 #include "object.h"
 #include "asm.h"
-#include "common.h"
-#include "effects.h"
 #include "room.h"
 
 typedef struct {
diff --git a/src/enemy/dust.c b/src/enemy/dust.c
index 071184db..a19dd612 100644
--- a/src/enemy/dust.c
+++ b/src/enemy/dust.c
@@ -6,13 +6,13 @@
  */
 #include "asm.h"
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "flags.h"
+#include "common.h"
 #include "entity.h"
 #include "hitbox.h"
 #include "object.h"
-#include "common.h"
-#include "sound.h"
-#include "flags.h"
-#include "effects.h"
 #include "room.h"
 #include "physics.h"
 #include "player.h"
diff --git a/src/enemy/enemy4D.c b/src/enemy/enemy4D.c
index 4e930e91..3a37c7da 100644
--- a/src/enemy/enemy4D.c
+++ b/src/enemy/enemy4D.c
@@ -5,6 +5,8 @@
  * @brief Enemy4D enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "projectile.h"
 #include "entity.h"
 #include "room.h"
 #include "physics.h"
diff --git a/src/enemy/enemy50.c b/src/enemy/enemy50.c
index 0ffd569a..0b54476e 100644
--- a/src/enemy/enemy50.c
+++ b/src/enemy/enemy50.c
@@ -6,6 +6,7 @@
  */
 #include "area.h"
 #include "enemy.h"
+#include "effects.h"
 #include "physics.h"
 #include "player.h"
 #include "room.h"
diff --git a/src/enemy/enemy64.c b/src/enemy/enemy64.c
index 5ebc2949..7dc17d67 100644
--- a/src/enemy/enemy64.c
+++ b/src/enemy/enemy64.c
@@ -5,6 +5,10 @@
  * @brief Enemy64 enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "flags.h"
+#include "projectile.h"
 #include "fade.h"
 #include "scroll.h"
 #include "physics.h"
@@ -12,6 +16,7 @@
 #include "room.h"
 #include "player.h"
 #include "asm.h"
+#include "map.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/enemyE.c b/src/enemy/enemyE.c
index 08beabb0..5b59069b 100644
--- a/src/enemy/enemyE.c
+++ b/src/enemy/enemyE.c
@@ -5,6 +5,7 @@
  * @brief EnemyE enemy
  */
 #include "enemy.h"
+#include "effects.h"
 
 void sub_08023000(Entity*, int);
 
diff --git a/src/enemy/eyegore.c b/src/enemy/eyegore.c
index 07991c44..d7d3679f 100644
--- a/src/enemy/eyegore.c
+++ b/src/enemy/eyegore.c
@@ -5,13 +5,12 @@
  * @brief Eyegore enemy
  */
 #include "enemy.h"
-#include "fade.h"
+#include "sound.h"
+#include "effects.h"
+#include "flags.h"
 #include "hitbox.h"
 #include "object.h"
 #include "asm.h"
-#include "sound.h"
-#include "flags.h"
-#include "effects.h"
 #include "room.h"
 #include "physics.h"
 #include "player.h"
diff --git a/src/enemy/fallingBoulder.c b/src/enemy/fallingBoulder.c
index fbb40c70..fa3d564c 100644
--- a/src/enemy/fallingBoulder.c
+++ b/src/enemy/fallingBoulder.c
@@ -5,6 +5,8 @@
  * @brief Falling Boulder enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "room.h"
 #include "player.h"
 #include "physics.h"
diff --git a/src/enemy/fireballGuy.c b/src/enemy/fireballGuy.c
index 848b2b04..112194d0 100644
--- a/src/enemy/fireballGuy.c
+++ b/src/enemy/fireballGuy.c
@@ -5,6 +5,8 @@
  * @brief Fireball Guy enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "player.h"
 #include "physics.h"
 #include "asm.h"
diff --git a/src/enemy/flyingPot.c b/src/enemy/flyingPot.c
index 0c99cc7a..1116caa8 100644
--- a/src/enemy/flyingPot.c
+++ b/src/enemy/flyingPot.c
@@ -6,6 +6,7 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "effects.h"
 #include "physics.h"
 #include "player.h"
 #include "room.h"
diff --git a/src/enemy/flyingSkull.c b/src/enemy/flyingSkull.c
index 307fb7fa..b9e2f8fa 100644
--- a/src/enemy/flyingSkull.c
+++ b/src/enemy/flyingSkull.c
@@ -7,6 +7,7 @@
 #include "object/pot.h"
 #include "collision.h"
 #include "enemy.h"
+#include "effects.h"
 #include "entity.h"
 #include "physics.h"
 #include "hitbox.h"
diff --git a/src/enemy/ghini.c b/src/enemy/ghini.c
index e0afd0fb..0dd2a388 100644
--- a/src/enemy/ghini.c
+++ b/src/enemy/ghini.c
@@ -6,6 +6,8 @@
  */
 #include "area.h"
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "player.h"
 #include "physics.h"
 #include "asm.h"
diff --git a/src/enemy/gibdo.c b/src/enemy/gibdo.c
index 3da47c9c..d31c94ed 100644
--- a/src/enemy/gibdo.c
+++ b/src/enemy/gibdo.c
@@ -5,10 +5,10 @@
  * @brief Gibdo enemy
  */
 #include "enemy.h"
-#include "object.h"
-#include "asm.h"
 #include "sound.h"
 #include "effects.h"
+#include "object.h"
+#include "asm.h"
 #include "physics.h"
 #include "player.h"
 
diff --git a/src/enemy/gleerok.c b/src/enemy/gleerok.c
index 124d5d65..18586946 100644
--- a/src/enemy/gleerok.c
+++ b/src/enemy/gleerok.c
@@ -5,18 +5,21 @@
  * @brief Gleerok enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "flags.h"
+#include "common.h"
+#include "projectile.h"
 #include "entity.h"
 #include "object.h"
 #include "asm.h"
-#include "common.h"
-#include "sound.h"
-#include "flags.h"
-#include "effects.h"
 #include "room.h"
 #include "physics.h"
 #include "player.h"
 #include "screen.h"
 #include "pauseMenu.h"
+#include "color.h"
+#include "fade.h"
 
 typedef struct {
     union SplitHWord unk0;
diff --git a/src/enemy/gyorgChild.c b/src/enemy/gyorgChild.c
index 4d15d58d..67beee16 100644
--- a/src/enemy/gyorgChild.c
+++ b/src/enemy/gyorgChild.c
@@ -9,6 +9,7 @@
 #include "room.h"
 #include "player.h"
 #include "physics.h"
+#include "sound.h"
 
 void GyorgChild_OnTick(GyorgChildEntity*);
 void GyorgChild_OnCollision(GyorgChildEntity*);
diff --git a/src/enemy/gyorgFemale.c b/src/enemy/gyorgFemale.c
index de4abc83..b705005b 100644
--- a/src/enemy/gyorgFemale.c
+++ b/src/enemy/gyorgFemale.c
@@ -8,8 +8,11 @@
 #include "beanstalkSubtask.h"
 #include "collision.h"
 #include "enemy.h"
-#include "enemy/gyorg.h"
 #include "sound.h"
+#include "effects.h"
+#include "common.h"
+#include "projectile.h"
+#include "enemy/gyorg.h"
 #include "assets/map_offsets.h"
 #include "game.h"
 #include "player.h"
diff --git a/src/enemy/gyorgFemaleEye.c b/src/enemy/gyorgFemaleEye.c
index 1dc30c7c..05c03183 100644
--- a/src/enemy/gyorgFemaleEye.c
+++ b/src/enemy/gyorgFemaleEye.c
@@ -5,6 +5,8 @@
  * @brief Gyorg Female Eye enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "enemy/gyorg.h"
 #include "entity.h"
 #include "player.h"
diff --git a/src/enemy/gyorgMale.c b/src/enemy/gyorgMale.c
index a4cfffeb..39d98d7c 100644
--- a/src/enemy/gyorgMale.c
+++ b/src/enemy/gyorgMale.c
@@ -6,6 +6,8 @@
  */
 #include "effects.h"
 #include "enemy.h"
+#include "sound.h"
+#include "projectile.h"
 #include "enemy/gyorg.h"
 #include "fileselect.h"
 #include "physics.h"
diff --git a/src/enemy/gyorgMaleEye.c b/src/enemy/gyorgMaleEye.c
index e3f536fd..c62b8d30 100644
--- a/src/enemy/gyorgMaleEye.c
+++ b/src/enemy/gyorgMaleEye.c
@@ -5,7 +5,8 @@
  * @brief GyorgMaleEye enemy
  */
 #include "enemy.h"
-#include "fade.h"
+#include "sound.h"
+#include "effects.h"
 #include "physics.h"
 #include "room.h"
 
diff --git a/src/enemy/hangingSeed.c b/src/enemy/hangingSeed.c
index 19479230..3dabc2ca 100644
--- a/src/enemy/hangingSeed.c
+++ b/src/enemy/hangingSeed.c
@@ -5,10 +5,9 @@
  * @brief Hanging Seed enemy
  */
 #include "enemy.h"
-#include "entity.h"
-#include "object.h"
-#include "asm.h"
+#include "sound.h"
 #include "effects.h"
+#include "entity.h"
 
 extern void (*const HangingSeed_Functions[])(Entity*);
 extern void (*const gUnk_080CB588[])(Entity*);
diff --git a/src/enemy/helmasaur.c b/src/enemy/helmasaur.c
index abe346ce..cf22a53c 100644
--- a/src/enemy/helmasaur.c
+++ b/src/enemy/helmasaur.c
@@ -6,12 +6,13 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "effects.h"
 #include "object.h"
 #include "asm.h"
-#include "effects.h"
 #include "room.h"
 #include "physics.h"
 #include "player.h"
+#include "map.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/keaton.c b/src/enemy/keaton.c
index ac7366da..993d0ba0 100644
--- a/src/enemy/keaton.c
+++ b/src/enemy/keaton.c
@@ -5,6 +5,9 @@
  * @brief keaton enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "projectile.h"
 #include "physics.h"
 #include "asm.h"
 
diff --git a/src/enemy/keese.c b/src/enemy/keese.c
index 99517334..8f1390a6 100644
--- a/src/enemy/keese.c
+++ b/src/enemy/keese.c
@@ -5,6 +5,8 @@
  * @brief Keese enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "physics.h"
 #include "player.h"
 #include "asm.h"
diff --git a/src/enemy/lakitu.c b/src/enemy/lakitu.c
index f22d0fa1..bff5b976 100644
--- a/src/enemy/lakitu.c
+++ b/src/enemy/lakitu.c
@@ -5,6 +5,9 @@
  * @brief Lakitu enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "projectile.h"
 #include "physics.h"
 #include "player.h"
 #include "asm.h"
diff --git a/src/enemy/lakituCloud.c b/src/enemy/lakituCloud.c
index 9436c709..85d37c90 100644
--- a/src/enemy/lakituCloud.c
+++ b/src/enemy/lakituCloud.c
@@ -7,9 +7,9 @@
 #include "asm.h"
 #include "effects.h"
 #include "enemy.h"
+#include "sound.h"
 #include "entity.h"
 #include "object.h"
-#include "sound.h"
 #include "physics.h"
 #include "player.h"
 #include "room.h"
diff --git a/src/enemy/leever.c b/src/enemy/leever.c
index 6b12cf8e..6896e80e 100644
--- a/src/enemy/leever.c
+++ b/src/enemy/leever.c
@@ -6,6 +6,7 @@
  */
 #include "asm.h"
 #include "enemy.h"
+#include "effects.h"
 #include "physics.h"
 #include "tiles.h"
 
diff --git a/src/enemy/likeLike.c b/src/enemy/likeLike.c
index 5bee7fc3..b69bfde1 100644
--- a/src/enemy/likeLike.c
+++ b/src/enemy/likeLike.c
@@ -5,12 +5,12 @@
  * @brief Like Like enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "item.h"
 #include "message.h"
 #include "object.h"
 #include "asm.h"
-#include "sound.h"
-#include "effects.h"
 #include "physics.h"
 #include "player.h"
 #include "save.h"
diff --git a/src/enemy/madderpillar.c b/src/enemy/madderpillar.c
index 1ecff210..de439c90 100644
--- a/src/enemy/madderpillar.c
+++ b/src/enemy/madderpillar.c
@@ -5,11 +5,13 @@
  * @brief Madderpillar enemy
  */
 #include "enemy.h"
-#include "hitbox.h"
+#include "sound.h"
 #include "effects.h"
+#include "hitbox.h"
 #include "room.h"
 #include "physics.h"
 #include "asm.h"
+#include "color.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/mazaalBracelet.c b/src/enemy/mazaalBracelet.c
index 60fc15e7..72ba305e 100644
--- a/src/enemy/mazaalBracelet.c
+++ b/src/enemy/mazaalBracelet.c
@@ -5,15 +5,16 @@
  * @brief Mazaal Bracelet enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "hitbox.h"
 #include "object.h"
 #include "asm.h"
 #include "script.h"
-#include "sound.h"
-#include "effects.h"
 #include "room.h"
 #include "physics.h"
 #include "player.h"
+#include "color.h"
 
 typedef struct MazaalBraceletEntity_ {
     /*0x00*/ Entity base;
diff --git a/src/enemy/mazaalHead.c b/src/enemy/mazaalHead.c
index 0e079d48..1cec5baa 100644
--- a/src/enemy/mazaalHead.c
+++ b/src/enemy/mazaalHead.c
@@ -6,10 +6,11 @@
  */
 #include "area.h"
 #include "enemy.h"
-#include "object.h"
-#include "asm.h"
 #include "sound.h"
 #include "effects.h"
+#include "projectile.h"
+#include "object.h"
+#include "asm.h"
 #include "room.h"
 #include "physics.h"
 #include "player.h"
diff --git a/src/enemy/mazaalMacro.c b/src/enemy/mazaalMacro.c
index 91191679..fd3146b6 100644
--- a/src/enemy/mazaalMacro.c
+++ b/src/enemy/mazaalMacro.c
@@ -5,7 +5,10 @@
  * @brief Mazaal Macro enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "screenTransitions.h"
+#include "room.h"
 #include "script.h"
 #include "tiles.h"
 #include "player.h"
diff --git a/src/enemy/miniFireballGuy.c b/src/enemy/miniFireballGuy.c
index a0097211..f50c3bc6 100644
--- a/src/enemy/miniFireballGuy.c
+++ b/src/enemy/miniFireballGuy.c
@@ -5,6 +5,8 @@
  * @brief Mini Fireball Guy enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "physics.h"
 #include "asm.h"
 
diff --git a/src/enemy/miniSlime.c b/src/enemy/miniSlime.c
index 0624494e..38a42e96 100644
--- a/src/enemy/miniSlime.c
+++ b/src/enemy/miniSlime.c
@@ -5,6 +5,8 @@
  * @brief Mini Slime enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "physics.h"
 #include "asm.h"
 
diff --git a/src/enemy/moldworm.c b/src/enemy/moldworm.c
index 1282d029..8e3e6db0 100644
--- a/src/enemy/moldworm.c
+++ b/src/enemy/moldworm.c
@@ -6,11 +6,14 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "physics.h"
 #include "tiles.h"
 #include "room.h"
 #include "player.h"
 #include "asm.h"
+#include "color.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/mulldozer.c b/src/enemy/mulldozer.c
index d60a1c4f..60176768 100644
--- a/src/enemy/mulldozer.c
+++ b/src/enemy/mulldozer.c
@@ -6,6 +6,8 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "asm.h"
 
 typedef struct {
diff --git a/src/enemy/octorok.c b/src/enemy/octorok.c
index ac13da58..07101e70 100644
--- a/src/enemy/octorok.c
+++ b/src/enemy/octorok.c
@@ -5,6 +5,9 @@
  * @brief Octorok enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "projectile.h"
 #include "physics.h"
 #include "asm.h"
 
diff --git a/src/enemy/octorokBoss.c b/src/enemy/octorokBoss.c
index 0ef5f55c..0886f1bf 100644
--- a/src/enemy/octorokBoss.c
+++ b/src/enemy/octorokBoss.c
@@ -18,6 +18,7 @@
 #include "player.h"
 #include "projectile.h"
 #include "vram.h"
+#include "color.h"
 
 #define IS_FROZEN(this) ((this)->bossPhase & 1)
 
diff --git a/src/enemy/octorokGolden.c b/src/enemy/octorokGolden.c
index 8c31a460..8753e2b5 100644
--- a/src/enemy/octorokGolden.c
+++ b/src/enemy/octorokGolden.c
@@ -6,6 +6,10 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "flags.h"
+#include "projectile.h"
 #include "map.h"
 #include "player.h"
 #include "item.h"
diff --git a/src/enemy/peahat.c b/src/enemy/peahat.c
index d18a3553..52437ceb 100644
--- a/src/enemy/peahat.c
+++ b/src/enemy/peahat.c
@@ -5,6 +5,8 @@
  * @brief Peahat enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "physics.h"
 #include "asm.h"
 #include "room.h"
diff --git a/src/enemy/pesto.c b/src/enemy/pesto.c
index 6b523e27..e44b11e3 100644
--- a/src/enemy/pesto.c
+++ b/src/enemy/pesto.c
@@ -6,11 +6,12 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "projectile.h"
 #include "game.h"
 #include "object.h"
 #include "asm.h"
-#include "sound.h"
-#include "effects.h"
 #include "room.h"
 #include "physics.h"
 #include "player.h"
diff --git a/src/enemy/puffstool.c b/src/enemy/puffstool.c
index 2abd938b..bb6fa93a 100644
--- a/src/enemy/puffstool.c
+++ b/src/enemy/puffstool.c
@@ -6,14 +6,15 @@
  */
 #include "collision.h"
 #include "enemy.h"
-#include "object.h"
-#include "asm.h"
 #include "sound.h"
 #include "effects.h"
+#include "object.h"
+#include "asm.h"
 #include "room.h"
 #include "physics.h"
 #include "player.h"
 #include "tiles.h"
+#include "color.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/rockChuchu.c b/src/enemy/rockChuchu.c
index 8872b928..25acfff7 100644
--- a/src/enemy/rockChuchu.c
+++ b/src/enemy/rockChuchu.c
@@ -5,9 +5,10 @@
  * @brief Rock Chuchu enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "player.h"
 #include "asm.h"
-#include "effects.h"
 
 extern void (*const RockChuchu_Functions[])(Entity*);
 extern void (*const gUnk_080CB960[])(Entity*);
diff --git a/src/enemy/rollobite.c b/src/enemy/rollobite.c
index ab546efb..428038e6 100644
--- a/src/enemy/rollobite.c
+++ b/src/enemy/rollobite.c
@@ -6,6 +6,7 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "sound.h"
 #include "physics.h"
 #include "player.h"
 #include "room.h"
diff --git a/src/enemy/rope.c b/src/enemy/rope.c
index 6ba4d764..762e32b1 100644
--- a/src/enemy/rope.c
+++ b/src/enemy/rope.c
@@ -5,6 +5,8 @@
  * @brief Rope enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "physics.h"
 #include "tiles.h"
 #include "asm.h"
diff --git a/src/enemy/ropeGolden.c b/src/enemy/ropeGolden.c
index 4b5051cf..69c43e98 100644
--- a/src/enemy/ropeGolden.c
+++ b/src/enemy/ropeGolden.c
@@ -5,6 +5,9 @@
  * @brief Golden Rope enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "flags.h"
 #include "entity.h"
 #include "physics.h"
 #include "player.h"
diff --git a/src/enemy/scissorsBeetle.c b/src/enemy/scissorsBeetle.c
index f0eaa381..dd4eba0c 100644
--- a/src/enemy/scissorsBeetle.c
+++ b/src/enemy/scissorsBeetle.c
@@ -6,6 +6,9 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "projectile.h"
 #include "entity.h"
 #include "asm.h"
 
diff --git a/src/enemy/sensorBladeTrap.c b/src/enemy/sensorBladeTrap.c
index 31d2bc10..36357f4e 100644
--- a/src/enemy/sensorBladeTrap.c
+++ b/src/enemy/sensorBladeTrap.c
@@ -6,6 +6,7 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "sound.h"
 #include "map.h"
 #include "physics.h"
 
diff --git a/src/enemy/slime.c b/src/enemy/slime.c
index 6e6be923..5c7636c0 100644
--- a/src/enemy/slime.c
+++ b/src/enemy/slime.c
@@ -5,6 +5,8 @@
  * @brief Slime enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "physics.h"
 #include "room.h"
 #include "asm.h"
diff --git a/src/enemy/sluggula.c b/src/enemy/sluggula.c
index 5a95aa56..cece7301 100644
--- a/src/enemy/sluggula.c
+++ b/src/enemy/sluggula.c
@@ -5,6 +5,8 @@
  * @brief Sluggula enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "physics.h"
 #include "asm.h"
 
diff --git a/src/enemy/smallPesto.c b/src/enemy/smallPesto.c
index 79f24419..a9652e10 100644
--- a/src/enemy/smallPesto.c
+++ b/src/enemy/smallPesto.c
@@ -5,6 +5,8 @@
  * @brief Small Pesto enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "physics.h"
 #include "asm.h"
 
diff --git a/src/enemy/spark.c b/src/enemy/spark.c
index 69c4f75e..a5dde94a 100644
--- a/src/enemy/spark.c
+++ b/src/enemy/spark.c
@@ -6,9 +6,8 @@
  */
 #include "collision.h"
 #include "enemy.h"
-#include "object.h"
-#include "asm.h"
 #include "effects.h"
+#include "object.h"
 #include "physics.h"
 
 extern void (*const Spark_Functions[])(Entity*);
diff --git a/src/enemy/spearMoblin.c b/src/enemy/spearMoblin.c
index 2c40c235..e8954dd2 100644
--- a/src/enemy/spearMoblin.c
+++ b/src/enemy/spearMoblin.c
@@ -5,10 +5,11 @@
  * @brief Spear Moblin enemy
  */
 #include "enemy.h"
-#include "object.h"
-#include "asm.h"
 #include "sound.h"
 #include "effects.h"
+#include "projectile.h"
+#include "object.h"
+#include "asm.h"
 #include "physics.h"
 
 typedef struct {
diff --git a/src/enemy/spikedBeetle.c b/src/enemy/spikedBeetle.c
index 6563b7bd..01200c7d 100644
--- a/src/enemy/spikedBeetle.c
+++ b/src/enemy/spikedBeetle.c
@@ -5,6 +5,8 @@
  * @brief Spiked Beetle enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "player.h"
 #include "physics.h"
 #include "asm.h"
diff --git a/src/enemy/spinyBeetle.c b/src/enemy/spinyBeetle.c
index c6fec3b0..bbc0b84a 100644
--- a/src/enemy/spinyBeetle.c
+++ b/src/enemy/spinyBeetle.c
@@ -5,6 +5,7 @@
  * @brief Spiny Beetle enemy
  */
 #include "enemy.h"
+#include "sound.h"
 #include "entity.h"
 #include "object.h"
 #include "asm.h"
diff --git a/src/enemy/spinyChuchu.c b/src/enemy/spinyChuchu.c
index c6ffc5ab..89de684b 100644
--- a/src/enemy/spinyChuchu.c
+++ b/src/enemy/spinyChuchu.c
@@ -5,6 +5,8 @@
  * @brief Spiny Chuchu enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "hitbox.h"
 #include "physics.h"
 #include "asm.h"
diff --git a/src/enemy/stalfos.c b/src/enemy/stalfos.c
index ab0b46a1..103698d7 100644
--- a/src/enemy/stalfos.c
+++ b/src/enemy/stalfos.c
@@ -6,6 +6,9 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "projectile.h"
 #include "physics.h"
 #include "tiles.h"
 #include "room.h"
diff --git a/src/enemy/takkuri.c b/src/enemy/takkuri.c
index bc80e9f5..ee5e6908 100644
--- a/src/enemy/takkuri.c
+++ b/src/enemy/takkuri.c
@@ -5,6 +5,7 @@
  * @brief Takkuri enemy
  */
 #include "enemy.h"
+#include "sound.h"
 #include "entity.h"
 #include "item.h"
 #include "object.h"
diff --git a/src/enemy/tektite.c b/src/enemy/tektite.c
index 59b71c7b..46053390 100644
--- a/src/enemy/tektite.c
+++ b/src/enemy/tektite.c
@@ -6,6 +6,7 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "effects.h"
 #include "asm.h"
 
 typedef struct {
diff --git a/src/enemy/tektiteGolden.c b/src/enemy/tektiteGolden.c
index 570cc67c..f7875954 100644
--- a/src/enemy/tektiteGolden.c
+++ b/src/enemy/tektiteGolden.c
@@ -6,6 +6,8 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "effects.h"
+#include "flags.h"
 #include "item.h"
 #include "asm.h"
 
diff --git a/src/enemy/torchTrap.c b/src/enemy/torchTrap.c
index f2e4dd2d..c6ce0762 100644
--- a/src/enemy/torchTrap.c
+++ b/src/enemy/torchTrap.c
@@ -5,6 +5,9 @@
  * @brief Torch Trap enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "flags.h"
+#include "projectile.h"
 #include "entity.h"
 #include "physics.h"
 #include "player.h"
diff --git a/src/enemy/treeItem.c b/src/enemy/treeItem.c
index 60fe4802..5169946d 100644
--- a/src/enemy/treeItem.c
+++ b/src/enemy/treeItem.c
@@ -5,6 +5,8 @@
  * @brief Tree Item enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "item.h"
 #include "object.h"
 #include "asm.h"
diff --git a/src/enemy/vaatiArm.c b/src/enemy/vaatiArm.c
index 9abcd5c9..b53ca35e 100644
--- a/src/enemy/vaatiArm.c
+++ b/src/enemy/vaatiArm.c
@@ -6,12 +6,13 @@
  */
 #include "area.h"
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "common.h"
+#include "projectile.h"
 #include "hitbox.h"
 #include "object.h"
 #include "asm.h"
-#include "common.h"
-#include "sound.h"
-#include "effects.h"
 #include "room.h"
 #include "physics.h"
 #include "player.h"
diff --git a/src/enemy/vaatiBall.c b/src/enemy/vaatiBall.c
index e97acf52..3e662393 100644
--- a/src/enemy/vaatiBall.c
+++ b/src/enemy/vaatiBall.c
@@ -5,6 +5,7 @@
  * @brief Vaati Ball enemy
  */
 #include "enemy.h"
+#include "projectile.h"
 #include "entity.h"
 #include "object.h"
 #include "asm.h"
diff --git a/src/enemy/vaatiEyesMacro.c b/src/enemy/vaatiEyesMacro.c
index f2f4829b..33e90175 100644
--- a/src/enemy/vaatiEyesMacro.c
+++ b/src/enemy/vaatiEyesMacro.c
@@ -5,6 +5,8 @@
  * @brief Vaati Eyes Macro enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "room.h"
 #include "player.h"
 #include "physics.h"
diff --git a/src/enemy/vaatiProjectile.c b/src/enemy/vaatiProjectile.c
index 6e34e868..783eb43c 100644
--- a/src/enemy/vaatiProjectile.c
+++ b/src/enemy/vaatiProjectile.c
@@ -5,7 +5,10 @@
  * @brief Vaati Projectile enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "screenTransitions.h"
+#include "room.h"
 #include "tiles.h"
 #include "player.h"
 #include "physics.h"
diff --git a/src/enemy/vaatiRebornEnemy.c b/src/enemy/vaatiRebornEnemy.c
index d8b0fac9..123442cb 100644
--- a/src/enemy/vaatiRebornEnemy.c
+++ b/src/enemy/vaatiRebornEnemy.c
@@ -6,6 +6,10 @@
  */
 #include "area.h"
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "flags.h"
+#include "projectile.h"
 #include "physics.h"
 #include "room.h"
 #include "player.h"
diff --git a/src/enemy/vaatiTransfigured.c b/src/enemy/vaatiTransfigured.c
index 132ec86e..ca917019 100644
--- a/src/enemy/vaatiTransfigured.c
+++ b/src/enemy/vaatiTransfigured.c
@@ -5,11 +5,12 @@
  * @brief Vaati Transfigured enemy
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "flags.h"
+#include "projectile.h"
 #include "object.h"
 #include "asm.h"
-#include "sound.h"
-#include "flags.h"
-#include "effects.h"
 #include "room.h"
 #include "physics.h"
 #include "player.h"
diff --git a/src/enemy/vaatiTransfiguredEye.c b/src/enemy/vaatiTransfiguredEye.c
index 7012dcd9..a0190dd6 100644
--- a/src/enemy/vaatiTransfiguredEye.c
+++ b/src/enemy/vaatiTransfiguredEye.c
@@ -5,9 +5,11 @@
  * @brief Vaati Transfigured Eye enemy
  */
 #include "enemy.h"
+#include "sound.h"
 #include "entity.h"
 #include "message.h"
 #include "physics.h"
+#include "color.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/enemy/vaatiWrath.c b/src/enemy/vaatiWrath.c
index c351381e..66a40a98 100644
--- a/src/enemy/vaatiWrath.c
+++ b/src/enemy/vaatiWrath.c
@@ -16,9 +16,11 @@
 #include "room.h"
 #include "physics.h"
 #include "player.h"
-#include "screen.h"
 #include "vram.h"
 #include "scroll.h"
+#include "color.h"
+#include "fade.h"
+#include "projectile.h"
 #if defined USA || defined DEMO_USA || defined DEMO_JP
 #include "save.h"
 #endif
diff --git a/src/enemy/vaatiWrathEye.c b/src/enemy/vaatiWrathEye.c
index 7f398d4f..3fd20877 100644
--- a/src/enemy/vaatiWrathEye.c
+++ b/src/enemy/vaatiWrathEye.c
@@ -8,6 +8,9 @@
 #include "room.h"
 #include "physics.h"
 #include "asm.h"
+#include "sound.h"
+#include "effects.h"
+#include "projectile.h"
 
 void sub_080485D8(Entity*);
 void sub_080485FC(Entity*);
diff --git a/src/enemy/wallMaster.c b/src/enemy/wallMaster.c
index 922eb611..f7f93fd7 100644
--- a/src/enemy/wallMaster.c
+++ b/src/enemy/wallMaster.c
@@ -6,8 +6,11 @@
  */
 #include "area.h"
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "player.h"
 #include "screenTransitions.h"
+#include "room.h"
 #include "asm.h"
 
 typedef struct {
diff --git a/src/enemy/wallMaster2.c b/src/enemy/wallMaster2.c
index aa8a6d74..7be382a8 100644
--- a/src/enemy/wallMaster2.c
+++ b/src/enemy/wallMaster2.c
@@ -6,8 +6,10 @@
  */
 #include "area.h"
 #include "enemy.h"
+#include "effects.h"
 #include "physics.h"
 #include "screenTransitions.h"
+#include "room.h"
 #include "player.h"
 #include "asm.h"
 
diff --git a/src/enemy/waterDrop.c b/src/enemy/waterDrop.c
index 7d7c7e78..c96e2754 100644
--- a/src/enemy/waterDrop.c
+++ b/src/enemy/waterDrop.c
@@ -5,6 +5,7 @@
  * @brief Water Drop enemy
  */
 #include "enemy.h"
+#include "effects.h"
 #include "object.h"
 #include "asm.h"
 #include "sound.h"
diff --git a/src/enemy/wizzrobeFire.c b/src/enemy/wizzrobeFire.c
index a9dfb2c2..dda22d54 100644
--- a/src/enemy/wizzrobeFire.c
+++ b/src/enemy/wizzrobeFire.c
@@ -6,6 +6,9 @@
  */
 #include "enemy/wizzrobe.h"
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "projectile.h"
 #include "player.h"
 #include "asm.h"
 
diff --git a/src/enemy/wizzrobeIce.c b/src/enemy/wizzrobeIce.c
index 71ce4d92..99ec30ce 100644
--- a/src/enemy/wizzrobeIce.c
+++ b/src/enemy/wizzrobeIce.c
@@ -6,6 +6,7 @@
  */
 #include "enemy/wizzrobe.h"
 #include "enemy.h"
+#include "projectile.h"
 #include "object.h"
 #include "asm.h"
 #include "sound.h"
diff --git a/src/enemy/wizzrobeWind.c b/src/enemy/wizzrobeWind.c
index eb01fd0c..b261ee15 100644
--- a/src/enemy/wizzrobeWind.c
+++ b/src/enemy/wizzrobeWind.c
@@ -8,6 +8,7 @@
 
 #include "collision.h"
 #include "enemy.h"
+#include "projectile.h"
 #include "object.h"
 #include "asm.h"
 #include "sound.h"
diff --git a/src/enemyUtils.c b/src/enemyUtils.c
index e2356e4f..4abe5b5f 100644
--- a/src/enemyUtils.c
+++ b/src/enemyUtils.c
@@ -1,16 +1,17 @@
 #include "enemyUtils.h"
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "projectile.h"
 #include "definitions.h"
 #include "entity.h"
 #include "object.h"
-#include "sound.h"
-#include "effects.h"
 #include "room.h"
 #include "physics.h"
 #include "object/deathFx.h"
-#include "projectile.h"
 #include "save.h"
 #include "vram.h"
+#include "color.h"
 
 extern void ReplaceMonitoredEntity(Entity*, Entity*);
 
diff --git a/src/enterPortalSubtask.c b/src/enterPortalSubtask.c
index ee748dca..15210253 100644
--- a/src/enterPortalSubtask.c
+++ b/src/enterPortalSubtask.c
@@ -20,6 +20,7 @@
 #include "screen.h"
 #include "subtask.h"
 #include "affine.h"
+#include "fade.h"
 
 extern void ClearArmosData(void);
 extern void sub_080300C4(void);
diff --git a/src/entity.c b/src/entity.c
index 9e1603d4..0670283f 100644
--- a/src/entity.c
+++ b/src/entity.c
@@ -9,6 +9,7 @@
 #include "room.h"
 #include "player.h"
 #include "physics.h"
+#include "color.h"
 
 typedef struct Temp {
     void* prev;
diff --git a/src/fade.c b/src/fade.c
index 8f14b277..94d57cea 100644
--- a/src/fade.c
+++ b/src/fade.c
@@ -1,3 +1,4 @@
+#include "fade.h"
 #include "global.h"
 #include "save.h"
 #include "vram.h"
diff --git a/src/fileselect.c b/src/fileselect.c
index 34c13d3a..f920798f 100644
--- a/src/fileselect.c
+++ b/src/fileselect.c
@@ -25,6 +25,7 @@
 #include "ui.h"
 #include "affine.h"
 #include "gfx.h"
+#include "fade.h"
 
 // copy, erase, start
 #define NUM_FILE_OPERATIONS 3
diff --git a/src/game.c b/src/game.c
index da2c4427..7a7fc11d 100644
--- a/src/game.c
+++ b/src/game.c
@@ -23,6 +23,7 @@
 #include "ui.h"
 #include "beanstalkSubtask.h"
 #include "pauseMenu.h"
+#include "fade.h"
 
 // Game task
 
diff --git a/src/gameData.c b/src/gameData.c
index c7ed4cf1..09a983e8 100644
--- a/src/gameData.c
+++ b/src/gameData.c
@@ -1,6 +1,5 @@
 // TODO belongs to game.c, but spriteAnimations332.s is before.
 // maybe also signals code that no longer belongs to game.c?
-#include "common.h"
 #include "flags.h"
 #include "game.h"
 #include "item.h"
diff --git a/src/interrupts.c b/src/interrupts.c
index 14b97384..66c9f7ad 100644
--- a/src/interrupts.c
+++ b/src/interrupts.c
@@ -12,6 +12,8 @@
 #include "sound.h"
 #include "ui.h"
 #include "asm.h"
+#include "map.h"
+#include "fade.h"
 
 extern u8 gUnk_03003DE0;
 extern u8 gUnk_03000C30;
diff --git a/src/item/itemPacciCane.c b/src/item/itemPacciCane.c
index 41994302..8c8c08e6 100644
--- a/src/item/itemPacciCane.c
+++ b/src/item/itemPacciCane.c
@@ -1,5 +1,4 @@
 #include "global.h"
-#include "entity.h"
 #include "item.h"
 #include "physics.h"
 #include "playeritem.h"
diff --git a/src/item/itemShield.c b/src/item/itemShield.c
index 5f358905..74418bd6 100644
--- a/src/item/itemShield.c
+++ b/src/item/itemShield.c
@@ -1,5 +1,4 @@
 #include "global.h"
-#include "entity.h"
 #include "item.h"
 #include "sound.h"
 #include "physics.h"
diff --git a/src/main.c b/src/main.c
index 5260574a..68204fd4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -12,6 +12,7 @@
 #include "save.h"
 #include "screen.h"
 #include "sound.h"
+#include "fade.h"
 
 extern u32 gRand;
 
diff --git a/src/manager/armosInteriorManager.c b/src/manager/armosInteriorManager.c
index 392e80ec..0c190d36 100644
--- a/src/manager/armosInteriorManager.c
+++ b/src/manager/armosInteriorManager.c
@@ -6,7 +6,6 @@
  */
 #include "manager/armosInteriorManager.h"
 #include "common.h"
-#include "entity.h"
 #include "flags.h"
 #include "sound.h"
 #include "room.h"
diff --git a/src/manager/enterRoomTextboxManager.c b/src/manager/enterRoomTextboxManager.c
index e9c7d5a4..6e1f012c 100644
--- a/src/manager/enterRoomTextboxManager.c
+++ b/src/manager/enterRoomTextboxManager.c
@@ -12,6 +12,7 @@
 #include "message.h"
 #include "screen.h"
 #include "vram.h"
+#include "fade.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/flameManager.c b/src/manager/flameManager.c
index 1132dc5a..e7535e63 100644
--- a/src/manager/flameManager.c
+++ b/src/manager/flameManager.c
@@ -11,6 +11,7 @@
 #include "room.h"
 #include "tiles.h"
 #include "player.h"
+#include "map.h"
 
 void FlameManager_Main(FlameManager* this) {
     if (super->action == 0) {
diff --git a/src/manager/manager29.c b/src/manager/manager29.c
index ca3cd3a5..29daf9e7 100644
--- a/src/manager/manager29.c
+++ b/src/manager/manager29.c
@@ -9,6 +9,7 @@
 #include "flags.h"
 #include "room.h"
 #include "player.h"
+#include "map.h"
 
 bool32 sub_0805CF80(Manager29* this);
 void sub_0805CBD0(Manager29* this);
diff --git a/src/manager/rollingBarrelManager.c b/src/manager/rollingBarrelManager.c
index cf42b5e7..11320d40 100644
--- a/src/manager/rollingBarrelManager.c
+++ b/src/manager/rollingBarrelManager.c
@@ -16,6 +16,7 @@
 #include "sound.h"
 #include "game.h"
 #include "asm.h"
+#include "fade.h"
 
 extern struct BgAffineDstData gUnk_02017AA0[];
 extern struct BgAffineDstData gUnk_02017BA0[];
diff --git a/src/manager/templeOfDropletsManager.c b/src/manager/templeOfDropletsManager.c
index 12e523a4..fc8309df 100644
--- a/src/manager/templeOfDropletsManager.c
+++ b/src/manager/templeOfDropletsManager.c
@@ -7,8 +7,8 @@
 #include "manager/templeOfDropletsManager.h"
 #include "enemy.h"
 #include "flags.h"
-#include "object.h"
 #include "common.h"
+#include "object.h"
 #include "room.h"
 #include "player.h"
 #include "screen.h"
diff --git a/src/manager/tileChangeObserveManager.c b/src/manager/tileChangeObserveManager.c
index 08b46b14..e24a8787 100644
--- a/src/manager/tileChangeObserveManager.c
+++ b/src/manager/tileChangeObserveManager.c
@@ -10,6 +10,7 @@
 #include "manager/tileChangeObserveManager.h"
 #include "flags.h"
 #include "room.h"
+#include "map.h"
 
 void TileChangeObserveManager_Init(TileChangeObserveManager*);
 void TileChangeObserveManager_Action1(TileChangeObserveManager*);
diff --git a/src/manager/vaati3InsideArmManager.c b/src/manager/vaati3InsideArmManager.c
index 2f89d2ce..a5f1eaed 100644
--- a/src/manager/vaati3InsideArmManager.c
+++ b/src/manager/vaati3InsideArmManager.c
@@ -6,6 +6,7 @@
  */
 #include "manager/vaati3InsideArmManager.h"
 #include "screenTransitions.h"
+#include "room.h"
 #include "sound.h"
 
 void sub_0805DBF0(Vaati3InsideArmManager*);
diff --git a/src/manager/vaati3StartManager.c b/src/manager/vaati3StartManager.c
index 8804a640..27fc8b9b 100644
--- a/src/manager/vaati3StartManager.c
+++ b/src/manager/vaati3StartManager.c
@@ -12,10 +12,10 @@
 #include "object.h"
 #include "room.h"
 #include "player.h"
-#include "screen.h"
 #include "screenTransitions.h"
 #include "sound.h"
 #include "scroll.h"
+#include "fade.h"
 #if !defined(EU) && !defined(JP)
 #include "save.h"
 #endif
diff --git a/src/manager/waterfallBottomManager.c b/src/manager/waterfallBottomManager.c
index 47000615..9fb68714 100644
--- a/src/manager/waterfallBottomManager.c
+++ b/src/manager/waterfallBottomManager.c
@@ -10,6 +10,7 @@
 #include "player.h"
 #include "tiles.h"
 #include "room.h"
+#include "map.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 53156fef..92b1edb5 100644
--- a/src/manager/weatherChangeManager.c
+++ b/src/manager/weatherChangeManager.c
@@ -15,6 +15,7 @@
 #include "game.h"
 #include "manager/staticBackgroundManager.h"
 #include "player.h"
+#include "fade.h"
 
 void WeatherChangeManager_OnEnterRoom(WeatherChangeManager*);
 void sub_08059608(WeatherChangeManager*);
diff --git a/src/menu/figurineMenu.c b/src/menu/figurineMenu.c
index a15668bb..881dc803 100644
--- a/src/menu/figurineMenu.c
+++ b/src/menu/figurineMenu.c
@@ -23,6 +23,7 @@
 #include "ui.h"
 #include "affine.h"
 #include "pauseMenu.h"
+#include "fade.h"
 
 void sub_080A4DA8(u32);
 void sub_080A4B44(void);
diff --git a/src/menu/kinstoneMenu.c b/src/menu/kinstoneMenu.c
index a50b5460..bac34a14 100644
--- a/src/menu/kinstoneMenu.c
+++ b/src/menu/kinstoneMenu.c
@@ -7,6 +7,8 @@
 #include "area.h"
 #include "common.h"
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "flags.h"
 #include "kinstone.h"
 #include "main.h"
@@ -20,10 +22,10 @@
 #include "roomid.h"
 #include "save.h"
 #include "screen.h"
-#include "sound.h"
 #include "subtask.h"
 #include "ui.h"
 #include "affine.h"
+#include "fade.h"
 
 extern u32 sub_08000E44(u32);
 extern void sub_080A3B74(void);
diff --git a/src/menu/pauseMenu.c b/src/menu/pauseMenu.c
index e6b0a5ec..413b93b9 100644
--- a/src/menu/pauseMenu.c
+++ b/src/menu/pauseMenu.c
@@ -20,6 +20,7 @@
 #include "subtask.h"
 #include "ui.h"
 #include "affine.h"
+#include "fade.h"
 
 extern void sub_080A4DB8(u32);
 
diff --git a/src/npc/bigGoron.c b/src/npc/bigGoron.c
index 61c44d20..0f3237cd 100644
--- a/src/npc/bigGoron.c
+++ b/src/npc/bigGoron.c
@@ -17,6 +17,7 @@
 #include "sound.h"
 #include "asm.h"
 #include "physics.h"
+#include "map.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/bladeBrothers.c b/src/npc/bladeBrothers.c
index 41d97d4e..ffdf7c41 100644
--- a/src/npc/bladeBrothers.c
+++ b/src/npc/bladeBrothers.c
@@ -17,6 +17,7 @@
 #include "script.h"
 #include "sound.h"
 #include "effects.h"
+#include "color.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/castorWildsStatue.c b/src/npc/castorWildsStatue.c
index dd4db86d..911fc0c5 100644
--- a/src/npc/castorWildsStatue.c
+++ b/src/npc/castorWildsStatue.c
@@ -16,6 +16,8 @@
 #include "vram.h"
 #include "room.h"
 #include "player.h"
+#include "color.h"
+#include "map.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/cat.c b/src/npc/cat.c
index 4d44c978..9815e8e1 100644
--- a/src/npc/cat.c
+++ b/src/npc/cat.c
@@ -5,6 +5,7 @@
  * @brief Cat NPC
  */
 #include "enemy.h"
+#include "sound.h"
 #include "entity.h"
 #include "message.h"
 #include "npc.h"
diff --git a/src/npc/emma.c b/src/npc/emma.c
index fa22a81d..7e7cdb3c 100644
--- a/src/npc/emma.c
+++ b/src/npc/emma.c
@@ -6,6 +6,7 @@
  */
 #include "entity.h"
 #include "screenTransitions.h"
+#include "room.h"
 #include "script.h"
 
 void Emma(Entity* this) {
diff --git a/src/npc/gregal.c b/src/npc/gregal.c
index 48cc43aa..a6706d75 100644
--- a/src/npc/gregal.c
+++ b/src/npc/gregal.c
@@ -9,6 +9,7 @@
 #include "script.h"
 #include "player.h"
 #include "physics.h"
+#include "color.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/kid.c b/src/npc/kid.c
index 766d5814..44f65647 100644
--- a/src/npc/kid.c
+++ b/src/npc/kid.c
@@ -14,6 +14,7 @@
 #include "manager.h"
 #include "structures.h"
 #include "physics.h"
+#include "map.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/npc/npc5.c b/src/npc/npc5.c
index 787bb16f..e5219081 100644
--- a/src/npc/npc5.c
+++ b/src/npc/npc5.c
@@ -15,6 +15,7 @@
 #include "asm.h"
 #include "room.h"
 #include "player.h"
+#include "map.h"
 
 #define kFollowDistance 32 // distance to follow player
 #define kPoiDistance 4     // point of interest distance
diff --git a/src/npc/simon.c b/src/npc/simon.c
index ddce95ea..783aeb31 100644
--- a/src/npc/simon.c
+++ b/src/npc/simon.c
@@ -9,11 +9,11 @@
 #include "object.h"
 #include "effects.h"
 #include "room.h"
-#include "screen.h"
 #include "screenTransitions.h"
 #include "script.h"
 #include "sound.h"
 #include "tiles.h"
+#include "fade.h"
 
 typedef struct {
     u8 filler[4];
diff --git a/src/npc/vaatiReborn.c b/src/npc/vaatiReborn.c
index ffee2a4c..a699702c 100644
--- a/src/npc/vaatiReborn.c
+++ b/src/npc/vaatiReborn.c
@@ -5,6 +5,7 @@
  * @brief Vaati Reborn NPC
  */
 #include "npc.h"
+#include "color.h"
 #include "sound.h"
 #include "flags.h"
 #include "message.h"
diff --git a/src/npc/zelda.c b/src/npc/zelda.c
index 49a269bc..f5a93fa3 100644
--- a/src/npc/zelda.c
+++ b/src/npc/zelda.c
@@ -15,6 +15,7 @@
 #include "asm.h"
 #include "room.h"
 #include "player.h"
+#include "map.h"
 
 void ZeldaFollower_Hide(Entity*, Entity*);
 void ZeldaFollower_Show(Entity*, Entity*);
diff --git a/src/npcDefinitions.c b/src/npcDefinitions.c
index b6db7f31..7bc178a2 100644
--- a/src/npcDefinitions.c
+++ b/src/npcDefinitions.c
@@ -1,4 +1,3 @@
-#include "entity.h"
 #include "definitions.h"
 
 // TODO deduplicate using sprite indices enum
diff --git a/src/npcUtils.c b/src/npcUtils.c
index e5a5318c..d4fd6839 100644
--- a/src/npcUtils.c
+++ b/src/npcUtils.c
@@ -11,6 +11,7 @@
 #include "flags.h"
 #include "common.h"
 #include "vram.h"
+#include "color.h"
 
 extern const NPCDefinition gNPCDefinitions[];
 
diff --git a/src/object/ambientClouds.c b/src/object/ambientClouds.c
index 8277b138..cd607cbc 100644
--- a/src/object/ambientClouds.c
+++ b/src/object/ambientClouds.c
@@ -10,6 +10,7 @@
 #include "object.h"
 #include "player.h"
 #include "script.h"
+#include "color.h"
 
 void AmbientClouds_Init(Entity* this);
 void AmbientClouds_Action1(Entity* this);
diff --git a/src/object/beanstalk.c b/src/object/beanstalk.c
index 0b70aa06..b0815ad0 100644
--- a/src/object/beanstalk.c
+++ b/src/object/beanstalk.c
@@ -12,6 +12,7 @@
 #include "player.h"
 #include "tiles.h"
 #include "vram.h"
+#include "map.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/object/bush.c b/src/object/bush.c
index bd9c3a37..fb142371 100644
--- a/src/object/bush.c
+++ b/src/object/bush.c
@@ -4,7 +4,6 @@
  *
  * @brief Bush object
  */
-#include "hitbox.h"
 #include "object.h"
 #include "asm.h"
 #include "effects.h"
diff --git a/src/object/button.c b/src/object/button.c
index e223f28c..a2967cac 100644
--- a/src/object/button.c
+++ b/src/object/button.c
@@ -12,6 +12,7 @@
 #include "effects.h"
 #include "room.h"
 #include "player.h"
+#include "map.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/object/chuchuBossStartParticle.c b/src/object/chuchuBossStartParticle.c
index 312b5839..00469edd 100644
--- a/src/object/chuchuBossStartParticle.c
+++ b/src/object/chuchuBossStartParticle.c
@@ -10,6 +10,7 @@
 #include "room.h"
 #include "physics.h"
 #include "player.h"
+#include "color.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/object/cuccoMinigame.c b/src/object/cuccoMinigame.c
index 2b0d400e..887a1022 100644
--- a/src/object/cuccoMinigame.c
+++ b/src/object/cuccoMinigame.c
@@ -6,18 +6,19 @@
  * @brief Cucco Minigame object
  */
 #include "enemy.h"
+#include "sound.h"
+#include "flags.h"
+#include "common.h"
 #include "entity.h"
 #include "fileselect.h"
 #include "item.h"
 #include "npc.h"
 #include "object.h"
-#include "common.h"
-#include "sound.h"
-#include "flags.h"
 #include "room.h"
 #include "player.h"
 #include "script.h"
 #include "tiles.h"
+#include "map.h"
 
 typedef struct {
     Entity base;
diff --git a/src/object/cutsceneMiscObject.c b/src/object/cutsceneMiscObject.c
index d8ac6be7..4d052dfe 100644
--- a/src/object/cutsceneMiscObject.c
+++ b/src/object/cutsceneMiscObject.c
@@ -17,10 +17,11 @@
 #include "room.h"
 #include "physics.h"
 #include "player.h"
-#include "screen.h"
 #include "scroll.h"
 #include "script.h"
 #include "tiles.h"
+#include "color.h"
+#include "fade.h"
 
 extern u8 gUnk_08122AE0[];
 extern u16 gUnk_08122AE8[];
diff --git a/src/object/deathFx.c b/src/object/deathFx.c
index a752fb53..779a2f5e 100644
--- a/src/object/deathFx.c
+++ b/src/object/deathFx.c
@@ -6,11 +6,11 @@
  */
 #include "object/deathFx.h"
 #include "enemy.h"
+#include "sound.h"
 #include "entity.h"
 #include "item.h"
 #include "physics.h"
 #include "global.h"
-#include "sound.h"
 #include "vram.h"
 
 void sub_08081790(DeathFxObject* this);
diff --git a/src/object/dirtParticle.c b/src/object/dirtParticle.c
index 1a038be5..f4e80932 100644
--- a/src/object/dirtParticle.c
+++ b/src/object/dirtParticle.c
@@ -8,6 +8,7 @@
 #include "asm.h"
 #include "physics.h"
 #include "player.h"
+#include "color.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/object/doubleBookshelf.c b/src/object/doubleBookshelf.c
index 48fc4dcd..b0b706d5 100644
--- a/src/object/doubleBookshelf.c
+++ b/src/object/doubleBookshelf.c
@@ -12,6 +12,7 @@
 #include "physics.h"
 #include "player.h"
 #include "tiles.h"
+#include "map.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/object/fan.c b/src/object/fan.c
index 1d184cf6..2f496c27 100644
--- a/src/object/fan.c
+++ b/src/object/fan.c
@@ -10,9 +10,9 @@
 #include "asm.h"
 #include "object.h"
 #include "sound.h"
-#include "room.h"
 #include "physics.h"
 #include "player.h"
+#include "map.h"
 
 typedef struct {
     Entity base;
diff --git a/src/object/fanWind.c b/src/object/fanWind.c
index 631f3936..b5509bb9 100644
--- a/src/object/fanWind.c
+++ b/src/object/fanWind.c
@@ -6,8 +6,8 @@
  */
 #include "collision.h"
 #include "entity.h"
-#include "room.h"
 #include "physics.h"
+#include "map.h"
 
 void FanWind(Entity* this) {
     u8* collisionData;
diff --git a/src/object/figurineDevice.c b/src/object/figurineDevice.c
index 7bdf0124..b38571f0 100644
--- a/src/object/figurineDevice.c
+++ b/src/object/figurineDevice.c
@@ -20,6 +20,7 @@
 #include "screen.h"
 #include "tiles.h"
 #include "subtask.h"
+#include "color.h"
 #ifndef EU
 #include "script.h"
 #endif
diff --git a/src/object/fourElements.c b/src/object/fourElements.c
index 9e88cb0d..f163ee79 100644
--- a/src/object/fourElements.c
+++ b/src/object/fourElements.c
@@ -15,6 +15,7 @@
 #include "scroll.h"
 #include "manager/lightManager.h"
 #include "script.h"
+#include "fade.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/object/frozenOctorok.c b/src/object/frozenOctorok.c
index b9d04b1c..b7d2a2a9 100644
--- a/src/object/frozenOctorok.c
+++ b/src/object/frozenOctorok.c
@@ -15,6 +15,7 @@
 #include "physics.h"
 #include "player.h"
 #include "vram.h"
+#include "color.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/object/furniture.c b/src/object/furniture.c
index c8ff8961..5ebf750d 100644
--- a/src/object/furniture.c
+++ b/src/object/furniture.c
@@ -11,6 +11,8 @@
 #include "physics.h"
 #include "player.h"
 #include "tiles.h"
+#include "color.h"
+#include "map.h"
 
 enum {
     FURNITURE_INIT,
diff --git a/src/object/gentariCurtain.c b/src/object/gentariCurtain.c
index 65506287..9607058b 100644
--- a/src/object/gentariCurtain.c
+++ b/src/object/gentariCurtain.c
@@ -10,6 +10,7 @@
 #include "object.h"
 #include "room.h"
 #include "tiles.h"
+#include "map.h"
 
 typedef struct {
     Entity base;
diff --git a/src/object/giantTwig.c b/src/object/giantTwig.c
index eead81c1..92fcdbc1 100644
--- a/src/object/giantTwig.c
+++ b/src/object/giantTwig.c
@@ -10,6 +10,8 @@
 #include "physics.h"
 #include "player.h"
 #include "tiles.h"
+#include "color.h"
+#include "map.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/object/greatFairy.c b/src/object/greatFairy.c
index 366dff46..27440aa2 100644
--- a/src/object/greatFairy.c
+++ b/src/object/greatFairy.c
@@ -15,6 +15,7 @@
 #include "save.h"
 #include "screen.h"
 #include "script.h"
+#include "fade.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/object/gyorgBossObject.c b/src/object/gyorgBossObject.c
index c32f6770..3704d70b 100644
--- a/src/object/gyorgBossObject.c
+++ b/src/object/gyorgBossObject.c
@@ -18,6 +18,7 @@
 #include "screen.h"
 #include "screenTransitions.h"
 #include "scroll.h"
+#include "fade.h"
 #ifndef EU
 #include "area.h"
 #endif
diff --git a/src/object/kinstoneSpark.c b/src/object/kinstoneSpark.c
index afc05722..7b359ee0 100644
--- a/src/object/kinstoneSpark.c
+++ b/src/object/kinstoneSpark.c
@@ -9,6 +9,7 @@
 #include "object.h"
 #include "asm.h"
 #include "sound.h"
+#include "color.h"
 
 void sub_080A0ADC(Entity*);
 void sub_080A0AF0(Entity*);
diff --git a/src/object/lightRay.c b/src/object/lightRay.c
index 6ad499d3..1e4c53eb 100644
--- a/src/object/lightRay.c
+++ b/src/object/lightRay.c
@@ -10,6 +10,7 @@
 #include "room.h"
 #include "player.h"
 #include "screen.h"
+#include "fade.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/object/lockedDoor.c b/src/object/lockedDoor.c
index 5eaee228..02b7614c 100644
--- a/src/object/lockedDoor.c
+++ b/src/object/lockedDoor.c
@@ -17,6 +17,7 @@
 #include "tiles.h"
 #include "vram.h"
 #include "player.h"
+#include "color.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/object/macroBook.c b/src/object/macroBook.c
index 10270a6c..2d14e0b5 100644
--- a/src/object/macroBook.c
+++ b/src/object/macroBook.c
@@ -11,6 +11,7 @@
 #include "npc.h"
 #include "tiles.h"
 #include "room.h"
+#include "map.h"
 
 typedef struct {
     Entity base;
diff --git a/src/object/macroDecorations.c b/src/object/macroDecorations.c
index 457dce52..9e124c33 100644
--- a/src/object/macroDecorations.c
+++ b/src/object/macroDecorations.c
@@ -9,6 +9,7 @@
 #include "map.h"
 #include "room.h"
 #include "tiles.h"
+#include "color.h"
 
 typedef struct {
     Entity base;
diff --git a/src/object/macroPlayer.c b/src/object/macroPlayer.c
index 80218ced..270e648f 100644
--- a/src/object/macroPlayer.c
+++ b/src/object/macroPlayer.c
@@ -12,6 +12,7 @@
 #include "physics.h"
 #include "player.h"
 #include "beanstalkSubtask.h"
+#include "color.h"
 
 typedef struct {
     Entity base;
diff --git a/src/object/mask.c b/src/object/mask.c
index 284c5c1f..0c961656 100644
--- a/src/object/mask.c
+++ b/src/object/mask.c
@@ -13,6 +13,7 @@
 #include "player.h"
 #include "tiles.h"
 #include "item.h"
+#include "map.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/object/mazaalBossObject.c b/src/object/mazaalBossObject.c
index 1a487226..f668bb52 100644
--- a/src/object/mazaalBossObject.c
+++ b/src/object/mazaalBossObject.c
@@ -5,16 +5,17 @@
  * @brief Mazaal Boss object
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "flags.h"
 #include "item.h"
 #include "object.h"
-#include "flags.h"
 #include "physics.h"
 #include "player.h"
 #include "room.h"
 #include "screen.h"
 #include "scroll.h"
 #include "script.h"
-#include "sound.h"
 
 extern u16 script_MazaalBossObjectMazaal[];
 
diff --git a/src/object/minishPortalCloseup.c b/src/object/minishPortalCloseup.c
index 2b224c83..33308043 100644
--- a/src/object/minishPortalCloseup.c
+++ b/src/object/minishPortalCloseup.c
@@ -10,6 +10,7 @@
 #include "common.h"
 #include "room.h"
 #include "screen.h"
+#include "fade.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/object/minishVillageObject.c b/src/object/minishVillageObject.c
index c42a598c..9c3330a7 100644
--- a/src/object/minishVillageObject.c
+++ b/src/object/minishVillageObject.c
@@ -12,6 +12,8 @@
 #include "room.h"
 #include "screen.h"
 #include "tiles.h"
+#include "color.h"
+#include "map.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/object/moleMittsParticle.c b/src/object/moleMittsParticle.c
index 1d243967..a124887a 100644
--- a/src/object/moleMittsParticle.c
+++ b/src/object/moleMittsParticle.c
@@ -9,6 +9,7 @@
 #include "room.h"
 #include "player.h"
 #include "item.h"
+#include "color.h"
 
 void MoleMittsParticle_Init(Entity*);
 void MoleMittsParticle_Action1(Entity*);
diff --git a/src/object/object30.c b/src/object/object30.c
index 8b4290a0..fc145a17 100644
--- a/src/object/object30.c
+++ b/src/object/object30.c
@@ -8,8 +8,8 @@
 #include "item.h"
 #include "object.h"
 #include "asm.h"
-#include "room.h"
 #include "scroll.h"
+#include "map.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/object/object37.c b/src/object/object37.c
index 14d3d89f..c6f87a1a 100644
--- a/src/object/object37.c
+++ b/src/object/object37.c
@@ -6,10 +6,10 @@
  */
 #include "object.h"
 #include "asm.h"
-#include "room.h"
 #include "player.h"
 #include "item.h"
 #include "save.h"
+#include "map.h"
 
 typedef struct {
     Entity base;
diff --git a/src/object/objectA2.c b/src/object/objectA2.c
index f6e3c473..39372890 100644
--- a/src/object/objectA2.c
+++ b/src/object/objectA2.c
@@ -10,7 +10,10 @@
 #include "sound.h"
 #include "effects.h"
 #include "physics.h"
+#include "color.h"
+#ifndef EU
 #include "save.h"
+#endif
 
 void ObjectA2_Init(Entity*);
 void ObjectA2_Action1(Entity*);
diff --git a/src/object/octorokBossObject.c b/src/object/octorokBossObject.c
index 39dc5cf4..503403d2 100644
--- a/src/object/octorokBossObject.c
+++ b/src/object/octorokBossObject.c
@@ -7,10 +7,7 @@
 #include "game.h"
 #include "object.h"
 #include "asm.h"
-#include "common.h"
 #include "sound.h"
-#include "flags.h"
-#include "effects.h"
 #include "room.h"
 #include "physics.h"
 #include "player.h"
diff --git a/src/object/pinwheel.c b/src/object/pinwheel.c
index cb9a0478..dc69967e 100644
--- a/src/object/pinwheel.c
+++ b/src/object/pinwheel.c
@@ -7,14 +7,7 @@
 #include "entity.h"
 #include "flags.h"
 #include "object.h"
-#include "asm.h"
-#include "common.h"
-#include "sound.h"
-#include "flags.h"
 #include "effects.h"
-#include "room.h"
-#include "physics.h"
-#include "player.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/object/pullableMushroom.c b/src/object/pullableMushroom.c
index f8136808..bd674d2c 100644
--- a/src/object/pullableMushroom.c
+++ b/src/object/pullableMushroom.c
@@ -13,6 +13,7 @@
 #include "physics.h"
 #include "player.h"
 #include "tiles.h"
+#include "color.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/object/pushableFurniture.c b/src/object/pushableFurniture.c
index 28e1f6bf..f869c62d 100644
--- a/src/object/pushableFurniture.c
+++ b/src/object/pushableFurniture.c
@@ -13,6 +13,7 @@
 #include "room.h"
 #include "player.h"
 #include "physics.h"
+#include "map.h"
 
 extern const s16 gUnk_080B4488[];
 
diff --git a/src/object/railtrack.c b/src/object/railtrack.c
index 2456f4c1..3639f929 100644
--- a/src/object/railtrack.c
+++ b/src/object/railtrack.c
@@ -10,6 +10,7 @@
 #include "room.h"
 #include "sound.h"
 #include "tiles.h"
+#include "map.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/object/vaati3PlayerObject.c b/src/object/vaati3PlayerObject.c
index 6420cbab..5a7980e0 100644
--- a/src/object/vaati3PlayerObject.c
+++ b/src/object/vaati3PlayerObject.c
@@ -7,7 +7,9 @@
 #include "entity.h"
 #include "physics.h"
 #include "player.h"
+#ifndef EU
 #include "room.h"
+#endif
 
 void Vaati3PlayerObject(Entity* this) {
     if (this->action == 0) {
diff --git a/src/object/waterfallOpening.c b/src/object/waterfallOpening.c
index a3986be0..f6f02a3f 100644
--- a/src/object/waterfallOpening.c
+++ b/src/object/waterfallOpening.c
@@ -11,6 +11,7 @@
 #include "sound.h"
 #include "tiles.h"
 #include "vram.h"
+#include "map.h"
 
 typedef struct {
     Entity base;
diff --git a/src/object/well.c b/src/object/well.c
index 9fa5860d..082ba849 100644
--- a/src/object/well.c
+++ b/src/object/well.c
@@ -9,6 +9,7 @@
 #include "player.h"
 #include "room.h"
 #include "tiles.h"
+#include "map.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/object/whirlwind.c b/src/object/whirlwind.c
index 16dca27d..218ee28b 100644
--- a/src/object/whirlwind.c
+++ b/src/object/whirlwind.c
@@ -13,6 +13,7 @@
 #include "flags.h"
 #include "physics.h"
 #include "player.h"
+#include "color.h"
 
 void Whirlwind_Init(Entity*);
 void Whirlwind_Action1(Entity*);
diff --git a/src/objectUtils.c b/src/objectUtils.c
index 3e589d2e..965b0437 100644
--- a/src/objectUtils.c
+++ b/src/objectUtils.c
@@ -10,6 +10,7 @@
 #include "vram.h"
 #include "object/linkAnimation.h"
 #include "object/itemOnGround.h"
+#include "color.h"
 
 extern const Hitbox* const gObjectHitboxes[];
 
diff --git a/src/player.c b/src/player.c
index c8b5d6c7..e1cba46b 100644
--- a/src/player.c
+++ b/src/player.c
@@ -24,13 +24,13 @@
 #include "playeritem.h"
 #include "playerItem/playerItemBottle.h"
 #include "save.h"
-#include "screen.h"
 #include "screenTransitions.h"
 #include "scroll.h"
 #include "sound.h"
 #include "tiles.h"
 #include "ui.h"
 #include "pauseMenu.h"
+#include "fade.h"
 
 #define kGravityRate Q_8_8(32)
 #define kWalkSpeedSlopeSubtractor Q_8_8(0.3125)
diff --git a/src/playerItem/playerItemSwordBeam.c b/src/playerItem/playerItemSwordBeam.c
index 8d04528b..e538407e 100644
--- a/src/playerItem/playerItemSwordBeam.c
+++ b/src/playerItem/playerItemSwordBeam.c
@@ -14,6 +14,7 @@
 #include "sound.h"
 #include "object.h"
 #include "room.h"
+#include "color.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/playerItemDefinitions.c b/src/playerItemDefinitions.c
index 1eaaff4c..c944cae5 100644
--- a/src/playerItemDefinitions.c
+++ b/src/playerItemDefinitions.c
@@ -1,4 +1,3 @@
-#include "entity.h"
 #include "definitions.h"
 
 #define MULTI_FORM(index, unk) \
diff --git a/src/playerUtils.c b/src/playerUtils.c
index c93f1fb9..b417ff74 100644
--- a/src/playerUtils.c
+++ b/src/playerUtils.c
@@ -28,6 +28,7 @@
 #include "backgroundAnimations.h"
 #include "itemDefinitions.h"
 #include "ui.h"
+#include "fade.h"
 
 static void sub_08077E54(ItemBehavior* this);
 
diff --git a/src/projectile/arrowProjectile.c b/src/projectile/arrowProjectile.c
index cf39a80c..eeba0cf0 100644
--- a/src/projectile/arrowProjectile.c
+++ b/src/projectile/arrowProjectile.c
@@ -6,14 +6,13 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "projectile.h"
 #include "entity.h"
 #include "object.h"
 #include "asm.h"
-
-#include "sound.h"
-#include "effects.h"
 #include "physics.h"
-
 #include "player.h"
 
 extern void (*const ArrowProjectile_Functions[])(Entity*);
diff --git a/src/projectile/boneProjectile.c b/src/projectile/boneProjectile.c
index 7902f3e6..c15e3da7 100644
--- a/src/projectile/boneProjectile.c
+++ b/src/projectile/boneProjectile.c
@@ -6,6 +6,7 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "projectile.h"
 #include "entity.h"
 #include "physics.h"
 #include "script.h"
diff --git a/src/projectile/cannonballProjectile.c b/src/projectile/cannonballProjectile.c
index 9c198811..8e52b1df 100644
--- a/src/projectile/cannonballProjectile.c
+++ b/src/projectile/cannonballProjectile.c
@@ -6,6 +6,8 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "effects.h"
+#include "projectile.h"
 #include "entity.h"
 #include "physics.h"
 #include "asm.h"
diff --git a/src/projectile/dekuSeedProjectile.c b/src/projectile/dekuSeedProjectile.c
index 6e3c5acc..326e4ad1 100644
--- a/src/projectile/dekuSeedProjectile.c
+++ b/src/projectile/dekuSeedProjectile.c
@@ -6,6 +6,9 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "sound.h"
+#include "flags.h"
+#include "projectile.h"
 #include "entity.h"
 #include "physics.h"
 #include "script.h"
diff --git a/src/projectile/dirtBallProjectile.c b/src/projectile/dirtBallProjectile.c
index 2aeb8755..06690e5f 100644
--- a/src/projectile/dirtBallProjectile.c
+++ b/src/projectile/dirtBallProjectile.c
@@ -5,10 +5,12 @@
  * @brief Dirt Ball Projectile
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "projectile.h"
 #include "entity.h"
 #include "physics.h"
 #include "player.h"
-#include "sound.h"
 #include "asm.h"
 
 typedef struct {
diff --git a/src/projectile/fireProjectile.c b/src/projectile/fireProjectile.c
index 5dbe969b..c121411a 100644
--- a/src/projectile/fireProjectile.c
+++ b/src/projectile/fireProjectile.c
@@ -5,6 +5,8 @@
  * @brief Fire Projectile
  */
 #include "enemy.h"
+#include "sound.h"
+#include "projectile.h"
 #include "entity.h"
 #include "physics.h"
 #include "script.h"
diff --git a/src/projectile/gleerokProjectile.c b/src/projectile/gleerokProjectile.c
index 28de350b..223d05ce 100644
--- a/src/projectile/gleerokProjectile.c
+++ b/src/projectile/gleerokProjectile.c
@@ -5,6 +5,8 @@
  * @brief Gleerok Projectile
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
 #include "entity.h"
 #include "player.h"
 #include "room.h"
diff --git a/src/projectile/guardLineOfSight.c b/src/projectile/guardLineOfSight.c
index caadc900..6ac4146c 100644
--- a/src/projectile/guardLineOfSight.c
+++ b/src/projectile/guardLineOfSight.c
@@ -7,10 +7,10 @@
 #include "asm.h"
 #include "collision.h"
 #include "entity.h"
-#include "room.h"
 #include "hitbox.h"
 #include "physics.h"
 #include "projectile.h"
+#include "map.h"
 
 extern u32 sub_080644C8(Entity*);
 
diff --git a/src/projectile/gyorgMaleEnergyProjectile.c b/src/projectile/gyorgMaleEnergyProjectile.c
index 73556f7e..c5d91c8c 100644
--- a/src/projectile/gyorgMaleEnergyProjectile.c
+++ b/src/projectile/gyorgMaleEnergyProjectile.c
@@ -5,6 +5,8 @@
  * @brief Gyorg Male Energy Projectile
  */
 #include "enemy.h"
+#include "sound.h"
+#include "projectile.h"
 #include "entity.h"
 #include "physics.h"
 #include "player.h"
diff --git a/src/projectile/iceProjectile.c b/src/projectile/iceProjectile.c
index 02191bd9..41031cfb 100644
--- a/src/projectile/iceProjectile.c
+++ b/src/projectile/iceProjectile.c
@@ -5,6 +5,8 @@
  * @brief Ice Projectile
  */
 #include "enemy.h"
+#include "sound.h"
+#include "projectile.h"
 #include "entity.h"
 #include "physics.h"
 #include "script.h"
diff --git a/src/projectile/lakituCloudProjectile.c b/src/projectile/lakituCloudProjectile.c
index d7284203..ec6d6b88 100644
--- a/src/projectile/lakituCloudProjectile.c
+++ b/src/projectile/lakituCloudProjectile.c
@@ -5,6 +5,9 @@
  * @brief Lakitu Cloud Projectile
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "projectile.h"
 #include "entity.h"
 #include "player.h"
 #include "physics.h"
diff --git a/src/projectile/lakituLightning.c b/src/projectile/lakituLightning.c
index 912ce722..78536197 100644
--- a/src/projectile/lakituLightning.c
+++ b/src/projectile/lakituLightning.c
@@ -6,6 +6,8 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "effects.h"
+#include "projectile.h"
 #include "entity.h"
 #include "physics.h"
 
diff --git a/src/projectile/mandiblesProjectile.c b/src/projectile/mandiblesProjectile.c
index 5f06db16..29a9507c 100644
--- a/src/projectile/mandiblesProjectile.c
+++ b/src/projectile/mandiblesProjectile.c
@@ -5,6 +5,7 @@
  * @brief Mandibles Projectile
  */
 #include "enemy.h"
+#include "sound.h"
 #include "entity.h"
 #include "room.h"
 #include "hitbox.h"
diff --git a/src/projectile/moblinSpear.c b/src/projectile/moblinSpear.c
index 2e58a091..a89eba94 100644
--- a/src/projectile/moblinSpear.c
+++ b/src/projectile/moblinSpear.c
@@ -5,6 +5,8 @@
  * @brief Moblin Spear Projectile
  */
 #include "enemy.h"
+#include "sound.h"
+#include "projectile.h"
 #include "entity.h"
 #include "physics.h"
 
diff --git a/src/projectile/octorokBossProjectile.c b/src/projectile/octorokBossProjectile.c
index a295a9ea..5c7dea7e 100644
--- a/src/projectile/octorokBossProjectile.c
+++ b/src/projectile/octorokBossProjectile.c
@@ -6,9 +6,11 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "projectile.h"
 #include "entity.h"
 #include "physics.h"
-#include "projectile.h"
 #include "player.h"
 #include "asm.h"
 
diff --git a/src/projectile/projectile5.c b/src/projectile/projectile5.c
index f84d2a7b..f1895384 100644
--- a/src/projectile/projectile5.c
+++ b/src/projectile/projectile5.c
@@ -6,6 +6,7 @@
  */
 #include "asm.h"
 #include "enemy.h"
+#include "projectile.h"
 #include "entity.h"
 #include "physics.h"
 #include "player.h"
diff --git a/src/projectile/removableDust.c b/src/projectile/removableDust.c
index c5617a61..d5ccd5f4 100644
--- a/src/projectile/removableDust.c
+++ b/src/projectile/removableDust.c
@@ -5,11 +5,12 @@
  * @brief Removable Dust Projectile
  */
 #include "enemy.h"
+#include "sound.h"
+#include "flags.h"
+#include "common.h"
 #include "entity.h"
 #include "object.h"
 #include "asm.h"
-#include "common.h"
-#include "flags.h"
 #include "player.h"
 #include "physics.h"
 #include "room.h"
diff --git a/src/projectile/rockProjectile.c b/src/projectile/rockProjectile.c
index aa88fd1e..b7888f58 100644
--- a/src/projectile/rockProjectile.c
+++ b/src/projectile/rockProjectile.c
@@ -5,6 +5,8 @@
  * @brief Rock Projectile
  */
 #include "enemy.h"
+#include "sound.h"
+#include "projectile.h"
 #include "entity.h"
 #include "physics.h"
 #include "script.h"
diff --git a/src/projectile/stalfosProjectile.c b/src/projectile/stalfosProjectile.c
index dd6a0bd5..24f9b6d4 100644
--- a/src/projectile/stalfosProjectile.c
+++ b/src/projectile/stalfosProjectile.c
@@ -5,6 +5,9 @@
  * @brief Stalfos Projectile
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "projectile.h"
 #include "entity.h"
 #include "physics.h"
 #include "asm.h"
diff --git a/src/projectile/torchTrapProjectile.c b/src/projectile/torchTrapProjectile.c
index b007037f..ee472563 100644
--- a/src/projectile/torchTrapProjectile.c
+++ b/src/projectile/torchTrapProjectile.c
@@ -6,6 +6,7 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "projectile.h"
 #include "physics.h"
 
 extern void (*const TorchTrapProjectile_Functions[])(Entity*);
diff --git a/src/projectile/v1DarkMagicProjectile.c b/src/projectile/v1DarkMagicProjectile.c
index 73d10a11..b0a95ad3 100644
--- a/src/projectile/v1DarkMagicProjectile.c
+++ b/src/projectile/v1DarkMagicProjectile.c
@@ -5,10 +5,14 @@
  * @brief V1 Dark Magic Projectile
  */
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "projectile.h"
 #include "entity.h"
 #include "physics.h"
 #include "player.h"
 #include "asm.h"
+#include "color.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/projectile/v1FireProjectile.c b/src/projectile/v1FireProjectile.c
index c5ce71b0..66a30bb4 100644
--- a/src/projectile/v1FireProjectile.c
+++ b/src/projectile/v1FireProjectile.c
@@ -5,6 +5,7 @@
  * @brief V1 Fire Projectile
  */
 #include "enemy.h"
+#include "sound.h"
 #include "entity.h"
 #include "player.h"
 #include "room.h"
diff --git a/src/projectile/v2Projectile.c b/src/projectile/v2Projectile.c
index fa77b2a6..9223dedd 100644
--- a/src/projectile/v2Projectile.c
+++ b/src/projectile/v2Projectile.c
@@ -14,6 +14,8 @@
 #include "physics.h"
 #include "player.h"
 #include "tiles.h"
+#include "color.h"
+#include "map.h"
 
 typedef struct {
     /*0x00*/ Entity base;
diff --git a/src/projectile/v3ElectricProjectile.c b/src/projectile/v3ElectricProjectile.c
index e3e5f070..539792b2 100644
--- a/src/projectile/v3ElectricProjectile.c
+++ b/src/projectile/v3ElectricProjectile.c
@@ -6,6 +6,8 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "sound.h"
+#include "projectile.h"
 #include "entity.h"
 #include "physics.h"
 #include "player.h"
diff --git a/src/projectile/v3HandProjectile.c b/src/projectile/v3HandProjectile.c
index b60057c4..b896a9db 100644
--- a/src/projectile/v3HandProjectile.c
+++ b/src/projectile/v3HandProjectile.c
@@ -6,6 +6,8 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "sound.h"
+#include "projectile.h"
 #include "physics.h"
 #include "player.h"
 
diff --git a/src/projectile/v3TennisBallProjectile.c b/src/projectile/v3TennisBallProjectile.c
index b6be41f3..0456d5cd 100644
--- a/src/projectile/v3TennisBallProjectile.c
+++ b/src/projectile/v3TennisBallProjectile.c
@@ -6,6 +6,9 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "sound.h"
+#include "effects.h"
+#include "projectile.h"
 #include "entity.h"
 #include "physics.h"
 
diff --git a/src/projectile/windProjectile.c b/src/projectile/windProjectile.c
index 5f294a3d..3e97e606 100644
--- a/src/projectile/windProjectile.c
+++ b/src/projectile/windProjectile.c
@@ -5,6 +5,8 @@
  * @brief Wind Projectile
  */
 #include "enemy.h"
+#include "sound.h"
+#include "projectile.h"
 #include "entity.h"
 #include "physics.h"
 #include "script.h"
diff --git a/src/projectile/winder.c b/src/projectile/winder.c
index 032df7e5..aac4bba7 100644
--- a/src/projectile/winder.c
+++ b/src/projectile/winder.c
@@ -12,6 +12,7 @@
 #include "physics.h"
 #include "projectile.h"
 #include "room.h"
+#include "map.h"
 
 extern s16 gUnk_080B4488[];
 
diff --git a/src/projectileUtils.c b/src/projectileUtils.c
index 5eebb291..79154830 100644
--- a/src/projectileUtils.c
+++ b/src/projectileUtils.c
@@ -2,6 +2,7 @@
 #include "definitions.h"
 #include "vram.h"
 #include "room.h"
+#include "color.h"
 
 extern const ProjectileDefinition gProjectileDefinitions[];
 
diff --git a/src/room.c b/src/room.c
index 61c2c707..fd039c6e 100644
--- a/src/room.c
+++ b/src/room.c
@@ -3,14 +3,13 @@
 #include "area.h"
 #include "common.h"
 #include "enemy.h"
+#include "effects.h"
 #include "flags.h"
 #include "script.h"
 #include "game.h"
 #include "manager/bombableWallManager.h"
 #include "map.h"
 #include "object.h"
-#include "asm.h"
-#include "effects.h"
 #include "room.h"
 #include "tiles.h"
 
diff --git a/src/roomInit.c b/src/roomInit.c
index 68e812e8..4db08d58 100644
--- a/src/roomInit.c
+++ b/src/roomInit.c
@@ -29,6 +29,7 @@
 #include "scroll.h"
 #include "subtask.h"
 #include "beanstalkSubtask.h"
+#include "fade.h"
 
 extern u32 sub_08060354(void);
 extern void MinishVillageTileSetManger_LoadInitialGfxGroup(void);
diff --git a/src/save.c b/src/save.c
index b638d73e..9b58b364 100644
--- a/src/save.c
+++ b/src/save.c
@@ -3,7 +3,6 @@
 #include "sound.h"
 #include "menu.h"
 #include "main.h"
-#include "game.h"
 #include "fileselect.h"
 
 typedef struct SaveFileStatus {
diff --git a/src/script.c b/src/script.c
index 084665ee..a9c1271a 100644
--- a/src/script.c
+++ b/src/script.c
@@ -13,13 +13,13 @@
 #include "room.h"
 #include "physics.h"
 #include "player.h"
-#include "screen.h"
 #include "scroll.h"
 #include "script.h"
 #include "ui.h"
 #include "save.h"
 #include "subtask.h"
 #include "pauseMenu.h"
+#include "fade.h"
 
 void InitScriptExecutionContext(ScriptExecutionContext* context, Script* script);
 void sub_0807DE80(Entity*);
diff --git a/src/staffroll.c b/src/staffroll.c
index 169c52ac..f0354a95 100644
--- a/src/staffroll.c
+++ b/src/staffroll.c
@@ -15,6 +15,7 @@
 #include "screen.h"
 #include "subtask.h"
 #include "sound.h"
+#include "fade.h"
 
 typedef struct {
     /*0x00*/ Menu base;
diff --git a/src/subtask.c b/src/subtask.c
index 974002fe..61a40f79 100644
--- a/src/subtask.c
+++ b/src/subtask.c
@@ -11,6 +11,7 @@
 #include "windcrest.h"
 #include "affine.h"
 #include "beanstalkSubtask.h"
+#include "fade.h"
 
 extern Screen gUnk_03001020;
 extern u8 gPaletteBufferBackup[];
diff --git a/src/subtask/subtaskAuxCutscene.c b/src/subtask/subtaskAuxCutscene.c
index ac585965..2297e727 100644
--- a/src/subtask/subtaskAuxCutscene.c
+++ b/src/subtask/subtaskAuxCutscene.c
@@ -15,6 +15,7 @@
 #include "sound.h"
 #include "subtask.h"
 #include "affine.h"
+#include "fade.h"
 
 typedef void(AuxCutsceneState)(void);
 typedef void(CutsceneMainState)(void);
diff --git a/src/subtask/subtaskFastTravel.c b/src/subtask/subtaskFastTravel.c
index f2f24059..400291e1 100644
--- a/src/subtask/subtaskFastTravel.c
+++ b/src/subtask/subtaskFastTravel.c
@@ -13,6 +13,7 @@
 #include "affine.h"
 #include "asm.h"
 #include "pauseMenu.h"
+#include "fade.h"
 
 extern void (*const Subtask_FastTravel_Functions[])(void);
 void sub_080A6E70(void);
diff --git a/src/subtask/subtaskLocalMapHint.c b/src/subtask/subtaskLocalMapHint.c
index 7de81d4d..f3095bcb 100644
--- a/src/subtask/subtaskLocalMapHint.c
+++ b/src/subtask/subtaskLocalMapHint.c
@@ -13,6 +13,7 @@
 #include "common.h"
 #include "affine.h"
 #include "vram.h"
+#include "fade.h"
 
 void Subtask_LocalMapHint() {
     extern void (*const gUnk_08128F1C[])(void);
diff --git a/src/subtask/subtaskMapHint.c b/src/subtask/subtaskMapHint.c
index 2ab6bead..d514770d 100644
--- a/src/subtask/subtaskMapHint.c
+++ b/src/subtask/subtaskMapHint.c
@@ -10,11 +10,8 @@
 #include "main.h"
 #include "sound.h"
 #include "save.h"
-#include "flags.h"
-#include "fileselect.h"
-#include "kinstone.h"
-#include "game.h"
 #include "affine.h"
+#include "fade.h"
 
 void sub_080A6438();
 
diff --git a/src/subtask/subtaskWorldEvent.c b/src/subtask/subtaskWorldEvent.c
index ac8d52af..b44f3b33 100644
--- a/src/subtask/subtaskWorldEvent.c
+++ b/src/subtask/subtaskWorldEvent.c
@@ -17,6 +17,7 @@
 #include "screen.h"
 #include "subtask.h"
 #include "affine.h"
+#include "fade.h"
 
 void Subtask_WorldEvent_Update(void);
 
diff --git a/src/text.c b/src/text.c
index 7b4305f8..90f04386 100644
--- a/src/text.c
+++ b/src/text.c
@@ -2,6 +2,7 @@
 #include "common.h"
 #include "asm.h"
 #include "enemy.h"
+#include "effects.h"
 #include "message.h"
 #include "fileselect.h"
 
diff --git a/src/title.c b/src/title.c
index a9df5b66..3130a234 100644
--- a/src/title.c
+++ b/src/title.c
@@ -17,6 +17,7 @@
 #include "save.h"
 #include "game.h"
 #include "affine.h"
+#include "fade.h"
 #ifdef DEMO_JP
 #include "item.h"
 #include "flags.h"
diff --git a/src/vram.c b/src/vram.c
index be4820cf..495a7c07 100644
--- a/src/vram.c
+++ b/src/vram.c
@@ -2,6 +2,7 @@
 #include "fileselect.h"
 #include "vram.h"
 #include "gfx.h"
+#include "color.h"
 
 extern u32 gFixedTypeGfxData[];
 
diff --git a/src/worldEvent/worldEvent1.c b/src/worldEvent/worldEvent1.c
index 92a17ddd..e4e6a808 100644
--- a/src/worldEvent/worldEvent1.c
+++ b/src/worldEvent/worldEvent1.c
@@ -4,14 +4,10 @@
  *
  * @brief World Event 1
  */
-#include "asm.h"
 #include "fade.h"
 #include "flags.h"
 #include "menu.h"
-#include "physics.h"
 #include "room.h"
-#include "script.h"
-#include "sound.h"
 #include "subtask.h"
 
 void WorldEvent_1_0(void);
diff --git a/src/worldEvent/worldEvent22.c b/src/worldEvent/worldEvent22.c
index e26dd650..46fe2037 100644
--- a/src/worldEvent/worldEvent22.c
+++ b/src/worldEvent/worldEvent22.c
@@ -8,7 +8,7 @@
 #include "menu.h"
 #include "npc.h"
 #include "room.h"
-#include "screen.h"
+#include "fade.h"
 
 extern void sub_0804B0B0(u32, u32);
 extern void sub_08055B70(u32, u32, u32, u32);
diff --git a/src/worldEvent/worldEvent4.c b/src/worldEvent/worldEvent4.c
index 7280d2c4..ceb4b226 100644
--- a/src/worldEvent/worldEvent4.c
+++ b/src/worldEvent/worldEvent4.c
@@ -6,9 +6,7 @@
  */
 #include "fade.h"
 #include "flags.h"
-#include "kinstone.h"
 #include "menu.h"
-#include "screen.h"
 #include "sound.h"
 #include "subtask.h"