diff --git a/src/boot/boot.c b/src/boot/boot.c
index 7c17e59e6..0a565d263 100644
--- a/src/boot/boot.c
+++ b/src/boot/boot.c
@@ -7,7 +7,7 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_0dcdb0.h"
+#include "game/game_0e0770.h"
 #include "gvars/gvars.h"
 #include "lib/lib_03050.h"
 #include "lib/lib_03ee0.h"
diff --git a/src/game/bondbike.c b/src/game/bondbike.c
index b83d92b22..2e7457e56 100644
--- a/src/game/bondbike.c
+++ b/src/game/bondbike.c
@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "game/bondbike.h"
 #include "game/chr/chraction.h"
 #include "game/data/data_000000.h"
 #include "game/data/data_0083d0.h"
@@ -9,13 +10,14 @@
 #include "game/data/data_020df0.h"
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
+#include "game/game_091e10.h"
 #include "game/game_092610.h"
+#include "game/game_095320.h"
 #include "game/game_096ca0.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b3350.h"
 #include "game/game_0b63b0.h"
 #include "game/game_0c79f0.h"
-#include "game/bondbike.h"
 #include "game/game_113220.h"
 #include "game/game_167ae0.h"
 #include "game/pdoptions.h"
diff --git a/src/game/bondgrab.c b/src/game/bondgrab.c
index e191f1b74..f7a249425 100644
--- a/src/game/bondgrab.c
+++ b/src/game/bondgrab.c
@@ -11,7 +11,7 @@
 #include "game/data/data_020df0.h"
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
-#include "game/game_092610.h"
+#include "game/game_095320.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b63b0.h"
 #include "game/game_0c79f0.h"
diff --git a/src/game/bondwalk.c b/src/game/bondwalk.c
index 00b8cb102..4f4468fc7 100644
--- a/src/game/bondwalk.c
+++ b/src/game/bondwalk.c
@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "game/bondwalk.h"
 #include "game/cheats.h"
 #include "game/chr/chraction.h"
 #include "game/data/data_000000.h"
@@ -13,9 +14,9 @@
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
 #include "game/game_092610.h"
+#include "game/game_095320.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b63b0.h"
-#include "game/bondwalk.h"
 #include "game/game_0c79f0.h"
 #include "game/game_111600.h"
 #include "game/game_113220.h"
diff --git a/src/game/chr/chraction.c b/src/game/chr/chraction.c
index 3ffe4044d..010189cbb 100644
--- a/src/game/chr/chraction.c
+++ b/src/game/chr/chraction.c
@@ -16,6 +16,7 @@
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
 #include "game/game_092610.h"
+#include "game/game_095320.h"
 #include "game/game_096750.h"
 #include "game/game_0969d0.h"
 #include "game/game_097ba0.h"
diff --git a/src/game/chr/chraicommands.c b/src/game/chr/chraicommands.c
index d866c5c6c..d2d19b268 100644
--- a/src/game/chr/chraicommands.c
+++ b/src/game/chr/chraicommands.c
@@ -19,6 +19,7 @@
 #include "game/game_066310.h"
 #include "game/game_091e10.h"
 #include "game/game_092610.h"
+#include "game/game_095320.h"
 #include "game/game_096750.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b0420.h"
diff --git a/src/game/game_005fd0.c b/src/game/game_005fd0.c
index 2df85ead9..e95cffcf4 100644
--- a/src/game/game_005fd0.c
+++ b/src/game/game_005fd0.c
@@ -1,34 +1,18 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/chr/chraction.h"
 #include "game/data/data_000000.h"
 #include "game/data/data_0083d0.h"
 #include "game/data/data_00e460.h"
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_000920.h"
 #include "game/game_005fd0.h"
-#include "game/game_01e250.h"
-#include "game/game_0601b0.h"
 #include "game/game_092610.h"
-#include "game/game_096750.h"
-#include "game/game_0b3350.h"
-#include "game/game_0d4690.h"
 #include "game/game_11ecf0.h"
-#include "game/game_157db0.h"
-#include "game/game_166e40.h"
 #include "gvars/gvars.h"
-#include "lib/lib_04790.h"
-#include "lib/lib_09660.h"
-#include "lib/lib_0e9d0.h"
 #include "lib/lib_12dc0.h"
-#include "lib/lib_159b0.h"
 #include "lib/lib_16110.h"
 #include "lib/lib_1a500.h"
