--- np2/i286x/v30patch.cpp	2003/12/08 00:55:31	1.5
+++ np2/i286x/v30patch.cpp	2004/07/12 10:33:02	1.7
@@ -5,7 +5,6 @@
 #include	"i286xs.h"
 #include	"i286xrep.h"
 #include	"i286xcts.h"
-#include	"memory.h"
 #include	"pccore.h"
 #include	"bios.h"
 #include	"iocore.h"
@@ -15,7 +14,7 @@
 
 
 typedef struct {
-	DWORD	opnum;
+	UINT	opnum;
 	void	(*v30opcode)(void);
 } V30PATCH_T;