--- xmil/win9x/scrnmng.cpp	2004/08/04 10:49:21	1.2
+++ xmil/win9x/scrnmng.cpp	2004/08/07 07:19:56	1.5
@@ -13,10 +13,8 @@
 #include	"extclass.h"
 #include	"pccore.h"
 #include	"scrndraw.h"
-#include	"draw.h"
 #include	"palettes.h"
-#include	"x1_io.h"
-#include	"x1_crtc.h"
+#include	"makescrn.h"
 
 
 typedef struct {
@@ -473,7 +471,7 @@ BRESULT scrnmng_create(UINT8 mode) {
 	scrnmng.bpp = (UINT8)bitcolor;
 	scrnsurf.bpp = bitcolor;
 	ddraw.scrnmode = mode;
-	ddraw.width = SCREEN_WIDTH;
+	ddraw.width = SURFACE_WIDTH;
 	ddraw.height = height;
 	ddraw.cliping = 0;
 	renewalclientsize(FALSE);
@@ -642,8 +640,8 @@ void clearblanklines(DWORD posx, DWORD p
 
 	fillrect.left = posx;
 	fillrect.top = posy + ddraw.rect.bottom;
-	fillrect.right = posx + SCREEN_WIDTH;
-	fillrect.bottom = posy + SCREEN_HEIGHT;
+	fillrect.right = posx + SURFACE_WIDTH;
+	fillrect.bottom = posy + SURFACE_HEIGHT;
 
 	ZeroMemory(&ddbf, sizeof(ddbf));
 	ddbf.dwSize = sizeof(ddbf);
@@ -768,7 +766,7 @@ void scrnmng_dispclock(void) {
 			ddraw.primsurf->Restore();
 			ddraw.clocksurf->Restore();
 		}
-		dclock_cntdown(xmilcfg.DRAW_SKIP);
+		dclock_cntdown(xmiloscfg.DRAW_SKIP);
 	}
 }