diff --git a/include/fault.h b/include/fault.h
index d0ce18b23f..8ddd759c60 100644
--- a/include/fault.h
+++ b/include/fault.h
@@ -5,7 +5,6 @@
 
 #include "stdarg.h"
 #include "stdint.h"
-#include "PR/controller.h"
 
 #include "padmgr.h"
 #include "stack.h"
diff --git a/include/libc64/aprintf.h b/include/libc64/aprintf.h
index f7b9dcdee8..38b0183a3a 100644
--- a/include/libc64/aprintf.h
+++ b/include/libc64/aprintf.h
@@ -3,6 +3,8 @@
 
 #include "ultra64.h"
 
+#include "stdarg.h"
+
 int vaprintf(PrintCallback* pfn, const char* fmt, va_list args);
 int aprintf(PrintCallback* pfn, const char* fmt, ...);
 
diff --git a/include/libc64/sprintf.h b/include/libc64/sprintf.h
index c6d7f03d0d..485f938f58 100644
--- a/include/libc64/sprintf.h
+++ b/include/libc64/sprintf.h
@@ -3,6 +3,8 @@
 
 #include "ultra64.h"
 
+#include "stdarg.h"
+
 int vsprintf(char* dst, const char* fmt, va_list args);
 int sprintf(char* dst, const char* fmt, ...);
 
diff --git a/include/main.h b/include/main.h
index be32328e50..e6f8f9f552 100644
--- a/include/main.h
+++ b/include/main.h
@@ -2,6 +2,9 @@
 #define MAIN_H
 
 #include "ultra64.h"
+
+#include "stdint.h"
+
 #include "scheduler.h"
 #include "padmgr.h"
 
diff --git a/include/padmgr.h b/include/padmgr.h
index 68a7a59aa8..4bd78d9012 100644
--- a/include/padmgr.h
+++ b/include/padmgr.h
@@ -1,8 +1,10 @@
 #ifndef PADMGR_H
 #define PADMGR_H
 
-#include "stdbool.h"
 #include "ultra64.h"
+
+#include "stdbool.h"
+
 #include "irqmgr.h"
 #include "padutils.h"
 
diff --git a/include/padutils.h b/include/padutils.h
index f818a49509..77d3dc1cda 100644
--- a/include/padutils.h
+++ b/include/padutils.h
@@ -1,7 +1,7 @@
 #ifndef PADUTILS_H
 #define PADUTILS_H
 
