diff --git a/lib/libnvpair/Makefile.am b/lib/libnvpair/Makefile.am
index 181bde9b2c27..8d736f7b7167 100644
--- a/lib/libnvpair/Makefile.am
+++ b/lib/libnvpair/Makefile.am
@@ -1,38 +1,40 @@
 include $(top_srcdir)/config/Rules.am
 
 VPATH = \
 	$(top_srcdir)/module/nvpair \
 	$(top_srcdir)/lib/libnvpair
 
 # Includes kernel code, generate warnings for large stack frames
 # and required CFLAGS for libtirpc
 AM_CFLAGS += $(FRAME_LARGER_THAN) $(LIBTIRPC_CFLAGS)
 
 lib_LTLIBRARIES = libnvpair.la
 
 USER_C = \
 	libnvpair.c \
 	libnvpair_json.c \
 	nvpair_alloc_system.c
 
 KERNEL_C = \
 	nvpair_alloc_fixed.c \
 	nvpair.c \
 	fnvpair.c
 
 dist_libnvpair_la_SOURCES = \
 	$(USER_C)
 
 nodist_libnvpair_la_SOURCES = \
 	$(KERNEL_C)
 
 libnvpair_la_LIBADD = \
 	$(top_builddir)/lib/libspl/libspl_assert.la
 
 libnvpair_la_LIBADD += $(LIBTIRPC_LIBS) $(LTLIBINTL)
 
+libnvpair_la_LDFLAGS = -Wl,-z,defs
+
 if BUILD_FREEBSD
-libnvpair_la_LDFLAGS = -version-info 3:0:0
+libnvpair_la_LDFLAGS += -version-info 3:0:0
 else
-libnvpair_la_LDFLAGS = -version-info 1:1:0
+libnvpair_la_LDFLAGS += -version-info 1:1:0
 endif
diff --git a/lib/libuutil/Makefile.am b/lib/libuutil/Makefile.am
index fd217ff8fc59..099446ca23f9 100644
--- a/lib/libuutil/Makefile.am
+++ b/lib/libuutil/Makefile.am
@@ -1,30 +1,30 @@
 include $(top_srcdir)/config/Rules.am
 
 lib_LTLIBRARIES = libuutil.la
 
 USER_C = \
 	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
 
 libuutil_la_SOURCES = $(USER_C)
 
 libuutil_la_LIBADD = \
 	$(top_builddir)/lib/libavl/libavl.la \
 	$(top_builddir)/lib/libspl/libspl.la
 
 libuutil_la_LIBADD += $(LTLIBINTL)
 
-libuutil_la_LDFLAGS = -pthread
+libuutil_la_LDFLAGS = -pthread -Wl,-z,defs
 
 if BUILD_FREEBSD
 libuutil_la_LDFLAGS += -version-info 3:0:0
 else
 libuutil_la_LDFLAGS += -version-info 1:1:0
 endif
diff --git a/lib/libzfs/Makefile.am b/lib/libzfs/Makefile.am
index 7e07bf1e3685..5a421409c1a0 100644
--- a/lib/libzfs/Makefile.am
+++ b/lib/libzfs/Makefile.am
@@ -1,96 +1,96 @@
 include $(top_srcdir)/config/Rules.am
 
 VPATH = \
 	$(top_srcdir)/module/icp \
 	$(top_srcdir)/module/zcommon \
 	$(top_srcdir)/lib/libzfs
 
 # Suppress unused but set variable warnings often due to ASSERTs
 AM_CFLAGS += $(NO_UNUSED_BUT_SET_VARIABLE)
 AM_CFLAGS += $(LIBCRYPTO_CFLAGS) $(ZLIB_CFLAGS)
 
 pkgconfig_DATA = libzfs.pc
 
 lib_LTLIBRARIES = libzfs.la
 
 USER_C = \
 	libzfs_changelist.c \
 	libzfs_config.c \
 	libzfs_crypto.c \
 	libzfs_dataset.c \
 	libzfs_diff.c \
 	libzfs_import.c \
 	libzfs_iter.c \
 	libzfs_mount.c \
 	libzfs_pool.c \
 	libzfs_sendrecv.c \
 	libzfs_status.c \
 	libzfs_util.c
 
 
 if BUILD_FREEBSD
 USER_C += \
 	os/freebsd/libzfs_fsshare.c \
 	os/freebsd/libzfs_compat.c \
 	os/freebsd/libzfs_ioctl_compat.c \
 	os/freebsd/libzfs_zmount.c
 endif
 
 if BUILD_LINUX
 USER_C += \
 	os/linux/libzfs_mount_os.c \
 	os/linux/libzfs_pool_os.c \
 	os/linux/libzfs_sendrecv_os.c \
 	os/linux/libzfs_util_os.c
 endif
 
 KERNEL_C = \
 	algs/sha2/sha2.c \
 	cityhash.c \
 	zfeature_common.c \
 	zfs_comutil.c \
 	zfs_deleg.c \
 	zfs_fletcher.c \
 	zfs_fletcher_aarch64_neon.c \
 	zfs_fletcher_avx512.c \
 	zfs_fletcher_intel.c \
 	zfs_fletcher_sse.c \
 	zfs_fletcher_superscalar.c \
 	zfs_fletcher_superscalar4.c \
 	zfs_namecheck.c \
 	zfs_prop.c \
 	zfs_uio.c \
 	zpool_prop.c \
 	zprop_common.c
 
 dist_libzfs_la_SOURCES = \
 	$(USER_C)
 
 nodist_libzfs_la_SOURCES = \
 	$(KERNEL_C)
 
 libzfs_la_LIBADD =
 
 if BUILD_LINUX
 libzfs_la_LIBADD += \
 	$(top_builddir)/lib/libshare/libshare.la
 endif
 
 libzfs_la_LIBADD += \
 	$(top_builddir)/lib/libzfs_core/libzfs_core.la \
 	$(top_builddir)/lib/libnvpair/libnvpair.la \
 	$(top_builddir)/lib/libuutil/libuutil.la
 
 libzfs_la_LIBADD += -lm $(LIBCRYPTO_LIBS) $(ZLIB_LIBS) $(LTLIBINTL)
 