-#include "lib/lib_317f0.h"
-#include "lib/lib_4a360.h"
-#include "lib/lib_4b480.h"
 #include "types.h"
 
 bool func0f005fd0(s32 arg0)
diff --git a/src/game/game_006bd0.c b/src/game/game_006bd0.c
index 9467b1da5..1ab9ba738 100644
--- a/src/game/game_006bd0.c
+++ b/src/game/game_006bd0.c
@@ -9,13 +9,13 @@
 #include "game/data/data_020df0.h"
 #include "game/game_000920.h"
 #include "game/game_005fd0.h"
+#include "game/game_006bd0.h"
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
-#include "game/game_092610.h"
+#include "game/game_095320.h"
 #include "game/game_096750.h"
 #include "game/game_0b3350.h"
 #include "game/game_0d4690.h"
-#include "game/game_11ecf0.h"
 #include "game/game_157db0.h"
 #include "game/game_166e40.h"
 #include "gvars/gvars.h"
@@ -25,7 +25,6 @@
 #include "lib/lib_12dc0.h"
 #include "lib/lib_159b0.h"
 #include "lib/lib_16110.h"
-#include "lib/lib_1a500.h"
 #include "lib/lib_317f0.h"
 #include "lib/lib_4a360.h"
 #include "lib/lib_4b480.h"
diff --git a/src/game/game_00b820.c b/src/game/game_00b820.c
index e3d379154..4d2710954 100644
--- a/src/game/game_00b820.c
+++ b/src/game/game_00b820.c
@@ -11,7 +11,7 @@
 #include "game/game_00b820.h"
 #include "game/game_011110.h"
 #include "game/game_02cde0.h"
-#include "game/game_066310.h"
+#include "game/game_091e10.h"
 #include "gvars/gvars.h"
 #include "lib/lib_121e0.h"
 #include "lib/lib_12dc0.h"
diff --git a/src/game/game_00c490.c b/src/game/game_00c490.c
index a2e7f7f20..ec72923e9 100644
--- a/src/game/game_00c490.c
+++ b/src/game/game_00c490.c
@@ -21,6 +21,7 @@
 #include "game/game_02cde0.h"
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
+#include "game/game_091e10.h"
 #include "game/game_096750.h"
 #include "game/game_111600.h"
 #include "game/game_127910.h"
diff --git a/src/game/game_011110.c b/src/game/game_011110.c
index 482e7cfbb..55e919c9c 100644
--- a/src/game/game_011110.c
+++ b/src/game/game_011110.c
@@ -12,7 +12,7 @@
 #include "game/game_01e250.h"
 #include "game/game_02cde0.h"
 #include "game/game_0601b0.h"
-#include "game/game_066310.h"
+#include "game/game_091e10.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b63b0.h"
 #include "game/game_0c79f0.h"
diff --git a/src/game/game_015010.c b/src/game/game_015010.c
index 4e3caeb3e..deb509249 100644
--- a/src/game/game_015010.c
+++ b/src/game/game_015010.c
@@ -8,6 +8,7 @@
 #include "game/data/data_020df0.h"
 #include "game/game_015010.h"
 #include "game/game_066310.h"
+#include "game/game_091e10.h"
 #include "gvars/gvars.h"
 #include "types.h"
 
diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c
index 6fa60fdff..411b8d4fb 100644
--- a/src/game/game_01bea0.c
+++ b/src/game/game_01bea0.c
@@ -12,12 +12,11 @@
 #include "game/game_01bea0.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b63b0.h"
-#include "game/game_0dcdb0.h"
+#include "game/game_0e0770.h"
 #include "game/game_0f09f0.h"
 #include "game/game_102240.h"
 #include "game/game_10ccd0.h"
 #include "game/game_127910.h"
-#include "game/game_131060.h"
 #include "game/game_167ae0.h"
 #include "game/game_16cfa0.h"
 #include "game/game_177e00.h"
diff --git a/src/game/game_01d770.c b/src/game/game_01d770.c
index d9357a209..f59c9501f 100644
--- a/src/game/game_01d770.c
+++ b/src/game/game_01d770.c
@@ -6,30 +6,9 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_005fd0.h"
-#include "game/game_016100.h"
-#include "game/game_01b0a0.h"
-#include "game/game_01bea0.h"
-#include "game/game_097ba0.h"
-#include "game/game_0b63b0.h"
-#include "game/game_0dcdb0.h"
-#include "game/game_0f09f0.h"
-#include "game/game_102240.h"
-#include "game/game_10ccd0.h"
-#include "game/game_127910.h"
 #include "game/game_131060.h"
