Index: b/usr/src/uts/common/fs/zfs/ddt.c
===================================================================
--- a/usr/src/uts/common/fs/zfs/ddt.c	2014-03-10 12:36:38.344683162 +0400
+++ b/usr/src/uts/common/fs/zfs/ddt.c	2014-03-10 12:37:57.398849299 +0400
@@ -37,6 +37,10 @@
 #include <sys/zio_compress.h>
 #include <sys/dsl_scan.h>
 
+#ifndef _KERNEL
+#include <libsunavl.h>
+#endif
+
 /*
  * Enable/disable prefetching of dedup-ed blocks which are going to be freed.
  */
Index: b/usr/src/uts/common/fs/zfs/dmu_send.c
===================================================================
--- a/usr/src/uts/common/fs/zfs/dmu_send.c	2014-03-10 12:36:38.344551375 +0400
+++ b/usr/src/uts/common/fs/zfs/dmu_send.c	2014-03-10 12:37:57.403207401 +0400
@@ -50,6 +50,10 @@
 #include <sys/dsl_destroy.h>
 #include <sys/dsl_bookmark.h>
 
+#ifndef _KERNEL
+#include <libsunavl.h>
+#endif
+
 /* Set this tunable to TRUE to replace corrupt data with 0x2f5baddb10c */
 int zfs_send_corrupt_data = B_FALSE;
 
Index: b/usr/src/uts/common/fs/zfs/dnode.c
===================================================================
--- a/usr/src/uts/common/fs/zfs/dnode.c	2014-03-10 12:36:38.344840160 +0400
+++ b/usr/src/uts/common/fs/zfs/dnode.c	2014-03-10 12:37:57.405623161 +0400
@@ -36,6 +36,10 @@
 #include <sys/zio.h>
 #include <sys/dmu_zfetch.h>
 
+#ifndef _KERNEL
+#include <libsunavl.h>
+#endif
+
 static int free_range_compar(const void *node1, const void *node2);
 
 static kmem_cache_t *dnode_cache;
Index: b/usr/src/uts/common/fs/zfs/dnode_sync.c
===================================================================
--- a/usr/src/uts/common/fs/zfs/dnode_sync.c	2014-03-10 12:36:38.344634790 +0400
+++ b/usr/src/uts/common/fs/zfs/dnode_sync.c	2014-03-10 12:37:57.407237718 +0400
@@ -34,6 +34,10 @@
 #include <sys/spa.h>
 #include <sys/zfeature.h>
 
