--- np2/win9x/debuguty/viewcmn.cpp	2003/10/16 17:59:09	1.1.1.1
+++ np2/win9x/debuguty/viewcmn.cpp	2003/12/01 10:45:46	1.3
@@ -1,12 +1,8 @@
 #include	"compiler.h"
 #include	"resource.h"
 #include	"np2.h"
-#include	"i286.h"
-#include	"memory.h"
-#include	"pccore.h"
-#include	"iocore.h"
-#include	"bios.h"
 #include	"viewer.h"
+#include	"viewcmn.h"
 #include	"viewmenu.h"
 #include	"viewmem.h"
 #include	"viewreg.h"
@@ -14,6 +10,11 @@
 #include	"view1mb.h"
 #include	"viewasm.h"
 #include	"viewsnd.h"
+#include	"i286.h"
+#include	"memory.h"
+#include	"pccore.h"
+#include	"iocore.h"
+#include	"bios.h"
 
 
 char viewcmn_hex[16] = {
@@ -155,8 +156,8 @@ void viewcmn_setbank(NP2VIEW_T *view) {
 
 	dmem = &view->dmem;
 	dmem->vram = gdcs.disp;
-	dmem->itf = itf.bank;
-	dmem->A20 = (BYTE)((extmem.adrsmask >> 20) & 1);
+	dmem->itf = i286core.s.itfbank;
+	dmem->A20 = (BYTE)((i286core.s.adrsmask >> 20) & 1);
 }