-#include "game/game_167ae0.h"
-#include "game/game_16cfa0.h"
-#include "game/game_177e00.h"
-#include "game/game_179060.h"
-#include "game/game_187770.h"
-#include "game/game_19aa80.h"
-#include "game/game_19c990.h"
 #include "gvars/gvars.h"
-#include "lib/lib_09660.h"
 #include "lib/lib_0d520.h"
-#include "lib/lib_0e9d0.h"
-#include "lib/lib_13900.h"
 #include "types.h"
 
 const char var7f1a8640[] = "wettick";
diff --git a/src/game/game_01e250.c b/src/game/game_01e250.c
index 0f9b494cd..aec835d3e 100644
--- a/src/game/game_01e250.c
+++ b/src/game/game_01e250.c
@@ -12,6 +12,7 @@
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
 #include "game/game_092610.h"
+#include "game/game_095320.h"
 #include "game/game_096360.h"
 #include "game/game_097ba0.h"
 #include "game/game_0abe70.h"
diff --git a/src/game/game_0601b0.c b/src/game/game_0601b0.c
index 832c50e70..5b79d3e5b 100644
--- a/src/game/game_0601b0.c
+++ b/src/game/game_0601b0.c
@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "game/bondwalk.h"
 #include "game/chr/chraction.h"
 #include "game/data/data_000000.h"
 #include "game/data/data_0083d0.h"
@@ -12,13 +13,13 @@
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
 #include "game/game_092610.h"
+#include "game/game_095320.h"
 #include "game/game_097890.h"
 #include "game/game_097970.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b0420.h"
 #include "game/game_0b3350.h"
 #include "game/game_0b63b0.h"
-#include "game/bondwalk.h"
 #include "game/game_0c79f0.h"
 #include "game/game_127910.h"
 #include "game/game_129900.h"
diff --git a/src/game/game_066310.c b/src/game/game_066310.c
index 0117432df..ef23dace5 100644
--- a/src/game/game_066310.c
+++ b/src/game/game_066310.c
@@ -1,5 +1,6 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "game/bondwalk.h"
 #include "game/cheats.h"
 #include "game/chr/chraction.h"
 #include "game/chr/chrai.h"
@@ -10,12 +11,14 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/game_000920.h"
-#include "game/game_005fd0.h"
+#include "game/game_006bd0.h"
 #include "game/game_011110.h"
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
+#include "game/game_091e10.h"
 #include "game/game_092610.h"
+#include "game/game_095320.h"
 #include "game/game_096360.h"
 #include "game/game_096750.h"
 #include "game/game_0969d0.h"
@@ -29,7 +32,6 @@
 #include "game/game_0b3350.h"
 #include "game/game_0b63b0.h"
 #include "game/game_0c33f0.h"
-#include "game/bondwalk.h"
 #include "game/game_0c79f0.h"
 #include "game/game_0dcdb0.h"
 #include "game/game_0f09f0.h"
@@ -54,7 +56,6 @@
 #include "game/game_190260.h"
 #include "game/game_1999b0.h"
 #include "game/game_19c990.h"
-#include "game/game_1a3340.h"
 #include "game/lang.h"
 #include "game/pad.h"
 #include "game/pdoptions.h"
diff --git a/src/game/game_091e10.c b/src/game/game_091e10.c
index a672aa593..70d56f2d9 100644
--- a/src/game/game_091e10.c
+++ b/src/game/game_091e10.c
@@ -1,83 +1,19 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/cheats.h"
-#include "game/chr/chraction.h"
-#include "game/chr/chrai.h"
 #include "game/data/data_000000.h"
 #include "game/data/data_0083d0.h"
 #include "game/data/data_00e460.h"
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_000920.h"
-#include "game/game_005fd0.h"
-#include "game/game_011110.h"
-#include "game/game_01e250.h"
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
 #include "game/game_091e10.h"
-#include "game/game_092610.h"
-#include "game/game_096360.h"
-#include "game/game_096750.h"
-#include "game/game_0969d0.h"
-#include "game/game_096ca0.h"
-#include "game/game_097890.h"
-#include "game/game_097970.h"
-#include "game/game_097ba0.h"
-#include "game/game_0abe70.h"
-#include "game/game_0b0420.h"
 #include "game/game_0b28d0.h"
