--- np2/win9x/debuguty/viewcmn.cpp	2003/12/01 10:45:46	1.3
+++ np2/win9x/debuguty/viewcmn.cpp	2003/12/12 01:04:41	1.5
@@ -10,8 +10,7 @@
 #include	"view1mb.h"
 #include	"viewasm.h"
 #include	"viewsnd.h"
-#include	"i286.h"
-#include	"memory.h"
+#include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"bios.h"
@@ -156,8 +155,8 @@ void viewcmn_setbank(NP2VIEW_T *view) {
 
 	dmem = &view->dmem;
 	dmem->vram = gdcs.disp;
-	dmem->itf = i286core.s.itfbank;
-	dmem->A20 = (BYTE)((i286core.s.adrsmask >> 20) & 1);
+	dmem->itf = CPU_ITFBANK;
+	dmem->A20 = (BYTE)((CPU_ADRSMASK >> 20) & 1);
 }
 
 
@@ -184,10 +183,10 @@ void viewcmn_setmenuseg(HWND hwnd) {
 	hmenu = GetSubMenu(hparent, 2);
 
 	if (hmenu) {
-		modmenu(hmenu, 2, IDM_SEGCS, "CS", I286_CS);
-		modmenu(hmenu, 3, IDM_SEGDS, "DS", I286_DS);
-		modmenu(hmenu, 4, IDM_SEGES, "ES", I286_ES);
-		modmenu(hmenu, 5, IDM_SEGSS, "SS", I286_SS);
+		modmenu(hmenu, 2, IDM_SEGCS, "CS", CPU_CS);
+		modmenu(hmenu, 3, IDM_SEGDS, "DS", CPU_DS);
+		modmenu(hmenu, 4, IDM_SEGES, "ES", CPU_ES);
+		modmenu(hmenu, 5, IDM_SEGSS, "SS", CPU_SS);
 		DrawMenuBar(hwnd);
 	}
 }