13 files changed, 20 insertions, 11 deletions
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/worldEvent10.c b/src/worldEvent/worldEvent10.c
index 69d7691e..6074760a 100644
--- a/src/worldEvent/worldEvent10.c
+++ b/src/worldEvent/worldEvent10.c
@@ -7,6 +7,9 @@
 #include "fade.h"
 #include "menu.h"
 #include "object.h"
+#include "common.h"
+#include "flags.h"
+#include "room.h"
 #include "subtask.h"
 
 void WorldEvent_Beanstalk_0(void);
diff --git a/src/worldEvent/worldEvent12.c b/src/worldEvent/worldEvent12.c
index 3fa18c50..0cba9c61 100644
--- a/src/worldEvent/worldEvent12.c
+++ b/src/worldEvent/worldEvent12.c
@@ -12,6 +12,7 @@
 #include "room.h"
 #include "script.h"
 #include "subtask.h"
+#include "save.h"
 
 extern Script script_GormanFirstAppearance;
 const EntityData gUnk_080FF2C0[] = {
diff --git a/src/worldEvent/worldEvent14.c b/src/worldEvent/worldEvent14.c
index 249a7774..c6e4c462 100644
--- a/src/worldEvent/worldEvent14.c
+++ b/src/worldEvent/worldEvent14.c
@@ -12,6 +12,7 @@
 #include "room.h"
 #include "script.h"
 #include "subtask.h"
+#include "save.h"
 
 extern Script script_GhostBrotherKinstone;
 const EntityData gUnk_080FF17C[] = {
diff --git a/src/worldEvent/worldEvent17.c b/src/worldEvent/worldEvent17.c
index 0be153e6..4e6caf61 100644
--- a/src/worldEvent/worldEvent17.c
+++ b/src/worldEvent/worldEvent17.c
@@ -13,6 +13,11 @@
 #include "subtask.h"
 #include "manager/bombableWallManager.h"
 #include "tiles.h"
+#include "flags.h"
+#include "sound.h"
+#include "asm.h"
+#include "effects.h"
+#include "physics.h"
 
 // Called Goron Kinstone Fusion Script
 void sub_08054EB8(Entity* this, ScriptExecutionContext* context) {
diff --git a/src/worldEvent/worldEvent19.c b/src/worldEvent/worldEvent19.c
index 12437991..4e319336 100644
--- a/src/worldEvent/worldEvent19.c
+++ b/src/worldEvent/worldEvent19.c
@@ -5,12 +5,13 @@
  * @brief World Event 19
  */
 #include "fade.h"
-#include "functions.h"
 #include "menu.h"
 #include "npc.h"
 #include "room.h"
 #include "script.h"
 #include "subtask.h"
+#include "manager/staticBackgroundManager.h"
+#include "npc/bigGoron.h"
 
 extern Script script_BigGoronKinstone1;
 extern Script script_BigGoronKinstone2;
diff --git a/src/worldEvent/worldEvent21.c b/src/worldEvent/worldEvent21.c
index e5540fa9..2fc9625d 100644
--- a/src/worldEvent/worldEvent21.c
+++ b/src/worldEvent/worldEvent21.c
@@ -9,6 +9,7 @@
 #include "npc.h"
 #include "room.h"
 #include "subtask.h"
+#include "script.h"
 
 extern Script script_CarlovKinstone;
 const EntityData gUnk_080FF264[] = {
diff --git a/src/worldEvent/worldEvent22.c b/src/worldEvent/worldEvent22.c
index 3fc0a672..46fe2037 100644
--- a/src/worldEvent/worldEvent22.c
+++ b/src/worldEvent/worldEvent22.c
@@ -4,11 +4,11 @@
  *
  * @brief World Event 22
  */
-#include "functions.h"
+#include "script.h"
 #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/worldEvent25.c b/src/worldEvent/worldEvent25.c
index b50b5ce8..d24fa8dc 100644
--- a/src/worldEvent/worldEvent25.c
+++ b/src/worldEvent/worldEvent25.c
@@ -7,6 +7,7 @@
 #include "fade.h"
 #include "menu.h"
 #include "object.h"
+#include "room.h"
 #include "script.h"
 #include "subtask.h"
 
diff --git a/src/worldEvent/worldEvent3.c b/src/worldEvent/worldEvent3.c
index adb20f68..a40483f1 100644
--- a/src/worldEvent/worldEvent3.c
+++ b/src/worldEvent/worldEvent3.c
@@ -6,7 +6,6 @@
  */
 #include "fade.h"
 #include "flags.h"
-#include "functions.h"
 #include "menu.h"
 #include "subtask.h"
 
diff --git a/src/worldEvent/worldEvent4.c b/src/worldEvent/worldEvent4.c
index 114cec1c..ceb4b226 100644
--- a/src/worldEvent/worldEvent4.c
+++ b/src/worldEvent/worldEvent4.c
@@ -6,10 +6,7 @@
  */
 #include "fade.h"
 #include "flags.h"
-#include "functions.h"
-#include "kinstone.h"
 #include "menu.h"
-#include "screen.h"
 #include "sound.h"
 #include "subtask.h"
 
diff --git a/src/worldEvent/worldEvent6.c b/src/worldEvent/worldEvent6.c
index bfc96630..fdc90450 100644
--- a/src/worldEvent/worldEvent6.c
+++ b/src/worldEvent/worldEvent6.c
@@ -7,6 +7,9 @@
 #include "fade.h"
 #include "menu.h"
 #include "object.h"
+#include "flags.h"
+#include "effects.h"
+#include "room.h"
 #include "sound.h"
 #include "subtask.h"
 
diff --git a/src/worldEvent/worldEvent7.c b/src/worldEvent/worldEvent7.c
index 601990ad..1984868d 100644
--- a/src/worldEvent/worldEvent7.c
+++ b/src/worldEvent/worldEvent7.c
@@ -7,6 +7,7 @@
 #include "fade.h"
 #include "menu.h"
 #include "object.h"
+#include "flags.h"
 #include "sound.h"
 #include "subtask.h"