diff --git a/Makefile b/Makefile
index 67900f037..44c776d64 100644
--- a/Makefile
+++ b/Makefile
@@ -439,7 +439,6 @@ O_FILES       := $(foreach f,$(S_FILES:.s=.o),$(BUILD_DIR)/$f) \
                  $(foreach f,$(ASSET_C_FILES_COMMITTED:.c=.o),$(BUILD_DIR)/$f) \
                  $(foreach f,$(BASEROM_BIN_FILES),$(BUILD_DIR)/baserom/$(notdir $f).o) \
                  $(BUILD_DIR)/src/code/z_message_z_game_over.o
-                 $(foreach f,$(BASEROM_BIN_FILES),$(BUILD_DIR)/baserom/$(notdir $f).o)
 
 UCODE_PATCHES := $(wildcard F3DEX3/*.bps)
 UCODE_FILES   := $(foreach f,$(UCODE_PATCHES:.bps=),$f)
@@ -662,7 +661,7 @@ else
 endif
 	$(V)$(PYTHON) -m ipl3checksum sum --cic 6105 --update $@
 
-$(ELF): $(TEXTURE_FILES_OUT) $(ASSET_FILES_OUT) $(O_FILES) $(OVL_RELOC_FILES) $(LDSCRIPT) $(BUILD_DIR)/undefined_syms.txt \
+$(ELF): $(TEXTURE_FILES_OUT) $(ASSET_FILES_OUT) $(O_FILES) $(OVL_RELOC_FILES) $(UCODE_O_FILES) $(LDSCRIPT) $(BUILD_DIR)/undefined_syms.txt \
         $(SAMPLEBANK_O_FILES) $(SOUNDFONT_O_FILES) \
         $(BUILD_DIR)/assets/audio/audiobank_padding.o
 	$(call print,Linking:,,$@)
diff --git a/spec b/spec
index 4cc57219d..b4caa6dcc 100644
--- a/spec
+++ b/spec
@@ -730,6 +730,7 @@ beginseg
     include "$(BUILD_DIR)/src/debug/profiler.o"
 #endif
 endseg
+#endif
 
 #if PLATFORM_N64
 beginseg
diff --git a/src/boot/cic6105.c b/src/boot/cic6105.c
index 9cb5c3e39..91e30cf5a 100644
--- a/src/boot/cic6105.c
+++ b/src/boot/cic6105.c
@@ -42,7 +42,6 @@ void CIC6105_FaultClient(void) {
     func_800AE258_unknown("ROM_F");
     func_800AE258_unknown(" [Creator:%s]", gBuildTeam);
     func_800AE1E0_unknown(56, 192);
-    func_800AE258_unknown("[Date:%s]", gBuildDate);
     func_800AE1E0_unknown(96, 32);
     func_800AE258_unknown("I LOVE YOU %08x", func_80001714());
 }
diff --git a/src/code/sys_ucode.c b/src/code/sys_ucode.c
index aa3fa809f..5ced4d38d 100644
--- a/src/code/sys_ucode.c
+++ b/src/code/sys_ucode.c
@@ -1,4 +1,5 @@
 #include "global.h"
+#include "fault.h"
 
 #if !ENABLE_F3DEX3
 u64* sDefaultGSPUCodeText = gspF3DZEX2_NoN_PosLight_fifoTextStart;
diff --git a/src/debug/collision_view.c b/src/debug/collision_view.c
index c0d143028..9ca94c3aa 100644
--- a/src/debug/collision_view.c
+++ b/src/debug/collision_view.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "debug.h"
+#include "fault.h"
 
 static Gfx sPolyBuffer[MENU_BUFFER_SIZE];