diff --git a/sys/pc98/boot/biosboot/Makefile b/sys/pc98/boot/biosboot/Makefile
index 72731da9a5d3..50c5b45bd536 100644
--- a/sys/pc98/boot/biosboot/Makefile
+++ b/sys/pc98/boot/biosboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.14 1997/06/09 13:44:03 kato Exp $
+#	$Id: Makefile,v 1.15 1998/01/28 12:20:57 kato Exp $
 #
 
 PROG=	boot
@@ -12,7 +12,10 @@ CFLAGS=		-O2 -malign-functions=0 -malign-jumps=0 -malign-loops=0 \
 		-mno-486 \
 		-DPC98 -DBOOTWAIT=${BOOTWAIT} -DTIMEOUT=${TIMEOUT}
 CFLAGS+=	-DBOOTSEG=${BOOTSEG} -DBOOTSTACK=${BOOTSTACK}
-CFLAGS+=	-I${.CURDIR}/../../..
+.if exists(${.CURDIR}/../../../../include)
+CFLAGS+=	-nostdinc -I${.CURDIR}/../../../../include
+.endif
+CFLAGS+=	-I${.CURDIR}/../../.. -I${.OBJDIR}
 CFLAGS+=	${CWARNFLAGS}
 
 # By default, if a serial port is going to be used as console, use COM1
@@ -46,7 +49,7 @@ CFLAGS+=	-DCOMCONSOLE=${BOOT_COMCONSOLE_PORT} \
 # SCSI and have BIOS drive number (sd_unit_number + BOOT_HD_BIAS).  E.g.,
 # BOOT_HD_BIAS=1 makes sd(0,a) correspond to 1:sd(0,a) instead of 0:sd(0,a).
 
-CLEANFILES+=	boot.nohdr boot.strip boot1 boot2 sizetest
+CLEANFILES+=	boot.nohdr boot.strip boot1 boot2 machine sizetest
 LDFLAGS+=	-N -T 0 -nostdlib
 #LINKS=		${BINDIR}/sdboot ${BINDIR}/wdboot\
 #		${BINDIR}/sdboot ${BINDIR}/fdboot\
@@ -88,7 +91,12 @@ boot2:		boot.nohdr
 		exit 2 ; \
 	fi
 
-all:		boot1 boot2
+pre-compile:
+.if !exists(${.OBJDIR}/machine)
+	ln -s ${.CURDIR}/../../include ${.OBJDIR}/machine
+.endif
+
+all:	pre-compile boot1 boot2
 
 install:
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}\
diff --git a/sys/pc98/boot/kzipboot/Makefile b/sys/pc98/boot/kzipboot/Makefile
index 2f2bf81771a5..07f7b4975d7a 100644
--- a/sys/pc98/boot/kzipboot/Makefile
+++ b/sys/pc98/boot/kzipboot/Makefile
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: Makefile,v 1.3 1997/02/22 09:43:15 peter Exp $
 
 PROG= kztail.o kzhead.o
 BINMODE = 444	# target is a relocatable object
@@ -17,14 +17,30 @@ CSEG    = 0x8
 
 STRIP=	#  very important!! don't let kz*.o be stripped
 
+.if exists(${.CURDIR}/../../../../include)
+CFLAGS+= -nostdinc
+CFLAGS+= -I${.OBJDIR} -I${.CURDIR}/../../../
+CFLAGS+= -I${.CURDIR}/../../../../include
+.endif
+
 CFLAGS+= -DKADDR=$(KADDR) -DCSEG=$(CSEG)
 CFLAGS+= -DKZIP -DCOMCONSOLE=0x30 
 CFLAGS+= -DPC98
 
+CLEANFILES=machine
+
 kztail.o:  ${OBJS_KZTAIL}
 	$(LD) -r -x -o kztail.o $(OBJS_KZTAIL)
 
 kzhead.o:  ${OBJS_KZHEAD}
 	$(LD) -r -x -o kzhead.o $(OBJS_KZHEAD)
 
+pre-compile:
+.if !exists(${.OBJDIR}/machine)
+	ln -s ${.CURDIR}/../../include ${.OBJDIR}/machine
+.endif
+
+all:	pre-compile ${PROG}
+
+
 .include <bsd.prog.mk>
