cleanup unused and transitive includes

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)

include/entity.h

@@ -3,7 +3,6 @@
 #define ENTITY_H
 
 #include "global.h"
-#include "color.h"
 #include "sprite.h"
 
 #define MAX_ENTITIES 72

include/main.h

@@ -6,6 +6,7 @@
 #include "script.h"
 #include "screen.h"
 #include "vram.h"
+#include "color.h"
 
 /** File signature */
 #define SIGNATURE 'MCZ3'

include/object.h

@@ -1,7 +1,6 @@
 #ifndef OBJECT_H
 #define OBJECT_H
 
-#include "global.h"
 #include "definitions.h"
 #include "entity.h"
 

include/room.h

@@ -3,7 +3,6 @@
 
 #include "entity.h"
 #include "droptables.h"
-#include "map.h"
 #include "transitions.h"
 
 enum RoomTransition {

include/screen.h

@@ -2,7 +2,6 @@
 #define SCREEN_H
 
 #include "global.h"
-#include "fade.h"
 
 typedef struct {
     /*0x00*/ u16 displayControl;

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;

src/affine.c

@@ -2,7 +2,6 @@
 #include "global.h"
 #include "main.h"
 #include "room.h"
-#include "screen.h"
 
 extern u32 gFrameObjLists[];
 

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*);

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);
 

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"

src/color.c

@@ -5,6 +5,7 @@
 #include "room.h"
 #include "main.h"
 #include "gfx.h"
+#include "fade.h"
 
 extern Palette gUnk_02001A3C;
 

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];

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"

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);

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);

src/droptables.c

@@ -1,4 +1,3 @@
-#include "global.h"
 #include "droptables.h"
 
 const Droptable gEnemyDroptables[] = {

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"

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;

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"

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"

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"
 

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"

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"

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;

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"

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"

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"
 

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 {

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;

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"

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"

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"
 

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*);

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 {

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 {

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"

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"

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"

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;

src/enemy/enemyE.c

@@ -5,6 +5,7 @@
  * @brief EnemyE enemy
  */
 #include "enemy.h"
+#include "effects.h"
 
 void sub_08023000(Entity*, int);
 

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"

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"

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"

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"

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"

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"

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"
 

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;

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*);

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"

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"

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"

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"
 

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*);

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;

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"
 

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"

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"

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"

src/enemy/leever.c

@@ -6,6 +6,7 @@
  */
 #include "asm.h"
 #include "enemy.h"
+#include "effects.h"
 #include "physics.h"
 #include "tiles.h"
 

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"

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;

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;

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"

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"

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"
 

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"
 

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;

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 {

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"
 

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)
 

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"

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"

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"

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;

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*);

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"

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"

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"

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"
 

src/enemy/sensorBladeTrap.c

@@ -6,6 +6,7 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "sound.h"
 #include "map.h"
 #include "physics.h"
 

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"

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"
 

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"
 

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*);

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 {

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"

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"

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"

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"

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"

src/enemy/tektite.c

@@ -6,6 +6,7 @@
  */
 #include "collision.h"
 #include "enemy.h"
+#include "effects.h"
 #include "asm.h"
 
 typedef struct {

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"
 

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"

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"

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"

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"

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"

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"