--- np2/io/iocore.h	2003/12/08 00:55:32	1.3
+++ np2/io/iocore.h	2004/02/07 21:23:22	1.7
@@ -19,14 +19,15 @@ typedef void (*IOCBFN)(void);
 #include	"dipsw.h"
 #include	"dmac.h"
 #include	"egc.h"
-#include	"extmem.h"
+#include	"epsonio.h"
+#include	"emsio.h"
 #include	"fdc.h"
 #include	"fdd320.h"
 #include	"gdc.h"
 #include	"gdc_cmd.h"
 #include	"gdc_sub.h"
-#include	"itf.h"
 #include	"mouseif.h"
+#include	"necio.h"
 #include	"nmiio.h"
 #include	"np2sysp.h"
 #include	"pic.h"
@@ -47,12 +48,13 @@ extern	_CGWINDOW	cgwindow;
 extern	_CRTC		crtc;
 extern	_DMAC		dmac;
 extern	_EGC		egc;
-extern	_EXTMEM		extmem;
+extern	_EPSONIO	epsonio;
+extern	_EMSIO		emsio;
 extern	_FDC		fdc;
 extern	_GDC		gdc;
 extern	_GDCS		gdcs;
 extern	_GRCG		grcg;
-extern	_KEYB		keyb;
+extern	_KEYBRD		keybrd;
 extern	_MOUSEIF	mouseif;
 extern	_NMIIO		nmiio;
 extern	_NP2SYSP	np2sysp;