+#ifndef _KERNEL
+#include <libsunavl.h>
+#endif
+
 static void
 dnode_increase_indirection(dnode_t *dn, dmu_tx_t *tx)
 {
Index: b/usr/src/uts/common/fs/zfs/dsl_deadlist.c
===================================================================
--- a/usr/src/uts/common/fs/zfs/dsl_deadlist.c	2014-03-10 12:36:38.344705465 +0400
+++ b/usr/src/uts/common/fs/zfs/dsl_deadlist.c	2014-03-10 12:37:57.408611292 +0400
@@ -30,6 +30,10 @@
 #include <sys/zfs_context.h>
 #include <sys/dsl_pool.h>
 
+#ifndef _KERNEL
+#include <libsunavl.h>
+#endif
+
 /*
  * Deadlist concurrency:
  *
Index: b/usr/src/uts/common/fs/zfs/dsl_deleg.c
===================================================================
--- a/usr/src/uts/common/fs/zfs/dsl_deleg.c	2014-03-10 12:36:38.344492679 +0400
+++ b/usr/src/uts/common/fs/zfs/dsl_deleg.c	2014-03-10 12:37:57.410124981 +0400
@@ -80,6 +80,10 @@
 #include <sys/cred.h>
 #include <sys/sunddi.h>
 
+#ifndef _KERNEL
+#include <libsunavl.h>
+#endif
+
 #include "zfs_deleg.h"
 
 /*
Index: b/usr/src/uts/common/fs/zfs/dsl_scan.c
===================================================================
--- a/usr/src/uts/common/fs/zfs/dsl_scan.c	2014-03-10 12:36:38.344794632 +0400
+++ b/usr/src/uts/common/fs/zfs/dsl_scan.c	2014-03-10 12:37:57.412111005 +0400
@@ -50,6 +50,10 @@
 #include <sys/zfs_vfsops.h>
 #endif
 
+#ifndef _KERNEL
+#include <libsunavl.h>
+#endif
+
 typedef int (scan_cb_t)(dsl_pool_t *, const blkptr_t *, const zbookmark_t *);
 
 static scan_cb_t dsl_scan_defrag_cb;
Index: b/usr/src/uts/common/fs/zfs/metaslab.c
===================================================================
--- a/usr/src/uts/common/fs/zfs/metaslab.c	2014-03-10 12:36:38.344817841 +0400
+++ b/usr/src/uts/common/fs/zfs/metaslab.c	2014-03-10 12:37:57.414990055 +0400
@@ -33,6 +33,10 @@
 #include <sys/zio.h>
 #include <sys/spa_impl.h>
 
+#ifndef _KERNEL
+#include <libsunavl.h>
+#endif
+
 /*
  * Allow allocations to switch to gang blocks quickly. We do this to
  * avoid having to load lots of space_maps in a given txg. There are,
Index: b/usr/src/uts/common/fs/zfs/sa.c
===================================================================
--- a/usr/src/uts/common/fs/zfs/sa.c	2014-03-10 12:37:11.259608190 +0400
+++ b/usr/src/uts/common/fs/zfs/sa.c	2014-03-10 12:37:57.417078893 +0400
@@ -43,6 +43,10 @@
 #include <sys/errno.h>
 #include <sys/zfs_context.h>
 
+#ifndef _KERNEL
+#include <libsunavl.h>
+#endif
+
 /*
  * ZFS System attributes:
  *
Index: b/usr/src/uts/common/fs/zfs/spa.c
===================================================================
--- a/usr/src/uts/common/fs/zfs/spa.c	2014-03-10 12:36:38.344905483 +0400
+++ b/usr/src/uts/common/fs/zfs/spa.c	2014-03-10 12:37:57.424122768 +0400
@@ -76,6 +76,10 @@
 #include <sys/zone.h>
 #endif	/* _KERNEL */
 
+#ifndef _KERNEL
+#include <libsunavl.h>
+#endif
+
 #include "zfs_prop.h"
 #include "zfs_comutil.h"
 
Index: b/usr/src/uts/common/fs/zfs/spa_errlog.c
===================================================================
--- a/usr/src/uts/common/fs/zfs/spa_errlog.c	2014-03-10 12:36:38.344750576 +0400
+++ b/usr/src/uts/common/fs/zfs/spa_errlog.c	2014-03-10 12:37:57.425919142 +0400
@@ -54,6 +54,10 @@
 #include <sys/zap.h>
 #include <sys/zio.h>
 
+#ifndef _KERNEL
+#include <libsunavl.h>
+#endif
+
 
 /*
  * Convert a bookmark to a string.
Index: b/usr/src/uts/common/fs/zfs/spa_misc.c
===================================================================
--- a/usr/src/uts/common/fs/zfs/spa_misc.c	2014-03-10 12:36:38.344883015 +0400
+++ b/usr/src/uts/common/fs/zfs/spa_misc.c	2014-03-10 12:37:57.427996274 +0400
@@ -48,6 +48,11 @@
 #include <sys/metaslab_impl.h>
 #include <sys/arc.h>
 #include <sys/ddt.h>
+
+#ifndef _KERNEL
+#include <libsunavl.h>
+#endif
+
 #include "zfs_prop.h"
 #include "zfeature_common.h"
 
Index: b/usr/src/uts/common/fs/zfs/space_map.c
===================================================================
--- a/usr/src/uts/common/fs/zfs/space_map.c	2014-03-10 12:36:38.344928509 +0400
+++ b/usr/src/uts/common/fs/zfs/space_map.c	2014-03-10 12:37:57.429397816 +0400
@@ -37,6 +37,10 @@
 #include <sys/refcount.h>
 #include <sys/zfeature.h>
 
+#ifndef _KERNEL
+#include <libsunavl.h>
+#endif
+
 /*
  * This value controls how the space map's block size is allowed to grow.
  * If the value is set to the same size as SPACE_MAP_INITIAL_BLOCKSIZE then
Index: b/usr/src/uts/common/fs/zfs/unique.c
===================================================================
--- a/usr/src/uts/common/fs/zfs/unique.c	2014-03-10 12:36:38.344727972 +0400
+++ b/usr/src/uts/common/fs/zfs/unique.c	2014-03-10 12:37:57.430662695 +0400
@@ -29,6 +29,10 @@
 #include <sys/avl.h>
 #include <sys/unique.h>
 
+#ifndef _KERNEL
+#include <libsunavl.h>
+#endif
+
 static avl_tree_t unique_avl;
 static kmutex_t unique_mtx;
 
Index: b/usr/src/uts/common/fs/zfs/vdev.c
===================================================================
--- a/usr/src/uts/common/fs/zfs/vdev.c	2014-03-10 12:37:13.482272874 +0400
+++ b/usr/src/uts/common/fs/zfs/vdev.c	2014-03-10 12:37:57.433709367 +0400
@@ -44,6 +44,10 @@
 #include <sys/zil.h>
 #include <sys/dsl_scan.h>
 
+#ifndef _KERNEL
+#include <libsunavl.h>
+#endif
+
 /*
  * Virtual device management.
  */
Index: b/usr/src/uts/common/fs/zfs/vdev_cache.c
===================================================================
--- a/usr/src/uts/common/fs/zfs/vdev_cache.c	2014-03-10 12:36:38.344382448 +0400
+++ b/usr/src/uts/common/fs/zfs/vdev_cache.c	2014-03-10 12:37:57.435239415 +0400
@@ -32,6 +32,10 @@
 #include <sys/zio.h>
 #include <sys/kstat.h>
 
+#ifndef _KERNEL
+#include <libsunavl.h>
+#endif
+
 /*
  * Virtual device read-ahead caching.
  *
Index: b/usr/src/uts/common/fs/zfs/vdev_queue.c
===================================================================
--- a/usr/src/uts/common/fs/zfs/vdev_queue.c	2014-03-10 12:36:38.344468757 +0400
+++ b/usr/src/uts/common/fs/zfs/vdev_queue.c	2014-03-10 12:37:57.436776165 +0400
@@ -23,6 +23,10 @@
  * Use is subject to license terms.
  */
 
+#ifndef _KERNEL
+#include <libsunavl.h>
+#endif
+
 /*
  * Copyright (c) 2013 by Delphix. All rights reserved.
  */
Index: b/usr/src/uts/common/fs/zfs/zap_micro.c
===================================================================
--- a/usr/src/uts/common/fs/zfs/zap_micro.c	2014-03-10 12:36:38.344861867 +0400
+++ b/usr/src/uts/common/fs/zfs/zap_micro.c	2014-03-10 12:37:57.438627674 +0400
@@ -38,6 +38,10 @@
 #include <sys/sunddi.h>
 #endif
 
+#ifndef _KERNEL
+#include <libsunavl.h>
+#endif
+
 static int mzap_upgrade(zap_t **zapp, dmu_tx_t *tx, zap_flags_t flags);
 
 uint64_t
Index: b/usr/src/uts/common/fs/zfs/zfs_fuid.c
===================================================================
--- a/usr/src/uts/common/fs/zfs/zfs_fuid.c	2014-03-10 12:36:38.344660174 +0400
+++ b/usr/src/uts/common/fs/zfs/zfs_fuid.c	2014-03-10 12:37:57.440269798 +0400
@@ -36,6 +36,10 @@
 #endif
 #include <sys/zfs_fuid.h>
 
+#ifndef _KERNEL
+#include <libsunavl.h>
+#endif
+
 /*
  * FUID Domain table(s).
  *
Index: b/usr/src/uts/common/fs/zfs/zil.c
===================================================================
--- a/usr/src/uts/common/fs/zfs/zil.c	2014-03-10 12:37:15.693154121 +0400
+++ b/usr/src/uts/common/fs/zfs/zil.c	2014-03-10 12:37:57.442432564 +0400
@@ -39,6 +39,10 @@
 #include <sys/dmu_tx.h>
 #include <sys/dsl_pool.h>
 
+#ifndef _KERNEL
+#include <libsunavl.h>
+#endif
+
 /*
  * The zfs intent log (ZIL) saves transaction records of system calls
  * that change the file system in memory with enough information
Index: b/usr/src/lib/libzpool/Makefile.com
===================================================================
--- a/usr/src/lib/libzpool/Makefile.com	2014-03-10 12:37:22.093549907 +0400
+++ b/usr/src/lib/libzpool/Makefile.com	2014-03-10 12:37:57.443833162 +0400
@@ -65,7 +65,7 @@
 
 CFLAGS +=	-g $(CCVERBOSE) $(CNOGLOBAL)
 CFLAGS64 +=	-g $(CCVERBOSE)	$(CNOGLOBAL)
-LDLIBS +=	-lumem -lavl -lnvpair -lz -lc -lsysevent -lmd
+LDLIBS +=	-lumem -lsunavl -lnvpair -lz -lc -lsysevent -lmd
 CPPFLAGS +=	$(INCS)	-DDEBUG
 
 CERRWARN +=	-_gcc=-Wno-parentheses