diff --git a/sys/pc98/boot/netboot/Makefile b/sys/pc98/boot/netboot/Makefile
index 3fae1ebadd31..63bdd125a2ab 100644
--- a/sys/pc98/boot/netboot/Makefile
+++ b/sys/pc98/boot/netboot/Makefile
@@ -37,6 +37,7 @@ SRCS=	start2.S main.c misc.c bootmenu.c rpc.c
 
 BINDIR=		/usr/mdec
 BINMODE=	555
+
 CFLAGS=		-O2 -DNFS -DROMSIZE=${ROMSIZE} -DRELOC=${RELOCADDR} -DASK_BOOT
 CFLAGS+=	-DPC98
 #CFLAGS += -DPCI -DPCI_VENDOR=${PCI_VENDOR} -DPCI_DEVICE=${PCI_DEVICE}
@@ -45,13 +46,19 @@ CFLAGS+=	-DPC98
 #NS8390=	-DINCLUDE_NE
 #NS8390+=	-DINCLUDE_3COM -D_3COM_BASE=0x300
 NS8390=	-DINCLUDE_EGY -DNE_BASE=0xd0
-CLEANFILES+=	netboot.com
+CLEANFILES+=	machine netboot.com
 CLEANFILES+=	makerom start2.ro 3c509.o ns8390.o
 LDFLAGS+=	-N -T ${RELOCADDR} -e _start -nostdlib
 NOSHARED=	YES
 NOMAN=
 STRIP=
 
+.if exists(${.CURDIR}/../../../../include)
+CFLAGS+= -nostdinc
+CFLAGS+= -I${.OBJDIR} -I${.CURDIR}/../../../
+CFLAGS+= -I${.CURDIR}/../../../../include
+.endif
+
 ROMSIZE=16384
 RELOCADDR=0x90000
 
@@ -92,5 +99,11 @@ nb3c509.com:	start2.o ${SRCS:N*.h:R:S/$/.o/g} 3c509.o
 	dd ibs=32 skip=1 if=${.TARGET}.tmp of=${.TARGET}
 	rm -f ${.TARGET}.tmp
 
+pre-compile:
+.if !exists(${.OBJDIR}/machine)
+	ln -s ${.CURDIR}/../../include ${.OBJDIR}/machine
+.endif
+
+all:	pre-compile ${PROG}
 
 .include <bsd.prog.mk>
diff --git a/sys/pc98/boot/rawboot/Makefile b/sys/pc98/boot/rawboot/Makefile
index 96b12f064835..deea6122606c 100644
--- a/sys/pc98/boot/rawboot/Makefile
+++ b/sys/pc98/boot/rawboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.6 1997/02/22 09:43:18 peter Exp $
+#	$Id: Makefile,v 1.7 1997/04/26 04:00:25 kato Exp $
 #
 
 PROG=	boot
@@ -35,6 +35,12 @@ CFLAGS+=	-DPROBE_KEYBOARD_LOCK
 CFLAGS+=	-DFORCE_COMCONSOLE
 .endif
 
+.if exists(${.CURDIR}/../../../../include)
+CFLAGS+= -nostdinc
+CFLAGS+= -I${.OBJDIR} -I${.CURDIR}/../../../
+CFLAGS+= -I${.CURDIR}/../../../../include
+.endif
+
 # By default, if a serial port is going to be used as console, use COM1
 # (aka /dev/ttyd0).
 BOOT_COMCONSOLE_PORT?=0x30
@@ -62,7 +68,7 @@ CFLAGS+=	-DCOMCONSOLE=${BOOT_COMCONSOLE_PORT} \
 # SCSI and have BIOS drive number (sd_unit_number + BOOT_HD_BIAS).  E.g.,
 # BOOT_HD_BIAS=1 makes sd(0,a) correspond to 1:sd(0,a) instead of 0:sd(0,a).
 
-CLEANFILES+=	boot.nohdr boot.strip rawboot sizetest
+CLEANFILES+=	boot.nohdr boot.strip machine rawboot sizetest
 LDFLAGS+=	-N -T 0 -nostdlib
 NOSHARED=	YES
 NOMAN=
@@ -91,7 +97,12 @@ boot.nohdr:	boot.strip
 rawboot:	boot.nohdr
 	dd if=boot.nohdr of=rawboot bs=8k count=1 conv=sync
 
-all:		rawboot
+pre-compile:
+.if !exists(${.OBJDIR}/machine)
+	ln -s ${.CURDIR}/../../include ${.OBJDIR}/machine
+.endif
+
+all:		pre-compile rawboot
 
 install:
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}\