Index: head/sys/boot/userboot/ficl/Makefile
===================================================================
--- head/sys/boot/userboot/ficl/Makefile	(revision 325169)
+++ head/sys/boot/userboot/ficl/Makefile	(revision 325170)
@@ -1,63 +1,59 @@
 # $FreeBSD$
 #
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 MK_SSP=		no
 
-.PATH: ${.CURDIR}/../../ficl
-.PATH: ${.CURDIR}/../../ficl/${MACHINE_CPUARCH}
+.include "${BOOTSRC}/ficl.mk"
+
 BASE_SRCS=	dict.c ficl.c fileaccess.c float.c loader.c math64.c \
 		prefix.c search.c stack.c tools.c vm.c words.c
 
 SRCS=		${BASE_SRCS} sysdep.c softcore.c
 CLEANFILES=	softcore.c testmain testmain.o
 
 CWARNFLAGS.loader.c.c += -Wno-implicit-function-declaration
 
 .if HAVE_PNP
 CFLAGS+=	-DHAVE_PNP
 .endif
 .include <bsd.stand.mk>
 .ifmake testmain
 CFLAGS+=	-DTESTMAIN -D_TESTMAIN
 SRCS+=		testmain.c
 PROG=		testmain
 .include <bsd.prog.mk>
 .else
 LIB=		ficl
 INTERNALLIB=
 .include <bsd.lib.mk>
 .endif
 
 # Standard softwords
-.PATH: ${.CURDIR}/../../ficl/softwords
+.PATH: ${BOOTSRC}/ficl/softwords
 SOFTWORDS=	softcore.fr jhlocal.fr marker.fr freebsd.fr ficllocal.fr \
 		ifbrack.fr
 # Optional OO extension softwords
 #SOFTWORDS+=	oo.fr classes.fr
 
 #.if ${MACHINE_CPUARCH} == "amd64"
 #CFLAGS+=	-m32 -I.
 #.endif
 
 .if ${MACHINE_ARCH} == "powerpc64"
 CFLAGS+=	-m32 -mcpu=powerpc -I.
 .endif
 
-CFLAGS+=	-I${.CURDIR}/../../ficl
-CFLAGS+=	-I${.CURDIR}/../../ficl/${MACHINE_CPUARCH}
-CFLAGS+=	-I${.CURDIR}/../../common
-
 softcore.c: ${SOFTWORDS} softcore.awk
