5 files changed, 19 insertions, 15 deletions
diff --git a/src/subtask/subtaskAuxCutscene.c b/src/subtask/subtaskAuxCutscene.c
index f916ae62..2297e727 100644
--- a/src/subtask/subtaskAuxCutscene.c
+++ b/src/subtask/subtaskAuxCutscene.c
@@ -6,9 +6,6 @@
 #include "area.h"
 #include "asm.h"
 #include "common.h"
-#include "fileselect.h"
-#include "flags.h"
-#include "functions.h"
 #include "game.h"
 #include "main.h"
 #include "menu.h"
@@ -17,6 +14,8 @@
 #include "screen.h"
 #include "sound.h"
 #include "subtask.h"
+#include "affine.h"
+#include "fade.h"
 
 typedef void(AuxCutsceneState)(void);
 typedef void(CutsceneMainState)(void);
diff --git a/src/subtask/subtaskFastTravel.c b/src/subtask/subtaskFastTravel.c
index b457a10c..400291e1 100644
--- a/src/subtask/subtaskFastTravel.c
+++ b/src/subtask/subtaskFastTravel.c
@@ -7,17 +7,20 @@
 #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 "pauseMenu.h"
+#include "fade.h"
 
 extern void (*const Subtask_FastTravel_Functions[])(void);
 void sub_080A6E70(void);
 u32 sub_080A6D74(u32);
 void sub_080A6EE0(u32 param_1);
 
-extern const ScreenTransitionData gUnk_08128024[];
+extern const Transition gUnk_08128024[];
 
 void Subtask_FastTravel(void) {
     FlushSprites();
@@ -179,10 +182,10 @@ void sub_080A6EE0(u32 param_1) {
     u32 x;
     u32 y;
     RoomHeader* roomHeader;
-    const ScreenTransitionData* ptr = &gUnk_08128024[param_1];
+    const Transition* ptr = &gUnk_08128024[param_1];
 
-    x = (u16)ptr->playerXPos;
-    y = (u16)ptr->playerYPos;
+    x = (u16)ptr->endX;
+    y = (u16)ptr->endY;
     roomHeader = &gAreaRoomHeaders[ptr->area][ptr->room];
     x += roomHeader->map_x;
     y += roomHeader->map_y;
diff --git a/src/subtask/subtaskLocalMapHint.c b/src/subtask/subtaskLocalMapHint.c
index 357e3f7e..f3095bcb 100644
--- a/src/subtask/subtaskLocalMapHint.c
+++ b/src/subtask/subtaskLocalMapHint.c
@@ -7,10 +7,13 @@
 #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 "vram.h"
+#include "fade.h"
 
 void Subtask_LocalMapHint() {
     extern void (*const gUnk_08128F1C[])(void);
diff --git a/src/subtask/subtaskMapHint.c b/src/subtask/subtaskMapHint.c
index 1bbe2670..d514770d 100644
--- a/src/subtask/subtaskMapHint.c
+++ b/src/subtask/subtaskMapHint.c
@@ -5,16 +5,13 @@
  * @brief Map Hint Subtask
  */
 #include "menu.h"
-#include "functions.h"
 #include "subtask.h"
 #include "common.h"
 #include "main.h"
 #include "sound.h"
 #include "save.h"
-#include "flags.h"
-#include "fileselect.h"
-#include "kinstone.h"
-#include "game.h"
+#include "affine.h"
+#include "fade.h"
 
 void sub_080A6438();
 
diff --git a/src/subtask/subtaskWorldEvent.c b/src/subtask/subtaskWorldEvent.c
index 0c7c5b5b..b44f3b33 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,8 @@
 #include "room.h"
 #include "screen.h"
 #include "subtask.h"
+#include "affine.h"
+#include "fade.h"
 
 void Subtask_WorldEvent_Update(void);