7 files changed, 11 insertions, 10 deletions
diff --git a/src/code_2.c b/src/code_2.c
index 8a6987b..6f142e0 100644
--- a/src/code_2.c
+++ b/src/code_2.c
@@ -7,6 +7,7 @@
 #include "input.h"
 #include "memory.h"
 #include "main_menu.h"
+#include "moves.h"
 #include "music.h"
 #include "play_time.h"
 #include "save.h"
@@ -23,7 +24,6 @@ extern void sub_8097670(void);
 extern void LoadGameOptions(void);
 extern void sub_8094C14(void);
 extern void LoadItemParameters(void);
-extern void LoadWazaParameters(void);
 extern void sub_80950BC(void);
 extern void sub_80958E8(void);
 extern void sub_800CD64(u32, u32);
diff --git a/src/code_8057824.c b/src/code_8057824.c
index d763925..e43cef5 100644
--- a/src/code_8057824.c
+++ b/src/code_8057824.c
@@ -1,7 +1,6 @@
 #include "global.h"
 #include "dungeon_global_data.h"
 #include "dungeon_entity.h"
-#include "constants/move.h"
 #include "moves.h"
 
 extern u32 gUnknown_80FCF74;
diff --git a/src/friend_rescue.c b/src/friend_rescue.c
index aacc083..a864e5b 100644
--- a/src/friend_rescue.c
+++ b/src/friend_rescue.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "text.h"
+#include "input.h"
 #include "item.h"
 #include "team_inventory.h"
 #include "friend_rescue.h"
@@ -19,7 +20,6 @@ extern char gAvailablePokemonNames[0x50];
 extern struct WonderMailStruct_203B33C *gUnknown_203B33C;
 
 extern u8 sub_8039880(void);
-void ResetUnusedInputStruct(void);
 
 extern void sub_8035300(void);
 extern void sub_8035404(u32);
diff --git a/src/items.c b/src/items.c
index 4b5a710..526dff7 100644
--- a/src/items.c
+++ b/src/items.c
@@ -5,7 +5,9 @@
 #include "team_inventory.h"
 #include "random.h"
 #include "pokemon.h"
+#include "random.h"
 #include "subStruct_203B240.h"
+#include "team_inventory.h"
 
 #include <stddef.h>
 
@@ -702,13 +704,13 @@ u32 sub_80913E0(struct ItemSlot* slot, u32 a2, struct subStruct_203B240 ** a3)
     u8* typestring;
     u32 result;
 
-    InitPokemonMove(buffer8, move);
+    InitPokemonMove((struct PokemonMove *)buffer8, move);
     sub_80078A4(a2, 4, 82, 200, 7);
     xxx_format_and_draw(4, 84, gPtrTypeText, a2, 0);
-    moves_data = GetMoveType(buffer8);
+    moves_data = GetMoveType((struct PokemonMove *)buffer8);
     typestring = GetUnformattedTypeString(moves_data);
     xxx_format_and_draw(64, 84, typestring, a2, 0);
-    result = GetMoveMaxPP(buffer8);
+    result = GetMoveMaxPP((struct PokemonMove *)buffer8);
     gUnknown_202DE30 = result;
     xxx_format_and_draw(128, 84, gPtrPPD0Text, a2, 0);
   }
diff --git a/src/moves.c b/src/moves.c
index 0874f00..6b7665b 100644
--- a/src/moves.c
+++ b/src/moves.c
@@ -2,7 +2,7 @@
 #include "moves.h"
 
 #include "file_system.h"
-#include "constants/move_id.h"
+#include "moves.h"
 
 struct MoveDataFile
 {
diff --git a/src/moves_1.c b/src/moves_1.c
index 5a7bf6b..80f28af 100644
--- a/src/moves_1.c
+++ b/src/moves_1.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "code_8092334.h"
+#include "moves.h"
 #include "pokemon.h"
-#include "constants/move_id.h"
 
 void SavePokemonMove(struct unkStruct_8094924 *r0, struct PokemonMove *move)
 {
diff --git a/src/pokemon_mid.c b/src/pokemon_mid.c
index 791749a..ceb1371 100644
--- a/src/pokemon_mid.c
+++ b/src/pokemon_mid.c
@@ -1,7 +1,8 @@
 #include "global.h"
 #include "pokemon.h"
-#include "item.h"
 #include "file_system.h"
+#include "item.h"
+#include "moves.h"
 #include "subStruct_203B240.h"
 #include "constants/colors.h"
 #include "constants/move_id.h"
@@ -38,7 +39,6 @@ extern void xxx_pokemon2_to_pokemonstruct_808DF44(struct PokemonStruct*, struct
 extern u8* sub_8092B18(s16);
 extern u8* sub_808E07C(u8* a1, u16* a2);
 extern u8* sub_8092B54(s32);
-extern void InitZeroedPPPokemonMove(struct PokemonMove*, u16);
 extern u32 sub_8097DF0(char *, struct subStruct_203B240 **);
 
 struct unkStruct_8107654 {