diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile
index 8088ef497d46..f565683fba4e 100644
--- a/cddl/lib/libspl/Makefile
+++ b/cddl/lib/libspl/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl
-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl/os/freebsd
 .PATH: ${SRCTOP}/sys/contrib/openzfs/include
 
 
@@ -11,11 +10,13 @@ PACKAGE=	runtime
 
 SRCS = \
         assert.c \
+        getexecname.c \
         list.c \
         mkdirp.c \
+        os/freebsd/getexecname.c \
+        os/freebsd/zone.c \
         page.c \
         timestamp.c \
-        zone.c \
         include/sys/list.h \
         include/sys/list_impl.h
 
@@ -23,24 +24,11 @@ SRCS = \
 # will not compile when building on macOS.
 .if !defined(BOOTSTRAPPING)
 SRCS += \
-        getexecname.c \
-        gethostid.c \
-        getmntany.c \
-        mnttab.c
-
-
-.if ${MACHINE_ARCH} == "amd64"
-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl/asm-x86_64
-SRCS += atomic.S
-.elif ${MACHINE_ARCH} == "i386"
-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl/asm-i386
-SRCS += atomic.S
-.else
-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl/asm-generic
-SRCS += atomic.c
+        atomic.c \
+        os/freebsd/gethostid.c \
+        os/freebsd/getmntany.c \
+        os/freebsd/mnttab.c
 .endif
-.endif
-
 
 WARNS?=	2
 CSTD=	c99
@@ -53,6 +41,6 @@ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
 CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
 CFLAGS+= -DHAVE_ISSETUGID
 CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
-CFLAGS.atomic.S+= -DLOCORE
+CFLAGS.atomic.c+=	-Wno-error-atomic-alignment
 
 .include <bsd.lib.mk>
diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile
index 76567b50c610..169b8d8afe01 100644
--- a/cddl/lib/libuutil/Makefile
+++ b/cddl/lib/libuutil/Makefile
@@ -7,11 +7,9 @@ LIB=	uutil
 SRCS=\
 	uu_alloc.c \
 	uu_avl.c \
-	uu_dprintf.c \
 	uu_ident.c \
 	uu_list.c \
 	uu_misc.c \
-	uu_open.c \
 	uu_pname.c \
 	uu_string.c
 
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
index b159955c0212..6de09d1b7333 100644
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@ -5,7 +5,6 @@
 .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs
 .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs/os/freebsd
 .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libshare
-.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libshare/os/freebsd
 .PATH: ${SRCTOP}/sys/contrib/openzfs/include
 .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd
 .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib
@@ -53,8 +52,8 @@ USER_C += \
 USER_C += \
 	libshare.c \
 	nfs.c \
-	smb.c
-
+	os/freebsd/nfs.c \
+	os/freebsd/smb.c
 
 KERNEL_C = \
         algs/sha2/sha2.c \
diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile
index 5c2595df1c9f..10d55215c0b3 100644
--- a/cddl/usr.bin/Makefile
+++ b/cddl/usr.bin/Makefile
@@ -8,7 +8,6 @@ SUBDIR= \
 	ctfmerge \
 	${_zinject} \
 	${_zstream} \
-	${_zstreamdump} \
 	${_ztest}
 
 SUBDIR.${MK_TESTS}+= tests
@@ -17,7 +16,6 @@ SUBDIR.${MK_TESTS}+= tests
 _zinject= zinject
 _ztest=	ztest
 _zstream = zstream
-_zstreamdump = zstreamdump
 .endif
 
 SUBDIR_PARALLEL=
diff --git a/cddl/usr.bin/zstream/Makefile b/cddl/usr.bin/zstream/Makefile
index d6ac8c5f3b16..ac3bfeb68cf4 100644
--- a/cddl/usr.bin/zstream/Makefile
+++ b/cddl/usr.bin/zstream/Makefile
@@ -7,6 +7,7 @@ ZFSTOP=	${SRCTOP}/sys/contrib/openzfs
 
 PROG=	zstream
 MAN=	zstream.8
+MLINKS=	zstream.8 zstreamdump.8
 INCS=	zstream.h
 SRCS= \
 	zstream.c \
@@ -14,6 +15,8 @@ SRCS= \
 	zstream_redup.c \
 	zstream_token.c
 
+LINKS=	${BINDIR}/zstream ${BINDIR}/zstreamdump
+
 WARNS?=	2
 CFLAGS+= \
 	-DIN_BASE \
diff --git a/cddl/usr.bin/zstreamdump/Makefile b/cddl/usr.bin/zstreamdump/Makefile
deleted file mode 100644
index 63f365d0445a..000000000000
--- a/cddl/usr.bin/zstreamdump/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-ZFSTOP=	${SRCTOP}/sys/contrib/openzfs
-
-.PATH: ${ZFSTOP}/cmd/zstreamdump
-.PATH: ${ZFSTOP}/man/man8
-
-SCRIPTS=	zstreamdump
-MAN=	zstreamdump.8
-
-.include <bsd.prog.mk>
diff --git a/cddl/usr.bin/zstreamdump/Makefile.depend b/cddl/usr.bin/zstreamdump/Makefile.depend
deleted file mode 100644
index 3089536f9717..000000000000
--- a/cddl/usr.bin/zstreamdump/Makefile.depend
+++ /dev/null
@@ -1,25 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-	cddl/lib/libavl \
-	cddl/lib/libnvpair \
-	cddl/lib/libumem \
-	cddl/lib/libzpool \
-	gnu/lib/csu \
-	include \
-	include/xlocale \
-	lib/${CSU_DIR} \
-	lib/libc \
-	lib/libcompiler_rt \
-	lib/libmd \
-	lib/libthr \
-	lib/libz \
-	lib/msun \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
diff --git a/lib/libbe/Makefile b/lib/libbe/Makefile
index d1fab41578bf..50a8f8f56fb2 100644
--- a/lib/libbe/Makefile
+++ b/lib/libbe/Makefile
@@ -58,6 +58,7 @@ CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd
 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/libzfs
 CFLAGS+= -I${SRCTOP}/sys
 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
 CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h