--- np2/io/iocore.h	2004/01/05 06:05:11	1.5
+++ np2/io/iocore.h	2004/02/21 00:25:33	1.8
@@ -20,12 +20,11 @@ typedef void (*IOCBFN)(void);
 #include	"dmac.h"
 #include	"egc.h"
 #include	"epsonio.h"
-#include	"extmem.h"
+#include	"emsio.h"
 #include	"fdc.h"
 #include	"fdd320.h"
 #include	"gdc.h"
 #include	"gdc_cmd.h"
-#include	"gdc_sub.h"
 #include	"mouseif.h"
 #include	"necio.h"
 #include	"nmiio.h"
@@ -49,12 +48,12 @@ extern	_CRTC		crtc;
 extern	_DMAC		dmac;
 extern	_EGC		egc;
 extern	_EPSONIO	epsonio;
-extern	_EXTMEM		extmem;
+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;