--- np2/i386c/cpucore.h	2003/12/08 00:55:31	1.1
+++ np2/i386c/cpucore.h	2003/12/12 01:04:40	1.3
@@ -1,4 +1,6 @@
-/*	$Id: cpucore.h,v 1.1 2003/12/08 00:55:31 yui Exp $	*/
+/*	$Id: cpucore.h,v 1.3 2003/12/12 01:04:40 yui Exp $	*/
+
+#include	"memory.h"
 
 #ifndef	NP2_I386C_CPUCORE_H__
 #define	NP2_I386C_CPUCORE_H__
@@ -6,10 +8,10 @@
 #define	I286_MEMREADMAX		0xa4000
 #define	I286_MEMWRITEMAX	0xa0000
 
-#if defined(CPU386)
+#if defined(CPUCORE_IA32)
 #include "ia32/cpu.h"
-#else /* !CPU386 */
+#else /* !CPUCORE_IA32 */
 #include "i286/cpu.h"
-#endif /* CPU386 */
+#endif /* CPUCORE_IA32 */
 
 #endif	/* !NP2_I386C_CPUCORE_H__ */