diff --git a/src/daycare.c b/src/daycare.c
index d567ff79ab..17928324f8 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "pokemon.h"
+#include "battle.h"
 #include "daycare.h"
 #include "string_util.h"
 #include "constants/species.h"
@@ -22,8 +23,6 @@
 #define EGG_MOVES_ARRAY_COUNT           10
 #define EGG_LVL_UP_MOVES_ARRAY_COUNT    50
 
-extern u16 gMoveToLearn;
-
 // text
 extern const u8 gText_MaleSymbol4[];
 extern const u8 gText_FemaleSymbol4[];
diff --git a/src/decoration.c b/src/decoration.c
index 1fc94c80e8..08287a3cce 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -21,7 +21,6 @@
 #include "list_menu.h"
 #include "menu_helpers.h"
 #include "menu.h"
-#include "menu_indicators.h"
 #include "sound.h"
 #include "event_scripts.h"
 #include "event_data.h"
diff --git a/src/item_menu.c b/src/item_menu.c
index 3bce25661c..c4b4b15b14 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -26,7 +26,6 @@
 #include "malloc.h"
 #include "map_name_popup.h"
 #include "menu.h"
-#include "menu_indicators.h"
 #include "money.h"
 #include "overworld.h"
 #include "palette.h"
diff --git a/src/list_menu.c b/src/list_menu.c
index c35aabc03d..de7de82690 100644
--- a/src/list_menu.c
+++ b/src/list_menu.c
@@ -13,6 +13,8 @@
 #include "sound.h"
 #include "constants/songs.h"
 
+// This file needs better labels and function names.
+
 struct UnknownMysteryGiftLinkMenuStruct
 {
     s32 field_0;
diff --git a/src/main_menu.c b/src/main_menu.c
index 3d6c1df76e..3490424aff 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -16,7 +16,7 @@
 #include "link.h"
 #include "main.h"
 #include "menu.h"
-#include "menu_indicators.h"
+#include "list_menu.h"
 #include "mystery_event_menu.h"
 #include "naming_screen.h"
 #include "option_menu.h"
diff --git a/src/mon_markings.c b/src/mon_markings.c
index 147872ab66..7f320002da 100644
--- a/src/mon_markings.c
+++ b/src/mon_markings.c
@@ -2,7 +2,8 @@
 #include "dma3.h"
 #include "graphics.h"
 #include "main.h"
-#include "menu_indicators.h"
+#include "window.h"
+#include "list_menu.h"
 #include "mon_markings.h"
 #include "constants/songs.h"
 #include "sound.h"
diff --git a/src/player_pc.c b/src/player_pc.c
index 2bdf527e7e..c10c63dda0 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -18,7 +18,6 @@
 #include "malloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
-#include "menu_indicators.h"
 #include "overworld.h"
 #include "palette.h"
 #include "party_menu.h"
@@ -43,9 +42,6 @@ struct Struct203BCC4
     u8 spriteIds[7];
 };
 
-// extern offset
-void (*gFieldCallback)(void);
-
 // static functions
 static void InitPlayerPCMenu(u8 taskId);
 static void PlayerPCProcessMenuInput(u8 taskId);
diff --git a/src/pokeblock.c b/src/pokeblock.c
index f57b2f0c2f..216c9e2c50 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -24,7 +24,6 @@
 #include "constants/songs.h"
 #include "sound.h"
 #include "berry.h"
-#include "menu_indicators.h"
 #include "event_data.h"
 #include "battle_message.h"
 #include "safari_zone.h"
diff --git a/src/secret_base.c b/src/secret_base.c
index e2b7e20f15..66af4d4a22 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -10,7 +10,6 @@
 #include "list_menu.h"
 #include "menu.h"
 #include "menu_helpers.h"
-#include "menu_indicators.h"
 #include "constants/maps.h"
 #include "constants/songs.h"
 #include "constants/species.h"