diff --git a/src/melee/ft/chara/ftNess/ftNs_AttackHi4.c b/src/melee/ft/chara/ftNess/ftNs_AttackHi4.c
index 97ab116262..60e0a9164c 100644
--- a/src/melee/ft/chara/ftNess/ftNs_AttackHi4.c
+++ b/src/melee/ft/chara/ftNess/ftNs_AttackHi4.c
@@ -1,5 +1,4 @@
 #include "ftCommon/forward.h"
-#include "it/forward.h"
 #include "lb/forward.h"
 
 #include "ftNs_AttackHi4.h"
@@ -19,6 +18,7 @@
 #include "ftNess/types.h"
 #include "it/items/it_27CF.h"
 #include "it/itYoyo.h"
+#include "it/types.h"
 #include "lb/lb_00B0.h"
 #include "lb/lbcollision.h"
 #include "lb/lbrefract.h"
diff --git a/src/melee/ft/chara/ftSeak/ftSk_SpecialS.c b/src/melee/ft/chara/ftSeak/ftSk_SpecialS.c
index d6e242d795..664121ff85 100644
--- a/src/melee/ft/chara/ftSeak/ftSk_SpecialS.c
+++ b/src/melee/ft/chara/ftSeak/ftSk_SpecialS.c
@@ -1,4 +1,3 @@
-#include "it/forward.h"
 #include "lb/forward.h"
 
 #include "ftSeak/ftSk_SpecialS.h"
@@ -17,6 +16,7 @@
 #include "ftSeak/ftSk_Init.h"
 #include "ftSeak/types.h"
 #include "it/items/it_27CF.h"
+#include "it/types.h"
 #include "lb/lb_00B0.h"
 #include "lb/lbcollision.h"
 #include "lb/lbrefract.h"
diff --git a/src/melee/it/forward.h b/src/melee/it/forward.h
index 5dc1a8cebc..99ca4d6242 100644
--- a/src/melee/it/forward.h
+++ b/src/melee/it/forward.h
@@ -20,12 +20,10 @@ typedef struct ItemAttr ItemAttr;
 typedef struct ItemCommonData ItemCommonData;
 typedef struct ItemDynamics ItemDynamics;
 typedef struct ItemDynamicsDesc ItemDynamicsDesc;
-typedef struct ItemLogicTable ItemLogicTable;
 typedef struct ItemModelDesc ItemModelDesc;
 typedef struct ItemModStruct ItemModStruct;
 typedef struct ItemStateArray ItemStateArray;
 typedef struct ItemStateDesc ItemStateDesc;
-typedef struct ItemStateTable ItemStateTable;
 typedef struct itSword_ItemVars itSword_ItemVars;
 typedef struct SpawnItem SpawnItem;
 typedef struct UnkItemArticles3 UnkItemArticles3;
diff --git a/src/melee/it/it_2725.h b/src/melee/it/it_2725.h
index 031ac3aa73..7c3299af4c 100644
--- a/src/melee/it/it_2725.h
+++ b/src/melee/it/it_2725.h
@@ -6,6 +6,8 @@
 #include "it/forward.h"
 #include <baselib/forward.h>
 
+#include "it/items/types.h"
+
 #include <placeholder.h>
 
 /* 272CC0 */ HSD_JObj* it_80272CC0(Item_GObj*, enum_t);
@@ -27,5 +29,9 @@
 /* 27B378 */ void it_8027B378(Fighter_GObj*, Item_GObj*, float);
 /* 27C8B0 */ void it_8027C8B0(Item_GObj*);
 /* 27CE44 */ void it_8027CE44(Item_GObj*);
+/* 3F14C4 */ extern struct ItemLogicTable it_803F14C4[43];
+/* 3F23CC */ extern struct ItemLogicTable it_803F23CC[];
+/* 3F3100 */ extern struct ItemLogicTable it_803F3100[118];
+/* 3F4D20 */ extern struct ItemLogicTable it_803F4D20[];
 
 #endif
diff --git a/src/melee/it/item.c b/src/melee/it/item.c
index ebb2ea5c08..a2da54bbe9 100644
--- a/src/melee/it/item.c
+++ b/src/melee/it/item.c
@@ -11,11 +11,11 @@
 #include "ef/efasync.h"
 #include "ef/eflib.h"
 #include "ft/ftlib.h"
-#include "ft/types.h"
 #include "gm/gm_1601.h"
 #include "gr/grlib.h"
 #include "gr/stage.h"
 #include "it/inlines.h"
+#include "it/it_2725.h"
 #include "it/types.h"
 #include "lb/lb_00B0.h"
 #include "lb/lb_00F9.h"
@@ -523,11 +523,6 @@ static /// @remarks #Item_8026862C loads two integers into this,
     return result;
 }
 
-extern struct ItemLogicTable it_803F14C4[43];
-extern struct ItemLogicTable it_803F3100[118];
-extern struct ItemLogicTable it_803F23CC[];
-extern struct ItemLogicTable it_803F4D20[];
-
 void Item_80267978(HSD_GObj* gobj)
 {
     Item* item_data = gobj->user_data;
diff --git a/src/melee/it/items/forward.h b/src/melee/it/items/forward.h
index c9306586bc..62e292daf1 100644
--- a/src/melee/it/items/forward.h
+++ b/src/melee/it/items/forward.h
@@ -1,6 +1,8 @@
 #ifndef MELEE_IT_ITEMS_FORWARD_H
 #define MELEE_IT_ITEMS_FORWARD_H
 
+typedef struct ItemLogicTable ItemLogicTable;
+typedef struct ItemStateTable ItemStateTable;
 typedef struct itSword_UnkArticle1 itSword_UnkArticle1;
 typedef struct itSword_UnkBytes itSword_UnkBytes;
 
diff --git a/src/melee/it/items/it_27CF.h b/src/melee/it/items/it_27CF.h
index fbd1c27ba4..4a9ffb589a 100644
--- a/src/melee/it/items/it_27CF.h
+++ b/src/melee/it/items/it_27CF.h
@@ -3,11 +3,12 @@
 
 #include <platform.h>
 #include "ft/forward.h"
+#include "it/forward.h"
 #include <dolphin/mtx/forward.h>
 #include <baselib/forward.h>
 
 #include "ftSeak/types.h"
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 27D670 */ void it_8027D670(Vec3* const);
 /* 27D730 */ void it_8027D730(Item_GObj*);
diff --git a/src/melee/it/items/it_2ADA.h b/src/melee/it/items/it_2ADA.h
index 71f5c7c822..5052207ea6 100644
--- a/src/melee/it/items/it_2ADA.h
+++ b/src/melee/it/items/it_2ADA.h
@@ -1,9 +1,10 @@
 #ifndef GALE01_2ADA1C
 #define GALE01_2ADA1C
 
+#include "it/forward.h"
 #include <dolphin/mtx/forward.h>
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2ADA1C */ void it_802ADA1C(Vec3* pos, Vec3* vel, float facing_dir);
 /* 2ADBE4 */ void it_802ADBE4(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/it_2E5A.h b/src/melee/it/items/it_2E5A.h
index faa3851ea0..61089c6010 100644
--- a/src/melee/it/items/it_2E5A.h
+++ b/src/melee/it/items/it_2E5A.h
@@ -2,8 +2,9 @@
 #define GALE01_2E5AC4
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2E6A40 */ bool it_802E6A40(Item_GObj*);
 /* 2E6ACC */ void it_802E6ACC(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/it_2E6A.h b/src/melee/it/items/it_2E6A.h
index 2faf81eae0..dd2148fc68 100644
--- a/src/melee/it/items/it_2E6A.h
+++ b/src/melee/it/items/it_2E6A.h
@@ -2,8 +2,9 @@
 #define GALE01_2E6AEC
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2E6F7C */ bool it_802E6F7C(Item_GObj*);
 /* 2E6FC0 */ bool it_802E6FC0(Item_GObj*);
diff --git a/src/melee/it/items/it_2F28.h b/src/melee/it/items/it_2F28.h
index 81b5fcdc40..08c04b454b 100644
--- a/src/melee/it/items/it_2F28.h
+++ b/src/melee/it/items/it_2F28.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2F28C8
 #define GALE01_2F28C8
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2F2BDC */ void it_802F2BDC(Item_GObj*, Item_GObj*);
 /* 3F9470 */ extern ItemStateTable it_803F9470[];
diff --git a/src/melee/it/items/it_2F2B.h b/src/melee/it/items/it_2F2B.h
index b934d67c12..2fd12682ca 100644
--- a/src/melee/it/items/it_2F2B.h
+++ b/src/melee/it/items/it_2F2B.h
@@ -3,8 +3,9 @@
 
 #include <platform.h>
 #include "ft/chara/ftYoshi/forward.h"
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2F2BFC */ void it_802F2BFC(Item_GObj* gobj, ftYs_GObj* owner_gobj);
 /* 2F2CE0 */ void it_802F2CE0(Item_GObj* gobj, bool has_destroy_type);
diff --git a/src/melee/it/items/itbat.h b/src/melee/it/items/itbat.h
index 5df74e5dfe..b845fd2b4d 100644
--- a/src/melee/it/items/itbat.h
+++ b/src/melee/it/items/itbat.h
@@ -2,8 +2,9 @@
 #define GALE01_284854
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 284910 */ void it_80284910(Item_GObj*);
 /* 284AAC */ void it_80284AAC(Item_GObj*);
diff --git a/src/melee/it/items/itbombhei.h b/src/melee/it/items/itbombhei.h
index 10ea0b3ce3..af30ecb0bd 100644
--- a/src/melee/it/items/itbombhei.h
+++ b/src/melee/it/items/itbombhei.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_27D670
 #define GALE01_27D670
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 27D76C */ void it_8027D76C(Item_GObj*);
 /* 27E0B4 */ void it_8027E0B4(Item_GObj*);
diff --git a/src/melee/it/items/itbox.h b/src/melee/it/items/itbox.h
index 3f939f0126..fa463169b9 100644
--- a/src/melee/it/items/itbox.h
+++ b/src/melee/it/items/itbox.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_286088
 #define GALE01_286088
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2861CC */ void it_802861CC(Item_GObj*);
 /* 286208 */ void it_80286208(Item_GObj*);
diff --git a/src/melee/it/items/itcapsule.h b/src/melee/it/items/itcapsule.h
index 5482e1c961..738d6fdb24 100644
--- a/src/melee/it/items/itcapsule.h
+++ b/src/melee/it/items/itcapsule.h
@@ -2,9 +2,10 @@
 #define GALE01_27CF00
 
 #include <platform.h>
+#include "it/forward.h"
 #include <baselib/forward.h>
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 27CF00 */ void it_8027CF00(Item_GObj*);
 /* 27CF30 */ void it_8027CF30(Item_GObj*);
diff --git a/src/melee/it/items/itcerebi.h b/src/melee/it/items/itcerebi.h
index 1888383cd6..24cd02c587 100644
--- a/src/melee/it/items/itcerebi.h
+++ b/src/melee/it/items/itcerebi.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2D3EF8
 #define GALE01_2D3EF8
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2D3EF8 */ void it_802D3EF8(Item_GObj*);
 /* 2D3F4C */ void it_802D3F4C(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itchicorita.h b/src/melee/it/items/itchicorita.h
index 38e556192d..1ffd85228d 100644
--- a/src/melee/it/items/itchicorita.h
+++ b/src/melee/it/items/itchicorita.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2C9588
 #define GALE01_2C9588
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2C9588 */ void it_802C9588(Item_GObj*);
 /* 2C961C */ void it_802C961C(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itchicoritaleaf.h b/src/melee/it/items/itchicoritaleaf.h
index b3ec9a4f48..e08e1df46a 100644
--- a/src/melee/it/items/itchicoritaleaf.h
+++ b/src/melee/it/items/itchicoritaleaf.h
@@ -2,8 +2,9 @@
 #define GALE01_2C9B20
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2C9C20 */ void it_802C9C20(Item_GObj*);
 /* 2C9C78 */ bool it_802C9C78(Item_GObj*);
diff --git a/src/melee/it/items/itclimbersblizzard.h b/src/melee/it/items/itclimbersblizzard.h
index 1bc5923631..9503260035 100644
--- a/src/melee/it/items/itclimbersblizzard.h
+++ b/src/melee/it/items/itclimbersblizzard.h
@@ -2,8 +2,9 @@
 #define GALE01_2C2144
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2C2424 */ bool it_802C2424(Item_GObj*);
 /* 2C242C */ bool it_802C242C(Item_GObj*);
diff --git a/src/melee/it/items/itclimbersice.h b/src/melee/it/items/itclimbersice.h
index 49833031b2..7c468ee616 100644
--- a/src/melee/it/items/itclimbersice.h
+++ b/src/melee/it/items/itclimbersice.h
@@ -2,8 +2,9 @@
 #define GALE01_2C1590
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2C17FC */ void it_802C17FC(Item_GObj*);
 /* 2C1FC8 */ bool it_802C1FC8(Item_GObj*);
diff --git a/src/melee/it/items/itclimbersstring.h b/src/melee/it/items/itclimbersstring.h
index a0344cfc00..42a205aabb 100644
--- a/src/melee/it/items/itclimbersstring.h
+++ b/src/melee/it/items/itclimbersstring.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2C248C
 #define GALE01_2C248C
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2C37BC */ void it_802C37BC(Item_GObj*);
 /* 2C3AA4 */ void it_802C3AA4(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itclinkmilk.h b/src/melee/it/items/itclinkmilk.h
index 2cc3e18a2e..fd62682fed 100644
--- a/src/melee/it/items/itclinkmilk.h
+++ b/src/melee/it/items/itclinkmilk.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2C8B28
 #define GALE01_2C8B28
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2C8C74 */ void it_802C8C74(Item_GObj*);
 /* 2C8F2C */ void it_802C8F2C(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itcoin.h b/src/melee/it/items/itcoin.h
index 6a2a96a808..2a7a023d5c 100644
--- a/src/melee/it/items/itcoin.h
+++ b/src/melee/it/items/itcoin.h
@@ -2,8 +2,9 @@
 #define GALE01_2F13B4
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2F14E4 */ void it_802F14E4(Item_GObj*);
 /* 2F1518 */ void it_802F1518(Item_GObj*);
diff --git a/src/melee/it/items/itcrazyhandbomb.h b/src/melee/it/items/itcrazyhandbomb.h
index 13b2fdcae1..50d8ed2d9f 100644
--- a/src/melee/it/items/itcrazyhandbomb.h
+++ b/src/melee/it/items/itcrazyhandbomb.h
@@ -2,8 +2,9 @@
 #define GALE01_2F0F6C
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2F1094 */ void it_802F1094(Item_GObj*, Item_GObj*);
 /* 2F10B4 */ bool it_802F10B4(Item_GObj*);
diff --git a/src/melee/it/items/itdkinoko.h b/src/melee/it/items/itdkinoko.h
index dd5960615d..9837e43842 100644
--- a/src/melee/it/items/itdkinoko.h
+++ b/src/melee/it/items/itdkinoko.h
@@ -2,8 +2,9 @@
 #define GALE01_293A08
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 293A08 */ void it_80293A08(Item_GObj*);
 /* 293D6C */ bool it_80293D6C(Item_GObj*);
diff --git a/src/melee/it/items/itdosei.h b/src/melee/it/items/itdosei.h
index b89cbf6884..d103e5718a 100644
--- a/src/melee/it/items/itdosei.h
+++ b/src/melee/it/items/itdosei.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_281164
 #define GALE01_281164
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 281164 */ void it_80281164(Item_GObj*);
 /* 28218C */ void it_8028218C(Item_GObj*);
diff --git a/src/melee/it/items/itdrmariopill.h b/src/melee/it/items/itdrmariopill.h
index 967a0bddfd..378f35418e 100644
--- a/src/melee/it/items/itdrmariopill.h
+++ b/src/melee/it/items/itdrmariopill.h
@@ -3,9 +3,10 @@
 
 #include <platform.h>
 #include "ft/forward.h"
+#include "it/forward.h"
 #include <dolphin/mtx/forward.h>
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2C09C4 */ Item_GObj* it_802C09C4(Fighter_GObj* owner, Vec3* pos, int,
                                     enum_t, bool, bool, float facing_dir);
diff --git a/src/melee/it/items/itegg.h b/src/melee/it/items/itegg.h
index cddb5edd78..042a86b1b8 100644
--- a/src/melee/it/items/itegg.h
+++ b/src/melee/it/items/itegg.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_288C88
 #define GALE01_288C88
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 288D98 */ void it_80288D98(Item_GObj*);
 /* 288F88 */ void it_80288F88(Item_GObj*);
diff --git a/src/melee/it/items/itentei.h b/src/melee/it/items/itentei.h
index 705282bd34..d1a407e8ee 100644
--- a/src/melee/it/items/itentei.h
+++ b/src/melee/it/items/itentei.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2CF3E0
 #define GALE01_2CF3E0
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2CF3E0 */ void it_802CF3E0(Item_GObj*);
 /* 2CF450 */ void it_802CF450(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itevyoshiegg.h b/src/melee/it/items/itevyoshiegg.h
index 1f324670da..0d7ea88c55 100644
--- a/src/melee/it/items/itevyoshiegg.h
+++ b/src/melee/it/items/itevyoshiegg.h
@@ -2,8 +2,9 @@
 #define GALE01_29B0C8
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 29B188 */ void it_8029B188(Item_GObj*);
 /* 29B1AC */ void it_8029B1AC(Item_GObj*);
diff --git a/src/melee/it/items/itfflower.h b/src/melee/it/items/itfflower.h
index 400b6fcf5b..e5378aa882 100644
--- a/src/melee/it/items/itfflower.h
+++ b/src/melee/it/items/itfflower.h
@@ -2,8 +2,9 @@
 #define GALE01_292D48
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 292E04 */ void it_80292E04(Item_GObj*);
 /* 293284 */ void it_80293284(Item_GObj*);
diff --git a/src/melee/it/items/itfflowerflame.h b/src/melee/it/items/itfflowerflame.h
index 16800dd167..d7edec5ab7 100644
--- a/src/melee/it/items/itfflowerflame.h
+++ b/src/melee/it/items/itfflowerflame.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_29A748
 #define GALE01_29A748
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 29A9FC */ void it_8029A9FC(Item_GObj*);
 /* 29AD1C */ void it_8029AD1C(Item_GObj*);
diff --git a/src/melee/it/items/itfire.h b/src/melee/it/items/itfire.h
index 61694dd521..e30cb10add 100644
--- a/src/melee/it/items/itfire.h
+++ b/src/melee/it/items/itfire.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2CC6E4
 #define GALE01_2CC6E4
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2CC6E4 */ void it_802CC6E4(Item_GObj*);
 /* 2CC744 */ void it_802CC744(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itflipper.h b/src/melee/it/items/itflipper.h
index f291c18408..803c8ed7e5 100644
--- a/src/melee/it/items/itflipper.h
+++ b/src/melee/it/items/itflipper.h
@@ -2,8 +2,9 @@
 #define GALE01_290938
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 290A20 */ void it_80290A20(Item_GObj*);
 /* 290F8C */ void it_80290F8C(Item_GObj*);
diff --git a/src/melee/it/items/itfoods.h b/src/melee/it/items/itfoods.h
index 053ebca379..4084d6c156 100644
--- a/src/melee/it/items/itfoods.h
+++ b/src/melee/it/items/itfoods.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_28F9D8
 #define GALE01_28F9D8
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 28FBE4 */ void it_8028FBE4(Item_GObj*);
 /* 28FD7C */ void it_8028FD7C(Item_GObj*);
diff --git a/src/melee/it/items/itfoxblaster.h b/src/melee/it/items/itfoxblaster.h
index bc8749008b..96898f63f8 100644
--- a/src/melee/it/items/itfoxblaster.h
+++ b/src/melee/it/items/itfoxblaster.h
@@ -2,8 +2,9 @@
 #define GALE01_2ADDD0
 
 #include "ft/forward.h"
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2AE994 */ Item_GObj* it_802AE994(Fighter_GObj*, Fighter_Part, int);
 /* 2AEB00 */ void it_802AEB00(Item_GObj*);
diff --git a/src/melee/it/items/itfoxillusion.h b/src/melee/it/items/itfoxillusion.h
index 954375cb1d..ccb29fb212 100644
--- a/src/melee/it/items/itfoxillusion.h
+++ b/src/melee/it/items/itfoxillusion.h
@@ -2,10 +2,11 @@
 #define GALE01_29CD18
 
 #include <platform.h>
+#include "it/forward.h"
 #include <dolphin/mtx/forward.h>
 #include <baselib/forward.h>
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 29CD18 */ void it_8029CD18(Item_GObj*, int arg1);
 /* 29CD78 */ HSD_JObj* it_8029CD78(Item_GObj*);
diff --git a/src/melee/it/items/itfoxlaser.h b/src/melee/it/items/itfoxlaser.h
index 2c947517be..d7c8f0bb37 100644
--- a/src/melee/it/items/itfoxlaser.h
+++ b/src/melee/it/items/itfoxlaser.h
@@ -2,10 +2,11 @@
 #define GALE01_29C4D4
 
 #include <platform.h>
+#include "it/forward.h"
 #include <dolphin/mtx/forward.h>
 #include <baselib/forward.h>
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 29C4D4 */ bool it_8029C4D4(Item_GObj*);
 /* 29C504 */ void it_8029C504(HSD_GObj* parent, Vec3* pos, enum_t msid,
diff --git a/src/melee/it/items/itfreeze.h b/src/melee/it/items/itfreeze.h
index a68d14eb35..06b8e545a4 100644
--- a/src/melee/it/items/itfreeze.h
+++ b/src/melee/it/items/itfreeze.h
@@ -2,8 +2,9 @@
 #define GALE01_28EB88
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 28ED10 */ void it_8028ED10(Item_GObj*);
 /* 28ED50 */ void it_8028ED50(Item_GObj*);
diff --git a/src/melee/it/items/itfreezer.h b/src/melee/it/items/itfreezer.h
index efac4b7c1e..27b34901b2 100644
--- a/src/melee/it/items/itfreezer.h
+++ b/src/melee/it/items/itfreezer.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2CCF9C
 #define GALE01_2CCF9C
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2CCF9C */ void it_802CCF9C(Item_GObj*);
 /* 2CD000 */ void it_802CD000(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itfushigibana.h b/src/melee/it/items/itfushigibana.h
index c710c1f1ea..ecd5574110 100644
--- a/src/melee/it/items/itfushigibana.h
+++ b/src/melee/it/items/itfushigibana.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2D6FD0
 #define GALE01_2D6FD0
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2D6FD0 */ void it_802D6FD0(Item_GObj*);
 /* 3F82F0 */ extern ItemStateTable it_803F82F0[];
diff --git a/src/melee/it/items/itgamewatchbreath.h b/src/melee/it/items/itgamewatchbreath.h
index 8e082dc05f..e9b93b73f6 100644
--- a/src/melee/it/items/itgamewatchbreath.h
+++ b/src/melee/it/items/itgamewatchbreath.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2C720C
 #define GALE01_2C720C
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2C7310 */ void it_802C7310(Item_GObj*);
 /* 2C73CC */ void it_802C73CC(Item_GObj*);
diff --git a/src/melee/it/items/itgamewatchchef.h b/src/melee/it/items/itgamewatchchef.h
index 735cb19516..a1d9c7e385 100644
--- a/src/melee/it/items/itgamewatchchef.h
+++ b/src/melee/it/items/itgamewatchchef.h
@@ -2,8 +2,9 @@
 #define GALE01_2C837C
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2C847C */ bool it_802C847C(Item_GObj*);
 /* 2C88E4 */ bool it_802C88E4(Item_GObj*);
diff --git a/src/melee/it/items/itgamewatchfire.h b/src/melee/it/items/itgamewatchfire.h
index 0f0132113c..6ebd8f6c51 100644
--- a/src/melee/it/items/itgamewatchfire.h
+++ b/src/melee/it/items/itgamewatchfire.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2C68F8
 #define GALE01_2C68F8
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2C69FC */ void it_802C69FC(Item_GObj*);
 /* 2C6AB8 */ void it_802C6AB8(Item_GObj*);
diff --git a/src/melee/it/items/itgamewatchgreenhouse.h b/src/melee/it/items/itgamewatchgreenhouse.h
index 58a224fa79..464e939f9e 100644
--- a/src/melee/it/items/itgamewatchgreenhouse.h
+++ b/src/melee/it/items/itgamewatchgreenhouse.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2C61F4
 #define GALE01_2C61F4
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2C62F8 */ void it_802C62F8(Item_GObj*);
 /* 2C63B4 */ void it_802C63B4(Item_GObj*);
diff --git a/src/melee/it/items/itgamewatchjudge.h b/src/melee/it/items/itgamewatchjudge.h
index 3d28a88217..1133786952 100644
--- a/src/melee/it/items/itgamewatchjudge.h
+++ b/src/melee/it/items/itgamewatchjudge.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2C7774
 #define GALE01_2C7774
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2C7A54 */ void it_802C7A54(Item_GObj*);
 /* 2C7B10 */ void it_802C7B10(Item_GObj*);
diff --git a/src/melee/it/items/itgamewatchmanhole.h b/src/melee/it/items/itgamewatchmanhole.h
index 9283e72546..3cbcacf5f7 100644
--- a/src/melee/it/items/itgamewatchmanhole.h
+++ b/src/melee/it/items/itgamewatchmanhole.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2C65E4
 #define GALE01_2C65E4
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2C66E8 */ void it_802C66E8(Item_GObj*);
 /* 2C67A4 */ void it_802C67A4(Item_GObj*);
diff --git a/src/melee/it/items/itgamewatchpanic.h b/src/melee/it/items/itgamewatchpanic.h
index aae4a77d82..770be64246 100644
--- a/src/melee/it/items/itgamewatchpanic.h
+++ b/src/melee/it/items/itgamewatchpanic.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2C7D60
 #define GALE01_2C7D60
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2C7E64 */ void it_802C7E64(Item_GObj*);
 /* 2C7F20 */ void it_802C7F20(Item_GObj*);
diff --git a/src/melee/it/items/itgamewatchparachute.h b/src/melee/it/items/itgamewatchparachute.h
index b46782a574..87b312a21b 100644
--- a/src/melee/it/items/itgamewatchparachute.h
+++ b/src/melee/it/items/itgamewatchparachute.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2C6C38
 #define GALE01_2C6C38
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2C6D3C */ void it_802C6D3C(Item_GObj*);
 /* 2C6DF8 */ void it_802C6DF8(Item_GObj*);
diff --git a/src/melee/it/items/itgamewatchrescue.h b/src/melee/it/items/itgamewatchrescue.h
index fcdf57149c..ffbaa096ce 100644
--- a/src/melee/it/items/itgamewatchrescue.h
+++ b/src/melee/it/items/itgamewatchrescue.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2C8038
 #define GALE01_2C8038
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2C835C */ void it_802C835C(Item_GObj*, Item_GObj*);
 /* 3F79C0 */ extern ItemStateTable it_803F79C0[];
diff --git a/src/melee/it/items/itgamewatchturtle.h b/src/melee/it/items/itgamewatchturtle.h
index b4280a8991..0b7bd3fc3f 100644
--- a/src/melee/it/items/itgamewatchturtle.h
+++ b/src/melee/it/items/itgamewatchturtle.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2C6F40
 #define GALE01_2C6F40
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2C7044 */ void it_802C7044(Item_GObj*);
 /* 2C7100 */ void it_802C7100(Item_GObj*);
diff --git a/src/melee/it/items/itgshell.h b/src/melee/it/items/itgshell.h
index 9f1df229f9..6dbb38834b 100644
--- a/src/melee/it/items/itgshell.h
+++ b/src/melee/it/items/itgshell.h
@@ -2,8 +2,9 @@
 #define GALE01_28B8D8
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 28BDAC */ void it_8028BDAC(Item_GObj*);
 /* 28C148 */ void it_8028C148(Item_GObj*);
diff --git a/src/melee/it/items/ithammer.h b/src/melee/it/items/ithammer.h
index 4e9870f05b..49b1468d04 100644
--- a/src/melee/it/items/ithammer.h
+++ b/src/melee/it/items/ithammer.h
@@ -1,9 +1,10 @@
 #ifndef GALE01_293D94
 #define GALE01_293D94
 
+#include "it/forward.h"
 #include <baselib/forward.h>
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 293D94 */ void it_80293D94(Item_GObj* gobj);
 /* 293DCC */ int it_80293DCC(Item_GObj* gobj);
diff --git a/src/melee/it/items/ithammerhead.h b/src/melee/it/items/ithammerhead.h
index 689c514b2b..c8d8ce0d81 100644
--- a/src/melee/it/items/ithammerhead.h
+++ b/src/melee/it/items/ithammerhead.h
@@ -2,10 +2,11 @@
 #define GALE01_299C48
 
 #include <platform.h>
+#include "it/forward.h"
 #include <dolphin/mtx/forward.h>
 #include <baselib/forward.h>
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 299C48 */ void it_80299C48(HSD_GObj*, Vec3*, Vec3*, f32);
 /* 299D4C */ void it_80299D4C(Item_GObj*);
diff --git a/src/melee/it/items/itharisen.h b/src/melee/it/items/itharisen.h
index 3601c13fd5..e23c507156 100644
--- a/src/melee/it/items/itharisen.h
+++ b/src/melee/it/items/itharisen.h
@@ -2,8 +2,9 @@
 #define GALE01_2927E8
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 29285C */ void it_8029285C(Item_GObj*);
 /* 292A5C */ void it_80292A5C(Item_GObj*);
diff --git a/src/melee/it/items/ithassam.h b/src/melee/it/items/ithassam.h
index f1b5b87eae..d569c76575 100644
--- a/src/melee/it/items/ithassam.h
+++ b/src/melee/it/items/ithassam.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2CDBE0
 #define GALE01_2CDBE0
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2CDBE0 */ void it_802CDBE0(Item_GObj*);
 /* 2CDC60 */ void it_802CDC60(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itheart.h b/src/melee/it/items/itheart.h
index b054b97b0d..0fd38b2882 100644
--- a/src/melee/it/items/itheart.h
+++ b/src/melee/it/items/itheart.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_283AE4
 #define GALE01_283AE4
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 283BEC */ void it_80283BEC(Item_GObj*);
 /* 283C48 */ void it_80283C48(Item_GObj*);
diff --git a/src/melee/it/items/ithinoarashi.h b/src/melee/it/items/ithinoarashi.h
index 57fe07c1bc..4c37818385 100644
--- a/src/melee/it/items/ithinoarashi.h
+++ b/src/melee/it/items/ithinoarashi.h
@@ -2,8 +2,9 @@
 #define GALE01_2D5CF8
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2D5CF8 */ void it_802D5CF8(Item_GObj*);
 /* 2D6100 */ bool it_802D6100(Item_GObj*);
diff --git a/src/melee/it/items/ithitodeman.h b/src/melee/it/items/ithitodeman.h
index a5132f572d..70b3f38491 100644
--- a/src/melee/it/items/ithitodeman.h
+++ b/src/melee/it/items/ithitodeman.h
@@ -2,8 +2,9 @@
 #define GALE01_2D42C4
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2D42C4 */ void it_802D42C4(Item_GObj*);
 /* 2D43B0 */ void it_802D43B0(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/ithouou.h b/src/melee/it/items/ithouou.h
index a57ba6b1ad..f7874be3e7 100644
--- a/src/melee/it/items/ithouou.h
+++ b/src/melee/it/items/ithouou.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2D251C
 #define GALE01_2D251C
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2D251C */ void it_802D251C(Item_GObj*);
 /* 2D25BC */ void it_802D25BC(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itkabigon.h b/src/melee/it/items/itkabigon.h
index 38db5afc35..b647ef1629 100644
--- a/src/melee/it/items/itkabigon.h
+++ b/src/melee/it/items/itkabigon.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2C9D40
 #define GALE01_2C9D40
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2C9D40 */ void it_802C9D40(Item_GObj*);
 /* 2C9E00 */ void it_802C9E00(Item_GObj*);
diff --git a/src/melee/it/items/itkamex.h b/src/melee/it/items/itkamex.h
index 43a656425b..c98ba0c4ec 100644
--- a/src/melee/it/items/itkamex.h
+++ b/src/melee/it/items/itkamex.h
@@ -2,8 +2,9 @@
 #define GALE01_2CA49C
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2CA49C */ void it_802CA49C(Item_GObj*);
 /* 2CA538 */ void it_802CA538(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itkinoko.h b/src/melee/it/items/itkinoko.h
index 4fc9a2bada..cb3612a40f 100644
--- a/src/melee/it/items/itkinoko.h
+++ b/src/melee/it/items/itkinoko.h
@@ -2,8 +2,9 @@
 #define GALE01_293660
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 29367C */ void it_8029367C(Item_GObj*);
 /* 2939E0 */ bool it_802939E0(Item_GObj*);
diff --git a/src/melee/it/items/itkirbycutterbeam.h b/src/melee/it/items/itkirbycutterbeam.h
index 63ec9a04a1..5d1a7c7b27 100644
--- a/src/melee/it/items/itkirbycutterbeam.h
+++ b/src/melee/it/items/itkirbycutterbeam.h
@@ -2,8 +2,9 @@
 #define GALE01_29BAB8
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 29BFB4 */ bool it_8029BFB4(Item_GObj*);
 /* 29BFBC */ bool it_8029BFBC(Item_GObj*);
diff --git a/src/melee/it/items/itkirbygamewatchchefpan.h b/src/melee/it/items/itkirbygamewatchchefpan.h
index 09c874fbbf..2946139083 100644
--- a/src/melee/it/items/itkirbygamewatchchefpan.h
+++ b/src/melee/it/items/itkirbygamewatchchefpan.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2C74D8
 #define GALE01_2C74D8
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2C75DC */ void it_802C75DC(Item_GObj*);
 /* 2C7698 */ void it_802C7698(Item_GObj*);
diff --git a/src/melee/it/items/itkirbyhammer.h b/src/melee/it/items/itkirbyhammer.h
index afd9b6bb39..254e675f31 100644
--- a/src/melee/it/items/itkirbyhammer.h
+++ b/src/melee/it/items/itkirbyhammer.h
@@ -2,9 +2,11 @@
 #define _itkirbyhammer_h_
 
 #include <platform.h>
+#include "it/forward.h"
+#include <dolphin/mtx/forward.h>
 #include <baselib/forward.h>
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 void it_802ADC04(Item_GObj* gobj);
 void it_802ADC34(Item_GObj* gobj);
diff --git a/src/melee/it/items/itkirbyyoshispecialn.h b/src/melee/it/items/itkirbyyoshispecialn.h
index 26782a235a..f4d1df6e36 100644
--- a/src/melee/it/items/itkirbyyoshispecialn.h
+++ b/src/melee/it/items/itkirbyyoshispecialn.h
@@ -3,8 +3,9 @@
 
 #include <platform.h>
 #include "ft/chara/ftKirby/forward.h"
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2F2D98 */ void it_802F2D98(Item_GObj* gobj, ftKb_GObj* owner_gobj);
 /* 2F2E7C */ void it_802F2E7C(Item_GObj* gobj, bool has_destroy_type);
diff --git a/src/melee/it/items/itkireihana.h b/src/melee/it/items/itkireihana.h
index b40220a962..a3f7920166 100644
--- a/src/melee/it/items/itkireihana.h
+++ b/src/melee/it/items/itkireihana.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2D007C
 #define GALE01_2D007C
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2D007C */ void it_802D007C(Item_GObj*);
 /* 2D0118 */ void it_802D0118(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itkoopaflame.h b/src/melee/it/items/itkoopaflame.h
index 6798d54946..19782b09cd 100644
--- a/src/melee/it/items/itkoopaflame.h
+++ b/src/melee/it/items/itkoopaflame.h
@@ -2,8 +2,9 @@
 #define GALE01_2AC8A8
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2AD2E8 */ bool it_802AD2E8(Item_GObj*);
 /* 2AD2F0 */ bool it_802AD2F0(Item_GObj*);
diff --git a/src/melee/it/items/itkusudama.h b/src/melee/it/items/itkusudama.h
index 087b8e2dd9..c9b7a83f1c 100644
--- a/src/melee/it/items/itkusudama.h
+++ b/src/melee/it/items/itkusudama.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2896CC
 #define GALE01_2896CC
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 289784 */ void it_80289784(Item_GObj*);
 /* 28A93C */ void it_8028A93C(Item_GObj*);
diff --git a/src/melee/it/items/itleadead.h b/src/melee/it/items/itleadead.h
index 688aa7fee2..1f915f152f 100644
--- a/src/melee/it/items/itleadead.h
+++ b/src/melee/it/items/itleadead.h
@@ -2,8 +2,9 @@
 #define GALE01_2E8BCC
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2E8BCC */ void it_802E8BCC(Item_GObj*);
 /* 2E8CD8 */ bool it_802E8CD8(Item_GObj*);
diff --git a/src/melee/it/items/itlgun.h b/src/melee/it/items/itlgun.h
index 51bfd5d6b9..6f12f5a532 100644
--- a/src/melee/it/items/itlgun.h
+++ b/src/melee/it/items/itlgun.h
@@ -2,8 +2,9 @@
 #define GALE01_28E738
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 28E738 */ void it_8028E738(Item_GObj*);
 /* 28E904 */ void it_8028E904(Item_GObj*);
diff --git a/src/melee/it/items/itlgunbeam.h b/src/melee/it/items/itlgunbeam.h
index 8e1ef4966d..057e741ff3 100644
--- a/src/melee/it/items/itlgunbeam.h
+++ b/src/melee/it/items/itlgunbeam.h
@@ -2,8 +2,9 @@
 #define GALE01_2993E0
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 299B6C */ bool it_80299B6C(Item_GObj*);
 /* 299B74 */ bool it_80299B74(Item_GObj*);
diff --git a/src/melee/it/items/itlgunray.h b/src/melee/it/items/itlgunray.h
index 12b12179fa..c68edb7a39 100644
--- a/src/melee/it/items/itlgunray.h
+++ b/src/melee/it/items/itlgunray.h
@@ -2,8 +2,9 @@
 #define GALE01_298168
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 298634 */ bool it_80298634(Item_GObj*);
 /* 29863C */ bool it_8029863C(Item_GObj*);
diff --git a/src/melee/it/items/itlinkarrow.h b/src/melee/it/items/itlinkarrow.h
index 962bb83b08..a5df6762da 100644
--- a/src/melee/it/items/itlinkarrow.h
+++ b/src/melee/it/items/itlinkarrow.h
@@ -2,8 +2,9 @@
 #define GALE01_2A7D8C
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2A8984 */ void it_802A8984(Item_GObj*);
 /* 2A8AF8 */ void it_802A8AF8(Item_GObj*);
diff --git a/src/melee/it/items/itlinkbomb.h b/src/melee/it/items/itlinkbomb.h
index 6acab18e52..5777305d6b 100644
--- a/src/melee/it/items/itlinkbomb.h
+++ b/src/melee/it/items/itlinkbomb.h
@@ -2,8 +2,9 @@
 #define GALE01_29D968
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 29DEB0 */ void it_8029DEB0(Item_GObj*);
 /* 29E5D0 */ void it_8029E5D0(Item_GObj*);
diff --git a/src/melee/it/items/itlinkboomerang.h b/src/melee/it/items/itlinkboomerang.h
index 58eeb7b316..f0b765ea35 100644
--- a/src/melee/it/items/itlinkboomerang.h
+++ b/src/melee/it/items/itlinkboomerang.h
@@ -2,8 +2,9 @@
 #define GALE01_29FDBC
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2A087C */ void it_802A087C(Item_GObj*);
 /* 2A0E70 */ void it_802A0E70(Item_GObj*);
diff --git a/src/melee/it/items/itlinkbow.h b/src/melee/it/items/itlinkbow.h
index f2ae319d46..e4a811cc18 100644
--- a/src/melee/it/items/itlinkbow.h
+++ b/src/melee/it/items/itlinkbow.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2AF1A4
 #define GALE01_2AF1A4
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2AF298 */ void it_802AF298(Item_GObj*);
 /* 2AF434 */ void it_802AF434(Item_GObj*);
diff --git a/src/melee/it/items/itlinkhookshot.h b/src/melee/it/items/itlinkhookshot.h
index 0c0b8e7e75..9f891764f9 100644
--- a/src/melee/it/items/itlinkhookshot.h
+++ b/src/melee/it/items/itlinkhookshot.h
@@ -2,10 +2,11 @@
 #define GALE01_2A2418
 
 #include "ft/forward.h"
+#include "it/forward.h"
 #include <dolphin/mtx/forward.h>
 #include <baselib/forward.h>
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2A2418 */ void it_802A2418(Item_GObj*);
 /* 2A2B10 */ void it_802A2B10(Item_GObj* gobj);
diff --git a/src/melee/it/items/itlipstick.h b/src/melee/it/items/itlipstick.h
index 4b31ff4830..d8c59aa4e1 100644
--- a/src/melee/it/items/itlipstick.h
+++ b/src/melee/it/items/itlipstick.h
@@ -2,8 +2,9 @@
 #define GALE01_29570C
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 29570C */ void it_8029570C(Item_GObj*);
 /* 2958C8 */ void it_802958C8(Item_GObj*);
diff --git a/src/melee/it/items/itlipstickspore.h b/src/melee/it/items/itlipstickspore.h
index 24b0096138..75b29923bc 100644
--- a/src/melee/it/items/itlipstickspore.h
+++ b/src/melee/it/items/itlipstickspore.h
@@ -2,8 +2,9 @@
 #define GALE01_29A114
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 29A600 */ bool it_8029A600(Item_GObj*);
 /* 29A608 */ bool it_8029A608(Item_GObj*);
diff --git a/src/melee/it/items/itlizardon.h b/src/melee/it/items/itlizardon.h
index 6df1caa306..602b52518e 100644
--- a/src/melee/it/items/itlizardon.h
+++ b/src/melee/it/items/itlizardon.h
@@ -2,8 +2,9 @@
 #define GALE01_2CB8AC
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2CB8AC */ void it_802CB8AC(Item_GObj*);
 /* 2CB940 */ void it_802CB940(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itlucky.h b/src/melee/it/items/itlucky.h
index 47dec3b97d..5d4601c0a7 100644
--- a/src/melee/it/items/itlucky.h
+++ b/src/melee/it/items/itlucky.h
@@ -2,8 +2,9 @@
 #define GALE01_2D5050
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2D5050 */ void it_802D5050(Item_GObj*);
 /* 2D5648 */ bool it_802D5648(Item_GObj*);
diff --git a/src/melee/it/items/itlugia.h b/src/melee/it/items/itlugia.h
index b767d7e34e..a700dcb106 100644
--- a/src/melee/it/items/itlugia.h
+++ b/src/melee/it/items/itlugia.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2D1438
 #define GALE01_2D1438
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2D1438 */ void it_802D1438(Item_GObj*);
 /* 2D14D4 */ void it_802D14D4(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itluigifireball.h b/src/melee/it/items/itluigifireball.h
index 122c1249c7..41a7948286 100644
--- a/src/melee/it/items/itluigifireball.h
+++ b/src/melee/it/items/itluigifireball.h
@@ -2,10 +2,11 @@
 #define GALE01_2C01AC
 
 #include <platform.h>
+#include "it/forward.h"
 #include <dolphin/mtx/forward.h>
 #include <baselib/forward.h>
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2C01AC */ void it_802C01AC(Item_GObj* gobj, Vec3* pos, ItemKind kind,
                               float facing_dir);
diff --git a/src/melee/it/items/itmaril.h b/src/melee/it/items/itmaril.h
index 01f00b6f7d..495df788ef 100644
--- a/src/melee/it/items/itmaril.h
+++ b/src/melee/it/items/itmaril.h
@@ -2,8 +2,9 @@
 #define GALE01_2D66F8
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2D6808 */ bool it_802D6808(Item_GObj*);
 /* 2D6810 */ bool it_802D6810(Item_GObj*);
diff --git a/src/melee/it/items/itmariocape.h b/src/melee/it/items/itmariocape.h
index facfa5ff68..2aaf59a949 100644
--- a/src/melee/it/items/itmariocape.h
+++ b/src/melee/it/items/itmariocape.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2B2560
 #define GALE01_2B2560
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2B2644 */ void it_802B2644(Item_GObj*);
 /* 2B2700 */ void it_802B2700(Item_GObj*);
diff --git a/src/melee/it/items/itmariofireball.h b/src/melee/it/items/itmariofireball.h
index 729ecd040a..8020accef7 100644
--- a/src/melee/it/items/itmariofireball.h
+++ b/src/melee/it/items/itmariofireball.h
@@ -2,8 +2,9 @@
 #define GALE01_29B6F8
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 29BA38 */ bool it_8029BA38(Item_GObj*);
 /* 29BA40 */ bool it_8029BA40(Item_GObj*);
diff --git a/src/melee/it/items/itmarumine.h b/src/melee/it/items/itmarumine.h
index 9fa8e24b8d..a8f3e2c777 100644
--- a/src/melee/it/items/itmarumine.h
+++ b/src/melee/it/items/itmarumine.h
@@ -2,8 +2,9 @@
 #define GALE01_2D09D0
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2D0A0C */ void it_802D0A0C(Item_GObj*);
 /* 2D0AB0 */ void it_802D0AB0(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itmasterhandbullet.h b/src/melee/it/items/itmasterhandbullet.h
index bb641204e5..7a21addf8d 100644
--- a/src/melee/it/items/itmasterhandbullet.h
+++ b/src/melee/it/items/itmasterhandbullet.h
@@ -2,8 +2,9 @@
 #define GALE01_2F0AE0
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2F0BC8 */ void it_802F0BC8(Item_GObj*, Item_GObj*);
 /* 2F0F0C */ bool it_802F0F0C(Item_GObj*);
diff --git a/src/melee/it/items/itmasterhandlaser.h b/src/melee/it/items/itmasterhandlaser.h
index 4c93fc5851..9be3b2da7f 100644
--- a/src/melee/it/items/itmasterhandlaser.h
+++ b/src/melee/it/items/itmasterhandlaser.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2F0340
 #define GALE01_2F0340
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 3F9378 */ extern ItemStateTable it_803F9378[];
 
diff --git a/src/melee/it/items/itmatadogas.h b/src/melee/it/items/itmatadogas.h
index 7b4c917ae2..cbacee1ace 100644
--- a/src/melee/it/items/itmatadogas.h
+++ b/src/melee/it/items/itmatadogas.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2CAFD4
 #define GALE01_2CAFD4
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2CAFD4 */ void it_802CAFD4(Item_GObj*);
 /* 2CB0F8 */ void it_802CB0F8(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itmato.h b/src/melee/it/items/itmato.h
index c91f5e99fa..26b886a196 100644
--- a/src/melee/it/items/itmato.h
+++ b/src/melee/it/items/itmato.h
@@ -2,8 +2,9 @@
 #define GALE01_2D84F8
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2D84F8 */ void it_802D84F8(Item_GObj*);
 /* 2D8554 */ void it_802D8554(Item_GObj*);
diff --git a/src/melee/it/items/itmball.h b/src/melee/it/items/itmball.h
index a467f8b472..f7efe72d4d 100644
--- a/src/melee/it/items/itmball.h
+++ b/src/melee/it/items/itmball.h
@@ -2,8 +2,9 @@
 #define GALE01_2978DC
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2978DC */ void it_802978DC(Item_GObj*);
 /* 297904 */ void it_80297904(Item_GObj*);
diff --git a/src/melee/it/items/itmetalb.h b/src/melee/it/items/itmetalb.h
index aa876fdd16..196e33e170 100644
--- a/src/melee/it/items/itmetalb.h
+++ b/src/melee/it/items/itmetalb.h
@@ -2,8 +2,9 @@
 #define GALE01_2953C8
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2953C8 */ void it_802953C8(Item_GObj*);
 /* 295524 */ void it_80295524(Item_GObj*);
diff --git a/src/melee/it/items/itmetamon.h b/src/melee/it/items/itmetamon.h
index a21eae2179..a95ac74417 100644
--- a/src/melee/it/items/itmetamon.h
+++ b/src/melee/it/items/itmetamon.h
@@ -2,8 +2,9 @@
 #define GALE01_2D3008
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2D3008 */ void it_802D3008(Item_GObj*);
 /* 2D306C */ void it_802D306C(Item_GObj*);
diff --git a/src/melee/it/items/itmew.h b/src/melee/it/items/itmew.h
index 10703070b7..edf3a0db7f 100644
--- a/src/melee/it/items/itmew.h
+++ b/src/melee/it/items/itmew.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2D3B18
 #define GALE01_2D3B18
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2D3B18 */ void it_802D3B18(Item_GObj*);
 /* 2D3B6C */ void it_802D3B6C(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itmewtwodisable.h b/src/melee/it/items/itmewtwodisable.h
index b3706bcc89..9521408b0b 100644
--- a/src/melee/it/items/itmewtwodisable.h
+++ b/src/melee/it/items/itmewtwodisable.h
@@ -2,8 +2,9 @@
 #define GALE01_2C49E0
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2C4A00 */ void it_802C4A00(Item_GObj*);
 /* 2C4C90 */ bool it_802C4C90(Item_GObj*);
diff --git a/src/melee/it/items/itmewtwoshadowball.h b/src/melee/it/items/itmewtwoshadowball.h
index 81e6b1e893..0269fac83c 100644
--- a/src/melee/it/items/itmewtwoshadowball.h
+++ b/src/melee/it/items/itmewtwoshadowball.h
@@ -2,8 +2,9 @@
 #define GALE01_2C4D10
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2C56A0 */ void it_802C56A0(Item_GObj*);
 /* 2C578C */ void it_802C578C(Item_GObj*);
diff --git a/src/melee/it/items/itmsbomb.h b/src/melee/it/items/itmsbomb.h
index 6c95b19ebc..78bc64a88c 100644
--- a/src/melee/it/items/itmsbomb.h
+++ b/src/melee/it/items/itmsbomb.h
@@ -2,8 +2,9 @@
 #define GALE01_28FE90
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 28FED4 */ void it_8028FED4(Item_GObj*);
 /* 2900CC */ void it_802900CC(Item_GObj*);
diff --git a/src/melee/it/items/itnessbat.h b/src/melee/it/items/itnessbat.h
index 3442843b60..da04956fc8 100644
--- a/src/melee/it/items/itnessbat.h
+++ b/src/melee/it/items/itnessbat.h
@@ -2,8 +2,9 @@
 #define GALE01_2AD478
 
 #include "ft/forward.h"
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2AD590 */ Item_GObj* it_802AD590(Fighter_GObj*, Fighter_Part);
 /* 2AD6F0 */ void it_802AD6F0(Item_GObj*);
diff --git a/src/melee/it/items/itnessfirepillar.h b/src/melee/it/items/itnessfirepillar.h
index 3da6d7c64b..714f63e31e 100644
--- a/src/melee/it/items/itnessfirepillar.h
+++ b/src/melee/it/items/itnessfirepillar.h
@@ -2,8 +2,9 @@
 #define GALE01_2AA494
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2AA75C */ bool it_802AA75C(Item_GObj*);
 /* 2AA7C4 */ void it_802AA7C4(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itnesspkfire.h b/src/melee/it/items/itnesspkfire.h
index 5d175ab8ce..7bab9b0b61 100644
--- a/src/melee/it/items/itnesspkfire.h
+++ b/src/melee/it/items/itnesspkfire.h
@@ -2,8 +2,9 @@
 #define GALE01_2AA054
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2AA284 */ bool it_802AA284(Item_GObj*);
 /* 2AA2E8 */ bool it_802AA2E8(Item_GObj*);
diff --git a/src/melee/it/items/itnesspkflush.h b/src/melee/it/items/itnesspkflush.h
index 14d260a229..9bec620ee3 100644
--- a/src/melee/it/items/itnesspkflush.h
+++ b/src/melee/it/items/itnesspkflush.h
@@ -2,8 +2,9 @@
 #define GALE01_2AA7E4
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2AA9CC */ void it_802AA9CC(Item_GObj*);
 /* 2AB2AC */ bool it_802AB2AC(Item_GObj*);
diff --git a/src/melee/it/items/itnesspkflushexplode.h b/src/melee/it/items/itnesspkflushexplode.h
index 98d2cfb0d2..789e620ede 100644
--- a/src/melee/it/items/itnesspkflushexplode.h
+++ b/src/melee/it/items/itnesspkflushexplode.h
@@ -2,8 +2,9 @@
 #define GALE01_2AF940
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2AFA2C */ void it_802AFA2C(Item_GObj*);
 /* 2AFD4C */ bool it_802AFD4C(Item_GObj*);
diff --git a/src/melee/it/items/itnesspkthunderball.h b/src/melee/it/items/itnesspkthunderball.h
index 366c4af5cb..9444e94323 100644
--- a/src/melee/it/items/itnesspkthunderball.h
+++ b/src/melee/it/items/itnesspkthunderball.h
@@ -2,8 +2,9 @@
 #define GALE01_2AB3F0
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2AB90C */ void it_802AB90C(Item_GObj*);
 /* 2AC050 */ bool it_802AC050(Item_GObj*);
diff --git a/src/melee/it/items/itnesspkthundertrail.h b/src/melee/it/items/itnesspkthundertrail.h
index 52ac2eba28..2e620e61c5 100644
--- a/src/melee/it/items/itnesspkthundertrail.h
+++ b/src/melee/it/items/itnesspkthundertrail.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2AC43C
 #define GALE01_2AC43C
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 3F6C08 */ extern ItemStateTable it_803F6C08[];
 
diff --git a/src/melee/it/items/itnessyoyo.h b/src/melee/it/items/itnessyoyo.h
index 179883ac5a..365e6daaba 100644
--- a/src/melee/it/items/itnessyoyo.h
+++ b/src/melee/it/items/itnessyoyo.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2BE598
 #define GALE01_2BE598
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2BFE34 */ void it_802BFE34(Item_GObj*);
 /* 2C016C */ void it_802C016C(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itoctarock.h b/src/melee/it/items/itoctarock.h
index 4fddf0a4f5..ce5f9f7fd7 100644
--- a/src/melee/it/items/itoctarock.h
+++ b/src/melee/it/items/itoctarock.h
@@ -2,8 +2,9 @@
 #define GALE01_2E4A44
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2E4A44 */ void it_802E4A44(Item_GObj*);
 /* 2E4B00 */ bool it_802E4B00(Item_GObj*);
diff --git a/src/melee/it/items/itoctarockstone.h b/src/melee/it/items/itoctarockstone.h
index d5e9452ade..3cefa5d998 100644
--- a/src/melee/it/items/itoctarockstone.h
+++ b/src/melee/it/items/itoctarockstone.h
@@ -2,8 +2,9 @@
 #define GALE01_2E878C
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2E878C */ void it_802E878C(Item_GObj*);
 /* 2E87D8 */ bool it_802E87D8(Item_GObj*);
diff --git a/src/melee/it/items/itoldkuri.h b/src/melee/it/items/itoldkuri.h
index a46b655d92..e28fbf0b4f 100644
--- a/src/melee/it/items/itoldkuri.h
+++ b/src/melee/it/items/itoldkuri.h
@@ -2,8 +2,9 @@
 #define GALE01_2D73D0
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2D73D0 */ void it_802D73D0(Item_GObj*, Item_GObj*);
 /* 2D73F0 */ void it_802D73F0(Item_GObj*);
diff --git a/src/melee/it/items/itoldottosea.h b/src/melee/it/items/itoldottosea.h
index 664f2337eb..916783dd36 100644
--- a/src/melee/it/items/itoldottosea.h
+++ b/src/melee/it/items/itoldottosea.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2E2470
 #define GALE01_2E2470
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 3F89C8 */ extern ItemStateTable it_803F89C8[];
 
diff --git a/src/melee/it/items/itparasol.h b/src/melee/it/items/itparasol.h
index 68d557c3af..69b8117fc6 100644
--- a/src/melee/it/items/itparasol.h
+++ b/src/melee/it/items/itparasol.h
@@ -2,9 +2,10 @@
 #define GALE01_28B08C
 
 #include <platform.h>
+#include "it/forward.h"
 #include <baselib/forward.h>
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 28B08C */ int it_8028B08C(Item_GObj* item_gobj, int statenum);
 /* 28B0B8 */ void it_8028B0B8(Item_GObj* item_gobj);
diff --git a/src/melee/it/items/itpeachexplode.h b/src/melee/it/items/itpeachexplode.h
index ec90c29154..3bd2dd9740 100644
--- a/src/melee/it/items/itpeachexplode.h
+++ b/src/melee/it/items/itpeachexplode.h
@@ -2,8 +2,9 @@
 #define GALE01_2BD158
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2BD240 */ bool it_802BD240(Item_GObj*);
 /* 2BD30C */ void it_802BD30C(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itpeachparasol.h b/src/melee/it/items/itpeachparasol.h
index 88f4a9d42e..7c9d988999 100644
--- a/src/melee/it/items/itpeachparasol.h
+++ b/src/melee/it/items/itpeachparasol.h
@@ -2,10 +2,11 @@
 #define GALE01_2BDA40
 
 #include <platform.h>
+#include "it/forward.h"
 #include <dolphin/mtx/forward.h>
 #include <baselib/forward.h>
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2BDA40 */ int it_802BDA40(Item_GObj*, int);
 /* 2BDA64 */ Item_GObj* it_802BDA64(HSD_GObj* parent, Vec3* pos, u8 arg2,
diff --git a/src/melee/it/items/itpeachtoad.h b/src/melee/it/items/itpeachtoad.h
index 039b877565..f348e7e6ae 100644
--- a/src/melee/it/items/itpeachtoad.h
+++ b/src/melee/it/items/itpeachtoad.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2BDE18
 #define GALE01_2BDE18
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2BDEFC */ void it_802BDEFC(Item_GObj*);
 /* 2BDFE0 */ void it_802BDFE0(Item_GObj*);
diff --git a/src/melee/it/items/itpeachtoadspore.h b/src/melee/it/items/itpeachtoadspore.h
index 8a6931288b..8964bd0593 100644
--- a/src/melee/it/items/itpeachtoadspore.h
+++ b/src/melee/it/items/itpeachtoadspore.h
@@ -2,8 +2,9 @@
 #define GALE01_2BE214
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2BE488 */ bool it_802BE488(Item_GObj*);
 /* 2BE4AC */ bool it_802BE4AC(Item_GObj*);
diff --git a/src/melee/it/items/itpeachturnip.h b/src/melee/it/items/itpeachturnip.h
index 07aa25ee10..4530d63819 100644
--- a/src/melee/it/items/itpeachturnip.h
+++ b/src/melee/it/items/itpeachturnip.h
@@ -2,8 +2,9 @@
 #define GALE01_2BD32C
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2BD47C */ void it_802BD47C(Item_GObj*);
 /* 2BD628 */ void it_802BD628(Item_GObj*);
diff --git a/src/melee/it/items/itpikachuthunder.h b/src/melee/it/items/itpikachuthunder.h
index c762589e18..43a0ad863b 100644
--- a/src/melee/it/items/itpikachuthunder.h
+++ b/src/melee/it/items/itpikachuthunder.h
@@ -2,8 +2,9 @@
 #define GALE01_2B1DEC
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2B202C */ void it_802B202C(Item_GObj*);
 /* 2B2508 */ bool it_802B2508(Item_GObj*);
diff --git a/src/melee/it/items/itpikachutjoltair.h b/src/melee/it/items/itpikachutjoltair.h
index 71f7f3f26c..28a54e6214 100644
--- a/src/melee/it/items/itpikachutjoltair.h
+++ b/src/melee/it/items/itpikachutjoltair.h
@@ -2,8 +2,9 @@
 #define GALE01_2B3EFC
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2B45F0 */ bool it_802B45F0(Item_GObj*);
 /* 2B4638 */ bool it_802B4638(Item_GObj*);
diff --git a/src/melee/it/items/itpikachutjoltground.h b/src/melee/it/items/itpikachutjoltground.h
index e859cf06b9..c44a6cb640 100644
--- a/src/melee/it/items/itpikachutjoltground.h
+++ b/src/melee/it/items/itpikachutjoltground.h
@@ -2,8 +2,9 @@
 #define GALE01_2B3368
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2B34E4 */ void it_802B34E4(Item_GObj*);
 /* 2B3A94 */ bool it_802B3A94(Item_GObj*);
diff --git a/src/melee/it/items/itpippi.h b/src/melee/it/items/itpippi.h
index 77514595aa..09e5b789b4 100644
--- a/src/melee/it/items/itpippi.h
+++ b/src/melee/it/items/itpippi.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2D3260
 #define GALE01_2D3260
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2D3260 */ void it_802D3260(Item_GObj*);
 /* 2D32DC */ void it_802D32DC(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itporygon2.h b/src/melee/it/items/itporygon2.h
index 8b8bad9927..fb8b899b31 100644
--- a/src/melee/it/items/itporygon2.h
+++ b/src/melee/it/items/itporygon2.h
@@ -2,9 +2,10 @@
 #define GALE01_2D5ABC
 
 #include <platform.h>
+#include "it/forward.h"
 #include <baselib/forward.h>
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2D5ABC */ void it_802D5ABC(Item_GObj*);
 /* 2D5B14 */ void it_802D5B14(Item_GObj*);
diff --git a/src/melee/it/items/itrabbitc.h b/src/melee/it/items/itrabbitc.h
index d75beed644..f00d290098 100644
--- a/src/melee/it/items/itrabbitc.h
+++ b/src/melee/it/items/itrabbitc.h
@@ -2,8 +2,9 @@
 #define GALE01_294DA0
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 294DA0 */ bool it_80294DA0(Item_GObj*);
 /* 295118 */ void it_80295118(Item_GObj*);
diff --git a/src/melee/it/items/itraikou.h b/src/melee/it/items/itraikou.h
index cbc544bb65..3ae47098e5 100644
--- a/src/melee/it/items/itraikou.h
+++ b/src/melee/it/items/itraikou.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2CF814
 #define GALE01_2CF814
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2CF814 */ void it_802CF814(Item_GObj*);
 /* 2CF884 */ void it_802CF884(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itrshell.h b/src/melee/it/items/itrshell.h
index 4b9ca576a1..40edbde759 100644
--- a/src/melee/it/items/itrshell.h
+++ b/src/melee/it/items/itrshell.h
@@ -2,8 +2,9 @@
 #define GALE01_28CFE0
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 28D59C */ void it_8028D59C(Item_GObj*);
 /* 28D898 */ void it_8028D898(Item_GObj*);
diff --git a/src/melee/it/items/itsamusbomb.h b/src/melee/it/items/itsamusbomb.h
index 8f0708c892..cb209e3245 100644
--- a/src/melee/it/items/itsamusbomb.h
+++ b/src/melee/it/items/itsamusbomb.h
@@ -2,8 +2,9 @@
 #define GALE01_2B4AC8
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2B4F78 */ void it_802B4F78(Item_GObj*);
 /* 2B52B8 */ bool it_802B52B8(Item_GObj*);
diff --git a/src/melee/it/items/itsamuschargeshot.h b/src/melee/it/items/itsamuschargeshot.h
index 1213d420c7..7e6786a002 100644
--- a/src/melee/it/items/itsamuschargeshot.h
+++ b/src/melee/it/items/itsamuschargeshot.h
@@ -2,8 +2,9 @@
 #define GALE01_2B5518
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2B58D8 */ void it_802B58D8(Item_GObj*);
 /* 2B59C4 */ void it_802B59C4(Item_GObj*);
diff --git a/src/melee/it/items/itsamusgrapple.h b/src/melee/it/items/itsamusgrapple.h
index c9a1d8edcf..d27cec755b 100644
--- a/src/melee/it/items/itsamusgrapple.h
+++ b/src/melee/it/items/itsamusgrapple.h
@@ -2,10 +2,11 @@
 #define GALE01_2B7150
 
 #include "ft/forward.h"
+#include "it/forward.h"
 #include <dolphin/mtx/forward.h>
 #include <baselib/forward.h>
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2A77DC */ void it_802A77DC(Item_GObj* gobj);
 /* 2B7150 */ void it_802B7150(Item_GObj*);
diff --git a/src/melee/it/items/itsamusmissile.h b/src/melee/it/items/itsamusmissile.h
index d8fe6fb256..d797e5913a 100644
--- a/src/melee/it/items/itsamusmissile.h
+++ b/src/melee/it/items/itsamusmissile.h
@@ -2,8 +2,9 @@
 #define GALE01_2B62D0
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2B6C28 */ bool it_802B6C28(Item_GObj*);
 /* 2B6C7C */ bool it_802B6C7C(Item_GObj*);
diff --git a/src/melee/it/items/itscball.h b/src/melee/it/items/itscball.h
index 79e42e6ab8..162b33f9d6 100644
--- a/src/melee/it/items/itscball.h
+++ b/src/melee/it/items/itscball.h
@@ -2,8 +2,9 @@
 #define GALE01_294AB0
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 294AB0 */ void it_80294AB0(Item_GObj*);
 /* 294BE4 */ void it_80294BE4(Item_GObj*);
diff --git a/src/melee/it/items/itseakchain.h b/src/melee/it/items/itseakchain.h
index f125162b80..679aff1c7f 100644
--- a/src/melee/it/items/itseakchain.h
+++ b/src/melee/it/items/itseakchain.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2BAEEC
 #define GALE01_2BAEEC
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2BCE94 */ void it_802BCE94(Item_GObj*);
 /* 2BD10C */ void it_802BD10C(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itseakneedleheld.h b/src/melee/it/items/itseakneedleheld.h
index 87635f9ad5..34cc7d9429 100644
--- a/src/melee/it/items/itseakneedleheld.h
+++ b/src/melee/it/items/itseakneedleheld.h
@@ -2,8 +2,9 @@
 #define GALE01_2B18B0
 
 #include "ft/forward.h"
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2AFD8C */ Fighter_GObj* it_802AFD8C(Fighter_GObj*, Vec3*, u32, float);
 /* 2AFEA8 */ Fighter_GObj* it_802AFEA8(Fighter_GObj*, Fighter_GObj*, u32);
diff --git a/src/melee/it/items/itseakneedlethrown.h b/src/melee/it/items/itseakneedlethrown.h
index 3ac969fe75..080385153f 100644
--- a/src/melee/it/items/itseakneedlethrown.h
+++ b/src/melee/it/items/itseakneedlethrown.h
@@ -2,8 +2,9 @@
 #define GALE01_2AFD8C
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2AFEF8 */ void it_802AFEF8(Item_GObj*);
 /* 2B0D84 */ bool it_802B0D84(Item_GObj*);
diff --git a/src/melee/it/items/itseakvanish.h b/src/melee/it/items/itseakvanish.h
index cd57e39f31..7005b79ca6 100644
--- a/src/melee/it/items/itseakvanish.h
+++ b/src/melee/it/items/itseakvanish.h
@@ -2,10 +2,11 @@
 #define GALE01_2B1C60
 
 #include <platform.h>
+#include "it/forward.h"
 #include <dolphin/mtx/forward.h>
 #include <baselib/forward.h>
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2B1C60 */ Item_GObj* it_802B1C60(HSD_GObj* parent, Vec3* pos, f32 dir);
 /* 2B1D38 */ bool it_802B1D38(Item_GObj*);
diff --git a/src/melee/it/items/itsonans.h b/src/melee/it/items/itsonans.h
index 6338cd83aa..21973c4fdb 100644
--- a/src/melee/it/items/itsonans.h
+++ b/src/melee/it/items/itsonans.h
@@ -2,8 +2,9 @@
 #define GALE01_2CD44C
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2CD44C */ void it_802CD44C(Item_GObj*);
 /* 2CD4DC */ void it_802CD4DC(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itspycloak.h b/src/melee/it/items/itspycloak.h
index e6b16c38e4..431b174e81 100644
--- a/src/melee/it/items/itspycloak.h
+++ b/src/melee/it/items/itspycloak.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_295C48
 #define GALE01_295C48
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 295C48 */ void it_80295C48(Item_GObj*);
 /* 295D90 */ void it_80295D90(Item_GObj*);
diff --git a/src/melee/it/items/itsscope.h b/src/melee/it/items/itsscope.h
index eaf6c407bd..4adf61b419 100644
--- a/src/melee/it/items/itsscope.h
+++ b/src/melee/it/items/itsscope.h
@@ -2,8 +2,9 @@
 #define GALE01_291BE0
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 291C98 */ void it_80291C98(Item_GObj*);
 /* 29215C */ void it_8029215C(Item_GObj*);
diff --git a/src/melee/it/items/itsscopebeam.h b/src/melee/it/items/itsscopebeam.h
index c67b40692b..1f2b35bab5 100644
--- a/src/melee/it/items/itsscopebeam.h
+++ b/src/melee/it/items/itsscopebeam.h
@@ -2,8 +2,9 @@
 #define GALE01_298DEC
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 299360 */ bool it_80299360(Item_GObj*);
 /* 299368 */ bool it_80299368(Item_GObj*);
diff --git a/src/melee/it/items/itstar.h b/src/melee/it/items/itstar.h
index 2504ab2071..de8bca491e 100644
--- a/src/melee/it/items/itstar.h
+++ b/src/melee/it/items/itstar.h
@@ -2,9 +2,10 @@
 #define GALE01_284644
 
 #include <platform.h>
+#include "it/forward.h"
 #include <baselib/forward.h>
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 284644 */ void it_80284644(Item_GObj*);
 /* 2846D4 */ void it_802846D4(Item_GObj*);
diff --git a/src/melee/it/items/itstarrod.h b/src/melee/it/items/itstarrod.h
index 980917c502..d92b2feaaa 100644
--- a/src/melee/it/items/itstarrod.h
+++ b/src/melee/it/items/itstarrod.h
@@ -2,8 +2,9 @@
 #define GALE01_292360
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 292360 */ void it_80292360(Item_GObj*);
 /* 292514 */ void it_80292514(Item_GObj*);
diff --git a/src/melee/it/items/itstarrodstar.h b/src/melee/it/items/itstarrodstar.h
index 66fdd21e52..a23aeb420a 100644
--- a/src/melee/it/items/itstarrodstar.h
+++ b/src/melee/it/items/itstarrodstar.h
@@ -2,8 +2,9 @@
 #define GALE01_2988E4
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 298BE4 */ bool it_80298BE4(Item_GObj*);
 /* 298BEC */ bool it_80298BEC(Item_GObj*);
diff --git a/src/melee/it/items/itsuikun.h b/src/melee/it/items/itsuikun.h
index d4f88ad3c5..4f2727b867 100644
--- a/src/melee/it/items/itsuikun.h
+++ b/src/melee/it/items/itsuikun.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2CFC48
 #define GALE01_2CFC48
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2CFC48 */ void it_802CFC48(Item_GObj*);
 /* 2CFCB8 */ void it_802CFCB8(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itsword.h b/src/melee/it/items/itsword.h
index 78164bfbd7..c5538f1134 100644
--- a/src/melee/it/items/itsword.h
+++ b/src/melee/it/items/itsword.h
@@ -2,11 +2,12 @@
 #define GALE01_284D54
 
 #include <platform.h>
+#include "it/forward.h"
 #include "it/items/forward.h"
 #include <dolphin/mtx/forward.h>
 #include <baselib/forward.h>
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 284D54 */ Item_GObj* itSword_Spawn(Vec3* pos);
 /* 284E10 */ void it_80284E10(HSD_GObj*, int);
diff --git a/src/melee/it/items/ittaru.h b/src/melee/it/items/ittaru.h
index 85eba20d8d..c4ad79cd23 100644
--- a/src/melee/it/items/ittaru.h
+++ b/src/melee/it/items/ittaru.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_287458
 #define GALE01_287458
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 287458 */ void it_80287458(Item_GObj*);
 /* 287E68 */ void it_80287E68(Item_GObj*);
diff --git a/src/melee/it/items/ittarucann.h b/src/melee/it/items/ittarucann.h
index 154361eb03..9120fb5487 100644
--- a/src/melee/it/items/ittarucann.h
+++ b/src/melee/it/items/ittarucann.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_295ED4
 #define GALE01_295ED4
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2960E0 */ void it_802960E0(Item_GObj*);
 /* 296120 */ void it_80296120(Item_GObj*);
diff --git a/src/melee/it/items/itthunder.h b/src/melee/it/items/itthunder.h
index 4812935036..ebd3ac04b8 100644
--- a/src/melee/it/items/itthunder.h
+++ b/src/melee/it/items/itthunder.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2CCAB4
 #define GALE01_2CCAB4
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2CCAB4 */ void it_802CCAB4(Item_GObj*);
 /* 2CCB14 */ void it_802CCB14(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/ittogepy.h b/src/melee/it/items/ittogepy.h
index eb4caec488..ee8932f3b1 100644
--- a/src/melee/it/items/ittogepy.h
+++ b/src/melee/it/items/ittogepy.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2D36B0
 #define GALE01_2D36B0
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2D36B0 */ void it_802D36B0(Item_GObj*);
 /* 2D372C */ void it_802D372C(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/ittomato.h b/src/melee/it/items/ittomato.h
index cbf31f0159..313b4b1945 100644
--- a/src/melee/it/items/ittomato.h
+++ b/src/melee/it/items/ittomato.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2841B4
 #define GALE01_2841B4
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 #include <placeholder.h>
 
diff --git a/src/melee/it/items/ittosakinto.h b/src/melee/it/items/ittosakinto.h
index 16944525ed..156829220d 100644
--- a/src/melee/it/items/ittosakinto.h
+++ b/src/melee/it/items/ittosakinto.h
@@ -1,7 +1,9 @@
 #ifndef GALE01_2C8F4C
 #define GALE01_2C8F4C
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2C8F4C */ void it_802C8F4C(Item_GObj*);
 /* 2C8FC4 */ void it_802C8FC4(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itunknown.h b/src/melee/it/items/itunknown.h
index 4d3762951e..49f0d497ab 100644
--- a/src/melee/it/items/itunknown.h
+++ b/src/melee/it/items/itunknown.h
@@ -3,7 +3,9 @@
 #ifndef GALE01_2CE710
 #define GALE01_2CE710
 
-#include "it/types.h"
+#include "it/forward.h"
+
+#include "it/items/types.h"
 
 /* 2CE710 */ void it_802CE710(Item_GObj*);
 /* 2CE7D0 */ void it_802CE7D0(Item_GObj*, Item_GObj*);
diff --git a/src/melee/it/items/itwstar.h b/src/melee/it/items/itwstar.h
index c1698075d6..1d0b216d06 100644
--- a/src/melee/it/items/itwstar.h
+++ b/src/melee/it/items/itwstar.h
@@ -2,10 +2,11 @@
 #define GALE01_294364
 
 #include "ftCommon/forward.h"
+#include "it/forward.h"
 #include <dolphin/mtx/forward.h>
 #include <baselib/forward.h>
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 294364 */ HSD_AnimJoint* it_80294364(Item_GObj*);
 /* 294430 */ void it_80294430(Item_GObj*, float, float);
diff --git a/src/melee/it/items/ityoshieggthrow.h b/src/melee/it/items/ityoshieggthrow.h
index ad1bf45a8c..68ced37ae3 100644
--- a/src/melee/it/items/ityoshieggthrow.h
+++ b/src/melee/it/items/ityoshieggthrow.h
@@ -2,8 +2,9 @@
 #define GALE01_2B2890
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2B2AE0 */ void it_802B2AE0(Item_GObj*);
 /* 2B2C04 */ bool it_802B2C04(Item_GObj*);
diff --git a/src/melee/it/items/ityoshistar.h b/src/melee/it/items/ityoshistar.h
index a7d72e3a92..113c70089f 100644
--- a/src/melee/it/items/ityoshistar.h
+++ b/src/melee/it/items/ityoshistar.h
@@ -2,10 +2,11 @@
 #define GALE01_2B2FC8
 
 #include <platform.h>
+#include "it/forward.h"
 #include <dolphin/mtx/forward.h>
 #include <baselib/forward.h>
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2B2FC8 */ Item_GObj* it_802B2FC8(HSD_GObj* parent, Vec3* pos, f32 dir);
 /* 2B309C */ bool it_802B309C(Item_GObj*);
diff --git a/src/melee/it/items/itzeldadinfire.h b/src/melee/it/items/itzeldadinfire.h
index 6fe3a76b6c..d6d91fa234 100644
--- a/src/melee/it/items/itzeldadinfire.h
+++ b/src/melee/it/items/itzeldadinfire.h
@@ -2,8 +2,9 @@
 #define GALE01_2C3AF0
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2C3CBC */ void it_802C3CBC(Item_GObj*);
 /* 2C443C */ bool it_802C443C(Item_GObj*);
diff --git a/src/melee/it/items/itzeldadinfireexplode.h b/src/melee/it/items/itzeldadinfireexplode.h
index 65663c3bb7..0d1913ffba 100644
--- a/src/melee/it/items/itzeldadinfireexplode.h
+++ b/src/melee/it/items/itzeldadinfireexplode.h
@@ -2,8 +2,9 @@
 #define GALE01_2C4580
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 /* 2C4670 */ void it_802C4670(Item_GObj*);
 /* 2C49A0 */ bool it_802C49A0(Item_GObj*);
diff --git a/src/melee/it/items/itzgshell.h b/src/melee/it/items/itzgshell.h
index e80538e436..55eba83fa7 100644
--- a/src/melee/it/items/itzgshell.h
+++ b/src/melee/it/items/itzgshell.h
@@ -2,8 +2,9 @@
 #define _itzgshell_h_
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 void it_802DE040(Item_GObj* gobj);
 void it_802DE434(Item_GObj* gobj);
diff --git a/src/melee/it/items/itzrshell.h b/src/melee/it/items/itzrshell.h
index e56c52de9d..f7fec934f8 100644
--- a/src/melee/it/items/itzrshell.h
+++ b/src/melee/it/items/itzrshell.h
@@ -2,8 +2,9 @@
 #define _itzrshell_h_
 
 #include <platform.h>
+#include "it/forward.h"
 
-#include "it/types.h"
+#include "it/items/types.h"
 
 void it_802E02E8(Item_GObj* gobj);
 void it_802E0308(Item_GObj* gobj);
diff --git a/src/melee/it/items/types.h b/src/melee/it/items/types.h
index 588deda7f9..43c494ca6b 100644
--- a/src/melee/it/items/types.h
+++ b/src/melee/it/items/types.h
@@ -2,10 +2,73 @@
 #define MELEE_IT_ITEMS_TYPES_H
 
 #include <platform.h>
-#include "it/items/forward.h"
+#include "it/items/forward.h" // IWYU pragma: export
+#include <baselib/forward.h>
 
 #include <placeholder.h>
 
+/// @todo Size unknown.
+struct ItemStateTable {
+    /// @at{0} @sz{4}
+    enum_t anim_id;
+
+    /// @at{4} @sz{4}
+    HSD_GObjPredicate animated;
+
+    /// @at{8} @sz{4}
+    HSD_GObjEvent physics_updated;
+
+    /// @at{C} @sz{4}
+    HSD_GObjPredicate collided;
+};
+
+struct ItemLogicTable {
+    /// @at{0} @sz{4}
+    ItemStateTable* states;
+
+    /// @at{4} @sz{4}
+    HSD_GObjEvent spawned;
+
+    /// @at{8} @sz{4}
+    HSD_GObjEvent destroyed;
+
+    /// @at{C} @sz{4}
+    HSD_GObjEvent picked_up;
+
+    /// @at{10} @sz{4}
+    HSD_GObjEvent dropped;
+
+    /// @at{14} @sz{4}
+    HSD_GObjEvent thrown;
+
+    /// @at{18} @sz{4}
+    HSD_GObjPredicate dmg_dealt;
+
+    /// @at{1C} @sz{4}
+    HSD_GObjPredicate dmg_received;
+
+    /// @at{20} @sz{4}
+    HSD_GObjEvent entered_air;
+
+    /// @at{24} @sz{4}
+    HSD_GObjPredicate reflected;
+
+    /// @at{28} @sz{4}
+    HSD_GObjPredicate clanked;
+
+    /// @at{2C} @sz{4}
+    HSD_GObjPredicate absorbed;
+
+    /// @at{30} @sz{4}
+    HSD_GObjPredicate shield_bounced;
+
+    /// @at{34} @sz{4}
+    HSD_GObjPredicate hit_shield;
+
+    /// @at{38} @sz{4}
+    HSD_GObjInteraction evt_unk;
+};
+
 struct itSword_UnkBytes {
     /*   +0 */ u8 x0;
     /*   +1 */ u8 x1;
diff --git a/src/melee/it/types.h b/src/melee/it/types.h
index 496eeca2a7..7e8438b34c 100644
--- a/src/melee/it/types.h
+++ b/src/melee/it/types.h
@@ -4,6 +4,7 @@
 #include <platform.h>
 #include "cm/forward.h"
 #include "it/forward.h" // IWYU pragma: export
+#include "it/items/forward.h"
 #include <dolphin/gx/forward.h>
 #include <baselib/forward.h>
 
@@ -18,68 +19,6 @@
 #include <dolphin/gx/types.h>
 #include <dolphin/mtx/types.h>
 
-/// @todo Size unknown.
-struct ItemStateTable {
-    /// @at{0} @sz{4}
-    enum_t anim_id;
-
-    /// @at{4} @sz{4}
-    HSD_GObjPredicate animated;
-
-    /// @at{8} @sz{4}
-    HSD_GObjEvent physics_updated;
-
-    /// @at{C} @sz{4}
-    HSD_GObjPredicate collided;
-};
-
-struct ItemLogicTable {
-    /// @at{0} @sz{4}
-    ItemStateTable* states;
-
-    /// @at{4} @sz{4}
-    HSD_GObjEvent spawned;
-
-    /// @at{8} @sz{4}
-    HSD_GObjEvent destroyed;
-
-    /// @at{C} @sz{4}
-    HSD_GObjEvent picked_up;
-
-    /// @at{10} @sz{4}
-    HSD_GObjEvent dropped;
-
-    /// @at{14} @sz{4}
-    HSD_GObjEvent thrown;
-
-    /// @at{18} @sz{4}
-    HSD_GObjPredicate dmg_dealt;
-
-    /// @at{1C} @sz{4}
-    HSD_GObjPredicate dmg_received;
-
-    /// @at{20} @sz{4}
-    HSD_GObjEvent entered_air;
-
-    /// @at{24} @sz{4}
-    HSD_GObjPredicate reflected;
-
-    /// @at{28} @sz{4}
-    HSD_GObjPredicate clanked;
-
-    /// @at{2C} @sz{4}
-    HSD_GObjPredicate absorbed;
-
-    /// @at{30} @sz{4}
-    HSD_GObjPredicate shield_bounced;
-
-    /// @at{34} @sz{4}
-    HSD_GObjPredicate hit_shield;
-
-    /// @at{38} @sz{4}
-    HSD_GObjInteraction evt_unk;
-};
-
 struct CameraBoxFlags {
     struct {
         u8 b01 : 2;