cleanup header includes and orders

Not complete, but a good start.

18 files changed, 47 insertions, 18 deletions

diff --git a/arm9/lib/src/CARD_common.c b/arm9/lib/src/CARD_common.c
index f820027e..fd66c7ce 100644
--- a/arm9/lib/src/CARD_common.c
+++ b/arm9/lib/src/CARD_common.c
@@ -8,6 +8,7 @@
 #include "OS_cache.h"
 #include "MB_mb.h"
 #include "PXI_fifo.h"
+#include "mmap.h"
 
 CARDiCommon cardi_common ALIGN(32);
 static CARDiCommandArg cardi_arg ALIGN(32);
diff --git a/arm9/lib/src/CARD_pullOut.c b/arm9/lib/src/CARD_pullOut.c
index 3456df48..d5c7737f 100644
--- a/arm9/lib/src/CARD_pullOut.c
+++ b/arm9/lib/src/CARD_pullOut.c
@@ -8,6 +8,7 @@
 #include "PAD_pad.h"
 #include "SPI_pm.h"
 #include "syscall.h"
+#include "mmap.h"
 
 static CARDPulledOutCallback CARD_UserCallback;
 static BOOL CARDi_IsPulledOutFlag = FALSE;
diff --git a/arm9/lib/src/CP_context.c b/arm9/lib/src/CP_context.c
index 4e928c06..6567f516 100644
--- a/arm9/lib/src/CP_context.c
+++ b/arm9/lib/src/CP_context.c
@@ -1,6 +1,6 @@
 #include "CP_context.h"
 #include "function_target.h"
