--- np2/i286c/i286c_0f.c	2003/10/19 14:56:15	1.4
+++ np2/i286c/i286c_0f.c	2003/11/21 06:51:11	1.6
@@ -1,9 +1,8 @@
 #include	"compiler.h"
 #include	"i286.h"
 #include	"i286c.h"
-#include	"i286c.mcr"
 #include	"memory.h"
-#include	"nevent.h"
+#include	"i286c.mcr"
 
 
 I286_0F _sgdt(UINT op) {
@@ -80,7 +79,7 @@ I286_0F _smsw(UINT op) {
 
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(3);
-		*(reg16_b20[op]) = i286reg.MSW;
+		*(REG16_B20(op)) = i286reg.MSW;
 	}
 	else {
 		I286_WORKCLOCK(6);
@@ -92,7 +91,7 @@ I286_0F _lmsw(UINT op) {
 
 	if (op >= 0xc0) {
 		I286_WORKCLOCK(2);
-		i286reg.MSW = *(reg16_b20[op]);
+		i286reg.MSW = *(REG16_B20(op));
 	}
 	else {
 		I286_WORKCLOCK(3);