--- np2/i286x/v30patch.cpp	2003/12/01 10:45:46	1.4
+++ np2/i286x/v30patch.cpp	2004/07/12 10:33:02	1.7
@@ -1,11 +1,10 @@
 #include	"compiler.h"
-#include	"i286.h"
+#include	"cpucore.h"
 #include	"i286x.h"
 #include	"i286xadr.h"
 #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;
 
@@ -992,7 +991,7 @@ static void v30patching(void (*dst[])(vo
 
 #define	V30PATCHING(a, b)	v30patching(a, b, sizeof(b)/sizeof(V30PATCH_T))
 
-void v30init(void) {
+void v30xinit(void) {
 
 	CopyMemory(v30op, i286op, sizeof(v30op));
 	V30PATCHING(v30op, v30patch_op);
@@ -1002,7 +1001,7 @@ void v30init(void) {
 	V30PATCHING(v30op_repe, v30patch_repe);
 }
 
-LABEL void v30(void) {
+LABEL void v30x(void) {
 
 	__asm {
 				pushad
@@ -1049,7 +1048,7 @@ v30notrap:		mov		dword ptr (i286core.s.p
 	}
 }
 
-LABEL void v30_step(void) {
+LABEL void v30x_step(void) {
 
 	__asm {
 				pushad