--- xmil/win9x/sysmng.cpp	2004/08/03 12:50:54	1.2
+++ xmil/win9x/sysmng.cpp	2004/08/10 08:28:49	1.6
@@ -6,7 +6,7 @@
 #include	"z80core.h"
 #include	"pccore.h"
 #include	"fddfile.h"
-#include	"draw.h"
+#include	"makescrn.h"
 
 
 	UINT	sys_updates;
@@ -14,7 +14,7 @@
 
 void sysmng_scrnwidth(REG8 mode) {
 
-	xmenu_setwidth(mode);
+	menu_setwidth(mode);
 }
 
 
@@ -60,14 +60,14 @@ void sysmng_updatecaption(REG8 flag) {
 
 	if (flag & 1) {
 		title[0] = '\0';
-		if (fdd_diskready(0)) {
+		if (fddfile_diskready(0)) {
 			milstr_ncat(title, OEMTEXT("  FDD0:"), NELEMENTS(title));
-			milstr_ncat(title, file_getname(fdd_diskname(0)),
+			milstr_ncat(title, file_getname(fddfile_diskname(0)),
 															NELEMENTS(title));
 		}
-		if (fdd_diskready(1)) {
+		if (fddfile_diskready(1)) {
 			milstr_ncat(title, OEMTEXT("  FDD1:"), NELEMENTS(title));
-			milstr_ncat(title, file_getname(fdd_diskname(1)),
+			milstr_ncat(title, file_getname(fddfile_diskname(1)),
 															NELEMENTS(title));
 		}
 	}
@@ -75,7 +75,7 @@ void sysmng_updatecaption(REG8 flag) {
 		clock[0] = '\0';
 		if (xmiloscfg.DISPCLK & 2) {
 			if (workclock.fps) {
-				SPRINTF(clock, OEMTEXT(" - %u.%1uFPS"),
+				OEMSPRINTF(clock, OEMTEXT(" - %u.%1uFPS"),
 									workclock.fps / 10, workclock.fps % 10);
 			}
 			else {
@@ -83,7 +83,7 @@ void sysmng_updatecaption(REG8 flag) {
 			}
 		}
 		if (xmiloscfg.DISPCLK & 1) {
-			SPRINTF(work, OEMTEXT(" %u.%03uMHz"),
+			OEMSPRINTF(work, OEMTEXT(" %u.%03uMHz"),
 								workclock.khz / 1000, workclock.khz % 1000);
 			if (clock[0] == '\0') {
 				milstr_ncpy(clock, OEMTEXT(" -"), NELEMENTS(clock));