15 files changed, 12 insertions, 11 deletions
diff --git a/src/boot/boot_main.c b/src/boot/boot_main.c
index 905582fe7..1ce87d3b0 100644
--- a/src/boot/boot_main.c
+++ b/src/boot/boot_main.c
@@ -2,7 +2,7 @@
 #include "CIC6105.h"
 #include "idle.h"
 #include "stack.h"
-#include "stackcheck.h"
+#include "libu64/stackcheck.h"
 #include "z64thread.h"
 
 StackEntry sBootStackInfo;
diff --git a/src/boot/fault.c b/src/boot/fault.c
index 36ed37da9..8f4739e04 100644
--- a/src/boot/fault.c
+++ b/src/boot/fault.c
@@ -50,7 +50,7 @@
 #include "macros.h"
 #include "main.h"
 #include "vt.h"
-#include "stackcheck.h"
+#include "libu64/stackcheck.h"
 #include "z64thread.h"
 
 FaultMgr* sFaultInstance;
diff --git a/src/boot/idle.c b/src/boot/idle.c
index 3c2138672..10ee965ce 100644
--- a/src/boot/idle.c
+++ b/src/boot/idle.c
@@ -6,7 +6,7 @@
 #include "main.h"
 #include "segment_symbols.h"
 #include "stack.h"
-#include "stackcheck.h"
+#include "libu64/stackcheck.h"
 #include "viconfig.h"
 #include "z64dma.h"
 #include "z64thread.h"
diff --git a/src/boot/irqmgr.c b/src/boot/irqmgr.c
index 7311414a6..f1dec7bc6 100644
--- a/src/boot/irqmgr.c
+++ b/src/boot/irqmgr.c
@@ -38,7 +38,7 @@
 
 #include "macros.h"
 #include "scheduler.h"
-#include "stackcheck.h"
+#include "libu64/stackcheck.h"
 #include "z64thread.h"
 
 vs32 gIrqMgrResetStatus = IRQ_RESET_STATUS_IDLE;
diff --git a/src/boot/O2/debug.c b/src/boot/libu64/debug.c
index 3933b585e..3933b585e 100644
--- a/src/boot/O2/debug.c
+++ b/src/boot/libu64/debug.c
diff --git a/src/boot/O2/gfxprint.c b/src/boot/libu64/gfxprint.c
index c4294177c..53e16d962 100644
--- a/src/boot/O2/gfxprint.c
+++ b/src/boot/libu64/gfxprint.c
@@ -1,4 +1,4 @@
-#include "gfxprint.h"
+#include "libu64/gfxprint.h"
 #include "attributes.h"
 
 #define GFXP_FLAG_HIRAGANA (1 << 0)
diff --git a/src/boot/O2/loadfragment.c b/src/boot/libu64/loadfragment.c
index 7fbcfb411..95a5287b0 100644
--- a/src/boot/O2/loadfragment.c
+++ b/src/boot/libu64/loadfragment.c
@@ -12,7 +12,7 @@
 
 #include "global.h"
 #include "libc64/malloc.h"
-#include "loadfragment.h"
+#include "libu64/loadfragment.h"
 
 s32 gFragmentLogSeverity = 2;
 
diff --git a/src/boot/O2/loadfragment2.c b/src/boot/libu64/loadfragment2.c
index b8dacf82d..1899885fb 100644
--- a/src/boot/O2/loadfragment2.c
+++ b/src/boot/libu64/loadfragment2.c
@@ -8,7 +8,7 @@
  */
 #include "global.h"
 #include "libc64/malloc.h"
-#include "loadfragment.h"
+#include "libu64/loadfragment.h"
 
 s32 gOverlayLogSeverity = 2;
 
diff --git a/src/boot/O2/mtxuty-cvt.c b/src/boot/libu64/mtxuty-cvt.c
index f96de806f..f96de806f 100644
--- a/src/boot/O2/mtxuty-cvt.c
+++ b/src/boot/libu64/mtxuty-cvt.c
diff --git a/src/boot/O2/padutils.c b/src/boot/libu64/pad.c
index 8460bc007..d169e56ec 100644
--- a/src/boot/O2/padutils.c
+++ b/src/boot/libu64/pad.c
@@ -1,4 +1,4 @@
-#include "padutils.h"
+#include "libu64/pad.h"
 
 #include "PR/os_libc.h"
 
diff --git a/src/boot/O2/padsetup.c b/src/boot/libu64/padsetup.c
index ebbb5d828..c6a4a49d9 100644
--- a/src/boot/O2/padsetup.c
+++ b/src/boot/libu64/padsetup.c
@@ -1,4 +1,5 @@
-#include "global.h"
+#include "ultra64.h"
+#include "libu64/padsetup.h"
 
 s32 PadSetup_Init(OSMesgQueue* mq, u8* outMask, OSContStatus* status) {
     s32 ret;
diff --git a/src/boot/O2/rcp_utils.c b/src/boot/libu64/rcp_utils.c
index f587fad21..f587fad21 100644
--- a/src/boot/O2/rcp_utils.c
+++ b/src/boot/libu64/rcp_utils.c
diff --git a/src/boot/O2/stackcheck.c b/src/boot/libu64/stackcheck.c
index d08dbfcb5..de321bddd 100644
--- a/src/boot/O2/stackcheck.c
+++ b/src/boot/libu64/stackcheck.c
@@ -1,4 +1,4 @@
-#include "stackcheck.h"
+#include "libu64/stackcheck.h"
 #include "stdbool.h"
 #include "stdint.h"
 
diff --git a/src/boot/O2/system_heap.c b/src/boot/libu64/system_heap.c
index 7ad21b6ae..7ad21b6ae 100644
--- a/src/boot/O2/system_heap.c
+++ b/src/boot/libu64/system_heap.c
diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c
index 8e68eafff..053d460c7 100644
--- a/src/boot/z_std_dma.c
+++ b/src/boot/z_std_dma.c
@@ -26,7 +26,7 @@
 #include "macros.h"
 #include "segment_symbols.h"
 #include "stack.h"
-#include "stackcheck.h"
+#include "libu64/stackcheck.h"
 #include "yaz0.h"
 #include "z64thread.h"