-#include "consts.h"
+#include "registers.h"
 
 ARM_FUNC asm void CP_SaveContext(register CPContext *context)
 {
diff --git a/arm9/lib/src/CTRDG_common.c b/arm9/lib/src/CTRDG_common.c
index 3d80cf24..df3ec0b6 100644
--- a/arm9/lib/src/CTRDG_common.c
+++ b/arm9/lib/src/CTRDG_common.c
@@ -7,6 +7,7 @@
 #include "PXI_fifo.h"
 #include "MI_dma.h"
 #include "MI_memory.h"
+#include "mmap.h"
 
 CTRDGWork CTRDGi_Work;
 
diff --git a/arm9/lib/src/FX_cp.c b/arm9/lib/src/FX_cp.c
index c8069146..0c5d4ff8 100644
--- a/arm9/lib/src/FX_cp.c
+++ b/arm9/lib/src/FX_cp.c
@@ -1,6 +1,8 @@
-#include "global.h"
 #include "fx.h"
 
+#include "global.h"
+#include "registers.h"
+
 
 ARM_FUNC fx32 FX_Div(fx32 numerator, fx32 denominator){
     FX_DivAsync(numerator, denominator);
diff --git a/arm9/lib/src/FX_vec.c b/arm9/lib/src/FX_vec.c
index 39dd3076..005872ac 100644
--- a/arm9/lib/src/FX_vec.c
+++ b/arm9/lib/src/FX_vec.c
@@ -1,6 +1,8 @@
-#include "global.h"
 #include "fx.h"
 
+#include "global.h"
+#include "registers.h"
+
 ARM_FUNC void VEC_Add(struct Vecx32 *a, struct Vecx32 *b, struct Vecx32 *dst){
     dst->x = a->x + b->x;
     dst->y = a->y + b->y;
diff --git a/arm9/lib/src/GX.c b/arm9/lib/src/GX.c
index 688e41b7..f47c0131 100644
--- a/arm9/lib/src/GX.c
+++ b/arm9/lib/src/GX.c
@@ -1,6 +1,9 @@
-#include "global.h"
 #include "gx.h"
 
+#include "global.h"
+#include "OS_spinLock.h"
+#include "OS_terminate_proc.h"
+
 u32 GXi_DmaId = 3;
 vu16 GXi_VRamLockId = 0;
 
diff --git a/arm9/lib/src/MI_wram.c b/arm9/lib/src/MI_wram.c
index a65bbb6f..c1433f07 100644
--- a/arm9/lib/src/MI_wram.c
+++ b/arm9/lib/src/MI_wram.c
@@ -1,7 +1,8 @@
-#include "function_target.h"
-#include "consts.h"
 #include "MI_wram.h"
 
+#include "global.h"
+#include "registers.h"
+
 ARM_FUNC void MI_SetWramBank(MIWram cnt)
 {
     reg_GX_VRAMCNT_WRAM = (u8)cnt;
diff --git a/arm9/lib/src/OS_arena.c b/arm9/lib/src/OS_arena.c
index df9c2fd8..de7cb9fe 100644
--- a/arm9/lib/src/OS_arena.c
+++ b/arm9/lib/src/OS_arena.c
@@ -1,8 +1,9 @@
-#include "function_target.h"

-#include "consts.h"

 #include "OS_arena.h"

+

+#include "global.h"

 #include "OS_protectionRegion.h"

 #include "OS_emulator.h"

+#include "mmap.h"

 

 static BOOL OSi_Initialized = FALSE;

 static BOOL OSi_MainExArenaEnabled = FALSE;

diff --git a/arm9/lib/src/OS_entropy.c b/arm9/lib/src/OS_entropy.c
index b33781cc..5d466f82 100644
--- a/arm9/lib/src/OS_entropy.c
+++ b/arm9/lib/src/OS_entropy.c
@@ -2,10 +2,13 @@
 // Created by red031000 on 2020-05-03.
 //
 
-#include "function_target.h"
-#include "consts.h"
 #include "OS_entropy.h"
 
+#include "global.h"
+#include "registers.h"
+#include "systemWork.h"
+#include "userInfo.h"
+
 ARM_FUNC void OS_GetLowEntropyData(u32 * arr)
 {
     const OSSystemWork* work = OS_GetSystemWork();
diff --git a/arm9/lib/src/OS_exception.c b/arm9/lib/src/OS_exception.c
index 3aaaa2f2..63cd6d58 100644
--- a/arm9/lib/src/OS_exception.c
+++ b/arm9/lib/src/OS_exception.c
@@ -1,6 +1,8 @@
 #include "OS_exception.h"
-#include "function_target.h"
+
+#include "global.h"
 #include "OS_protectionUnit.h"
+#include "mmap.h"
 
 static OSiExContext OSi_ExContext;
 
diff --git a/arm9/lib/src/OS_interrupt.c b/arm9/lib/src/OS_interrupt.c
index c7c0704d..699c7929 100644
--- a/arm9/lib/src/OS_interrupt.c
+++ b/arm9/lib/src/OS_interrupt.c
@@ -1,6 +1,8 @@
-#include "consts.h"
-#include "function_target.h"
 #include "OS_interrupt.h"
+
+#include "global.h"
+#include "registers.h"
+#include "mmap.h"
 #include "OS_thread.h"
 
 #pragma optimize_for_size on
diff --git a/arm9/lib/src/OS_ownerInfo.c b/arm9/lib/src/OS_ownerInfo.c
index 10a638fb..6693f73f 100644
--- a/arm9/lib/src/OS_ownerInfo.c
+++ b/arm9/lib/src/OS_ownerInfo.c
@@ -1,5 +1,7 @@
-#include "function_target.h"
 #include "OS_ownerInfo.h"
+
+#include "global.h"
+#include "systemWork.h"
 #include "MI_memory.h"
 
 ARM_FUNC void OS_GetMacAddress(u8 *macAddress)
diff --git a/arm9/lib/src/OS_reset.c b/arm9/lib/src/OS_reset.c
index 45d2bb13..083f2321 100644
--- a/arm9/lib/src/OS_reset.c
+++ b/arm9/lib/src/OS_reset.c
@@ -1,5 +1,6 @@
-#include "function_target.h"
 #include "OS_reset.h"
+
+#include "global.h"
 #include "MB_mb.h"
 #include "OS_terminate_proc.h"
 #include "OS_interrupt.h"
diff --git a/arm9/lib/src/OS_spinLock.c b/arm9/lib/src/OS_spinLock.c
index c0398be9..576e03ad 100644
--- a/arm9/lib/src/OS_spinLock.c
+++ b/arm9/lib/src/OS_spinLock.c
@@ -3,9 +3,10 @@
 //
 
 #include "OS_spinLock.h"
+
 #include "OS_system.h"
 #include "function_target.h"
-#include "consts.h"
+#include "mmap.h"
 #include "MI_exMemory.h"
 
 extern void MIi_CpuClear32(u32 param1, void * addr, u32 length); //not too sure about names
diff --git a/arm9/lib/src/OS_thread.c b/arm9/lib/src/OS_thread.c
index 35e91c22..a52b1f6d 100644
--- a/arm9/lib/src/OS_thread.c
+++ b/arm9/lib/src/OS_thread.c
@@ -6,7 +6,8 @@
 #include "OS_system.h"
 #include "OS_context.h"
 #include "OS_terminate_proc.h"
-#include "consts.h"
+#include "systemWork.h"
+#include "mmap.h"
 
 extern void SDK_SYS_STACKSIZE(void);
 extern void SDK_IRQ_STACKSIZE(void);
diff --git a/arm9/lib/src/SND_command.c b/arm9/lib/src/SND_command.c
index 4ad80be5..044d960f 100644
--- a/arm9/lib/src/SND_command.c
+++ b/arm9/lib/src/SND_command.c
@@ -1,7 +1,10 @@
+#include "SND_alarm.h"
 #include "SND_command.h"
 #include "SND_work.h"
+#include "OS_emulator.h"
 #include "OS_system.h"
 #include "OS_cache.h"
+#include "PXI_fifo.h"
 
 #define SND_CMD_WAIT_QUEUE_COUNT 8
 
diff --git a/arm9/lib/src/custom_allocator.c b/arm9/lib/src/custom_allocator.c
index 1b1375bc..283c3500 100644
--- a/arm9/lib/src/custom_allocator.c
+++ b/arm9/lib/src/custom_allocator.c
@@ -1,6 +1,8 @@
-#include "global.h"
 #include "custom_allocator.h"
 
+#include "global.h"
+#include "OS_alloc.h"
+
 static FreeFunc sDestructor;
 static AllocFunc sAllocator;