-#include "game/game_0b3350.h"
-#include "game/game_0b63b0.h"
-#include "game/game_0c33f0.h"
-#include "game/bondwalk.h"
-#include "game/game_0c79f0.h"
-#include "game/game_0dcdb0.h"
-#include "game/game_0f09f0.h"
-#include "game/game_111600.h"
-#include "game/game_11ecf0.h"
-#include "game/game_127910.h"
-#include "game/game_128f30.h"
-#include "game/game_129210.h"
-#include "game/game_129900.h"
-#include "game/game_12d3f0.h"
-#include "game/game_12f6c0.h"
-#include "game/game_13e0e0.h"
-#include "game/game_150820.h"
-#include "game/game_1531a0.h"
 #include "game/game_157db0.h"
-#include "game/game_1655c0.h"
-#include "game/game_165670.h"
-#include "game/game_166e40.h"
-#include "game/game_167ae0.h"
-#include "game/game_179060.h"
-#include "game/game_187770.h"
-#include "game/game_190260.h"
-#include "game/game_1999b0.h"
-#include "game/game_19c990.h"
 #include "game/game_1a3340.h"
-#include "game/lang.h"
-#include "game/pad.h"
-#include "game/pdoptions.h"
 #include "gvars/gvars.h"
-#include "lib/lib_04790.h"
-#include "lib/lib_04a80.h"
-#include "lib/lib_09660.h"
-#include "lib/lib_0d0a0.h"
-#include "lib/lib_0d520.h"
-#include "lib/lib_0e9d0.h"
-#include "lib/lib_121e0.h"
-#include "lib/lib_12dc0.h"
-#include "lib/lib_13130.h"
-#include "lib/lib_159b0.h"
-#include "lib/lib_16110.h"
 #include "lib/lib_1a500.h"
-#include "lib/lib_233c0.h"
-#include "lib/lib_317f0.h"
-#include "lib/lib_4a360.h"
-#include "lib/lib_4a5e0.h"
-#include "lib/lib_4b480.h"
-#include "lib/lib_4e270.h"
 #include "types.h"
 
 u32 setupGetCommandLength(u32 *cmd)
diff --git a/src/game/game_092610.c b/src/game/game_092610.c
index 6b2495cbe..fd37364a2 100644
--- a/src/game/game_092610.c
+++ b/src/game/game_092610.c
@@ -1,6 +1,5 @@
 #include <ultra64.h>
 #include "constants.h"
-#include "game/chr/chraction.h"
 #include "game/chr/chraicommands.h"
 #include "game/data/data_000000.h"
 #include "game/data/data_0083d0.h"
@@ -9,33 +8,20 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/game_000920.h"
-#include "game/game_0601b0.h"
-#include "game/game_066310.h"
 #include "game/game_092610.h"
 #include "game/game_096750.h"
-#include "game/game_0b3350.h"
 #include "game/game_0dcdb0.h"
-#include "game/game_111600.h"
-#include "game/game_11ecf0.h"
-#include "game/game_127910.h"
 #include "game/game_166e40.h"
 #include "game/game_167ae0.h"
 #include "game/game_187770.h"
-#include "game/game_19c990.h"
-#include "game/lang.h"
 #include "game/pad.h"
 #include "gvars/gvars.h"
-#include "lib/lib_0d0a0.h"
 #include "lib/lib_0e9d0.h"
-#include "lib/lib_121e0.h"
 #include "lib/lib_12dc0.h"
-#include "lib/lib_13130.h"
-#include "lib/lib_159b0.h"
 #include "lib/lib_16110.h"
 #include "lib/lib_317f0.h"
 #include "lib/lib_481e0.h"
 #include "lib/lib_48830.h"
-#include "lib/lib_49a90.h"
 #include "lib/lib_4a360.h"
 #include "types.h"
 
diff --git a/src/game/game_095320.c b/src/game/game_095320.c
index 757d14020..5dbd00ffe 100644
--- a/src/game/game_095320.c
+++ b/src/game/game_095320.c
@@ -1,42 +1,31 @@
 #include <ultra64.h>
 #include "constants.h"
 #include "game/chr/chraction.h"
-#include "game/chr/chraicommands.h"
 #include "game/data/data_000000.h"
 #include "game/data/data_0083d0.h"
 #include "game/data/data_00e460.h"
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_000920.h"
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
-#include "game/game_092610.h"
-#include "game/game_096750.h"
+#include "game/game_091e10.h"
+#include "game/game_095320.h"
 #include "game/game_0b3350.h"
 #include "game/game_0dcdb0.h"
 #include "game/game_111600.h"
 #include "game/game_11ecf0.h"
 #include "game/game_127910.h"
