diff --git a/Makefile b/Makefile
index b7aa0d9d..18cbe739 100644
--- a/Makefile
+++ b/Makefile
@@ -46,16 +46,14 @@ all: check
 check: $$(TARGETS)
 
 commit-check: format
-	$(MAKE) remake
-	$(MAKE) objdiff
+	$(MAKE) --no-print-directory remake
+	$(MAKE) --no-print-directory objdiff
 
 clean:
 	$(RM) $(RMFLAGS) $(BUILD) nonmatchings
 
 remake: clean
-	$(MAKE)
-
-commit-check remake: MAKEFLAGS += --no-print-directory
+	$(MAKE) --no-print-directory
 
 include $(INCMAKEFILES)
 
diff --git a/src/SLUS_010.40/libcd/SYS.c b/src/SLUS_010.40/libcd/SYS.c
index 12e99562..5ea686d2 100644
--- a/src/SLUS_010.40/libcd/SYS.c
+++ b/src/SLUS_010.40/libcd/SYS.c
@@ -1,10 +1,20 @@
 #include "common.h"
 
-INCLUDE_ASM("build/src/SLUS_010.40/nonmatchings/libcd/SYS", CdStatus);
+typedef void (*CdlCB)(unsigned char, unsigned char*);
 
-INCLUDE_ASM("build/src/SLUS_010.40/nonmatchings/libcd/SYS", CdMode);
+extern unsigned char D_80032208;
+extern unsigned char D_80032214[];
+extern unsigned char D_80032218;
+extern unsigned char D_80032219;
+extern int D_80032204;
+extern CdlCB D_800321FC;
+extern CdlCB D_80032200;
 
-INCLUDE_ASM("build/src/SLUS_010.40/nonmatchings/libcd/SYS", CdLastCom);
+int CdStatus(void) { return D_80032208; }
+
+int CdMode(void) { return D_80032218; }
+
+int CdLastCom(void) { return D_80032219; }
 
 INCLUDE_ASM("build/src/SLUS_010.40/nonmatchings/libcd/SYS", CdLastPos);