-#include "PR/controller.h"
+#include "PR/os_cont.h"
 
 
 typedef struct Input {
diff --git a/include/segment_symbols.h b/include/segment_symbols.h
index c0130dd488..922f818d7c 100644
--- a/include/segment_symbols.h
+++ b/include/segment_symbols.h
@@ -2,6 +2,7 @@
 #define SEGMENT_SYMBOLS_H
 
 #include "stddef.h"
+#include "stdint.h"
 #include "PR/ultratypes.h"
 
 #include "romfile.h"
diff --git a/include/z64dma.h b/include/z64dma.h
index b6003823fa..d46238c695 100644
--- a/include/z64dma.h
+++ b/include/z64dma.h
@@ -2,9 +2,11 @@
 #define Z64DMA_H
 
 #include "ultra64.h"
-#include "unk.h"
+
+#include "stdint.h"
 
 #include "romfile.h"
+#include "unk.h"
 
 typedef struct {
     /* 0x00 */ uintptr_t vromAddr; // VROM address (source)
diff --git a/include/z64effect_ss.h b/include/z64effect_ss.h
index 3bf63cfdfa..37b12b1fe7 100644
--- a/include/z64effect_ss.h
+++ b/include/z64effect_ss.h
@@ -3,11 +3,12 @@
 
 #include "ultra64.h"
 
-#include "color.h"
-#include "z64math.h"
+#include "stdint.h"
 
+#include "color.h"
 #include "z64dma.h"
 #include "z64eff_ss_dead.h"
+#include "z64math.h"
 
 struct Actor;
 struct PlayState;
diff --git a/include/z64lib.h b/include/z64lib.h
index 0a4009ba34..5e38eab75f 100644
--- a/include/z64lib.h
+++ b/include/z64lib.h
@@ -3,6 +3,8 @@
 
 #include "ultra64.h"
 
+#include "stdint.h"
+
 #include "color.h"
 #include "z64math.h"
 
diff --git a/include/z64rumble.h b/include/z64rumble.h
index 844d712db7..d8c7bba14b 100644
--- a/include/z64rumble.h
+++ b/include/z64rumble.h
@@ -2,7 +2,6 @@
 #define Z64RUMBLE_H
 
 #include "PR/ultratypes.h"
-#include "PR/controller.h"
 
 typedef enum RumbleManagerState {
     /* 0 */ RUMBLEMANAGER_STATE_WIPE, // Disables the request processing and wipes every request. It can be either set manually or automatically by the system as fail-safe in case the Rumble Pak has been vibrating for 2 minutes
diff --git a/include/z64speed_meter.h b/include/z64speed_meter.h
index 70f7f49938..43b3d0a391 100644
--- a/include/z64speed_meter.h
+++ b/include/z64speed_meter.h
@@ -3,6 +3,7 @@
 
 #include "PR/ultratypes.h"
 #include "PR/os_time.h"
+
 #include "unk.h"
 
 struct GameState;
diff --git a/include/z64voice.h b/include/z64voice.h
index 7bf3c94ffd..b2d688bac4 100644
--- a/include/z64voice.h
+++ b/include/z64voice.h
@@ -2,9 +2,11 @@
 #define Z64VOICE_H
 
 #include "PR/ultratypes.h"
-#include "unk.h"
+#include "PR/os_message.h"
 #include "PR/os_voice.h"
 
+#include "unk.h"
+
 typedef struct {
     /* 0x000 */ u16 words[20][15]; // 20 words, each with up to 15 syllables
     /* 0x258 */ u8 numWords;
diff --git a/linker_scripts/undefined_syms.ld b/linker_scripts/undefined_syms.ld
index 7fa3da52a9..880773f840 100644
--- a/linker_scripts/undefined_syms.ld
+++ b/linker_scripts/undefined_syms.ld
@@ -129,8 +129,7 @@ gFramebufferHiRes0 = gHiBuffer;
 
 // Ucode symbols
 
-rspbootTextSize = 0x160;
-rspbootTextEnd = rspbootTextStart + rspbootTextSize;
+rspbootTextEnd = rspbootTextStart + 0x160;
 aspMainTextEnd = aspMainTextStart + 0x1000;
 aspMainDataEnd = aspMainDataStart + 0x2E0;
 
@@ -156,7 +155,6 @@ D_04023428 = 0x04023428;
 D_04051180 = 0x04051180;
 D_04051238 = 0x04051238;
 D_0406AB30 = 0x0406AB30;
-D_0407AB70 = 0x0407AB70;
 D_0407D590 = 0x0407D590;
 
 // segment 0x05
diff --git a/src/boot/O2/padutils.c b/src/boot/O2/padutils.c
index 76bf91c0c4..8460bc0070 100644
--- a/src/boot/O2/padutils.c
+++ b/src/boot/O2/padutils.c
@@ -1,5 +1,7 @@
 #include "padutils.h"
 
+#include "PR/os_libc.h"
+
 void PadUtils_Init(Input* input) {
     bzero(input, sizeof(Input));
 }
diff --git a/src/boot/libc64/sprintf.c b/src/boot/libc64/sprintf.c
index 58f2484142..a2cb2a7e1a 100644
--- a/src/boot/libc64/sprintf.c
+++ b/src/boot/libc64/sprintf.c
@@ -1,5 +1,6 @@
 #include "libc64/sprintf.h"
 
+#include "stdint.h"
 #include "string.h"
 
 void* proutPrintf(void* dst, const char* fmt, size_t size) {
@@ -20,7 +21,7 @@ int sprintf(char* dst, const char* fmt, ...) {
     va_list args;
     va_start(args, fmt);
 
-    ans = _Printf(&proutPrintf, dst, fmt, args);
+    ans = _Printf(proutPrintf, dst, fmt, args);
     if (ans > -1) {
         dst[ans] = 0;
     }
diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c
index 71e64ad695..8e68eafffd 100644
--- a/src/boot/z_std_dma.c
+++ b/src/boot/z_std_dma.c
@@ -18,6 +18,7 @@
  * There are some additional provisions to ensure that audio DMA is particularly high-speed, the audio data is assumed
  * to be uncompressed and the request queue and address translation is skipped.
  */
+#include "prevent_bss_reordering.h"
 #include "z64dma.h"
 
 #include "carthandle.h"
diff --git a/src/code/padmgr.c b/src/code/padmgr.c
index ec52c6fdd0..f8da69762a 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 068afb4cc9..39ad9369d0 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 b27310b3f0..7a4a86bcc0 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 ad2170d5f7..d276398584 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 d7d0d1c338..7527cc3a10 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 268d9756a6..af272b6865 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;
diff --git a/src/overlays/actors/ovl_Boss_01/z_boss_01.c b/src/overlays/actors/ovl_Boss_01/z_boss_01.c
index d6de138da9..b1d4245bb7 100644
--- a/src/overlays/actors/ovl_Boss_01/z_boss_01.c
+++ b/src/overlays/actors/ovl_Boss_01/z_boss_01.c
@@ -25,7 +25,6 @@
  * to randomly select; these new wait actions are what allow him to summon a ring of fire, drop falling blocks, etc.
  */
 
-#include "prevent_bss_reordering.h"
 #include "z_boss_01.h"
 #include "z64rumble.h"
 #include "z64shrink_window.h"
diff --git a/tools/m2ctx.py b/tools/m2ctx.py
index 23875eef0b..2a971eea89 100755
--- a/tools/m2ctx.py
+++ b/tools/m2ctx.py
@@ -14,6 +14,7 @@ src_dir = root_dir / "src"
 # Project-specific
 CPP_FLAGS = [
     "-Iinclude",
+    "-Iinclude/libc",
     "-Isrc",
     "-Iassets",
     "-Ibuild",
diff --git a/tools/warnings_count/.gitignore b/tools/warnings_count/.gitignore
index eaf2f58b5c..65bcf8e907 100644
--- a/tools/warnings_count/.gitignore
+++ b/tools/warnings_count/.gitignore
@@ -1,5 +1,7 @@
 # Generated warnings counters
 warnings_setup_new.txt
+warnings_assets_new.txt
 warnings_disasm_new.txt
 warnings_build_new.txt
+warnings_compress_new.txt
 warnings_temp.txt
diff --git a/tools/warnings_count/check_new_warnings.sh b/tools/warnings_count/check_new_warnings.sh
index 922dfe43f6..a76754e36d 100755
--- a/tools/warnings_count/check_new_warnings.sh
+++ b/tools/warnings_count/check_new_warnings.sh
@@ -53,6 +53,7 @@ do
     f)  full="true"
         run="make distclean
     make setup
+    make assets
     make disasm
     make rom
     make compress"
@@ -103,6 +104,7 @@ make_warnings () {
 if [[ $full ]]; then
     make distclean
     make_warnings setup setup
+    make_warnings assets assets
     make_warnings disasm disasm
     make_warnings rom build
     make_warnings compress compress
@@ -114,7 +116,11 @@ fi
 
 if [[ $full ]]; then
     $COMPARE_WARNINGS setup
+    $COMPARE_WARNINGS assets
     $COMPARE_WARNINGS disasm
+    $COMPARE_WARNINGS build
+    $COMPARE_WARNINGS compress
+else
+    $COMPARE_WARNINGS build
 fi
-$COMPARE_WARNINGS build