Small general cleanup (#1644)

* m2ctx.py

* check warnings

* vimode includes

* bgcheck includes

* padmgr includes

* sprintf

* z_std_dma

* sys_ucode

* z64voice

* z64lib

* z64effect_ss

* segment_symbols.h

* padutils

* main

* stdarg.h

* fault

* bzero

* undefined_syms

* z64rumble

13 files changed, 24 insertions, 8 deletions

diff --git a/include/fault.h b/include/fault.h
index d0ce18b23..8ddd759c6 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 f7b9dcdee..38b0183a3 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 c6d7f03d0..485f938f5 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 be32328e5..e6f8f9f55 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 68a7a59aa..4bd78d901 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 f818a4950..77d3dc1cd 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 c0130dd48..922f818d7 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 b6003823f..d46238c69 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 3bf63cfdf..37b12b1fe 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 0a4009ba3..5e38eab75 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 844d712db..d8c7bba14 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 70f7f4993..43b3d0a39 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 7bf3c94ff..b2d688bac 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;