Index: head/sys/boot/Makefile.inc
===================================================================
--- head/sys/boot/Makefile.inc	(revision 325483)
+++ head/sys/boot/Makefile.inc	(revision 325484)
@@ -1,39 +1,37 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
-
 .include "defs.mk"
 
 .if !defined(__BOOT_MAKEFILE_INC__)
 __BOOT_MAKEFILE_INC__=${MFILE}
 
 CFLAGS+=-I${SASRC}
 
 SSP_CFLAGS=
 
 .if ${MACHINE_CPUARCH} == "arm"
 # Do not generate movt/movw, because the relocation fixup for them does not
 # translate to the -Bsymbolic -pie format required by self_reloc() in loader(8).
 # Also, the fpu is not available in a standalone environment.
 .if ${COMPILER_VERSION} < 30800
 CFLAGS.clang+=	-mllvm -arm-use-movt=0
 .else
 CFLAGS.clang+=	-mno-movt
 .endif
 CFLAGS.clang+=  -mfpu=none
 .endif
 
 # The boot loader build uses dd status=none, where possible, for reproducible
 # build output (since performance varies from run to run). Trouble is that
 # option was recently (10.3) added to FreeBSD and is non-standard. Only use it
 # when this test succeeds rather than require dd to be a bootstrap tool.
 DD_NOSTATUS!=(dd status=none count=0 2> /dev/null && echo status=none) || true
 DD=dd ${DD_NOSTATUS}
 
 .if ${MK_LOADER_FORCE_LE} != "no"
 .if ${MACHINE_ARCH} == "powerpc64"
 CFLAGS+=	-mlittle-endian
 .endif
 .endif
 
 .endif
Index: head/sys/boot/efi/Makefile
===================================================================
--- head/sys/boot/efi/Makefile	(revision 325483)
+++ head/sys/boot/efi/Makefile	(revision 325484)
@@ -1,23 +1,23 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
+.include <bsd.init.mk>
 
 # In-tree GCC does not support __attribute__((ms_abi)), but gcc newer
 # than 4.5 supports it.
 .if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500
 
 .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm"
 .if ${MK_FDT} != "no"
 SUBDIR+=	fdt
 .endif
 .endif
 
 .if ${MACHINE_CPUARCH} == "aarch64" || \
     ${MACHINE_CPUARCH} == "amd64" || \
     ${MACHINE_CPUARCH} == "arm"
 SUBDIR+=	libefi loader boot1
 .endif
 
 .endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500
 
 .include <bsd.subdir.mk>
Index: head/sys/boot/geli/Makefile
===================================================================
--- head/sys/boot/geli/Makefile	(revision 325483)
+++ head/sys/boot/geli/Makefile	(revision 325484)
@@ -1,54 +1,53 @@
 # $FreeBSD$
 # libgeliboot
 
 MAN=
 
-.include <src.opts.mk>
-MK_SSP=		no
 .include <bsd.init.mk>
+MK_SSP=		no
 
 LIB=		geliboot
 INTERNALLIB=
 MK_PROFILE=	no
 NO_PIC=
 
 .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
 CFLAGS+=        -march=i386
 .endif
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64"
 CFLAGS+=        -m32
 .endif
 
 WARNS?=		0
 
 # string functions from libc
 .PATH: ${SRCTOP}/lib/libc/string
 SRCS+=  bcmp.c bcopy.c bzero.c
 
 # Our password input method
 SRCS+=  pwgets.c
 
 # sha256 and sha512 from sys/crypto
 .PATH: ${SYSDIR}/crypto/sha2
 CFLAGS+=	-DWEAK_REFS
 SRCS+=		sha256c.c sha512c.c
 
 # md5 from libmd
 .PATH: ${SRCTOP}/lib/libmd
 SRCS+=		md5c.c
 
 # AES implementation from sys/crypto
 .PATH: ${SYSDIR}/crypto/rijndael
 CFLAGS+=	-I${SYSDIR}
 CFLAGS+=	-I${LDRSRC}
 # Remove asserts
 CFLAGS+=	-DNDEBUG
 SRCS+=		rijndael-alg-fst.c rijndael-api-fst.c rijndael-api.c
 
 # local GELI Implementation
 .PATH: ${SYSDIR}/geom/eli
 CFLAGS+=	-D_STAND
 SRCS+=		geliboot_crypto.c g_eli_hmac.c g_eli_key.c g_eli_key_cache.c pkcs5v2.c
 
 .include <bsd.stand.mk>
 .include <bsd.lib.mk>
Index: head/sys/boot/i386/Makefile
===================================================================
--- head/sys/boot/i386/Makefile	(revision 325483)
+++ head/sys/boot/i386/Makefile	(revision 325484)
@@ -1,19 +1,19 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
+.include <bsd.init.mk>
 
 SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \
 		libi386 libfirewire loader
 
 # special boot programs, 'self-extracting boot2+loader'
 SUBDIR+=	pxeldr
 
 .if ${MACHINE_CPUARCH} == "i386"
 SUBDIR+=	kgzldr
 .endif
 
 .if ${MK_ZFS} != "no"
 SUBDIR+=	zfsboot gptzfsboot zfsloader
 .endif
 
 .include <bsd.subdir.mk>
Index: head/sys/boot/man/Makefile
===================================================================
--- head/sys/boot/man/Makefile	(revision 325483)
+++ head/sys/boot/man/Makefile	(revision 325484)
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
+.include <bsd.init.mk>
 
 MAN+=	loader.8
 .if ${MK_ZFS} != "no"
 MAN+=	zfsloader.8
 .endif
 
 .include <bsd.prog.mk>
Index: head/sys/boot/uboot/Makefile
===================================================================
--- head/sys/boot/uboot/Makefile	(revision 325483)
+++ head/sys/boot/uboot/Makefile	(revision 325484)
@@ -1,11 +1,11 @@
 # $FreeBSD$
 
-.include <src.opts.mk>
+.include <bsd.init.mk>
 
 SUBDIR=	lib
 
 .if ${MK_FDT} != "no"
 SUBDIR+=fdt
 .endif
 
 .include <bsd.subdir.mk>