diff --git a/include/battle/ov16_0223DF00.h b/include/battle/ov16_0223DF00.h
index e035a4fd5d..e7c9cf625e 100644
--- a/include/battle/ov16_0223DF00.h
+++ b/include/battle/ov16_0223DF00.h
@@ -12,7 +12,6 @@
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/chatot_cry.h"
 #include "struct_defs/trainer_data.h"
 
@@ -32,6 +31,7 @@
 #include "game_options.h"
 #include "message.h"
 #include "palette.h"
+#include "party.h"
 #include "pokemon.h"
 #include "strbuf.h"
 #include "string_template.h"
diff --git a/include/encounter.h b/include/encounter.h
index b820041ad0..4db8530452 100644
--- a/include/encounter.h
+++ b/include/encounter.h
@@ -1,12 +1,11 @@
 #ifndef POKEPLATINUM_ENCOUNTER_H
 #define POKEPLATINUM_ENCOUNTER_H
 
-#include "struct_decls/struct_party_decl.h"
-
 #include "field/field_system_decl.h"
 
 #include "field_battle_data_transfer.h"
 #include "field_task.h"
+#include "party.h"
 
 void Encounter_NewVsWild(FieldSystem *fieldSystem, FieldBattleDTO *dto);
 void Encounter_StartVsWild(FieldSystem *fieldSystem, FieldTask *task, FieldBattleDTO *dto);
diff --git a/include/field_battle_data_transfer.h b/include/field_battle_data_transfer.h
index 2df30e0455..9fe0bb3bb4 100644
--- a/include/field_battle_data_transfer.h
+++ b/include/field_battle_data_transfer.h
@@ -9,7 +9,6 @@
 #include "struct_decls/struct_0202C878_decl.h"
 #include "struct_decls/struct_0206D140_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/chatot_cry.h"
 #include "struct_defs/trainer_data.h"
 
@@ -19,6 +18,7 @@
 #include "game_options.h"
 #include "game_records.h"
 #include "journal.h"
+#include "party.h"
 #include "poketch.h"
 #include "rtc.h"
 #include "savedata.h"
diff --git a/include/functypes/funcptr_0205AB10.h b/include/functypes/funcptr_0205AB10.h
index 387c3cb774..ed124f334d 100644
--- a/include/functypes/funcptr_0205AB10.h
+++ b/include/functypes/funcptr_0205AB10.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_FUNCPTR_0205AB10_H
 #define POKEPLATINUM_FUNCPTR_0205AB10_H
 
-#include "struct_decls/struct_party_decl.h"
+#include "party.h"
 
 typedef void(UnkFuncPtr_0205AB10)(BOOL, const Party *);
 
diff --git a/include/overlay005/ov5_021E622C.h b/include/overlay005/ov5_021E622C.h
index 2f69424ed4..434ac7dcdb 100644
--- a/include/overlay005/ov5_021E622C.h
+++ b/include/overlay005/ov5_021E622C.h
@@ -3,10 +3,10 @@
 
 #include "struct_decls/struct_02026218_decl.h"
 #include "struct_decls/struct_02026310_decl.h"
-#include "struct_decls/struct_party_decl.h"
 
 #include "field/field_system_decl.h"
 
+#include "party.h"
 #include "pokemon.h"
 #include "savedata.h"
 #include "string_template.h"
diff --git a/include/overlay010/struct_ov10_0221F800.h b/include/overlay010/struct_ov10_0221F800.h
index b3b7ed999b..db76bd096d 100644
--- a/include/overlay010/struct_ov10_0221F800.h
+++ b/include/overlay010/struct_ov10_0221F800.h
@@ -1,9 +1,8 @@
 #ifndef POKEPLATINUM_STRUCT_OV10_0221F800_H
 #define POKEPLATINUM_STRUCT_OV10_0221F800_H
 
-#include "struct_decls/struct_party_decl.h"
-
 #include "field_battle_data_transfer.h"
