diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index 7f2afc5059cb..fee236359a92 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -194,7 +194,7 @@ i386/ibcs2/ibcs2_util.c		optional ibcs2
 i386/ibcs2/ibcs2_xenix.c	optional ibcs2
 i386/ibcs2/ibcs2_xenix_sysent.c	optional ibcs2
 i386/ibcs2/imgact_coff.c	optional ibcs2
-i386/isa/atpic.c		standard
+i386/isa/atpic.c		optional atpic	
 #i386/isa/atpic_vector.s		standard
 i386/isa/elink.c		optional ep | ie
 i386/isa/isa.c			optional isa
@@ -240,7 +240,7 @@ pc98/cbus/gdc.c			optional gdc
 pc98/cbus/nmi.c			standard
 pc98/cbus/olpt.c		optional olpt
 pc98/cbus/pckbd.c		optional pckbd
-pc98/cbus/pcrtc.c		standard
+pc98/cbus/pcrtc.c		optional atpic
 pc98/cbus/pmc.c			optional pmc
 pc98/cbus/scgdcrndr.c		optional sc gdc
 pc98/cbus/scterm-sck.c		optional sc
diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c
index 1549b177ddc8..e999b5619ddf 100644
--- a/sys/i386/isa/clock.c
+++ b/sys/i386/isa/clock.c
@@ -65,9 +65,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/frame.h>
 #include <machine/intr_machdep.h>
 #include <machine/md_var.h>
-#ifdef DEV_APIC
 #include <machine/apicvar.h>
-#endif
 #include <machine/ppireg.h>
 #include <machine/timerreg.h>
 #include <machine/smp.h>
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c
index 730059368db7..10b259868135 100644
--- a/sys/pc98/cbus/clock.c
+++ b/sys/pc98/cbus/clock.c
@@ -67,9 +67,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/frame.h>
 #include <machine/intr_machdep.h>
 #include <machine/md_var.h>
-#ifdef DEV_APIC
 #include <machine/apicvar.h>
-#endif
 #include <machine/ppireg.h>
 #include <machine/timerreg.h>
 #include <machine/smp.h>
diff --git a/sys/pc98/conf/DEFAULTS b/sys/pc98/conf/DEFAULTS
index 0002cf0a30cc..f30501e44ac1 100644
--- a/sys/pc98/conf/DEFAULTS
+++ b/sys/pc98/conf/DEFAULTS
@@ -24,3 +24,6 @@ device		uart_ns8250
 # Default partitioning schemes
 options 	GEOM_PART_BSD
 options 	GEOM_PART_PC98
+
+# enable support for native hardware
+device		atpic