From e6a9ad96207b91de2e78775dc46c00136e032f09 Mon Sep 17 00:00:00 2001
From: Dragorn421 <Dragorn421@users.noreply.github.com>
Date: Tue, 25 Feb 2025 03:18:24 +0100
Subject: [PATCH] Fixup includes (#2483)

---
 include/functions.h      | 2 +-
 include/ultra64.h        | 1 -
 src/code/sys_math_atan.c | 1 +
 src/code/sys_ucode.c     | 1 +
 src/code/z_elf_message.c | 1 +
 src/code/z_olib.c        | 1 +
 src/code/z_ss_sram.c     | 1 +
 src/libc64/math64.c      | 1 +
 src/libu64/padsetup.c    | 1 +
 9 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/include/functions.h b/include/functions.h
index fbf16a1eab..e5d15c10ec 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -102,7 +102,7 @@ ListAlloc* ListAlloc_Init(ListAlloc* this);
 void* ListAlloc_Alloc(ListAlloc* this, u32 size);
 void ListAlloc_Free(ListAlloc* this, void* data);
 void ListAlloc_FreeAll(ListAlloc* this);
-void Main(void* arg);
+
 void SysCfb_Init(s32 n64dd);
 void* SysCfb_GetFbPtr(s32 idx);
 void* SysCfb_GetFbEnd(void);
diff --git a/include/ultra64.h b/include/ultra64.h
index 30e43563e9..9972a4dfe8 100644
--- a/include/ultra64.h
+++ b/include/ultra64.h
@@ -189,7 +189,6 @@ void osViSetEvent(OSMesgQueue* mq, OSMesg msg, u32 retraceCount);
 s32 osPfsIsPlug(OSMesgQueue* mq, u8* pattern);
 void __osPfsRequestData(u8 cmd);
 void __osPfsGetInitData(u8* pattern, OSContStatus* contData);
-void guS2DInitBg(union uObjBg* bg);
 s32 __osPfsSelectBank(OSPfs* pfs, u8 bank);
 s32 osContSetCh(u8 ch);
 s32 osPfsFileState(OSPfs* pfs, s32 fileNo, OSPfsState* state);
diff --git a/src/code/sys_math_atan.c b/src/code/sys_math_atan.c
index 0647745b06..8dabed7d72 100644
--- a/src/code/sys_math_atan.c
+++ b/src/code/sys_math_atan.c
@@ -1,3 +1,4 @@
+#include "sys_math.h"
 #include "z64math.h"
 #include "macros.h"
 
diff --git a/src/code/sys_ucode.c b/src/code/sys_ucode.c
index 3e4ad8cbf6..71ae003909 100644
--- a/src/code/sys_ucode.c
+++ b/src/code/sys_ucode.c
@@ -1,4 +1,5 @@
 #include "ultra64.h"
+#include "sys_ucode.h"
 
 u64* sDefaultGSPUCodeText = gspF3DZEX2_NoN_PosLight_fifoTextStart;
 u64* sDefaultGSPUCodeData = gspF3DZEX2_NoN_PosLight_fifoDataStart;
diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c
index 7b3cf1c556..bb93099363 100644
--- a/src/code/z_elf_message.c
+++ b/src/code/z_elf_message.c
@@ -2,6 +2,7 @@
 #include "rand.h"
 #include "z64play.h"
 #include "z64player.h"
+#include "z64quest_hint.h"
 #include "z64quest_hint_commands.h"
 #include "z64save.h"
 
diff --git a/src/code/z_olib.c b/src/code/z_olib.c
index 298f151e2c..66c767f68b 100644
--- a/src/code/z_olib.c
+++ b/src/code/z_olib.c
@@ -1,5 +1,6 @@
 #include "z64math.h"
 #include "libc64/math64.h"
+#include "z64olib.h"
 #include "z_lib.h"
 
 /**
diff --git a/src/code/z_ss_sram.c b/src/code/z_ss_sram.c
index c2b7e2d34e..330f5ca4ac 100644
--- a/src/code/z_ss_sram.c
+++ b/src/code/z_ss_sram.c
@@ -1,4 +1,5 @@
 #include "ultra64.h"
+#include "z64ss_sram.h"
 
 #include "macros.h"
 #include "global.h"
diff --git a/src/libc64/math64.c b/src/libc64/math64.c
index 85fb4cedf3..f2a6edba9a 100644
--- a/src/libc64/math64.c
+++ b/src/libc64/math64.c
@@ -1,3 +1,4 @@
+#include "libc64/math64.h"
 #include "z64math.h"
 #include "macros.h"
 
diff --git a/src/libu64/padsetup.c b/src/libu64/padsetup.c
index 86f38c0adf..fde25418f6 100644
--- a/src/libu64/padsetup.c
+++ b/src/libu64/padsetup.c
@@ -1,4 +1,5 @@
 #include "ultra64.h"
+#include "libu64/padsetup.h"
 
 s32 PadSetup_Init(OSMesgQueue* mq, u8* outMask, OSContStatus* status) {
     s32 ret;