6 files changed, 18 insertions, 29 deletions
diff --git a/src/code/padmgr.c b/src/code/padmgr.c
index ec52c6fdd..f8da69762 100644
--- a/src/code/padmgr.c
+++ b/src/code/padmgr.c
@@ -31,11 +31,15 @@
  * done while waiting for this operation to complete.
  */
 
-#include "global.h"
-#include "PR/controller.h"
-#include "PR/os_motor.h"
+#include "padmgr.h"
+
 #include "libc64/sprintf.h"
+#include "PR/os_motor.h"
+
 #include "fault.h"
+#include "macros.h"
+#include "main.h"
+#include "z64math.h"
 #include "z64voice.h"
 
 extern FaultMgr gFaultMgr;
diff --git a/src/code/sys_ucode.c b/src/code/sys_ucode.c
index 068afb4cc..39ad9369d 100644
--- a/src/code/sys_ucode.c
+++ b/src/code/sys_ucode.c
@@ -5,6 +5,8 @@
 
 #include "sys_ucode.h"
 
+#include "stdint.h"
+
 u64* initialgspUcodeText = gspF3DZEX2_NoN_PosLight_fifoTextStart;
 u64* initialgspUcodeData = gspF3DZEX2_NoN_PosLight_fifoDataStart;
 
diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c
index b27310b3f..7a4a86bcc 100644
--- a/src/code/z_bgcheck.c
+++ b/src/code/z_bgcheck.c
@@ -1,9 +1,9 @@
 #include "z64bgcheck.h"
-#include "global.h"
 
 #include "libc64/fixed_point.h"
 #include "libc64/sprintf.h"
 
+#include "global.h"
 #include "fault.h"
 #include "vt.h"
 #include "z64actor.h"
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index ad2170d5f..d27639858 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -43,7 +43,6 @@
  *
  */
 
-#include "prevent_bss_reordering.h"
 #include "global.h"
 #include "string.h"
 #include "z64malloc.h"
diff --git a/src/code/z_demo.c b/src/code/z_demo.c
index d7d0d1c33..7527cc3a1 100644
--- a/src/code/z_demo.c
+++ b/src/code/z_demo.c
@@ -14,28 +14,6 @@ static s16 sBssPad;
 u8 gDisablePlayerCsActionStartPos;
 s16 gDungeonBossWarpSceneId;
 
-// clang-format off
-// Partial structs taken from "prevent_bss_reordering.h"
-struct Dummy200 { int x; };
-struct Dummy201 { int x; };
-struct Dummy202 { int x; };
-struct Dummy203 { int x; };
-struct Dummy204 { int x; };
-struct Dummy205 { int x; };
-struct Dummy206 { int x; };
-struct Dummy207 { int x; };
-struct Dummy208 { int x; };
-struct Dummy209 { int x; };
-struct Dummy210 { int x; };
-struct Dummy211 { int x; };
-struct Dummy212 { int x; };
-struct Dummy213 { int x; };
-struct Dummy214 { int x; };
-struct Dummy215 { int x; };
-struct Dummy216 { int x; };
-struct Dummy217 { int x; };
-// clang-format on
-
 #include "z64quake.h"
 #include "z64rumble.h"
 #include "z64shrink_window.h"
diff --git a/src/code/z_vimode.c b/src/code/z_vimode.c
index 268d9756a..af272b686 100644
--- a/src/code/z_vimode.c
+++ b/src/code/z_vimode.c
@@ -1,8 +1,14 @@
-#include "global.h"
-#include "debug.h"
 #include "z64vimode.h"
+
+#include "stdbool.h"
 #include "PR/viint.h"
 
+#include "debug.h"
+#include "macros.h"
+#include "main.h"
+#include "padutils.h"
+#include "regs.h"
+
 typedef struct {
     /* 0x00 */ u32 burst;
     /* 0x04 */ u32 vSync;