--- np2/win9x/debuguty/viewcmn.cpp	2003/10/16 17:59:09	1.1
+++ np2/win9x/debuguty/viewcmn.cpp	2004/04/08 13:08:23	1.6
@@ -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,10 @@
 #include	"view1mb.h"
 #include	"viewasm.h"
 #include	"viewsnd.h"
+#include	"cpucore.h"
+#include	"pccore.h"
+#include	"iocore.h"
+#include	"bios.h"
 
 
 char viewcmn_hex[16] = {
@@ -52,7 +52,7 @@ void viewcmn_putcaption(NP2VIEW_T *view)
 
 BOOL viewcmn_alloc(VIEWMEMBUF *buf, DWORD size) {
 
-	if (buf->type == ALOOCTYPE_ERROR) {
+	if (buf->type == ALLOCTYPE_ERROR) {
 		return(FAILURE);
 	}
 	if (buf->size < size) {
@@ -62,7 +62,7 @@ BOOL viewcmn_alloc(VIEWMEMBUF *buf, DWOR
 		ZeroMemory(buf, sizeof(VIEWMEMBUF));
 		buf->ptr = malloc(size);
 		if (!buf->ptr) {
-			buf->type = ALOOCTYPE_ERROR;
+			buf->type = ALLOCTYPE_ERROR;
 			return(FAILURE);
 		}
 		buf->size = size;
@@ -155,8 +155,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 = CPU_ITFBANK;
+	dmem->A20 = (BYTE)((CPU_ADRSMASK >> 20) & 1);
 }
 
 
@@ -183,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);
 	}
 }