-	(cd ${.CURDIR}/../../ficl/softwords; cat ${SOFTWORDS} \
+	(cd ${FICLSRC}/softwords; cat ${SOFTWORDS} \
 	    | awk -f softcore.awk -v datestamp="`LC_ALL=C date`") > ${.TARGET}
 
 #.if ${MACHINE_CPUARCH} == "amd64"
 #${SRCS:M*.c:R:S/$/.o/g}: machine
 #
 #beforedepend ${OBJS}: machine
 #
 #machine: .NOMETA
 #	ln -sf ${.CURDIR}/../../i386/include machine
 #
 #CLEANFILES+=	machine
 #.endif
Index: head/sys/boot/userboot/test/Makefile
===================================================================
--- head/sys/boot/userboot/test/Makefile	(revision 325169)
+++ head/sys/boot/userboot/test/Makefile	(revision 325170)
@@ -1,15 +1,15 @@
 # $FreeBSD$
 
 
 MAN=
 
-.include <bsd.own.mk>
+.include <bsd.init.mk>
 MK_SSP=		no
 
 PROG=		test
 INTERNALPROG=
 
-CFLAGS+=	-I${.CURDIR}/..
-CFLAGS+=	-I${.CURDIR}/../../..
+CFLAGS+=	-I${BOOTSRC}/userboot
+CFLAGS+=	-I${SYSDIR}
 
 .include <bsd.prog.mk>
Index: head/sys/boot/userboot/userboot/Makefile
===================================================================
--- head/sys/boot/userboot/userboot/Makefile	(revision 325169)
+++ head/sys/boot/userboot/userboot/Makefile	(revision 325170)
@@ -1,58 +1,59 @@
 # $FreeBSD$
 
 MAN=
 
-.include <src.opts.mk>
+.include <bsd.init.mk>
+
 MK_SSP=		no
 
 LOADER_MSDOS_SUPPORT?=	yes
 LOADER_UFS_SUPPORT?=	yes
 LOADER_CD9660_SUPPORT?=	no
 LOADER_EXT2FS_SUPPORT?=	no
 
 SHLIB_NAME=	userboot.so
 MK_CTF=		no
 STRIP=
 LIBDIR=		/boot
 
 SRCS=		autoload.c
 SRCS+=		bcache.c
 SRCS+=		biossmap.c
 SRCS+=		bootinfo.c
 SRCS+=		bootinfo32.c
 SRCS+=		bootinfo64.c
 SRCS+=		conf.c
 SRCS+=		console.c
 SRCS+=		copy.c
 SRCS+=		devicename.c
 SRCS+=		elf32_freebsd.c
 SRCS+=		elf64_freebsd.c
 SRCS+=		host.c
 SRCS+=		main.c
 SRCS+=		userboot_cons.c
 SRCS+=		userboot_disk.c
 SRCS+=		vers.c
 
 CFLAGS+=	-Wall
-CFLAGS+=	-I${.CURDIR}/..
-CFLAGS+=	-I${.CURDIR}/../../..
+CFLAGS+=	-I${BOOTSRC}/userboot
+CFLAGS+=	-I${SYSDIR}
 CFLAGS+=	-ffreestanding -I.
 
 CWARNFLAGS.main.c += -Wno-implicit-function-declaration
 
 LDFLAGS+=	-nostdlib -Wl,-Bsymbolic
 
 NEWVERSWHAT=	"User boot" ${MACHINE_CPUARCH}
 
 .if ${MK_ZFS} != "no"
 CFLAGS+=	-DUSERBOOT_ZFS_SUPPORT
-LIBZFSBOOT=	${.OBJDIR}/../zfs/libzfsboot.a
+LIBZFSBOOT=	${BOOTOBJ}/userboot/zfs/libzfsboot.a
 .endif
 
 # Always add MI sources 
-.include	"../../loader.mk"
+.include	"${BOOTSRC}/loader.mk"
 CFLAGS+=	-I.
 DPADD+=		${LIBFICL} ${LIBZFSBOOT} ${LIBSA} 
 LDADD+=		${LIBFICL} ${LIBZFSBOOT} ${LIBSA}
 
 .include <bsd.lib.mk>
Index: head/sys/boot/userboot/zfs/Makefile
===================================================================
--- head/sys/boot/userboot/zfs/Makefile	(revision 325169)
+++ head/sys/boot/userboot/zfs/Makefile	(revision 325170)
@@ -1,22 +1,22 @@
 # $FreeBSD$
 
-S=		${.CURDIR}/../../zfs
+.include <bsd.init.mk>
 
-.PATH:		${S} ${.CURDIR}/../../../crypto/skein
+.PATH:		${BOOTSRC}/zfs ${SYSDIR}/crypto/skein
 LIB=		zfsboot
 INTERNALLIB=
 
 SRCS+=		zfs.c skein.c skein_block.c
 
 # Do not unroll skein loops, reduce code size
 CFLAGS+=	-DSKEIN_LOOP=111
 
-CFLAGS+=	-I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.
+CFLAGS+=	-I${LDRSRC} -I${SYSDIR} -I.
 CFLAGS+=	-I${SASRC}
-CFLAGS+=	-I${.CURDIR}/../../../cddl/boot/zfs
-CFLAGS+=	-I${.CURDIR}/../../../crypto/skein
+CFLAGS+=	-I${SYSDIR}/cddl/boot/zfs
+CFLAGS+=	-I${SYSDIR}/crypto/skein
 
 CFLAGS+=	-ffreestanding -fPIC
 CFLAGS+=	-Wformat -Wall
 
 .include <bsd.lib.mk>