17 files changed, 19 insertions, 18 deletions
diff --git a/src/code/PreRender.c b/src/code/PreRender.c
index 8cae8a52a..1b9bd0b87 100644
--- a/src/code/PreRender.c
+++ b/src/code/PreRender.c
@@ -18,7 +18,7 @@
 #include "gfxalloc.h"
 #include "slowly.h"
 #include "stack.h"
-#include "stackcheck.h"
+#include "libu64/stackcheck.h"
 #include "sys_ucode.h"
 
 /**
diff --git a/src/code/game.c b/src/code/game.c
index fe8a9915a..290f474a9 100644
--- a/src/code/game.c
+++ b/src/code/game.c
@@ -2,7 +2,7 @@
 
 #include "global.h"
 #include "audiomgr.h"
-#include "debug.h"
+#include "libu64/debug.h"
 #include "gfx.h"
 #include "gfxalloc.h"
 #include "idle.h"
diff --git a/src/code/main.c b/src/code/main.c
index e2822a9a8..953cac7c0 100644
--- a/src/code/main.c
+++ b/src/code/main.c
@@ -35,10 +35,10 @@ struct PadMgr gPadMgr;
 #include "regs.h"
 #include "segment_symbols.h"
 #include "stack.h"
-#include "stackcheck.h"
+#include "libu64/stackcheck.h"
 #include "scheduler.h"
 #include "sys_initial_check.h"
-#include "system_heap.h"
+#include "libu64/system_heap.h"
 #include "z64nmi_buff.h"
 #include "z64thread.h"
 
diff --git a/src/code/padmgr.c b/src/code/padmgr.c
index 53eeadb99..0655bb232 100644
--- a/src/code/padmgr.c
+++ b/src/code/padmgr.c
@@ -34,6 +34,7 @@
 #include "padmgr.h"
 
 #include "libc64/sprintf.h"
+#include "libu64/padsetup.h"
 #include "PR/os_motor.h"
 
 #include "controller.h"
diff --git a/src/code/sched.c b/src/code/sched.c
index 48cc5ed6d..78f589f45 100644
--- a/src/code/sched.c
+++ b/src/code/sched.c
@@ -6,7 +6,7 @@
 #include "idle.h"
 #include "macros.h"
 #include "regs.h"
-#include "stackcheck.h"
+#include "libu64/stackcheck.h"
 #include "viconfig.h"
 #include "z64speed_meter.h"
 #include "z64thread.h"
diff --git a/src/code/sys_flashrom.c b/src/code/sys_flashrom.c
index 75286d807..27d7c61fd 100644
--- a/src/code/sys_flashrom.c
+++ b/src/code/sys_flashrom.c
@@ -6,7 +6,7 @@
 #include "fault.h"
 #include "macros.h"
 #include "stack.h"
-#include "stackcheck.h"
+#include "libu64/stackcheck.h"
 #include "z64thread.h"
 
 OSMesgQueue sFlashromMesgQueue;
diff --git a/src/code/sys_slowly.c b/src/code/sys_slowly.c
index 47170db62..fe048650d 100644
--- a/src/code/sys_slowly.c
+++ b/src/code/sys_slowly.c
@@ -11,7 +11,7 @@
 
 #include "slowly.h"
 #include "global.h"
-#include "stackcheck.h"
+#include "libu64/stackcheck.h"
 #include "z64thread.h"
 
 void Slowly_Main(SlowlyMgr* slowly) {
diff --git a/src/code/z_DLF.c b/src/code/z_DLF.c
index e1091e593..8c531a3b1 100644
--- a/src/code/z_DLF.c
+++ b/src/code/z_DLF.c
@@ -2,7 +2,7 @@
 #include "global.h"
 
 #include "libc64/malloc.h"
-#include "loadfragment.h"
+#include "libu64/loadfragment.h"
 
 void Overlay_LoadGameState(GameStateOverlay* overlayEntry) {
     void* vramStart;
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index dbc28a11b..532aecd65 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -6,7 +6,7 @@
 #include "fault.h"
 #include "attributes.h"
 #include "sys_cfb.h"
-#include "loadfragment.h"
+#include "libu64/loadfragment.h"
 
 // Variables are put before most headers as a hacky way to bypass bss reordering
 FaultClient sActorFaultClient; // 2 funcs
diff --git a/src/code/z_debug_mode.c b/src/code/z_debug_mode.c
index ae4c877ce..8e24982e8 100644
--- a/src/code/z_debug_mode.c
+++ b/src/code/z_debug_mode.c
@@ -3,7 +3,7 @@
 #include "color.h"
 #include "gfx.h"
 #include "gfxalloc.h"
-#include "gfxprint.h"
+#include "libu64/gfxprint.h"
 #include "macros.h"
 
 typedef struct {
diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c
index 4ff5c72d6..8fd5d2568 100644
--- a/src/code/z_effect_soft_sprite.c
+++ b/src/code/z_effect_soft_sprite.c
@@ -1,7 +1,7 @@
 #include "z64effect_ss.h"
 
 #include "tha.h"
-#include "loadfragment.h"
+#include "libu64/loadfragment.h"
 #include "zelda_arena.h"
 #include "global.h"
 
diff --git a/src/code/z_kaleido_manager.c b/src/code/z_kaleido_manager.c
index 8b43b255f..072c460ab 100644
--- a/src/code/z_kaleido_manager.c
+++ b/src/code/z_kaleido_manager.c
@@ -2,7 +2,7 @@
 
 #include "global.h"
 #include "fault.h"
-#include "loadfragment.h"
+#include "libu64/loadfragment.h"
 
 #define KALEIDO_OVERLAY(name) \
     { NULL, ROM_FILE(ovl_##name), SEGMENT_START(ovl_##name), SEGMENT_END(ovl_##name), 0, #name }
diff --git a/src/code/z_overlay.c b/src/code/z_overlay.c
index a72a979ce..b910a13c8 100644
--- a/src/code/z_overlay.c
+++ b/src/code/z_overlay.c
@@ -6,7 +6,7 @@
 
 #include "z64transition.h"
 
-#include "loadfragment.h"
+#include "libu64/loadfragment.h"
 #include "z64lib.h"
 #include "zelda_arena.h"
 
diff --git a/src/code/z_pause.c b/src/code/z_pause.c
index 9f6f4a226..f53cb9152 100644
--- a/src/code/z_pause.c
+++ b/src/code/z_pause.c
@@ -22,7 +22,7 @@
 #include "z64frameadvance.h"
 
 #include "controller.h"
-#include "padutils.h"
+#include "libu64/pad.h"
 #include "stdbool.h"
 
 void FrameAdvance_Init(FrameAdvanceContext* frameAdvCtx) {
diff --git a/src/code/z_play.c b/src/code/z_play.c
index 68d6014d5..49a902547 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -35,7 +35,7 @@ u8 sMotionBlurStatus;
 #include "overlays/gamestates/ovl_daytelop/z_daytelop.h"
 #include "overlays/gamestates/ovl_opening/z_opening.h"
 #include "overlays/gamestates/ovl_file_choose/z_file_select.h"
-#include "debug.h"
+#include "libu64/debug.h"
 
 s32 gDbgCamEnabled = false;
 u8 D_801D0D54 = false;
diff --git a/src/code/z_room.c b/src/code/z_room.c
index cb8d42666..e08fb1d96 100644
--- a/src/code/z_room.c
+++ b/src/code/z_room.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "PR/gs2dex.h"
-#include "debug.h"
+#include "libu64/debug.h"
 #include "sys_ucode.h"
 
 void Room_Noop(PlayState* play, Room* room, Input* input, s32 arg3) {
diff --git a/src/code/z_vimode.c b/src/code/z_vimode.c
index f4da13c39..bef6c9b4a 100644
--- a/src/code/z_vimode.c
+++ b/src/code/z_vimode.c
@@ -4,10 +4,10 @@
 #include "PR/viint.h"
 
 #include "controller.h"
-#include "debug.h"
+#include "libu64/debug.h"
 #include "macros.h"
 #include "main.h"
-#include "padutils.h"
+#include "libu64/pad.h"
 #include "regs.h"
 
 typedef struct {