diff --git a/spec b/spec
index c33783ad2e..1a6732ac5d 100644
--- a/spec
+++ b/spec
@@ -123,7 +123,7 @@ beginseg
     include "build/src/libultra/os/afterprenmi.o"
     include "build/src/libultra/io/contquery.o"
     include "build/src/libultra/gu/lookathil.o"
-    include "build/src/libultra/rmon/xprintf.o"
+    include "build/src/libultra/libc/xprintf.o"
     include "build/src/libultra/voice/voicecleardictionary.o"
     include "build/asm/boot/unmaptlball.text.o"
     include "build/src/libultra/io/epidma.o"
@@ -203,9 +203,9 @@ beginseg
     include "build/src/libultra/io/epirawwrite.o"
     include "build/src/libultra/os/settimer.o"
     include "build/data/boot/__libm_qnan_f.rodata.o"
-    include "build/src/libultra/rmon/xldtob.o"
+    include "build/src/libultra/libc/xldtob.o"
     include "build/src/libultra/libc/ldiv.o"
-    include "build/src/libultra/rmon/xlitob.o"
+    include "build/src/libultra/libc/xlitob.o"
     include "build/src/libultra/io/sirawwrite.o"
     include "build/src/libultra/io/spgetstat.o"
     include "build/src/libultra/io/spsetstat.o"
diff --git a/src/libultra/libc/ldiv.c b/src/libultra/libc/ldiv.c
index 9f9d750312..66b144da48 100644
--- a/src/libultra/libc/ldiv.c
+++ b/src/libultra/libc/ldiv.c
@@ -1,4 +1,5 @@
-#include "global.h"
+#include "ultra64.h"
+#include "libc/stdlib.h"
 
 ldiv_t ldiv(long numer, long denom) {
     ldiv_t val;
diff --git a/src/libultra/libc/ll.c b/src/libultra/libc/ll.c
index 0fd42d1ed7..a05917090d 100644
--- a/src/libultra/libc/ll.c
+++ b/src/libultra/libc/ll.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 long long __ull_rshift(unsigned long long left, unsigned long long right) {
     return left >> right;
diff --git a/src/libultra/libc/llcvt.c b/src/libultra/libc/llcvt.c
index 2ef487938d..f78d882725 100644
--- a/src/libultra/libc/llcvt.c
+++ b/src/libultra/libc/llcvt.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 
 long long __d_to_ll(double d) {
     return d;
diff --git a/src/libultra/rmon/sprintf.c b/src/libultra/libc/sprintf.c
similarity index 92%
rename from src/libultra/rmon/sprintf.c
rename to src/libultra/libc/sprintf.c
index 9f3610fe08..773b982fff 100644
--- a/src/libultra/rmon/sprintf.c
+++ b/src/libultra/libc/sprintf.c
@@ -1,4 +1,5 @@
-#include "global.h"
+#include "ultra64.h"
+#include "libc/stdlib.h"
 #include "libc/string.h"
 
 void* proutSprintf(void* dst, const char* fmt, size_t size) {
diff --git a/src/libultra/libc/string.c b/src/libultra/libc/string.c
index b23bf564da..b4bdf84aee 100644
--- a/src/libultra/libc/string.c
+++ b/src/libultra/libc/string.c
@@ -1,4 +1,6 @@
-#include "global.h"
+#include "ultra64.h"
+#include "libc/stdlib.h"
+#include "libc/string.h"
 
 const char* strchr(const char* s, int c) {
     const unsigned char ch = c;
diff --git a/src/libultra/rmon/xldtob.c b/src/libultra/libc/xldtob.c
similarity index 99%
rename from src/libultra/rmon/xldtob.c
rename to src/libultra/libc/xldtob.c
index e30bf4b81b..df9c30a28e 100644
--- a/src/libultra/rmon/xldtob.c
+++ b/src/libultra/libc/xldtob.c
@@ -1,4 +1,5 @@
-#include "global.h"
+#include "ultra64.h"
+#include "libc/stdlib.h"
 #include "libc/string.h"
 
 #define BUFF_LEN 0x20
diff --git a/src/libultra/rmon/xlitob.c b/src/libultra/libc/xlitob.c
similarity index 96%
rename from src/libultra/rmon/xlitob.c
rename to src/libultra/libc/xlitob.c
index ddb1904ccd..9eb0e98d1b 100644
--- a/src/libultra/rmon/xlitob.c
+++ b/src/libultra/libc/xlitob.c
@@ -1,4 +1,5 @@
-#include "global.h"
+#include "ultra64.h"
+#include "libc/stdlib.h"
 #include "libc/string.h"
 
 #define BUFF_LEN 0x18
diff --git a/src/libultra/rmon/xprintf.c b/src/libultra/libc/xprintf.c
similarity index 99%
rename from src/libultra/rmon/xprintf.c
rename to src/libultra/libc/xprintf.c
index 3fc6b5e2af..a4094833fa 100644
--- a/src/libultra/rmon/xprintf.c
+++ b/src/libultra/libc/xprintf.c
@@ -1,4 +1,4 @@
-#include "global.h"
+#include "ultra64.h"
 #include "libc/string.h"
 
 #define ATOI(i, a)                           \