-#include "game/game_166e40.h"
 #include "game/game_167ae0.h"
-#include "game/game_187770.h"
 #include "game/game_19c990.h"
 #include "game/lang.h"
-#include "game/pad.h"
 #include "gvars/gvars.h"
 #include "lib/lib_0d0a0.h"
-#include "lib/lib_0e9d0.h"
 #include "lib/lib_121e0.h"
 #include "lib/lib_12dc0.h"
 #include "lib/lib_13130.h"
 #include "lib/lib_159b0.h"
-#include "lib/lib_16110.h"
-#include "lib/lib_317f0.h"
-#include "lib/lib_481e0.h"
-#include "lib/lib_48830.h"
 #include "lib/lib_49a90.h"
-#include "lib/lib_4a360.h"
 #include "types.h"
 
 const u32 var7f1ab790[] = {0x00000000};
diff --git a/src/game/game_096360.c b/src/game/game_096360.c
index fd8b5304f..a91750b22 100644
--- a/src/game/game_096360.c
+++ b/src/game/game_096360.c
@@ -7,7 +7,7 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/game_066310.h"
-#include "game/game_092610.h"
+#include "game/game_095320.h"
 #include "game/game_096360.h"
 #include "game/game_0b3350.h"
 #include "game/game_19c990.h"
diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c
index bfd6a0144..021ba255b 100644
--- a/src/game/game_0b63b0.c
+++ b/src/game/game_0b63b0.c
@@ -8,13 +8,14 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_005fd0.h"
+#include "game/game_006bd0.h"
 #include "game/game_016100.h"
 #include "game/game_01e250.h"
 #include "game/game_02cde0.h"
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
 #include "game/game_092610.h"
+#include "game/game_095320.h"
 #include "game/game_096750.h"
 #include "game/game_096ca0.h"
 #include "game/game_097ba0.h"
diff --git a/src/game/game_0c79f0.c b/src/game/game_0c79f0.c
index 8b3c877ea..bf7b60d61 100644
--- a/src/game/game_0c79f0.c
+++ b/src/game/game_0c79f0.c
@@ -1,6 +1,8 @@
 #include <ultra64.h>
 #include "constants.h"
+#include "game/bondbike.h"
 #include "game/bondgrab.h"
+#include "game/bondwalk.h"
 #include "game/cheats.h"
 #include "game/chr/chraction.h"
 #include "game/data/data_000000.h"
@@ -20,9 +22,7 @@
 #include "game/game_0b3350.h"
 #include "game/game_0b63b0.h"
 #include "game/game_0c3620.h"
-#include "game/bondwalk.h"
 #include "game/game_0c79f0.h"
-#include "game/bondbike.h"
 #include "game/game_0fd660.h"
 #include "game/game_113220.h"
 #include "game/game_127910.h"
diff --git a/src/game/game_0dcdb0.c b/src/game/game_0dcdb0.c
index e0bd1000d..ab9f013fe 100644
--- a/src/game/game_0dcdb0.c
+++ b/src/game/game_0dcdb0.c
@@ -6,39 +6,26 @@
 #include "game/data/data_0160b0.h"
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
-#include "game/game_005fd0.h"
 #include "game/game_066310.h"
 #include "game/game_092610.h"
-#include "game/game_097ba0.h"
 #include "game/game_0b0420.h"
-#include "game/game_0b3350.h"
 #include "game/game_0b63b0.h"
 #include "game/game_0d4690.h"
 #include "game/game_0dcdb0.h"
-#include "game/game_0f09f0.h"
+#include "game/game_0e0770.h"
 #include "game/game_127910.h"
-#include "game/game_148b80.h"
 #include "game/game_1531a0.h"
-#include "game/game_166e40.h"
 #include "game/game_167ae0.h"
-#include "game/game_176d70.h"
 #include "game/game_187770.h"
-#include "game/game_19aa80.h"
-#include "game/game_19c990.h"
-#include "game/lang.h"
 #include "game/pdoptions.h"
 #include "gvars/gvars.h"
 #include "lib/lib_09660.h"
-#include "lib/lib_0d520.h"
 #include "lib/lib_0e9d0.h"
 #include "lib/lib_121e0.h"
-#include "lib/lib_12dc0.h"
 #include "lib/lib_13130.h"
