diff --git a/include/main_02008194.h b/include/main_02008194.h
index 06e6e9c5..bf8bf713 100644
--- a/include/main_02008194.h
+++ b/include/main_02008194.h
@@ -1,7 +1,6 @@
 #ifndef PMDSKY_MAIN_02008194_H
 #define PMDSKY_MAIN_02008194_H
 
-#include "util.h"
 #include "file.h"
 
 struct unk_020AF360 {
diff --git a/include/main_02009BE8.h b/include/main_02009BE8.h
index a8836839..d4a660be 100644
--- a/include/main_02009BE8.h
+++ b/include/main_02009BE8.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_MAIN_02009BE8_H
 #define PMDSKY_MAIN_02009BE8_H
 
-#include "util.h"
-
 void sub_02009BE8(u32 value, s32 flag);
 void sub_02009C10(u32 value, s32 flag);
 void sub_02009C38(u32 value);
diff --git a/include/main_0200CA54.h b/include/main_0200CA54.h
index 14fd944b..f605c92f 100644
--- a/include/main_0200CA54.h
+++ b/include/main_0200CA54.h
@@ -1,7 +1,6 @@
 #ifndef PMDSKY_MAIN_0200CA54_H
 #define PMDSKY_MAIN_0200CA54_H
 
-#include "util.h"
 #include "item.h"
 
 s16 GetDamageSource(s32 a, enum item_id item_id);
diff --git a/include/main_02017C80.h b/include/main_02017C80.h
index fbc7c8d1..601d0eb0 100644
--- a/include/main_02017C80.h
+++ b/include/main_02017C80.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_MAIN_02017C80_H
 #define PMDSKY_MAIN_02017C80_H
 
-#include "util.h"
-
 void PlaySeByIdVolumeWrapper(s32 se_id);
 void sub_02017C90(s32 a, s32 b, s32 c, s32 d);
 void sub_02017C9C(s32 a, s32 b, s32 c);
diff --git a/include/main_0201E380.h b/include/main_0201E380.h
index ffc1d0d3..934db7ea 100644
--- a/include/main_0201E380.h
+++ b/include/main_0201E380.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_MAIN_0201E380_H
 #define PMDSKY_MAIN_0201E380_H
 
-#include "util.h"
-
 struct unk_0201E380 {
     u8 field_0x0[0x18];
     u16* field_0x18;
diff --git a/include/main_0202613C.h b/include/main_0202613C.h
index 17d759e6..7713abd0 100644
--- a/include/main_0202613C.h
+++ b/include/main_0202613C.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_MAIN_0202613C_H
 #define PMDSKY_MAIN_0202613C_H
 
-#include "util.h"
-
 struct unk_02026130 {
     u8 field_0x0[4];
     u8 field_0x4[4];
diff --git a/include/main_02026174.h b/include/main_02026174.h
index 6a1c45b5..328e5607 100644
--- a/include/main_02026174.h
+++ b/include/main_02026174.h
@@ -1,7 +1,6 @@
 #ifndef PMDSKY_MAIN_02026174_H
 #define PMDSKY_MAIN_02026174_H
 
-#include "util.h"
 #include "main_0202613C.h"
 
 void sub_02026174(struct unk_02026130* p);
diff --git a/include/main_02027A80.h b/include/main_02027A80.h
index fda53e68..686302b3 100644
--- a/include/main_02027A80.h
+++ b/include/main_02027A80.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_MAIN_02027A80_H
 #define PMDSKY_MAIN_02027A80_H
 
-#include "util.h"
-
 void sub_02027A08(s32 window_id, s32 value);
 void SetScreenWindowsColor(s32 color, s32 screen);
 void SetBothScreensWindowsColor(s32 color);
diff --git a/include/main_02028284.h b/include/main_02028284.h
index 3159dc55..341232a7 100644
--- a/include/main_02028284.h
+++ b/include/main_02028284.h
@@ -1,7 +1,6 @@
 #ifndef PMDSKY_MAIN_02028284_H
 #define PMDSKY_MAIN_02028284_H
 
-#include "util.h"
 #include "window.h"
 
 void sub_0202825C(s32 index, u16 value);
diff --git a/include/main_02029EC8.h b/include/main_02029EC8.h
index 2c459e5a..4860de7b 100644
--- a/include/main_02029EC8.h
+++ b/include/main_02029EC8.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_MAIN_02029EC8_H
 #define PMDSKY_MAIN_02029EC8_H
 
-#include "util.h"
-
 extern u8 PREV_MENU_ITEMS[0x18];
 
 u32 Arm9LoadUnkFieldNa0x2029EC8(u32 i, u8 *unused);
diff --git a/include/main_0202C5E0.h b/include/main_0202C5E0.h
index 4a898e9d..9222b419 100644
--- a/include/main_0202C5E0.h
+++ b/include/main_0202C5E0.h
@@ -1,7 +1,6 @@
 #ifndef PMDSKY_MAIN_0202C5E0_H
 #define PMDSKY_MAIN_0202C5E0_H
 
-#include "util.h"
 #include "main_0202AAA8.h"
 
 struct unk_0202C5E0 {
diff --git a/include/main_0202C748.h b/include/main_0202C748.h
index d6e9ec6f..89126de3 100644
--- a/include/main_0202C748.h
+++ b/include/main_0202C748.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_MAIN_0202C748_H
 #define PMDSKY_MAIN_0202C748_H
 
-#include "util.h"
-
 s32 GetWindowIdSelectedMenuItemIdx(s32 window_id);
 s32 sub_0202C75C(s32 window_id);
 
diff --git a/include/main_0203083C.h b/include/main_0203083C.h
index 4acdb52d..a995928c 100644
--- a/include/main_0203083C.h
+++ b/include/main_0203083C.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_MAIN_0203083C_H
 #define PMDSKY_MAIN_0203083C_H
 
-#include "util.h"
-
 void SetAdvancedTextBoxField0x1C2(s32 window_id);
 void CloseAdvancedTextBox2(s32 window_id);
 
diff --git a/include/main_02030A18.h b/include/main_02030A18.h
index fb5e9d81..09dadd64 100644
--- a/include/main_02030A18.h
+++ b/include/main_02030A18.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_MAIN_02030A18_H
 #define PMDSKY_MAIN_02030A18_H
 
-#include "util.h"
-
 s32 GetWindowIdPageStart(s32 window_id);
 void SetWindowTitle(s32 window_id, u16 title);
 
diff --git a/include/main_02030A40.h b/include/main_02030A40.h
index 4fd2038e..cf06509f 100644
--- a/include/main_02030A40.h
+++ b/include/main_02030A40.h
@@ -6,8 +6,6 @@ struct unk_02030A50 {
     s32 field_0xC0;
 };
 
-#include "util.h"
-
 s32 GetAdvancedTextBoxFlags2(s32 window_id);
 void sub_02030A50(s32 window_id, s32 value);
 s32 sub_02030A64(s32 window_id);
diff --git a/include/main_02032558.h b/include/main_02032558.h
index b4aaa3fe..def1b246 100644
--- a/include/main_02032558.h
+++ b/include/main_02032558.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_MAIN_02032558_H
 #define PMDSKY_MAIN_02032558_H
 
-#include "util.h"
-
 struct unk_02032558 {
     u8 field_0x0[0xBC];
     s32 field_0xBC;
diff --git a/include/main_02043148.h b/include/main_02043148.h
index 7ba25921..876490dc 100644
--- a/include/main_02043148.h
+++ b/include/main_02043148.h
@@ -1,7 +1,6 @@
 #ifndef PMDSKY_MAIN_02043148_H
 #define PMDSKY_MAIN_02043148_H
 
-#include "util.h"
 #include "main_02042AF8.h"
 
 void sub_02043148(s32 index);
diff --git a/include/main_02043218.h b/include/main_02043218.h
index 5c9a2b31..9f35bafd 100644
--- a/include/main_02043218.h
+++ b/include/main_02043218.h
@@ -1,7 +1,6 @@
 #ifndef PMDSKY_MAIN_02043218_H
 #define PMDSKY_MAIN_02043218_H
 
-#include "util.h"
 #include "main_02042AF8.h"
 
 void sub_02043218(void);
diff --git a/include/main_0204F9B8.h b/include/main_0204F9B8.h
index db2fef61..c24fd45f 100644
--- a/include/main_0204F9B8.h
+++ b/include/main_0204F9B8.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_MAIN_0204F9B8_H
 #define PMDSKY_MAIN_0204F9B8_H
 
-#include "util.h"
-
 void sub_0204F9B8(void);
 void sub_0204F9CC(void);
 s32 sub_0204F9E0(void);
diff --git a/include/main_0204FA24.h b/include/main_0204FA24.h
index 285fb17e..fafba261 100644
--- a/include/main_0204FA24.h
+++ b/include/main_0204FA24.h
@@ -2,8 +2,6 @@
 #define PMDSKY_MAIN_0204FA24_H
 
 #include "adventure_log.h"
-#include "util.h"
-
 void SetAdventureLogStructLocation(void);
 void SetAdventureLogDungeonFloor(struct dungeon_floor_pair* floor);
 struct dungeon_floor_pair* GetAdventureLogDungeonFloor(void);
diff --git a/include/main_0204FD3C.h b/include/main_0204FD3C.h
index 5b203386..840e5b97 100644
--- a/include/main_0204FD3C.h
+++ b/include/main_0204FD3C.h
@@ -2,8 +2,6 @@
 #define PMDSKY_MAIN_0204FD3C_H
 
 #include "adventure_log.h"
-#include "util.h"
-
 void IncrementNbEggsHatched(void);
 u32 GetNbEggsHatched(void);
 u32 GetNbPokemonJoined(void);
diff --git a/include/main_0204FEB4.h b/include/main_0204FEB4.h
index 7672ded4..1cc67163 100644
--- a/include/main_0204FEB4.h
+++ b/include/main_0204FEB4.h
@@ -2,8 +2,6 @@
 #define PMDSKY_MAIN_0204FEB4_H
 
 #include "adventure_log.h"
-#include "util.h"
-
 u32 GetNbPokemonBattled(void);
 void IncrementNbBigTreasureWins(void);
 void SetNbBigTreasureWins(s32 value);
diff --git a/include/main_020502B0.h b/include/main_020502B0.h
index 83e15be9..2295575f 100644
--- a/include/main_020502B0.h
+++ b/include/main_020502B0.h
@@ -2,8 +2,6 @@
 #define PMDSKY_MAIN_020502B0_H
 
 #include "adventure_log.h"
-#include "util.h"
-
 void IncrementNbFainted(void);
 u32 GetNbFainted(void);
 
diff --git a/include/main_020503CC.h b/include/main_020503CC.h
index 23e807e1..ebd77a1c 100644
--- a/include/main_020503CC.h
+++ b/include/main_020503CC.h
@@ -2,8 +2,6 @@
 #define PMDSKY_MAIN_020503CC_H
 
 #include "adventure_log.h"
-#include "util.h"
-
 u32 GetNbItemAcquired(void);
 
 #endif
diff --git a/include/main_020504A4.h b/include/main_020504A4.h
index dc871d1f..d71a8230 100644
--- a/include/main_020504A4.h
+++ b/include/main_020504A4.h
@@ -2,8 +2,6 @@
 #define PMDSKY_MAIN_020504A4_H
 
 #include "adventure_log.h"
-#include "util.h"
-
 u32 GetSentryDutyGamePoints(s32 index);
 
 #endif
diff --git a/include/main_020568A4.h b/include/main_020568A4.h
index a2d89675..77a6e168 100644
--- a/include/main_020568A4.h
+++ b/include/main_020568A4.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_MAIN_020568A4_H
 #define PMDSKY_MAIN_020568A4_H
 
-#include "util.h"
-
 u32 GetAppointedLeaderMemberIdx(void);
 s16 sub_020568DC(s32 team);
 
diff --git a/include/main_02065C48.h b/include/main_02065C48.h
index f13e446c..26428279 100644
--- a/include/main_02065C48.h
+++ b/include/main_02065C48.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_MAIN_02065C48_H
 #define PMDSKY_MAIN_02065C48_H
 
-#include "util.h"
-
 struct unk_020A68C8 {
     s16 field_0x0;
     s16 field_0x2;
diff --git a/include/main_020663C8.h b/include/main_020663C8.h
index aca93b3b..debebb53 100644
--- a/include/main_020663C8.h
+++ b/include/main_020663C8.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_MAIN_020663C8_H
 #define PMDSKY_MAIN_020663C8_H
 
-#include "util.h"
-
 void sub_020663C8(s32 a, s32 b, s32 c, s32 d, s8 e);
 void sub_020663DC(s32 a, s32 b, s32 c, s32 d, s32 e, u16 f);
 void sub_02066408(s32 a, s32 b, s32 c, s32 d, s32 e, u16 f, s32 g);
diff --git a/include/main_0206C0D8.h b/include/main_0206C0D8.h
index 43173b8b..3dc323d4 100644
--- a/include/main_0206C0D8.h
+++ b/include/main_0206C0D8.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_MAIN_0206C0D8_H
 #define PMDSKY_MAIN_0206C0D8_H
 
-#include "util.h"
-
 struct unk_020B0B70 {
     s16 field_0x0;
     s16 field_0x2;
diff --git a/include/overlay_00_0230E3E8.h b/include/overlay_00_0230E3E8.h
index d0c451c6..d1198c61 100644
--- a/include/overlay_00_0230E3E8.h
+++ b/include/overlay_00_0230E3E8.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_OVERLAY_00_0230E3E8_H
 #define PMDSKY_OVERLAY_00_0230E3E8_H
 
-#include "util.h"
-
 struct unk_0230E3E8 {
     u32 field_0x0;
     u16 field_0x4;
diff --git a/include/overlay_01_0233755C.h b/include/overlay_01_0233755C.h
index 09a68ff3..937bff44 100644
--- a/include/overlay_01_0233755C.h
+++ b/include/overlay_01_0233755C.h
@@ -1,7 +1,6 @@
 #ifndef PMDSKY_OVERLAY_01_0233755C_H
 #define PMDSKY_OVERLAY_01_0233755C_H
 
-#include "util.h"
 #include "main_020348E4.h"
 
 void ov01_0233755C(void);
diff --git a/include/overlay_04_0233CA80.h b/include/overlay_04_0233CA80.h
index f76310d5..816ed80b 100644
--- a/include/overlay_04_0233CA80.h
+++ b/include/overlay_04_0233CA80.h
@@ -9,8 +9,6 @@ struct unk_0233F660 {
     u8 field_0xD[3];
 };
 
-#include "util.h"
-
 void ov04_0233CA80(void);
 void ov04_0233CA98(s32 a);
 s32 ov04_0233CAA8(void);
diff --git a/include/overlay_06_0233CA80.h b/include/overlay_06_0233CA80.h
index abd7e68a..7404af06 100644
--- a/include/overlay_06_0233CA80.h
+++ b/include/overlay_06_0233CA80.h
@@ -6,8 +6,6 @@ struct unk_0233EEE0 {
     u8 field_0x4[8];
 };
 
-#include "util.h"
-
 void ov06_0233CA80(void);
 void ov06_0233CA98(s32 a);
 s32 ov06_0233CAA8(void);
diff --git a/include/overlay_11_022E96E4.h b/include/overlay_11_022E96E4.h
index 7b9b957e..34bdfa06 100644
--- a/include/overlay_11_022E96E4.h
+++ b/include/overlay_11_022E96E4.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_OVERLAY_11_022E96E4_H
 #define PMDSKY_OVERLAY_11_022E96E4_H
 
-#include "util.h"
-
 u8 ov11_022E96E4(void);
 
 #endif
diff --git a/include/overlay_11_0230CD48.h b/include/overlay_11_0230CD48.h
index 01aee8e6..b7fc37dc 100644
--- a/include/overlay_11_0230CD48.h
+++ b/include/overlay_11_0230CD48.h
@@ -1,7 +1,6 @@
 #ifndef PMDSKY_OVERLAY_11_0230CD48_H
 #define PMDSKY_OVERLAY_11_0230CD48_H
 
-#include "util.h"
 #include "main_020348E4.h"
 
 u32 LoadCroagunkSwapShopOverlay(void);
diff --git a/include/overlay_16_0238CC94.h b/include/overlay_16_0238CC94.h
index ca5a3341..29915e04 100644
--- a/include/overlay_16_0238CC94.h
+++ b/include/overlay_16_0238CC94.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_OVERLAY_16_0238CC94_H
 #define PMDSKY_OVERLAY_16_0238CC94_H
 
-#include "util.h"
-
 struct unk_0238CE40 {
     u8 field_0x0[0xD8];
     s32 field_0xD8;
diff --git a/include/overlay_29_022E9FC0.h b/include/overlay_29_022E9FC0.h
index 086ccc14..57171a5f 100644
--- a/include/overlay_29_022E9FC0.h
+++ b/include/overlay_29_022E9FC0.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_OVERLAY_29_022E9FC0_H
 #define PMDSKY_OVERLAY_29_022E9FC0_H
 
-#include "util.h"
-
 u8 ov29_022E9FC0(void);
 void ov29_022E9FD0(u8 value);
 
diff --git a/include/overlay_29_022EA968.h b/include/overlay_29_022EA968.h
index 71b4b60c..80d1c8da 100644
--- a/include/overlay_29_022EA968.h
+++ b/include/overlay_29_022EA968.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_OVERLAY_29_022EA968_H
 #define PMDSKY_OVERLAY_29_022EA968_H
 
-#include "util.h"
-
 void SetDungeonRngPreseed23Bit(u32 preseed);
 u32 GenerateDungeonRngSeed(void);
 
diff --git a/include/overlay_29_022EA9CC.h b/include/overlay_29_022EA9CC.h
index ba80661e..8de38059 100644
--- a/include/overlay_29_022EA9CC.h
+++ b/include/overlay_29_022EA9CC.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_OVERLAY_29_022EA9CC_H
 #define PMDSKY_OVERLAY_29_022EA9CC_H
 
-#include "util.h"
-
 u32 GetDungeonRngPreseed(void);
 void SetDungeonRngPreseed(u32 preseed);
 
diff --git a/include/overlay_29_022EAC34.h b/include/overlay_29_022EAC34.h
index 1565f094..59328685 100644
--- a/include/overlay_29_022EAC34.h
+++ b/include/overlay_29_022EAC34.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_OVERLAY_29_022EAC34_H
 #define PMDSKY_OVERLAY_29_022EAC34_H
 
-#include "util.h"
-
 void DungeonRngUnsetSecondary(void);
 void DungeonRngSetSecondary(s32 idx);
 void DungeonRngSetPrimary(void);
diff --git a/include/overlay_29_022EAC7C.h b/include/overlay_29_022EAC7C.h
index ee159192..bde40a82 100644
--- a/include/overlay_29_022EAC7C.h
+++ b/include/overlay_29_022EAC7C.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_OVERLAY_29_022EAC7C_H
 #define PMDSKY_OVERLAY_29_022EAC7C_H
 
-#include "util.h"
-
 void PlayLevelUpSound(void);
 void PlayDungeonTipSound__022EB63C(void);
 void ov29_022EAC9C(void);
diff --git a/include/overlay_29_022EAE14.h b/include/overlay_29_022EAE14.h
index ce447523..8376e8d5 100644
--- a/include/overlay_29_022EAE14.h
+++ b/include/overlay_29_022EAE14.h
@@ -2,8 +2,6 @@
 #define PMDSKY_OVERLAY_29_022EAE14_H
 
 #include "dungeon.h"
-#include "util.h"
-
 void ChangeDungeonMusic(enum music_id music);
 
 #endif
diff --git a/include/overlay_29_022ED01C.h b/include/overlay_29_022ED01C.h
index 898c9f65..4682ca01 100644
--- a/include/overlay_29_022ED01C.h
+++ b/include/overlay_29_022ED01C.h
@@ -2,8 +2,6 @@
 #define PMDSKY_OVERLAY_29_022ED01C_H
 
 #include "dungeon.h"
-#include "util.h"
-
 void SetForcedLossReason(enum forced_loss_reason reason);
 enum forced_loss_reason GetForcedLossReason(void);
 
diff --git a/include/overlay_29_022ED868.h b/include/overlay_29_022ED868.h
index 6b28b12c..00e4ccc9 100644
--- a/include/overlay_29_022ED868.h
+++ b/include/overlay_29_022ED868.h
@@ -2,8 +2,6 @@
 #define PMDSKY_OVERLAY_29_022ED868_H
 
 #include "dungeon.h"
-#include "util.h"
-
 s32 AreLateGameTrapsEnabledWrapper(void);
 
 #endif
diff --git a/include/overlay_29_02338850.h b/include/overlay_29_02338850.h
index 70f1e102..1565476b 100644
--- a/include/overlay_29_02338850.h
+++ b/include/overlay_29_02338850.h
@@ -2,8 +2,6 @@
 #define PMDSKY_OVERLAY_29_02338850_H
 
 #include "dungeon.h"
-#include "util.h"
-
 enum hidden_stairs_type GetHiddenStairsField(void);
 void SetHiddenStairsField(enum hidden_stairs_type value);
 enum hidden_stairs_type GetHiddenFloorField(void);
diff --git a/include/overlay_29_02339118.h b/include/overlay_29_02339118.h
index ceea70dc..c0d73cbb 100644
--- a/include/overlay_29_02339118.h
+++ b/include/overlay_29_02339118.h
@@ -2,8 +2,6 @@
 #define PMDSKY_OVERLAY_29_02339118_H
 
 #include "dungeon.h"
-#include "util.h"
-
 struct minimap_display_data* GetMinimapData(void);
 
 #endif
diff --git a/include/overlay_29_0234396C.h b/include/overlay_29_0234396C.h
index 8642411d..3815348e 100644
--- a/include/overlay_29_0234396C.h
+++ b/include/overlay_29_0234396C.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_OVERLAY_29_0234396C_H
 #define PMDSKY_OVERLAY_29_0234396C_H
 
-#include "util.h"
-
 u8 FixedRoomActionParamToDirection(u8 action_param);
 
 #endif
diff --git a/include/overlay_29_02344B9C.h b/include/overlay_29_02344B9C.h
index b27eaa33..181012c3 100644
--- a/include/overlay_29_02344B9C.h
+++ b/include/overlay_29_02344B9C.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_OVERLAY_29_02344B9C_H
 #define PMDSKY_OVERLAY_29_02344B9C_H
 
-#include "util.h"
-
 void ov29_02344B9C(s32 idx, u32 val);
 
 #endif
diff --git a/include/overlay_29_02344BE4.h b/include/overlay_29_02344BE4.h
index add2473e..ccacebd4 100644
--- a/include/overlay_29_02344BE4.h
+++ b/include/overlay_29_02344BE4.h
@@ -1,8 +1,6 @@
 #ifndef PMDSKY_OVERLAY_29_02344BE4_H
 #define PMDSKY_OVERLAY_29_02344BE4_H
 
-#include "util.h"
-
 #include "dungeon_mode.h"
 #include "item.h"
 #include "move.h"