cleanup unused and transitive includes

94 files changed, 219 insertions, 50 deletions

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 "object.h"
-#include "asm.h"
 #include "sound.h"
-#include "flags.h"
 #include "effects.h"
+#include "flags.h"
+#include "projectile.h"
+#include "object.h"
+#include "asm.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"