-#include "lib/lib_159b0.h"
 #include "lib/lib_16110.h"
 #include "lib/lib_4a360.h"
 #include "lib/lib_4a5e0.h"
-#include "lib/lib_4b480.h"
 #include "types.h"
 
 const char var7f1ade80[] = "%s%s%4.2fX";
diff --git a/src/game/game_0e0770.c b/src/game/game_0e0770.c
index 66c464937..e54f6e879 100644
--- a/src/game/game_0e0770.c
+++ b/src/game/game_0e0770.c
@@ -7,37 +7,19 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/game_005fd0.h"
-#include "game/game_066310.h"
-#include "game/game_092610.h"
 #include "game/game_097ba0.h"
-#include "game/game_0b0420.h"
 #include "game/game_0b3350.h"
-#include "game/game_0b63b0.h"
 #include "game/game_0d4690.h"
-#include "game/game_0dcdb0.h"
-#include "game/game_0f09f0.h"
-#include "game/game_127910.h"
-#include "game/game_148b80.h"
+#include "game/game_0e0770.h"
 #include "game/game_1531a0.h"
 #include "game/game_166e40.h"
-#include "game/game_167ae0.h"
 #include "game/game_176d70.h"
-#include "game/game_187770.h"
-#include "game/game_19aa80.h"
-#include "game/game_19c990.h"
-#include "game/lang.h"
-#include "game/pdoptions.h"
 #include "gvars/gvars.h"
 #include "lib/lib_09660.h"
 #include "lib/lib_0d520.h"
-#include "lib/lib_0e9d0.h"
-#include "lib/lib_121e0.h"
 #include "lib/lib_12dc0.h"
-#include "lib/lib_13130.h"
 #include "lib/lib_159b0.h"
 #include "lib/lib_16110.h"
-#include "lib/lib_4a360.h"
-#include "lib/lib_4a5e0.h"
 #include "lib/lib_4b480.h"
 #include "types.h"
 
diff --git a/src/game/game_0e5ce0.c b/src/game/game_0e5ce0.c
index 5f350b20e..249847cc9 100644
--- a/src/game/game_0e5ce0.c
+++ b/src/game/game_0e5ce0.c
@@ -7,21 +7,14 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/game_005fd0.h"
-#include "game/game_066310.h"
-#include "game/game_092610.h"
-#include "game/game_097ba0.h"
-#include "game/game_0b0420.h"
+#include "game/game_095320.h"
 #include "game/game_0b3350.h"
-#include "game/game_0b63b0.h"
-#include "game/game_0d4690.h"
-#include "game/game_0dcdb0.h"
+#include "game/game_0e0770.h"
+#include "game/game_0e5ce0.h"
 #include "game/game_0f09f0.h"
-#include "game/game_127910.h"
 #include "game/game_148b80.h"
 #include "game/game_1531a0.h"
-#include "game/game_166e40.h"
 #include "game/game_167ae0.h"
-#include "game/game_176d70.h"
 #include "game/game_187770.h"
 #include "game/game_19aa80.h"
 #include "game/game_19c990.h"
@@ -30,15 +23,7 @@
 #include "gvars/gvars.h"
 #include "lib/lib_09660.h"
 #include "lib/lib_0d520.h"
-#include "lib/lib_0e9d0.h"
-#include "lib/lib_121e0.h"
-#include "lib/lib_12dc0.h"
 #include "lib/lib_13130.h"
-#include "lib/lib_159b0.h"
-#include "lib/lib_16110.h"
-#include "lib/lib_4a360.h"
-#include "lib/lib_4a5e0.h"
-#include "lib/lib_4b480.h"
 #include "types.h"
 
 const char var7f1adfa0[] = "brcol";
diff --git a/src/game/game_0f09f0.c b/src/game/game_0f09f0.c
index 94cba8799..b0c2cb532 100644
--- a/src/game/game_0f09f0.c
+++ b/src/game/game_0f09f0.c
@@ -7,15 +7,17 @@
 #include "game/data/data_01a3a0.h"
 #include "game/data/data_020df0.h"
 #include "game/game_005fd0.h"
+#include "game/game_006bd0.h"
 #include "game/game_02cde0.h"
 #include "game/game_066310.h"
-#include "game/game_092610.h"
+#include "game/game_095320.h"
 #include "game/game_096ca0.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b3350.h"
 #include "game/game_0b63b0.h"
 #include "game/game_0d4690.h"
