summaryrefslogtreecommitdiff
path: root/src/enemy
diff options
context:
space:
mode:
Diffstat (limited to 'src/enemy')
-rw-r--r--src/enemy/acroBandits.c3
-rw-r--r--src/enemy/beetle.c3
-rw-r--r--src/enemy/bladeTrap.c1
-rw-r--r--src/enemy/bobomb.c3
-rw-r--r--src/enemy/bombPeahat.c2
-rw-r--r--src/enemy/businessScrub.c3
-rw-r--r--src/enemy/chuchu.c3
-rw-r--r--src/enemy/cuccoChickAggr.c2
-rw-r--r--src/enemy/darkNut.c2
-rw-r--r--src/enemy/doorMimic.c1
-rw-r--r--src/enemy/fallingBoulder.c2
-rw-r--r--src/enemy/fireballGuy.c4
-rw-r--r--src/enemy/gibdo.c3
-rw-r--r--src/enemy/gyorgMale.c3
-rw-r--r--src/enemy/helmasaur.c1
-rw-r--r--src/enemy/keaton.c4
-rw-r--r--src/enemy/keese.c4
-rw-r--r--src/enemy/lakitu.c5
-rw-r--r--src/enemy/lakituCloud.c1
-rw-r--r--src/enemy/leever.c4
-rw-r--r--src/enemy/likeLike.c2
-rw-r--r--src/enemy/madderpillar.c3
-rw-r--r--src/enemy/mazaalBracelet.c4
-rw-r--r--src/enemy/mazaalHead.c7
-rw-r--r--src/enemy/mazaalMacro.c4
-rw-r--r--src/enemy/miniFireballGuy.c3
-rw-r--r--src/enemy/miniSlime.c3
-rw-r--r--src/enemy/moldorm.c2
-rw-r--r--src/enemy/moldworm.c3
-rw-r--r--src/enemy/octorok.c3
-rw-r--r--src/enemy/octorokBoss.c7
-rw-r--r--src/enemy/peahat.c2
-rw-r--r--src/enemy/pesto.c4
-rw-r--r--src/enemy/puffstool.c3
-rw-r--r--src/enemy/rockChuchu.c3
-rw-r--r--src/enemy/rollobite.c2
-rw-r--r--src/enemy/rope.c4
-rw-r--r--src/enemy/rupeeLike.c2
-rw-r--r--src/enemy/sensorBladeTrap.c1
-rw-r--r--src/enemy/slime.c5
-rw-r--r--src/enemy/sluggula.c2
-rw-r--r--src/enemy/smallPesto.c4
-rw-r--r--src/enemy/spearMoblin.c3
-rw-r--r--src/enemy/spikedBeetle.c2
-rw-r--r--src/enemy/spinyChuchu.c3
-rw-r--r--src/enemy/tektite.c3
-rw-r--r--src/enemy/tektiteGolden.c4
-rw-r--r--src/enemy/vaatiArm.c6
-rw-r--r--src/enemy/vaatiBall.c1
-rw-r--r--src/enemy/vaatiEyesMacro.c3
-rw-r--r--src/enemy/vaatiProjectile.c2
-rw-r--r--src/enemy/vaatiRebornEnemy.c6
-rw-r--r--src/enemy/vaatiTransfigured.c5
-rw-r--r--src/enemy/vaatiWrath.c8
-rw-r--r--src/enemy/vaatiWrathEye.c4
-rw-r--r--src/enemy/wallMaster.c2
-rw-r--r--src/enemy/wallMaster2.c1
-rw-r--r--src/enemy/waterDrop.c2
-rw-r--r--src/enemy/wisp.c5
59 files changed, 19 insertions, 168 deletions
diff --git a/src/enemy/acroBandits.c b/src/enemy/acroBandits.c
index c4784ee0..e43a8f39 100644
--- a/src/enemy/acroBandits.c
+++ b/src/enemy/acroBandits.c
@@ -1,7 +1,4 @@
-#include "global.h"
-#include "entity.h"
#include "enemy.h"
-#include "random.h"
#include "functions.h"
extern u32 sub_080002D4(s32, s32, u32);
diff --git a/src/enemy/beetle.c b/src/enemy/beetle.c
index b2b3e5ed..997f4faf 100644
--- a/src/enemy/beetle.c
+++ b/src/enemy/beetle.c
@@ -1,7 +1,4 @@
-#include "entity.h"
#include "enemy.h"
-#include "player.h"
-#include "random.h"
#include "functions.h"
extern u32 PlayerInRange(Entity*, u32, u32);
diff --git a/src/enemy/bladeTrap.c b/src/enemy/bladeTrap.c
index 66729fce..70fd869c 100644
--- a/src/enemy/bladeTrap.c
+++ b/src/enemy/bladeTrap.c
@@ -1,4 +1,5 @@
#include "global.h"
+#include "audio.h"
#include "entity.h"
#include "room.h"
#include "functions.h"
diff --git a/src/enemy/bobomb.c b/src/enemy/bobomb.c
index b9976950..9a68209d 100644
--- a/src/enemy/bobomb.c
+++ b/src/enemy/bobomb.c
@@ -1,5 +1,6 @@
+#include "asm.h"
+#include "audio.h"
#include "enemy.h"
-#include "random.h"
#include "createObject.h"
#include "object.h"
#include "functions.h"
diff --git a/src/enemy/bombPeahat.c b/src/enemy/bombPeahat.c
index 187670e9..71e0540d 100644
--- a/src/enemy/bombPeahat.c
+++ b/src/enemy/bombPeahat.c
@@ -1,8 +1,8 @@
+#include "asm.h"
#include "global.h"
#include "entity.h"
#include "enemy.h"
#include "player.h"
-#include "random.h"
#include "object.h"
#include "functions.h"
diff --git a/src/enemy/businessScrub.c b/src/enemy/businessScrub.c
index 6e75d855..e53d46e5 100644
--- a/src/enemy/businessScrub.c
+++ b/src/enemy/businessScrub.c
@@ -1,9 +1,10 @@
+#include "asm.h"
#include "enemy.h"
+#include "audio.h"
#include "entity.h"
#include "flags.h"
#include "textbox.h"
#include "save.h"
-#include "random.h"
#include "npc.h"
#include "functions.h"
#include "effects.h"
diff --git a/src/enemy/chuchu.c b/src/enemy/chuchu.c
index c6c83615..f14b400c 100644
--- a/src/enemy/chuchu.c
+++ b/src/enemy/chuchu.c
@@ -1,7 +1,8 @@
+#include "asm.h"
#include "enemy.h"
#include "entity.h"
-#include "random.h"
#include "functions.h"
+#include "audio.h"
extern s32 sub_080012DC(Entity*);
extern void sub_08001318(Entity*);
diff --git a/src/enemy/cuccoChickAggr.c b/src/enemy/cuccoChickAggr.c
index d3295203..abb416f2 100644
--- a/src/enemy/cuccoChickAggr.c
+++ b/src/enemy/cuccoChickAggr.c
@@ -1,6 +1,4 @@
#include "enemy.h"
-#include "entity.h"
-#include "random.h"
#include "functions.h"
extern Entity* sub_08049DF4(u32);
diff --git a/src/enemy/darkNut.c b/src/enemy/darkNut.c
index e9061ad0..ed6d602b 100644
--- a/src/enemy/darkNut.c
+++ b/src/enemy/darkNut.c
@@ -1,6 +1,4 @@
-#include "entity.h"
#include "enemy.h"
-#include "random.h"
#include "functions.h"
typedef struct {
diff --git a/src/enemy/doorMimic.c b/src/enemy/doorMimic.c
index 713ace16..ab1531fb 100644
--- a/src/enemy/doorMimic.c
+++ b/src/enemy/doorMimic.c
@@ -1,3 +1,4 @@
+#include "audio.h"
#include "enemy.h"
#include "entity.h"
#include "functions.h"
diff --git a/src/enemy/fallingBoulder.c b/src/enemy/fallingBoulder.c
index 6084d868..7e4ddde1 100644
--- a/src/enemy/fallingBoulder.c
+++ b/src/enemy/fallingBoulder.c
@@ -1,7 +1,5 @@
#include "enemy.h"
-#include "random.h"
#include "functions.h"
-#include "effects.h"
void sub_0802C4B0(Entity*);
void sub_0802C62C(Entity*);
diff --git a/src/enemy/fireballGuy.c b/src/enemy/fireballGuy.c
index c6e0123e..afcc4ac7 100644
--- a/src/enemy/fireballGuy.c
+++ b/src/enemy/fireballGuy.c
@@ -1,9 +1,5 @@
-#include "global.h"
-#include "entity.h"
#include "enemy.h"
-#include "random.h"
#include "functions.h"
-#include "effects.h"
typedef struct {
s8 h, v;
diff --git a/src/enemy/gibdo.c b/src/enemy/gibdo.c
index 59e03862..912f0f61 100644
--- a/src/enemy/gibdo.c
+++ b/src/enemy/gibdo.c
@@ -1,8 +1,5 @@
#include "global.h"
-#include "entity.h"
-#include "sprite.h"
#include "enemy.h"
-#include "random.h"
#include "object.h"
#include "functions.h"
// Gibudo
diff --git a/src/enemy/gyorgMale.c b/src/enemy/gyorgMale.c
index 855a66dc..40497928 100644
--- a/src/enemy/gyorgMale.c
+++ b/src/enemy/gyorgMale.c
@@ -1,10 +1,7 @@
#include "global.h"
#include "enemy.h"
#include "player.h"
-#include "room.h"
-#include "coord.h"
#include "fileScreen.h"
-#include "random.h"
#include "functions.h"
#include "effects.h"
diff --git a/src/enemy/helmasaur.c b/src/enemy/helmasaur.c
index 0bb1c1c4..594c8800 100644
--- a/src/enemy/helmasaur.c
+++ b/src/enemy/helmasaur.c
@@ -1,5 +1,4 @@
#include "enemy.h"
-#include "random.h"
#include "object.h"
#include "functions.h"
diff --git a/src/enemy/keaton.c b/src/enemy/keaton.c
index b5bbef3f..6c551e9c 100644
--- a/src/enemy/keaton.c
+++ b/src/enemy/keaton.c
@@ -1,9 +1,5 @@
-#include "global.h"
-#include "entity.h"
#include "enemy.h"
-#include "random.h"
#include "functions.h"
-#include "effects.h"
extern Entity* gUnk_020000B0;
diff --git a/src/enemy/keese.c b/src/enemy/keese.c
index 92d3ff86..1b3c4e11 100644
--- a/src/enemy/keese.c
+++ b/src/enemy/keese.c
@@ -1,8 +1,4 @@
-#include "global.h"
-#include "entity.h"
#include "enemy.h"
-#include "player.h"
-#include "random.h"
#include "functions.h"
extern void sub_08001328(Entity*);
diff --git a/src/enemy/lakitu.c b/src/enemy/lakitu.c
index 8e4ae08e..85d80ee3 100644
--- a/src/enemy/lakitu.c
+++ b/src/enemy/lakitu.c
@@ -1,11 +1,6 @@
#include "global.h"
-#include "entity.h"
#include "enemy.h"
#include "functions.h"
-#include "coord.h"
-#include "random.h"
-#include "player.h"
-#include "effects.h"
extern void (*const LakituActionFuncs[])(Entity*);
diff --git a/src/enemy/lakituCloud.c b/src/enemy/lakituCloud.c
index f847b0bd..f391c5ee 100644
--- a/src/enemy/lakituCloud.c
+++ b/src/enemy/lakituCloud.c
@@ -1,4 +1,5 @@
#include "global.h"
+#include "asm.h"
#include "entity.h"
#include "player.h"
#include "functions.h"
diff --git a/src/enemy/leever.c b/src/enemy/leever.c
index d5b8e3de..e7624432 100644
--- a/src/enemy/leever.c
+++ b/src/enemy/leever.c
@@ -1,9 +1,5 @@
-#include "global.h"
-#include "entity.h"
#include "enemy.h"
-#include "random.h"
#include "functions.h"
-#include "coord.h"
extern u32 sub_080002D4(s32, s32, u32);
extern u32 sub_080002BC(s32, s32, u32);
diff --git a/src/enemy/likeLike.c b/src/enemy/likeLike.c
index 42e8d88f..3bba9493 100644
--- a/src/enemy/likeLike.c
+++ b/src/enemy/likeLike.c
@@ -1,8 +1,6 @@
#include "enemy.h"
-#include "entity.h"
#include "textbox.h"
#include "save.h"
-#include "random.h"
#include "createObject.h"
#include "functions.h"
diff --git a/src/enemy/madderpillar.c b/src/enemy/madderpillar.c
index 45ac8b27..11742547 100644
--- a/src/enemy/madderpillar.c
+++ b/src/enemy/madderpillar.c
@@ -1,8 +1,5 @@
#include "enemy.h"
-#include "entity.h"
-#include "random.h"
#include "functions.h"
-#include "effects.h"
extern u8 gEntCount;
extern Hitbox gUnk_080FD298;
diff --git a/src/enemy/mazaalBracelet.c b/src/enemy/mazaalBracelet.c
index eb32b41b..d0db11ed 100644
--- a/src/enemy/mazaalBracelet.c
+++ b/src/enemy/mazaalBracelet.c
@@ -1,10 +1,6 @@
-#include "global.h"
#include "enemy.h"
-#include "audio.h"
-#include "random.h"
#include "object.h"
#include "functions.h"
-#include "effects.h"
void sub_0803B538(Entity*);
u32 sub_0803B4E4(Entity*);
diff --git a/src/enemy/mazaalHead.c b/src/enemy/mazaalHead.c
index b282e776..a96e4f84 100644
--- a/src/enemy/mazaalHead.c
+++ b/src/enemy/mazaalHead.c
@@ -1,12 +1,7 @@
-#include "global.h"
-#include "entity.h"
#include "enemy.h"
-#include "screen.h"
-#include "audio.h"
-#include "random.h"
#include "object.h"
#include "functions.h"
-#include "effects.h"
+#include "screen.h"
extern void UnloadOBJPalette(Entity*);
diff --git a/src/enemy/mazaalMacro.c b/src/enemy/mazaalMacro.c
index 89eed0d1..ed28d6c8 100644
--- a/src/enemy/mazaalMacro.c
+++ b/src/enemy/mazaalMacro.c
@@ -1,11 +1,7 @@
-#include "global.h"
-#include "entity.h"
#include "enemy.h"
-#include "random.h"
#include "script.h"
#include "structures.h"
#include "functions.h"
-#include "effects.h"
extern void sub_0807B600(u32);
diff --git a/src/enemy/miniFireballGuy.c b/src/enemy/miniFireballGuy.c
index 7f538b1b..cca05ed4 100644
--- a/src/enemy/miniFireballGuy.c
+++ b/src/enemy/miniFireballGuy.c
@@ -1,7 +1,4 @@
-#include "global.h"
-#include "entity.h"
#include "enemy.h"
-#include "random.h"
#include "functions.h"
extern void sub_08045678(Entity*);
diff --git a/src/enemy/miniSlime.c b/src/enemy/miniSlime.c
index 521b52a8..488cb419 100644
--- a/src/enemy/miniSlime.c
+++ b/src/enemy/miniSlime.c
@@ -1,7 +1,4 @@
-#include "global.h"
-#include "entity.h"
#include "enemy.h"
-#include "random.h"
#include "functions.h"
void sub_08045374(Entity*);
diff --git a/src/enemy/moldorm.c b/src/enemy/moldorm.c
index 25ae0111..767254f9 100644
--- a/src/enemy/moldorm.c
+++ b/src/enemy/moldorm.c
@@ -1,6 +1,4 @@
#include "enemy.h"
-#include "entity.h"
-#include "random.h"
#include "functions.h"
void sub_08022EAC(Entity*);
diff --git a/src/enemy/moldworm.c b/src/enemy/moldworm.c
index 7b700322..9ffd49fa 100644
--- a/src/enemy/moldworm.c
+++ b/src/enemy/moldworm.c
@@ -1,8 +1,5 @@
#include "enemy.h"
-#include "entity.h"
-#include "random.h"
#include "functions.h"
-#include "effects.h"
extern void sub_0800449C(Entity*, u32);
extern bool32 sub_08023A38(u32);
diff --git a/src/enemy/octorok.c b/src/enemy/octorok.c
index 9ca40e32..4c142bdc 100644
--- a/src/enemy/octorok.c
+++ b/src/enemy/octorok.c
@@ -1,7 +1,4 @@
-#include "global.h"
-#include "entity.h"
#include "enemy.h"
-#include "random.h"
#include "functions.h"
extern Entity* sub_08049DF4(u32);
diff --git a/src/enemy/octorokBoss.c b/src/enemy/octorokBoss.c
index 7544b241..23dca6d4 100644
--- a/src/enemy/octorokBoss.c
+++ b/src/enemy/octorokBoss.c
@@ -1,14 +1,9 @@
-#include "global.h"
-#include "audio.h"
#include "enemy.h"
#include "functions.h"
#include "object.h"
#include "projectile.h"
-#include "random.h"
-#include "room.h"
#include "structures.h"
-#include "structures.h"
-#include "utils.h"
+#include "overworld.h"
extern void sub_08078AC0(u32, u32, u32);
extern u32 GetRandomByWeight(const u8*);
diff --git a/src/enemy/peahat.c b/src/enemy/peahat.c
index de45a52a..5d8ba2d5 100644
--- a/src/enemy/peahat.c
+++ b/src/enemy/peahat.c
@@ -1,6 +1,4 @@
-#include "entity.h"
#include "enemy.h"
-#include "random.h"
#include "functions.h"
extern void (*const gPeahatFunctions[])(Entity*);
diff --git a/src/enemy/pesto.c b/src/enemy/pesto.c
index 472d982d..8694f4af 100644
--- a/src/enemy/pesto.c
+++ b/src/enemy/pesto.c
@@ -1,8 +1,6 @@
#include "enemy.h"
-#include "entity.h"
-#include "random.h"
#include "createObject.h"
-#include "game.h"
+#include "overworld.h"
#include "functions.h"
#include "save.h"
diff --git a/src/enemy/puffstool.c b/src/enemy/puffstool.c
index 207934a9..6240bcd2 100644
--- a/src/enemy/puffstool.c
+++ b/src/enemy/puffstool.c
@@ -1,9 +1,6 @@
#include "enemy.h"
-#include "entity.h"
-#include "random.h"
#include "object.h"
#include "functions.h"
-#include "effects.h"
extern u32 sub_080002E0(u32, u32);
extern u32 sub_080002C8(u16, u8);
diff --git a/src/enemy/rockChuchu.c b/src/enemy/rockChuchu.c
index 95e0a9c1..dd3987cd 100644
--- a/src/enemy/rockChuchu.c
+++ b/src/enemy/rockChuchu.c
@@ -1,8 +1,5 @@
#include "enemy.h"
-#include "entity.h"
-#include "random.h"
#include "functions.h"
-#include "effects.h"
extern void sub_0804A4E4(Entity*, Entity*);
diff --git a/src/enemy/rollobite.c b/src/enemy/rollobite.c
index 9815510f..5fb77dab 100644
--- a/src/enemy/rollobite.c
+++ b/src/enemy/rollobite.c
@@ -1,6 +1,4 @@
-#include "entity.h"
#include "enemy.h"
-#include "random.h"
#include "functions.h"
extern void (*const gRollobiteFunctions[])(Entity*);
diff --git a/src/enemy/rope.c b/src/enemy/rope.c
index 2c61fb03..d001888d 100644
--- a/src/enemy/rope.c
+++ b/src/enemy/rope.c
@@ -1,8 +1,4 @@
-#include "global.h"
-#include "entity.h"
#include "enemy.h"
-#include "random.h"
-#include "audio.h"
#include "functions.h"
extern void (*const gRope[6])(Entity*);
diff --git a/src/enemy/rupeeLike.c b/src/enemy/rupeeLike.c
index 05334d65..62853353 100644
--- a/src/enemy/rupeeLike.c
+++ b/src/enemy/rupeeLike.c
@@ -1,4 +1,6 @@
#include "global.h"
+#include "asm.h"
+#include "audio.h"
#include "entity.h"
#include "enemy.h"
#include "npc.h"
diff --git a/src/enemy/sensorBladeTrap.c b/src/enemy/sensorBladeTrap.c
index 0aae18f1..40ad4f03 100644
--- a/src/enemy/sensorBladeTrap.c
+++ b/src/enemy/sensorBladeTrap.c
@@ -1,4 +1,5 @@
#include "enemy.h"
+#include "audio.h"
#include "functions.h"
extern u32 sub_0804A024(Entity*, u32, u32);
diff --git a/src/enemy/slime.c b/src/enemy/slime.c
index ab7666f8..86069f50 100644
--- a/src/enemy/slime.c
+++ b/src/enemy/slime.c
@@ -1,10 +1,5 @@
-#include "global.h"
-#include "entity.h"
#include "enemy.h"
-#include "room.h"
-#include "random.h"
#include "functions.h"
-#include "effects.h"
typedef struct {
s8 h, v;
diff --git a/src/enemy/sluggula.c b/src/enemy/sluggula.c
index d6361507..5d307fc4 100644
--- a/src/enemy/sluggula.c
+++ b/src/enemy/sluggula.c
@@ -1,6 +1,4 @@
#include "enemy.h"
-#include "entity.h"
-#include "random.h"
#include "functions.h"
extern s32 sub_080012DC(Entity*);
diff --git a/src/enemy/smallPesto.c b/src/enemy/smallPesto.c
index 3be1f047..b8fdc5db 100644
--- a/src/enemy/smallPesto.c
+++ b/src/enemy/smallPesto.c
@@ -1,8 +1,4 @@
-#include "global.h"
-#include "entity.h"
#include "enemy.h"
-#include "coord.h"
-#include "random.h"
#include "functions.h"
extern void sub_080317F8(Entity*);
diff --git a/src/enemy/spearMoblin.c b/src/enemy/spearMoblin.c
index fa90d4f8..6e35d52a 100644
--- a/src/enemy/spearMoblin.c
+++ b/src/enemy/spearMoblin.c
@@ -1,8 +1,5 @@
#include "enemy.h"
-#include "entity.h"
-#include "random.h"
#include "functions.h"
-#include "effects.h"
extern bool32 sub_0806FC80(Entity*, Entity*, u32);
extern Entity* sub_08049DF4(u32);
diff --git a/src/enemy/spikedBeetle.c b/src/enemy/spikedBeetle.c
index 89d9e031..903908c4 100644
--- a/src/enemy/spikedBeetle.c
+++ b/src/enemy/spikedBeetle.c
@@ -1,6 +1,4 @@
#include "enemy.h"
-#include "entity.h"
-#include "random.h"
#include "functions.h"
extern u32 sub_0804A024(Entity*, u32, u32);
diff --git a/src/enemy/spinyChuchu.c b/src/enemy/spinyChuchu.c
index 887a433d..69664d39 100644
--- a/src/enemy/spinyChuchu.c
+++ b/src/enemy/spinyChuchu.c
@@ -1,7 +1,4 @@
#include "enemy.h"
-#include "entity.h"
-#include "random.h"
-#include "audio.h"
#include "functions.h"
extern void sub_08001318(Entity*);
diff --git a/src/enemy/tektite.c b/src/enemy/tektite.c
index a4f78704..ac123367 100644
--- a/src/enemy/tektite.c
+++ b/src/enemy/tektite.c
@@ -1,7 +1,4 @@
-#include "global.h"
-#include "entity.h"
#include "enemy.h"
-#include "random.h"
#include "functions.h"
extern void (*const gUnk_080CDED0[])(Entity*);
diff --git a/src/enemy/tektiteGolden.c b/src/enemy/tektiteGolden.c
index 12287902..ba3b5d58 100644
--- a/src/enemy/tektiteGolden.c
+++ b/src/enemy/tektiteGolden.c
@@ -1,8 +1,4 @@
-#include "global.h"
-#include "entity.h"
#include "enemy.h"
-#include "flags.h"
-#include "random.h"
#include "functions.h"
extern void sub_08038168(Entity*);
diff --git a/src/enemy/vaatiArm.c b/src/enemy/vaatiArm.c
index 139b1fe0..8a5dd737 100644
--- a/src/enemy/vaatiArm.c
+++ b/src/enemy/vaatiArm.c
@@ -1,12 +1,6 @@
-#include "global.h"
#include "enemy.h"
-#include "entity.h"
-#include "audio.h"
#include "object.h"
-#include "random.h"
-#include "utils.h"
#include "functions.h"
-#include "effects.h"
extern void DoExitTransition(ScreenTransitionData*);
diff --git a/src/enemy/vaatiBall.c b/src/enemy/vaatiBall.c
index 778af1a7..f6a4356f 100644
--- a/src/enemy/vaatiBall.c
+++ b/src/enemy/vaatiBall.c
@@ -1,4 +1,5 @@
#include "entity.h"
+#include "enemy.h"
#include "player.h"
#include "screen.h"
#include "createObject.h"
diff --git a/src/enemy/vaatiEyesMacro.c b/src/enemy/vaatiEyesMacro.c
index 5bc955dc..be77a617 100644
--- a/src/enemy/vaatiEyesMacro.c
+++ b/src/enemy/vaatiEyesMacro.c
@@ -1,7 +1,4 @@
-#include "global.h"
#include "enemy.h"
-#include "audio.h"
-#include "random.h"
#include "functions.h"
extern u32 sub_080002E0(u32, u32);
diff --git a/src/enemy/vaatiProjectile.c b/src/enemy/vaatiProjectile.c
index c8c85e44..2efae6f5 100644
--- a/src/enemy/vaatiProjectile.c
+++ b/src/enemy/vaatiProjectile.c
@@ -1,6 +1,4 @@
-#include "global.h"
#include "enemy.h"
-#include "random.h"
#include "functions.h"
extern bool32 PlayerInRange(Entity*, u32, u32);
diff --git a/src/enemy/vaatiRebornEnemy.c b/src/enemy/vaatiRebornEnemy.c
index d1a2e4c8..c8f97752 100644
--- a/src/enemy/vaatiRebornEnemy.c
+++ b/src/enemy/vaatiRebornEnemy.c
@@ -1,12 +1,6 @@
-#include "global.h"
#include "enemy.h"
-#include "coord.h"
-#include "flags.h"
-#include "random.h"
-#include "audio.h"
#include "area.h"
#include "functions.h"
-#include "effects.h"
extern void sub_080AEFB4(Entity*);
extern u8 gEntCount;
diff --git a/src/enemy/vaatiTransfigured.c b/src/enemy/vaatiTransfigured.c
index c00649a5..232d95a5 100644
--- a/src/enemy/vaatiTransfigured.c
+++ b/src/enemy/vaatiTransfigured.c
@@ -1,11 +1,6 @@
-#include "entity.h"
#include "enemy.h"
#include "object.h"
-#include "random.h"
-#include "flags.h"
-#include "audio.h"
#include "functions.h"
-#include "effects.h"
void sub_080409B0(Entity*);
void sub_080408EC(Entity*);
diff --git a/src/enemy/vaatiWrath.c b/src/enemy/vaatiWrath.c
index 21d38958..a8843ae8 100644
--- a/src/enemy/vaatiWrath.c
+++ b/src/enemy/vaatiWrath.c
@@ -1,16 +1,10 @@
-#include "entity.h"
#include "enemy.h"
-#include "audio.h"
-#include "room.h"
-#include "random.h"
#include "object.h"
#include "textbox.h"
-#include "flags.h"
-#include "utils.h"
#include "structures.h"
#include "functions.h"
#include "save.h"
-#include "effects.h"
+#include "screen.h"
extern u8 gEntCount;
diff --git a/src/enemy/vaatiWrathEye.c b/src/enemy/vaatiWrathEye.c
index d476ca6c..d8590edc 100644
--- a/src/enemy/vaatiWrathEye.c
+++ b/src/enemy/vaatiWrathEye.c
@@ -1,8 +1,6 @@
-#include "entity.h"
-#include "audio.h"
+#include "enemy.h"
#include "structures.h"
#include "functions.h"
-#include "effects.h"
void sub_080485D8(Entity*);
void sub_080485FC(Entity*);
diff --git a/src/enemy/wallMaster.c b/src/enemy/wallMaster.c
index a0d612f7..e548e329 100644
--- a/src/enemy/wallMaster.c
+++ b/src/enemy/wallMaster.c
@@ -1,7 +1,5 @@
#include "enemy.h"
-#include "entity.h"
#include "area.h"
-#include "random.h"
#include "functions.h"
extern void sub_08001328(Entity*);
diff --git a/src/enemy/wallMaster2.c b/src/enemy/wallMaster2.c
index 03d35e80..73deb8da 100644
--- a/src/enemy/wallMaster2.c
+++ b/src/enemy/wallMaster2.c
@@ -1,6 +1,5 @@
#include "enemy.h"
#include "area.h"
-#include "random.h"
#include "functions.h"
extern void sub_08001328(Entity*);
diff --git a/src/enemy/waterDrop.c b/src/enemy/waterDrop.c
index 96ff44c2..32390db3 100644
--- a/src/enemy/waterDrop.c
+++ b/src/enemy/waterDrop.c
@@ -1,7 +1,5 @@
#include "enemy.h"
-#include "entity.h"
#include "screen.h"
-#include "random.h"
#include "object.h"
#include "structures.h"
#include "functions.h"
diff --git a/src/enemy/wisp.c b/src/enemy/wisp.c
index beb1ec43..b2c00736 100644
--- a/src/enemy/wisp.c
+++ b/src/enemy/wisp.c
@@ -1,12 +1,7 @@
-#include "global.h"
-#include "entity.h"
#include "enemy.h"
-#include "player.h"
#include "save.h"
-#include "random.h"
#include "createObject.h"
#include "functions.h"
-#include "effects.h"
extern void (*const gUnk_080CEB74[])(Entity*);
extern void (*const gUnk_080CEB8C[])(Entity*);