diff --git a/src/bios/0module.mk b/src/bios/0module.mk
index 2c29424..138bb54 100644
--- a/src/bios/0module.mk
+++ b/src/bios/0module.mk
@@ -15,7 +15,7 @@ $(BIOS_BIN)/%.rel: $(BIOS_SRC)/%.asm | $(BIOS_BIN)
 	$(call mb_sdcc_compile_asm,$<,$@)
 
 $(BIOS_HEX): $(BIOS_RELS)
-	$(call mb_sdcc_link_asm_dos,$<,$@)
+	$(call mb_sdcc_link_asm_bdos,$<,$@)
 
 $(BIOS_DAT): $(BIOS_HEX)
 	$(call mb_sdcc_hex2bin,$<,$@)
diff --git a/src/dist-run/0module.mk b/src/dist-run/0module.mk
index b9b19b6..a048b2b 100644
--- a/src/dist-run/0module.mk
+++ b/src/dist-run/0module.mk
@@ -20,8 +20,7 @@ $(DIST_RUN_BIN)/dome.000: bin/domelib/dome.000 | $(DIST_RUN_BIN)
 	cp src/gfx/org/*.zop $(DIST_RUN_BIN);
 
 $(DIST_RUN_NAME): $(DIST_RUN_INC_BIN)
-	$(call mb_autoexec_show_gui80_mouse,$(DIST_RUN_BIN),init)
-	$(call mb_openmsx_dosctl,$(DIST_RUN_BIN))
+	$(call mb_msxpipe_run_gui_mouse,$(DIST_RUN_BIN),init)
 
 .PHONY: $(DIST_RUN_BIN)/@flight-video
 $(DIST_RUN_BIN)/@flight-video:
diff --git a/src/gfx/0module.mk b/src/gfx/0module.mk
index 42e4ac8..75c67a7 100644
--- a/src/gfx/0module.mk
+++ b/src/gfx/0module.mk
@@ -44,8 +44,7 @@ $(GFX_BIN)/%.zop: $(GFX_SRC)/%.ge5 | $(GFX_BIN)
 	$(call mb_openmsx_dosctl,$(GFX_BIN))
 
 test-gfx: gfx
-	$(call mb_autoexec_open_gui,$(GFX_BIN))
-	$(call mb_openmsx_dosctl,$(GFX_BIN))
+	$(call mb_msxpipe_run_gui,$(GFX_BIN))
 
 gfx: $(GFX_BIN_FILES)
 	echo All GFX are compressed.
diff --git a/src/init/0module.mk b/src/init/0module.mk
index 6587c84..67521ce 100644
--- a/src/init/0module.mk
+++ b/src/init/0module.mk
@@ -15,7 +15,7 @@ $(INIT_BIN)/%.rel: $(INIT_SRC)/%.asm | $(INIT_BIN)
 	$(call mb_sdcc_compile_asm,$<,$@)
 
 $(INIT_HEX): $(INIT_RELS)
-	$(call mb_sdcc_link_asm_dos,$<,$@)
+	$(call mb_sdcc_link_asm_bdos,$<,$@)
 
 $(INIT_COM): $(INIT_HEX)
 	$(call mb_sdcc_hex2bin,$<,$@)
diff --git a/src/makelib/0module.mk b/src/makelib/0module.mk
index 476a714..9b6e982 100644
--- a/src/makelib/0module.mk
+++ b/src/makelib/0module.mk
@@ -15,7 +15,7 @@ $(MAKELIB_BIN)/%.rel: $(MAKELIB_SRC)/%.asm | $(MAKELIB_BIN)
 	$(call mb_sdcc_compile_asm,$<,$@)
 
 $(MAKELIB_HEX): $(MAKELIB_RELS)
-	$(call mb_sdcc_link_asm_dos,$<,$@)
+	$(call mb_sdcc_link_asm_bdos,$<,$@)
 
 $(MAKELIB_COM): $(MAKELIB_HEX)
 	$(call mb_sdcc_hex2bin,$<,$@)