-#include "game/game_0dcdb0.h"
+#include "game/game_0e0770.h"
+#include "game/game_0e5ce0.h"
 #include "game/game_0f09f0.h"
 #include "game/game_0fd660.h"
 #include "game/game_107fb0.h"
diff --git a/src/game/game_102240.c b/src/game/game_102240.c
index 12a98d3d0..31df98d29 100644
--- a/src/game/game_102240.c
+++ b/src/game/game_102240.c
@@ -10,7 +10,7 @@
 #include "game/game_016100.h"
 #include "game/game_01b0a0.h"
 #include "game/game_01bea0.h"
-#include "game/game_092610.h"
+#include "game/game_095320.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b0420.h"
 #include "game/game_0b3350.h"
diff --git a/src/game/game_10ccd0.c b/src/game/game_10ccd0.c
index c3a990045..9d3e16f8b 100644
--- a/src/game/game_10ccd0.c
+++ b/src/game/game_10ccd0.c
@@ -10,12 +10,12 @@
 #include "game/game_005fd0.h"
 #include "game/game_016100.h"
 #include "game/game_01b0a0.h"
-#include "game/game_092610.h"
+#include "game/game_095320.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b0420.h"
 #include "game/game_0b63b0.h"
 #include "game/game_0d4690.h"
-#include "game/game_0dcdb0.h"
+#include "game/game_0e0770.h"
 #include "game/game_0f09f0.h"
 #include "game/game_102240.h"
 #include "game/game_107fb0.h"
diff --git a/src/game/game_129900.c b/src/game/game_129900.c
index d905faffa..b43bff3b6 100644
--- a/src/game/game_129900.c
+++ b/src/game/game_129900.c
@@ -11,6 +11,7 @@
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
+#include "game/game_091e10.h"
 #include "game/game_092610.h"
 #include "game/game_0b3350.h"
 #include "game/game_129900.h"
diff --git a/src/game/game_131060.c b/src/game/game_131060.c
index 7bb9c5cda..402b4dae8 100644
--- a/src/game/game_131060.c
+++ b/src/game/game_131060.c
@@ -13,7 +13,7 @@
 #include "game/game_0b3350.h"
 #include "game/game_0b63b0.h"
 #include "game/game_0d4690.h"
-#include "game/game_0dcdb0.h"
+#include "game/game_0e0770.h"
 #include "game/game_0f09f0.h"
 #include "game/game_12f6c0.h"
 #include "game/game_131060.h"
diff --git a/src/game/game_148b80.c b/src/game/game_148b80.c
index fc9322b8c..92ceb7853 100644
--- a/src/game/game_148b80.c
+++ b/src/game/game_148b80.c
@@ -23,6 +23,7 @@
 #include "lib/lib_121e0.h"
 #include "lib/lib_126b0.h"
 #include "lib/lib_12dc0.h"
+#include "lib/lib_159b0.h"
 #include "lib/lib_16110.h"
 #include "lib/lib_1a500.h"
 #include "lib/lib_481e0.h"
diff --git a/src/game/game_167ae0.c b/src/game/game_167ae0.c
index a6f535c69..98b950c56 100644
--- a/src/game/game_167ae0.c
+++ b/src/game/game_167ae0.c
@@ -11,6 +11,7 @@
 #include "game/data/data_020df0.h"
 #include "game/game_000920.h"
 #include "game/game_005fd0.h"
+#include "game/game_006bd0.h"
 #include "game/game_00b480.h"
 #include "game/game_00b820.h"
 #include "game/game_00c240.h"
@@ -45,6 +46,7 @@
 #include "game/game_016100.h"
 #include "game/game_01b0a0.h"
 #include "game/game_01bea0.h"
+#include "game/game_01d770.h"
 #include "game/game_01d860.h"
 #include "game/game_01d990.h"
 #include "game/game_01d9f0.h"
@@ -52,7 +54,7 @@
 #include "game/game_01e250.h"
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
-#include "game/game_092610.h"
+#include "game/game_095320.h"
 #include "game/game_097ba0.h"
 #include "game/game_0abe70.h"
 #include "game/game_0b0420.h"
diff --git a/src/game/game_19c990.c b/src/game/game_19c990.c
index e3fafcb3a..3f48fdf5c 100644
--- a/src/game/game_19c990.c
+++ b/src/game/game_19c990.c
@@ -11,6 +11,7 @@
 #include "game/game_0601b0.h"
 #include "game/game_066310.h"
 #include "game/game_092610.h"
