diff --git a/Makefile b/Makefile
index e89dc19ea8..2a2f7df3b7 100644
--- a/Makefile
+++ b/Makefile
@@ -419,7 +419,9 @@ $(shell mkdir -p $(foreach dir, \
 endif
 
 ifeq ($(COMPILER),ido)
+$(BUILD_DIR)/src/boot/driverominit.o: OPTFLAGS := -O2
 $(BUILD_DIR)/src/boot/logutils.o: OPTFLAGS := -O2
+$(BUILD_DIR)/src/boot/sprintf.o: OPTFLAGS := -O2
 $(BUILD_DIR)/src/boot/stackcheck.o: OPTFLAGS := -O2
 
 $(BUILD_DIR)/src/code/__osMalloc.o: OPTFLAGS := -O2
diff --git a/spec b/spec
index afb1e9d389..80f74fba8e 100644
--- a/spec
+++ b/spec
@@ -29,12 +29,12 @@ beginseg
     include "$(BUILD_DIR)/src/boot/assert.o"
 #endif
     include "$(BUILD_DIR)/src/boot/is_debug.o"
-    include "$(BUILD_DIR)/src/libultra/io/driverominit.o"
+    include "$(BUILD_DIR)/src/boot/driverominit.o"
     include "$(BUILD_DIR)/src/boot/mio0.o"
     include "$(BUILD_DIR)/src/boot/stackcheck.o"
     include "$(BUILD_DIR)/src/boot/logutils.o"
 #if OOT_DEBUG
-    include "$(BUILD_DIR)/src/libultra/libc/sprintf.o"
+    include "$(BUILD_DIR)/src/boot/sprintf.o"
 #endif
     include "$(BUILD_DIR)/src/libultra/io/piacs.o"
     include "$(BUILD_DIR)/src/libultra/os/sendmesg.o"
@@ -580,7 +580,7 @@ beginseg
     include "$(BUILD_DIR)/src/code/rand.o"
     include "$(BUILD_DIR)/src/code/__osMalloc.o"
 #if !OOT_DEBUG
-    include "$(BUILD_DIR)/src/libultra/libc/sprintf.o"
+    include "$(BUILD_DIR)/src/boot/sprintf.o"
 #endif
     include "$(BUILD_DIR)/src/code/printutils.o"
     include "$(BUILD_DIR)/src/code/sleep.o"
diff --git a/src/libultra/io/driverominit.c b/src/boot/driverominit.c
similarity index 100%
rename from src/libultra/io/driverominit.c
rename to src/boot/driverominit.c
diff --git a/src/libultra/libc/sprintf.c b/src/boot/sprintf.c
similarity index 100%
rename from src/libultra/libc/sprintf.c
rename to src/boot/sprintf.c
diff --git a/tools/disasm/ntsc-1.2/files_boot.csv b/tools/disasm/ntsc-1.2/files_boot.csv
index a028cff131..d9d2741689 100644
--- a/tools/disasm/ntsc-1.2/files_boot.csv
+++ b/tools/disasm/ntsc-1.2/files_boot.csv
@@ -7,7 +7,7 @@ C90,800010F0,src/boot/yaz0
 FD0,80001430,src/boot/z_locale
 1070,800014D0,src/boot/cic6105
 12F0,80001750,src/boot/is_debug
-1350,800017B0,src/libultra/io/driverominit
+1350,800017B0,src/boot/driverominit
 1530,80001990,src/boot/mio0
 15E0,80001A40,src/boot/stackcheck
 17F0,80001C50,src/boot/logutils
@@ -92,7 +92,7 @@ offset,vram,.data
 6340,800067A0,src/boot/z_std_dma
 6350,800067B0,src/boot/z_locale
 6360,800067C0,src/boot/cic6105
-63A0,80006800,src/libultra/io/driverominit
+63A0,80006800,src/boot/driverominit
 63B0,80006810,src/boot/stackcheck
 63C0,80006820,src/libultra/io/piacs
 63D0,80006830,src/libultra/io/vimodepallan1
@@ -127,7 +127,7 @@ offset,vram,.bss
 7F00,80008360,src/boot/z_std_dma
 8670,80008AD0,src/boot/yaz0
 8A80,80008EE0,src/boot/cic6105
-8AA0,80008F00,src/libultra/io/driverominit
+8AA0,80008F00,src/boot/driverominit
 8B20,80008F80,src/libultra/io/piacs
 8B40,80008FA0,src/libultra/os/initialize
 8B50,80008FB0,src/libultra/io/pimgr
diff --git a/tools/disasm/ntsc-1.2/files_code.csv b/tools/disasm/ntsc-1.2/files_code.csv
index f66c981ae3..ea7d8bcd49 100644
--- a/tools/disasm/ntsc-1.2/files_code.csv
+++ b/tools/disasm/ntsc-1.2/files_code.csv
@@ -133,7 +133,7 @@ BCA20,800CE100,src/code/fp
 BCB80,800CE260,src/code/system_malloc
 BCDF0,800CE4D0,src/code/rand
 BCEF0,800CE5D0,src/code/__osMalloc
-BD8A0,800CEF80,src/libultra/libc/sprintf
+BD8A0,800CEF80,src/boot/sprintf
 BD970,800CF050,src/code/printutils
 BD9D0,800CF0B0,src/code/jpegutils
 BDEE0,800CF5C0,src/code/jpegdecoder