-libzfs_la_LDFLAGS = -pthread
+libzfs_la_LDFLAGS = -pthread -Wl,-z,defs
 
 if BUILD_FREEBSD
 libzfs_la_LIBADD += -lutil -lgeom
 libzfs_la_LDFLAGS += -version-info 4:0:0
 else
 libzfs_la_LDFLAGS += -version-info 2:0:0
 endif
 
 # Licensing data
 EXTRA_DIST = THIRDPARTYLICENSE.openssl THIRDPARTYLICENSE.openssl.descrip
diff --git a/lib/libzfs_core/Makefile.am b/lib/libzfs_core/Makefile.am
index 39731f3128eb..75b46acde260 100644
--- a/lib/libzfs_core/Makefile.am
+++ b/lib/libzfs_core/Makefile.am
@@ -1,25 +1,25 @@
 include $(top_srcdir)/config/Rules.am
 
 pkgconfig_DATA = libzfs_core.pc
 
 lib_LTLIBRARIES = libzfs_core.la
 
 USER_C = \
 	libzfs_core.c
 
 libzfs_core_la_SOURCES = $(USER_C)
 
 libzfs_core_la_LIBADD = \
 	$(top_builddir)/lib/libzutil/libzutil.la \
 	$(top_builddir)/lib/libnvpair/libnvpair.la
 
 libzfs_core_la_LIBADD += $(LTLIBINTL)
 
-libzfs_core_la_LDFLAGS = -pthread
+libzfs_core_la_LDFLAGS = -pthread -Wl,-z,defs
 
 if BUILD_FREEBSD
 libzfs_core_la_LIBADD += -lutil -lgeom
 libzfs_core_la_LDFLAGS += -version-info 3:0:0
 else
 libzfs_core_la_LDFLAGS += -version-info 1:0:0
 endif
diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am
index bce45acc203b..6cbab8feed79 100644
--- a/lib/libzpool/Makefile.am
+++ b/lib/libzpool/Makefile.am
@@ -1,222 +1,222 @@
 include $(top_srcdir)/config/Rules.am
 
 VPATH = \
 	$(top_srcdir)/module/zfs \
 	$(top_srcdir)/module/zcommon \
 	$(top_srcdir)/module/lua \
 	$(top_srcdir)/module/os/linux/zfs \
 	$(top_srcdir)/lib/libzpool
 
 # Suppress unused but set variable warnings often due to ASSERTs
 AM_CFLAGS += $(NO_UNUSED_BUT_SET_VARIABLE)
 
 # Includes kernel code generate warnings for large stack frames
 AM_CFLAGS += $(FRAME_LARGER_THAN)
 
 AM_CFLAGS += $(ZLIB_CFLAGS)
 
 AM_CFLAGS += -DLIB_ZPOOL_BUILD
 
 lib_LTLIBRARIES = libzpool.la
 
 USER_C = \
 	kernel.c \
 	taskq.c \
 	util.c
 
 KERNEL_C = \
 	zfeature_common.c \
 	zfs_comutil.c \
 	zfs_deleg.c \
 	zfs_fletcher.c \
 	zfs_fletcher_aarch64_neon.c \
 	zfs_fletcher_avx512.c \
 	zfs_fletcher_intel.c \
 	zfs_fletcher_sse.c \
 	zfs_fletcher_superscalar.c \
 	zfs_fletcher_superscalar4.c \
 	zfs_namecheck.c \
 	zfs_prop.c \
 	zfs_uio.c \
 	zpool_prop.c \
 	zprop_common.c \
 	abd.c \
 	abd_os.c \
 	aggsum.c \
 	arc.c \
 	arc_os.c \
 	blkptr.c \
 	bplist.c \
 	bpobj.c \
 	bptree.c \
 	btree.c \
 	bqueue.c \
 	cityhash.c \
 	dbuf.c \
 	dbuf_stats.c \
 	ddt.c \
 	ddt_zap.c \
 	dmu.c \
 	dmu_diff.c \
 	dmu_object.c \
 	dmu_objset.c \
 	dmu_recv.c \
 	dmu_redact.c \
 	dmu_send.c \
 	dmu_traverse.c \
 	dmu_tx.c \
 	dmu_zfetch.c \
 	dnode.c \
 	dnode_sync.c \
 	dsl_bookmark.c \
 	dsl_dataset.c \
 	dsl_deadlist.c \
 	dsl_deleg.c \
 	dsl_dir.c \
 	dsl_crypt.c \
 	dsl_pool.c \
 	dsl_prop.c \
 	dsl_scan.c \
 	dsl_synctask.c \
 	dsl_destroy.c \
 	dsl_userhold.c \
 	edonr_zfs.c \
 	hkdf.c \
 	fm.c \
 	gzip.c \
 	lzjb.c \
 	lz4.c \
 	metaslab.c \
 	mmp.c \
 	multilist.c \
 	objlist.c \
 	pathname.c \
 	range_tree.c \
 	refcount.c \
 	rrwlock.c \
 	sa.c \
 	sha256.c \
 	skein_zfs.c \
 	spa.c \
 	spa_boot.c \
 	spa_checkpoint.c \
 	spa_config.c \
 	spa_errlog.c \
 	spa_history.c \
 	spa_log_spacemap.c \
 	spa_misc.c \
 	spa_stats.c \
 	space_map.c \
 	space_reftree.c \
 	txg.c \
 	trace.c \
 	uberblock.c \
 	unique.c \
 	vdev.c \
 	vdev_cache.c \
 	vdev_file.c \
 	vdev_indirect_births.c \
 	vdev_indirect.c \
 	vdev_indirect_mapping.c \
 	vdev_initialize.c \
 	vdev_label.c \
 	vdev_mirror.c \
 	vdev_missing.c \
 	vdev_queue.c \
 	vdev_raidz.c \
 	vdev_raidz_math_aarch64_neon.c \
 	vdev_raidz_math_aarch64_neonx2.c \
 	vdev_raidz_math_avx2.c \
 	vdev_raidz_math_avx512bw.c \
 	vdev_raidz_math_avx512f.c \
 	vdev_raidz_math.c \
 	vdev_raidz_math_scalar.c \
 	vdev_raidz_math_sse2.c \
 	vdev_raidz_math_ssse3.c \
 	vdev_raidz_math_powerpc_altivec.c \
 	vdev_rebuild.c \
 	vdev_removal.c \
 	vdev_root.c \
 	vdev_trim.c \
 	zap.c \
 	zap_leaf.c \
 	zap_micro.c \
 	zcp.c \
 	zcp_get.c \
 	zcp_global.c \
 	zcp_iter.c \
 	zcp_set.c \
 	zcp_synctask.c \
 	zfeature.c \
 	zfs_byteswap.c \
 	zfs_debug.c \
 	zfs_fm.c \
 	zfs_fuid.c \
 	zfs_sa.c \
 	zfs_znode.c \
 	zfs_ratelimit.c \
 	zfs_rlock.c \
 	zil.c \
 	zio.c \
 	zio_checksum.c \
 	zio_compress.c \
 	zio_crypt.c \
 	zio_inject.c \
 	zle.c \
 	zrlock.c \
 	zthr.c
 
 LUA_C = \
 	lapi.c \
 	lauxlib.c \
 	lbaselib.c \
 	lcode.c \
 	lcompat.c \
 	lcorolib.c \
 	lctype.c \
 	ldebug.c \
 	ldo.c \
 	lfunc.c \
 	lgc.c \
 	llex.c \
 	lmem.c \
 	lobject.c \
 	lopcodes.c \
 	lparser.c \
 	lstate.c \
 	lstring.c \
 	lstrlib.c \
 	ltable.c \
 	ltablib.c \
 	ltm.c \
 	lvm.c \
 	lzio.c
 
 dist_libzpool_la_SOURCES = \
 	$(USER_C)
 
 nodist_libzpool_la_SOURCES = \
 	$(KERNEL_C) \
 	$(LUA_C)
 
 libzpool_la_LIBADD = \
 	$(top_builddir)/lib/libicp/libicp.la \
 	$(top_builddir)/lib/libunicode/libunicode.la \
 	$(top_builddir)/lib/libzfs_core/libzfs_core.la \
 	$(top_builddir)/lib/libnvpair/libnvpair.la
 
 libzpool_la_LIBADD += $(LIBCLOCK_GETTIME) $(ZLIB_LIBS) -ldl
 
-libzpool_la_LDFLAGS = -pthread
+libzpool_la_LDFLAGS = -pthread -Wl,-z,defs
 
 if BUILD_FREEBSD
 libzpool_la_LIBADD += -lgeom
 libzpool_la_LDFLAGS += -version-info 4:0:0
 else
 libzpool_la_LDFLAGS += -version-info 2:0:0
 endif
 
 if TARGET_CPU_POWERPC
 vdev_raidz_math_powerpc_altivec.$(OBJEXT): CFLAGS += -maltivec
 vdev_raidz_math_powerpc_altivec.l$(OBJEXT): CFLAGS += -maltivec
 endif