+#include "game/game_095320.h"
 #include "game/game_096750.h"
 #include "game/game_097ba0.h"
 #include "game/game_0b0420.h"
diff --git a/src/game/game_1a3340.c b/src/game/game_1a3340.c
index 443187c25..f01e5c769 100644
--- a/src/game/game_1a3340.c
+++ b/src/game/game_1a3340.c
@@ -11,7 +11,7 @@
 #include "game/game_097ba0.h"
 #include "game/game_0b0420.h"
 #include "game/game_0b3350.h"
-#include "game/game_0dcdb0.h"
+#include "game/game_0e0770.h"
 #include "game/game_0f09f0.h"
 #include "game/game_102240.h"
 #include "game/game_111600.h"
diff --git a/src/include/game/game_0e5ce0.h b/src/include/game/game_0e5ce0.h
index 6fb9d9b5b..79d4cf12b 100644
--- a/src/include/game/game_0e5ce0.h
+++ b/src/include/game/game_0e5ce0.h
@@ -9,14 +9,14 @@ u32 func0f0e6038(void);
 u32 func0f0e6298(void);
 u32 func0f0e6328(void);
 u32 func0f0e75a0(void);
-u32 func0f0e7998(void);
+void func0f0e7998(u8 *arg0, u32 *arg1);
 u32 func0f0e7a8c(void);
 u32 func0f0e8138(void);
 u32 func0f0e8290(void);
 u32 func0f0e855c(void);
 u32 func0f0e85ac(void);
 u32 func0f0e91d0(void);
-u32 func0f0e9744(void);
+void func0f0e9744(u8 *arg0, u32 *arg1);
 u32 func0f0e97d0(void);
 u32 func0f0e98ac(void);
 u32 func0f0ea290(void);
@@ -27,7 +27,7 @@ u32 func0f0eaec0(void);
 u32 func0f0eb46c(void);
 u32 func0f0eb508(void);
 u32 func0f0ebec8(void);
-u32 func0f0ec220(void);
+void func0f0ec220(u32 *arg0);
 u32 func0f0ec228(void);
 u32 func0f0ec4e4(void);
 u32 func0f0ec64c(void);
@@ -35,18 +35,18 @@ u32 func0f0ecbfc(void);
 u32 func0f0ecc98(void);
 u32 func0f0ece20(void);
 u32 func0f0ed264(void);
-u32 func0f0ed514(void);
+void func0f0ed514(u32 *arg0);
 u32 func0f0ed528(void);
 u32 func0f0eda34(void);
-u32 func0f0edb50(void);
+void func0f0edb50(u32 *arg0);
 u32 func0f0edb64(u32 arg);
 u32 func0f0edb6c(void);
 u32 func0f0ee574(void);
-u32 func0f0ee640(void);
+void func0f0ee640(u32 *arg0);
 u32 func0f0ee648(void);
 u32 func0f0ef200(void);
 u32 func0f0ef2fc(void);
-u32 func0f0ef360(void);
+void func0f0ef360(u8 *arg0, u32 *arg1);
 u32 func0f0ef394(void);
 u32 func0f0ef4bc(void);
 u32 func0f0ef758(void);
@@ -54,7 +54,7 @@ u32 func0f0efa90(void);
 u32 func0f0efbb4(void);
 u32 func0f0efe30(void);
 u32 func0f0eff78(void);
-u32 func0f0f057c(void);
+void func0f0f057c(u32 *arg0);
 u32 func0f0f059c(void);
 u32 func0f0f0704(void);
 void func0f0f0860(u8 *arg0, u32 *arg1);
diff --git a/src/lib/lib_0d520.c b/src/lib/lib_0d520.c
index 774ab9529..653d6a300 100644
--- a/src/lib/lib_0d520.c
+++ b/src/lib/lib_0d520.c
@@ -20,14 +20,14 @@
 #include "game/game_0008f0.h"
 #include "game/game_000900.h"
 #include "game/game_000910.h"
-#include "game/game_005fd0.h"
+#include "game/game_006bd0.h"
 #include "game/game_00b190.h"
 #include "game/game_00b200.h"
 #include "game/game_00b210.h"
 #include "game/game_00b320.h"
 #include "game/game_016100.h"
 #include "game/game_01b0a0.h"
-#include "game/game_092610.h"
+#include "game/game_095320.h"
 #include "game/game_10ccd0.h"
 #include "game/game_1165d0.h"
 #include "game/game_11ecf0.h"