Index: head/cddl/usr.sbin/zdb/Makefile
===================================================================
--- head/cddl/usr.sbin/zdb/Makefile	(revision 292687)
+++ head/cddl/usr.sbin/zdb/Makefile	(revision 292688)
@@ -1,33 +1,33 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zdb
 
 PROG=	zdb
 MAN=	zdb.8
 SRCS=	zdb.c zdb_il.c
 
 WARNS?=	0
 CSTD=	c99
 
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
-LIBADD=	geom m nvpair pthread umem uutil zfs_core zfs zpool
+LIBADD=	nvpair umem uutil zfs zpool
 
 # Since there are many asserts in this program, it makes no sense to compile
 # it without debugging.
 CFLAGS+=	-g -DDEBUG=1
 
 .include <bsd.prog.mk>
Index: head/cddl/usr.sbin/zhack/Makefile
===================================================================
--- head/cddl/usr.sbin/zhack/Makefile	(revision 292687)
+++ head/cddl/usr.sbin/zhack/Makefile	(revision 292688)
@@ -1,31 +1,31 @@
 # $FreeBSD$
 
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zhack
 
 PROG=	zhack
 MAN=
 
 WARNS?=	0
 CSTD=	c99
 
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
-LIBADD=	geom m nvpair pthread umem uutil zfs_core zfs zpool
+LIBADD=	nvpair zfs zpool
 
 CFLAGS+=	-DDEBUG=1
 #DEBUG_FLAGS+=	-g
 
 .include <bsd.prog.mk>