--- xmil/win9x/xmil.cpp	2004/08/03 12:50:54	1.4
+++ xmil/win9x/xmil.cpp	2004/08/04 17:09:25	1.6
@@ -22,8 +22,7 @@
 
 #include	"z80core.h"
 #include	"pccore.h"
-#include	"x1_io.h"
-#include	"x1_crtc.h"
+#include	"iocore.h"
 #include	"timing.h"
 #include	"draw.h"
 #include	"fdd_ini.h"
@@ -259,15 +258,15 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 					break;
 
 				case IDM_WIDTH80:
-					crtc.TXT_XL = 80;
-					crtc.GRP_XL = 640;
+					crtc.s.TXT_XL = 80;
+					crtc.s.GRP_XL = 640;
 					vrambank_patch();
 					scrnallflash = 1;
 					break;
 
 				case IDM_WIDTH40:
-					crtc.TXT_XL = 40;
-					crtc.GRP_XL = 320;
+					crtc.s.TXT_XL = 40;
+					crtc.s.GRP_XL = 320;
 					vrambank_patch();
 					scrnallflash = 1;
 					break;
@@ -675,7 +674,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 						WS_OVERLAPPED | WS_SYSMENU | WS_CAPTION |
 						WS_MINIMIZEBOX,
 						xmiloscfg.winx, xmiloscfg.winy,
-						SCREEN_WIDTH, SCREEN_HEIGHT,
+						SURFACE_WIDTH, SURFACE_HEIGHT,
 						NULL, NULL, hInstance, NULL);
 	hWndMain = hWnd;
 	scrnmng_initialize();