Index: head/cddl/lib/drti/Makefile
===================================================================
--- head/cddl/lib/drti/Makefile	(revision 365579)
+++ head/cddl/lib/drti/Makefile	(revision 365580)
@@ -1,30 +1,29 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/common
 
 SRCS=		drti.c
 FILES=		${SRCS:R:S/$/.o/g}
 FILESOWN=	${LIBOWN}
 FILESGRP=	${LIBGRP}
 FILESMODE=	${LIBMODE}
 FILESDIR=	${LIBDIR}/dtrace
 CLEANFILES=	${FILES}
 # These FILES qualify as libraries for the purpose of LIBRARIES_ONLY.
 .undef LIBRARIES_ONLY
 CFLAGS+= -DIN_BASE
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd/spl
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
 CFLAGS+= -I${SRCTOP}/sys
 CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
 CFLAGS+= -DHAVE_ISSETUGID
 CFLAGS+=	-I${SRCTOP}/sys/cddl/compat/opensolaris \
 		-I${SRCTOP}/cddl/compat/opensolaris/include \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
 		-DPIC ${PICFLAG}
 
 .include <bsd.lib.mk>
Index: head/cddl/lib/libctf/Makefile
===================================================================
--- head/cddl/lib/libctf/Makefile	(revision 365579)
+++ head/cddl/lib/libctf/Makefile	(revision 365580)
@@ -1,41 +1,40 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/common/ctf
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common
 .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/ctf
 
 LIB=		ctf
 SRCS=		ctf_create.c \
 		ctf_decl.c \
 		ctf_error.c \
 		ctf_hash.c \
 		ctf_labels.c \
 		ctf_lib.c \
 		ctf_lookup.c \
 		ctf_open.c \
 		ctf_subr.c \
 		ctf_types.c \
 		ctf_util.c
 MAN=		ctf.5
 
 WARNS?=		2
 CFLAGS+=	-DCTF_OLD_VERSIONS
 
 CFLAGS+= -DIN_BASE
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd/spl
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
 CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
 CFLAGS+= -DHAVE_ISSETUGID
 
 CFLAGS+=	-I${SRCTOP}/sys/cddl/compat/opensolaris \
 		-I${SRCTOP}/cddl/compat/opensolaris/include \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
 		-I${OPENSOLARIS_USR_DISTDIR}/common/ctf \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
 LIBADD+=	spl z
 
 .include <bsd.lib.mk>
