diff --git a/cmd/zfs/Makefile.in b/cmd/zfs/Makefile.in
index 69f71dc7da..a8bf20c903 100644
--- a/cmd/zfs/Makefile.in
+++ b/cmd/zfs/Makefile.in
@@ -245,7 +245,7 @@ zfs_LDADD = \
 	$(top_builddir)/lib/libzpool/libzpool.la \
 	$(top_builddir)/lib/libzfs/libzfs.la
 
-zfs_LDFLAGS = -pthread -lm -lz
+zfs_LDFLAGS = -pthread -lm -lz -lrt
 all: all-am
 
 .SUFFIXES:
diff --git a/cmd/zpool/Makefile.in b/cmd/zpool/Makefile.in
index 278012ad7b..38df8e07ce 100644
--- a/cmd/zpool/Makefile.in
+++ b/cmd/zpool/Makefile.in
@@ -61,7 +61,12 @@ PROGRAMS = $(sbin_PROGRAMS)
 am_zpool_OBJECTS = zpool_iter.$(OBJEXT) zpool_main.$(OBJEXT) \
 	zpool_util.$(OBJEXT) zpool_vdev.$(OBJEXT)
 zpool_OBJECTS = $(am_zpool_OBJECTS)
-zpool_DEPENDENCIES = $(top_builddir)/lib/libspl/libspl.la
+zpool_DEPENDENCIES = $(top_builddir)/lib/libspl/libspl.la \
+	$(top_builddir)/lib/libavl/libavl.la \
+	$(top_builddir)/lib/libnvpair/libnvpair.la \
+	$(top_builddir)/lib/libuutil/libuutil.la \
+	$(top_builddir)/lib/libzpool/libzpool.la \
+	$(top_builddir)/lib/libzfs/libzfs.la
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -206,7 +211,13 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include
+DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include \
+	-I${top_srcdir}/lib/libuutil/include \
+	-I${top_srcdir}/lib/libzfs/include \
+	-I${top_srcdir}/lib/libnvpair/include \
+	-I${top_srcdir}/module/zcommon/include \
+	-I${top_srcdir}/module/nvpair/include \
+	-I${top_srcdir}/module/avl/include
 
 # FIXME: Quiet warnings not covered by the gcc-* patches.  We should
 # FIXME: consider removing this as soon as we reasonably can.
@@ -222,15 +233,21 @@ AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch -Wno-unused \
 	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
 	-DTEXT_DOMAIN=\"zfs-linux-user\"
 zpool_SOURCES = \
-	zpool_iter.c \
-	zpool_main.c \
-	zpool_util.c \
-	zpool_util.h \
-	zpool_vdev.c
+	-I${top_srcdir}/cmd/zpool/zpool_iter.c \
+	-I${top_srcdir}/cmd/zpool/zpool_main.c \
+	-I${top_srcdir}/cmd/zpool/zpool_util.c \
+	-I${top_srcdir}/cmd/zpool/zpool_util.h \
+	-I${top_srcdir}/cmd/zpool/zpool_vdev.c
 
 zpool_LDADD = \
-	$(top_builddir)/lib/libspl/libspl.la
+	$(top_builddir)/lib/libspl/libspl.la \
+	$(top_builddir)/lib/libavl/libavl.la \
+	$(top_builddir)/lib/libnvpair/libnvpair.la \
+	$(top_builddir)/lib/libuutil/libuutil.la \
+	$(top_builddir)/lib/libzpool/libzpool.la \
+	$(top_builddir)/lib/libzfs/libzfs.la
 
+zpool_LDFLAGS = -pthread -lm -lz -lrt
 all: all-am
 
 .SUFFIXES:
