diff --git a/src/melee/db/db_2253.h b/src/melee/db/db_2253.h
index 77f1e82c22..f0138cb94e 100644
--- a/src/melee/db/db_2253.h
+++ b/src/melee/db/db_2253.h
@@ -5,7 +5,6 @@
 #include "ft/forward.h"
 #include "it/forward.h"
 
-/* 225374 */ UNK_RET db_80225374(UNK_PARAMS);
 /* 225374 */ void db_80225374(void);
 /* 2254B8 */ UNK_RET db_802254B8(UNK_PARAMS);
 /* 22558C */ UNK_RET fn_8022558C(UNK_PARAMS);
@@ -26,9 +25,7 @@
 /* 225C8C */ UNK_RET fn_80225C8C(UNK_PARAMS);
 /* 225CD4 */ UNK_RET fn_80225CD4(UNK_PARAMS);
 /* 225D1C */ UNK_RET db_80225D1C(UNK_PARAMS);
-/* 225D2C */ UNK_RET db_80225D2C(UNK_PARAMS);
 /* 225D2C */ void db_80225D2C(void);
-/* 225D40 */ UNK_RET db_80225D40(UNK_PARAMS);
 /* 225D40 */ void db_80225D40(void);
 /* 225D54 */ UNK_T db_80225D54(HSD_ObjAllocUnk4*);
 /* 225D64 */ void db_80225D64(Item_GObj* item, Fighter_GObj* owner);
@@ -72,16 +69,13 @@
 /* 2287C4 */ UNK_RET fn_802287C4(UNK_PARAMS);
 /* 2287D8 */ UNK_RET fn_802287D8(UNK_PARAMS);
 /* 228820 */ UNK_RET fn_80228820(UNK_PARAMS);
-/* 22886C */ UNK_RET db_8022886C(UNK_PARAMS);
 /* 22886C */ void db_8022886C(void);
 /* 22887C */ UNK_RET db_8022887C(UNK_PARAMS);
 /* 22892C */ UNK_RET db_8022892C(UNK_PARAMS);
 /* 2289F8 */ UNK_RET fn_802289F8(UNK_PARAMS);
-/* 228A64 */ UNK_RET db_80228A64(UNK_PARAMS);
 /* 228A64 */ void db_80228A64(void);
 /* 228AB4 */ UNK_RET fn_80228AB4(UNK_PARAMS);
 /* 228B28 */ UNK_RET fn_80228B28(UNK_PARAMS);
-/* 228C4C */ UNK_RET db_80228C4C(UNK_PARAMS);
 /* 228C4C */ void db_80228C4C(void);
 /* 228CF4 */ UNK_RET fn_80228CF4(UNK_PARAMS);
 /* 228D18 */ UNK_RET fn_80228D18(UNK_PARAMS);
diff --git a/src/melee/gm/gmmain_lib.h b/src/melee/gm/gmmain_lib.h
index a4844672e3..c3228aa198 100644
--- a/src/melee/gm/gmmain_lib.h
+++ b/src/melee/gm/gmmain_lib.h
@@ -158,10 +158,8 @@
 /* 15F600 */ UNK_RET gmMainLib_8015F600(UNK_PARAMS);
 /* 15FA34 */ UNK_RET gmMainLib_8015FA34(UNK_PARAMS);
 /* 15FB68 */ UNK_RET gmMainLib_8015FB68(UNK_PARAMS);
-/* 15FBA4 */ UNK_RET gmMainLib_8015FBA4(UNK_PARAMS);
 /* 15FBA4 */ void gmMainLib_8015FBA4(void);
 /* 15FC74 */ UNK_RET gmMainLib_8015FC74(UNK_PARAMS);
-/* 15FCC0 */ UNK_RET gmMainLib_8015FCC0(UNK_PARAMS);
 /* 15FCC0 */ void gmMainLib_8015FCC0(void);
 /* 4D3EE0 */ extern struct gmm_x0* gmMainLib_804D3EE0;
 
diff --git a/src/melee/gr/ground.c b/src/melee/gr/ground.c
index f463ef8025..dc7bd328ef 100644
--- a/src/melee/gr/ground.c
+++ b/src/melee/gr/ground.c
@@ -30,6 +30,7 @@
 #include "mp/mpcoll.h"
 #include "mp/mplib.h"
 #include "pl/player.h"
+#include "ty/toy.h"
 #include "un/un_2FC9.h"
 
 #include <common_structs.h>