Index: head/cddl/lib/libdtrace/Makefile
===================================================================
--- head/cddl/lib/libdtrace/Makefile	(revision 365579)
+++ head/cddl/lib/libdtrace/Makefile	(revision 365580)
@@ -1,140 +1,139 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/common
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libgen/common
 
 LIB=		dtrace
 SRCS=		dt_aggregate.c \
 		dt_as.c \
 		dt_buf.c \
 		dt_cc.c \
 		dt_cg.c \
 		dt_consume.c \
 		dt_decl.c \
 		dt_dis.c \
 		dt_dof.c \
 		dt_error.c \
 		dt_errtags.c \
 		dt_grammar.y \
 		dt_handle.c \
 		dt_ident.c \
 		dt_isadep.c \
 		dt_inttab.c \
 		dt_lex.l \
 		dt_link.c \
 		dt_list.c \
 		dt_map.c \
 		dt_module.c \
 		dt_names.c \
 		dt_open.c \
 		dt_options.c \
 		dt_parser.c \
 		dt_pcb.c \
 		dt_pid.c \
 		dt_pq.c \
 		dt_pragma.c \
 		dt_print.c \
 		dt_printf.c \
 		dt_proc.c \
 		dt_program.c \
 		dt_provider.c \
 		dt_regset.c \
 		dt_string.c \
 		dt_strtab.c \
 		dt_subr.c \
 		dt_sugar.c \
 		dt_work.c \
 		dt_xlator.c \
 		gmatch.c
 
 DSRCS=		errno.d			\
 		io.d			\
 		ip.d			\
 		psinfo.d		\
 		sctp.d			\
 		siftr.d			\
 		signal.d		\
 		tcp.d			\
 		socket.d		\
 		udp.d			\
 		udplite.d		\
 		unistd.d
 
 FILES=		${DSRCS}
 FILESDIR=	/usr/lib/dtrace
 FILESMODE=	${NOBINMODE}
 
 WARNS?=		1
 
 CFLAGS+= -DIN_BASE
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd/spl
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
 CFLAGS+= -I${SRCTOP}/sys
 CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
 CFLAGS+= -DHAVE_ISSETUGID
 
 
 CFLAGS+=	-I${.OBJDIR} -I${.CURDIR} \
 		-I${SRCTOP}/sys/cddl/dev/dtrace/${MACHINE_ARCH} \
 		-I${SRCTOP}/sys/cddl/compat/opensolaris \
 		-I${SRCTOP}/cddl/compat/opensolaris/include \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
 #CFLAGS+=	-DYYDEBUG
 
 .if ${MACHINE_CPUARCH} == "aarch64"
 CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/aarch64
 .PATH:		${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/aarch64
 .PATH:		${SRCTOP}/sys/cddl/dev/dtrace/aarch64
 .elif ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
 CFLAGS+=	-I${SRCTOP}/sys/cddl/dev/dtrace/x86
 CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/intel -DDIS_MEM
 .PATH:		${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/i386
 .PATH:		${SRCTOP}/sys/cddl/dev/dtrace/${MACHINE_ARCH}
 .PATH:		${SRCTOP}/sys/cddl/dev/dtrace/x86
 .elif ${MACHINE_CPUARCH} == "arm"
 CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/arm
 .PATH:		${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/arm
 .PATH:		${SRCTOP}/sys/cddl/dev/dtrace/arm
 .elif ${MACHINE_CPUARCH} == "mips"
 CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/mips
 .PATH:		${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/mips
 .PATH:		${SRCTOP}/sys/cddl/dev/dtrace/mips
 .elif ${MACHINE_CPUARCH} == "powerpc"
 CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/powerpc
 .PATH:		${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/powerpc
 .PATH:		${SRCTOP}/sys/cddl/dev/dtrace/powerpc
 .elif ${MACHINE_CPUARCH} == "riscv"
 CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/riscv
 .PATH:		${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/riscv
 .PATH:		${SRCTOP}/sys/cddl/dev/dtrace/riscv
 .else
 # temporary hack
 CFLAGS+=	-I${OPENSOLARIS_SYS_DISTDIR}/uts/intel
 .endif
 
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
 SRCS+=		dis_tables.c
 DSRCS+=		regs_x86.d
 .endif
 
 LFLAGS+=-l
 
 YFLAGS+=-d
 
 LIBADD=	ctf elf proc pthread rtld_db
 
 CLEANFILES=	dt_errtags.c dt_names.c
 
 .include <bsd.lib.mk>
 
 dt_errtags.c: ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common/dt_errtags.h
 	sh ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common/mkerrtags.sh < ${.ALLSRC} > ${.TARGET}
 
 dt_names.c: ${OPENSOLARIS_SYS_DISTDIR}/uts/common/sys/dtrace.h
 	sh ${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common/mknames.sh < ${.ALLSRC} > ${.TARGET}
Index: head/cddl/usr.bin/ctfconvert/Makefile
===================================================================
--- head/cddl/usr.bin/ctfconvert/Makefile	(revision 365579)
+++ head/cddl/usr.bin/ctfconvert/Makefile	(revision 365580)
@@ -1,51 +1,50 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt
 
 PROG=		ctfconvert
 SRCS=		alist.c \
 		ctf.c \
 		ctfconvert.c \
 		dwarf.c \
 		fixup_tdescs.c \
 		hash.c \
 		iidesc.c \
 		input.c \
 		list.c \
 		memory.c \
 		merge.c \
 		output.c \
 		st_parse.c \
 		stabs.c \
 		stack.c \
 		strtab.c \
 		symbol.c \
 		tdata.c \
 		traverse.c \
 		util.c
 
 CFLAGS+= -DIN_BASE
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd/spl
 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
 CFLAGS+=	-I${SRCTOP}/sys/cddl/compat/opensolaris \
 		-I${SRCTOP}/cddl/compat/opensolaris/include \
 		-I${OPENSOLARIS_USR_DISTDIR} \
 		-I${OPENSOLARIS_SYS_DISTDIR} \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \
 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 CFLAGS+= -DHAVE_ISSETUGID 
 
 LIBADD=		spl dwarf elf z pthread
 
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.prog.mk>
Index: head/cddl/usr.bin/ctfdump/Makefile
===================================================================
--- head/cddl/usr.bin/ctfdump/Makefile	(revision 365579)
+++ head/cddl/usr.bin/ctfdump/Makefile	(revision 365580)
@@ -1,30 +1,29 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/dump
 
 PROG=		ctfdump
 SRCS=		dump.c \
 		symbol.c \
 		utils.c
 
 CFLAGS+= -DIN_BASE
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd/spl
 CFLAGS+= -I${SRCTOP}/sys
 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
 CFLAGS+=	-I${OPENSOLARIS_USR_DISTDIR} \
 		-I${OPENSOLARIS_SYS_DISTDIR} \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
 		-I${OPENSOLARIS_USR_DISTDIR}/cmd/mdb/tools/common \
 		-I${SRCTOP}/sys/cddl/compat/opensolaris \
 		-I${SRCTOP}/cddl/compat/opensolaris/include \
 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 CFLAGS+= -DHAVE_ISSETUGID
 
 LIBADD=		elf z
 
 .include <bsd.prog.mk>
Index: head/cddl/usr.bin/ctfmerge/Makefile
===================================================================
--- head/cddl/usr.bin/ctfmerge/Makefile	(revision 365579)
+++ head/cddl/usr.bin/ctfmerge/Makefile	(revision 365580)
@@ -1,46 +1,45 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt
 
 PROG=		ctfmerge
 SRCS=		alist.c \
 		barrier.c \
 		ctf.c \
 		ctfmerge.c \
 		fifo.c \
 		hash.c \
 		iidesc.c \
 		input.c \
 		list.c \
 		memory.c \
 		merge.c \
 		output.c \
 		strtab.c \
 		symbol.c \
 		tdata.c \
 		traverse.c \
 		util.c
 
 WARNS?=		1
 
 
 CFLAGS+= -DIN_BASE
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd/spl
 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
 CFLAGS+=	-I${SRCTOP}/sys/cddl/compat/opensolaris \
 		-I${SRCTOP}/cddl/compat/opensolaris/include \
 		-I${OPENSOLARIS_USR_DISTDIR} \
 		-I${OPENSOLARIS_SYS_DISTDIR} \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \
 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 CFLAGS+= -DHAVE_ISSETUGID
 
 LIBADD=		spl elf z pthread
 
 .include <bsd.prog.mk>
Index: head/cddl/usr.sbin/dtrace/Makefile
===================================================================
--- head/cddl/usr.sbin/dtrace/Makefile	(revision 365579)
+++ head/cddl/usr.sbin/dtrace/Makefile	(revision 365580)
@@ -1,39 +1,38 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/dtrace
 
 PROG=		dtrace
 SRCS=		dtrace.c
 BINDIR?=	/usr/sbin
 
 WARNS?=		1
 
 CFLAGS+= -DIN_BASE
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd/spl
 CFLAGS+= -I${SRCTOP}/sys
 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
 CFLAGS+=	-I${SRCTOP}/sys/cddl/compat/opensolaris \
 		-I${SRCTOP}/cddl/compat/opensolaris/include \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
 		-I${OPENSOLARIS_SYS_DISTDIR}/compat
 CFLAGS+= -DHAVE_ISSETUGID
 
 # Optional debugging stuff...
 #CFLAGS+=	-DNEED_ERRLOC
 #YFLAGS+=	-d
 
 LIBADD=	dtrace ctf elf proc spl
 
 .if ${MK_DTRACE_TESTS} != "no"
 SUBDIR+=	tests
 .endif
 
 .include <bsd.prog.mk>
Index: head/cddl/usr.sbin/lockstat/Makefile
===================================================================
--- head/cddl/usr.sbin/lockstat/Makefile	(revision 365579)
+++ head/cddl/usr.sbin/lockstat/Makefile	(revision 365580)
@@ -1,35 +1,34 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/lockstat
 
 PROG=		lockstat
 SRCS=		lockstat.c sym.c
 BINDIR?=	/usr/sbin
 
 WARNS?=		1
 
 CFLAGS+= -DIN_BASE
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd/spl
 CFLAGS+= -I${SRCTOP}/sys
 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
 CFLAGS+= -I${SRCTOP}/sys/cddl/compat/opensolaris
 CFLAGS+=	-I${SRCTOP}/sys/cddl/compat/opensolaris \
 		-I${SRCTOP}/cddl/compat/opensolaris/include \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
 		-I${OPENSOLARIS_SYS_DISTDIR}/compat \
 		-I${SRCTOP}/sys
 CFLAGS+= -DHAVE_ISSETUGID
 
 CFLAGS+=	-DNEED_ERRLOC -g
 
 #YFLAGS+=	-d
 
 LIBADD=	elf dtrace rt
 
 .include <bsd.prog.mk>
Index: head/cddl/usr.sbin/plockstat/Makefile
===================================================================
--- head/cddl/usr.sbin/plockstat/Makefile	(revision 365579)
+++ head/cddl/usr.sbin/plockstat/Makefile	(revision 365580)
@@ -1,31 +1,30 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/plockstat
 
 PROG=		plockstat
 SRCS=		plockstat.c
 BINDIR?=	/usr/sbin
 
 WARNS?=		1
 
 CFLAGS+= -DIN_BASE
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd/spl
 CFLAGS+= -I${SRCTOP}/sys
 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
 CFLAGS+=	-I${SRCTOP}/sys/cddl/compat/opensolaris \
 		-I${SRCTOP}/cddl/compat/opensolaris/include \
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
 		-I${OPENSOLARIS_SYS_DISTDIR}/compat \
 		-I${SRCTOP}/cddl/lib/libdtrace \
 		-I${SRCTOP}/sys
 CFLAGS+= -DHAVE_ISSETUGID
 
 LIBADD=	dtrace proc
 
 .include <bsd.prog.mk>
Index: head/cddl/usr.sbin/zfsd/Makefile.common
===================================================================
--- head/cddl/usr.sbin/zfsd/Makefile.common	(revision 365579)
+++ head/cddl/usr.sbin/zfsd/Makefile.common	(revision 365580)
@@ -1,35 +1,34 @@
 # $FreeBSD$
 
 SRCS=		callout.cc		\
 		case_file.cc		\
 		zfsd_event.cc		\
 		vdev.cc			\
 		vdev_iterator.cc	\
 		zfsd.cc			\
 		zfsd_exception.cc	\
 		zpool_list.cc		\
 		zfsd_main.cc
 
 WARNS?=		2
 
 # Ignore warnings about Solaris specific pragmas.
 IGNORE_PRAGMA=  YES
 
 CFLAGS+= -DIN_BASE
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd/spl
 CFLAGS+= -I${SRCTOP}/sys
 CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
 CFLAGS+= -I${SRCTOP}/cddl/usr.sbin
 
 # use issetugid(2)
 CFLAGS+= -D_MACHINE_FLOAT_H_ -DHAVE_ISSETUGID
 
 LIBADD+=	devdctl zfs zfs_core util geom bsdxml sbuf nvpair avl uutil zutil
 
 cscope:
 	find ${.CURDIR} -type f -a \( -name "*.[ch]" -o -name "*.cc" \) \
 	     > ${.CURDIR}/cscope.files
 	cd ${.CURDIR} && cscope -buq ${INCFLAGS}
Index: head/lib/libproc/Makefile
===================================================================
--- head/lib/libproc/Makefile	(revision 365579)
+++ head/lib/libproc/Makefile	(revision 365580)
@@ -1,53 +1,52 @@
 # $FreeBSD$
 
 .include <src.opts.mk>
 
 LIB=	proc
 
 SRCS=	crc32.c			\
 	proc_bkpt.c		\
 	proc_create.c		\
 	proc_regs.c		\
 	proc_sym.c		\
 	proc_rtld.c		\
 	proc_util.c
 
 INCS=	libproc.h
 
 CFLAGS+=	-I${.CURDIR}
 
 .if ${MK_CXX} == "no"
 CFLAGS+=	-DNO_CXA_DEMANGLE
 .elif ${MK_LIBCPLUSPLUS} != "no"
 LIBADD+=		cxxrt
 .else
 LIBADD+=	supcplusplus
 .endif
 
 LIBADD+=	elf procstat rtld_db util
 
 .if ${MK_CDDL} != "no"
 LIBADD+=	ctf
 IGNORE_PRAGMA=	YES
 CFLAGS+= -DIN_BASE
-CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd/spl
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
 CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
 CFLAGS+= -DHAVE_ISSETUGID -DHAVE_BOOLEAN
 CFLAGS+=	-I${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common \
 		-I${SRCTOP}/sys/cddl/contrib/opensolaris/uts/common \
 		-I${SRCTOP}/sys/cddl/compat/opensolaris
 .else
 CFLAGS+=	-DNO_CTF
 .endif
 
 SHLIB_MAJOR=	5
 
 MAN=
 
 HAS_TESTS=
 SUBDIR.${MK_TESTS}+= tests
 
 .include <bsd.lib.mk>