@@ -328,6 +345,62 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
+zpool_iter.o: -I${top_srcdir}/cmd/zpool/zpool_iter.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zpool_iter.o -MD -MP -MF "$(DEPDIR)/zpool_iter.Tpo" -c -o zpool_iter.o `test -f '-I${top_srcdir}/cmd/zpool/zpool_iter.c' || echo '$(srcdir)/'`-I${top_srcdir}/cmd/zpool/zpool_iter.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zpool_iter.Tpo" "$(DEPDIR)/zpool_iter.Po"; else rm -f "$(DEPDIR)/zpool_iter.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='-I${top_srcdir}/cmd/zpool/zpool_iter.c' object='zpool_iter.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zpool_iter.o `test -f '-I${top_srcdir}/cmd/zpool/zpool_iter.c' || echo '$(srcdir)/'`-I${top_srcdir}/cmd/zpool/zpool_iter.c
+
+zpool_iter.obj: -I${top_srcdir}/cmd/zpool/zpool_iter.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zpool_iter.obj -MD -MP -MF "$(DEPDIR)/zpool_iter.Tpo" -c -o zpool_iter.obj `if test -f '-I${top_srcdir}/cmd/zpool/zpool_iter.c'; then $(CYGPATH_W) '-I${top_srcdir}/cmd/zpool/zpool_iter.c'; else $(CYGPATH_W) '$(srcdir)/-I${top_srcdir}/cmd/zpool/zpool_iter.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zpool_iter.Tpo" "$(DEPDIR)/zpool_iter.Po"; else rm -f "$(DEPDIR)/zpool_iter.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='-I${top_srcdir}/cmd/zpool/zpool_iter.c' object='zpool_iter.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zpool_iter.obj `if test -f '-I${top_srcdir}/cmd/zpool/zpool_iter.c'; then $(CYGPATH_W) '-I${top_srcdir}/cmd/zpool/zpool_iter.c'; else $(CYGPATH_W) '$(srcdir)/-I${top_srcdir}/cmd/zpool/zpool_iter.c'; fi`
+
+zpool_main.o: -I${top_srcdir}/cmd/zpool/zpool_main.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zpool_main.o -MD -MP -MF "$(DEPDIR)/zpool_main.Tpo" -c -o zpool_main.o `test -f '-I${top_srcdir}/cmd/zpool/zpool_main.c' || echo '$(srcdir)/'`-I${top_srcdir}/cmd/zpool/zpool_main.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zpool_main.Tpo" "$(DEPDIR)/zpool_main.Po"; else rm -f "$(DEPDIR)/zpool_main.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='-I${top_srcdir}/cmd/zpool/zpool_main.c' object='zpool_main.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zpool_main.o `test -f '-I${top_srcdir}/cmd/zpool/zpool_main.c' || echo '$(srcdir)/'`-I${top_srcdir}/cmd/zpool/zpool_main.c
+
+zpool_main.obj: -I${top_srcdir}/cmd/zpool/zpool_main.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zpool_main.obj -MD -MP -MF "$(DEPDIR)/zpool_main.Tpo" -c -o zpool_main.obj `if test -f '-I${top_srcdir}/cmd/zpool/zpool_main.c'; then $(CYGPATH_W) '-I${top_srcdir}/cmd/zpool/zpool_main.c'; else $(CYGPATH_W) '$(srcdir)/-I${top_srcdir}/cmd/zpool/zpool_main.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zpool_main.Tpo" "$(DEPDIR)/zpool_main.Po"; else rm -f "$(DEPDIR)/zpool_main.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='-I${top_srcdir}/cmd/zpool/zpool_main.c' object='zpool_main.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zpool_main.obj `if test -f '-I${top_srcdir}/cmd/zpool/zpool_main.c'; then $(CYGPATH_W) '-I${top_srcdir}/cmd/zpool/zpool_main.c'; else $(CYGPATH_W) '$(srcdir)/-I${top_srcdir}/cmd/zpool/zpool_main.c'; fi`
+
+zpool_util.o: -I${top_srcdir}/cmd/zpool/zpool_util.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zpool_util.o -MD -MP -MF "$(DEPDIR)/zpool_util.Tpo" -c -o zpool_util.o `test -f '-I${top_srcdir}/cmd/zpool/zpool_util.c' || echo '$(srcdir)/'`-I${top_srcdir}/cmd/zpool/zpool_util.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zpool_util.Tpo" "$(DEPDIR)/zpool_util.Po"; else rm -f "$(DEPDIR)/zpool_util.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='-I${top_srcdir}/cmd/zpool/zpool_util.c' object='zpool_util.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zpool_util.o `test -f '-I${top_srcdir}/cmd/zpool/zpool_util.c' || echo '$(srcdir)/'`-I${top_srcdir}/cmd/zpool/zpool_util.c
+
+zpool_util.obj: -I${top_srcdir}/cmd/zpool/zpool_util.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zpool_util.obj -MD -MP -MF "$(DEPDIR)/zpool_util.Tpo" -c -o zpool_util.obj `if test -f '-I${top_srcdir}/cmd/zpool/zpool_util.c'; then $(CYGPATH_W) '-I${top_srcdir}/cmd/zpool/zpool_util.c'; else $(CYGPATH_W) '$(srcdir)/-I${top_srcdir}/cmd/zpool/zpool_util.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zpool_util.Tpo" "$(DEPDIR)/zpool_util.Po"; else rm -f "$(DEPDIR)/zpool_util.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='-I${top_srcdir}/cmd/zpool/zpool_util.c' object='zpool_util.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zpool_util.obj `if test -f '-I${top_srcdir}/cmd/zpool/zpool_util.c'; then $(CYGPATH_W) '-I${top_srcdir}/cmd/zpool/zpool_util.c'; else $(CYGPATH_W) '$(srcdir)/-I${top_srcdir}/cmd/zpool/zpool_util.c'; fi`
+
+zpool_vdev.o: -I${top_srcdir}/cmd/zpool/zpool_vdev.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zpool_vdev.o -MD -MP -MF "$(DEPDIR)/zpool_vdev.Tpo" -c -o zpool_vdev.o `test -f '-I${top_srcdir}/cmd/zpool/zpool_vdev.c' || echo '$(srcdir)/'`-I${top_srcdir}/cmd/zpool/zpool_vdev.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zpool_vdev.Tpo" "$(DEPDIR)/zpool_vdev.Po"; else rm -f "$(DEPDIR)/zpool_vdev.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='-I${top_srcdir}/cmd/zpool/zpool_vdev.c' object='zpool_vdev.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zpool_vdev.o `test -f '-I${top_srcdir}/cmd/zpool/zpool_vdev.c' || echo '$(srcdir)/'`-I${top_srcdir}/cmd/zpool/zpool_vdev.c
+
+zpool_vdev.obj: -I${top_srcdir}/cmd/zpool/zpool_vdev.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zpool_vdev.obj -MD -MP -MF "$(DEPDIR)/zpool_vdev.Tpo" -c -o zpool_vdev.obj `if test -f '-I${top_srcdir}/cmd/zpool/zpool_vdev.c'; then $(CYGPATH_W) '-I${top_srcdir}/cmd/zpool/zpool_vdev.c'; else $(CYGPATH_W) '$(srcdir)/-I${top_srcdir}/cmd/zpool/zpool_vdev.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/zpool_vdev.Tpo" "$(DEPDIR)/zpool_vdev.Po"; else rm -f "$(DEPDIR)/zpool_vdev.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='-I${top_srcdir}/cmd/zpool/zpool_vdev.c' object='zpool_vdev.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zpool_vdev.obj `if test -f '-I${top_srcdir}/cmd/zpool/zpool_vdev.c'; then $(CYGPATH_W) '-I${top_srcdir}/cmd/zpool/zpool_vdev.c'; else $(CYGPATH_W) '$(srcdir)/-I${top_srcdir}/cmd/zpool/zpool_vdev.c'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo