cleanup headers

5 files changed, 11 insertions, 7 deletions

diff --git a/src/subtask/subtaskAuxCutscene.c b/src/subtask/subtaskAuxCutscene.c
index f916ae62..f1c30af4 100644
--- a/src/subtask/subtaskAuxCutscene.c
+++ b/src/subtask/subtaskAuxCutscene.c
@@ -6,9 +6,7 @@
 #include "area.h"
 #include "asm.h"
 #include "common.h"
-#include "fileselect.h"
-#include "flags.h"
-#include "functions.h"
+#include "structures.h"
 #include "game.h"
 #include "main.h"
 #include "menu.h"
@@ -17,6 +15,7 @@
 #include "screen.h"
 #include "sound.h"
 #include "subtask.h"
+#include "affine.h"
 
 typedef void(AuxCutsceneState)(void);
 typedef void(CutsceneMainState)(void);
diff --git a/src/subtask/subtaskFastTravel.c b/src/subtask/subtaskFastTravel.c
index 40b1ca0f..1b297789 100644
--- a/src/subtask/subtaskFastTravel.c
+++ b/src/subtask/subtaskFastTravel.c
@@ -7,10 +7,12 @@
 #include "subtask.h"
 #include "common.h"
 #include "menu.h"
-#include "functions.h"
 #include "message.h"
 #include "sound.h"
 #include "save.h"
+#include "affine.h"
+#include "asm.h"
+#include "structures.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 357e3f7e..cd33365d 100644
--- a/src/subtask/subtaskLocalMapHint.c
+++ b/src/subtask/subtaskLocalMapHint.c
@@ -7,10 +7,12 @@
 #include "menu.h"
 #include "subtask.h"
 #include "kinstone.h"
-#include "functions.h"
+#include "player.h"
 #include "screen.h"
 #include "sound.h"
 #include "common.h"
+#include "affine.h"
+#include "structures.h"
 
 void Subtask_LocalMapHint() {
     extern void (*const gUnk_08128F1C[])(void);
diff --git a/src/subtask/subtaskMapHint.c b/src/subtask/subtaskMapHint.c
index 1bbe2670..2ab6bead 100644
--- a/src/subtask/subtaskMapHint.c
+++ b/src/subtask/subtaskMapHint.c
@@ -5,7 +5,6 @@
  * @brief Map Hint Subtask
  */
 #include "menu.h"
-#include "functions.h"
 #include "subtask.h"
 #include "common.h"
 #include "main.h"
@@ -15,6 +14,7 @@
 #include "fileselect.h"
 #include "kinstone.h"
 #include "game.h"
+#include "affine.h"
 
 void sub_080A6438();
 
diff --git a/src/subtask/subtaskWorldEvent.c b/src/subtask/subtaskWorldEvent.c
index 0c7c5b5b..ac8d52af 100644
--- a/src/subtask/subtaskWorldEvent.c
+++ b/src/subtask/subtaskWorldEvent.c
@@ -7,7 +7,7 @@
 #include "asm.h"
 #include "common.h"
 #include "flags.h"
-#include "functions.h"
+#include "manager/hyruleTownTileSetManager.h"
 #include "game.h"
 #include "kinstone.h"
 #include "main.h"
@@ -16,6 +16,7 @@
 #include "room.h"
 #include "screen.h"
 #include "subtask.h"
+#include "affine.h"
 
 void Subtask_WorldEvent_Update(void);