--- np2/lio/gscreen.c	2003/10/16 17:58:27	1.1.1.1
+++ np2/lio/gscreen.c	2003/12/12 01:04:40	1.4
@@ -1,14 +1,10 @@
 #include	"compiler.h"
-#include	"i286.h"
-#include	"memory.h"
+#include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"lio.h"
 
 
-extern BYTE screenupdate;
-
-
 static void lio_makescreen(void) {
 
 	UINT16	pos;
@@ -44,7 +40,7 @@ BYTE lio_gscreen(void) {
 	BYTE			bit;
 	int				disp;
 
-	i286_memstr_read(I286_DS, I286_BX, &data, sizeof(data));
+	i286_memstr_read(CPU_DS, CPU_BX, &data, sizeof(data));
 	if (data.mode == 0xff) {
 		data.mode = lio.gscreen.mode;
 	}