--- xmil/win9x/menu.cpp	2004/08/01 05:31:31	1.1
+++ xmil/win9x/menu.cpp	2004/08/03 11:02:00	1.3
@@ -5,8 +5,6 @@
 #include	"scrnmng.h"
 #include	"sysmng.h"
 #include	"pccore.h"
-#include	"x1_io.h"
-#include	"x1_fdc.h"
 #include	"ini.h"
 #include	"menu.h"
 #include	"draw.h"
@@ -131,8 +129,8 @@ void xmenu_setbootmedia(UINT8 value) {
 	HMENU	hmenu;
 
 	hmenu = GetMenu(hWndMain);
-	value &= DIP_BOOTMEDIA;
-	xmilcfg.DIP_SW &= (~DIP_BOOTMEDIA);
+	value &= DIPSW_BOOTMEDIA;
+	xmilcfg.DIP_SW &= ~DIPSW_BOOTMEDIA;
 	xmilcfg.DIP_SW |= value;
 	CheckMenuItem(hmenu, IDM_BOOT2D, MFCHECK(!value));
 	CheckMenuItem(hmenu, IDM_BOOT2HD, MFCHECK(value));
@@ -152,8 +150,8 @@ void xmenu_setresolute(UINT8 value) {
 	HMENU	hmenu;
 
 	hmenu = GetMenu(hWndMain);
-	value &= DIP_RESOLUTE;
-	xmilcfg.DIP_SW &= (~DIP_RESOLUTE);
+	value &= DIPSW_RESOLUTE;
+	xmilcfg.DIP_SW &= ~DIPSW_RESOLUTE;
 	xmilcfg.DIP_SW |= value;
 	CheckMenuItem(hmenu, IDM_HIGHRES, MFCHECK(!value));
 	CheckMenuItem(hmenu, IDM_LOWRES, MFCHECK(value));