+#include "party.h"
 #include "strbuf.h"
 
 typedef struct {
diff --git a/include/overlay013/struct_ov13_0221FC20.h b/include/overlay013/struct_ov13_0221FC20.h
index b922269fb7..09fb2eaa4f 100644
--- a/include/overlay013/struct_ov13_0221FC20.h
+++ b/include/overlay013/struct_ov13_0221FC20.h
@@ -2,7 +2,8 @@
 #define POKEPLATINUM_STRUCT_OV13_0221FC20_H
 
 #include "struct_decls/battle_system.h"
-#include "struct_decls/struct_party_decl.h"
+
+#include "party.h"
 
 typedef struct {
     Party *unk_00;
diff --git a/include/overlay019/struct_ov19_021D4DF0.h b/include/overlay019/struct_ov19_021D4DF0.h
index 2cc9986a1e..3e222585a8 100644
--- a/include/overlay019/struct_ov19_021D4DF0.h
+++ b/include/overlay019/struct_ov19_021D4DF0.h
@@ -2,7 +2,6 @@
 #define POKEPLATINUM_STRUCT_OV19_021D4DF0_H
 
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_party_decl.h"
 
 #include "overlay019/struct_ov19_021D3CFC.h"
 #include "overlay019/struct_ov19_021D4DE4.h"
@@ -14,6 +13,8 @@
 #include "overlay019/struct_ov19_021D5D20.h"
 #include "overlay019/struct_ov19_021DF964.h"
 
+#include "party.h"
+
 typedef struct {
     const PCBoxes *unk_00;
     const Party *unk_04;
diff --git a/include/overlay088/ov88_0223B140.h b/include/overlay088/ov88_0223B140.h
index 8d10741b93..0b024586ec 100644
--- a/include/overlay088/ov88_0223B140.h
+++ b/include/overlay088/ov88_0223B140.h
@@ -2,9 +2,9 @@
 #define POKEPLATINUM_OV88_0223B140_H
 
 #include "struct_decls/struct_02095E80_decl.h"
-#include "struct_decls/struct_party_decl.h"
 
 #include "overlay_manager.h"
+#include "party.h"
 
 int ov88_0223B140(OverlayManager *param0, int *param1);
 int ov88_0223B57C(OverlayManager *param0, int *param1);
diff --git a/include/overlay088/struct_ov88_0223C370.h b/include/overlay088/struct_ov88_0223C370.h
index 9efab89b93..0f2ba199dc 100644
--- a/include/overlay088/struct_ov88_0223C370.h
+++ b/include/overlay088/struct_ov88_0223C370.h
@@ -4,13 +4,13 @@
 #include "struct_decls/pokedexdata_decl.h"
 #include "struct_decls/struct_02027F8C_decl.h"
 #include "struct_decls/struct_0202C878_decl.h"
-#include "struct_decls/struct_party_decl.h"
 
 #include "field/field_system_decl.h"
 
 #include "game_options.h"
 #include "game_records.h"
 #include "journal.h"
+#include "party.h"
 #include "pokemon.h"
 #include "savedata.h"
 #include "trainer_info.h"
diff --git a/include/overlay094/ov94_0223FB48.h b/include/overlay094/ov94_0223FB48.h
index 1e9c4c2f03..0250b62ab2 100644
--- a/include/overlay094/ov94_0223FB48.h
+++ b/include/overlay094/ov94_0223FB48.h
@@ -2,10 +2,10 @@
 #define POKEPLATINUM_OV94_0223FB48_H
 
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_party_decl.h"
 
 #include "overlay094/struct_ov94_0223FD4C_decl.h"
 
+#include "party.h"
 #include "pokemon.h"
 
 int ov94_0223FB48(UnkStruct_ov94_0223FD4C *param0, int param1);
diff --git a/include/overlay104/ov104_0222DCE0.h b/include/overlay104/ov104_0222DCE0.h
index cc88b17785..dd37bf39de 100644
--- a/include/overlay104/ov104_0222DCE0.h
+++ b/include/overlay104/ov104_0222DCE0.h
@@ -1,7 +1,6 @@
 #ifndef POKEPLATINUM_OV104_0222DCE0_H
 #define POKEPLATINUM_OV104_0222DCE0_H
 
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0204B184.h"
 #include "struct_defs/struct_0204B1E8.h"
 
@@ -11,6 +10,7 @@
 
 #include "cell_actor.h"
 #include "field_battle_data_transfer.h"
+#include "party.h"
 #include "pokemon.h"
 #include "savedata.h"
 #include "string_template.h"
diff --git a/include/overlay104/ov104_02237DD8.h b/include/overlay104/ov104_02237DD8.h
index a8ec3fe0b9..1d0a845e15 100644
--- a/include/overlay104/ov104_02237DD8.h
+++ b/include/overlay104/ov104_02237DD8.h
@@ -1,11 +1,10 @@
 #ifndef POKEPLATINUM_OV104_02237DD8_H
 #define POKEPLATINUM_OV104_02237DD8_H
 
-#include "struct_decls/struct_party_decl.h"
-
 #include "overlay104/struct_ov104_0223BFFC.h"
 #include "overlay104/struct_ov104_0223C4CC_decl.h"
 
+#include "party.h"
 #include "savedata.h"
 
 UnkStruct_ov104_0223BFFC *ov104_02237DD8(SaveData *param0, u16 param1, u8 param2, u16 param3, u16 param4, u16 param5, u16 *param6);
diff --git a/include/overlay104/ov104_0223B6F4.h b/include/overlay104/ov104_0223B6F4.h
index ef9ba602c7..87f12aa421 100644
--- a/include/overlay104/ov104_0223B6F4.h
+++ b/include/overlay104/ov104_0223B6F4.h
@@ -2,13 +2,13 @@
 #define POKEPLATINUM_OV104_0223B6F4_H
 
 #include "struct_decls/struct_0203068C_decl.h"
-#include "struct_decls/struct_party_decl.h"
 
 #include "overlay104/struct_ov104_02230BE4.h"
 #include "overlay104/struct_ov104_0223BA10.h"
 
 #include "bg_window.h"
 #include "field_battle_data_transfer.h"
+#include "party.h"
 #include "pokemon.h"
 
 void ov104_0223B760(u8 param0, int param1, u16 param2[], u8 param3);
diff --git a/include/overlay104/ov104_0223BCBC.h b/include/overlay104/ov104_0223BCBC.h
index 7c083ad2b0..e65499912e 100644
--- a/include/overlay104/ov104_0223BCBC.h
+++ b/include/overlay104/ov104_0223BCBC.h
@@ -1,12 +1,11 @@
 #ifndef POKEPLATINUM_OV104_0223BCBC_H
 #define POKEPLATINUM_OV104_0223BCBC_H
 
-#include "struct_decls/struct_party_decl.h"
-
 #include "overlay104/struct_ov104_02230BE4.h"
 #include "overlay104/struct_ov104_0223BFFC.h"
 
 #include "field_battle_data_transfer.h"
+#include "party.h"
 #include "pokemon.h"
 
 void ov104_0223BD28(u8 param0, int param1, u16 param2[], u8 param3);
diff --git a/include/overlay104/struct_ov104_02234130.h b/include/overlay104/struct_ov104_02234130.h
index dabb03a40b..d77d6aa04d 100644
--- a/include/overlay104/struct_ov104_02234130.h
+++ b/include/overlay104/struct_ov104_02234130.h
@@ -1,8 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV104_02234130_H
 #define POKEPLATINUM_STRUCT_OV104_02234130_H
 
-#include "struct_decls/struct_party_decl.h"
-
+#include "party.h"
 #include "savedata.h"
 
 typedef struct {
diff --git a/include/overlay104/struct_ov104_02235208.h b/include/overlay104/struct_ov104_02235208.h
index 4c945ed3e3..3bd4fecc0b 100644
--- a/include/overlay104/struct_ov104_02235208.h
+++ b/include/overlay104/struct_ov104_02235208.h
@@ -1,8 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV104_02235208_H
 #define POKEPLATINUM_STRUCT_OV104_02235208_H
 
-#include "struct_decls/struct_party_decl.h"
-
+#include "party.h"
 #include "savedata.h"
 
 typedef struct {
diff --git a/include/overlay104/struct_ov104_0223597C.h b/include/overlay104/struct_ov104_0223597C.h
index 09d2064e32..189be1d078 100644
--- a/include/overlay104/struct_ov104_0223597C.h
+++ b/include/overlay104/struct_ov104_0223597C.h
@@ -1,8 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV104_0223597C_H
 #define POKEPLATINUM_STRUCT_OV104_0223597C_H
 
-#include "struct_decls/struct_party_decl.h"
-
+#include "party.h"
 #include "savedata.h"
 
 typedef struct {
diff --git a/include/overlay104/struct_ov104_02238240.h b/include/overlay104/struct_ov104_02238240.h
index d64732c8d7..668d943cc2 100644
--- a/include/overlay104/struct_ov104_02238240.h
+++ b/include/overlay104/struct_ov104_02238240.h
@@ -1,8 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV104_02238240_H
 #define POKEPLATINUM_STRUCT_OV104_02238240_H
 
-#include "struct_decls/struct_party_decl.h"
-
+#include "party.h"
 #include "savedata.h"
 
 typedef struct {
diff --git a/include/overlay104/struct_ov104_0223ADA0.h b/include/overlay104/struct_ov104_0223ADA0.h
index 28543dac46..cb9f073659 100644
--- a/include/overlay104/struct_ov104_0223ADA0.h
+++ b/include/overlay104/struct_ov104_0223ADA0.h
@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_STRUCT_OV104_0223ADA0_H
 #define POKEPLATINUM_STRUCT_OV104_0223ADA0_H
 
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0202FF58.h"
 
 #include "overlay104/struct_ov104_0223A348.h"
 #include "overlay104/struct_ov104_0223A348_sub2.h"
 
+#include "party.h"
 #include "savedata.h"
 #include "sys_task_manager.h"
 
diff --git a/include/overlay104/struct_ov104_0223B5C0.h b/include/overlay104/struct_ov104_0223B5C0.h
index 7fa83a44e7..b16d8bf7c5 100644
--- a/include/overlay104/struct_ov104_0223B5C0.h
+++ b/include/overlay104/struct_ov104_0223B5C0.h
@@ -2,11 +2,11 @@
 #define POKEPLATINUM_STRUCT_OV104_0223B5C0_H
 
 #include "struct_decls/struct_02030114_decl.h"
-#include "struct_decls/struct_party_decl.h"
 
 #include "overlay104/struct_ov104_0223A348.h"
 #include "overlay104/struct_ov104_0223A348_sub2.h"
 
+#include "party.h"
 #include "pokemon.h"
 #include "savedata.h"
 
diff --git a/include/overlay104/struct_ov104_0223BA10.h b/include/overlay104/struct_ov104_0223BA10.h
index b956daceb6..dcc6a10bfd 100644
--- a/include/overlay104/struct_ov104_0223BA10.h
+++ b/include/overlay104/struct_ov104_0223BA10.h
@@ -2,11 +2,11 @@
 #define POKEPLATINUM_STRUCT_OV104_0223BA10_H
 
 #include "struct_decls/struct_020302DC_decl.h"
-#include "struct_decls/struct_party_decl.h"
 
 #include "overlay104/struct_ov104_0223A348.h"
 #include "overlay104/struct_ov104_0223A348_sub2.h"
 
+#include "party.h"
 #include "savedata.h"
 
 typedef struct {
diff --git a/include/overlay104/struct_ov104_0223BFFC.h b/include/overlay104/struct_ov104_0223BFFC.h
index af97b415e5..01969aa173 100644
--- a/include/overlay104/struct_ov104_0223BFFC.h
+++ b/include/overlay104/struct_ov104_0223BFFC.h
@@ -3,11 +3,11 @@
 
 #include "struct_decls/cell_actor_data.h"
 #include "struct_decls/struct_020304A0_decl.h"
-#include "struct_decls/struct_party_decl.h"
 
 #include "overlay104/struct_ov104_0223A348.h"
 #include "overlay104/struct_ov104_0223A348_sub2.h"
 
+#include "party.h"
 #include "savedata.h"
 
 typedef struct {
diff --git a/include/overlay107/ov107_02249604.h b/include/overlay107/ov107_02249604.h
index 6f98b1b9aa..7cde88f1ab 100644
--- a/include/overlay107/ov107_02249604.h
+++ b/include/overlay107/ov107_02249604.h
@@ -1,11 +1,10 @@
 #ifndef POKEPLATINUM_OV107_02249604_H
 #define POKEPLATINUM_OV107_02249604_H
 
-#include "struct_decls/struct_party_decl.h"
-
 #include "overlay107/struct_ov107_02249954.h"
 
 #include "cell_actor.h"
+#include "party.h"
 
 void ov107_02249604(UnkStruct_ov107_02249954 *param0, Party *param1, u8 param2);
 CellActor *ov107_022498A4(UnkStruct_ov107_02249954 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7);
diff --git a/include/overlay108/ov108_02243030.h b/include/overlay108/ov108_02243030.h
index 955d1a5315..ee9f8050df 100644
--- a/include/overlay108/ov108_02243030.h
+++ b/include/overlay108/ov108_02243030.h
@@ -1,11 +1,10 @@
 #ifndef POKEPLATINUM_OV108_02243030_H
 #define POKEPLATINUM_OV108_02243030_H
 
-#include "struct_decls/struct_party_decl.h"
-
 #include "overlay108/struct_ov108_02243030.h"
 
 #include "cell_actor.h"
+#include "party.h"
 
 void ov108_02243030(UnkStruct_ov108_02243030 *param0, Party *param1, Party *param2, u8 param3);
 CellActor *ov108_022430F0(UnkStruct_ov108_02243030 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7);
diff --git a/include/party.h b/include/party.h
index 74f2fcf93f..cbff4a189a 100644
--- a/include/party.h
+++ b/include/party.h
@@ -1,24 +1,29 @@
-#ifndef POKEPLATINUM_UNK_02079FEC_H
-#define POKEPLATINUM_UNK_02079FEC_H
+#ifndef POKEPLATINUM_PARTY_H
+#define POKEPLATINUM_PARTY_H
 
-#include "struct_decls/struct_party_decl.h"
+#include "struct_defs/pokemon.h"
 
-#include "pokemon.h"
 #include "savedata.h"
 
+typedef struct Party {
+    int capacity;
+    int currentCount;
+    Pokemon pokemon[6];
+} Party;
+
 int Party_SaveSize(void);
-Party *Party_New(u32 param0);
-void Party_Init(Party *param0);
+Party *Party_New(u32 heapID);
+void Party_Init(Party *party);
 void Party_InitWithCapacity(Party *party, int capacity);
 BOOL Party_AddPokemon(Party *party, Pokemon *pokemon);
 BOOL Party_RemovePokemonBySlotIndex(Party *party, int slot);
 int Party_GetCapacity(const Party *party);
 int Party_GetCurrentCount(const Party *party);
 Pokemon *Party_GetPokemonBySlotIndex(const Party *party, int slot);
-void sub_0207A128(Party *party, int slot, Pokemon *param2);
+void sub_0207A128(Party *party, int slot, Pokemon *pokemon);
 BOOL Party_SwapSlots(Party *party, int slotA, int slotB);
 void Party_Copy(const Party *src, Party *dest);
 BOOL Party_HasSpecies(const Party *party, int species);
-Party *Party_GetFromSavedata(SaveData *party);
+Party *Party_GetFromSavedata(SaveData *saveData);
 
-#endif // POKEPLATINUM_UNK_02079FEC_H
+#endif // POKEPLATINUM_PARTY_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 7a7583b6c8..a5b830001b 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -11,7 +11,6 @@
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02078B40_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/archived_sprite.h"
 #include "struct_defs/chatot_cry.h"
 #include "struct_defs/pokemon.h"
@@ -21,6 +20,7 @@
 
 #include "narc.h"
 #include "palette.h"
+#include "party.h"
 #include "string.h"
 #include "trainer_info.h"
 
diff --git a/include/struct_decls/struct_party_decl.h b/include/struct_decls/struct_party_decl.h
deleted file mode 100644
index 9d38ffaba0..0000000000
--- a/include/struct_decls/struct_party_decl.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef POKEPLATINUM_STRUCT_PARTY_DECL_H
-#define POKEPLATINUM_STRUCT_PARTY_DECL_H
-
-typedef struct Party Party;
-
-#endif // POKEPLATINUM_STRUCT_02079FF4_DECL_H
diff --git a/include/struct_defs/battle_system.h b/include/struct_defs/battle_system.h
index 2fd126e640..1eec5b932f 100644
--- a/include/struct_defs/battle_system.h
+++ b/include/struct_defs/battle_system.h
@@ -15,7 +15,6 @@
 #include "struct_decls/struct_02027F8C_decl.h"
 #include "struct_decls/struct_0206D140_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/chatot_cry.h"
 #include "struct_defs/struct_0207C690.h"
 #include "struct_defs/trainer_data.h"
@@ -35,6 +34,7 @@
 #include "game_options.h"
 #include "message.h"
 #include "palette.h"
+#include "party.h"
 #include "poketch.h"
 #include "strbuf.h"
 #include "string_template.h"
diff --git a/include/struct_defs/struct_0203D9B8.h b/include/struct_defs/struct_0203D9B8.h
index 420e345091..6ded9dc9c6 100644
--- a/include/struct_defs/struct_0203D9B8.h
+++ b/include/struct_defs/struct_0203D9B8.h
@@ -1,11 +1,11 @@
 #ifndef POKEPLATINUM_STRUCT_0203D9B8_H
 #define POKEPLATINUM_STRUCT_0203D9B8_H
 
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_020989DC.h"
 
 #include "bag.h"
 #include "game_options.h"
+#include "party.h"
 #include "poffin.h"
 #include "trainer_info.h"
 
diff --git a/include/struct_defs/struct_0203E0FC.h b/include/struct_defs/struct_0203E0FC.h
index 10299706ea..6322e40954 100644
--- a/include/struct_defs/struct_0203E0FC.h
+++ b/include/struct_defs/struct_0203E0FC.h
@@ -6,12 +6,12 @@
 #include "struct_decls/struct_0202C878_decl.h"
 #include "struct_decls/struct_0202DA40_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_party_decl.h"
 
 #include "bag.h"
 #include "game_options.h"
 #include "game_records.h"
 #include "journal.h"
+#include "party.h"
 #include "savedata.h"
 #include "system_data.h"
 #include "trainer_info.h"
diff --git a/include/struct_defs/struct_0203E234.h b/include/struct_defs/struct_0203E234.h
index 619266185d..087ffc130e 100644
--- a/include/struct_defs/struct_0203E234.h
+++ b/include/struct_defs/struct_0203E234.h
@@ -1,8 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_0203E234_H
 #define POKEPLATINUM_STRUCT_0203E234_H
 
-#include "struct_decls/struct_party_decl.h"
-
+#include "party.h"
 #include "play_time.h"
 #include "trainer_info.h"
 
diff --git a/include/struct_defs/struct_0205964C.h b/include/struct_defs/struct_0205964C.h
index af8caae9fc..d71f205970 100644
--- a/include/struct_defs/struct_0205964C.h
+++ b/include/struct_defs/struct_0205964C.h
@@ -3,12 +3,12 @@
 
 #include <nitro/math.h>
 
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_02072014.h"
 
 #include "field/field_system_decl.h"
 #include "functypes/funcptr_020598EC.h"
 
+#include "party.h"
 #include "sys_task_manager.h"
 
 #endif // POKEPLATINUM_STRUCT_0205964C_H
diff --git a/include/struct_defs/struct_0207AE68_t.h b/include/struct_defs/struct_0207AE68_t.h
index ab24e5aa49..291665e4e6 100644
--- a/include/struct_defs/struct_0207AE68_t.h
+++ b/include/struct_defs/struct_0207AE68_t.h
@@ -5,7 +5,6 @@
 #include "struct_decls/pokemon_animation_sys_decl.h"
 #include "struct_decls/sprite_decl.h"
 #include "struct_decls/struct_02007768_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0207C690.h"
 #include "struct_defs/struct_0207C8C4.h"
 
@@ -19,6 +18,7 @@
 #include "narc.h"
 #include "overlay_manager.h"
 #include "palette.h"
+#include "party.h"
 #include "pokemon.h"
 #include "poketch.h"
 #include "strbuf.h"
diff --git a/include/struct_defs/struct_02095C48.h b/include/struct_defs/struct_02095C48.h
index 3cc84dec38..dd41594a93 100644
--- a/include/struct_defs/struct_02095C48.h
+++ b/include/struct_defs/struct_02095C48.h
@@ -2,12 +2,12 @@
 #define POKEPLATINUM_STRUCT_02095C48_H
 
 #include "struct_decls/struct_0202A750_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_02094A58.h"
 #include "struct_defs/struct_02095C48_sub1.h"
 #include "struct_defs/struct_02095C60.h"
 
 #include "game_options.h"
+#include "party.h"
 #include "pokemon.h"
 #include "savedata.h"
 #include "sys_task_manager.h"
diff --git a/include/struct_defs/struct_02095E80_t.h b/include/struct_defs/struct_02095E80_t.h
index 4f5993671e..896d47fff0 100644
--- a/include/struct_defs/struct_02095E80_t.h
+++ b/include/struct_defs/struct_02095E80_t.h
@@ -7,7 +7,6 @@
 #include "struct_decls/struct_02027F8C_decl.h"
 #include "struct_decls/struct_0202B370_decl.h"
 #include "struct_decls/struct_02095E80_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/archived_sprite.h"
 #include "struct_defs/chatot_cry.h"
 #include "struct_defs/struct_0200C738.h"
@@ -25,6 +24,7 @@
 #include "menu.h"
 #include "message.h"
 #include "overlay_manager.h"
+#include "party.h"
 #include "savedata.h"
 #include "sprite_resource.h"
 #include "strbuf.h"
diff --git a/include/struct_defs/struct_02097F18.h b/include/struct_defs/struct_02097F18.h
index d71fcae2cf..72f24094ed 100644
--- a/include/struct_defs/struct_02097F18.h
+++ b/include/struct_defs/struct_02097F18.h
@@ -2,9 +2,9 @@
 #define POKEPLATINUM_STRUCT_02097F18_H
 
 #include "struct_decls/struct_0202CA1C_decl.h"
-#include "struct_decls/struct_party_decl.h"
 
 #include "game_options.h"
+#include "party.h"
 #include "pokemon.h"
 #include "savedata.h"
 
diff --git a/include/struct_defs/struct_02098C44.h b/include/struct_defs/struct_02098C44.h
index 9be1a01e26..17697df176 100644
--- a/include/struct_defs/struct_02098C44.h
+++ b/include/struct_defs/struct_02098C44.h
@@ -1,9 +1,8 @@
 #ifndef POKEPLATINUM_STRUCT_02098C44_H
 #define POKEPLATINUM_STRUCT_02098C44_H
 
-#include "struct_decls/struct_party_decl.h"
-
 #include "game_options.h"
+#include "party.h"
 
 typedef struct {
     Party *unk_00;
diff --git a/include/struct_defs/struct_party.h b/include/struct_defs/struct_party.h
deleted file mode 100644
index ef7cb32a90..0000000000
--- a/include/struct_defs/struct_party.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef POKEPLATINUM_STRUCT_PARTY_H
-#define POKEPLATINUM_STRUCT_PARTY_H
-
-#include "pokemon.h"
-
-typedef struct Party {
-    int capacity;
-    int currentCount;
-    Pokemon pokemon[6];
-} Party;
-
-#endif // POKEPLATINUM_STRUCT_PARTY_H
diff --git a/include/unk_0202DF8C.h b/include/unk_0202DF8C.h
index 251d165c8f..47f4fed532 100644
--- a/include/unk_0202DF8C.h
+++ b/include/unk_0202DF8C.h
@@ -3,11 +3,12 @@
 
 #include <nitro/rtc.h>
 
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0202DF8C.h"
 
 #include "overlay087/struct_ov87_021D1640.h"
 
+#include "party.h"
+
 int HallOfFame_SaveSize(void);
 void HallOfFame_Init(HallOfFame *param0);
 void sub_0202DFA8(HallOfFame *param0, const Party *param1, const RTCDate *param2);
diff --git a/include/unk_02054884.h b/include/unk_02054884.h
index af262b5aaf..6a8060c66d 100644
--- a/include/unk_02054884.h
+++ b/include/unk_02054884.h
@@ -1,8 +1,7 @@
 #ifndef POKEPLATINUM_UNK_02054884_H
 #define POKEPLATINUM_UNK_02054884_H
 
-#include "struct_decls/struct_party_decl.h"
-
+#include "party.h"
 #include "pokemon.h"
 #include "savedata.h"
 
diff --git a/include/unk_0207A2A8.h b/include/unk_0207A2A8.h
index 0a81399da4..a7147859db 100644
--- a/include/unk_0207A2A8.h
+++ b/include/unk_0207A2A8.h
@@ -2,9 +2,9 @@
 #define POKEPLATINUM_UNK_0207A2A8_H
 
 #include "struct_decls/struct_02098700_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0202610C.h"
 
+#include "party.h"
 #include "pokemon.h"
 
 HeightWeightData *sub_0207A2A8(int param0);
diff --git a/include/unk_0207AE68.h b/include/unk_0207AE68.h
index d1d27c7ffd..aaffc6dc10 100644
--- a/include/unk_0207AE68.h
+++ b/include/unk_0207AE68.h
@@ -3,11 +3,11 @@
 
 #include "struct_decls/pokedexdata_decl.h"
 #include "struct_decls/struct_0207AE68_decl.h"
-#include "struct_decls/struct_party_decl.h"
 
 #include "bag.h"
 #include "game_options.h"
 #include "game_records.h"
+#include "party.h"
 #include "pokemon.h"
 #include "poketch.h"
 
diff --git a/include/unk_02096420.h b/include/unk_02096420.h
index 42f43d0c6b..3e9c27de62 100644
--- a/include/unk_02096420.h
+++ b/include/unk_02096420.h
@@ -1,8 +1,7 @@
 #ifndef POKEPLATINUM_UNK_02096420_H
 #define POKEPLATINUM_UNK_02096420_H
 
-#include "struct_decls/struct_party_decl.h"
-
+#include "party.h"
 #include "pokemon.h"
 
 u8 CheckItemEffectsOnPokemon(Pokemon *param0, u16 param1, u16 param2, u32 param3);
diff --git a/src/battle/battle_display.c b/src/battle/battle_display.c
index be91e73f0c..d09ab1877f 100644
--- a/src/battle/battle_display.c
+++ b/src/battle/battle_display.c
@@ -11,7 +11,6 @@
 #include "struct_decls/struct_02007768_decl.h"
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/archived_sprite.h"
 #include "struct_defs/battle_io.h"
 #include "struct_defs/sprite_animation_frame.h"
diff --git a/src/battle/battle_io.c b/src/battle/battle_io.c
index 99d94b8c62..e0a055f2aa 100644
--- a/src/battle/battle_io.c
+++ b/src/battle/battle_io.c
@@ -8,7 +8,6 @@
 #include "consts/gender.h"
 
 #include "struct_decls/battle_system.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/battle_io.h"
 #include "struct_defs/battle_system.h"
 #include "struct_defs/struct_0207A81C.h"
diff --git a/src/battle/battle_io_command.c b/src/battle/battle_io_command.c
index 2ebe930aa6..d12d641086 100644
--- a/src/battle/battle_io_command.c
+++ b/src/battle/battle_io_command.c
@@ -8,7 +8,6 @@
 #include "struct_decls/battle_system.h"
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/archived_sprite.h"
 #include "struct_defs/battle_io.h"
 
diff --git a/src/battle/battle_lib.c b/src/battle/battle_lib.c
index 07613998d9..07adf9b76f 100644
--- a/src/battle/battle_lib.c
+++ b/src/battle/battle_lib.c
@@ -17,7 +17,6 @@
 
 #include "struct_decls/battle_system.h"
 #include "struct_decls/struct_02098700_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/fraction.h"
 
 #include "battle/battle_context.h"
diff --git a/src/battle/battle_script.c b/src/battle/battle_script.c
index e1280e70d6..a50ead2dab 100644
--- a/src/battle/battle_script.c
+++ b/src/battle/battle_script.c
@@ -18,7 +18,6 @@
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/archived_sprite.h"
 #include "struct_defs/battle_system.h"
 #include "struct_defs/fraction.h"
diff --git a/src/battle/ov16_0223DF00.c b/src/battle/ov16_0223DF00.c
index e6962917d0..3caa46a00c 100644
--- a/src/battle/ov16_0223DF00.c
+++ b/src/battle/ov16_0223DF00.c
@@ -20,7 +20,6 @@
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/battle_system.h"
 #include "struct_defs/chatot_cry.h"
 #include "struct_defs/struct_0200D0F4.h"
diff --git a/src/battle/trainer_ai/trainer_ai.c b/src/battle/trainer_ai/trainer_ai.c
index ebd48686c8..a014937a10 100644
--- a/src/battle/trainer_ai/trainer_ai.c
+++ b/src/battle/trainer_ai/trainer_ai.c
@@ -9,7 +9,6 @@
 #include "consts/abilities.h"
 
 #include "struct_decls/battle_system.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/battle_system.h"
 
 #include "battle/ai_context.h"
diff --git a/src/enc_effects.c b/src/enc_effects.c
index e04c921652..5a858cf04e 100644
--- a/src/enc_effects.c
+++ b/src/enc_effects.c
@@ -9,11 +9,10 @@
 #include "constants/trainer.h"
 #include "consts/sdat.h"
 
-#include "struct_decls/struct_party_decl.h"
-
 #include "overlay005/encounter_effect.h"
 
 #include "field_battle_data_transfer.h"
+#include "party.h"
 #include "pokemon.h"
 #include "unk_02054884.h"
 
diff --git a/src/encounter.c b/src/encounter.c
index 04512a3d33..0252e09ded 100644
--- a/src/encounter.c
+++ b/src/encounter.c
@@ -12,7 +12,6 @@
 
 #include "struct_decls/struct_0202440C_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0202610C.h"
 
 #include "field/field_system.h"
diff --git a/src/field_battle_data_transfer.c b/src/field_battle_data_transfer.c
index 456a7dd29c..3ac86fbd54 100644
--- a/src/field_battle_data_transfer.c
+++ b/src/field_battle_data_transfer.c
@@ -15,7 +15,6 @@
 
 #include "struct_decls/pokedexdata_decl.h"
 #include "struct_decls/struct_0203A790_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/chatot_cry.h"
 #include "struct_defs/struct_0202610C.h"
 #include "struct_defs/struct_0205EC34.h"
diff --git a/src/field_comm_manager.c b/src/field_comm_manager.c
index 93d65acebf..3f3e1d5320 100644
--- a/src/field_comm_manager.c
+++ b/src/field_comm_manager.c
@@ -6,7 +6,6 @@
 #include "constants/heap.h"
 
 #include "struct_decls/struct_02029894_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0205964C.h"
 #include "struct_defs/struct_02072014.h"
 
diff --git a/src/field_menu.c b/src/field_menu.c
index ff732513b7..af2af690ef 100644
--- a/src/field_menu.c
+++ b/src/field_menu.c
@@ -10,7 +10,6 @@
 #include "struct_decls/struct_0207AE68_decl.h"
 #include "struct_decls/struct_0207CB08_decl.h"
 #include "struct_decls/struct_0209747C_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/sentence.h"
 #include "struct_defs/sprite_template.h"
 #include "struct_defs/struct_0200D0F4.h"
diff --git a/src/overlay005/field_control.c b/src/overlay005/field_control.c
index b4201a296d..7aefaf0738 100644
--- a/src/overlay005/field_control.c
+++ b/src/overlay005/field_control.c
@@ -11,7 +11,6 @@
 #include "struct_decls/struct_02026310_decl.h"
 #include "struct_decls/struct_0203A790_decl.h"
 #include "struct_decls/struct_02061AB4_decl.h"
-#include "struct_decls/struct_party_decl.h"
 
 #include "field/field_system.h"
 #include "field/field_system_sub2_t.h"
diff --git a/src/overlay005/ov5_021E622C.c b/src/overlay005/ov5_021E622C.c
index a56166b5ee..a5c985ebe2 100644
--- a/src/overlay005/ov5_021E622C.c
+++ b/src/overlay005/ov5_021E622C.c
@@ -10,7 +10,6 @@
 #include "struct_decls/struct_02026218_decl.h"
 #include "struct_decls/struct_02026224_decl.h"
 #include "struct_decls/struct_02026310_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/chatot_cry.h"
 
 #include "field/field_system.h"
diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c
index d6c2b659a2..8ed602bcfd 100644
--- a/src/overlay005/ov5_021F6454.c
+++ b/src/overlay005/ov5_021F6454.c
@@ -12,7 +12,6 @@
 #include "struct_decls/struct_020308A0_decl.h"
 #include "struct_decls/struct_02061830_decl.h"
 #include "struct_decls/struct_02061AB4_decl.h"
-#include "struct_decls/struct_party_decl.h"
 
 #include "field/field_system.h"
 #include "overlay005/ov5_021EB1A0.h"
diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c
index a26d367ff3..ce36987835 100644
--- a/src/overlay006/ov6_02240C9C.c
+++ b/src/overlay006/ov6_02240C9C.c
@@ -12,7 +12,6 @@
 #include "consts/items.h"
 #include "consts/pokemon.h"
 
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0202D7B0.h"
 #include "struct_defs/struct_0206C638.h"
 
diff --git a/src/overlay006/ov6_02246034.c b/src/overlay006/ov6_02246034.c
index ea24e06f3d..f0ef53c9d4 100644
--- a/src/overlay006/ov6_02246034.c
+++ b/src/overlay006/ov6_02246034.c
@@ -5,7 +5,6 @@
 
 #include "constants/battle.h"
 
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0202D7B0.h"
 #include "struct_defs/struct_0206C638.h"
 
diff --git a/src/overlay006/ov6_02246184.c b/src/overlay006/ov6_02246184.c
index 4c3877db53..3da6d8cb60 100644
--- a/src/overlay006/ov6_02246184.c
+++ b/src/overlay006/ov6_02246184.c
@@ -3,8 +3,6 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_party_decl.h"
-
 #include "field/field_system.h"
 #include "overlay006/struct_ov6_02246204_decl.h"
 #include "overlay006/struct_ov6_02246254.h"
diff --git a/src/overlay007/ov7_0224B4E8.c b/src/overlay007/ov7_0224B4E8.c
index 497df33069..aeda57e000 100644
--- a/src/overlay007/ov7_0224B4E8.c
+++ b/src/overlay007/ov7_0224B4E8.c
@@ -4,7 +4,6 @@
 #include <string.h>
 
 #include "struct_decls/struct_02098700_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0202610C.h"
 
 #include "field/field_system.h"
diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c
index e802dee00b..f45b2a416c 100644
--- a/src/overlay010/ov10_0221F800.c
+++ b/src/overlay010/ov10_0221F800.c
@@ -9,7 +9,6 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02012744_decl.h"
 #include "struct_decls/struct_02014014_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/sprite_template.h"
 #include "struct_defs/struct_0200D0F4.h"
 #include "struct_defs/struct_020127E8.h"
diff --git a/src/overlay013/ov13_022264F4.c b/src/overlay013/ov13_022264F4.c
index 9e8070982f..54e2feb921 100644
--- a/src/overlay013/ov13_022264F4.c
+++ b/src/overlay013/ov13_022264F4.c
@@ -5,7 +5,6 @@
 
 #include "struct_decls/battle_system.h"
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_party_decl.h"
 
 #include "battle/battle_lib.h"
 #include "battle/ov16_0223DF00.h"
diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c
index b090d15fcb..7007468583 100644
--- a/src/overlay019/ov19_021D0D80.c
+++ b/src/overlay019/ov19_021D0D80.c
@@ -9,7 +9,6 @@
 #include "struct_decls/struct_02023FCC_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
 #include "struct_decls/struct_0207CB08_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/chatot_cry.h"
 #include "struct_defs/struct_02042434.h"
 #include "struct_defs/struct_0208737C.h"
diff --git a/src/overlay032/ov32_022561C0.c b/src/overlay032/ov32_022561C0.c
index b3c3c08384..1ac713f8f5 100644
--- a/src/overlay032/ov32_022561C0.c
+++ b/src/overlay032/ov32_022561C0.c
@@ -2,8 +2,6 @@
 #include <nitro/sinit.h>
 #include <string.h>
 
-#include "struct_decls/struct_party_decl.h"
-
 #include "overlay025/poketch_system.h"
 #include "overlay032/ov32_02256470.h"
 #include "overlay032/struct_ov32_02256470_1.h"
diff --git a/src/overlay033/ov33_022561C0.c b/src/overlay033/ov33_022561C0.c
index e12b6fef32..f7324b2dce 100644
--- a/src/overlay033/ov33_022561C0.c
+++ b/src/overlay033/ov33_022561C0.c
@@ -2,8 +2,6 @@
 #include <nitro/sinit.h>
 #include <string.h>
 
-#include "struct_decls/struct_party_decl.h"
-
 #include "overlay025/poketch_system.h"
 #include "overlay033/ov33_02256474.h"
 #include "overlay033/struct_ov33_02256474_1.h"
diff --git a/src/overlay044/ov44_022561C0.c b/src/overlay044/ov44_022561C0.c
index eb6a5b537c..b24f09a1ee 100644
--- a/src/overlay044/ov44_022561C0.c
+++ b/src/overlay044/ov44_022561C0.c
@@ -2,8 +2,6 @@
 #include <nitro/sinit.h>
 #include <string.h>
 
-#include "struct_decls/struct_party_decl.h"
-
 #include "overlay005/ov5_021E622C.h"
 #include "overlay025/poketch_button.h"
 #include "overlay025/poketch_system.h"
diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c
index 5ef382d7de..c9ace8e1f6 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -11,7 +11,7 @@
 #include "struct_decls/struct_0202B370_decl.h"
 #include "struct_decls/struct_0202C878_decl.h"
 #include "struct_decls/struct_0203068C_decl.h"
-#include "struct_decls/struct_party_decl.h"
+#include "party.h"
 #include "struct_defs/struct_020127E8.h"
 #include "struct_defs/struct_0207DFAC.h"
 #include "struct_defs/struct_0207E060.h"
diff --git a/src/overlay066/ov66_0222DDF0.c b/src/overlay066/ov66_0222DDF0.c
index 5a4968cd3c..dd962fdb20 100644
--- a/src/overlay066/ov66_0222DDF0.c
+++ b/src/overlay066/ov66_0222DDF0.c
@@ -14,7 +14,6 @@
 #include "struct_decls/struct_0202C878_decl.h"
 #include "struct_decls/struct_02030EC4_decl.h"
 #include "struct_decls/struct_0207E060_decl.h"
-#include "struct_decls/struct_party_decl.h"
 
 #include "overlay066/ov66_02231428.h"
 #include "overlay066/ov66_0223177C.h"
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index 08b0d71443..4e53136122 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -8,7 +8,6 @@
 
 #include "struct_decls/struct_0202B370_decl.h"
 #include "struct_decls/struct_02095E80_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/archived_sprite.h"
 #include "struct_defs/chatot_cry.h"
 #include "struct_defs/struct_02027F8C.h"
diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c
index b8c806c881..c11371cdf5 100644
--- a/src/overlay094/ov94_0223FB48.c
+++ b/src/overlay094/ov94_0223FB48.c
@@ -8,7 +8,6 @@
 #include "consts/species.h"
 
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_party_decl.h"
 
 #include "overlay094/ov94_0223BCB0.h"
 #include "overlay094/ov94_022414B8.h"
diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c
index db43e60f73..7d613e6501 100644
--- a/src/overlay104/ov104_0222DCE0.c
+++ b/src/overlay104/ov104_0222DCE0.c
@@ -4,7 +4,6 @@
 #include <string.h>
 
 #include "struct_decls/struct_0202C878_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/sentence.h"
 #include "struct_defs/struct_0204B184.h"
 #include "struct_defs/struct_0204B1E8.h"
diff --git a/src/overlay104/ov104_0222ECE8.c b/src/overlay104/ov104_0222ECE8.c
index 44904a1651..2d652c3561 100644
--- a/src/overlay104/ov104_0222ECE8.c
+++ b/src/overlay104/ov104_0222ECE8.c
@@ -5,7 +5,6 @@
 
 #include "struct_decls/struct_0203041C_decl.h"
 #include "struct_decls/struct_020305B8_decl.h"
-#include "struct_decls/struct_party_decl.h"
 
 #include "overlay104/ov104_0223A7F4.h"
 #include "overlay104/ov104_0223B6F4.h"
diff --git a/src/overlay104/ov104_0222FBE4.c b/src/overlay104/ov104_0222FBE4.c
index 3742708977..80328c3338 100644
--- a/src/overlay104/ov104_0222FBE4.c
+++ b/src/overlay104/ov104_0222FBE4.c
@@ -10,7 +10,6 @@
 #include "struct_decls/struct_02014014_decl.h"
 #include "struct_decls/struct_0202440C_decl.h"
 #include "struct_decls/struct_0202B370_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0200D0F4.h"
 
 #include "overlay004/ov4_021D0D80.h"
diff --git a/src/overlay104/ov104_02234838.c b/src/overlay104/ov104_02234838.c
index 277ad5939e..840b6e240a 100644
--- a/src/overlay104/ov104_02234838.c
+++ b/src/overlay104/ov104_02234838.c
@@ -2,7 +2,6 @@
 #include <string.h>
 
 #include "struct_decls/struct_0202440C_decl.h"
-#include "struct_decls/struct_party_decl.h"
 
 #include "overlay104/ov104_0222DCE0.h"
 #include "overlay104/ov104_0222E930.h"
diff --git a/src/overlay104/ov104_022358E8.c b/src/overlay104/ov104_022358E8.c
index d5fab4229f..fdffd485c0 100644
--- a/src/overlay104/ov104_022358E8.c
+++ b/src/overlay104/ov104_022358E8.c
@@ -1,8 +1,6 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_party_decl.h"
-
 #include "overlay104/ov104_0222DCE0.h"
 #include "overlay104/ov104_0222E63C.h"
 #include "overlay104/ov104_0222E930.h"
diff --git a/src/overlay104/ov104_022361B4.c b/src/overlay104/ov104_022361B4.c
index 348ea74880..7c0ec86c3d 100644
--- a/src/overlay104/ov104_022361B4.c
+++ b/src/overlay104/ov104_022361B4.c
@@ -8,7 +8,6 @@
 #include "struct_decls/struct_020302DC_decl.h"
 #include "struct_decls/struct_0203041C_decl.h"
 #include "struct_decls/struct_0203068C_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0204B184.h"
 
 #include "overlay104/ov104_0222DCE0.h"
diff --git a/src/overlay104/ov104_02237378.c b/src/overlay104/ov104_02237378.c
index 54883932cb..18cf58605d 100644
--- a/src/overlay104/ov104_02237378.c
+++ b/src/overlay104/ov104_02237378.c
@@ -2,7 +2,6 @@
 #include <string.h>
 
 #include "struct_decls/struct_02014014_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0200D0F4.h"
 
 #include "overlay063/ov63_0222CCE4.h"
diff --git a/src/overlay104/ov104_02237DD8.c b/src/overlay104/ov104_02237DD8.c
index 0550e42b80..b17d3184a7 100644
--- a/src/overlay104/ov104_02237DD8.c
+++ b/src/overlay104/ov104_02237DD8.c
@@ -8,7 +8,6 @@
 
 #include "struct_decls/struct_020304A0_decl.h"
 #include "struct_decls/struct_020305B8_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0200D0F4.h"
 #include "struct_defs/struct_0204B184.h"
 
diff --git a/src/overlay104/ov104_0223A0C4.c b/src/overlay104/ov104_0223A0C4.c
index ff9461adb0..6a934255e3 100644
--- a/src/overlay104/ov104_0223A0C4.c
+++ b/src/overlay104/ov104_0223A0C4.c
@@ -5,7 +5,6 @@
 
 #include "consts/battle.h"
 
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0202D764.h"
 #include "struct_defs/struct_0204AFC4.h"
 #include "struct_defs/struct_0204B184.h"
diff --git a/src/overlay104/ov104_0223AF58.c b/src/overlay104/ov104_0223AF58.c
index d1ac9a07f3..a4d475c54f 100644
--- a/src/overlay104/ov104_0223AF58.c
+++ b/src/overlay104/ov104_0223AF58.c
@@ -5,7 +5,6 @@
 
 #include "consts/battle.h"
 
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0204B184.h"
 
 #include "overlay104/ov104_0222DCE0.h"
diff --git a/src/overlay104/ov104_0223B6F4.c b/src/overlay104/ov104_0223B6F4.c
index ab60517ac8..4e0adda850 100644
--- a/src/overlay104/ov104_0223B6F4.c
+++ b/src/overlay104/ov104_0223B6F4.c
@@ -6,7 +6,6 @@
 #include "consts/battle.h"
 
 #include "struct_decls/struct_0203068C_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0204B184.h"
 
 #include "overlay104/ov104_0222DCE0.h"
diff --git a/src/overlay104/ov104_0223BCBC.c b/src/overlay104/ov104_0223BCBC.c
index 50dcca5677..7315b09d66 100644
--- a/src/overlay104/ov104_0223BCBC.c
+++ b/src/overlay104/ov104_0223BCBC.c
@@ -3,7 +3,6 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0204B184.h"
 
 #include "overlay104/ov104_0222DCE0.h"
diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c
index 8cd1432f1e..42355bc9c0 100644
--- a/src/overlay105/ov105_02241AE0.c
+++ b/src/overlay105/ov105_02241AE0.c
@@ -5,7 +5,6 @@
 
 #include "struct_decls/sprite_decl.h"
 #include "struct_decls/struct_02007768_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0207C690.h"
 #include "struct_defs/struct_02099F80.h"
 
diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c
index 2ce0451d5f..411365e7f5 100644
--- a/src/overlay106/ov106_02241AE0.c
+++ b/src/overlay106/ov106_02241AE0.c
@@ -4,7 +4,6 @@
 #include <string.h>
 
 #include "struct_decls/struct_0200C440_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_02099F80.h"
 
 #include "applications/pokemon_summary_screen/main.h"
diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c
index ce0b81f282..3b899ad2b0 100644
--- a/src/overlay107/ov107_02241AE0.c
+++ b/src/overlay107/ov107_02241AE0.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_020302DC_decl.h"
 #include "struct_decls/struct_0203041C_decl.h"
 #include "struct_decls/struct_0203068C_decl.h"
-#include "struct_decls/struct_party_decl.h"
+#include "party.h"
 #include "struct_defs/struct_02099F80.h"
 
 #include "overlay104/ov104_0222DCE0.h"
diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c
index e80d9845e6..edd75537fc 100644
--- a/src/overlay107/ov107_02245EB0.c
+++ b/src/overlay107/ov107_02245EB0.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_020302DC_decl.h"
 #include "struct_decls/struct_0203041C_decl.h"
 #include "struct_decls/struct_0203068C_decl.h"
-#include "struct_decls/struct_party_decl.h"
+#include "party.h"
 #include "struct_defs/struct_02099F80.h"
 
 #include "overlay104/ov104_0222DCE0.h"
diff --git a/src/overlay107/ov107_02249604.c b/src/overlay107/ov107_02249604.c
index e1d3140de3..6bc0825fc0 100644
--- a/src/overlay107/ov107_02249604.c
+++ b/src/overlay107/ov107_02249604.c
@@ -3,8 +3,6 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_party_decl.h"
-
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay107/struct_ov107_02249954.h"
 
diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c
index 6e39828ee0..786512407d 100644
--- a/src/overlay108/ov108_02241AE0.c
+++ b/src/overlay108/ov108_02241AE0.c
@@ -6,7 +6,6 @@
 #include "struct_decls/struct_020304A0_decl.h"
 #include "struct_decls/struct_020305B8_decl.h"
 #include "struct_decls/struct_0203068C_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_02099F80.h"
 
 #include "overlay104/ov104_0223BCBC.h"
diff --git a/src/overlay108/ov108_02243030.c b/src/overlay108/ov108_02243030.c
index da8a52213a..016230c167 100644
--- a/src/overlay108/ov108_02243030.c
+++ b/src/overlay108/ov108_02243030.c
@@ -3,8 +3,6 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_party_decl.h"
-
 #include "overlay022/struct_ov22_022559F8.h"
 #include "overlay108/struct_ov108_02243030.h"
 
diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c
index 461335dcbf..1e9ee0f719 100644
--- a/src/overlay109/ov109_021D0D80.c
+++ b/src/overlay109/ov109_021D0D80.c
@@ -8,7 +8,6 @@
 
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/sprite_template.h"
 #include "struct_defs/struct_0200D0F4.h"
 #include "struct_defs/struct_02073838.h"
diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c
index 75cb7705a4..48d463caa7 100644
--- a/src/overlay113/ov113_0225C700.c
+++ b/src/overlay113/ov113_0225C700.c
@@ -11,7 +11,6 @@
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02012744_decl.h"
 #include "struct_decls/struct_02015920_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/sprite_manager_allocation.h"
 #include "struct_defs/sprite_template.h"
 #include "struct_defs/struct_0200D0F4.h"
diff --git a/src/party.c b/src/party.c
index e5037b0f15..980d1e9ac8 100644
--- a/src/party.c
+++ b/src/party.c
@@ -3,8 +3,6 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_defs/struct_party.h"
-
 #include "heap.h"
 #include "pokemon.h"
 #include "savedata.h"
@@ -21,32 +19,30 @@ int Party_SaveSize(void)
     return sizeof(Party);
 }
 
-Party *Party_New(u32 param0)
+Party *Party_New(u32 heapID)
 {
-    Party *v0;
-
-    v0 = Heap_AllocFromHeap(param0, sizeof(Party));
-    Party_Init(v0);
+    Party *party = Heap_AllocFromHeap(heapID, sizeof(Party));
+    Party_Init(party);
 
-    return v0;
+    return party;
 }
 
-void Party_Init(Party *param0)
+void Party_Init(Party *party)
 {
-    Party_InitWithCapacity(param0, 6);
+    Party_InitWithCapacity(party, MAX_PARTY_SIZE);
 }
 
 void Party_InitWithCapacity(Party *party, int capacity)
 {
     int i;
 
-    GF_ASSERT(capacity <= 6);
+    GF_ASSERT(capacity <= MAX_PARTY_SIZE);
     memset(party, 0, sizeof(Party));
 
     party->currentCount = 0;
     party->capacity = capacity;
 
-    for (i = 0; i < 6; i++) {
+    for (i = 0; i < MAX_PARTY_SIZE; i++) {
         Pokemon_Init(&party->pokemon[i]);
     }
 }
@@ -96,14 +92,14 @@ Pokemon *Party_GetPokemonBySlotIndex(const Party *party, int slot)
     return (Pokemon *)&party->pokemon[slot];
 }
 
-void sub_0207A128(Party *party, int slot, Pokemon *param2)
+void sub_0207A128(Party *party, int slot, Pokemon *pokemon)
 {
     int v0;
 
     PARTY_ASSERT_SLOT(party, slot);
 
-    v0 = Pokemon_GetValue(&(party->pokemon[slot]), MON_DATA_SPECIES_EXISTS, NULL) - Pokemon_GetValue(param2, MON_DATA_SPECIES_EXISTS, NULL);
-    party->pokemon[slot] = *param2;
+    v0 = Pokemon_GetValue(&(party->pokemon[slot]), MON_DATA_SPECIES_EXISTS, NULL) - Pokemon_GetValue(pokemon, MON_DATA_SPECIES_EXISTS, NULL);
+    party->pokemon[slot] = *pokemon;
     party->currentCount += v0;
 }
 
@@ -143,10 +139,7 @@ BOOL Party_HasSpecies(const Party *party, int species)
     return i != party->currentCount;
 }
 
-Party *Party_GetFromSavedata(SaveData *param0)
+Party *Party_GetFromSavedata(SaveData *saveData)
 {
-    Party *v0;
-
-    v0 = (Party *)SaveData_SaveTable(param0, 2);
-    return v0;
+    return SaveData_SaveTable(saveData, SAVE_TABLE_ENTRY_PARTY);
 }
diff --git a/src/pokemon.c b/src/pokemon.c
index 7b3319a368..2e7ac8fce2 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -18,7 +18,6 @@
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02023790_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/archived_poke_sprite_data.h"
 #include "struct_defs/archived_sprite.h"
 #include "struct_defs/chatot_cry.h"
diff --git a/src/scrcmd.c b/src/scrcmd.c
index fa616dad2f..776e4429cd 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -30,7 +30,6 @@
 #include "struct_decls/struct_02061830_decl.h"
 #include "struct_decls/struct_02061AB4_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/choose_starter_data.h"
 #include "struct_defs/struct_0202D7B0.h"
 #include "struct_defs/struct_0202DF8C.h"
diff --git a/src/unk_02028124.c b/src/unk_02028124.c
index d98bf63d2b..804e50bdf9 100644
--- a/src/unk_02028124.c
+++ b/src/unk_02028124.c
@@ -3,7 +3,6 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/sentence.h"
 #include "struct_defs/struct_0202818C.h"
 #include "struct_defs/struct_02028430.h"
diff --git a/src/unk_0202DF8C.c b/src/unk_0202DF8C.c
index a9237af2a3..070c9075c0 100644
--- a/src/unk_0202DF8C.c
+++ b/src/unk_0202DF8C.c
@@ -3,7 +3,6 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0202DF8C.h"
 #include "struct_defs/struct_0202DFA8.h"
 #include "struct_defs/struct_0202E1F4.h"
diff --git a/src/unk_0202F1D4.c b/src/unk_0202F1D4.c
index 4484a1413e..36e4cd686d 100644
--- a/src/unk_0202F1D4.c
+++ b/src/unk_0202F1D4.c
@@ -14,7 +14,6 @@
 #include "struct_defs/struct_0202FD30.h"
 #include "struct_defs/struct_02030A80.h"
 #include "struct_defs/struct_02078B40.h"
-#include "struct_defs/struct_party.h"
 
 #include "savedata/save_table.h"
 
diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c
index e7ba9e3bf7..c2f3395203 100644
--- a/src/unk_0203D1B8.c
+++ b/src/unk_0203D1B8.c
@@ -11,7 +11,6 @@
 #include "struct_decls/struct_0202C834_decl.h"
 #include "struct_decls/struct_0207AE68_decl.h"
 #include "struct_decls/struct_0209747C_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/choose_starter_data.h"
 #include "struct_defs/struct_0202DF8C.h"
 #include "struct_defs/struct_0203D8AC.h"
diff --git a/src/unk_02048DD8.c b/src/unk_02048DD8.c
index 008b1cc26b..951c3e5803 100644
--- a/src/unk_02048DD8.c
+++ b/src/unk_02048DD8.c
@@ -7,7 +7,6 @@
 
 #include "struct_decls/struct_0202440C_decl.h"
 #include "struct_decls/struct_0202A750_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0202E7D8.h"
 #include "struct_defs/struct_0202E7E4.h"
 #include "struct_defs/struct_0202E7F0.h"
diff --git a/src/unk_02049D08.c b/src/unk_02049D08.c
index 4e9ba53ceb..8179efa333 100644
--- a/src/unk_02049D08.c
+++ b/src/unk_02049D08.c
@@ -10,7 +10,6 @@
 #include "struct_decls/struct_0202D750_decl.h"
 #include "struct_decls/struct_0202D764_decl.h"
 #include "struct_decls/struct_0203068C_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0204AFC4.h"
 #include "struct_defs/struct_02098C44.h"
 
diff --git a/src/unk_0204AEE8.c b/src/unk_0204AEE8.c
index 5cab1de639..66cdf238cd 100644
--- a/src/unk_0204AEE8.c
+++ b/src/unk_0204AEE8.c
@@ -4,7 +4,6 @@
 #include <string.h>
 
 #include "struct_decls/pokedexdata_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0204AFC4.h"
 #include "struct_defs/struct_0204B184.h"
 #include "struct_defs/struct_0204B1E8.h"
diff --git a/src/unk_0204B830.c b/src/unk_0204B830.c
index 9164d4728f..d2555ba146 100644
--- a/src/unk_0204B830.c
+++ b/src/unk_0204B830.c
@@ -6,7 +6,6 @@
 #include "constants/heap.h"
 #include "constants/species.h"
 
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0202610C.h"
 #include "struct_defs/union_0204C4D0.h"
 
diff --git a/src/unk_0204CA84.c b/src/unk_0204CA84.c
index 6c9df5ba01..3c6a1db5e9 100644
--- a/src/unk_0204CA84.c
+++ b/src/unk_0204CA84.c
@@ -4,7 +4,6 @@
 #include <string.h>
 
 #include "struct_decls/struct_02026310_decl.h"
-#include "struct_decls/struct_party_decl.h"
 
 #include "field/field_system.h"
 #include "overlay005/ov5_021E622C.h"
diff --git a/src/unk_0204CFFC.c b/src/unk_0204CFFC.c
index f5e859a434..9791754a5a 100644
--- a/src/unk_0204CFFC.c
+++ b/src/unk_0204CFFC.c
@@ -6,7 +6,6 @@
 #include "constants/heap.h"
 
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_party_decl.h"
 
 #include "field/field_system.h"
 #include "overlay005/ov5_021E622C.h"
diff --git a/src/unk_0204F13C.c b/src/unk_0204F13C.c
index c8129870f3..41edb8738b 100644
--- a/src/unk_0204F13C.c
+++ b/src/unk_0204F13C.c
@@ -10,7 +10,6 @@
 #include "struct_decls/struct_0203026C_decl.h"
 #include "struct_decls/struct_0203068C_decl.h"
 #include "struct_decls/struct_020308A0_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0204AFC4.h"
 #include "struct_defs/struct_0204F3D0.h"
 #include "struct_defs/struct_02098C44.h"
diff --git a/src/unk_02052C6C.c b/src/unk_02052C6C.c
index d8212f9d4d..a6f34fc573 100644
--- a/src/unk_02052C6C.c
+++ b/src/unk_02052C6C.c
@@ -5,7 +5,6 @@
 
 #include "consts/game_records.h"
 
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0202DF8C.h"
 #include "struct_defs/struct_0203E234.h"
 #include "struct_defs/struct_0203E274.h"
diff --git a/src/unk_02054884.c b/src/unk_02054884.c
index 355caf4d9e..0c55de2847 100644
--- a/src/unk_02054884.c
+++ b/src/unk_02054884.c
@@ -8,8 +8,6 @@
 #include "constants/heap.h"
 #include "constants/items.h"
 
-#include "struct_decls/struct_party_decl.h"
-
 #include "overlay005/ov5_021E622C.h"
 
 #include "heap.h"
diff --git a/src/unk_020559DC.c b/src/unk_020559DC.c
index 67e3ba8461..21d8a43c77 100644
--- a/src/unk_020559DC.c
+++ b/src/unk_020559DC.c
@@ -4,7 +4,6 @@
 #include <string.h>
 
 #include "struct_decls/struct_0202440C_decl.h"
-#include "struct_decls/struct_party_decl.h"
 
 #include "field/field_system.h"
 #include "savedata/save_table.h"
diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c
index ffa4caf3d8..8716cb1b1a 100644
--- a/src/unk_0205A0D8.c
+++ b/src/unk_0205A0D8.c
@@ -3,7 +3,6 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_02072014.h"
 #include "struct_defs/struct_02098C44.h"
 
diff --git a/src/unk_0205DFC4.c b/src/unk_0205DFC4.c
index 7c4bf8b375..c1dd328f3f 100644
--- a/src/unk_0205DFC4.c
+++ b/src/unk_0205DFC4.c
@@ -4,7 +4,6 @@
 #include <string.h>
 
 #include "struct_decls/struct_02061AB4_decl.h"
-#include "struct_decls/struct_party_decl.h"
 
 #include "field/field_system.h"
 #include "overlay004/ov4_021D0D80.h"
diff --git a/src/unk_0206CCB0.c b/src/unk_0206CCB0.c
index 75b9b21c9b..3ee2c00748 100644
--- a/src/unk_0206CCB0.c
+++ b/src/unk_0206CCB0.c
@@ -11,7 +11,6 @@
 #include "struct_decls/struct_0202440C_decl.h"
 #include "struct_decls/struct_02029C68_decl.h"
 #include "struct_decls/struct_0202A750_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0202D7B0.h"
 #include "struct_defs/struct_0202E7D8.h"
 #include "struct_defs/struct_0202E7E4.h"
diff --git a/src/unk_020722AC.c b/src/unk_020722AC.c
index 2d9384263d..99824e3faf 100644
--- a/src/unk_020722AC.c
+++ b/src/unk_020722AC.c
@@ -2,7 +2,6 @@
 #include <string.h>
 
 #include "struct_decls/struct_02028430_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0202818C.h"
 #include "struct_defs/struct_0206A844.h"
 #include "struct_defs/struct_02097728.h"
diff --git a/src/unk_0207A2A8.c b/src/unk_0207A2A8.c
index 8f14a9dec4..14d0361a55 100644
--- a/src/unk_0207A2A8.c
+++ b/src/unk_0207A2A8.c
@@ -4,7 +4,6 @@
 #include <string.h>
 
 #include "struct_decls/struct_02098700_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0202610C.h"
 
 #include "party.h"
diff --git a/src/unk_0207A6DC.c b/src/unk_0207A6DC.c
index 13829af300..e17a2dd9bd 100644
--- a/src/unk_0207A6DC.c
+++ b/src/unk_0207A6DC.c
@@ -6,7 +6,6 @@
 #include "constants/battle.h"
 
 #include "struct_decls/battle_system.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/chatot_cry.h"
 #include "struct_defs/struct_02027F8C.h"
 #include "struct_defs/struct_02039A58.h"
diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c
index b9d057a4d9..bc1081d861 100644
--- a/src/unk_0207AE68.c
+++ b/src/unk_0207AE68.c
@@ -9,7 +9,6 @@
 
 #include "struct_decls/pokedexdata_decl.h"
 #include "struct_decls/struct_0207AE68_decl.h"
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/archived_sprite.h"
 #include "struct_defs/sprite_animation_frame.h"
 #include "struct_defs/struct_0202818C.h"
diff --git a/src/unk_02096420.c b/src/unk_02096420.c
index 8873197047..1f43061796 100644
--- a/src/unk_02096420.c
+++ b/src/unk_02096420.c
@@ -5,8 +5,6 @@
 
 #include "consts/species.h"
 
-#include "struct_decls/struct_party_decl.h"
-
 #include "heap.h"
 #include "item.h"
 #include "move_table.h"
diff --git a/src/unk_0209BA80.c b/src/unk_0209BA80.c
index e5807fefaf..87e4cbab08 100644
--- a/src/unk_0209BA80.c
+++ b/src/unk_0209BA80.c
@@ -3,7 +3,6 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_02039A58.h"
 #include "struct_defs/struct_0204AFC4.h"
 #include "struct_defs/struct_0209BBA4.h"