lib{efi,avl,share,tpool,zfs_core,zfsbootenv,zutil}: -fvisibility=hidden

No symbols affected in libavl
No symbols affected by libtpool, but pre-ANSI declarations got purged
No symbols affected by libzfs_core
No symbols affected by libzfs_bootenv

libefi got cleaned, gained efi_debug documentation in efi_partition.h,
and removes one undocumented and unused symbol from libzfs_core:
  D default_vtoc_map

libnvpair saw removal of these symbols:
  D nv_alloc_nosleep_def
  D nv_alloc_sleep
  D nv_alloc_sleep_def
  D nv_fixed_ops_def
  D nvlist_hashtable_init_size
  D nvpair_max_recursion

libshare saw removal of these symbols from libzfs:
  T libshare_nfs_init
  T libshare_smb_init
  T register_fstype
  B smb_shares

libzutil saw removal of these internal symbols from libzfs_core:
  T label_paths
  T slice_cache_compare
  T zpool_find_import_blkid
  T zpool_open_func
  T zutil_alloc
  T zutil_strdup

Reviewed-by: Matthew Ahrens <[email protected]>
Reviewed-by: John Kennedy <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #12191

24 files changed, 2481 insertions, 2567 deletions

diff --git a/include/libnvpair.h b/include/libnvpair.h
index 5277f9574..bc50c3b7e 100644
--- a/include/libnvpair.h
+++ b/include/libnvpair.h
@@ -24,7 +24,7 @@
  */
 
 #ifndef	_LIBNVPAIR_H
-#define	_LIBNVPAIR_H
+#define	_LIBNVPAIR_H extern __attribute__((visibility("default")))
 
 #include <sys/nvpair.h>
 #include <stdlib.h>
@@ -42,13 +42,13 @@ extern "C" {
  * are all imported from <sys/nvpair.h> included above.
  */
 
-extern int nvpair_value_match(nvpair_t *, int, char *, char **);
-extern int nvpair_value_match_regex(nvpair_t *, int, char *, regex_t *,
+_LIBNVPAIR_H int nvpair_value_match(nvpair_t *, int, char *, char **);
+_LIBNVPAIR_H int nvpair_value_match_regex(nvpair_t *, int, char *, regex_t *,
     char **);
 
-extern void nvlist_print(FILE *, nvlist_t *);
-int nvlist_print_json(FILE *, nvlist_t *);
-extern void dump_nvlist(nvlist_t *, int);
+_LIBNVPAIR_H void nvlist_print(FILE *, nvlist_t *);
+_LIBNVPAIR_H int nvlist_print_json(FILE *, nvlist_t *);
+_LIBNVPAIR_H void dump_nvlist(nvlist_t *, int);
 
 /*
  * Private nvlist printing interface that allows the caller some control
@@ -88,18 +88,18 @@ enum nvlist_indent_mode {
 	NVLIST_INDENT_TABBED	/* Indent with tabstops */
 };
 
-extern nvlist_prtctl_t nvlist_prtctl_alloc(void);
-extern void nvlist_prtctl_free(nvlist_prtctl_t);
-extern void nvlist_prt(nvlist_t *, nvlist_prtctl_t);
+_LIBNVPAIR_H nvlist_prtctl_t nvlist_prtctl_alloc(void);
+_LIBNVPAIR_H void nvlist_prtctl_free(nvlist_prtctl_t);
+_LIBNVPAIR_H void nvlist_prt(nvlist_t *, nvlist_prtctl_t);
 
 /* Output stream */
-extern void nvlist_prtctl_setdest(nvlist_prtctl_t, FILE *);
-extern FILE *nvlist_prtctl_getdest(nvlist_prtctl_t);
+_LIBNVPAIR_H void nvlist_prtctl_setdest(nvlist_prtctl_t, FILE *);
+_LIBNVPAIR_H FILE *nvlist_prtctl_getdest(nvlist_prtctl_t);
 
 /* Indentation mode, start indent, indent increment; default tabbed/0/1 */
-extern void nvlist_prtctl_setindent(nvlist_prtctl_t, enum nvlist_indent_mode,
-    int, int);
-extern void nvlist_prtctl_doindent(nvlist_prtctl_t, int);
+_LIBNVPAIR_H void nvlist_prtctl_setindent(nvlist_prtctl_t,
+    enum nvlist_indent_mode, int, int);
+_LIBNVPAIR_H void nvlist_prtctl_doindent(nvlist_prtctl_t, int);
 
 enum nvlist_prtctl_fmt {
 	NVLIST_FMT_MEMBER_NAME,		/* name fmt; default "%s = " */
@@ -107,9 +107,10 @@ enum nvlist_prtctl_fmt {
 	NVLIST_FMT_BTWN_ARRAY		/* between array members; default " " */
 };
 
-extern void nvlist_prtctl_setfmt(nvlist_prtctl_t, enum nvlist_prtctl_fmt,
+_LIBNVPAIR_H void nvlist_prtctl_setfmt(nvlist_prtctl_t, enum nvlist_prtctl_fmt,
     const char *);
-extern void nvlist_prtctl_dofmt(nvlist_prtctl_t, enum nvlist_prtctl_fmt, ...);
+_LIBNVPAIR_H void nvlist_prtctl_dofmt(nvlist_prtctl_t, enum nvlist_prtctl_fmt,
+    ...);
 
 /*
  * Function prototypes for interfaces that appoint a new rendering function
@@ -139,7 +140,7 @@ extern void nvlist_prtctl_dofmt(nvlist_prtctl_t, enum nvlist_prtctl_fmt, ...);
  */
 
 #define	NVLIST_PRINTCTL_SVDECL(funcname, valtype) \
-    extern void funcname(nvlist_prtctl_t, \
+    _LIBNVPAIR_H void funcname(nvlist_prtctl_t, \
     int (*)(nvlist_prtctl_t, void *, nvlist_t *, const char *, valtype), \
     void *)
 
@@ -170,7 +171,7 @@ NVLIST_PRINTCTL_SVDECL(nvlist_prtctlop_nvlist, nvlist_t *);
  * Return values as above.
  */
 #define	NVLIST_PRINTCTL_AVDECL(funcname, vtype) \
-    extern void funcname(nvlist_prtctl_t, \
+    _LIBNVPAIR_H void funcname(nvlist_prtctl_t, \
     int (*)(nvlist_prtctl_t, void *, nvlist_t *, const char *, vtype, uint_t), \
     void *)
 
diff --git a/include/libzfs_core.h b/include/libzfs_core.h
index 34161a06f..83d8211ab 100644
--- a/include/libzfs_core.h
+++ b/include/libzfs_core.h
@@ -27,7 +27,7 @@
  */
 
 #ifndef	_LIBZFS_CORE_H
-#define	_LIBZFS_CORE_H
+#define	_LIBZFS_CORE_H extern __attribute__((visibility("default")))
 
 #include <libnvpair.h>
 #include <sys/param.h>
@@ -38,41 +38,42 @@
 extern "C" {
 #endif
 
-int libzfs_core_init(void);
-void libzfs_core_fini(void);
+_LIBZFS_CORE_H int libzfs_core_init(void);
+_LIBZFS_CORE_H void libzfs_core_fini(void);
 
 /*
- * NB: this type should be kept binary compatible with dmu_objset_type_t.
+ * NB: this type should be kept binary-compatible with dmu_objset_type_t.
  */
 enum lzc_dataset_type {
 	LZC_DATSET_TYPE_ZFS = 2,
 	LZC_DATSET_TYPE_ZVOL
 };
 
-int lzc_snapshot(nvlist_t *, nvlist_t *, nvlist_t **);
-int lzc_create(const char *, enum lzc_dataset_type, nvlist_t *, uint8_t *,
+_LIBZFS_CORE_H int lzc_snapshot(nvlist_t *, nvlist_t *, nvlist_t **);
+_LIBZFS_CORE_H int lzc_create(const char *, enum lzc_dataset_type, nvlist_t *,
+    uint8_t *, uint_t);
+_LIBZFS_CORE_H int lzc_clone(const char *, const char *, nvlist_t *);
+_LIBZFS_CORE_H int lzc_promote(const char *, char *, int);
+_LIBZFS_CORE_H int lzc_destroy_snaps(nvlist_t *, boolean_t, nvlist_t **);
+_LIBZFS_CORE_H int lzc_bookmark(nvlist_t *, nvlist_t **);
+_LIBZFS_CORE_H int lzc_get_bookmarks(const char *, nvlist_t *, nvlist_t **);
+_LIBZFS_CORE_H int lzc_get_bookmark_props(const char *, nvlist_t **);
+_LIBZFS_CORE_H int lzc_destroy_bookmarks(nvlist_t *, nvlist_t **);
+_LIBZFS_CORE_H int lzc_load_key(const char *, boolean_t, uint8_t *, uint_t);
+_LIBZFS_CORE_H int lzc_unload_key(const char *);
+_LIBZFS_CORE_H int lzc_change_key(const char *, uint64_t, nvlist_t *, uint8_t *,
     uint_t);
-int lzc_clone(const char *, const char *, nvlist_t *);
-int lzc_promote(const char *, char *, int);
-int lzc_destroy_snaps(nvlist_t *, boolean_t, nvlist_t **);
-int lzc_bookmark(nvlist_t *, nvlist_t **);
-int lzc_get_bookmarks(const char *, nvlist_t *, nvlist_t **);
-int lzc_get_bookmark_props(const char *, nvlist_t **);
-int lzc_destroy_bookmarks(nvlist_t *, nvlist_t **);
-int lzc_load_key(const char *, boolean_t, uint8_t *, uint_t);
-int lzc_unload_key(const char *);
-int lzc_change_key(const char *, uint64_t, nvlist_t *, uint8_t *, uint_t);
-int lzc_initialize(const char *, pool_initialize_func_t, nvlist_t *,
-    nvlist_t **);
-int lzc_trim(const char *, pool_trim_func_t, uint64_t, boolean_t,
+_LIBZFS_CORE_H int lzc_initialize(const char *, pool_initialize_func_t,
     nvlist_t *, nvlist_t **);
-int lzc_redact(const char *, const char *, nvlist_t *);
+_LIBZFS_CORE_H int lzc_trim(const char *, pool_trim_func_t, uint64_t, boolean_t,
+    nvlist_t *, nvlist_t **);
+_LIBZFS_CORE_H int lzc_redact(const char *, const char *, nvlist_t *);
 
-int lzc_snaprange_space(const char *, const char *, uint64_t *);
+_LIBZFS_CORE_H int lzc_snaprange_space(const char *, const char *, uint64_t *);
 
-int lzc_hold(nvlist_t *, int, nvlist_t **);
-int lzc_release(nvlist_t *, nvlist_t **);
-int lzc_get_holds(const char *, nvlist_t **);
+_LIBZFS_CORE_H int lzc_hold(nvlist_t *, int, nvlist_t **);
+_LIBZFS_CORE_H int lzc_release(nvlist_t *, nvlist_t **);
+_LIBZFS_CORE_H int lzc_get_holds(const char *, nvlist_t **);
 
 enum lzc_send_flags {
 	LZC_SEND_FLAG_EMBED_DATA = 1 << 0,
@@ -82,61 +83,66 @@ enum lzc_send_flags {
 	LZC_SEND_FLAG_SAVED = 1 << 4,
 };
 
-int lzc_send(const char *, const char *, int, enum lzc_send_flags);
-int lzc_send_resume(const char *, const char *, int,
+_LIBZFS_CORE_H int lzc_send(const char *, const char *, int,
+    enum lzc_send_flags);
+_LIBZFS_CORE_H int lzc_send_resume(const char *, const char *, int,
     enum lzc_send_flags, uint64_t, uint64_t);
-int lzc_send_space(const char *, const char *, enum lzc_send_flags, uint64_t *);
+_LIBZFS_CORE_H int lzc_send_space(const char *, const char *,
+    enum lzc_send_flags, uint64_t *);
 
 struct dmu_replay_record;
 
-int lzc_send_redacted(const char *, const char *, int, enum lzc_send_flags,
-    const char *);
-int lzc_send_resume_redacted(const char *, const char *, int,
+_LIBZFS_CORE_H int lzc_send_redacted(const char *, const char *, int,
+    enum lzc_send_flags, const char *);
+_LIBZFS_CORE_H int lzc_send_resume_redacted(const char *, const char *, int,
     enum lzc_send_flags, uint64_t, uint64_t, const char *);
-int lzc_receive(const char *, nvlist_t *, const char *, boolean_t, boolean_t,
-    int);
-int lzc_receive_resumable(const char *, nvlist_t *, const char *, boolean_t,
-    boolean_t, int);
-int lzc_receive_with_header(const char *, nvlist_t *, const char *, boolean_t,
-    boolean_t, boolean_t, int, const struct dmu_replay_record *);
-int lzc_receive_one(const char *, nvlist_t *, const char *, boolean_t,
-    boolean_t, boolean_t, int, const struct dmu_replay_record *, int,
+_LIBZFS_CORE_H int lzc_receive(const char *, nvlist_t *, const char *,
+    boolean_t, boolean_t, int);
+_LIBZFS_CORE_H int lzc_receive_resumable(const char *, nvlist_t *, const char *,
+    boolean_t, boolean_t, int);
+_LIBZFS_CORE_H int lzc_receive_with_header(const char *, nvlist_t *,
+    const char *, boolean_t, boolean_t, boolean_t, int,
+    const struct dmu_replay_record *);
+_LIBZFS_CORE_H int lzc_receive_one(const char *, nvlist_t *, const char *,
+    boolean_t, boolean_t, boolean_t, int, const struct dmu_replay_record *, int,
     uint64_t *, uint64_t *, uint64_t *, nvlist_t **);
-int lzc_receive_with_cmdprops(const char *, nvlist_t *, nvlist_t *,
-    uint8_t *, uint_t, const char *, boolean_t, boolean_t, boolean_t, int,
-    const struct dmu_replay_record *, int, uint64_t *, uint64_t *,
-    uint64_t *, nvlist_t **);
-int lzc_send_space(const char *, const char *, enum lzc_send_flags, uint64_t *);
-int lzc_send_space_resume_redacted(const char *, const char *,
+_LIBZFS_CORE_H int lzc_receive_with_cmdprops(const char *, nvlist_t *,
+    nvlist_t *, uint8_t *, uint_t, const char *, boolean_t, boolean_t,
+    boolean_t, int, const struct dmu_replay_record *, int, uint64_t *,
+    uint64_t *, uint64_t *, nvlist_t **);
+_LIBZFS_CORE_H int lzc_send_space(const char *, const char *,
+    enum lzc_send_flags, uint64_t *);
+_LIBZFS_CORE_H int lzc_send_space_resume_redacted(const char *, const char *,
     enum lzc_send_flags, uint64_t, uint64_t, uint64_t, const char *,
     int, uint64_t *);
-uint64_t lzc_send_progress(int);
+_LIBZFS_CORE_H uint64_t lzc_send_progress(int);
 
-boolean_t lzc_exists(const char *);
+_LIBZFS_CORE_H boolean_t lzc_exists(const char *);
 
-int lzc_rollback(const char *, char *, int);
-int lzc_rollback_to(const char *, const char *);
+_LIBZFS_CORE_H int lzc_rollback(const char *, char *, int);
+_LIBZFS_CORE_H int lzc_rollback_to(const char *, const char *);
 
-int lzc_rename(const char *, const char *);
-int lzc_destroy(const char *);
+_LIBZFS_CORE_H int lzc_rename(const char *, const char *);
+_LIBZFS_CORE_H int lzc_destroy(const char *);
 
-int lzc_channel_program(const char *, const char *, uint64_t,
-    uint64_t, nvlist_t *, nvlist_t **);
-int lzc_channel_program_nosync(const char *, const char *, uint64_t,
+_LIBZFS_CORE_H int lzc_channel_program(const char *, const char *, uint64_t,
     uint64_t, nvlist_t *, nvlist_t **);
+_LIBZFS_CORE_H int lzc_channel_program_nosync(const char *, const char *,
+    uint64_t, uint64_t, nvlist_t *, nvlist_t **);
 
-int lzc_sync(const char *, nvlist_t *, nvlist_t **);
-int lzc_reopen(const char *, boolean_t);
+_LIBZFS_CORE_H int lzc_sync(const char *, nvlist_t *, nvlist_t **);
+_LIBZFS_CORE_H int lzc_reopen(const char *, boolean_t);
 
-int lzc_pool_checkpoint(const char *);
-int lzc_pool_checkpoint_discard(const char *);
+_LIBZFS_CORE_H int lzc_pool_checkpoint(const char *);
+_LIBZFS_CORE_H int lzc_pool_checkpoint_discard(const char *);
 
-int lzc_wait(const char *, zpool_wait_activity_t, boolean_t *);
-int lzc_wait_tag(const char *, zpool_wait_activity_t, uint64_t, boolean_t *);
-int lzc_wait_fs(const char *, zfs_wait_activity_t, boolean_t *);
+_LIBZFS_CORE_H int lzc_wait(const char *, zpool_wait_activity_t, boolean_t *);
+_LIBZFS_CORE_H int lzc_wait_tag(const char *, zpool_wait_activity_t, uint64_t,
+    boolean_t *);
+_LIBZFS_CORE_H int lzc_wait_fs(const char *, zfs_wait_activity_t, boolean_t *);
 
-int lzc_set_bootenv(const char *, const nvlist_t *);
-int lzc_get_bootenv(const char *, nvlist_t **);
+_LIBZFS_CORE_H int lzc_set_bootenv(const char *, const nvlist_t *);
+_LIBZFS_CORE_H int lzc_get_bootenv(const char *, nvlist_t **);
 #ifdef	__cplusplus
 }
 #endif
diff --git a/include/libzfsbootenv.h b/include/libzfsbootenv.h
index b078b605d..cbc8751dc 100644
--- a/include/libzfsbootenv.h
+++ b/include/libzfsbootenv.h
@@ -14,7 +14,7 @@
  */
 
 #ifndef _LIBZFSBOOTENV_H
-#define	_LIBZFSBOOTENV_H
+#define	_LIBZFSBOOTENV_H extern __attribute__((visibility("default")))
 
 #ifdef __cplusplus
 extern "C" {
@@ -25,14 +25,16 @@ typedef enum lzbe_flags {
 	lzbe_replace	/* replace current nvlist */
 } lzbe_flags_t;
 
-extern int lzbe_nvlist_get(const char *, const char *, void **);
-extern int lzbe_nvlist_set(const char *, const char *, void *);
-extern void lzbe_nvlist_free(void *);
-extern int lzbe_add_pair(void *, const char *, const char *, void *, size_t);
-extern int lzbe_remove_pair(void *, const char *);
-extern int lzbe_set_boot_device(const char *, lzbe_flags_t, const char *);
-extern int lzbe_get_boot_device(const char *, char **);
-extern int lzbe_bootenv_print(const char *, const char *, FILE *);
+_LIBZFSBOOTENV_H int lzbe_nvlist_get(const char *, const char *, void **);
+_LIBZFSBOOTENV_H int lzbe_nvlist_set(const char *, const char *, void *);
+_LIBZFSBOOTENV_H void lzbe_nvlist_free(void *);
+_LIBZFSBOOTENV_H int lzbe_add_pair(void *, const char *, const char *, void *,
+    size_t);
+_LIBZFSBOOTENV_H int lzbe_remove_pair(void *, const char *);
+_LIBZFSBOOTENV_H int lzbe_set_boot_device(const char *, lzbe_flags_t,
+    const char *);
+_LIBZFSBOOTENV_H int lzbe_get_boot_device(const char *, char **);
+_LIBZFSBOOTENV_H int lzbe_bootenv_print(const char *, const char *, FILE *);
 
 #ifdef __cplusplus
 }
diff --git a/include/sys/avl.h b/include/sys/avl.h
index ed3c6f86a..20e88f2a6 100644
--- a/include/sys/avl.h
+++ b/include/sys/avl.h
@@ -28,7 +28,7 @@
  */
 
 #ifndef	_AVL_H
-#define	_AVL_H
+#define	_AVL_H extern __attribute__((visibility("default")))
 
 /*
  * This is a private header file.  Applications should not directly include
@@ -160,7 +160,7 @@ typedef uintptr_t avl_index_t;
  * size   - the value of sizeof(struct my_type)
  * offset - the value of OFFSETOF(struct my_type, my_link)
  */
-extern void avl_create(avl_tree_t *tree,
+_AVL_H void avl_create(avl_tree_t *tree,
 	int (*compar) (const void *, const void *), size_t size, size_t offset);
 
 
@@ -172,7 +172,7 @@ extern void avl_create(avl_tree_t *tree,
  * node   - node that has the value being looked for
  * where  - position for use with avl_nearest() or avl_insert(), may be NULL
  */
-extern void *avl_find(avl_tree_t *tree, const void *node, avl_index_t *where);
+_AVL_H void *avl_find(avl_tree_t *tree, const void *node, avl_index_t *where);
 
 /*
  * Insert a node into the tree.
@@ -180,7 +180,7 @@ extern void *avl_find(avl_tree_t *tree, const void *node, avl_index_t *where);
  * node   - the node to insert
  * where  - position as returned from avl_find()
  */
-extern void avl_insert(avl_tree_t *tree, void *node, avl_index_t where);
+_AVL_H void avl_insert(avl_tree_t *tree, void *node, avl_index_t where);
 
 /*
  * Insert "new_data" in "tree" in the given "direction" either after
@@ -193,7 +193,7 @@ extern void avl_insert(avl_tree_t *tree, void *node, avl_index_t where);
  * here		- existing node in "tree"
  * direction	- either AVL_AFTER or AVL_BEFORE the data "here".
  */
-extern void avl_insert_here(avl_tree_t *tree, void *new_data, void *here,
+_AVL_H void avl_insert_here(avl_tree_t *tree, void *new_data, void *here,
     int direction);
 
 
@@ -202,8 +202,8 @@ extern void avl_insert_here(avl_tree_t *tree, void *new_data, void *here,
  * if the tree is empty.
  *
  */
-extern void *avl_first(avl_tree_t *tree);
-extern void *avl_last(avl_tree_t *tree);
+_AVL_H void *avl_first(avl_tree_t *tree);
+_AVL_H void *avl_last(avl_tree_t *tree);
 
 
 /*
@@ -239,7 +239,7 @@ extern void *avl_last(avl_tree_t *tree);
  *	else
  *		less = avl_nearest(tree, where, AVL_BEFORE);
  */
-extern void *avl_nearest(avl_tree_t *tree, avl_index_t where, int direction);
+_AVL_H void *avl_nearest(avl_tree_t *tree, avl_index_t where, int direction);
 
 
 /*
@@ -249,7 +249,7 @@ extern void *avl_nearest(avl_tree_t *tree, avl_index_t where, int direction);
  *
  * node   - the node to add
  */
-extern void avl_add(avl_tree_t *tree, void *node);
+_AVL_H void avl_add(avl_tree_t *tree, void *node);
 
 
 /*
@@ -257,7 +257,7 @@ extern void avl_add(avl_tree_t *tree, void *node);
  *
  * node   - the node to remove
  */
-extern void avl_remove(avl_tree_t *tree, void *node);
+_AVL_H void avl_remove(avl_tree_t *tree, void *node);
 
 /*
  * Reinsert a node only if its order has changed relative to its nearest
@@ -266,24 +266,24 @@ extern void avl_remove(avl_tree_t *tree, void *node);
  * avl_update_gt() only if you know the direction in which the order of the
  * node may change.
  */
-extern boolean_t avl_update(avl_tree_t *, void *);
-extern boolean_t avl_update_lt(avl_tree_t *, void *);
-extern boolean_t avl_update_gt(avl_tree_t *, void *);
+_AVL_H boolean_t avl_update(avl_tree_t *, void *);
+_AVL_H boolean_t avl_update_lt(avl_tree_t *, void *);
+_AVL_H boolean_t avl_update_gt(avl_tree_t *, void *);
 
 /*
  * Swaps the contents of the two trees.
  */
-extern void avl_swap(avl_tree_t *tree1, avl_tree_t *tree2);
+_AVL_H void avl_swap(avl_tree_t *tree1, avl_tree_t *tree2);
 
 /*
  * Return the number of nodes in the tree
  */
-extern ulong_t avl_numnodes(avl_tree_t *tree);
+_AVL_H ulong_t avl_numnodes(avl_tree_t *tree);
 
 /*
  * Return B_TRUE if there are zero nodes in the tree, B_FALSE otherwise.
  */
-extern boolean_t avl_is_empty(avl_tree_t *tree);
+_AVL_H boolean_t avl_is_empty(avl_tree_t *tree);
 
 /*
  * Used to destroy any remaining nodes in a tree. The cookie argument should
@@ -306,7 +306,7 @@ extern boolean_t avl_is_empty(avl_tree_t *tree);
  *		free(node);
  *	avl_destroy(tree);
  */
-extern void *avl_destroy_nodes(avl_tree_t *tree, void **cookie);
+_AVL_H void *avl_destroy_nodes(avl_tree_t *tree, void **cookie);
 
 
 /*
@@ -314,7 +314,7 @@ extern void *avl_destroy_nodes(avl_tree_t *tree, void **cookie);
  *
  * tree   - the empty tree to destroy
  */
-extern void avl_destroy(avl_tree_t *tree);
+_AVL_H void avl_destroy(avl_tree_t *tree);
 
 
 
diff --git a/include/sys/avl_impl.h b/include/sys/avl_impl.h
index fddf76906..f577ecd42 100644
--- a/include/sys/avl_impl.h
+++ b/include/sys/avl_impl.h
@@ -25,8 +25,7 @@
  */
 
 #ifndef	_AVL_IMPL_H
-#define	_AVL_IMPL_H
-
+#define	_AVL_IMPL_H extern __attribute__((visibility("default")))
 
 
 /*
@@ -155,7 +154,7 @@ struct avl_tree {
 /*
  * This will only by used via AVL_NEXT() or AVL_PREV()
  */
-extern void *avl_walk(struct avl_tree *, void *, int);
+_AVL_IMPL_H void *avl_walk(struct avl_tree *, void *, int);
 
 #ifdef	__cplusplus
 }
diff --git a/include/sys/efi_partition.h b/include/sys/efi_partition.h
index fbb58013e..cda2c98e5 100644
--- a/include/sys/efi_partition.h
+++ b/include/sys/efi_partition.h
@@ -24,7 +24,7 @@
  */
 
 #ifndef	_SYS_EFI_PARTITION_H
-#define	_SYS_EFI_PARTITION_H
+#define	_SYS_EFI_PARTITION_H extern __attribute__((visibility("default")))
 
 #include <sys/uuid.h>
 
@@ -363,14 +363,15 @@ struct partition64 {
 #endif
 
 #ifndef _KERNEL
-extern	int	efi_alloc_and_init(int, uint32_t, struct dk_gpt **);
-extern	int	efi_alloc_and_read(int, struct dk_gpt **);
-extern	int	efi_write(int, struct dk_gpt *);
-extern	int	efi_rescan(int);
-extern	void	efi_free(struct dk_gpt *);
-extern	int	efi_type(int);
-extern	void	efi_err_check(struct dk_gpt *);
-extern	int	efi_use_whole_disk(int fd);
+_SYS_EFI_PARTITION_H int efi_debug;
+_SYS_EFI_PARTITION_H int efi_alloc_and_init(int, uint32_t, struct dk_gpt **);
+_SYS_EFI_PARTITION_H int efi_alloc_and_read(int, struct dk_gpt **);
+_SYS_EFI_PARTITION_H int efi_write(int, struct dk_gpt *);
+_SYS_EFI_PARTITION_H int efi_rescan(int);
+_SYS_EFI_PARTITION_H void efi_free(struct dk_gpt *);
+_SYS_EFI_PARTITION_H int efi_type(int);
+_SYS_EFI_PARTITION_H void efi_err_check(struct dk_gpt *);
+_SYS_EFI_PARTITION_H int efi_use_whole_disk(int fd);
 #endif
 
 #ifdef __cplusplus
diff --git a/include/sys/nvpair.h b/include/sys/nvpair.h
index b0be8bd7a..76d383a3c 100644
--- a/include/sys/nvpair.h
+++ b/include/sys/nvpair.h
@@ -24,7 +24,7 @@
  */
 
 #ifndef	_SYS_NVPAIR_H
-#define	_SYS_NVPAIR_H
+#define	_SYS_NVPAIR_H extern __attribute__((visibility("default")))
 
 #include <sys/types.h>
 #include <sys/time.h>
@@ -135,221 +135,270 @@ struct nv_alloc_ops {
 	void (*nv_ao_reset)(nv_alloc_t *);
 };
 
-extern const nv_alloc_ops_t *nv_fixed_ops;
-extern nv_alloc_t *nv_alloc_nosleep;
+_SYS_NVPAIR_H const nv_alloc_ops_t *nv_fixed_ops;
+_SYS_NVPAIR_H nv_alloc_t *nv_alloc_nosleep;
 
 #if defined(_KERNEL)
-extern nv_alloc_t *nv_alloc_sleep;
-extern nv_alloc_t *nv_alloc_pushpage;
+_SYS_NVPAIR_H nv_alloc_t *nv_alloc_sleep;
+_SYS_NVPAIR_H nv_alloc_t *nv_alloc_pushpage;
 #endif
 
-int nv_alloc_init(nv_alloc_t *, const nv_alloc_ops_t *, /* args */ ...);
-void nv_alloc_reset(nv_alloc_t *);
-void nv_alloc_fini(nv_alloc_t *);
+_SYS_NVPAIR_H int nv_alloc_init(nv_alloc_t *, const nv_alloc_ops_t *,
+	/* args */ ...);
+_SYS_NVPAIR_H void nv_alloc_reset(nv_alloc_t *);
+_SYS_NVPAIR_H void nv_alloc_fini(nv_alloc_t *);
 
 /* list management */
-int nvlist_alloc(nvlist_t **, uint_t, int);
-void nvlist_free(nvlist_t *);
-int nvlist_size(nvlist_t *, size_t *, int);
-int nvlist_pack(nvlist_t *, char **, size_t *, int, int);
-int nvlist_unpack(char *, size_t, nvlist_t **, int);
-int nvlist_dup(nvlist_t *, nvlist_t **, int);
-int nvlist_merge(nvlist_t *, nvlist_t *, int);
-
-uint_t nvlist_nvflag(nvlist_t *);
-
-int nvlist_xalloc(nvlist_t **, uint_t, nv_alloc_t *);
-int nvlist_xpack(nvlist_t *, char **, size_t *, int, nv_alloc_t *);
-int nvlist_xunpack(char *, size_t, nvlist_t **, nv_alloc_t *);
-int nvlist_xdup(nvlist_t *, nvlist_t **, nv_alloc_t *);
-nv_alloc_t *nvlist_lookup_nv_alloc(nvlist_t *);
-
-int nvlist_add_nvpair(nvlist_t *, nvpair_t *);
-int nvlist_add_boolean(nvlist_t *, const char *);
-int nvlist_add_boolean_value(nvlist_t *, const char *, boolean_t);
-int nvlist_add_byte(nvlist_t *, const char *, uchar_t);
-int nvlist_add_int8(nvlist_t *, const char *, int8_t);
-int nvlist_add_uint8(nvlist_t *, const char *, uint8_t);
-int nvlist_add_int16(nvlist_t *, const char *, int16_t);
-int nvlist_add_uint16(nvlist_t *, const char *, uint16_t);
-int nvlist_add_int32(nvlist_t *, const char *, int32_t);
-int nvlist_add_uint32(nvlist_t *, const char *, uint32_t);
-int nvlist_add_int64(nvlist_t *, const char *, int64_t);
-int nvlist_add_uint64(nvlist_t *, const char *, uint64_t);
-int nvlist_add_string(nvlist_t *, const char *, const char *);
-int nvlist_add_nvlist(nvlist_t *, const char *, nvlist_t *);
-int nvlist_add_boolean_array(nvlist_t *, const char *, boolean_t *, uint_t);
-int nvlist_add_byte_array(nvlist_t *, const char *, uchar_t *, uint_t);
-int nvlist_add_int8_array(nvlist_t *, const char *, int8_t *, uint_t);
-int nvlist_add_uint8_array(nvlist_t *, const char *, uint8_t *, uint_t);
-int nvlist_add_int16_array(nvlist_t *, const char *, int16_t *, uint_t);
-int nvlist_add_uint16_array(nvlist_t *, const char *, uint16_t *, uint_t);
-int nvlist_add_int32_array(nvlist_t *, const char *, int32_t *, uint_t);
-int nvlist_add_uint32_array(nvlist_t *, const char *, uint32_t *, uint_t);
-int nvlist_add_int64_array(nvlist_t *, const char *, int64_t *, uint_t);
-int nvlist_add_uint64_array(nvlist_t *, const char *, uint64_t *, uint_t);
-int nvlist_add_string_array(nvlist_t *, const char *, char *const *, uint_t);
-int nvlist_add_nvlist_array(nvlist_t *, const char *, nvlist_t **, uint_t);
-int nvlist_add_hrtime(nvlist_t *, const char *, hrtime_t);
+_SYS_NVPAIR_H int nvlist_alloc(nvlist_t **, uint_t, int);
+_SYS_NVPAIR_H void nvlist_free(nvlist_t *);
+_SYS_NVPAIR_H int nvlist_size(nvlist_t *, size_t *, int);
+_SYS_NVPAIR_H int nvlist_pack(nvlist_t *, char **, size_t *, int, int);
+_SYS_NVPAIR_H int nvlist_unpack(char *, size_t, nvlist_t **, int);
+_SYS_NVPAIR_H int nvlist_dup(nvlist_t *, nvlist_t **, int);
+_SYS_NVPAIR_H int nvlist_merge(nvlist_t *, nvlist_t *, int);
+
+_SYS_NVPAIR_H uint_t nvlist_nvflag(nvlist_t *);
+
+_SYS_NVPAIR_H int nvlist_xalloc(nvlist_t **, uint_t, nv_alloc_t *);
+_SYS_NVPAIR_H int nvlist_xpack(nvlist_t *, char **, size_t *, int,
+    nv_alloc_t *);
+_SYS_NVPAIR_H int nvlist_xunpack(char *, size_t, nvlist_t **, nv_alloc_t *);
+_SYS_NVPAIR_H int nvlist_xdup(nvlist_t *, nvlist_t **, nv_alloc_t *);
+_SYS_NVPAIR_H nv_alloc_t *nvlist_lookup_nv_alloc(nvlist_t *);
+
+_SYS_NVPAIR_H int nvlist_add_nvpair(nvlist_t *, nvpair_t *);
+_SYS_NVPAIR_H int nvlist_add_boolean(nvlist_t *, const char *);
+_SYS_NVPAIR_H int nvlist_add_boolean_value(nvlist_t *, const char *, boolean_t);
+_SYS_NVPAIR_H int nvlist_add_byte(nvlist_t *, const char *, uchar_t);
+_SYS_NVPAIR_H int nvlist_add_int8(nvlist_t *, const char *, int8_t);
+_SYS_NVPAIR_H int nvlist_add_uint8(nvlist_t *, const char *, uint8_t);
+_SYS_NVPAIR_H int nvlist_add_int16(nvlist_t *, const char *, int16_t);
+_SYS_NVPAIR_H int nvlist_add_uint16(nvlist_t *, const char *, uint16_t);
+_SYS_NVPAIR_H int nvlist_add_int32(nvlist_t *, const char *, int32_t);
+_SYS_NVPAIR_H int nvlist_add_uint32(nvlist_t *, const char *, uint32_t);
+_SYS_NVPAIR_H int nvlist_add_int64(nvlist_t *, const char *, int64_t);
+_SYS_NVPAIR_H int nvlist_add_uint64(nvlist_t *, const char *, uint64_t);
+_SYS_NVPAIR_H int nvlist_add_string(nvlist_t *, const char *, const char *);
+_SYS_NVPAIR_H int nvlist_add_nvlist(nvlist_t *, const char *, nvlist_t *);
+_SYS_NVPAIR_H int nvlist_add_boolean_array(nvlist_t *, const char *,
+    boolean_t *, uint_t);
+_SYS_NVPAIR_H int nvlist_add_byte_array(nvlist_t *, const char *, uchar_t *,
+    uint_t);
+_SYS_NVPAIR_H int nvlist_add_int8_array(nvlist_t *, const char *, int8_t *,
+    uint_t);
+_SYS_NVPAIR_H int nvlist_add_uint8_array(nvlist_t *, const char *, uint8_t *,
+    uint_t);
+_SYS_NVPAIR_H int nvlist_add_int16_array(nvlist_t *, const char *, int16_t *,
+    uint_t);
+_SYS_NVPAIR_H int nvlist_add_uint16_array(nvlist_t *, const char *, uint16_t *,
+    uint_t);
+_SYS_NVPAIR_H int nvlist_add_int32_array(nvlist_t *, const char *, int32_t *,
+    uint_t);
+_SYS_NVPAIR_H int nvlist_add_uint32_array(nvlist_t *, const char *, uint32_t *,
+    uint_t);
+_SYS_NVPAIR_H int nvlist_add_int64_array(nvlist_t *, const char *, int64_t *,
+    uint_t);
+_SYS_NVPAIR_H int nvlist_add_uint64_array(nvlist_t *, const char *, uint64_t *,
+    uint_t);
+_SYS_NVPAIR_H int nvlist_add_string_array(nvlist_t *, const char *,
+    char * const *, uint_t);
+_SYS_NVPAIR_H int nvlist_add_nvlist_array(nvlist_t *, const char *,
+    nvlist_t **, uint_t);
+_SYS_NVPAIR_H int nvlist_add_hrtime(nvlist_t *, const char *, hrtime_t);
 #if !defined(_KERNEL) && !defined(_STANDALONE)
-int nvlist_add_double(nvlist_t *, const char *, double);
+_SYS_NVPAIR_H int nvlist_add_double(nvlist_t *, const char *, double);
 #endif
 
-int nvlist_remove(nvlist_t *, const char *, data_type_t);
-int nvlist_remove_all(nvlist_t *, const char *);
-int nvlist_remove_nvpair(nvlist_t *, nvpair_t *);
-
-int nvlist_lookup_boolean(nvlist_t *, const char *);
-int nvlist_lookup_boolean_value(nvlist_t *, const char *, boolean_t *);
-int nvlist_lookup_byte(nvlist_t *, const char *, uchar_t *);
-int nvlist_lookup_int8(nvlist_t *, const char *, int8_t *);
-int nvlist_lookup_uint8(nvlist_t *, const char *, uint8_t *);
-int nvlist_lookup_int16(nvlist_t *, const char *, int16_t *);
-int nvlist_lookup_uint16(nvlist_t *, const char *, uint16_t *);
-int nvlist_lookup_int32(nvlist_t *, const char *, int32_t *);
-int nvlist_lookup_uint32(nvlist_t *, const char *, uint32_t *);
-int nvlist_lookup_int64(nvlist_t *, const char *, int64_t *);
-int nvlist_lookup_uint64(nvlist_t *, const char *, uint64_t *);
-int nvlist_lookup_string(nvlist_t *, const char *, char **);
-int nvlist_lookup_nvlist(nvlist_t *, const char *, nvlist_t **);
-int nvlist_lookup_boolean_array(nvlist_t *, const char *,
+_SYS_NVPAIR_H int nvlist_remove(nvlist_t *, const char *, data_type_t);
+_SYS_NVPAIR_H int nvlist_remove_all(nvlist_t *, const char *);
+_SYS_NVPAIR_H int nvlist_remove_nvpair(nvlist_t *, nvpair_t *);
+
+_SYS_NVPAIR_H int nvlist_lookup_boolean(nvlist_t *, const char *);
+_SYS_NVPAIR_H int nvlist_lookup_boolean_value(nvlist_t *, const char *,
+    boolean_t *);
+_SYS_NVPAIR_H int nvlist_lookup_byte(nvlist_t *, const char *, uchar_t *);
+_SYS_NVPAIR_H int nvlist_lookup_int8(nvlist_t *, const char *, int8_t *);
+_SYS_NVPAIR_H int nvlist_lookup_uint8(nvlist_t *, const char *, uint8_t *);
+_SYS_NVPAIR_H int nvlist_lookup_int16(nvlist_t *, const char *, int16_t *);
+_SYS_NVPAIR_H int nvlist_lookup_uint16(nvlist_t *, const char *, uint16_t *);
+_SYS_NVPAIR_H int nvlist_lookup_int32(nvlist_t *, const char *, int32_t *);
+_SYS_NVPAIR_H int nvlist_lookup_uint32(nvlist_t *, const char *, uint32_t *);
+_SYS_NVPAIR_H int nvlist_lookup_int64(nvlist_t *, const char *, int64_t *);
+_SYS_NVPAIR_H int nvlist_lookup_uint64(nvlist_t *, const char *, uint64_t *);
+_SYS_NVPAIR_H int nvlist_lookup_string(nvlist_t *, const char *, char **);
+_SYS_NVPAIR_H int nvlist_lookup_nvlist(nvlist_t *, const char *, nvlist_t **);
+_SYS_NVPAIR_H int nvlist_lookup_boolean_array(nvlist_t *, const char *,
     boolean_t **, uint_t *);
-int nvlist_lookup_byte_array(nvlist_t *, const char *, uchar_t **, uint_t *);
-int nvlist_lookup_int8_array(nvlist_t *, const char *, int8_t **, uint_t *);
-int nvlist_lookup_uint8_array(nvlist_t *, const char *, uint8_t **, uint_t *);
-int nvlist_lookup_int16_array(nvlist_t *, const char *, int16_t **, uint_t *);
-int nvlist_lookup_uint16_array(nvlist_t *, const char *, uint16_t **, uint_t *);
-int nvlist_lookup_int32_array(nvlist_t *, const char *, int32_t **, uint_t *);
-int nvlist_lookup_uint32_array(nvlist_t *, const char *, uint32_t **, uint_t *);
-int nvlist_lookup_int64_array(nvlist_t *, const char *, int64_t **, uint_t *);
-int nvlist_lookup_uint64_array(nvlist_t *, const char *, uint64_t **, uint_t *);
-int nvlist_lookup_string_array(nvlist_t *, const char *, char ***, uint_t *);
-int nvlist_lookup_nvlist_array(nvlist_t *, const char *,
+_SYS_NVPAIR_H int nvlist_lookup_byte_array(nvlist_t *, const char *, uchar_t **,
+    uint_t *);
+_SYS_NVPAIR_H int nvlist_lookup_int8_array(nvlist_t *, const char *, int8_t **,
+    uint_t *);
+_SYS_NVPAIR_H int nvlist_lookup_uint8_array(nvlist_t *, const char *,
+    uint8_t **, uint_t *);
+_SYS_NVPAIR_H int nvlist_lookup_int16_array(nvlist_t *, const char *,
+    int16_t **, uint_t *);
+_SYS_NVPAIR_H int nvlist_lookup_uint16_array(nvlist_t *, const char *,
+    uint16_t **, uint_t *);
+_SYS_NVPAIR_H int nvlist_lookup_int32_array(nvlist_t *, const char *,
+    int32_t **, uint_t *);
+_SYS_NVPAIR_H int nvlist_lookup_uint32_array(nvlist_t *, const char *,
+    uint32_t **, uint_t *);
+_SYS_NVPAIR_H int nvlist_lookup_int64_array(nvlist_t *, const char *,
+    int64_t **, uint_t *);
+_SYS_NVPAIR_H int nvlist_lookup_uint64_array(nvlist_t *, const char *,
+    uint64_t **, uint_t *);
+_SYS_NVPAIR_H int nvlist_lookup_string_array(nvlist_t *, const char *,
+    char ***, uint_t *);
+_SYS_NVPAIR_H int nvlist_lookup_nvlist_array(nvlist_t *, const char *,
     nvlist_t ***, uint_t *);
-int nvlist_lookup_hrtime(nvlist_t *, const char *, hrtime_t *);
-int nvlist_lookup_pairs(nvlist_t *, int, ...);
+_SYS_NVPAIR_H int nvlist_lookup_hrtime(nvlist_t *, const char *, hrtime_t *);
+_SYS_NVPAIR_H int nvlist_lookup_pairs(nvlist_t *, int, ...);
 #if !defined(_KERNEL) && !defined(_STANDALONE)
-int nvlist_lookup_double(nvlist_t *, const char *, double *);
+_SYS_NVPAIR_H int nvlist_lookup_double(nvlist_t *, const char *, double *);
 #endif
 
-int nvlist_lookup_nvpair(nvlist_t *, const char *, nvpair_t **);
-int nvlist_lookup_nvpair_embedded_index(nvlist_t *, const char *, nvpair_t **,
-    int *, char **);
-boolean_t nvlist_exists(nvlist_t *, const char *);
-boolean_t nvlist_empty(nvlist_t *);
+_SYS_NVPAIR_H int nvlist_lookup_nvpair(nvlist_t *, const char *, nvpair_t **);
+_SYS_NVPAIR_H int nvlist_lookup_nvpair_embedded_index(nvlist_t *, const char *,
+    nvpair_t **, int *, char **);
+_SYS_NVPAIR_H boolean_t nvlist_exists(nvlist_t *, const char *);
+_SYS_NVPAIR_H boolean_t nvlist_empty(nvlist_t *);
 
 /* processing nvpair */
-nvpair_t *nvlist_next_nvpair(nvlist_t *, nvpair_t *);
-nvpair_t *nvlist_prev_nvpair(nvlist_t *, nvpair_t *);
-char *nvpair_name(nvpair_t *);
-data_type_t nvpair_type(nvpair_t *);
-int nvpair_type_is_array(nvpair_t *);
-int nvpair_value_boolean_value(nvpair_t *, boolean_t *);
-int nvpair_value_byte(nvpair_t *, uchar_t *);
-int nvpair_value_int8(nvpair_t *, int8_t *);
-int nvpair_value_uint8(nvpair_t *, uint8_t *);
-int nvpair_value_int16(nvpair_t *, int16_t *);
-int nvpair_value_uint16(nvpair_t *, uint16_t *);
-int nvpair_value_int32(nvpair_t *, int32_t *);
-int nvpair_value_uint32(nvpair_t *, uint32_t *);
-int nvpair_value_int64(nvpair_t *, int64_t *);
-int nvpair_value_uint64(nvpair_t *, uint64_t *);
-int nvpair_value_string(nvpair_t *, char **);
-int nvpair_value_nvlist(nvpair_t *, nvlist_t **);
-int nvpair_value_boolean_array(nvpair_t *, boolean_t **, uint_t *);
-int nvpair_value_byte_array(nvpair_t *, uchar_t **, uint_t *);
-int nvpair_value_int8_array(nvpair_t *, int8_t **, uint_t *);
-int nvpair_value_uint8_array(nvpair_t *, uint8_t **, uint_t *);
-int nvpair_value_int16_array(nvpair_t *, int16_t **, uint_t *);
-int nvpair_value_uint16_array(nvpair_t *, uint16_t **, uint_t *);
-int nvpair_value_int32_array(nvpair_t *, int32_t **, uint_t *);
-int nvpair_value_uint32_array(nvpair_t *, uint32_t **, uint_t *);
-int nvpair_value_int64_array(nvpair_t *, int64_t **, uint_t *);
-int nvpair_value_uint64_array(nvpair_t *, uint64_t **, uint_t *);
-int nvpair_value_string_array(nvpair_t *, char ***, uint_t *);
-int nvpair_value_nvlist_array(nvpair_t *, nvlist_t ***, uint_t *);
-int nvpair_value_hrtime(nvpair_t *, hrtime_t *);
+_SYS_NVPAIR_H nvpair_t *nvlist_next_nvpair(nvlist_t *, nvpair_t *);
+_SYS_NVPAIR_H nvpair_t *nvlist_prev_nvpair(nvlist_t *, nvpair_t *);
+_SYS_NVPAIR_H char *nvpair_name(nvpair_t *);
+_SYS_NVPAIR_H data_type_t nvpair_type(nvpair_t *);
+_SYS_NVPAIR_H int nvpair_type_is_array(nvpair_t *);
+_SYS_NVPAIR_H int nvpair_value_boolean_value(nvpair_t *, boolean_t *);
+_SYS_NVPAIR_H int nvpair_value_byte(nvpair_t *, uchar_t *);
+_SYS_NVPAIR_H int nvpair_value_int8(nvpair_t *, int8_t *);
+_SYS_NVPAIR_H int nvpair_value_uint8(nvpair_t *, uint8_t *);
+_SYS_NVPAIR_H int nvpair_value_int16(nvpair_t *, int16_t *);
+_SYS_NVPAIR_H int nvpair_value_uint16(nvpair_t *, uint16_t *);
+_SYS_NVPAIR_H int nvpair_value_int32(nvpair_t *, int32_t *);
+_SYS_NVPAIR_H int nvpair_value_uint32(nvpair_t *, uint32_t *);
+_SYS_NVPAIR_H int nvpair_value_int64(nvpair_t *, int64_t *);
+_SYS_NVPAIR_H int nvpair_value_uint64(nvpair_t *, uint64_t *);
+_SYS_NVPAIR_H int nvpair_value_string(nvpair_t *, char **);
+_SYS_NVPAIR_H int nvpair_value_nvlist(nvpair_t *, nvlist_t **);
+_SYS_NVPAIR_H int nvpair_value_boolean_array(nvpair_t *, boolean_t **,
+    uint_t *);
+_SYS_NVPAIR_H int nvpair_value_byte_array(nvpair_t *, uchar_t **, uint_t *);
+_SYS_NVPAIR_H int nvpair_value_int8_array(nvpair_t *, int8_t **, uint_t *);
+_SYS_NVPAIR_H int nvpair_value_uint8_array(nvpair_t *, uint8_t **, uint_t *);
+_SYS_NVPAIR_H int nvpair_value_int16_array(nvpair_t *, int16_t **, uint_t *);
+_SYS_NVPAIR_H int nvpair_value_uint16_array(nvpair_t *, uint16_t **, uint_t *);
+_SYS_NVPAIR_H int nvpair_value_int32_array(nvpair_t *, int32_t **, uint_t *);
+_SYS_NVPAIR_H int nvpair_value_uint32_array(nvpair_t *, uint32_t **, uint_t *);
+_SYS_NVPAIR_H int nvpair_value_int64_array(nvpair_t *, int64_t **, uint_t *);
+_SYS_NVPAIR_H int nvpair_value_uint64_array(nvpair_t *, uint64_t **, uint_t *);
+_SYS_NVPAIR_H int nvpair_value_string_array(nvpair_t *, char ***, uint_t *);
+_SYS_NVPAIR_H int nvpair_value_nvlist_array(nvpair_t *, nvlist_t ***, uint_t *);
+_SYS_NVPAIR_H int nvpair_value_hrtime(nvpair_t *, hrtime_t *);
 #if !defined(_KERNEL) && !defined(_STANDALONE)
-int nvpair_value_double(nvpair_t *, double *);
+_SYS_NVPAIR_H int nvpair_value_double(nvpair_t *, double *);
 #endif
 
-nvlist_t *fnvlist_alloc(void);
-void fnvlist_free(nvlist_t *);
-size_t fnvlist_size(nvlist_t *);
-char *fnvlist_pack(nvlist_t *, size_t *);
-void fnvlist_pack_free(char *, size_t);
-nvlist_t *fnvlist_unpack(char *, size_t);
-nvlist_t *fnvlist_dup(nvlist_t *);
-void fnvlist_merge(nvlist_t *, nvlist_t *);
-size_t fnvlist_num_pairs(nvlist_t *);
-
-void fnvlist_add_boolean(nvlist_t *, const char *);
-void fnvlist_add_boolean_value(nvlist_t *, const char *, boolean_t);
-void fnvlist_add_byte(nvlist_t *, const char *, uchar_t);
-void fnvlist_add_int8(nvlist_t *, const char *, int8_t);
-void fnvlist_add_uint8(nvlist_t *, const char *, uint8_t);
-void fnvlist_add_int16(nvlist_t *, const char *, int16_t);
-void fnvlist_add_uint16(nvlist_t *, const char *, uint16_t);
-void fnvlist_add_int32(nvlist_t *, const char *, int32_t);
-void fnvlist_add_uint32(nvlist_t *, const char *, uint32_t);
-void fnvlist_add_int64(nvlist_t *, const char *, int64_t);
-void fnvlist_add_uint64(nvlist_t *, const char *, uint64_t);
-void fnvlist_add_string(nvlist_t *, const char *, const char *);
-void fnvlist_add_nvlist(nvlist_t *, const char *, nvlist_t *);
-void fnvlist_add_nvpair(nvlist_t *, nvpair_t *);
-void fnvlist_add_boolean_array(nvlist_t *, const char *, boolean_t *, uint_t);
-void fnvlist_add_byte_array(nvlist_t *, const char *, uchar_t *, uint_t);
-void fnvlist_add_int8_array(nvlist_t *, const char *, int8_t *, uint_t);
-void fnvlist_add_uint8_array(nvlist_t *, const char *, uint8_t *, uint_t);
-void fnvlist_add_int16_array(nvlist_t *, const char *, int16_t *, uint_t);
-void fnvlist_add_uint16_array(nvlist_t *, const char *, uint16_t *, uint_t);
-void fnvlist_add_int32_array(nvlist_t *, const char *, int32_t *, uint_t);
-void fnvlist_add_uint32_array(nvlist_t *, const char *, uint32_t *, uint_t);
-void fnvlist_add_int64_array(nvlist_t *, const char *, int64_t *, uint_t);
-void fnvlist_add_uint64_array(nvlist_t *, const char *, uint64_t *, uint_t);
-void fnvlist_add_string_array(nvlist_t *, const char *, char * const *, uint_t);
-void fnvlist_add_nvlist_array(nvlist_t *, const char *, nvlist_t **, uint_t);
-
-void fnvlist_remove(nvlist_t *, const char *);
-void fnvlist_remove_nvpair(nvlist_t *, nvpair_t *);
-
-nvpair_t *fnvlist_lookup_nvpair(nvlist_t *, const char *);
-boolean_t fnvlist_lookup_boolean(nvlist_t *, const char *);
-boolean_t fnvlist_lookup_boolean_value(nvlist_t *, const char *);
-uchar_t fnvlist_lookup_byte(nvlist_t *, const char *);
-int8_t fnvlist_lookup_int8(nvlist_t *, const char *);
-int16_t fnvlist_lookup_int16(nvlist_t *, const char *);
-int32_t fnvlist_lookup_int32(nvlist_t *, const char *);
-int64_t fnvlist_lookup_int64(nvlist_t *, const char *);
-uint8_t fnvlist_lookup_uint8(nvlist_t *, const char *);
-uint16_t fnvlist_lookup_uint16(nvlist_t *, const char *);
-uint32_t fnvlist_lookup_uint32(nvlist_t *, const char *);
-uint64_t fnvlist_lookup_uint64(nvlist_t *, const char *);
-char *fnvlist_lookup_string(nvlist_t *, const char *);
-nvlist_t *fnvlist_lookup_nvlist(nvlist_t *, const char *);
-boolean_t *fnvlist_lookup_boolean_array(nvlist_t *, const char *, uint_t *);
-uchar_t *fnvlist_lookup_byte_array(nvlist_t *, const char *, uint_t *);
-int8_t *fnvlist_lookup_int8_array(nvlist_t *, const char *, uint_t *);
-uint8_t *fnvlist_lookup_uint8_array(nvlist_t *, const char *, uint_t *);
-int16_t *fnvlist_lookup_int16_array(nvlist_t *, const char *, uint_t *);
-uint16_t *fnvlist_lookup_uint16_array(nvlist_t *, const char *, uint_t *);
-int32_t *fnvlist_lookup_int32_array(nvlist_t *, const char *, uint_t *);
-uint32_t *fnvlist_lookup_uint32_array(nvlist_t *, const char *, uint_t *);
-int64_t *fnvlist_lookup_int64_array(nvlist_t *, const char *, uint_t *);
-uint64_t *fnvlist_lookup_uint64_array(nvlist_t *, const char *, uint_t *);
-
-boolean_t fnvpair_value_boolean_value(nvpair_t *nvp);
-uchar_t fnvpair_value_byte(nvpair_t *nvp);
-int8_t fnvpair_value_int8(nvpair_t *nvp);
-int16_t fnvpair_value_int16(nvpair_t *nvp);
-int32_t fnvpair_value_int32(nvpair_t *nvp);
-int64_t fnvpair_value_int64(nvpair_t *nvp);
-uint8_t fnvpair_value_uint8(nvpair_t *nvp);
-uint16_t fnvpair_value_uint16(nvpair_t *nvp);
-uint32_t fnvpair_value_uint32(nvpair_t *nvp);
-uint64_t fnvpair_value_uint64(nvpair_t *nvp);
-char *fnvpair_value_string(nvpair_t *nvp);
-nvlist_t *fnvpair_value_nvlist(nvpair_t *nvp);
+_SYS_NVPAIR_H nvlist_t *fnvlist_alloc(void);
+_SYS_NVPAIR_H void fnvlist_free(nvlist_t *);
+_SYS_NVPAIR_H size_t fnvlist_size(nvlist_t *);
+_SYS_NVPAIR_H char *fnvlist_pack(nvlist_t *, size_t *);
+_SYS_NVPAIR_H void fnvlist_pack_free(char *, size_t);
+_SYS_NVPAIR_H nvlist_t *fnvlist_unpack(char *, size_t);
+_SYS_NVPAIR_H nvlist_t *fnvlist_dup(nvlist_t *);
+_SYS_NVPAIR_H void fnvlist_merge(nvlist_t *, nvlist_t *);
+_SYS_NVPAIR_H size_t fnvlist_num_pairs(nvlist_t *);
+
+_SYS_NVPAIR_H void fnvlist_add_boolean(nvlist_t *, const char *);
+_SYS_NVPAIR_H void fnvlist_add_boolean_value(nvlist_t *, const char *,
+    boolean_t);
+_SYS_NVPAIR_H void fnvlist_add_byte(nvlist_t *, const char *, uchar_t);
+_SYS_NVPAIR_H void fnvlist_add_int8(nvlist_t *, const char *, int8_t);
+_SYS_NVPAIR_H void fnvlist_add_uint8(nvlist_t *, const char *, uint8_t);
+_SYS_NVPAIR_H void fnvlist_add_int16(nvlist_t *, const char *, int16_t);
+_SYS_NVPAIR_H void fnvlist_add_uint16(nvlist_t *, const char *, uint16_t);
+_SYS_NVPAIR_H void fnvlist_add_int32(nvlist_t *, const char *, int32_t);
+_SYS_NVPAIR_H void fnvlist_add_uint32(nvlist_t *, const char *, uint32_t);
+_SYS_NVPAIR_H void fnvlist_add_int64(nvlist_t *, const char *, int64_t);
+_SYS_NVPAIR_H void fnvlist_add_uint64(nvlist_t *, const char *, uint64_t);
+_SYS_NVPAIR_H void fnvlist_add_string(nvlist_t *, const char *, const char *);
+_SYS_NVPAIR_H void fnvlist_add_nvlist(nvlist_t *, const char *, nvlist_t *);
+_SYS_NVPAIR_H void fnvlist_add_nvpair(nvlist_t *, nvpair_t *);
+_SYS_NVPAIR_H void fnvlist_add_boolean_array(nvlist_t *, const char *,
+    boolean_t *, uint_t);
+_SYS_NVPAIR_H void fnvlist_add_byte_array(nvlist_t *, const char *, uchar_t *,
+    uint_t);
+_SYS_NVPAIR_H void fnvlist_add_int8_array(nvlist_t *, const char *, int8_t *,
+    uint_t);
+_SYS_NVPAIR_H void fnvlist_add_uint8_array(nvlist_t *, const char *, uint8_t *,
+    uint_t);
+_SYS_NVPAIR_H void fnvlist_add_int16_array(nvlist_t *, const char *, int16_t *,
+    uint_t);
+_SYS_NVPAIR_H void fnvlist_add_uint16_array(nvlist_t *, const char *,
+    uint16_t *, uint_t);
+_SYS_NVPAIR_H void fnvlist_add_int32_array(nvlist_t *, const char *, int32_t *,
+    uint_t);
+_SYS_NVPAIR_H void fnvlist_add_uint32_array(nvlist_t *, const char *,
+    uint32_t *, uint_t);
+_SYS_NVPAIR_H void fnvlist_add_int64_array(nvlist_t *, const char *, int64_t *,
+    uint_t);
+_SYS_NVPAIR_H void fnvlist_add_uint64_array(nvlist_t *, const char *,
+    uint64_t *, uint_t);
+_SYS_NVPAIR_H void fnvlist_add_string_array(nvlist_t *, const char *,
+    char * const *, uint_t);
+_SYS_NVPAIR_H void fnvlist_add_nvlist_array(nvlist_t *, const char *,
+    nvlist_t **, uint_t);
+
+_SYS_NVPAIR_H void fnvlist_remove(nvlist_t *, const char *);
+_SYS_NVPAIR_H void fnvlist_remove_nvpair(nvlist_t *, nvpair_t *);
+
+_SYS_NVPAIR_H nvpair_t *fnvlist_lookup_nvpair(nvlist_t *, const char *);
+_SYS_NVPAIR_H boolean_t fnvlist_lookup_boolean(nvlist_t *, const char *);
+_SYS_NVPAIR_H boolean_t fnvlist_lookup_boolean_value(nvlist_t *, const char *);
+_SYS_NVPAIR_H uchar_t fnvlist_lookup_byte(nvlist_t *, const char *);
+_SYS_NVPAIR_H int8_t fnvlist_lookup_int8(nvlist_t *, const char *);
+_SYS_NVPAIR_H int16_t fnvlist_lookup_int16(nvlist_t *, const char *);
+_SYS_NVPAIR_H int32_t fnvlist_lookup_int32(nvlist_t *, const char *);
+_SYS_NVPAIR_H int64_t fnvlist_lookup_int64(nvlist_t *, const char *);
+_SYS_NVPAIR_H uint8_t fnvlist_lookup_uint8(nvlist_t *, const char *);
+_SYS_NVPAIR_H uint16_t fnvlist_lookup_uint16(nvlist_t *, const char *);
+_SYS_NVPAIR_H uint32_t fnvlist_lookup_uint32(nvlist_t *, const char *);
+_SYS_NVPAIR_H uint64_t fnvlist_lookup_uint64(nvlist_t *, const char *);
+_SYS_NVPAIR_H char *fnvlist_lookup_string(nvlist_t *, const char *);
+_SYS_NVPAIR_H nvlist_t *fnvlist_lookup_nvlist(nvlist_t *, const char *);
+_SYS_NVPAIR_H boolean_t *fnvlist_lookup_boolean_array(nvlist_t *, const char *,
+    uint_t *);
+_SYS_NVPAIR_H uchar_t *fnvlist_lookup_byte_array(nvlist_t *, const char *,
+    uint_t *);
+_SYS_NVPAIR_H int8_t *fnvlist_lookup_int8_array(nvlist_t *, const char *,
+    uint_t *);
+_SYS_NVPAIR_H uint8_t *fnvlist_lookup_uint8_array(nvlist_t *, const char *,
+    uint_t *);
+_SYS_NVPAIR_H int16_t *fnvlist_lookup_int16_array(nvlist_t *, const char *,
+    uint_t *);
+_SYS_NVPAIR_H uint16_t *fnvlist_lookup_uint16_array(nvlist_t *, const char *,
+    uint_t *);
+_SYS_NVPAIR_H int32_t *fnvlist_lookup_int32_array(nvlist_t *, const char *,
+    uint_t *);
+_SYS_NVPAIR_H uint32_t *fnvlist_lookup_uint32_array(nvlist_t *, const char *,
+    uint_t *);
+_SYS_NVPAIR_H int64_t *fnvlist_lookup_int64_array(nvlist_t *, const char *,
+    uint_t *);
+_SYS_NVPAIR_H uint64_t *fnvlist_lookup_uint64_array(nvlist_t *, const char *,
+    uint_t *);
+
+_SYS_NVPAIR_H boolean_t fnvpair_value_boolean_value(nvpair_t *nvp);
+_SYS_NVPAIR_H uchar_t fnvpair_value_byte(nvpair_t *nvp);
+_SYS_NVPAIR_H int8_t fnvpair_value_int8(nvpair_t *nvp);
+_SYS_NVPAIR_H int16_t fnvpair_value_int16(nvpair_t *nvp);
+_SYS_NVPAIR_H int32_t fnvpair_value_int32(nvpair_t *nvp);
+_SYS_NVPAIR_H int64_t fnvpair_value_int64(nvpair_t *nvp);
+_SYS_NVPAIR_H uint8_t fnvpair_value_uint8(nvpair_t *nvp);
+_SYS_NVPAIR_H uint16_t fnvpair_value_uint16(nvpair_t *nvp);
+_SYS_NVPAIR_H uint32_t fnvpair_value_uint32(nvpair_t *nvp);
+_SYS_NVPAIR_H uint64_t fnvpair_value_uint64(nvpair_t *nvp);
+_SYS_NVPAIR_H char *fnvpair_value_string(nvpair_t *nvp);
+_SYS_NVPAIR_H nvlist_t *fnvpair_value_nvlist(nvpair_t *nvp);
 
 #ifdef	__cplusplus
 }
diff --git a/include/thread_pool.h b/include/thread_pool.h
index 57266f11c..43090c3c6 100644
--- a/include/thread_pool.h
+++ b/include/thread_pool.h
@@ -25,7 +25,7 @@
  */
 
 #ifndef	_THREAD_POOL_H_
-#define	_THREAD_POOL_H_
+#define	_THREAD_POOL_H_ extern __attribute__((visibility("default")))
 
 #include <sys/types.h>
 #include <thread.h>
@@ -37,33 +37,17 @@ extern "C" {
 
 typedef	struct tpool tpool_t;	/* opaque thread pool descriptor */
 
-#if defined(__STDC__)
-
-extern	tpool_t	*tpool_create(uint_t min_threads, uint_t max_threads,
+_THREAD_POOL_H_ tpool_t	*tpool_create(uint_t min_threads, uint_t max_threads,
 			uint_t linger, pthread_attr_t *attr);
-extern	int	tpool_dispatch(tpool_t *tpool,
+_THREAD_POOL_H_ int	tpool_dispatch(tpool_t *tpool,
 			void (*func)(void *), void *arg);
-extern	void	tpool_destroy(tpool_t *tpool);
-extern	void	tpool_abandon(tpool_t *tpool);
-extern	void	tpool_wait(tpool_t *tpool);
-extern	void	tpool_suspend(tpool_t *tpool);
-extern	int	tpool_suspended(tpool_t *tpool);
-extern	void	tpool_resume(tpool_t *tpool);
-extern	int	tpool_member(tpool_t *tpool);
-
-#else	/* Non ANSI */
-
-extern	tpool_t	*tpool_create();
-extern	int	tpool_dispatch();
-extern	void	tpool_destroy();
-extern	void	tpool_abandon();
-extern	void	tpool_wait();
-extern	void	tpool_suspend();
-extern	int	tpool_suspended();
-extern	void	tpool_resume();
-extern	int	tpool_member();
-
-#endif	/* __STDC__ */
+_THREAD_POOL_H_ void	tpool_destroy(tpool_t *tpool);
+_THREAD_POOL_H_ void	tpool_abandon(tpool_t *tpool);
+_THREAD_POOL_H_ void	tpool_wait(tpool_t *tpool);
+_THREAD_POOL_H_ void	tpool_suspend(tpool_t *tpool);
+_THREAD_POOL_H_ int	tpool_suspended(tpool_t *tpool);
+_THREAD_POOL_H_ void	tpool_resume(tpool_t *tpool);
+_THREAD_POOL_H_ int	tpool_member(tpool_t *tpool);
 
 #ifdef	__cplusplus
 }
diff --git a/lib/libavl/Makefile.am b/lib/libavl/Makefile.am
index 2e0a431c7..3166febd0 100644
--- a/lib/libavl/Makefile.am
+++ b/lib/libavl/Makefile.am
@@ -4,6 +4,7 @@ VPATH = $(top_srcdir)/module/avl/
 
 # Includes kernel code, generate warnings for large stack frames
 AM_CFLAGS += $(FRAME_LARGER_THAN)
+AM_CFLAGS += -fvisibility=hidden
 
 noinst_LTLIBRARIES = libavl.la
 
diff --git a/lib/libefi/Makefile.am b/lib/libefi/Makefile.am
index b26f7a6dc..580319a31 100644
--- a/lib/libefi/Makefile.am
+++ b/lib/libefi/Makefile.am
@@ -1,6 +1,7 @@
 include $(top_srcdir)/config/Rules.am
 
 AM_CFLAGS += $(LIBUUID_CFLAGS) $(ZLIB_CFLAGS)
+AM_CFLAGS += -fvisibility=hidden
 
 noinst_LTLIBRARIES = libefi.la
 
diff --git a/lib/libefi/rdwr_efi.c b/lib/libefi/rdwr_efi.c
index 39b3509a5..fd243e230 100644
--- a/lib/libefi/rdwr_efi.c
+++ b/lib/libefi/rdwr_efi.c
@@ -140,40 +140,6 @@ static struct uuid_to_ptag {
 	{ EFI_FREEDESKTOP_BOOT }
 };
 
-/*
- * Default vtoc information for non-SVr4 partitions
- */
-struct dk_map2  default_vtoc_map[NDKMAP] = {
-	{	V_ROOT,		0	},		/* a - 0 */
-	{	V_SWAP,		V_UNMNT	},		/* b - 1 */
-	{	V_BACKUP,	V_UNMNT	},		/* c - 2 */
-	{	V_UNASSIGNED,	0	},		/* d - 3 */
-	{	V_UNASSIGNED,	0	},		/* e - 4 */
-	{	V_UNASSIGNED,	0	},		/* f - 5 */
-	{	V_USR,		0	},		/* g - 6 */
-	{	V_UNASSIGNED,	0	},		/* h - 7 */
-
-#if defined(_SUNOS_VTOC_16)
-
-#if defined(i386) || defined(__amd64) || defined(__arm) || \
-    defined(__powerpc) || defined(__sparc) || defined(__s390__) || \
-    defined(__mips__) || defined(__rv64g__)
-	{	V_BOOT,		V_UNMNT	},		/* i - 8 */
-	{	V_ALTSCTR,	0	},		/* j - 9 */
-
-#else
-#error No VTOC format defined.
-#endif			/* defined(i386) */
-
-	{	V_UNASSIGNED,	0	},		/* k - 10 */
-	{	V_UNASSIGNED,	0	},		/* l - 11 */
-	{	V_UNASSIGNED,	0	},		/* m - 12 */
-	{	V_UNASSIGNED,	0	},		/* n - 13 */
-	{	V_UNASSIGNED,	0	},		/* o - 14 */
-	{	V_UNASSIGNED,	0	},		/* p - 15 */
-#endif			/* defined(_SUNOS_VTOC_16) */
-};
-
 int efi_debug = 0;
 
 static int efi_read(int, struct dk_gpt *);
diff --git a/lib/libnvpair/Makefile.am b/lib/libnvpair/Makefile.am
index a3e1fa307..7b9ebebe7 100644
--- a/lib/libnvpair/Makefile.am
+++ b/lib/libnvpair/Makefile.am
@@ -7,6 +7,7 @@ VPATH = \
 # Includes kernel code, generate warnings for large stack frames
 # and required CFLAGS for libtirpc
 AM_CFLAGS += $(FRAME_LARGER_THAN) $(LIBTIRPC_CFLAGS)
+AM_CFLAGS += -fvisibility=hidden
 
 lib_LTLIBRARIES = libnvpair.la
 
diff --git a/lib/libnvpair/libnvpair.abi b/lib/libnvpair/libnvpair.abi
index 697a67b7f..8c503fecd 100644
--- a/lib/libnvpair/libnvpair.abi
+++ b/lib/libnvpair/libnvpair.abi
@@ -232,132 +232,126 @@
   <elf-variable-symbols>
     <elf-symbol name='libspl_assert_ok' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='nv_alloc_nosleep' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='nv_alloc_nosleep_def' size='16' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='nv_alloc_sleep' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='nv_alloc_sleep_def' size='16' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='nv_fixed_ops' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='nv_fixed_ops_def' size='40' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='nvlist_hashtable_init_size' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='nvpair_max_recursion' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
-  <abi-instr version='1.0' address-size='64' path='libnvpair.c' comp-dir-path='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair' language='LANG_C99'>
+  <abi-instr version='1.0' address-size='64' path='libnvpair.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libnvpair' language='LANG_C99'>
     <type-decl name='void' id='type-id-1'/>
-    <class-decl name='nvlist_prtctl' size-in-bits='576' is-struct='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='91' column='1' id='type-id-2'>
+    <class-decl name='nvlist_prtctl' size-in-bits='576' is-struct='yes' visibility='default' id='type-id-2'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='nvprt_fp' type-id='type-id-3' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='92' column='1'/>
+        <var-decl name='nvprt_fp' type-id='type-id-3' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='nvprt_indent_mode' type-id='type-id-4' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='93' column='1'/>
+        <var-decl name='nvprt_indent_mode' type-id='type-id-4' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='nvprt_indent' type-id='type-id-5' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='94' column='1'/>
+        <var-decl name='nvprt_indent' type-id='type-id-5' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='nvprt_indentinc' type-id='type-id-5' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='95' column='1'/>
+        <var-decl name='nvprt_indentinc' type-id='type-id-5' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='nvprt_nmfmt' type-id='type-id-6' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='96' column='1'/>
+        <var-decl name='nvprt_nmfmt' type-id='type-id-6' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='nvprt_eomfmt' type-id='type-id-6' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='97' column='1'/>
+        <var-decl name='nvprt_eomfmt' type-id='type-id-6' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='nvprt_btwnarrfmt' type-id='type-id-6' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='98' column='1'/>
+        <var-decl name='nvprt_btwnarrfmt' type-id='type-id-6' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='nvprt_btwnarrfmt_nl' type-id='type-id-5' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='99' column='1'/>
+        <var-decl name='nvprt_btwnarrfmt_nl' type-id='type-id-5' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='nvprt_dfltops' type-id='type-id-7' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='100' column='1'/>
+        <var-decl name='nvprt_dfltops' type-id='type-id-7' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='nvprt_custops' type-id='type-id-7' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='101' column='1'/>
+        <var-decl name='nvprt_custops' type-id='type-id-7' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='_IO_FILE' size-in-bits='1728' is-struct='yes' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='49' column='1' id='type-id-8'>
+    <class-decl name='_IO_FILE' size-in-bits='1728' is-struct='yes' visibility='default' id='type-id-8'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='_flags' type-id='type-id-5' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='51' column='1'/>
+        <var-decl name='_flags' type-id='type-id-5' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='_IO_read_ptr' type-id='type-id-9' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='54' column='1'/>
+        <var-decl name='_IO_read_ptr' type-id='type-id-9' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='_IO_read_end' type-id='type-id-9' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='55' column='1'/>
+        <var-decl name='_IO_read_end' type-id='type-id-9' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='_IO_read_base' type-id='type-id-9' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='56' column='1'/>
+        <var-decl name='_IO_read_base' type-id='type-id-9' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='_IO_write_base' type-id='type-id-9' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='57' column='1'/>
+        <var-decl name='_IO_write_base' type-id='type-id-9' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='_IO_write_ptr' type-id='type-id-9' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='58' column='1'/>
+        <var-decl name='_IO_write_ptr' type-id='type-id-9' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='_IO_write_end' type-id='type-id-9' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='59' column='1'/>
+        <var-decl name='_IO_write_end' type-id='type-id-9' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='_IO_buf_base' type-id='type-id-9' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='60' column='1'/>
+        <var-decl name='_IO_buf_base' type-id='type-id-9' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='_IO_buf_end' type-id='type-id-9' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='61' column='1'/>
+        <var-decl name='_IO_buf_end' type-id='type-id-9' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='_IO_save_base' type-id='type-id-9' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='64' column='1'/>
+        <var-decl name='_IO_save_base' type-id='type-id-9' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='_IO_backup_base' type-id='type-id-9' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='65' column='1'/>
+        <var-decl name='_IO_backup_base' type-id='type-id-9' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='_IO_save_end' type-id='type-id-9' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='66' column='1'/>
+        <var-decl name='_IO_save_end' type-id='type-id-9' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='_markers' type-id='type-id-10' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='68' column='1'/>
+        <var-decl name='_markers' type-id='type-id-10' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='_chain' type-id='type-id-11' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='70' column='1'/>
+        <var-decl name='_chain' type-id='type-id-11' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='_fileno' type-id='type-id-5' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='72' column='1'/>
+        <var-decl name='_fileno' type-id='type-id-5' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='928'>
-        <var-decl name='_flags2' type-id='type-id-5' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='73' column='1'/>
+        <var-decl name='_flags2' type-id='type-id-5' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='_old_offset' type-id='type-id-12' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='74' column='1'/>
+        <var-decl name='_old_offset' type-id='type-id-12' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='_cur_column' type-id='type-id-13' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='77' column='1'/>
+        <var-decl name='_cur_column' type-id='type-id-13' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1040'>
-        <var-decl name='_vtable_offset' type-id='type-id-14' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='78' column='1'/>
+        <var-decl name='_vtable_offset' type-id='type-id-14' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1048'>
-        <var-decl name='_shortbuf' type-id='type-id-15' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='79' column='1'/>
+        <var-decl name='_shortbuf' type-id='type-id-15' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='_offset' type-id='type-id-16' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='89' column='1'/>
+        <var-decl name='_offset' type-id='type-id-16' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='_codecvt' type-id='type-id-17' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='91' column='1'/>
+        <var-decl name='_codecvt' type-id='type-id-17' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='_wide_data' type-id='type-id-18' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='92' column='1'/>
+        <var-decl name='_wide_data' type-id='type-id-18' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='_freeres_list' type-id='type-id-11' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='93' column='1'/>
+        <var-decl name='_freeres_list' type-id='type-id-11' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='_freeres_buf' type-id='type-id-19' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='94' column='1'/>
+        <var-decl name='_freeres_buf' type-id='type-id-19' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1472'>
-        <var-decl name='__pad5' type-id='type-id-20' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='95' column='1'/>
+        <var-decl name='__pad5' type-id='type-id-20' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='_mode' type-id='type-id-5' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='96' column='1'/>
+        <var-decl name='_mode' type-id='type-id-5' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1568'>
-        <var-decl name='_unused2' type-id='type-id-21' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/struct_FILE.h' line='98' column='1'/>
+        <var-decl name='_unused2' type-id='type-id-21' visibility='default'/>
       </data-member>
     </class-decl>
     <type-decl name='int' size-in-bits='32' id='type-id-5'/>
@@ -367,7 +361,7 @@
     <pointer-type-def type-id='type-id-23' size-in-bits='64' id='type-id-10'/>
     <pointer-type-def type-id='type-id-8' size-in-bits='64' id='type-id-11'/>
     <type-decl name='long int' size-in-bits='64' id='type-id-24'/>
-    <typedef-decl name='__off_t' type-id='type-id-24' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='150' column='1' id='type-id-12'/>
+    <typedef-decl name='__off_t' type-id='type-id-24' id='type-id-12'/>
     <type-decl name='unsigned short int' size-in-bits='16' id='type-id-13'/>
     <type-decl name='signed char' size-in-bits='8' id='type-id-14'/>
     <type-decl name='__ARRAY_SIZE_TYPE__' size-in-bits='64' id='type-id-25'/>
@@ -376,677 +370,677 @@
       <subrange length='1' type-id='type-id-25' id='type-id-26'/>
 
     </array-type-def>
-    <typedef-decl name='__off64_t' type-id='type-id-24' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='151' column='1' id='type-id-16'/>
+    <typedef-decl name='__off64_t' type-id='type-id-24' id='type-id-16'/>
     <class-decl name='_IO_codecvt' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-27'/>
     <pointer-type-def type-id='type-id-27' size-in-bits='64' id='type-id-17'/>
     <class-decl name='_IO_wide_data' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-28'/>
     <pointer-type-def type-id='type-id-28' size-in-bits='64' id='type-id-18'/>
     <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-19'/>
     <type-decl name='unsigned long int' size-in-bits='64' id='type-id-29'/>
-    <typedef-decl name='size_t' type-id='type-id-29' filepath='/usr/lib/llvm-13/lib/clang/13.0.0/include/stddef.h' line='46' column='1' id='type-id-20'/>
+    <typedef-decl name='size_t' type-id='type-id-29' id='type-id-20'/>
 
     <array-type-def dimensions='1' type-id='type-id-22' size-in-bits='160' id='type-id-21'>
       <subrange length='20' type-id='type-id-25' id='type-id-30'/>
 
     </array-type-def>
-    <typedef-decl name='FILE' type-id='type-id-8' filepath='/usr/include/x86_64-linux-gnu/bits/types/FILE.h' line='7' column='1' id='type-id-31'/>
+    <typedef-decl name='FILE' type-id='type-id-8' id='type-id-31'/>
     <pointer-type-def type-id='type-id-31' size-in-bits='64' id='type-id-3'/>
     <type-decl name='unnamed-enum-underlying-type' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='type-id-32'/>
-    <enum-decl name='nvlist_indent_mode' filepath='../../include/libnvpair.h' line='86' column='1' id='type-id-4'>
+    <enum-decl name='nvlist_indent_mode' id='type-id-4'>
       <underlying-type type-id='type-id-32'/>
       <enumerator name='NVLIST_INDENT_ABS' value='0'/>
       <enumerator name='NVLIST_INDENT_TABBED' value='1'/>
     </enum-decl>
     <qualified-type-def type-id='type-id-22' const='yes' id='type-id-33'/>
     <pointer-type-def type-id='type-id-33' size-in-bits='64' id='type-id-6'/>
-    <class-decl name='nvlist_printops' size-in-bits='3456' is-struct='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='61' column='1' id='type-id-34'>
+    <class-decl name='nvlist_printops' size-in-bits='3456' is-struct='yes' visibility='default' id='type-id-34'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='print_boolean' type-id='type-id-35' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='62' column='1'/>
+        <var-decl name='print_boolean' type-id='type-id-35' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='print_boolean_value' type-id='type-id-36' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='63' column='1'/>
+        <var-decl name='print_boolean_value' type-id='type-id-36' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='print_byte' type-id='type-id-37' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='64' column='1'/>
+        <var-decl name='print_byte' type-id='type-id-37' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='print_int8' type-id='type-id-38' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='65' column='1'/>
+        <var-decl name='print_int8' type-id='type-id-38' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='print_uint8' type-id='type-id-39' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='66' column='1'/>
+        <var-decl name='print_uint8' type-id='type-id-39' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='640'>
-        <var-decl name='print_int16' type-id='type-id-40' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='67' column='1'/>
+        <var-decl name='print_int16' type-id='type-id-40' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='print_uint16' type-id='type-id-41' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='68' column='1'/>
+        <var-decl name='print_uint16' type-id='type-id-41' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
-        <var-decl name='print_int32' type-id='type-id-42' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='69' column='1'/>
+        <var-decl name='print_int32' type-id='type-id-42' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='print_uint32' type-id='type-id-43' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='70' column='1'/>
+        <var-decl name='print_uint32' type-id='type-id-43' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='print_int64' type-id='type-id-44' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='71' column='1'/>
+        <var-decl name='print_int64' type-id='type-id-44' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='print_uint64' type-id='type-id-45' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='72' column='1'/>
+        <var-decl name='print_uint64' type-id='type-id-45' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
-        <var-decl name='print_double' type-id='type-id-46' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='73' column='1'/>
+        <var-decl name='print_double' type-id='type-id-46' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1536'>
-        <var-decl name='print_string' type-id='type-id-47' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='74' column='1'/>
+        <var-decl name='print_string' type-id='type-id-47' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1664'>
-        <var-decl name='print_hrtime' type-id='type-id-48' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='75' column='1'/>
+        <var-decl name='print_hrtime' type-id='type-id-48' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1792'>
-        <var-decl name='print_nvlist' type-id='type-id-49' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='76' column='1'/>
+        <var-decl name='print_nvlist' type-id='type-id-49' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1920'>
-        <var-decl name='print_boolean_array' type-id='type-id-50' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='77' column='1'/>
+        <var-decl name='print_boolean_array' type-id='type-id-50' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2048'>
-        <var-decl name='print_byte_array' type-id='type-id-51' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='78' column='1'/>
+        <var-decl name='print_byte_array' type-id='type-id-51' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2176'>
-        <var-decl name='print_int8_array' type-id='type-id-52' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='79' column='1'/>
+        <var-decl name='print_int8_array' type-id='type-id-52' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2304'>
-        <var-decl name='print_uint8_array' type-id='type-id-53' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='80' column='1'/>
+        <var-decl name='print_uint8_array' type-id='type-id-53' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2432'>
-        <var-decl name='print_int16_array' type-id='type-id-54' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='81' column='1'/>
+        <var-decl name='print_int16_array' type-id='type-id-54' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2560'>
-        <var-decl name='print_uint16_array' type-id='type-id-55' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='82' column='1'/>
+        <var-decl name='print_uint16_array' type-id='type-id-55' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2688'>
-        <var-decl name='print_int32_array' type-id='type-id-56' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='83' column='1'/>
+        <var-decl name='print_int32_array' type-id='type-id-56' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2816'>
-        <var-decl name='print_uint32_array' type-id='type-id-57' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='84' column='1'/>
+        <var-decl name='print_uint32_array' type-id='type-id-57' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2944'>
-        <var-decl name='print_int64_array' type-id='type-id-58' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='85' column='1'/>
+        <var-decl name='print_int64_array' type-id='type-id-58' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3072'>
-        <var-decl name='print_uint64_array' type-id='type-id-59' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='86' column='1'/>
+        <var-decl name='print_uint64_array' type-id='type-id-59' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3200'>
-        <var-decl name='print_string_array' type-id='type-id-60' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='87' column='1'/>
+        <var-decl name='print_string_array' type-id='type-id-60' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='3328'>
-        <var-decl name='print_nvlist_array' type-id='type-id-61' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='88' column='1'/>
+        <var-decl name='print_nvlist_array' type-id='type-id-61' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='62' column='1' id='type-id-35'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-35'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-62' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='62' column='1'/>
+        <var-decl name='op' type-id='type-id-62' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='62' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-2' size-in-bits='64' id='type-id-63'/>
-    <class-decl name='nvlist' size-in-bits='192' is-struct='yes' visibility='default' filepath='../../include/sys/nvpair.h' line='85' column='1' id='type-id-64'>
+    <class-decl name='nvlist' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-64'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='nvl_version' type-id='type-id-65' visibility='default' filepath='../../include/sys/nvpair.h' line='86' column='1'/>
+        <var-decl name='nvl_version' type-id='type-id-65' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='nvl_nvflag' type-id='type-id-66' visibility='default' filepath='../../include/sys/nvpair.h' line='87' column='1'/>
+        <var-decl name='nvl_nvflag' type-id='type-id-66' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='nvl_priv' type-id='type-id-67' visibility='default' filepath='../../include/sys/nvpair.h' line='88' column='1'/>
+        <var-decl name='nvl_priv' type-id='type-id-67' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='nvl_flag' type-id='type-id-66' visibility='default' filepath='../../include/sys/nvpair.h' line='89' column='1'/>
+        <var-decl name='nvl_flag' type-id='type-id-66' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='160'>
-        <var-decl name='nvl_pad' type-id='type-id-65' visibility='default' filepath='../../include/sys/nvpair.h' line='90' column='1'/>
+        <var-decl name='nvl_pad' type-id='type-id-65' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__int32_t' type-id='type-id-5' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='40' column='1' id='type-id-68'/>
-    <typedef-decl name='int32_t' type-id='type-id-68' filepath='/usr/include/x86_64-linux-gnu/bits/stdint-intn.h' line='26' column='1' id='type-id-65'/>
+    <typedef-decl name='__int32_t' type-id='type-id-5' id='type-id-68'/>
+    <typedef-decl name='int32_t' type-id='type-id-68' id='type-id-65'/>
     <type-decl name='unsigned int' size-in-bits='32' id='type-id-69'/>
-    <typedef-decl name='__uint32_t' type-id='type-id-69' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='41' column='1' id='type-id-70'/>
-    <typedef-decl name='uint32_t' type-id='type-id-70' filepath='/usr/include/x86_64-linux-gnu/bits/stdint-uintn.h' line='26' column='1' id='type-id-66'/>
-    <typedef-decl name='__uint64_t' type-id='type-id-29' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='44' column='1' id='type-id-71'/>
-    <typedef-decl name='uint64_t' type-id='type-id-71' filepath='/usr/include/x86_64-linux-gnu/bits/stdint-uintn.h' line='27' column='1' id='type-id-67'/>
-    <typedef-decl name='nvlist_t' type-id='type-id-64' filepath='../../include/sys/nvpair.h' line='91' column='1' id='type-id-72'/>
+    <typedef-decl name='__uint32_t' type-id='type-id-69' id='type-id-70'/>
+    <typedef-decl name='uint32_t' type-id='type-id-70' id='type-id-66'/>
+    <typedef-decl name='__uint64_t' type-id='type-id-29' id='type-id-71'/>
+    <typedef-decl name='uint64_t' type-id='type-id-71' id='type-id-67'/>
+    <typedef-decl name='nvlist_t' type-id='type-id-64' id='type-id-72'/>
     <pointer-type-def type-id='type-id-72' size-in-bits='64' id='type-id-73'/>
     <pointer-type-def type-id='type-id-74' size-in-bits='64' id='type-id-62'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='63' column='1' id='type-id-36'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-36'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-75' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='63' column='1'/>
+        <var-decl name='op' type-id='type-id-75' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='63' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='../../lib/libspl/include/sys/stdtypes.h' line='26' column='1' id='type-id-76'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-76'>
       <underlying-type type-id='type-id-32'/>
       <enumerator name='B_FALSE' value='0'/>
       <enumerator name='B_TRUE' value='1'/>
     </enum-decl>
-    <typedef-decl name='boolean_t' type-id='type-id-76' filepath='../../lib/libspl/include/sys/stdtypes.h' line='29' column='1' id='type-id-77'/>
+    <typedef-decl name='boolean_t' type-id='type-id-76' id='type-id-77'/>
     <pointer-type-def type-id='type-id-78' size-in-bits='64' id='type-id-75'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='64' column='1' id='type-id-37'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-37'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-79' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='64' column='1'/>
+        <var-decl name='op' type-id='type-id-79' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='64' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
     <type-decl name='unsigned char' size-in-bits='8' id='type-id-80'/>
-    <typedef-decl name='uchar_t' type-id='type-id-80' filepath='../../lib/libspl/include/sys/stdtypes.h' line='31' column='1' id='type-id-81'/>
+    <typedef-decl name='uchar_t' type-id='type-id-80' id='type-id-81'/>
     <pointer-type-def type-id='type-id-82' size-in-bits='64' id='type-id-79'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='65' column='1' id='type-id-38'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-38'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-83' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='65' column='1'/>
+        <var-decl name='op' type-id='type-id-83' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='65' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__int8_t' type-id='type-id-14' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='36' column='1' id='type-id-84'/>
-    <typedef-decl name='int8_t' type-id='type-id-84' filepath='/usr/include/x86_64-linux-gnu/bits/stdint-intn.h' line='24' column='1' id='type-id-85'/>
+    <typedef-decl name='__int8_t' type-id='type-id-14' id='type-id-84'/>
+    <typedef-decl name='int8_t' type-id='type-id-84' id='type-id-85'/>
     <pointer-type-def type-id='type-id-86' size-in-bits='64' id='type-id-83'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='66' column='1' id='type-id-39'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-39'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-87' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='66' column='1'/>
+        <var-decl name='op' type-id='type-id-87' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='66' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__uint8_t' type-id='type-id-80' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='37' column='1' id='type-id-88'/>
-    <typedef-decl name='uint8_t' type-id='type-id-88' filepath='/usr/include/x86_64-linux-gnu/bits/stdint-uintn.h' line='24' column='1' id='type-id-89'/>
+    <typedef-decl name='__uint8_t' type-id='type-id-80' id='type-id-88'/>
+    <typedef-decl name='uint8_t' type-id='type-id-88' id='type-id-89'/>
     <pointer-type-def type-id='type-id-90' size-in-bits='64' id='type-id-87'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='67' column='1' id='type-id-40'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-40'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-91' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='67' column='1'/>
+        <var-decl name='op' type-id='type-id-91' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='67' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
     <type-decl name='short int' size-in-bits='16' id='type-id-92'/>
-    <typedef-decl name='__int16_t' type-id='type-id-92' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='38' column='1' id='type-id-93'/>
-    <typedef-decl name='int16_t' type-id='type-id-93' filepath='/usr/include/x86_64-linux-gnu/bits/stdint-intn.h' line='25' column='1' id='type-id-94'/>
+    <typedef-decl name='__int16_t' type-id='type-id-92' id='type-id-93'/>
+    <typedef-decl name='int16_t' type-id='type-id-93' id='type-id-94'/>
     <pointer-type-def type-id='type-id-95' size-in-bits='64' id='type-id-91'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='68' column='1' id='type-id-41'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-41'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-96' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='68' column='1'/>
+        <var-decl name='op' type-id='type-id-96' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='68' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__uint16_t' type-id='type-id-13' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='39' column='1' id='type-id-97'/>
-    <typedef-decl name='uint16_t' type-id='type-id-97' filepath='/usr/include/x86_64-linux-gnu/bits/stdint-uintn.h' line='25' column='1' id='type-id-98'/>
+    <typedef-decl name='__uint16_t' type-id='type-id-13' id='type-id-97'/>
+    <typedef-decl name='uint16_t' type-id='type-id-97' id='type-id-98'/>
     <pointer-type-def type-id='type-id-99' size-in-bits='64' id='type-id-96'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='69' column='1' id='type-id-42'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-42'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-100' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='69' column='1'/>
+        <var-decl name='op' type-id='type-id-100' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='69' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-101' size-in-bits='64' id='type-id-100'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='70' column='1' id='type-id-43'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-43'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-102' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='70' column='1'/>
+        <var-decl name='op' type-id='type-id-102' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='70' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-103' size-in-bits='64' id='type-id-102'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='71' column='1' id='type-id-44'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-44'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-104' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='71' column='1'/>
+        <var-decl name='op' type-id='type-id-104' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='71' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__int64_t' type-id='type-id-24' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='43' column='1' id='type-id-105'/>
-    <typedef-decl name='int64_t' type-id='type-id-105' filepath='/usr/include/x86_64-linux-gnu/bits/stdint-intn.h' line='27' column='1' id='type-id-106'/>
+    <typedef-decl name='__int64_t' type-id='type-id-24' id='type-id-105'/>
+    <typedef-decl name='int64_t' type-id='type-id-105' id='type-id-106'/>
     <pointer-type-def type-id='type-id-107' size-in-bits='64' id='type-id-104'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='72' column='1' id='type-id-45'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-45'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-108' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='72' column='1'/>
+        <var-decl name='op' type-id='type-id-108' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='72' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-109' size-in-bits='64' id='type-id-108'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='73' column='1' id='type-id-46'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-46'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-110' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='73' column='1'/>
+        <var-decl name='op' type-id='type-id-110' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='73' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
     <type-decl name='double' size-in-bits='64' id='type-id-111'/>
     <pointer-type-def type-id='type-id-112' size-in-bits='64' id='type-id-110'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='74' column='1' id='type-id-47'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-47'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-113' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='74' column='1'/>
+        <var-decl name='op' type-id='type-id-113' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='74' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-114' size-in-bits='64' id='type-id-113'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='75' column='1' id='type-id-48'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-48'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-115' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='75' column='1'/>
+        <var-decl name='op' type-id='type-id-115' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='75' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
     <type-decl name='long long int' size-in-bits='64' id='type-id-116'/>
-    <typedef-decl name='hrtime_t' type-id='type-id-116' filepath='../../lib/libspl/include/sys/time.h' line='78' column='1' id='type-id-117'/>
+    <typedef-decl name='hrtime_t' type-id='type-id-116' id='type-id-117'/>
     <pointer-type-def type-id='type-id-118' size-in-bits='64' id='type-id-115'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='76' column='1' id='type-id-49'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-49'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-119' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='76' column='1'/>
+        <var-decl name='op' type-id='type-id-119' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='76' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-120' size-in-bits='64' id='type-id-119'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='77' column='1' id='type-id-50'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-50'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-121' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='77' column='1'/>
+        <var-decl name='op' type-id='type-id-121' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='77' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-77' size-in-bits='64' id='type-id-122'/>
-    <typedef-decl name='uint_t' type-id='type-id-69' filepath='../../lib/libspl/include/sys/stdtypes.h' line='33' column='1' id='type-id-123'/>
+    <typedef-decl name='uint_t' type-id='type-id-69' id='type-id-123'/>
     <pointer-type-def type-id='type-id-124' size-in-bits='64' id='type-id-121'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='78' column='1' id='type-id-51'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-51'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-125' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='78' column='1'/>
+        <var-decl name='op' type-id='type-id-125' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='78' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-81' size-in-bits='64' id='type-id-126'/>
     <pointer-type-def type-id='type-id-127' size-in-bits='64' id='type-id-125'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='79' column='1' id='type-id-52'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-52'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-128' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='79' column='1'/>
+        <var-decl name='op' type-id='type-id-128' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='79' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-85' size-in-bits='64' id='type-id-129'/>
     <pointer-type-def type-id='type-id-130' size-in-bits='64' id='type-id-128'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='80' column='1' id='type-id-53'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-53'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-131' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='80' column='1'/>
+        <var-decl name='op' type-id='type-id-131' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='80' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-89' size-in-bits='64' id='type-id-132'/>
     <pointer-type-def type-id='type-id-133' size-in-bits='64' id='type-id-131'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='81' column='1' id='type-id-54'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-54'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-134' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='81' column='1'/>
+        <var-decl name='op' type-id='type-id-134' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='81' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-94' size-in-bits='64' id='type-id-135'/>
     <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-134'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='82' column='1' id='type-id-55'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-55'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-137' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='82' column='1'/>
+        <var-decl name='op' type-id='type-id-137' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='82' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-98' size-in-bits='64' id='type-id-138'/>
     <pointer-type-def type-id='type-id-139' size-in-bits='64' id='type-id-137'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='83' column='1' id='type-id-56'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-56'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-140' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='83' column='1'/>
+        <var-decl name='op' type-id='type-id-140' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='83' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-65' size-in-bits='64' id='type-id-141'/>
     <pointer-type-def type-id='type-id-142' size-in-bits='64' id='type-id-140'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='84' column='1' id='type-id-57'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-57'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-143' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='84' column='1'/>
+        <var-decl name='op' type-id='type-id-143' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='84' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-66' size-in-bits='64' id='type-id-144'/>
     <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-143'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='85' column='1' id='type-id-58'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-58'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-146' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='85' column='1'/>
+        <var-decl name='op' type-id='type-id-146' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='85' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-106' size-in-bits='64' id='type-id-147'/>
     <pointer-type-def type-id='type-id-148' size-in-bits='64' id='type-id-146'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='86' column='1' id='type-id-59'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-59'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-149' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='86' column='1'/>
+        <var-decl name='op' type-id='type-id-149' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='86' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-67' size-in-bits='64' id='type-id-150'/>
     <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-149'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='87' column='1' id='type-id-60'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-60'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-152' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='87' column='1'/>
+        <var-decl name='op' type-id='type-id-152' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='87' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-9' size-in-bits='64' id='type-id-153'/>
     <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-152'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='88' column='1' id='type-id-61'>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-61'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='op' type-id='type-id-155' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='88' column='1'/>
+        <var-decl name='op' type-id='type-id-155' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='arg' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='88' column='1'/>
+        <var-decl name='arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-156'/>
     <pointer-type-def type-id='type-id-157' size-in-bits='64' id='type-id-155'/>
     <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-7'/>
-    <typedef-decl name='nvlist_prtctl_t' type-id='type-id-63' filepath='../../include/libnvpair.h' line='84' column='1' id='type-id-158'/>
-    <function-decl name='nvlist_prtctl_setdest' mangled-name='nvlist_prtctl_setdest' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='312' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctl_setdest'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='312' column='1'/>
-      <parameter type-id='type-id-3' name='fp' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='312' column='1'/>
+    <typedef-decl name='nvlist_prtctl_t' type-id='type-id-63' id='type-id-158'/>
+    <function-decl name='nvlist_prtctl_setdest' mangled-name='nvlist_prtctl_setdest' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctl_setdest'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-3' name='fp'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_prtctl_getdest' mangled-name='nvlist_prtctl_getdest' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctl_getdest'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='318' column='1'/>
+    <function-decl name='nvlist_prtctl_getdest' mangled-name='nvlist_prtctl_getdest' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctl_getdest'>
+      <parameter type-id='type-id-158' name='pctl'/>
       <return type-id='type-id-3'/>
     </function-decl>
-    <function-decl name='nvlist_prtctl_setindent' mangled-name='nvlist_prtctl_setindent' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='325' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctl_setindent'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='325' column='1'/>
-      <parameter type-id='type-id-4' name='mode' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='325' column='1'/>
-      <parameter type-id='type-id-5' name='start' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='326' column='1'/>
-      <parameter type-id='type-id-5' name='inc' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='326' column='1'/>
+    <function-decl name='nvlist_prtctl_setindent' mangled-name='nvlist_prtctl_setindent' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctl_setindent'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-4' name='mode'/>
+      <parameter type-id='type-id-5' name='start'/>
+      <parameter type-id='type-id-5' name='inc'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_prtctl_doindent' mangled-name='nvlist_prtctl_doindent' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='343' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctl_doindent'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='343' column='1'/>
-      <parameter type-id='type-id-5' name='onemore' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='343' column='1'/>
+    <function-decl name='nvlist_prtctl_doindent' mangled-name='nvlist_prtctl_doindent' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctl_doindent'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-5' name='onemore'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <enum-decl name='nvlist_prtctl_fmt' filepath='../../include/libnvpair.h' line='104' column='1' id='type-id-159'>
+    <enum-decl name='nvlist_prtctl_fmt' id='type-id-159'>
       <underlying-type type-id='type-id-32'/>
       <enumerator name='NVLIST_FMT_MEMBER_NAME' value='0'/>
       <enumerator name='NVLIST_FMT_MEMBER_POSTAMBLE' value='1'/>
       <enumerator name='NVLIST_FMT_BTWN_ARRAY' value='2'/>
     </enum-decl>
-    <function-decl name='nvlist_prtctl_setfmt' mangled-name='nvlist_prtctl_setfmt' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='350' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctl_setfmt'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='350' column='1'/>
-      <parameter type-id='type-id-159' name='which' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='350' column='1'/>
-      <parameter type-id='type-id-6' name='fmt' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='351' column='1'/>
+    <function-decl name='nvlist_prtctl_setfmt' mangled-name='nvlist_prtctl_setfmt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctl_setfmt'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-159' name='which'/>
+      <parameter type-id='type-id-6' name='fmt'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_prtctl_dofmt' mangled-name='nvlist_prtctl_dofmt' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='383' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctl_dofmt'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='383' column='1'/>
-      <parameter type-id='type-id-159' name='which' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='383' column='1'/>
+    <function-decl name='nvlist_prtctl_dofmt' mangled-name='nvlist_prtctl_dofmt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctl_dofmt'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-159' name='which'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-160' size-in-bits='64' id='type-id-161'/>
-    <function-decl name='nvlist_prtctlop_boolean' mangled-name='nvlist_prtctlop_boolean' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='430' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_boolean'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='430' column='1'/>
-      <parameter type-id='type-id-161' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='430' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='430' column='1'/>
+    <function-decl name='nvlist_prtctlop_boolean' mangled-name='nvlist_prtctlop_boolean' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_boolean'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-161' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-163'/>
-    <function-decl name='nvlist_prtctlop_boolean_value' mangled-name='nvlist_prtctlop_boolean_value' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_boolean_value'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='431' column='1'/>
-      <parameter type-id='type-id-163' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='431' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='431' column='1'/>
+    <function-decl name='nvlist_prtctlop_boolean_value' mangled-name='nvlist_prtctlop_boolean_value' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_boolean_value'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-163' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-164' size-in-bits='64' id='type-id-165'/>
-    <function-decl name='nvlist_prtctlop_byte' mangled-name='nvlist_prtctlop_byte' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_byte'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='432' column='1'/>
-      <parameter type-id='type-id-165' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='432' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='432' column='1'/>
+    <function-decl name='nvlist_prtctlop_byte' mangled-name='nvlist_prtctlop_byte' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_byte'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-165' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-166' size-in-bits='64' id='type-id-167'/>
-    <function-decl name='nvlist_prtctlop_int8' mangled-name='nvlist_prtctlop_int8' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='433' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_int8'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='433' column='1'/>
-      <parameter type-id='type-id-167' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='433' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='433' column='1'/>
+    <function-decl name='nvlist_prtctlop_int8' mangled-name='nvlist_prtctlop_int8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_int8'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-167' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-168' size-in-bits='64' id='type-id-169'/>
-    <function-decl name='nvlist_prtctlop_uint8' mangled-name='nvlist_prtctlop_uint8' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='434' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_uint8'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='434' column='1'/>
-      <parameter type-id='type-id-169' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='434' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='434' column='1'/>
+    <function-decl name='nvlist_prtctlop_uint8' mangled-name='nvlist_prtctlop_uint8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_uint8'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-169' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-170' size-in-bits='64' id='type-id-171'/>
-    <function-decl name='nvlist_prtctlop_int16' mangled-name='nvlist_prtctlop_int16' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='435' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_int16'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='435' column='1'/>
-      <parameter type-id='type-id-171' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='435' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='435' column='1'/>
+    <function-decl name='nvlist_prtctlop_int16' mangled-name='nvlist_prtctlop_int16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_int16'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-171' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-172' size-in-bits='64' id='type-id-173'/>
-    <function-decl name='nvlist_prtctlop_uint16' mangled-name='nvlist_prtctlop_uint16' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='436' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_uint16'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='436' column='1'/>
-      <parameter type-id='type-id-173' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='436' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='436' column='1'/>
+    <function-decl name='nvlist_prtctlop_uint16' mangled-name='nvlist_prtctlop_uint16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_uint16'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-173' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-175'/>
-    <function-decl name='nvlist_prtctlop_int32' mangled-name='nvlist_prtctlop_int32' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='437' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_int32'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='437' column='1'/>
-      <parameter type-id='type-id-175' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='437' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='437' column='1'/>
+    <function-decl name='nvlist_prtctlop_int32' mangled-name='nvlist_prtctlop_int32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_int32'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-175' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-177'/>
-    <function-decl name='nvlist_prtctlop_uint32' mangled-name='nvlist_prtctlop_uint32' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='438' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_uint32'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='438' column='1'/>
-      <parameter type-id='type-id-177' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='438' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='438' column='1'/>
+    <function-decl name='nvlist_prtctlop_uint32' mangled-name='nvlist_prtctlop_uint32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_uint32'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-177' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-178' size-in-bits='64' id='type-id-179'/>
-    <function-decl name='nvlist_prtctlop_int64' mangled-name='nvlist_prtctlop_int64' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='439' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_int64'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='439' column='1'/>
-      <parameter type-id='type-id-179' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='439' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='439' column='1'/>
+    <function-decl name='nvlist_prtctlop_int64' mangled-name='nvlist_prtctlop_int64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_int64'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-179' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-180' size-in-bits='64' id='type-id-181'/>
-    <function-decl name='nvlist_prtctlop_uint64' mangled-name='nvlist_prtctlop_uint64' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='440' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_uint64'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='440' column='1'/>
-      <parameter type-id='type-id-181' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='440' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='440' column='1'/>
+    <function-decl name='nvlist_prtctlop_uint64' mangled-name='nvlist_prtctlop_uint64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_uint64'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-181' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-183'/>
-    <function-decl name='nvlist_prtctlop_double' mangled-name='nvlist_prtctlop_double' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='441' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_double'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='441' column='1'/>
-      <parameter type-id='type-id-183' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='441' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='441' column='1'/>
+    <function-decl name='nvlist_prtctlop_double' mangled-name='nvlist_prtctlop_double' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_double'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-183' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-185'/>
-    <function-decl name='nvlist_prtctlop_string' mangled-name='nvlist_prtctlop_string' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='442' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_string'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='442' column='1'/>
-      <parameter type-id='type-id-185' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='442' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='442' column='1'/>
+    <function-decl name='nvlist_prtctlop_string' mangled-name='nvlist_prtctlop_string' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_string'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-185' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-187'/>
-    <function-decl name='nvlist_prtctlop_hrtime' mangled-name='nvlist_prtctlop_hrtime' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='443' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_hrtime'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='443' column='1'/>
-      <parameter type-id='type-id-187' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='443' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='443' column='1'/>
+    <function-decl name='nvlist_prtctlop_hrtime' mangled-name='nvlist_prtctlop_hrtime' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_hrtime'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-187' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-189'/>
-    <function-decl name='nvlist_prtctlop_nvlist' mangled-name='nvlist_prtctlop_nvlist' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='444' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_nvlist'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='444' column='1'/>
-      <parameter type-id='type-id-189' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='444' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='444' column='1'/>
+    <function-decl name='nvlist_prtctlop_nvlist' mangled-name='nvlist_prtctlop_nvlist' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_nvlist'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-189' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-190' size-in-bits='64' id='type-id-191'/>
-    <function-decl name='nvlist_prtctlop_boolean_array' mangled-name='nvlist_prtctlop_boolean_array' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='456' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_boolean_array'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='456' column='1'/>
-      <parameter type-id='type-id-191' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='456' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='456' column='1'/>
+    <function-decl name='nvlist_prtctlop_boolean_array' mangled-name='nvlist_prtctlop_boolean_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_boolean_array'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-191' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-192' size-in-bits='64' id='type-id-193'/>
-    <function-decl name='nvlist_prtctlop_byte_array' mangled-name='nvlist_prtctlop_byte_array' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='457' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_byte_array'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='457' column='1'/>
-      <parameter type-id='type-id-193' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='457' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='457' column='1'/>
+    <function-decl name='nvlist_prtctlop_byte_array' mangled-name='nvlist_prtctlop_byte_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_byte_array'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-193' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-194' size-in-bits='64' id='type-id-195'/>
-    <function-decl name='nvlist_prtctlop_int8_array' mangled-name='nvlist_prtctlop_int8_array' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='458' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_int8_array'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='458' column='1'/>
-      <parameter type-id='type-id-195' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='458' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='458' column='1'/>
+    <function-decl name='nvlist_prtctlop_int8_array' mangled-name='nvlist_prtctlop_int8_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_int8_array'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-195' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-196' size-in-bits='64' id='type-id-197'/>
-    <function-decl name='nvlist_prtctlop_uint8_array' mangled-name='nvlist_prtctlop_uint8_array' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='459' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_uint8_array'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='459' column='1'/>
-      <parameter type-id='type-id-197' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='459' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='459' column='1'/>
+    <function-decl name='nvlist_prtctlop_uint8_array' mangled-name='nvlist_prtctlop_uint8_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_uint8_array'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-197' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-198' size-in-bits='64' id='type-id-199'/>
-    <function-decl name='nvlist_prtctlop_int16_array' mangled-name='nvlist_prtctlop_int16_array' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_int16_array'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='460' column='1'/>
-      <parameter type-id='type-id-199' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='460' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='460' column='1'/>
+    <function-decl name='nvlist_prtctlop_int16_array' mangled-name='nvlist_prtctlop_int16_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_int16_array'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-199' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-200' size-in-bits='64' id='type-id-201'/>
-    <function-decl name='nvlist_prtctlop_uint16_array' mangled-name='nvlist_prtctlop_uint16_array' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='461' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_uint16_array'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='461' column='1'/>
-      <parameter type-id='type-id-201' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='461' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='461' column='1'/>
+    <function-decl name='nvlist_prtctlop_uint16_array' mangled-name='nvlist_prtctlop_uint16_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_uint16_array'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-201' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-202' size-in-bits='64' id='type-id-203'/>
-    <function-decl name='nvlist_prtctlop_int32_array' mangled-name='nvlist_prtctlop_int32_array' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='462' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_int32_array'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='462' column='1'/>
-      <parameter type-id='type-id-203' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='462' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='462' column='1'/>
+    <function-decl name='nvlist_prtctlop_int32_array' mangled-name='nvlist_prtctlop_int32_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_int32_array'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-203' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-204' size-in-bits='64' id='type-id-205'/>
-    <function-decl name='nvlist_prtctlop_uint32_array' mangled-name='nvlist_prtctlop_uint32_array' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='463' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_uint32_array'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='463' column='1'/>
-      <parameter type-id='type-id-205' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='463' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='463' column='1'/>
+    <function-decl name='nvlist_prtctlop_uint32_array' mangled-name='nvlist_prtctlop_uint32_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_uint32_array'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-205' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-207'/>
-    <function-decl name='nvlist_prtctlop_int64_array' mangled-name='nvlist_prtctlop_int64_array' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='464' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_int64_array'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='464' column='1'/>
-      <parameter type-id='type-id-207' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='464' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='464' column='1'/>
+    <function-decl name='nvlist_prtctlop_int64_array' mangled-name='nvlist_prtctlop_int64_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_int64_array'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-207' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-208' size-in-bits='64' id='type-id-209'/>
-    <function-decl name='nvlist_prtctlop_uint64_array' mangled-name='nvlist_prtctlop_uint64_array' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='465' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_uint64_array'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='465' column='1'/>
-      <parameter type-id='type-id-209' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='465' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='465' column='1'/>
+    <function-decl name='nvlist_prtctlop_uint64_array' mangled-name='nvlist_prtctlop_uint64_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_uint64_array'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-209' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-211'/>
-    <function-decl name='nvlist_prtctlop_string_array' mangled-name='nvlist_prtctlop_string_array' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='466' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_string_array'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='466' column='1'/>
-      <parameter type-id='type-id-211' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='466' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='466' column='1'/>
+    <function-decl name='nvlist_prtctlop_string_array' mangled-name='nvlist_prtctlop_string_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_string_array'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-211' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <pointer-type-def type-id='type-id-212' size-in-bits='64' id='type-id-213'/>
-    <function-decl name='nvlist_prtctlop_nvlist_array' mangled-name='nvlist_prtctlop_nvlist_array' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='467' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_nvlist_array'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='467' column='1'/>
-      <parameter type-id='type-id-213' name='func' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='467' column='1'/>
-      <parameter type-id='type-id-19' name='private' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='467' column='1'/>
+    <function-decl name='nvlist_prtctlop_nvlist_array' mangled-name='nvlist_prtctlop_nvlist_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctlop_nvlist_array'>
+      <parameter type-id='type-id-158' name='pctl'/>
+      <parameter type-id='type-id-213' name='func'/>
+      <parameter type-id='type-id-19' name='private'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_prtctl_alloc' mangled-name='nvlist_prtctl_alloc' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='527' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctl_alloc'>
+    <function-decl name='nvlist_prtctl_alloc' mangled-name='nvlist_prtctl_alloc' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctl_alloc'>
       <return type-id='type-id-158'/>
     </function-decl>
-    <function-decl name='nvlist_prtctl_free' mangled-name='nvlist_prtctl_free' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='546' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctl_free'>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='546' column='1'/>
+    <function-decl name='nvlist_prtctl_free' mangled-name='nvlist_prtctl_free' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prtctl_free'>
+      <parameter type-id='type-id-158' name='pctl'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_print' mangled-name='nvlist_print' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='757' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_print'>
-      <parameter type-id='type-id-3' name='fp' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='757' column='1'/>
-      <parameter type-id='type-id-73' name='nvl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='757' column='1'/>
+    <function-decl name='nvlist_print' mangled-name='nvlist_print' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_print'>
+      <parameter type-id='type-id-3' name='fp'/>
+      <parameter type-id='type-id-73' name='nvl'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <class-decl name='nvpair' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../include/sys/nvpair.h' line='73' column='1' id='type-id-214'>
+    <class-decl name='nvpair' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-214'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='nvp_size' type-id='type-id-65' visibility='default' filepath='../../include/sys/nvpair.h' line='74' column='1'/>
+        <var-decl name='nvp_size' type-id='type-id-65' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='nvp_name_sz' type-id='type-id-94' visibility='default' filepath='../../include/sys/nvpair.h' line='75' column='1'/>
+        <var-decl name='nvp_name_sz' type-id='type-id-94' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='nvp_reserve' type-id='type-id-94' visibility='default' filepath='../../include/sys/nvpair.h' line='76' column='1'/>
+        <var-decl name='nvp_reserve' type-id='type-id-94' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='nvp_value_elem' type-id='type-id-65' visibility='default' filepath='../../include/sys/nvpair.h' line='77' column='1'/>
+        <var-decl name='nvp_value_elem' type-id='type-id-65' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='nvp_type' type-id='type-id-215' visibility='default' filepath='../../include/sys/nvpair.h' line='78' column='1'/>
+        <var-decl name='nvp_type' type-id='type-id-215' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='../../include/sys/nvpair.h' line='37' column='1' id='type-id-216'>
+    <enum-decl name='__anonymous_enum__' is-anonymous='yes' id='type-id-216'>
       <underlying-type type-id='type-id-32'/>
       <enumerator name='DATA_TYPE_DONTCARE' value='-1'/>
       <enumerator name='DATA_TYPE_UNKNOWN' value='0'/>
@@ -1078,280 +1072,280 @@
       <enumerator name='DATA_TYPE_UINT8_ARRAY' value='26'/>
       <enumerator name='DATA_TYPE_DOUBLE' value='27'/>
     </enum-decl>
-    <typedef-decl name='data_type_t' type-id='type-id-216' filepath='../../include/sys/nvpair.h' line='71' column='1' id='type-id-215'/>
+    <typedef-decl name='data_type_t' type-id='type-id-216' id='type-id-215'/>
     <pointer-type-def type-id='type-id-214' size-in-bits='64' id='type-id-217'/>
     <pointer-type-def type-id='type-id-64' size-in-bits='64' id='type-id-218'/>
-    <function-decl name='nvlist_next_nvpair' filepath='../../include/sys/nvpair.h' line='242' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_next_nvpair' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-217'/>
       <return type-id='type-id-217'/>
     </function-decl>
-    <function-decl name='nvpair_type' filepath='../../include/sys/nvpair.h' line='245' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_type' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <return type-id='type-id-216'/>
     </function-decl>
-    <function-decl name='nvpair_name' filepath='../../include/sys/nvpair.h' line='244' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_name' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <return type-id='type-id-9'/>
     </function-decl>
     <pointer-type-def type-id='type-id-80' size-in-bits='64' id='type-id-219'/>
-    <function-decl name='nvpair_value_byte' filepath='../../include/sys/nvpair.h' line='248' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_byte' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-219'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-92' size-in-bits='64' id='type-id-220'/>
-    <function-decl name='nvpair_value_int16' filepath='../../include/sys/nvpair.h' line='251' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_int16' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-220'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-13' size-in-bits='64' id='type-id-221'/>
-    <function-decl name='nvpair_value_uint16' filepath='../../include/sys/nvpair.h' line='252' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_uint16' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-221'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-5' size-in-bits='64' id='type-id-222'/>
-    <function-decl name='nvpair_value_int32' filepath='../../include/sys/nvpair.h' line='253' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_int32' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-222'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-69' size-in-bits='64' id='type-id-223'/>
-    <function-decl name='nvpair_value_uint32' filepath='../../include/sys/nvpair.h' line='254' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_uint32' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-24' size-in-bits='64' id='type-id-224'/>
-    <function-decl name='nvpair_value_int64' filepath='../../include/sys/nvpair.h' line='255' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_int64' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-224'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-29' size-in-bits='64' id='type-id-225'/>
-    <function-decl name='nvpair_value_uint64' filepath='../../include/sys/nvpair.h' line='256' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_uint64' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-225'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_string' filepath='../../include/sys/nvpair.h' line='257' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_string' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-153'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-219' size-in-bits='64' id='type-id-226'/>
-    <function-decl name='nvpair_value_byte_array' filepath='../../include/sys/nvpair.h' line='260' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_byte_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-226'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-220' size-in-bits='64' id='type-id-227'/>
-    <function-decl name='nvpair_value_int16_array' filepath='../../include/sys/nvpair.h' line='263' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_int16_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-227'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-221' size-in-bits='64' id='type-id-228'/>
-    <function-decl name='nvpair_value_uint16_array' filepath='../../include/sys/nvpair.h' line='264' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_uint16_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-228'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-222' size-in-bits='64' id='type-id-229'/>
-    <function-decl name='nvpair_value_int32_array' filepath='../../include/sys/nvpair.h' line='265' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_int32_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-229'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-223' size-in-bits='64' id='type-id-230'/>
-    <function-decl name='nvpair_value_uint32_array' filepath='../../include/sys/nvpair.h' line='266' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_uint32_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-230'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-224' size-in-bits='64' id='type-id-231'/>
-    <function-decl name='nvpair_value_int64_array' filepath='../../include/sys/nvpair.h' line='267' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_int64_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-231'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-225' size-in-bits='64' id='type-id-232'/>
-    <function-decl name='nvpair_value_uint64_array' filepath='../../include/sys/nvpair.h' line='268' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_uint64_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-232'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-153' size-in-bits='64' id='type-id-233'/>
-    <function-decl name='nvpair_value_string_array' filepath='../../include/sys/nvpair.h' line='269' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_string_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-233'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-116' size-in-bits='64' id='type-id-234'/>
-    <function-decl name='nvpair_value_hrtime' filepath='../../include/sys/nvpair.h' line='271' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_hrtime' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-234'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-235'/>
-    <function-decl name='nvpair_value_nvlist' filepath='../../include/sys/nvpair.h' line='258' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_nvlist' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-235'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-235' size-in-bits='64' id='type-id-236'/>
-    <function-decl name='nvpair_value_nvlist_array' filepath='../../include/sys/nvpair.h' line='270' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_nvlist_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-236'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-76' size-in-bits='64' id='type-id-237'/>
-    <function-decl name='nvpair_value_boolean_value' filepath='../../include/sys/nvpair.h' line='247' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_boolean_value' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-237'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-14' size-in-bits='64' id='type-id-238'/>
-    <function-decl name='nvpair_value_int8' filepath='../../include/sys/nvpair.h' line='249' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_int8' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-238'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_uint8' filepath='../../include/sys/nvpair.h' line='250' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_uint8' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-219'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-237' size-in-bits='64' id='type-id-239'/>
-    <function-decl name='nvpair_value_boolean_array' filepath='../../include/sys/nvpair.h' line='259' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_boolean_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-239'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-238' size-in-bits='64' id='type-id-240'/>
-    <function-decl name='nvpair_value_int8_array' filepath='../../include/sys/nvpair.h' line='261' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_int8_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-240'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_uint8_array' filepath='../../include/sys/nvpair.h' line='262' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_uint8_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-226'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-111' size-in-bits='64' id='type-id-241'/>
-    <function-decl name='nvpair_value_double' filepath='../../include/sys/nvpair.h' line='273' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_value_double' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <parameter type-id='type-id-241'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_prt' mangled-name='nvlist_prt' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='766' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prt'>
-      <parameter type-id='type-id-73' name='nvl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='766' column='1'/>
-      <parameter type-id='type-id-158' name='pctl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='766' column='1'/>
+    <function-decl name='nvlist_prt' mangled-name='nvlist_prt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prt'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-158' name='pctl'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='dump_nvlist' mangled-name='dump_nvlist' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='794' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dump_nvlist'>
-      <parameter type-id='type-id-73' name='list' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='794' column='1'/>
-      <parameter type-id='type-id-5' name='indent' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='794' column='1'/>
+    <function-decl name='dump_nvlist' mangled-name='dump_nvlist' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dump_nvlist'>
+      <parameter type-id='type-id-73' name='list'/>
+      <parameter type-id='type-id-5' name='indent'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='dcgettext' filepath='/usr/include/libintl.h' line='51' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='dcgettext' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <typedef-decl name='nvpair_t' type-id='type-id-214' filepath='../../include/sys/nvpair.h' line='82' column='1' id='type-id-242'/>
+    <typedef-decl name='nvpair_t' type-id='type-id-214' id='type-id-242'/>
     <pointer-type-def type-id='type-id-242' size-in-bits='64' id='type-id-243'/>
-    <class-decl name='re_pattern_buffer' size-in-bits='512' is-struct='yes' visibility='default' filepath='/usr/include/regex.h' line='413' column='1' id='type-id-244'>
+    <class-decl name='re_pattern_buffer' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-244'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='buffer' type-id='type-id-245' visibility='default' filepath='/usr/include/regex.h' line='417' column='1'/>
+        <var-decl name='buffer' type-id='type-id-245' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='allocated' type-id='type-id-246' visibility='default' filepath='/usr/include/regex.h' line='420' column='1'/>
+        <var-decl name='allocated' type-id='type-id-246' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='used' type-id='type-id-246' visibility='default' filepath='/usr/include/regex.h' line='423' column='1'/>
+        <var-decl name='used' type-id='type-id-246' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='syntax' type-id='type-id-247' visibility='default' filepath='/usr/include/regex.h' line='426' column='1'/>
+        <var-decl name='syntax' type-id='type-id-247' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='fastmap' type-id='type-id-9' visibility='default' filepath='/usr/include/regex.h' line='431' column='1'/>
+        <var-decl name='fastmap' type-id='type-id-9' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='translate' type-id='type-id-219' visibility='default' filepath='/usr/include/regex.h' line='437' column='1'/>
+        <var-decl name='translate' type-id='type-id-219' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='re_nsub' type-id='type-id-20' visibility='default' filepath='/usr/include/regex.h' line='440' column='1'/>
+        <var-decl name='re_nsub' type-id='type-id-20' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='31'>
-        <var-decl name='can_be_null' type-id='type-id-69' visibility='default' filepath='/usr/include/regex.h' line='446' column='1'/>
+        <var-decl name='can_be_null' type-id='type-id-69' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='29'>
-        <var-decl name='regs_allocated' type-id='type-id-69' visibility='default' filepath='/usr/include/regex.h' line='457' column='1'/>
+        <var-decl name='regs_allocated' type-id='type-id-69' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='28'>
-        <var-decl name='fastmap_accurate' type-id='type-id-69' visibility='default' filepath='/usr/include/regex.h' line='461' column='1'/>
+        <var-decl name='fastmap_accurate' type-id='type-id-69' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='27'>
-        <var-decl name='no_sub' type-id='type-id-69' visibility='default' filepath='/usr/include/regex.h' line='465' column='1'/>
+        <var-decl name='no_sub' type-id='type-id-69' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='26'>
-        <var-decl name='not_bol' type-id='type-id-69' visibility='default' filepath='/usr/include/regex.h' line='469' column='1'/>
+        <var-decl name='not_bol' type-id='type-id-69' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='25'>
-        <var-decl name='not_eol' type-id='type-id-69' visibility='default' filepath='/usr/include/regex.h' line='472' column='1'/>
+        <var-decl name='not_eol' type-id='type-id-69' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='24'>
-        <var-decl name='newline_anchor' type-id='type-id-69' visibility='default' filepath='/usr/include/regex.h' line='475' column='1'/>
+        <var-decl name='newline_anchor' type-id='type-id-69' visibility='default'/>
       </data-member>
     </class-decl>
     <class-decl name='re_dfa_t' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-248'/>
     <pointer-type-def type-id='type-id-248' size-in-bits='64' id='type-id-245'/>
-    <typedef-decl name='__re_long_size_t' type-id='type-id-29' filepath='/usr/include/regex.h' line='56' column='1' id='type-id-246'/>
-    <typedef-decl name='reg_syntax_t' type-id='type-id-29' filepath='/usr/include/regex.h' line='72' column='1' id='type-id-247'/>
-    <typedef-decl name='regex_t' type-id='type-id-244' filepath='/usr/include/regex.h' line='478' column='1' id='type-id-249'/>
+    <typedef-decl name='__re_long_size_t' type-id='type-id-29' id='type-id-246'/>
+    <typedef-decl name='reg_syntax_t' type-id='type-id-29' id='type-id-247'/>
+    <typedef-decl name='regex_t' type-id='type-id-244' id='type-id-249'/>
     <pointer-type-def type-id='type-id-249' size-in-bits='64' id='type-id-250'/>
-    <function-decl name='nvpair_value_match_regex' mangled-name='nvpair_value_match_regex' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='949' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_match_regex'>
-      <parameter type-id='type-id-243' name='nvp' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='949' column='1'/>
-      <parameter type-id='type-id-5' name='ai' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='949' column='1'/>
-      <parameter type-id='type-id-9' name='value' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='950' column='1'/>
-      <parameter type-id='type-id-250' name='value_regex' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='950' column='1'/>
-      <parameter type-id='type-id-153' name='ep' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='950' column='1'/>
+    <function-decl name='nvpair_value_match_regex' mangled-name='nvpair_value_match_regex' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_match_regex'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-5' name='ai'/>
+      <parameter type-id='type-id-9' name='value'/>
+      <parameter type-id='type-id-250' name='value_regex'/>
+      <parameter type-id='type-id-153' name='ep'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_type_is_array' filepath='../../include/sys/nvpair.h' line='246' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvpair_type_is_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <qualified-type-def type-id='type-id-244' const='yes' id='type-id-251'/>
     <pointer-type-def type-id='type-id-251' size-in-bits='64' id='type-id-252'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/regex.h' line='517' column='1' id='type-id-253'>
+    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-253'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='rm_so' type-id='type-id-254' visibility='default' filepath='/usr/include/regex.h' line='519' column='1'/>
+        <var-decl name='rm_so' type-id='type-id-254' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='rm_eo' type-id='type-id-254' visibility='default' filepath='/usr/include/regex.h' line='520' column='1'/>
+        <var-decl name='rm_eo' type-id='type-id-254' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='regoff_t' type-id='type-id-5' filepath='/usr/include/regex.h' line='490' column='1' id='type-id-254'/>
+    <typedef-decl name='regoff_t' type-id='type-id-5' id='type-id-254'/>
     <pointer-type-def type-id='type-id-253' size-in-bits='64' id='type-id-255'/>
-    <function-decl name='regexec' filepath='/usr/include/regex.h' line='643' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='regexec' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-252'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-29'/>
@@ -1359,11 +1353,11 @@
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_match' mangled-name='nvpair_value_match' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='1274' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_match'>
-      <parameter type-id='type-id-243' name='nvp' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='1274' column='1'/>
-      <parameter type-id='type-id-5' name='ai' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='1274' column='1'/>
-      <parameter type-id='type-id-9' name='value' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='1274' column='1'/>
-      <parameter type-id='type-id-153' name='ep' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair.c' line='1274' column='1'/>
+    <function-decl name='nvpair_value_match' mangled-name='nvpair_value_match' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_match'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-5' name='ai'/>
+      <parameter type-id='type-id-9' name='value'/>
+      <parameter type-id='type-id-153' name='ep'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-type size-in-bits='64' id='type-id-124'>
@@ -1823,45 +1817,45 @@
       <return type-id='type-id-5'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='libnvpair_json.c' comp-dir-path='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair' language='LANG_C99'>
-    <function-decl name='nvlist_print_json' mangled-name='nvlist_print_json' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair_json.c' line='118' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_print_json'>
-      <parameter type-id='type-id-3' name='fp' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair_json.c' line='118' column='1'/>
-      <parameter type-id='type-id-73' name='nvl' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/libnvpair_json.c' line='118' column='1'/>
+  <abi-instr version='1.0' address-size='64' path='libnvpair_json.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libnvpair' language='LANG_C99'>
+    <function-decl name='nvlist_print_json' mangled-name='nvlist_print_json' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_print_json'>
+      <parameter type-id='type-id-3' name='fp'/>
+      <parameter type-id='type-id-73' name='nvl'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvpair_value_byte' filepath='../../include/sys/nvpair.h' line='342' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='fnvpair_value_byte' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <return type-id='type-id-80'/>
     </function-decl>
-    <function-decl name='fnvpair_value_int16' filepath='../../include/sys/nvpair.h' line='344' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='fnvpair_value_int16' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <return type-id='type-id-92'/>
     </function-decl>
-    <function-decl name='fnvpair_value_uint16' filepath='../../include/sys/nvpair.h' line='348' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='fnvpair_value_uint16' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <return type-id='type-id-13'/>
     </function-decl>
-    <function-decl name='fnvpair_value_int32' filepath='../../include/sys/nvpair.h' line='345' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='fnvpair_value_int32' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvpair_value_uint32' filepath='../../include/sys/nvpair.h' line='349' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='fnvpair_value_uint32' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <return type-id='type-id-69'/>
     </function-decl>
-    <function-decl name='fnvpair_value_int64' filepath='../../include/sys/nvpair.h' line='346' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='fnvpair_value_int64' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <return type-id='type-id-24'/>
     </function-decl>
-    <function-decl name='fnvpair_value_uint64' filepath='../../include/sys/nvpair.h' line='350' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='fnvpair_value_uint64' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <return type-id='type-id-29'/>
     </function-decl>
-    <function-decl name='fnvpair_value_string' filepath='../../include/sys/nvpair.h' line='351' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='fnvpair_value_string' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='libspl_assertf' filepath='../../lib/libspl/include/assert.h' line='40' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='libspl_assertf' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-5'/>
@@ -1869,36 +1863,36 @@
       <parameter is-variadic='yes'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='fnvpair_value_nvlist' filepath='../../include/sys/nvpair.h' line='352' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='fnvpair_value_nvlist' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <return type-id='type-id-218'/>
     </function-decl>
-    <function-decl name='fnvpair_value_boolean_value' filepath='../../include/sys/nvpair.h' line='341' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='fnvpair_value_boolean_value' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <return type-id='type-id-76'/>
     </function-decl>
-    <function-decl name='fnvpair_value_int8' filepath='../../include/sys/nvpair.h' line='343' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='fnvpair_value_int8' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <return type-id='type-id-14'/>
     </function-decl>
-    <function-decl name='fnvpair_value_uint8' filepath='../../include/sys/nvpair.h' line='347' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='fnvpair_value_uint8' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-217'/>
       <return type-id='type-id-80'/>
     </function-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/__mbstate_t.h' line='13' column='1' id='type-id-256'>
+    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-256'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__count' type-id='type-id-5' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/__mbstate_t.h' line='15' column='1'/>
+        <var-decl name='__count' type-id='type-id-5' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='__value' type-id='type-id-257' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/__mbstate_t.h' line='20' column='1'/>
+        <var-decl name='__value' type-id='type-id-257' visibility='default'/>
       </data-member>
     </class-decl>
-    <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/__mbstate_t.h' line='16' column='1' id='type-id-257'>
+    <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' id='type-id-257'>
       <data-member access='private'>
-        <var-decl name='__wch' type-id='type-id-69' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/__mbstate_t.h' line='18' column='1'/>
+        <var-decl name='__wch' type-id='type-id-69' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='__wchb' type-id='type-id-258' visibility='default' filepath='/usr/include/x86_64-linux-gnu/bits/types/__mbstate_t.h' line='19' column='1'/>
+        <var-decl name='__wchb' type-id='type-id-258' visibility='default'/>
       </data-member>
     </union-decl>
 
@@ -1907,7 +1901,7 @@
 
     </array-type-def>
     <pointer-type-def type-id='type-id-256' size-in-bits='64' id='type-id-260'/>
-    <function-decl name='mbrtowc' filepath='/usr/include/wchar.h' line='296' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='mbrtowc' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-222'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-29'/>
@@ -1915,46 +1909,46 @@
       <return type-id='type-id-29'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='nvpair_alloc_system.c' comp-dir-path='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair' language='LANG_C99'>
-    <class-decl name='nv_alloc' size-in-bits='128' is-struct='yes' visibility='default' filepath='../../include/sys/nvpair.h' line='125' column='1' id='type-id-261'>
+  <abi-instr version='1.0' address-size='64' path='nvpair_alloc_system.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libnvpair' language='LANG_C99'>
+    <class-decl name='nv_alloc' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-261'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='nva_ops' type-id='type-id-262' visibility='default' filepath='../../include/sys/nvpair.h' line='126' column='1'/>
+        <var-decl name='nva_ops' type-id='type-id-262' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='nva_arg' type-id='type-id-19' visibility='default' filepath='../../include/sys/nvpair.h' line='127' column='1'/>
+        <var-decl name='nva_arg' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='nv_alloc_ops' size-in-bits='320' is-struct='yes' visibility='default' filepath='../../include/sys/nvpair.h' line='130' column='1' id='type-id-263'>
+    <class-decl name='nv_alloc_ops' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-263'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='nv_ao_init' type-id='type-id-264' visibility='default' filepath='../../include/sys/nvpair.h' line='131' column='1'/>
+        <var-decl name='nv_ao_init' type-id='type-id-264' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='nv_ao_fini' type-id='type-id-265' visibility='default' filepath='../../include/sys/nvpair.h' line='132' column='1'/>
+        <var-decl name='nv_ao_fini' type-id='type-id-265' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='nv_ao_alloc' type-id='type-id-266' visibility='default' filepath='../../include/sys/nvpair.h' line='133' column='1'/>
+        <var-decl name='nv_ao_alloc' type-id='type-id-266' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='nv_ao_free' type-id='type-id-267' visibility='default' filepath='../../include/sys/nvpair.h' line='134' column='1'/>
+        <var-decl name='nv_ao_free' type-id='type-id-267' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='nv_ao_reset' type-id='type-id-265' visibility='default' filepath='../../include/sys/nvpair.h' line='135' column='1'/>
+        <var-decl name='nv_ao_reset' type-id='type-id-265' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='nv_alloc_t' type-id='type-id-261' filepath='../../include/sys/nvpair.h' line='128' column='1' id='type-id-268'/>
+    <typedef-decl name='nv_alloc_t' type-id='type-id-261' id='type-id-268'/>
     <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-269'/>
     <class-decl name='__va_list_tag' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-270'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='gp_offset' type-id='type-id-69' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/nvpair_alloc_system.c' line='54' column='1'/>
+        <var-decl name='gp_offset' type-id='type-id-69' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='fp_offset' type-id='type-id-69' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/nvpair_alloc_system.c' line='54' column='1'/>
+        <var-decl name='fp_offset' type-id='type-id-69' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='overflow_arg_area' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/nvpair_alloc_system.c' line='54' column='1'/>
+        <var-decl name='overflow_arg_area' type-id='type-id-19' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='reg_save_area' type-id='type-id-19' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/nvpair_alloc_system.c' line='54' column='1'/>
+        <var-decl name='reg_save_area' type-id='type-id-19' visibility='default'/>
       </data-member>
     </class-decl>
     <pointer-type-def type-id='type-id-270' size-in-bits='64' id='type-id-271'/>
@@ -1962,13 +1956,10 @@
     <pointer-type-def type-id='type-id-273' size-in-bits='64' id='type-id-265'/>
     <pointer-type-def type-id='type-id-274' size-in-bits='64' id='type-id-266'/>
     <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-267'/>
-    <typedef-decl name='nv_alloc_ops_t' type-id='type-id-263' filepath='../../include/sys/nvpair.h' line='123' column='1' id='type-id-276'/>
+    <typedef-decl name='nv_alloc_ops_t' type-id='type-id-263' id='type-id-276'/>
     <qualified-type-def type-id='type-id-276' const='yes' id='type-id-277'/>
     <pointer-type-def type-id='type-id-277' size-in-bits='64' id='type-id-262'/>
-    <var-decl name='nv_alloc_sleep_def' type-id='type-id-268' mangled-name='nv_alloc_sleep_def' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/nvpair_alloc_system.c' line='54' column='1' elf-symbol-id='nv_alloc_sleep_def'/>
-    <var-decl name='nv_alloc_nosleep_def' type-id='type-id-268' mangled-name='nv_alloc_nosleep_def' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/nvpair_alloc_system.c' line='59' column='1' elf-symbol-id='nv_alloc_nosleep_def'/>
-    <var-decl name='nv_alloc_sleep' type-id='type-id-269' mangled-name='nv_alloc_sleep' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/nvpair_alloc_system.c' line='64' column='1' elf-symbol-id='nv_alloc_sleep'/>
-    <var-decl name='nv_alloc_nosleep' type-id='type-id-269' mangled-name='nv_alloc_nosleep' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair/nvpair_alloc_system.c' line='65' column='1' elf-symbol-id='nv_alloc_nosleep'/>
+    <var-decl name='nv_alloc_nosleep' type-id='type-id-269' mangled-name='nv_alloc_nosleep' visibility='default' elf-symbol-id='nv_alloc_nosleep'/>
     <function-type size-in-bits='64' id='type-id-272'>
       <parameter type-id='type-id-269'/>
       <parameter type-id='type-id-271'/>
@@ -1990,721 +1981,718 @@
       <return type-id='type-id-19'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../module/nvpair/nvpair_alloc_fixed.c' comp-dir-path='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair' language='LANG_C99'>
-    <var-decl name='nv_fixed_ops_def' type-id='type-id-277' mangled-name='nv_fixed_ops_def' visibility='default' filepath='../../module/nvpair/nvpair_alloc_fixed.c' line='103' column='1' elf-symbol-id='nv_fixed_ops_def'/>
-    <var-decl name='nv_fixed_ops' type-id='type-id-262' mangled-name='nv_fixed_ops' visibility='default' filepath='../../module/nvpair/nvpair_alloc_fixed.c' line='111' column='1' elf-symbol-id='nv_fixed_ops'/>
+  <abi-instr version='1.0' address-size='64' path='../../module/nvpair/nvpair_alloc_fixed.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libnvpair' language='LANG_C99'>
+    <var-decl name='nv_fixed_ops' type-id='type-id-262' mangled-name='nv_fixed_ops' visibility='default' elf-symbol-id='nv_fixed_ops'/>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../module/nvpair/nvpair.c' comp-dir-path='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair' language='LANG_C99'>
-    <var-decl name='nvpair_max_recursion' type-id='type-id-5' mangled-name='nvpair_max_recursion' visibility='default' filepath='../../module/nvpair/nvpair.c' line='151' column='1' elf-symbol-id='nvpair_max_recursion'/>
-    <var-decl name='nvlist_hashtable_init_size' type-id='type-id-67' mangled-name='nvlist_hashtable_init_size' visibility='default' filepath='../../module/nvpair/nvpair.c' line='154' column='1' elf-symbol-id='nvlist_hashtable_init_size'/>
-    <function-decl name='nv_alloc_init' mangled-name='nv_alloc_init' filepath='../../module/nvpair/nvpair.c' line='157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nv_alloc_init'>
-      <parameter type-id='type-id-269' name='nva' filepath='../../module/nvpair/nvpair.c' line='157' column='1'/>
-      <parameter type-id='type-id-262' name='nvo' filepath='../../module/nvpair/nvpair.c' line='157' column='1'/>
+  <abi-instr version='1.0' address-size='64' path='../../module/nvpair/nvpair.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libnvpair' language='LANG_C99'>
+    <function-decl name='nv_alloc_init' mangled-name='nv_alloc_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nv_alloc_init'>
+      <parameter type-id='type-id-269' name='nva'/>
+      <parameter type-id='type-id-262' name='nvo'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nv_alloc_reset' mangled-name='nv_alloc_reset' filepath='../../module/nvpair/nvpair.c' line='174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nv_alloc_reset'>
-      <parameter type-id='type-id-269' name='nva' filepath='../../module/nvpair/nvpair.c' line='174' column='1'/>
+    <function-decl name='nv_alloc_reset' mangled-name='nv_alloc_reset' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nv_alloc_reset'>
+      <parameter type-id='type-id-269' name='nva'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nv_alloc_fini' mangled-name='nv_alloc_fini' filepath='../../module/nvpair/nvpair.c' line='181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nv_alloc_fini'>
-      <parameter type-id='type-id-269' name='nva' filepath='../../module/nvpair/nvpair.c' line='174' column='1'/>
+    <function-decl name='nv_alloc_fini' mangled-name='nv_alloc_fini' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nv_alloc_fini'>
+      <parameter type-id='type-id-269' name='nva'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_nv_alloc' mangled-name='nvlist_lookup_nv_alloc' filepath='../../module/nvpair/nvpair.c' line='188' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_nv_alloc'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='188' column='1'/>
+    <function-decl name='nvlist_lookup_nv_alloc' mangled-name='nvlist_lookup_nv_alloc' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_nv_alloc'>
+      <parameter type-id='type-id-73' name='nvl'/>
       <return type-id='type-id-269'/>
     </function-decl>
-    <function-decl name='nvlist_nvflag' mangled-name='nvlist_nvflag' filepath='../../module/nvpair/nvpair.c' line='559' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_nvflag'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='559' column='1'/>
+    <function-decl name='nvlist_nvflag' mangled-name='nvlist_nvflag' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_nvflag'>
+      <parameter type-id='type-id-73' name='nvl'/>
       <return type-id='type-id-123'/>
     </function-decl>
-    <function-decl name='nvlist_alloc' mangled-name='nvlist_alloc' filepath='../../module/nvpair/nvpair.c' line='585' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_alloc'>
-      <parameter type-id='type-id-156' name='nvlp' filepath='../../module/nvpair/nvpair.c' line='585' column='1'/>
-      <parameter type-id='type-id-123' name='nvflag' filepath='../../module/nvpair/nvpair.c' line='585' column='1'/>
-      <parameter type-id='type-id-5' name='kmflag' filepath='../../module/nvpair/nvpair.c' line='585' column='1'/>
+    <function-decl name='nvlist_alloc' mangled-name='nvlist_alloc' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_alloc'>
+      <parameter type-id='type-id-156' name='nvlp'/>
+      <parameter type-id='type-id-123' name='nvflag'/>
+      <parameter type-id='type-id-5' name='kmflag'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_xalloc' mangled-name='nvlist_xalloc' filepath='../../module/nvpair/nvpair.c' line='591' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_xalloc'>
-      <parameter type-id='type-id-156' name='nvlp' filepath='../../module/nvpair/nvpair.c' line='591' column='1'/>
-      <parameter type-id='type-id-123' name='nvflag' filepath='../../module/nvpair/nvpair.c' line='591' column='1'/>
-      <parameter type-id='type-id-269' name='nva' filepath='../../module/nvpair/nvpair.c' line='591' column='1'/>
+    <function-decl name='nvlist_xalloc' mangled-name='nvlist_xalloc' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_xalloc'>
+      <parameter type-id='type-id-156' name='nvlp'/>
+      <parameter type-id='type-id-123' name='nvflag'/>
+      <parameter type-id='type-id-269' name='nva'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_free' mangled-name='nvlist_free' filepath='../../module/nvpair/nvpair.c' line='866' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_free'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='866' column='1'/>
+    <function-decl name='nvlist_free' mangled-name='nvlist_free' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_free'>
+      <parameter type-id='type-id-73' name='nvl'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_dup' mangled-name='nvlist_dup' filepath='../../module/nvpair/nvpair.c' line='916' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_dup'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='916' column='1'/>
-      <parameter type-id='type-id-156' name='nvlp' filepath='../../module/nvpair/nvpair.c' line='916' column='1'/>
-      <parameter type-id='type-id-5' name='kmflag' filepath='../../module/nvpair/nvpair.c' line='916' column='1'/>
+    <function-decl name='nvlist_dup' mangled-name='nvlist_dup' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_dup'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-156' name='nvlp'/>
+      <parameter type-id='type-id-5' name='kmflag'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_xdup' mangled-name='nvlist_xdup' filepath='../../module/nvpair/nvpair.c' line='922' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_xdup'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='922' column='1'/>
-      <parameter type-id='type-id-156' name='nvlp' filepath='../../module/nvpair/nvpair.c' line='922' column='1'/>
-      <parameter type-id='type-id-269' name='nva' filepath='../../module/nvpair/nvpair.c' line='922' column='1'/>
+    <function-decl name='nvlist_xdup' mangled-name='nvlist_xdup' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_xdup'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-156' name='nvlp'/>
+      <parameter type-id='type-id-269' name='nva'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_remove_all' mangled-name='nvlist_remove_all' filepath='../../module/nvpair/nvpair.c' line='945' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_remove_all'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='945' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='945' column='1'/>
+    <function-decl name='nvlist_remove_all' mangled-name='nvlist_remove_all' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_remove_all'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_remove_nvpair' mangled-name='nvlist_remove_nvpair' filepath='../../module/nvpair/nvpair.c' line='978' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_remove_nvpair'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='978' column='1'/>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='978' column='1'/>
+    <function-decl name='nvlist_remove_nvpair' mangled-name='nvlist_remove_nvpair' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_remove_nvpair'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-243' name='nvp'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_remove' mangled-name='nvlist_remove' filepath='../../module/nvpair/nvpair.c' line='965' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_remove'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='965' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='965' column='1'/>
-      <parameter type-id='type-id-215' name='type' filepath='../../module/nvpair/nvpair.c' line='965' column='1'/>
+    <function-decl name='nvlist_remove' mangled-name='nvlist_remove' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_remove'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-215' name='type'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_boolean' mangled-name='nvlist_add_boolean' filepath='../../module/nvpair/nvpair.c' line='1276' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_boolean'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1276' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1276' column='1'/>
+    <function-decl name='nvlist_add_boolean' mangled-name='nvlist_add_boolean' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_boolean'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_boolean_value' mangled-name='nvlist_add_boolean_value' filepath='../../module/nvpair/nvpair.c' line='1282' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_boolean_value'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1282' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1282' column='1'/>
-      <parameter type-id='type-id-77' name='val' filepath='../../module/nvpair/nvpair.c' line='1282' column='1'/>
+    <function-decl name='nvlist_add_boolean_value' mangled-name='nvlist_add_boolean_value' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_boolean_value'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-77' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_byte' mangled-name='nvlist_add_byte' filepath='../../module/nvpair/nvpair.c' line='1288' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_byte'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1288' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1288' column='1'/>
-      <parameter type-id='type-id-81' name='val' filepath='../../module/nvpair/nvpair.c' line='1288' column='1'/>
+    <function-decl name='nvlist_add_byte' mangled-name='nvlist_add_byte' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_byte'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-81' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_int8' mangled-name='nvlist_add_int8' filepath='../../module/nvpair/nvpair.c' line='1294' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_int8'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1294' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1294' column='1'/>
-      <parameter type-id='type-id-85' name='val' filepath='../../module/nvpair/nvpair.c' line='1294' column='1'/>
+    <function-decl name='nvlist_add_int8' mangled-name='nvlist_add_int8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_int8'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-85' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_uint8' mangled-name='nvlist_add_uint8' filepath='../../module/nvpair/nvpair.c' line='1300' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_uint8'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1300' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1300' column='1'/>
-      <parameter type-id='type-id-89' name='val' filepath='../../module/nvpair/nvpair.c' line='1300' column='1'/>
+    <function-decl name='nvlist_add_uint8' mangled-name='nvlist_add_uint8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_uint8'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-89' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_int16' mangled-name='nvlist_add_int16' filepath='../../module/nvpair/nvpair.c' line='1306' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_int16'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1306' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1306' column='1'/>
-      <parameter type-id='type-id-94' name='val' filepath='../../module/nvpair/nvpair.c' line='1306' column='1'/>
+    <function-decl name='nvlist_add_int16' mangled-name='nvlist_add_int16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_int16'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-94' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_uint16' mangled-name='nvlist_add_uint16' filepath='../../module/nvpair/nvpair.c' line='1312' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_uint16'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1312' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1312' column='1'/>
-      <parameter type-id='type-id-98' name='val' filepath='../../module/nvpair/nvpair.c' line='1312' column='1'/>
+    <function-decl name='nvlist_add_uint16' mangled-name='nvlist_add_uint16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_uint16'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-98' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_int32' mangled-name='nvlist_add_int32' filepath='../../module/nvpair/nvpair.c' line='1318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_int32'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1318' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1318' column='1'/>
-      <parameter type-id='type-id-65' name='val' filepath='../../module/nvpair/nvpair.c' line='1318' column='1'/>
+    <function-decl name='nvlist_add_int32' mangled-name='nvlist_add_int32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_int32'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-65' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_uint32' mangled-name='nvlist_add_uint32' filepath='../../module/nvpair/nvpair.c' line='1324' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_uint32'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1324' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1324' column='1'/>
-      <parameter type-id='type-id-66' name='val' filepath='../../module/nvpair/nvpair.c' line='1324' column='1'/>
+    <function-decl name='nvlist_add_uint32' mangled-name='nvlist_add_uint32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_uint32'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-66' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_int64' mangled-name='nvlist_add_int64' filepath='../../module/nvpair/nvpair.c' line='1330' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_int64'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1330' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1330' column='1'/>
-      <parameter type-id='type-id-106' name='val' filepath='../../module/nvpair/nvpair.c' line='1330' column='1'/>
+    <function-decl name='nvlist_add_int64' mangled-name='nvlist_add_int64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_int64'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-106' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_uint64' mangled-name='nvlist_add_uint64' filepath='../../module/nvpair/nvpair.c' line='1336' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_uint64'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1336' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1336' column='1'/>
-      <parameter type-id='type-id-67' name='val' filepath='../../module/nvpair/nvpair.c' line='1336' column='1'/>
+    <function-decl name='nvlist_add_uint64' mangled-name='nvlist_add_uint64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_uint64'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-67' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_double' mangled-name='nvlist_add_double' filepath='../../module/nvpair/nvpair.c' line='1343' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_double'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1343' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1343' column='1'/>
-      <parameter type-id='type-id-111' name='val' filepath='../../module/nvpair/nvpair.c' line='1343' column='1'/>
+    <function-decl name='nvlist_add_double' mangled-name='nvlist_add_double' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_double'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-111' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_string' mangled-name='nvlist_add_string' filepath='../../module/nvpair/nvpair.c' line='1350' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_string'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1350' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1350' column='1'/>
-      <parameter type-id='type-id-6' name='val' filepath='../../module/nvpair/nvpair.c' line='1350' column='1'/>
+    <function-decl name='nvlist_add_string' mangled-name='nvlist_add_string' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_string'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-6' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_boolean_array' mangled-name='nvlist_add_boolean_array' filepath='../../module/nvpair/nvpair.c' line='1356' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_boolean_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1356' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1356' column='1'/>
-      <parameter type-id='type-id-122' name='a' filepath='../../module/nvpair/nvpair.c' line='1357' column='1'/>
-      <parameter type-id='type-id-123' name='n' filepath='../../module/nvpair/nvpair.c' line='1357' column='1'/>
+    <function-decl name='nvlist_add_boolean_array' mangled-name='nvlist_add_boolean_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_boolean_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-122' name='a'/>
+      <parameter type-id='type-id-123' name='n'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_byte_array' mangled-name='nvlist_add_byte_array' filepath='../../module/nvpair/nvpair.c' line='1363' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_byte_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1363' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1363' column='1'/>
-      <parameter type-id='type-id-126' name='a' filepath='../../module/nvpair/nvpair.c' line='1363' column='1'/>
-      <parameter type-id='type-id-123' name='n' filepath='../../module/nvpair/nvpair.c' line='1363' column='1'/>
+    <function-decl name='nvlist_add_byte_array' mangled-name='nvlist_add_byte_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_byte_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-126' name='a'/>
+      <parameter type-id='type-id-123' name='n'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_int8_array' mangled-name='nvlist_add_int8_array' filepath='../../module/nvpair/nvpair.c' line='1369' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_int8_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1369' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1369' column='1'/>
-      <parameter type-id='type-id-129' name='a' filepath='../../module/nvpair/nvpair.c' line='1369' column='1'/>
-      <parameter type-id='type-id-123' name='n' filepath='../../module/nvpair/nvpair.c' line='1369' column='1'/>
+    <function-decl name='nvlist_add_int8_array' mangled-name='nvlist_add_int8_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_int8_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-129' name='a'/>
+      <parameter type-id='type-id-123' name='n'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_uint8_array' mangled-name='nvlist_add_uint8_array' filepath='../../module/nvpair/nvpair.c' line='1375' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_uint8_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1375' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1375' column='1'/>
-      <parameter type-id='type-id-132' name='a' filepath='../../module/nvpair/nvpair.c' line='1375' column='1'/>
-      <parameter type-id='type-id-123' name='n' filepath='../../module/nvpair/nvpair.c' line='1375' column='1'/>
+    <function-decl name='nvlist_add_uint8_array' mangled-name='nvlist_add_uint8_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_uint8_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-132' name='a'/>
+      <parameter type-id='type-id-123' name='n'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_int16_array' mangled-name='nvlist_add_int16_array' filepath='../../module/nvpair/nvpair.c' line='1381' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_int16_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1381' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1381' column='1'/>
-      <parameter type-id='type-id-135' name='a' filepath='../../module/nvpair/nvpair.c' line='1381' column='1'/>
-      <parameter type-id='type-id-123' name='n' filepath='../../module/nvpair/nvpair.c' line='1381' column='1'/>
+    <function-decl name='nvlist_add_int16_array' mangled-name='nvlist_add_int16_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_int16_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-135' name='a'/>
+      <parameter type-id='type-id-123' name='n'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_uint16_array' mangled-name='nvlist_add_uint16_array' filepath='../../module/nvpair/nvpair.c' line='1387' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_uint16_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1387' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1387' column='1'/>
-      <parameter type-id='type-id-138' name='a' filepath='../../module/nvpair/nvpair.c' line='1387' column='1'/>
-      <parameter type-id='type-id-123' name='n' filepath='../../module/nvpair/nvpair.c' line='1387' column='1'/>
+    <function-decl name='nvlist_add_uint16_array' mangled-name='nvlist_add_uint16_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_uint16_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-138' name='a'/>
+      <parameter type-id='type-id-123' name='n'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_int32_array' mangled-name='nvlist_add_int32_array' filepath='../../module/nvpair/nvpair.c' line='1393' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_int32_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1393' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1393' column='1'/>
-      <parameter type-id='type-id-141' name='a' filepath='../../module/nvpair/nvpair.c' line='1393' column='1'/>
-      <parameter type-id='type-id-123' name='n' filepath='../../module/nvpair/nvpair.c' line='1393' column='1'/>
+    <function-decl name='nvlist_add_int32_array' mangled-name='nvlist_add_int32_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_int32_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-141' name='a'/>
+      <parameter type-id='type-id-123' name='n'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_uint32_array' mangled-name='nvlist_add_uint32_array' filepath='../../module/nvpair/nvpair.c' line='1399' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_uint32_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1399' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1399' column='1'/>
-      <parameter type-id='type-id-144' name='a' filepath='../../module/nvpair/nvpair.c' line='1399' column='1'/>
-      <parameter type-id='type-id-123' name='n' filepath='../../module/nvpair/nvpair.c' line='1399' column='1'/>
+    <function-decl name='nvlist_add_uint32_array' mangled-name='nvlist_add_uint32_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_uint32_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-144' name='a'/>
+      <parameter type-id='type-id-123' name='n'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_int64_array' mangled-name='nvlist_add_int64_array' filepath='../../module/nvpair/nvpair.c' line='1405' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_int64_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1405' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1405' column='1'/>
-      <parameter type-id='type-id-147' name='a' filepath='../../module/nvpair/nvpair.c' line='1405' column='1'/>
-      <parameter type-id='type-id-123' name='n' filepath='../../module/nvpair/nvpair.c' line='1405' column='1'/>
+    <function-decl name='nvlist_add_int64_array' mangled-name='nvlist_add_int64_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_int64_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-147' name='a'/>
+      <parameter type-id='type-id-123' name='n'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_uint64_array' mangled-name='nvlist_add_uint64_array' filepath='../../module/nvpair/nvpair.c' line='1411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_uint64_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1411' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1411' column='1'/>
-      <parameter type-id='type-id-150' name='a' filepath='../../module/nvpair/nvpair.c' line='1411' column='1'/>
-      <parameter type-id='type-id-123' name='n' filepath='../../module/nvpair/nvpair.c' line='1411' column='1'/>
+    <function-decl name='nvlist_add_uint64_array' mangled-name='nvlist_add_uint64_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_uint64_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-150' name='a'/>
+      <parameter type-id='type-id-123' name='n'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <qualified-type-def type-id='type-id-9' const='yes' id='type-id-278'/>
     <pointer-type-def type-id='type-id-278' size-in-bits='64' id='type-id-279'/>
-    <function-decl name='nvlist_add_string_array' mangled-name='nvlist_add_string_array' filepath='../../module/nvpair/nvpair.c' line='1417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_string_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1417' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1417' column='1'/>
-      <parameter type-id='type-id-279' name='a' filepath='../../module/nvpair/nvpair.c' line='1418' column='1'/>
-      <parameter type-id='type-id-123' name='n' filepath='../../module/nvpair/nvpair.c' line='1418' column='1'/>
+    <function-decl name='nvlist_add_string_array' mangled-name='nvlist_add_string_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_string_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-279' name='a'/>
+      <parameter type-id='type-id-123' name='n'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_hrtime' mangled-name='nvlist_add_hrtime' filepath='../../module/nvpair/nvpair.c' line='1424' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_hrtime'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1424' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1424' column='1'/>
-      <parameter type-id='type-id-117' name='val' filepath='../../module/nvpair/nvpair.c' line='1424' column='1'/>
+    <function-decl name='nvlist_add_hrtime' mangled-name='nvlist_add_hrtime' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_hrtime'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-117' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_nvlist' mangled-name='nvlist_add_nvlist' filepath='../../module/nvpair/nvpair.c' line='1430' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_nvlist'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1430' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1430' column='1'/>
-      <parameter type-id='type-id-73' name='val' filepath='../../module/nvpair/nvpair.c' line='1430' column='1'/>
+    <function-decl name='nvlist_add_nvlist' mangled-name='nvlist_add_nvlist' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_nvlist'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-73' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_nvlist_array' mangled-name='nvlist_add_nvlist_array' filepath='../../module/nvpair/nvpair.c' line='1436' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_nvlist_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1436' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1436' column='1'/>
-      <parameter type-id='type-id-156' name='a' filepath='../../module/nvpair/nvpair.c' line='1436' column='1'/>
-      <parameter type-id='type-id-123' name='n' filepath='../../module/nvpair/nvpair.c' line='1436' column='1'/>
+    <function-decl name='nvlist_add_nvlist_array' mangled-name='nvlist_add_nvlist_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_nvlist_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-156' name='a'/>
+      <parameter type-id='type-id-123' name='n'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_next_nvpair' mangled-name='nvlist_next_nvpair' filepath='../../module/nvpair/nvpair.c' line='1443' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_next_nvpair'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1443' column='1'/>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='1443' column='1'/>
+    <function-decl name='nvlist_next_nvpair' mangled-name='nvlist_next_nvpair' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_next_nvpair'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-243' name='nvp'/>
       <return type-id='type-id-243'/>
     </function-decl>
-    <function-decl name='nvlist_prev_nvpair' mangled-name='nvlist_prev_nvpair' filepath='../../module/nvpair/nvpair.c' line='1472' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prev_nvpair'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1443' column='1'/>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='1443' column='1'/>
+    <function-decl name='nvlist_prev_nvpair' mangled-name='nvlist_prev_nvpair' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_prev_nvpair'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-243' name='nvp'/>
       <return type-id='type-id-243'/>
     </function-decl>
-    <function-decl name='nvlist_empty' mangled-name='nvlist_empty' filepath='../../module/nvpair/nvpair.c' line='1496' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_empty'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1496' column='1'/>
+    <function-decl name='nvlist_empty' mangled-name='nvlist_empty' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_empty'>
+      <parameter type-id='type-id-73' name='nvl'/>
       <return type-id='type-id-77'/>
     </function-decl>
-    <function-decl name='nvpair_name' mangled-name='nvpair_name' filepath='../../module/nvpair/nvpair.c' line='1508' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_name'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='1508' column='1'/>
+    <function-decl name='nvpair_name' mangled-name='nvpair_name' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_name'>
+      <parameter type-id='type-id-243' name='nvp'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='nvpair_type' mangled-name='nvpair_type' filepath='../../module/nvpair/nvpair.c' line='1514' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_type'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='1514' column='1'/>
+    <function-decl name='nvpair_type' mangled-name='nvpair_type' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_type'>
+      <parameter type-id='type-id-243' name='nvp'/>
       <return type-id='type-id-215'/>
     </function-decl>
-    <function-decl name='nvpair_type_is_array' mangled-name='nvpair_type_is_array' filepath='../../module/nvpair/nvpair.c' line='1520' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_type_is_array'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='1520' column='1'/>
+    <function-decl name='nvpair_type_is_array' mangled-name='nvpair_type_is_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_type_is_array'>
+      <parameter type-id='type-id-243' name='nvp'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_boolean' mangled-name='nvlist_lookup_boolean' filepath='../../module/nvpair/nvpair.c' line='1636' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_boolean'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1276' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1276' column='1'/>
+    <function-decl name='nvlist_lookup_boolean' mangled-name='nvlist_lookup_boolean' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_boolean'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_boolean_value' mangled-name='nvlist_lookup_boolean_value' filepath='../../module/nvpair/nvpair.c' line='1642' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_boolean_value'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1642' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1642' column='1'/>
-      <parameter type-id='type-id-122' name='val' filepath='../../module/nvpair/nvpair.c' line='1642' column='1'/>
+    <function-decl name='nvlist_lookup_boolean_value' mangled-name='nvlist_lookup_boolean_value' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_boolean_value'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-122' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_byte' mangled-name='nvlist_lookup_byte' filepath='../../module/nvpair/nvpair.c' line='1649' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_byte'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1649' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1649' column='1'/>
-      <parameter type-id='type-id-126' name='val' filepath='../../module/nvpair/nvpair.c' line='1649' column='1'/>
+    <function-decl name='nvlist_lookup_byte' mangled-name='nvlist_lookup_byte' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_byte'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-126' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_int8' mangled-name='nvlist_lookup_int8' filepath='../../module/nvpair/nvpair.c' line='1655' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_int8'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1655' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1655' column='1'/>
-      <parameter type-id='type-id-129' name='val' filepath='../../module/nvpair/nvpair.c' line='1655' column='1'/>
+    <function-decl name='nvlist_lookup_int8' mangled-name='nvlist_lookup_int8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_int8'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-129' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_uint8' mangled-name='nvlist_lookup_uint8' filepath='../../module/nvpair/nvpair.c' line='1661' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_uint8'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1661' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1661' column='1'/>
-      <parameter type-id='type-id-132' name='val' filepath='../../module/nvpair/nvpair.c' line='1661' column='1'/>
+    <function-decl name='nvlist_lookup_uint8' mangled-name='nvlist_lookup_uint8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_uint8'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-132' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_int16' mangled-name='nvlist_lookup_int16' filepath='../../module/nvpair/nvpair.c' line='1667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_int16'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1667' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1667' column='1'/>
-      <parameter type-id='type-id-135' name='val' filepath='../../module/nvpair/nvpair.c' line='1667' column='1'/>
+    <function-decl name='nvlist_lookup_int16' mangled-name='nvlist_lookup_int16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_int16'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-135' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_uint16' mangled-name='nvlist_lookup_uint16' filepath='../../module/nvpair/nvpair.c' line='1673' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_uint16'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1673' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1673' column='1'/>
-      <parameter type-id='type-id-138' name='val' filepath='../../module/nvpair/nvpair.c' line='1673' column='1'/>
+    <function-decl name='nvlist_lookup_uint16' mangled-name='nvlist_lookup_uint16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_uint16'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-138' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_int32' mangled-name='nvlist_lookup_int32' filepath='../../module/nvpair/nvpair.c' line='1679' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_int32'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1679' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1679' column='1'/>
-      <parameter type-id='type-id-141' name='val' filepath='../../module/nvpair/nvpair.c' line='1679' column='1'/>
+    <function-decl name='nvlist_lookup_int32' mangled-name='nvlist_lookup_int32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_int32'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-141' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_uint32' mangled-name='nvlist_lookup_uint32' filepath='../../module/nvpair/nvpair.c' line='1685' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_uint32'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1685' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1685' column='1'/>
-      <parameter type-id='type-id-144' name='val' filepath='../../module/nvpair/nvpair.c' line='1685' column='1'/>
+    <function-decl name='nvlist_lookup_uint32' mangled-name='nvlist_lookup_uint32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_uint32'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-144' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_int64' mangled-name='nvlist_lookup_int64' filepath='../../module/nvpair/nvpair.c' line='1691' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_int64'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1691' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1691' column='1'/>
-      <parameter type-id='type-id-147' name='val' filepath='../../module/nvpair/nvpair.c' line='1691' column='1'/>
+    <function-decl name='nvlist_lookup_int64' mangled-name='nvlist_lookup_int64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_int64'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-147' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_uint64' mangled-name='nvlist_lookup_uint64' filepath='../../module/nvpair/nvpair.c' line='1697' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_uint64'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1697' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1697' column='1'/>
-      <parameter type-id='type-id-150' name='val' filepath='../../module/nvpair/nvpair.c' line='1697' column='1'/>
+    <function-decl name='nvlist_lookup_uint64' mangled-name='nvlist_lookup_uint64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_uint64'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-150' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_double' mangled-name='nvlist_lookup_double' filepath='../../module/nvpair/nvpair.c' line='1704' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_double'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1704' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1704' column='1'/>
-      <parameter type-id='type-id-241' name='val' filepath='../../module/nvpair/nvpair.c' line='1704' column='1'/>
+    <function-decl name='nvlist_lookup_double' mangled-name='nvlist_lookup_double' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_double'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-241' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_string' mangled-name='nvlist_lookup_string' filepath='../../module/nvpair/nvpair.c' line='1711' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_string'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1711' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1711' column='1'/>
-      <parameter type-id='type-id-153' name='val' filepath='../../module/nvpair/nvpair.c' line='1711' column='1'/>
+    <function-decl name='nvlist_lookup_string' mangled-name='nvlist_lookup_string' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_string'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-153' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_nvlist' mangled-name='nvlist_lookup_nvlist' filepath='../../module/nvpair/nvpair.c' line='1717' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_nvlist'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1717' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1717' column='1'/>
-      <parameter type-id='type-id-156' name='val' filepath='../../module/nvpair/nvpair.c' line='1717' column='1'/>
+    <function-decl name='nvlist_lookup_nvlist' mangled-name='nvlist_lookup_nvlist' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_nvlist'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-156' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-122' size-in-bits='64' id='type-id-280'/>
     <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-281'/>
-    <function-decl name='nvlist_lookup_boolean_array' mangled-name='nvlist_lookup_boolean_array' filepath='../../module/nvpair/nvpair.c' line='1723' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_boolean_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1723' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1723' column='1'/>
-      <parameter type-id='type-id-280' name='a' filepath='../../module/nvpair/nvpair.c' line='1724' column='1'/>
-      <parameter type-id='type-id-281' name='n' filepath='../../module/nvpair/nvpair.c' line='1724' column='1'/>
+    <function-decl name='nvlist_lookup_boolean_array' mangled-name='nvlist_lookup_boolean_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_boolean_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-280' name='a'/>
+      <parameter type-id='type-id-281' name='n'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-126' size-in-bits='64' id='type-id-282'/>
-    <function-decl name='nvlist_lookup_byte_array' mangled-name='nvlist_lookup_byte_array' filepath='../../module/nvpair/nvpair.c' line='1731' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_byte_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1731' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1731' column='1'/>
-      <parameter type-id='type-id-282' name='a' filepath='../../module/nvpair/nvpair.c' line='1732' column='1'/>
-      <parameter type-id='type-id-281' name='n' filepath='../../module/nvpair/nvpair.c' line='1732' column='1'/>
+    <function-decl name='nvlist_lookup_byte_array' mangled-name='nvlist_lookup_byte_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_byte_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-282' name='a'/>
+      <parameter type-id='type-id-281' name='n'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-129' size-in-bits='64' id='type-id-283'/>
-    <function-decl name='nvlist_lookup_int8_array' mangled-name='nvlist_lookup_int8_array' filepath='../../module/nvpair/nvpair.c' line='1738' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_int8_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1738' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1738' column='1'/>
-      <parameter type-id='type-id-283' name='a' filepath='../../module/nvpair/nvpair.c' line='1738' column='1'/>
-      <parameter type-id='type-id-281' name='n' filepath='../../module/nvpair/nvpair.c' line='1738' column='1'/>
+    <function-decl name='nvlist_lookup_int8_array' mangled-name='nvlist_lookup_int8_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_int8_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-283' name='a'/>
+      <parameter type-id='type-id-281' name='n'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-132' size-in-bits='64' id='type-id-284'/>
-    <function-decl name='nvlist_lookup_uint8_array' mangled-name='nvlist_lookup_uint8_array' filepath='../../module/nvpair/nvpair.c' line='1744' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_uint8_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1744' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1744' column='1'/>
-      <parameter type-id='type-id-284' name='a' filepath='../../module/nvpair/nvpair.c' line='1745' column='1'/>
-      <parameter type-id='type-id-281' name='n' filepath='../../module/nvpair/nvpair.c' line='1745' column='1'/>
+    <function-decl name='nvlist_lookup_uint8_array' mangled-name='nvlist_lookup_uint8_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_uint8_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-284' name='a'/>
+      <parameter type-id='type-id-281' name='n'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-285'/>
-    <function-decl name='nvlist_lookup_int16_array' mangled-name='nvlist_lookup_int16_array' filepath='../../module/nvpair/nvpair.c' line='1751' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_int16_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1751' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1751' column='1'/>
-      <parameter type-id='type-id-285' name='a' filepath='../../module/nvpair/nvpair.c' line='1752' column='1'/>
-      <parameter type-id='type-id-281' name='n' filepath='../../module/nvpair/nvpair.c' line='1752' column='1'/>
+    <function-decl name='nvlist_lookup_int16_array' mangled-name='nvlist_lookup_int16_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_int16_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-285' name='a'/>
+      <parameter type-id='type-id-281' name='n'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-138' size-in-bits='64' id='type-id-286'/>
-    <function-decl name='nvlist_lookup_uint16_array' mangled-name='nvlist_lookup_uint16_array' filepath='../../module/nvpair/nvpair.c' line='1758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_uint16_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1758' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1758' column='1'/>
-      <parameter type-id='type-id-286' name='a' filepath='../../module/nvpair/nvpair.c' line='1759' column='1'/>
-      <parameter type-id='type-id-281' name='n' filepath='../../module/nvpair/nvpair.c' line='1759' column='1'/>
+    <function-decl name='nvlist_lookup_uint16_array' mangled-name='nvlist_lookup_uint16_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_uint16_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-286' name='a'/>
+      <parameter type-id='type-id-281' name='n'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-141' size-in-bits='64' id='type-id-287'/>
-    <function-decl name='nvlist_lookup_int32_array' mangled-name='nvlist_lookup_int32_array' filepath='../../module/nvpair/nvpair.c' line='1765' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_int32_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1765' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1765' column='1'/>
-      <parameter type-id='type-id-287' name='a' filepath='../../module/nvpair/nvpair.c' line='1766' column='1'/>
-      <parameter type-id='type-id-281' name='n' filepath='../../module/nvpair/nvpair.c' line='1766' column='1'/>
+    <function-decl name='nvlist_lookup_int32_array' mangled-name='nvlist_lookup_int32_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_int32_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-287' name='a'/>
+      <parameter type-id='type-id-281' name='n'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-144' size-in-bits='64' id='type-id-288'/>
-    <function-decl name='nvlist_lookup_uint32_array' mangled-name='nvlist_lookup_uint32_array' filepath='../../module/nvpair/nvpair.c' line='1772' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_uint32_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1772' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1772' column='1'/>
-      <parameter type-id='type-id-288' name='a' filepath='../../module/nvpair/nvpair.c' line='1773' column='1'/>
-      <parameter type-id='type-id-281' name='n' filepath='../../module/nvpair/nvpair.c' line='1773' column='1'/>
+    <function-decl name='nvlist_lookup_uint32_array' mangled-name='nvlist_lookup_uint32_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_uint32_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-288' name='a'/>
+      <parameter type-id='type-id-281' name='n'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-147' size-in-bits='64' id='type-id-289'/>
-    <function-decl name='nvlist_lookup_int64_array' mangled-name='nvlist_lookup_int64_array' filepath='../../module/nvpair/nvpair.c' line='1779' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_int64_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1779' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1779' column='1'/>
-      <parameter type-id='type-id-289' name='a' filepath='../../module/nvpair/nvpair.c' line='1780' column='1'/>
-      <parameter type-id='type-id-281' name='n' filepath='../../module/nvpair/nvpair.c' line='1780' column='1'/>
+    <function-decl name='nvlist_lookup_int64_array' mangled-name='nvlist_lookup_int64_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_int64_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-289' name='a'/>
+      <parameter type-id='type-id-281' name='n'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-150' size-in-bits='64' id='type-id-290'/>
-    <function-decl name='nvlist_lookup_uint64_array' mangled-name='nvlist_lookup_uint64_array' filepath='../../module/nvpair/nvpair.c' line='1786' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_uint64_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1786' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1786' column='1'/>
-      <parameter type-id='type-id-290' name='a' filepath='../../module/nvpair/nvpair.c' line='1787' column='1'/>
-      <parameter type-id='type-id-281' name='n' filepath='../../module/nvpair/nvpair.c' line='1787' column='1'/>
+    <function-decl name='nvlist_lookup_uint64_array' mangled-name='nvlist_lookup_uint64_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_uint64_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-290' name='a'/>
+      <parameter type-id='type-id-281' name='n'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_string_array' mangled-name='nvlist_lookup_string_array' filepath='../../module/nvpair/nvpair.c' line='1793' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_string_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1793' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1793' column='1'/>
-      <parameter type-id='type-id-233' name='a' filepath='../../module/nvpair/nvpair.c' line='1794' column='1'/>
-      <parameter type-id='type-id-281' name='n' filepath='../../module/nvpair/nvpair.c' line='1794' column='1'/>
+    <function-decl name='nvlist_lookup_string_array' mangled-name='nvlist_lookup_string_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_string_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-233' name='a'/>
+      <parameter type-id='type-id-281' name='n'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-156' size-in-bits='64' id='type-id-291'/>
-    <function-decl name='nvlist_lookup_nvlist_array' mangled-name='nvlist_lookup_nvlist_array' filepath='../../module/nvpair/nvpair.c' line='1800' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_nvlist_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1800' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1800' column='1'/>
-      <parameter type-id='type-id-291' name='a' filepath='../../module/nvpair/nvpair.c' line='1801' column='1'/>
-      <parameter type-id='type-id-281' name='n' filepath='../../module/nvpair/nvpair.c' line='1801' column='1'/>
+    <function-decl name='nvlist_lookup_nvlist_array' mangled-name='nvlist_lookup_nvlist_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_nvlist_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-291' name='a'/>
+      <parameter type-id='type-id-281' name='n'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-117' size-in-bits='64' id='type-id-292'/>
-    <function-decl name='nvlist_lookup_hrtime' mangled-name='nvlist_lookup_hrtime' filepath='../../module/nvpair/nvpair.c' line='1807' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_hrtime'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1807' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='1807' column='1'/>
-      <parameter type-id='type-id-292' name='val' filepath='../../module/nvpair/nvpair.c' line='1807' column='1'/>
+    <function-decl name='nvlist_lookup_hrtime' mangled-name='nvlist_lookup_hrtime' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_hrtime'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-292' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_pairs' mangled-name='nvlist_lookup_pairs' filepath='../../module/nvpair/nvpair.c' line='1813' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_pairs'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='1813' column='1'/>
-      <parameter type-id='type-id-5' name='flag' filepath='../../module/nvpair/nvpair.c' line='1813' column='1'/>
+    <function-decl name='nvlist_lookup_pairs' mangled-name='nvlist_lookup_pairs' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_pairs'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-5' name='flag'/>
       <parameter is-variadic='yes'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-243' size-in-bits='64' id='type-id-293'/>
-    <function-decl name='nvlist_lookup_nvpair' mangled-name='nvlist_lookup_nvpair' filepath='../../module/nvpair/nvpair.c' line='2063' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_nvpair'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='2063' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='2063' column='1'/>
-      <parameter type-id='type-id-293' name='ret' filepath='../../module/nvpair/nvpair.c' line='2063' column='1'/>
+    <function-decl name='nvlist_lookup_nvpair' mangled-name='nvlist_lookup_nvpair' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_nvpair'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-293' name='ret'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_nvpair_embedded_index' mangled-name='nvlist_lookup_nvpair_embedded_index' filepath='../../module/nvpair/nvpair.c' line='2073' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_nvpair_embedded_index'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='2073' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='2074' column='1'/>
-      <parameter type-id='type-id-293' name='ret' filepath='../../module/nvpair/nvpair.c' line='2074' column='1'/>
-      <parameter type-id='type-id-222' name='ip' filepath='../../module/nvpair/nvpair.c' line='2074' column='1'/>
-      <parameter type-id='type-id-153' name='ep' filepath='../../module/nvpair/nvpair.c' line='2074' column='1'/>
+    <function-decl name='nvlist_lookup_nvpair_embedded_index' mangled-name='nvlist_lookup_nvpair_embedded_index' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_lookup_nvpair_embedded_index'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-293' name='ret'/>
+      <parameter type-id='type-id-222' name='ip'/>
+      <parameter type-id='type-id-153' name='ep'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_exists' mangled-name='nvlist_exists' filepath='../../module/nvpair/nvpair.c' line='2080' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_exists'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='2080' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/nvpair.c' line='2080' column='1'/>
+    <function-decl name='nvlist_exists' mangled-name='nvlist_exists' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_exists'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
       <return type-id='type-id-77'/>
     </function-decl>
-    <function-decl name='nvpair_value_boolean_value' mangled-name='nvpair_value_boolean_value' filepath='../../module/nvpair/nvpair.c' line='2101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_boolean_value'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2101' column='1'/>
-      <parameter type-id='type-id-122' name='val' filepath='../../module/nvpair/nvpair.c' line='2101' column='1'/>
+    <function-decl name='nvpair_value_boolean_value' mangled-name='nvpair_value_boolean_value' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_boolean_value'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-122' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_byte' mangled-name='nvpair_value_byte' filepath='../../module/nvpair/nvpair.c' line='2107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_byte'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2107' column='1'/>
-      <parameter type-id='type-id-126' name='val' filepath='../../module/nvpair/nvpair.c' line='2107' column='1'/>
+    <function-decl name='nvpair_value_byte' mangled-name='nvpair_value_byte' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_byte'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-126' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_int8' mangled-name='nvpair_value_int8' filepath='../../module/nvpair/nvpair.c' line='2113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_int8'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2113' column='1'/>
-      <parameter type-id='type-id-129' name='val' filepath='../../module/nvpair/nvpair.c' line='2113' column='1'/>
+    <function-decl name='nvpair_value_int8' mangled-name='nvpair_value_int8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_int8'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-129' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_uint8' mangled-name='nvpair_value_uint8' filepath='../../module/nvpair/nvpair.c' line='2119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_uint8'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2119' column='1'/>
-      <parameter type-id='type-id-132' name='val' filepath='../../module/nvpair/nvpair.c' line='2119' column='1'/>
+    <function-decl name='nvpair_value_uint8' mangled-name='nvpair_value_uint8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_uint8'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-132' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_int16' mangled-name='nvpair_value_int16' filepath='../../module/nvpair/nvpair.c' line='2125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_int16'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2125' column='1'/>
-      <parameter type-id='type-id-135' name='val' filepath='../../module/nvpair/nvpair.c' line='2125' column='1'/>
+    <function-decl name='nvpair_value_int16' mangled-name='nvpair_value_int16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_int16'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-135' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_uint16' mangled-name='nvpair_value_uint16' filepath='../../module/nvpair/nvpair.c' line='2131' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_uint16'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2131' column='1'/>
-      <parameter type-id='type-id-138' name='val' filepath='../../module/nvpair/nvpair.c' line='2131' column='1'/>
+    <function-decl name='nvpair_value_uint16' mangled-name='nvpair_value_uint16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_uint16'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-138' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_int32' mangled-name='nvpair_value_int32' filepath='../../module/nvpair/nvpair.c' line='2137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_int32'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2137' column='1'/>
-      <parameter type-id='type-id-141' name='val' filepath='../../module/nvpair/nvpair.c' line='2137' column='1'/>
+    <function-decl name='nvpair_value_int32' mangled-name='nvpair_value_int32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_int32'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-141' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_uint32' mangled-name='nvpair_value_uint32' filepath='../../module/nvpair/nvpair.c' line='2143' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_uint32'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2143' column='1'/>
-      <parameter type-id='type-id-144' name='val' filepath='../../module/nvpair/nvpair.c' line='2143' column='1'/>
+    <function-decl name='nvpair_value_uint32' mangled-name='nvpair_value_uint32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_uint32'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-144' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_int64' mangled-name='nvpair_value_int64' filepath='../../module/nvpair/nvpair.c' line='2149' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_int64'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2149' column='1'/>
-      <parameter type-id='type-id-147' name='val' filepath='../../module/nvpair/nvpair.c' line='2149' column='1'/>
+    <function-decl name='nvpair_value_int64' mangled-name='nvpair_value_int64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_int64'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-147' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_uint64' mangled-name='nvpair_value_uint64' filepath='../../module/nvpair/nvpair.c' line='2155' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_uint64'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2155' column='1'/>
-      <parameter type-id='type-id-150' name='val' filepath='../../module/nvpair/nvpair.c' line='2155' column='1'/>
+    <function-decl name='nvpair_value_uint64' mangled-name='nvpair_value_uint64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_uint64'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-150' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_double' mangled-name='nvpair_value_double' filepath='../../module/nvpair/nvpair.c' line='2162' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_double'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2162' column='1'/>
-      <parameter type-id='type-id-241' name='val' filepath='../../module/nvpair/nvpair.c' line='2162' column='1'/>
+    <function-decl name='nvpair_value_double' mangled-name='nvpair_value_double' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_double'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-241' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_string' mangled-name='nvpair_value_string' filepath='../../module/nvpair/nvpair.c' line='2169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_string'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2169' column='1'/>
-      <parameter type-id='type-id-153' name='val' filepath='../../module/nvpair/nvpair.c' line='2169' column='1'/>
+    <function-decl name='nvpair_value_string' mangled-name='nvpair_value_string' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_string'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-153' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_nvlist' mangled-name='nvpair_value_nvlist' filepath='../../module/nvpair/nvpair.c' line='2175' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_nvlist'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2175' column='1'/>
-      <parameter type-id='type-id-156' name='val' filepath='../../module/nvpair/nvpair.c' line='2175' column='1'/>
+    <function-decl name='nvpair_value_nvlist' mangled-name='nvpair_value_nvlist' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_nvlist'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-156' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_boolean_array' mangled-name='nvpair_value_boolean_array' filepath='../../module/nvpair/nvpair.c' line='2181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_boolean_array'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2181' column='1'/>
-      <parameter type-id='type-id-280' name='val' filepath='../../module/nvpair/nvpair.c' line='2181' column='1'/>
-      <parameter type-id='type-id-281' name='nelem' filepath='../../module/nvpair/nvpair.c' line='2181' column='1'/>
+    <function-decl name='nvpair_value_boolean_array' mangled-name='nvpair_value_boolean_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_boolean_array'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-280' name='val'/>
+      <parameter type-id='type-id-281' name='nelem'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_byte_array' mangled-name='nvpair_value_byte_array' filepath='../../module/nvpair/nvpair.c' line='2187' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_byte_array'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2187' column='1'/>
-      <parameter type-id='type-id-282' name='val' filepath='../../module/nvpair/nvpair.c' line='2187' column='1'/>
-      <parameter type-id='type-id-281' name='nelem' filepath='../../module/nvpair/nvpair.c' line='2187' column='1'/>
+    <function-decl name='nvpair_value_byte_array' mangled-name='nvpair_value_byte_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_byte_array'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-282' name='val'/>
+      <parameter type-id='type-id-281' name='nelem'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_int8_array' mangled-name='nvpair_value_int8_array' filepath='../../module/nvpair/nvpair.c' line='2193' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_int8_array'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2193' column='1'/>
-      <parameter type-id='type-id-283' name='val' filepath='../../module/nvpair/nvpair.c' line='2193' column='1'/>
-      <parameter type-id='type-id-281' name='nelem' filepath='../../module/nvpair/nvpair.c' line='2193' column='1'/>
+    <function-decl name='nvpair_value_int8_array' mangled-name='nvpair_value_int8_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_int8_array'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-283' name='val'/>
+      <parameter type-id='type-id-281' name='nelem'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_uint8_array' mangled-name='nvpair_value_uint8_array' filepath='../../module/nvpair/nvpair.c' line='2199' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_uint8_array'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2199' column='1'/>
-      <parameter type-id='type-id-284' name='val' filepath='../../module/nvpair/nvpair.c' line='2199' column='1'/>
-      <parameter type-id='type-id-281' name='nelem' filepath='../../module/nvpair/nvpair.c' line='2199' column='1'/>
+    <function-decl name='nvpair_value_uint8_array' mangled-name='nvpair_value_uint8_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_uint8_array'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-284' name='val'/>
+      <parameter type-id='type-id-281' name='nelem'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_int16_array' mangled-name='nvpair_value_int16_array' filepath='../../module/nvpair/nvpair.c' line='2205' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_int16_array'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2205' column='1'/>
-      <parameter type-id='type-id-285' name='val' filepath='../../module/nvpair/nvpair.c' line='2205' column='1'/>
-      <parameter type-id='type-id-281' name='nelem' filepath='../../module/nvpair/nvpair.c' line='2205' column='1'/>
+    <function-decl name='nvpair_value_int16_array' mangled-name='nvpair_value_int16_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_int16_array'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-285' name='val'/>
+      <parameter type-id='type-id-281' name='nelem'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_uint16_array' mangled-name='nvpair_value_uint16_array' filepath='../../module/nvpair/nvpair.c' line='2211' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_uint16_array'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2211' column='1'/>
-      <parameter type-id='type-id-286' name='val' filepath='../../module/nvpair/nvpair.c' line='2211' column='1'/>
-      <parameter type-id='type-id-281' name='nelem' filepath='../../module/nvpair/nvpair.c' line='2211' column='1'/>
+    <function-decl name='nvpair_value_uint16_array' mangled-name='nvpair_value_uint16_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_uint16_array'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-286' name='val'/>
+      <parameter type-id='type-id-281' name='nelem'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_int32_array' mangled-name='nvpair_value_int32_array' filepath='../../module/nvpair/nvpair.c' line='2217' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_int32_array'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2217' column='1'/>
-      <parameter type-id='type-id-287' name='val' filepath='../../module/nvpair/nvpair.c' line='2217' column='1'/>
-      <parameter type-id='type-id-281' name='nelem' filepath='../../module/nvpair/nvpair.c' line='2217' column='1'/>
+    <function-decl name='nvpair_value_int32_array' mangled-name='nvpair_value_int32_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_int32_array'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-287' name='val'/>
+      <parameter type-id='type-id-281' name='nelem'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_uint32_array' mangled-name='nvpair_value_uint32_array' filepath='../../module/nvpair/nvpair.c' line='2223' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_uint32_array'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2223' column='1'/>
-      <parameter type-id='type-id-288' name='val' filepath='../../module/nvpair/nvpair.c' line='2223' column='1'/>
-      <parameter type-id='type-id-281' name='nelem' filepath='../../module/nvpair/nvpair.c' line='2223' column='1'/>
+    <function-decl name='nvpair_value_uint32_array' mangled-name='nvpair_value_uint32_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_uint32_array'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-288' name='val'/>
+      <parameter type-id='type-id-281' name='nelem'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_int64_array' mangled-name='nvpair_value_int64_array' filepath='../../module/nvpair/nvpair.c' line='2229' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_int64_array'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2229' column='1'/>
-      <parameter type-id='type-id-289' name='val' filepath='../../module/nvpair/nvpair.c' line='2229' column='1'/>
-      <parameter type-id='type-id-281' name='nelem' filepath='../../module/nvpair/nvpair.c' line='2229' column='1'/>
+    <function-decl name='nvpair_value_int64_array' mangled-name='nvpair_value_int64_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_int64_array'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-289' name='val'/>
+      <parameter type-id='type-id-281' name='nelem'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_uint64_array' mangled-name='nvpair_value_uint64_array' filepath='../../module/nvpair/nvpair.c' line='2235' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_uint64_array'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2235' column='1'/>
-      <parameter type-id='type-id-290' name='val' filepath='../../module/nvpair/nvpair.c' line='2235' column='1'/>
-      <parameter type-id='type-id-281' name='nelem' filepath='../../module/nvpair/nvpair.c' line='2235' column='1'/>
+    <function-decl name='nvpair_value_uint64_array' mangled-name='nvpair_value_uint64_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_uint64_array'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-290' name='val'/>
+      <parameter type-id='type-id-281' name='nelem'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_string_array' mangled-name='nvpair_value_string_array' filepath='../../module/nvpair/nvpair.c' line='2241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_string_array'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2241' column='1'/>
-      <parameter type-id='type-id-233' name='val' filepath='../../module/nvpair/nvpair.c' line='2241' column='1'/>
-      <parameter type-id='type-id-281' name='nelem' filepath='../../module/nvpair/nvpair.c' line='2241' column='1'/>
+    <function-decl name='nvpair_value_string_array' mangled-name='nvpair_value_string_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_string_array'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-233' name='val'/>
+      <parameter type-id='type-id-281' name='nelem'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_nvlist_array' mangled-name='nvpair_value_nvlist_array' filepath='../../module/nvpair/nvpair.c' line='2247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_nvlist_array'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2247' column='1'/>
-      <parameter type-id='type-id-291' name='val' filepath='../../module/nvpair/nvpair.c' line='2247' column='1'/>
-      <parameter type-id='type-id-281' name='nelem' filepath='../../module/nvpair/nvpair.c' line='2247' column='1'/>
+    <function-decl name='nvpair_value_nvlist_array' mangled-name='nvpair_value_nvlist_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_nvlist_array'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-291' name='val'/>
+      <parameter type-id='type-id-281' name='nelem'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvpair_value_hrtime' mangled-name='nvpair_value_hrtime' filepath='../../module/nvpair/nvpair.c' line='2253' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_hrtime'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2253' column='1'/>
-      <parameter type-id='type-id-292' name='val' filepath='../../module/nvpair/nvpair.c' line='2253' column='1'/>
+    <function-decl name='nvpair_value_hrtime' mangled-name='nvpair_value_hrtime' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvpair_value_hrtime'>
+      <parameter type-id='type-id-243' name='nvp'/>
+      <parameter type-id='type-id-292' name='val'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_add_nvpair' mangled-name='nvlist_add_nvpair' filepath='../../module/nvpair/nvpair.c' line='2262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_nvpair'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='2262' column='1'/>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/nvpair.c' line='2262' column='1'/>
+    <function-decl name='nvlist_add_nvpair' mangled-name='nvlist_add_nvpair' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_add_nvpair'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-243' name='nvp'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_merge' mangled-name='nvlist_merge' filepath='../../module/nvpair/nvpair.c' line='2279' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_merge'>
-      <parameter type-id='type-id-73' name='dst' filepath='../../module/nvpair/nvpair.c' line='2279' column='1'/>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='2279' column='1'/>
-      <parameter type-id='type-id-5' name='flag' filepath='../../module/nvpair/nvpair.c' line='2279' column='1'/>
+    <function-decl name='nvlist_merge' mangled-name='nvlist_merge' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_merge'>
+      <parameter type-id='type-id-73' name='dst'/>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-5' name='flag'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <pointer-type-def type-id='type-id-20' size-in-bits='64' id='type-id-294'/>
-    <function-decl name='nvlist_size' mangled-name='nvlist_size' filepath='../../module/nvpair/nvpair.c' line='2648' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_size'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='2648' column='1'/>
-      <parameter type-id='type-id-294' name='size' filepath='../../module/nvpair/nvpair.c' line='2648' column='1'/>
-      <parameter type-id='type-id-5' name='encoding' filepath='../../module/nvpair/nvpair.c' line='2648' column='1'/>
+    <function-decl name='nvlist_size' mangled-name='nvlist_size' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_size'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-294' name='size'/>
+      <parameter type-id='type-id-5' name='encoding'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <class-decl name='XDR' size-in-bits='384' is-struct='yes' visibility='default' filepath='/usr/include/rpc/xdr.h' line='110' column='1' id='type-id-295'>
+    <class-decl name='XDR' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-295'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='x_op' type-id='type-id-296' visibility='default' filepath='/usr/include/rpc/xdr.h' line='112' column='1'/>
+        <var-decl name='x_op' type-id='type-id-296' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='x_ops' type-id='type-id-297' visibility='default' filepath='/usr/include/rpc/xdr.h' line='136' column='1'/>
+        <var-decl name='x_ops' type-id='type-id-297' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='x_public' type-id='type-id-298' visibility='default' filepath='/usr/include/rpc/xdr.h' line='137' column='1'/>
+        <var-decl name='x_public' type-id='type-id-298' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='x_private' type-id='type-id-298' visibility='default' filepath='/usr/include/rpc/xdr.h' line='138' column='1'/>
+        <var-decl name='x_private' type-id='type-id-298' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='x_base' type-id='type-id-298' visibility='default' filepath='/usr/include/rpc/xdr.h' line='139' column='1'/>
+        <var-decl name='x_base' type-id='type-id-298' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='x_handy' type-id='type-id-299' visibility='default' filepath='/usr/include/rpc/xdr.h' line='140' column='1'/>
+        <var-decl name='x_handy' type-id='type-id-299' visibility='default'/>
       </data-member>
     </class-decl>
-    <enum-decl name='xdr_op' filepath='/usr/include/rpc/xdr.h' line='81' column='1' id='type-id-296'>
+    <enum-decl name='xdr_op' id='type-id-296'>
       <underlying-type type-id='type-id-32'/>
       <enumerator name='XDR_ENCODE' value='0'/>
       <enumerator name='XDR_DECODE' value='1'/>
       <enumerator name='XDR_FREE' value='2'/>
     </enum-decl>
-    <class-decl name='xdr_ops' size-in-bits='640' is-struct='yes' visibility='default' filepath='/usr/include/rpc/xdr.h' line='113' column='1' id='type-id-300'>
+    <class-decl name='xdr_ops' size-in-bits='640' is-struct='yes' visibility='default' id='type-id-300'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='x_getlong' type-id='type-id-301' visibility='default' filepath='/usr/include/rpc/xdr.h' line='115' column='1'/>
+        <var-decl name='x_getlong' type-id='type-id-301' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='x_putlong' type-id='type-id-302' visibility='default' filepath='/usr/include/rpc/xdr.h' line='117' column='1'/>
+        <var-decl name='x_putlong' type-id='type-id-302' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='x_getbytes' type-id='type-id-303' visibility='default' filepath='/usr/include/rpc/xdr.h' line='119' column='1'/>
+        <var-decl name='x_getbytes' type-id='type-id-303' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='x_putbytes' type-id='type-id-304' visibility='default' filepath='/usr/include/rpc/xdr.h' line='121' column='1'/>
+        <var-decl name='x_putbytes' type-id='type-id-304' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='x_getpostn' type-id='type-id-305' visibility='default' filepath='/usr/include/rpc/xdr.h' line='123' column='1'/>
+        <var-decl name='x_getpostn' type-id='type-id-305' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='x_setpostn' type-id='type-id-306' visibility='default' filepath='/usr/include/rpc/xdr.h' line='125' column='1'/>
+        <var-decl name='x_setpostn' type-id='type-id-306' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='x_inline' type-id='type-id-307' visibility='default' filepath='/usr/include/rpc/xdr.h' line='127' column='1'/>
+        <var-decl name='x_inline' type-id='type-id-307' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='x_destroy' type-id='type-id-308' visibility='default' filepath='/usr/include/rpc/xdr.h' line='129' column='1'/>
+        <var-decl name='x_destroy' type-id='type-id-308' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='x_getint32' type-id='type-id-309' visibility='default' filepath='/usr/include/rpc/xdr.h' line='131' column='1'/>
+        <var-decl name='x_getint32' type-id='type-id-309' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='x_putint32' type-id='type-id-310' visibility='default' filepath='/usr/include/rpc/xdr.h' line='133' column='1'/>
+        <var-decl name='x_putint32' type-id='type-id-310' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='bool_t' type-id='type-id-5' filepath='/usr/include/rpc/types.h' line='37' column='1' id='type-id-311'/>
-    <typedef-decl name='XDR' type-id='type-id-295' filepath='/usr/include/rpc/xdr.h' line='109' column='1' id='type-id-312'/>
+    <typedef-decl name='bool_t' type-id='type-id-5' id='type-id-311'/>
+    <typedef-decl name='XDR' type-id='type-id-295' id='type-id-312'/>
     <pointer-type-def type-id='type-id-312' size-in-bits='64' id='type-id-313'/>
     <pointer-type-def type-id='type-id-314' size-in-bits='64' id='type-id-301'/>
     <qualified-type-def type-id='type-id-24' const='yes' id='type-id-315'/>
     <pointer-type-def type-id='type-id-315' size-in-bits='64' id='type-id-316'/>
     <pointer-type-def type-id='type-id-317' size-in-bits='64' id='type-id-302'/>
-    <typedef-decl name='__caddr_t' type-id='type-id-9' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='201' column='1' id='type-id-318'/>
-    <typedef-decl name='caddr_t' type-id='type-id-318' filepath='/usr/include/x86_64-linux-gnu/sys/types.h' line='115' column='1' id='type-id-298'/>
-    <typedef-decl name='__u_int' type-id='type-id-69' filepath='/usr/include/x86_64-linux-gnu/bits/types.h' line='32' column='1' id='type-id-319'/>
-    <typedef-decl name='u_int' type-id='type-id-319' filepath='/usr/include/x86_64-linux-gnu/sys/types.h' line='35' column='1' id='type-id-299'/>
+    <typedef-decl name='__caddr_t' type-id='type-id-9' id='type-id-318'/>
+    <typedef-decl name='caddr_t' type-id='type-id-318' id='type-id-298'/>
+    <typedef-decl name='__u_int' type-id='type-id-69' id='type-id-319'/>
+    <typedef-decl name='u_int' type-id='type-id-319' id='type-id-299'/>
     <pointer-type-def type-id='type-id-320' size-in-bits='64' id='type-id-303'/>
     <pointer-type-def type-id='type-id-321' size-in-bits='64' id='type-id-304'/>
     <qualified-type-def type-id='type-id-312' const='yes' id='type-id-322'/>
@@ -2718,101 +2706,101 @@
     <pointer-type-def type-id='type-id-329' size-in-bits='64' id='type-id-330'/>
     <pointer-type-def type-id='type-id-331' size-in-bits='64' id='type-id-310'/>
     <pointer-type-def type-id='type-id-300' size-in-bits='64' id='type-id-297'/>
-    <function-decl name='xdrmem_create' filepath='/usr/include/rpc/xdr.h' line='350' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='xdrmem_create' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-313'/>
       <parameter type-id='type-id-9'/>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-296'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_pack' mangled-name='nvlist_pack' filepath='../../module/nvpair/nvpair.c' line='2657' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_pack'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='2657' column='1'/>
-      <parameter type-id='type-id-153' name='bufp' filepath='../../module/nvpair/nvpair.c' line='2657' column='1'/>
-      <parameter type-id='type-id-294' name='buflen' filepath='../../module/nvpair/nvpair.c' line='2657' column='1'/>
-      <parameter type-id='type-id-5' name='encoding' filepath='../../module/nvpair/nvpair.c' line='2657' column='1'/>
-      <parameter type-id='type-id-5' name='kmflag' filepath='../../module/nvpair/nvpair.c' line='2658' column='1'/>
+    <function-decl name='nvlist_pack' mangled-name='nvlist_pack' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_pack'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-153' name='bufp'/>
+      <parameter type-id='type-id-294' name='buflen'/>
+      <parameter type-id='type-id-5' name='encoding'/>
+      <parameter type-id='type-id-5' name='kmflag'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_xpack' mangled-name='nvlist_xpack' filepath='../../module/nvpair/nvpair.c' line='2665' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_xpack'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/nvpair.c' line='2665' column='1'/>
-      <parameter type-id='type-id-153' name='bufp' filepath='../../module/nvpair/nvpair.c' line='2665' column='1'/>
-      <parameter type-id='type-id-294' name='buflen' filepath='../../module/nvpair/nvpair.c' line='2665' column='1'/>
-      <parameter type-id='type-id-5' name='encoding' filepath='../../module/nvpair/nvpair.c' line='2665' column='1'/>
-      <parameter type-id='type-id-269' name='nva' filepath='../../module/nvpair/nvpair.c' line='2666' column='1'/>
+    <function-decl name='nvlist_xpack' mangled-name='nvlist_xpack' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_xpack'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-153' name='bufp'/>
+      <parameter type-id='type-id-294' name='buflen'/>
+      <parameter type-id='type-id-5' name='encoding'/>
+      <parameter type-id='type-id-269' name='nva'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_unpack' mangled-name='nvlist_unpack' filepath='../../module/nvpair/nvpair.c' line='2715' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_unpack'>
-      <parameter type-id='type-id-9' name='buf' filepath='../../module/nvpair/nvpair.c' line='2715' column='1'/>
-      <parameter type-id='type-id-20' name='buflen' filepath='../../module/nvpair/nvpair.c' line='2715' column='1'/>
-      <parameter type-id='type-id-156' name='nvlp' filepath='../../module/nvpair/nvpair.c' line='2715' column='1'/>
-      <parameter type-id='type-id-5' name='kmflag' filepath='../../module/nvpair/nvpair.c' line='2715' column='1'/>
+    <function-decl name='nvlist_unpack' mangled-name='nvlist_unpack' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_unpack'>
+      <parameter type-id='type-id-9' name='buf'/>
+      <parameter type-id='type-id-20' name='buflen'/>
+      <parameter type-id='type-id-156' name='nvlp'/>
+      <parameter type-id='type-id-5' name='kmflag'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='nvlist_xunpack' mangled-name='nvlist_xunpack' filepath='../../module/nvpair/nvpair.c' line='2721' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_xunpack'>
-      <parameter type-id='type-id-9' name='buf' filepath='../../module/nvpair/nvpair.c' line='2721' column='1'/>
-      <parameter type-id='type-id-20' name='buflen' filepath='../../module/nvpair/nvpair.c' line='2721' column='1'/>
-      <parameter type-id='type-id-156' name='nvlp' filepath='../../module/nvpair/nvpair.c' line='2721' column='1'/>
-      <parameter type-id='type-id-269' name='nva' filepath='../../module/nvpair/nvpair.c' line='2721' column='1'/>
+    <function-decl name='nvlist_xunpack' mangled-name='nvlist_xunpack' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvlist_xunpack'>
+      <parameter type-id='type-id-9' name='buf'/>
+      <parameter type-id='type-id-20' name='buflen'/>
+      <parameter type-id='type-id-156' name='nvlp'/>
+      <parameter type-id='type-id-269' name='nva'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='xdr_int' filepath='/usr/include/rpc/xdr.h' line='288' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='xdr_int' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-313'/>
       <parameter type-id='type-id-222'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='xdr_u_int' filepath='/usr/include/rpc/xdr.h' line='289' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='xdr_u_int' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-313'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='xdr_string' filepath='/usr/include/rpc/xdr.h' line='314' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='xdr_string' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-313'/>
       <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-69'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='xdr_char' filepath='/usr/include/rpc/xdr.h' line='318' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='xdr_char' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-313'/>
       <parameter type-id='type-id-9'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='xdr_longlong_t' filepath='/usr/include/rpc/xdr.h' line='294' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='xdr_longlong_t' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-313'/>
       <parameter type-id='type-id-224'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='xdr_short' filepath='/usr/include/rpc/xdr.h' line='286' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <pointer-type-def type-id='type-id-332' size-in-bits='64' id='type-id-333'/>
+    <function-decl name='xdr_array' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-313'/>
+      <parameter type-id='type-id-153'/>
+      <parameter type-id='type-id-223'/>
+      <parameter type-id='type-id-69'/>
+      <parameter type-id='type-id-69'/>
+      <parameter type-id='type-id-333'/>
+      <return type-id='type-id-5'/>
+    </function-decl>
+    <function-decl name='xdr_short' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-313'/>
       <parameter type-id='type-id-220'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='xdr_u_short' filepath='/usr/include/rpc/xdr.h' line='287' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='xdr_u_short' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-313'/>
       <parameter type-id='type-id-221'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='xdr_u_longlong_t' filepath='/usr/include/rpc/xdr.h' line='295' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='xdr_u_longlong_t' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-313'/>
       <parameter type-id='type-id-225'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='xdr_opaque' filepath='/usr/include/rpc/xdr.h' line='313' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='xdr_opaque' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-313'/>
       <parameter type-id='type-id-9'/>
       <parameter type-id='type-id-69'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-332' size-in-bits='64' id='type-id-333'/>
-    <function-decl name='xdr_array' filepath='/usr/include/rpc/xdr.h' line='308' column='1' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-313'/>
-      <parameter type-id='type-id-153'/>
-      <parameter type-id='type-id-223'/>
-      <parameter type-id='type-id-69'/>
-      <parameter type-id='type-id-69'/>
-      <parameter type-id='type-id-333'/>
-      <return type-id='type-id-5'/>
-    </function-decl>
-    <function-decl name='xdr_double' filepath='/usr/include/rpc/xdr.h' line='323' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='xdr_double' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-313'/>
       <parameter type-id='type-id-241'/>
       <return type-id='type-id-5'/>
@@ -2874,40 +2862,40 @@
       <return type-id='type-id-1'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='../../module/nvpair/fnvpair.c' comp-dir-path='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libnvpair' language='LANG_C99'>
-    <function-decl name='fnvlist_alloc' mangled-name='fnvlist_alloc' filepath='../../module/nvpair/fnvpair.c' line='51' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_alloc'>
+  <abi-instr version='1.0' address-size='64' path='../../module/nvpair/fnvpair.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libnvpair' language='LANG_C99'>
+    <function-decl name='fnvlist_alloc' mangled-name='fnvlist_alloc' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_alloc'>
       <return type-id='type-id-73'/>
     </function-decl>
-    <function-decl name='nvlist_alloc' filepath='../../include/sys/nvpair.h' line='151' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_alloc' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-235'/>
       <parameter type-id='type-id-69'/>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_free' mangled-name='fnvlist_free' filepath='../../module/nvpair/fnvpair.c' line='59' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_free'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='59' column='1'/>
+    <function-decl name='fnvlist_free' mangled-name='fnvlist_free' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_free'>
+      <parameter type-id='type-id-73' name='nvl'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_free' filepath='../../include/sys/nvpair.h' line='152' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_free' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='fnvlist_size' mangled-name='fnvlist_size' filepath='../../module/nvpair/fnvpair.c' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_size'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='65' column='1'/>
+    <function-decl name='fnvlist_size' mangled-name='fnvlist_size' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_size'>
+      <parameter type-id='type-id-73' name='nvl'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='nvlist_size' filepath='../../include/sys/nvpair.h' line='153' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_size' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-225'/>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_pack' mangled-name='fnvlist_pack' filepath='../../module/nvpair/fnvpair.c' line='77' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_pack'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='77' column='1'/>
-      <parameter type-id='type-id-294' name='sizep' filepath='../../module/nvpair/fnvpair.c' line='77' column='1'/>
+    <function-decl name='fnvlist_pack' mangled-name='fnvlist_pack' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_pack'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-294' name='sizep'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='nvlist_pack' filepath='../../include/sys/nvpair.h' line='154' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_pack' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-153'/>
       <parameter type-id='type-id-225'/>
@@ -2915,734 +2903,734 @@
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_pack_free' mangled-name='fnvlist_pack_free' filepath='../../module/nvpair/fnvpair.c' line='87' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_pack_free'>
-      <parameter type-id='type-id-9' name='pack' filepath='../../module/nvpair/fnvpair.c' line='87' column='1'/>
-      <parameter type-id='type-id-20' name='size' filepath='../../module/nvpair/fnvpair.c' line='87' column='1'/>
+    <function-decl name='fnvlist_pack_free' mangled-name='fnvlist_pack_free' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_pack_free'>
+      <parameter type-id='type-id-9' name='pack'/>
+      <parameter type-id='type-id-20' name='size'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='fnvlist_unpack' mangled-name='fnvlist_unpack' filepath='../../module/nvpair/fnvpair.c' line='97' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_unpack'>
-      <parameter type-id='type-id-9' name='buf' filepath='../../module/nvpair/fnvpair.c' line='97' column='1'/>
-      <parameter type-id='type-id-20' name='buflen' filepath='../../module/nvpair/fnvpair.c' line='97' column='1'/>
+    <function-decl name='fnvlist_unpack' mangled-name='fnvlist_unpack' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_unpack'>
+      <parameter type-id='type-id-9' name='buf'/>
+      <parameter type-id='type-id-20' name='buflen'/>
       <return type-id='type-id-73'/>
     </function-decl>
-    <function-decl name='nvlist_unpack' filepath='../../include/sys/nvpair.h' line='155' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_unpack' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-9'/>
       <parameter type-id='type-id-29'/>
       <parameter type-id='type-id-235'/>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_dup' mangled-name='fnvlist_dup' filepath='../../module/nvpair/fnvpair.c' line='105' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_dup'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='105' column='1'/>
+    <function-decl name='fnvlist_dup' mangled-name='fnvlist_dup' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_dup'>
+      <parameter type-id='type-id-73' name='nvl'/>
       <return type-id='type-id-73'/>
     </function-decl>
-    <function-decl name='nvlist_dup' filepath='../../include/sys/nvpair.h' line='156' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_dup' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-235'/>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_merge' mangled-name='fnvlist_merge' filepath='../../module/nvpair/fnvpair.c' line='113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_merge'>
-      <parameter type-id='type-id-73' name='dst' filepath='../../module/nvpair/fnvpair.c' line='113' column='1'/>
-      <parameter type-id='type-id-73' name='src' filepath='../../module/nvpair/fnvpair.c' line='113' column='1'/>
+    <function-decl name='fnvlist_merge' mangled-name='fnvlist_merge' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_merge'>
+      <parameter type-id='type-id-73' name='dst'/>
+      <parameter type-id='type-id-73' name='src'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_merge' filepath='../../include/sys/nvpair.h' line='157' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_merge' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_num_pairs' mangled-name='fnvlist_num_pairs' filepath='../../module/nvpair/fnvpair.c' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_num_pairs'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='119' column='1'/>
+    <function-decl name='fnvlist_num_pairs' mangled-name='fnvlist_num_pairs' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_num_pairs'>
+      <parameter type-id='type-id-73' name='nvl'/>
       <return type-id='type-id-20'/>
     </function-decl>
-    <function-decl name='fnvlist_add_boolean' mangled-name='fnvlist_add_boolean' filepath='../../module/nvpair/fnvpair.c' line='131' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_boolean'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='131' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='131' column='1'/>
+    <function-decl name='fnvlist_add_boolean' mangled-name='fnvlist_add_boolean' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_boolean'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_boolean' filepath='../../include/sys/nvpair.h' line='168' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_boolean' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_boolean_value' mangled-name='fnvlist_add_boolean_value' filepath='../../module/nvpair/fnvpair.c' line='137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_boolean_value'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='137' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='137' column='1'/>
-      <parameter type-id='type-id-77' name='val' filepath='../../module/nvpair/fnvpair.c' line='137' column='1'/>
+    <function-decl name='fnvlist_add_boolean_value' mangled-name='fnvlist_add_boolean_value' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_boolean_value'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-77' name='val'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_boolean_value' filepath='../../include/sys/nvpair.h' line='169' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_boolean_value' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-76'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_byte' mangled-name='fnvlist_add_byte' filepath='../../module/nvpair/fnvpair.c' line='143' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_byte'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='143' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='143' column='1'/>
-      <parameter type-id='type-id-81' name='val' filepath='../../module/nvpair/fnvpair.c' line='143' column='1'/>
+    <function-decl name='fnvlist_add_byte' mangled-name='fnvlist_add_byte' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_byte'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-81' name='val'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_byte' filepath='../../include/sys/nvpair.h' line='170' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_byte' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-80'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_int8' mangled-name='fnvlist_add_int8' filepath='../../module/nvpair/fnvpair.c' line='149' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_int8'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='149' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='149' column='1'/>
-      <parameter type-id='type-id-85' name='val' filepath='../../module/nvpair/fnvpair.c' line='149' column='1'/>
+    <function-decl name='fnvlist_add_int8' mangled-name='fnvlist_add_int8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_int8'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-85' name='val'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_int8' filepath='../../include/sys/nvpair.h' line='171' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_int8' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-14'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_uint8' mangled-name='fnvlist_add_uint8' filepath='../../module/nvpair/fnvpair.c' line='155' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_uint8'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='155' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='155' column='1'/>
-      <parameter type-id='type-id-89' name='val' filepath='../../module/nvpair/fnvpair.c' line='155' column='1'/>
+    <function-decl name='fnvlist_add_uint8' mangled-name='fnvlist_add_uint8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_uint8'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-89' name='val'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_uint8' filepath='../../include/sys/nvpair.h' line='172' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_uint8' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-80'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_int16' mangled-name='fnvlist_add_int16' filepath='../../module/nvpair/fnvpair.c' line='161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_int16'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='161' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='161' column='1'/>
-      <parameter type-id='type-id-94' name='val' filepath='../../module/nvpair/fnvpair.c' line='161' column='1'/>
+    <function-decl name='fnvlist_add_int16' mangled-name='fnvlist_add_int16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_int16'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-94' name='val'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_int16' filepath='../../include/sys/nvpair.h' line='173' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_int16' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-92'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_uint16' mangled-name='fnvlist_add_uint16' filepath='../../module/nvpair/fnvpair.c' line='167' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_uint16'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='167' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='167' column='1'/>
-      <parameter type-id='type-id-98' name='val' filepath='../../module/nvpair/fnvpair.c' line='167' column='1'/>
+    <function-decl name='fnvlist_add_uint16' mangled-name='fnvlist_add_uint16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_uint16'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-98' name='val'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_uint16' filepath='../../include/sys/nvpair.h' line='174' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_uint16' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-13'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_int32' mangled-name='fnvlist_add_int32' filepath='../../module/nvpair/fnvpair.c' line='173' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_int32'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='173' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='173' column='1'/>
-      <parameter type-id='type-id-65' name='val' filepath='../../module/nvpair/fnvpair.c' line='173' column='1'/>
+    <function-decl name='fnvlist_add_int32' mangled-name='fnvlist_add_int32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_int32'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-65' name='val'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_int32' filepath='../../include/sys/nvpair.h' line='175' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_int32' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_uint32' mangled-name='fnvlist_add_uint32' filepath='../../module/nvpair/fnvpair.c' line='179' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_uint32'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='179' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='179' column='1'/>
-      <parameter type-id='type-id-66' name='val' filepath='../../module/nvpair/fnvpair.c' line='179' column='1'/>
+    <function-decl name='fnvlist_add_uint32' mangled-name='fnvlist_add_uint32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_uint32'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-66' name='val'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_uint32' filepath='../../include/sys/nvpair.h' line='176' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_uint32' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-69'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_int64' mangled-name='fnvlist_add_int64' filepath='../../module/nvpair/fnvpair.c' line='185' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_int64'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='185' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='185' column='1'/>
-      <parameter type-id='type-id-106' name='val' filepath='../../module/nvpair/fnvpair.c' line='185' column='1'/>
+    <function-decl name='fnvlist_add_int64' mangled-name='fnvlist_add_int64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_int64'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-106' name='val'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_int64' filepath='../../include/sys/nvpair.h' line='177' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_int64' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-24'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_uint64' mangled-name='fnvlist_add_uint64' filepath='../../module/nvpair/fnvpair.c' line='191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_uint64'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='191' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='191' column='1'/>
-      <parameter type-id='type-id-67' name='val' filepath='../../module/nvpair/fnvpair.c' line='191' column='1'/>
+    <function-decl name='fnvlist_add_uint64' mangled-name='fnvlist_add_uint64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_uint64'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-67' name='val'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_uint64' filepath='../../include/sys/nvpair.h' line='178' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_uint64' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-29'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_string' mangled-name='fnvlist_add_string' filepath='../../module/nvpair/fnvpair.c' line='197' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_string'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='197' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='197' column='1'/>
-      <parameter type-id='type-id-6' name='val' filepath='../../module/nvpair/fnvpair.c' line='197' column='1'/>
+    <function-decl name='fnvlist_add_string' mangled-name='fnvlist_add_string' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_string'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-6' name='val'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_string' filepath='../../include/sys/nvpair.h' line='179' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_string' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_nvlist' mangled-name='fnvlist_add_nvlist' filepath='../../module/nvpair/fnvpair.c' line='203' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_nvlist'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='203' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='203' column='1'/>
-      <parameter type-id='type-id-73' name='val' filepath='../../module/nvpair/fnvpair.c' line='203' column='1'/>
+    <function-decl name='fnvlist_add_nvlist' mangled-name='fnvlist_add_nvlist' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_nvlist'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-73' name='val'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_nvlist' filepath='../../include/sys/nvpair.h' line='180' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_nvlist' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-218'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_nvpair' mangled-name='fnvlist_add_nvpair' filepath='../../module/nvpair/fnvpair.c' line='209' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_nvpair'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='209' column='1'/>
-      <parameter type-id='type-id-243' name='pair' filepath='../../module/nvpair/fnvpair.c' line='209' column='1'/>
+    <function-decl name='fnvlist_add_nvpair' mangled-name='fnvlist_add_nvpair' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_nvpair'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-243' name='pair'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_nvpair' filepath='../../include/sys/nvpair.h' line='167' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_nvpair' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-217'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_boolean_array' mangled-name='fnvlist_add_boolean_array' filepath='../../module/nvpair/fnvpair.c' line='215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_boolean_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='215' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='215' column='1'/>
-      <parameter type-id='type-id-122' name='val' filepath='../../module/nvpair/fnvpair.c' line='216' column='1'/>
-      <parameter type-id='type-id-123' name='n' filepath='../../module/nvpair/fnvpair.c' line='216' column='1'/>
+    <function-decl name='fnvlist_add_boolean_array' mangled-name='fnvlist_add_boolean_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_boolean_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-122' name='val'/>
+      <parameter type-id='type-id-123' name='n'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_boolean_array' filepath='../../include/sys/nvpair.h' line='181' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_boolean_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-237'/>
       <parameter type-id='type-id-69'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_byte_array' mangled-name='fnvlist_add_byte_array' filepath='../../module/nvpair/fnvpair.c' line='222' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_byte_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='222' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='222' column='1'/>
-      <parameter type-id='type-id-126' name='val' filepath='../../module/nvpair/fnvpair.c' line='222' column='1'/>
-      <parameter type-id='type-id-123' name='n' filepath='../../module/nvpair/fnvpair.c' line='222' column='1'/>
+    <function-decl name='fnvlist_add_byte_array' mangled-name='fnvlist_add_byte_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_byte_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-126' name='val'/>
+      <parameter type-id='type-id-123' name='n'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_byte_array' filepath='../../include/sys/nvpair.h' line='182' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_byte_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-219'/>
       <parameter type-id='type-id-69'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_int8_array' mangled-name='fnvlist_add_int8_array' filepath='../../module/nvpair/fnvpair.c' line='228' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_int8_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='228' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='228' column='1'/>
-      <parameter type-id='type-id-129' name='val' filepath='../../module/nvpair/fnvpair.c' line='228' column='1'/>
-      <parameter type-id='type-id-123' name='n' filepath='../../module/nvpair/fnvpair.c' line='228' column='1'/>
+    <function-decl name='fnvlist_add_int8_array' mangled-name='fnvlist_add_int8_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_int8_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-129' name='val'/>
+      <parameter type-id='type-id-123' name='n'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_int8_array' filepath='../../include/sys/nvpair.h' line='183' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_int8_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-238'/>
       <parameter type-id='type-id-69'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_uint8_array' mangled-name='fnvlist_add_uint8_array' filepath='../../module/nvpair/fnvpair.c' line='234' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_uint8_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='234' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='234' column='1'/>
-      <parameter type-id='type-id-132' name='val' filepath='../../module/nvpair/fnvpair.c' line='234' column='1'/>
-      <parameter type-id='type-id-123' name='n' filepath='../../module/nvpair/fnvpair.c' line='234' column='1'/>
+    <function-decl name='fnvlist_add_uint8_array' mangled-name='fnvlist_add_uint8_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_uint8_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-132' name='val'/>
+      <parameter type-id='type-id-123' name='n'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_uint8_array' filepath='../../include/sys/nvpair.h' line='184' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_uint8_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-219'/>
       <parameter type-id='type-id-69'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_int16_array' mangled-name='fnvlist_add_int16_array' filepath='../../module/nvpair/fnvpair.c' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_int16_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='240' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='240' column='1'/>
-      <parameter type-id='type-id-135' name='val' filepath='../../module/nvpair/fnvpair.c' line='240' column='1'/>
-      <parameter type-id='type-id-123' name='n' filepath='../../module/nvpair/fnvpair.c' line='240' column='1'/>
+    <function-decl name='fnvlist_add_int16_array' mangled-name='fnvlist_add_int16_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_int16_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-135' name='val'/>
+      <parameter type-id='type-id-123' name='n'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_int16_array' filepath='../../include/sys/nvpair.h' line='185' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_int16_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-220'/>
       <parameter type-id='type-id-69'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_uint16_array' mangled-name='fnvlist_add_uint16_array' filepath='../../module/nvpair/fnvpair.c' line='246' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_uint16_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='246' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='246' column='1'/>
-      <parameter type-id='type-id-138' name='val' filepath='../../module/nvpair/fnvpair.c' line='247' column='1'/>
-      <parameter type-id='type-id-123' name='n' filepath='../../module/nvpair/fnvpair.c' line='247' column='1'/>
+    <function-decl name='fnvlist_add_uint16_array' mangled-name='fnvlist_add_uint16_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_uint16_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-138' name='val'/>
+      <parameter type-id='type-id-123' name='n'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_uint16_array' filepath='../../include/sys/nvpair.h' line='186' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_uint16_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-221'/>
       <parameter type-id='type-id-69'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_int32_array' mangled-name='fnvlist_add_int32_array' filepath='../../module/nvpair/fnvpair.c' line='253' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_int32_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='253' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='253' column='1'/>
-      <parameter type-id='type-id-141' name='val' filepath='../../module/nvpair/fnvpair.c' line='253' column='1'/>
-      <parameter type-id='type-id-123' name='n' filepath='../../module/nvpair/fnvpair.c' line='253' column='1'/>
+    <function-decl name='fnvlist_add_int32_array' mangled-name='fnvlist_add_int32_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_int32_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-141' name='val'/>
+      <parameter type-id='type-id-123' name='n'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_int32_array' filepath='../../include/sys/nvpair.h' line='187' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_int32_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-222'/>
       <parameter type-id='type-id-69'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_uint32_array' mangled-name='fnvlist_add_uint32_array' filepath='../../module/nvpair/fnvpair.c' line='259' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_uint32_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='259' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='259' column='1'/>
-      <parameter type-id='type-id-144' name='val' filepath='../../module/nvpair/fnvpair.c' line='260' column='1'/>
-      <parameter type-id='type-id-123' name='n' filepath='../../module/nvpair/fnvpair.c' line='260' column='1'/>
+    <function-decl name='fnvlist_add_uint32_array' mangled-name='fnvlist_add_uint32_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_uint32_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-144' name='val'/>
+      <parameter type-id='type-id-123' name='n'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_uint32_array' filepath='../../include/sys/nvpair.h' line='188' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_uint32_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-223'/>
       <parameter type-id='type-id-69'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_int64_array' mangled-name='fnvlist_add_int64_array' filepath='../../module/nvpair/fnvpair.c' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_int64_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='266' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='266' column='1'/>
-      <parameter type-id='type-id-147' name='val' filepath='../../module/nvpair/fnvpair.c' line='266' column='1'/>
-      <parameter type-id='type-id-123' name='n' filepath='../../module/nvpair/fnvpair.c' line='266' column='1'/>
+    <function-decl name='fnvlist_add_int64_array' mangled-name='fnvlist_add_int64_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_int64_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-147' name='val'/>
+      <parameter type-id='type-id-123' name='n'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_int64_array' filepath='../../include/sys/nvpair.h' line='189' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_int64_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-224'/>
       <parameter type-id='type-id-69'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_uint64_array' mangled-name='fnvlist_add_uint64_array' filepath='../../module/nvpair/fnvpair.c' line='272' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_uint64_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='272' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='272' column='1'/>
-      <parameter type-id='type-id-150' name='val' filepath='../../module/nvpair/fnvpair.c' line='273' column='1'/>
-      <parameter type-id='type-id-123' name='n' filepath='../../module/nvpair/fnvpair.c' line='273' column='1'/>
+    <function-decl name='fnvlist_add_uint64_array' mangled-name='fnvlist_add_uint64_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_uint64_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-150' name='val'/>
+      <parameter type-id='type-id-123' name='n'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_uint64_array' filepath='../../include/sys/nvpair.h' line='190' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_uint64_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-225'/>
       <parameter type-id='type-id-69'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_string_array' mangled-name='fnvlist_add_string_array' filepath='../../module/nvpair/fnvpair.c' line='279' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_string_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='279' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='279' column='1'/>
-      <parameter type-id='type-id-279' name='val' filepath='../../module/nvpair/fnvpair.c' line='280' column='1'/>
-      <parameter type-id='type-id-123' name='n' filepath='../../module/nvpair/fnvpair.c' line='280' column='1'/>
+    <function-decl name='fnvlist_add_string_array' mangled-name='fnvlist_add_string_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_string_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-279' name='val'/>
+      <parameter type-id='type-id-123' name='n'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_string_array' filepath='../../include/sys/nvpair.h' line='191' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_string_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-279'/>
       <parameter type-id='type-id-69'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_add_nvlist_array' mangled-name='fnvlist_add_nvlist_array' filepath='../../module/nvpair/fnvpair.c' line='286' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_nvlist_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='286' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='286' column='1'/>
-      <parameter type-id='type-id-156' name='val' filepath='../../module/nvpair/fnvpair.c' line='287' column='1'/>
-      <parameter type-id='type-id-123' name='n' filepath='../../module/nvpair/fnvpair.c' line='287' column='1'/>
+    <function-decl name='fnvlist_add_nvlist_array' mangled-name='fnvlist_add_nvlist_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_add_nvlist_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-156' name='val'/>
+      <parameter type-id='type-id-123' name='n'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_add_nvlist_array' filepath='../../include/sys/nvpair.h' line='192' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_add_nvlist_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-235'/>
       <parameter type-id='type-id-69'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_remove' mangled-name='fnvlist_remove' filepath='../../module/nvpair/fnvpair.c' line='293' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_remove'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='131' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='131' column='1'/>
+    <function-decl name='fnvlist_remove' mangled-name='fnvlist_remove' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_remove'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_remove_all' filepath='../../include/sys/nvpair.h' line='199' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_remove_all' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_remove_nvpair' mangled-name='fnvlist_remove_nvpair' filepath='../../module/nvpair/fnvpair.c' line='299' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_remove_nvpair'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='209' column='1'/>
-      <parameter type-id='type-id-243' name='pair' filepath='../../module/nvpair/fnvpair.c' line='209' column='1'/>
+    <function-decl name='fnvlist_remove_nvpair' mangled-name='fnvlist_remove_nvpair' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_remove_nvpair'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-243' name='pair'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='nvlist_remove_nvpair' filepath='../../include/sys/nvpair.h' line='200' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_remove_nvpair' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-217'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_lookup_nvpair' mangled-name='fnvlist_lookup_nvpair' filepath='../../module/nvpair/fnvpair.c' line='305' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_nvpair'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='305' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='305' column='1'/>
+    <function-decl name='fnvlist_lookup_nvpair' mangled-name='fnvlist_lookup_nvpair' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_nvpair'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
       <return type-id='type-id-243'/>
     </function-decl>
     <pointer-type-def type-id='type-id-217' size-in-bits='64' id='type-id-334'/>
-    <function-decl name='nvlist_lookup_nvpair' filepath='../../include/sys/nvpair.h' line='235' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_lookup_nvpair' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-334'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_lookup_boolean' mangled-name='fnvlist_lookup_boolean' filepath='../../module/nvpair/fnvpair.c' line='314' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_boolean'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='314' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='314' column='1'/>
+    <function-decl name='fnvlist_lookup_boolean' mangled-name='fnvlist_lookup_boolean' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_boolean'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
       <return type-id='type-id-77'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_boolean' filepath='../../include/sys/nvpair.h' line='202' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_lookup_boolean' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_lookup_boolean_value' mangled-name='fnvlist_lookup_boolean_value' filepath='../../module/nvpair/fnvpair.c' line='320' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_boolean_value'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='320' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='320' column='1'/>
+    <function-decl name='fnvlist_lookup_boolean_value' mangled-name='fnvlist_lookup_boolean_value' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_boolean_value'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
       <return type-id='type-id-77'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_boolean_value' filepath='../../include/sys/nvpair.h' line='203' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_lookup_boolean_value' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-237'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_lookup_byte' mangled-name='fnvlist_lookup_byte' filepath='../../module/nvpair/fnvpair.c' line='328' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_byte'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='328' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='328' column='1'/>
+    <function-decl name='fnvlist_lookup_byte' mangled-name='fnvlist_lookup_byte' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_byte'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
       <return type-id='type-id-81'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_byte' filepath='../../include/sys/nvpair.h' line='204' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_lookup_byte' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-219'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_lookup_int8' mangled-name='fnvlist_lookup_int8' filepath='../../module/nvpair/fnvpair.c' line='336' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_int8'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='336' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='336' column='1'/>
+    <function-decl name='fnvlist_lookup_int8' mangled-name='fnvlist_lookup_int8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_int8'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
       <return type-id='type-id-85'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_int8' filepath='../../include/sys/nvpair.h' line='205' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_lookup_int8' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-238'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_lookup_int16' mangled-name='fnvlist_lookup_int16' filepath='../../module/nvpair/fnvpair.c' line='344' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_int16'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='344' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='344' column='1'/>
+    <function-decl name='fnvlist_lookup_int16' mangled-name='fnvlist_lookup_int16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_int16'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
       <return type-id='type-id-94'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_int16' filepath='../../include/sys/nvpair.h' line='207' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_lookup_int16' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-220'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_lookup_int32' mangled-name='fnvlist_lookup_int32' filepath='../../module/nvpair/fnvpair.c' line='352' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_int32'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='352' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='352' column='1'/>
+    <function-decl name='fnvlist_lookup_int32' mangled-name='fnvlist_lookup_int32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_int32'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
       <return type-id='type-id-65'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_int32' filepath='../../include/sys/nvpair.h' line='209' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_lookup_int32' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-222'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_lookup_int64' mangled-name='fnvlist_lookup_int64' filepath='../../module/nvpair/fnvpair.c' line='360' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_int64'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='360' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='360' column='1'/>
+    <function-decl name='fnvlist_lookup_int64' mangled-name='fnvlist_lookup_int64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_int64'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
       <return type-id='type-id-106'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_int64' filepath='../../include/sys/nvpair.h' line='211' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_lookup_int64' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-224'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_lookup_uint8' mangled-name='fnvlist_lookup_uint8' filepath='../../module/nvpair/fnvpair.c' line='368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_uint8'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='368' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='368' column='1'/>
+    <function-decl name='fnvlist_lookup_uint8' mangled-name='fnvlist_lookup_uint8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_uint8'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
       <return type-id='type-id-89'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_uint8' filepath='../../include/sys/nvpair.h' line='206' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_lookup_uint8' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-219'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_lookup_uint16' mangled-name='fnvlist_lookup_uint16' filepath='../../module/nvpair/fnvpair.c' line='376' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_uint16'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='376' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='376' column='1'/>
+    <function-decl name='fnvlist_lookup_uint16' mangled-name='fnvlist_lookup_uint16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_uint16'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
       <return type-id='type-id-98'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_uint16' filepath='../../include/sys/nvpair.h' line='208' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_lookup_uint16' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-221'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_lookup_uint32' mangled-name='fnvlist_lookup_uint32' filepath='../../module/nvpair/fnvpair.c' line='384' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_uint32'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='384' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='384' column='1'/>
+    <function-decl name='fnvlist_lookup_uint32' mangled-name='fnvlist_lookup_uint32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_uint32'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
       <return type-id='type-id-66'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_uint32' filepath='../../include/sys/nvpair.h' line='210' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_lookup_uint32' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_lookup_uint64' mangled-name='fnvlist_lookup_uint64' filepath='../../module/nvpair/fnvpair.c' line='392' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_uint64'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='392' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='392' column='1'/>
+    <function-decl name='fnvlist_lookup_uint64' mangled-name='fnvlist_lookup_uint64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_uint64'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
       <return type-id='type-id-67'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_uint64' filepath='../../include/sys/nvpair.h' line='212' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_lookup_uint64' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-225'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_lookup_string' mangled-name='fnvlist_lookup_string' filepath='../../module/nvpair/fnvpair.c' line='400' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_string'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='400' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='400' column='1'/>
+    <function-decl name='fnvlist_lookup_string' mangled-name='fnvlist_lookup_string' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_string'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_string' filepath='../../include/sys/nvpair.h' line='213' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_lookup_string' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-153'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_lookup_nvlist' mangled-name='fnvlist_lookup_nvlist' filepath='../../module/nvpair/fnvpair.c' line='408' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_nvlist'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='408' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='408' column='1'/>
+    <function-decl name='fnvlist_lookup_nvlist' mangled-name='fnvlist_lookup_nvlist' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_nvlist'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
       <return type-id='type-id-73'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_nvlist' filepath='../../include/sys/nvpair.h' line='214' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_lookup_nvlist' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-235'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_lookup_boolean_array' mangled-name='fnvlist_lookup_boolean_array' filepath='../../module/nvpair/fnvpair.c' line='415' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_boolean_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='415' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='415' column='1'/>
-      <parameter type-id='type-id-281' name='n' filepath='../../module/nvpair/fnvpair.c' line='415' column='1'/>
+    <function-decl name='fnvlist_lookup_boolean_array' mangled-name='fnvlist_lookup_boolean_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_boolean_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-281' name='n'/>
       <return type-id='type-id-122'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_boolean_array' filepath='../../include/sys/nvpair.h' line='215' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_lookup_boolean_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-239'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_lookup_byte_array' mangled-name='fnvlist_lookup_byte_array' filepath='../../module/nvpair/fnvpair.c' line='423' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_byte_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='423' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='423' column='1'/>
-      <parameter type-id='type-id-281' name='n' filepath='../../module/nvpair/fnvpair.c' line='423' column='1'/>
+    <function-decl name='fnvlist_lookup_byte_array' mangled-name='fnvlist_lookup_byte_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_byte_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-281' name='n'/>
       <return type-id='type-id-126'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_byte_array' filepath='../../include/sys/nvpair.h' line='217' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_lookup_byte_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-226'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_lookup_int8_array' mangled-name='fnvlist_lookup_int8_array' filepath='../../module/nvpair/fnvpair.c' line='431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_int8_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='431' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='431' column='1'/>
-      <parameter type-id='type-id-281' name='n' filepath='../../module/nvpair/fnvpair.c' line='431' column='1'/>
+    <function-decl name='fnvlist_lookup_int8_array' mangled-name='fnvlist_lookup_int8_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_int8_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-281' name='n'/>
       <return type-id='type-id-129'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_int8_array' filepath='../../include/sys/nvpair.h' line='218' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_lookup_int8_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-240'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_lookup_uint8_array' mangled-name='fnvlist_lookup_uint8_array' filepath='../../module/nvpair/fnvpair.c' line='439' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_uint8_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='439' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='439' column='1'/>
-      <parameter type-id='type-id-281' name='n' filepath='../../module/nvpair/fnvpair.c' line='439' column='1'/>
+    <function-decl name='fnvlist_lookup_uint8_array' mangled-name='fnvlist_lookup_uint8_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_uint8_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-281' name='n'/>
       <return type-id='type-id-132'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_uint8_array' filepath='../../include/sys/nvpair.h' line='219' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_lookup_uint8_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-226'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_lookup_int16_array' mangled-name='fnvlist_lookup_int16_array' filepath='../../module/nvpair/fnvpair.c' line='447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_int16_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='447' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='447' column='1'/>
-      <parameter type-id='type-id-281' name='n' filepath='../../module/nvpair/fnvpair.c' line='447' column='1'/>
+    <function-decl name='fnvlist_lookup_int16_array' mangled-name='fnvlist_lookup_int16_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_int16_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-281' name='n'/>
       <return type-id='type-id-135'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_int16_array' filepath='../../include/sys/nvpair.h' line='220' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_lookup_int16_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-227'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_lookup_uint16_array' mangled-name='fnvlist_lookup_uint16_array' filepath='../../module/nvpair/fnvpair.c' line='455' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_uint16_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='455' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='455' column='1'/>
-      <parameter type-id='type-id-281' name='n' filepath='../../module/nvpair/fnvpair.c' line='455' column='1'/>
+    <function-decl name='fnvlist_lookup_uint16_array' mangled-name='fnvlist_lookup_uint16_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_uint16_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-281' name='n'/>
       <return type-id='type-id-138'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_uint16_array' filepath='../../include/sys/nvpair.h' line='221' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_lookup_uint16_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-228'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_lookup_int32_array' mangled-name='fnvlist_lookup_int32_array' filepath='../../module/nvpair/fnvpair.c' line='463' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_int32_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='463' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='463' column='1'/>
-      <parameter type-id='type-id-281' name='n' filepath='../../module/nvpair/fnvpair.c' line='463' column='1'/>
+    <function-decl name='fnvlist_lookup_int32_array' mangled-name='fnvlist_lookup_int32_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_int32_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-281' name='n'/>
       <return type-id='type-id-141'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_int32_array' filepath='../../include/sys/nvpair.h' line='222' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_lookup_int32_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-229'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_lookup_uint32_array' mangled-name='fnvlist_lookup_uint32_array' filepath='../../module/nvpair/fnvpair.c' line='471' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_uint32_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='471' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='471' column='1'/>
-      <parameter type-id='type-id-281' name='n' filepath='../../module/nvpair/fnvpair.c' line='471' column='1'/>
+    <function-decl name='fnvlist_lookup_uint32_array' mangled-name='fnvlist_lookup_uint32_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_uint32_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-281' name='n'/>
       <return type-id='type-id-144'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_uint32_array' filepath='../../include/sys/nvpair.h' line='223' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_lookup_uint32_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-230'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_lookup_int64_array' mangled-name='fnvlist_lookup_int64_array' filepath='../../module/nvpair/fnvpair.c' line='479' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_int64_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='479' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='479' column='1'/>
-      <parameter type-id='type-id-281' name='n' filepath='../../module/nvpair/fnvpair.c' line='479' column='1'/>
+    <function-decl name='fnvlist_lookup_int64_array' mangled-name='fnvlist_lookup_int64_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_int64_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-281' name='n'/>
       <return type-id='type-id-147'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_int64_array' filepath='../../include/sys/nvpair.h' line='224' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_lookup_int64_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-231'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvlist_lookup_uint64_array' mangled-name='fnvlist_lookup_uint64_array' filepath='../../module/nvpair/fnvpair.c' line='487' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_uint64_array'>
-      <parameter type-id='type-id-73' name='nvl' filepath='../../module/nvpair/fnvpair.c' line='487' column='1'/>
-      <parameter type-id='type-id-6' name='name' filepath='../../module/nvpair/fnvpair.c' line='487' column='1'/>
-      <parameter type-id='type-id-281' name='n' filepath='../../module/nvpair/fnvpair.c' line='487' column='1'/>
+    <function-decl name='fnvlist_lookup_uint64_array' mangled-name='fnvlist_lookup_uint64_array' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvlist_lookup_uint64_array'>
+      <parameter type-id='type-id-73' name='nvl'/>
+      <parameter type-id='type-id-6' name='name'/>
+      <parameter type-id='type-id-281' name='n'/>
       <return type-id='type-id-150'/>
     </function-decl>
-    <function-decl name='nvlist_lookup_uint64_array' filepath='../../include/sys/nvpair.h' line='225' column='1' visibility='default' binding='global' size-in-bits='64'>
+    <function-decl name='nvlist_lookup_uint64_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-218'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-232'/>
       <parameter type-id='type-id-223'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='fnvpair_value_boolean_value' mangled-name='fnvpair_value_boolean_value' filepath='../../module/nvpair/fnvpair.c' line='495' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_boolean_value'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/fnvpair.c' line='495' column='1'/>
+    <function-decl name='fnvpair_value_boolean_value' mangled-name='fnvpair_value_boolean_value' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_boolean_value'>
+      <parameter type-id='type-id-243' name='nvp'/>
       <return type-id='type-id-77'/>
     </function-decl>
-    <function-decl name='fnvpair_value_byte' mangled-name='fnvpair_value_byte' filepath='../../module/nvpair/fnvpair.c' line='503' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_byte'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/fnvpair.c' line='503' column='1'/>
+    <function-decl name='fnvpair_value_byte' mangled-name='fnvpair_value_byte' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_byte'>
+      <parameter type-id='type-id-243' name='nvp'/>
       <return type-id='type-id-81'/>
     </function-decl>
-    <function-decl name='fnvpair_value_int8' mangled-name='fnvpair_value_int8' filepath='../../module/nvpair/fnvpair.c' line='511' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_int8'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/fnvpair.c' line='511' column='1'/>
+    <function-decl name='fnvpair_value_int8' mangled-name='fnvpair_value_int8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_int8'>
+      <parameter type-id='type-id-243' name='nvp'/>
       <return type-id='type-id-85'/>
     </function-decl>
-    <function-decl name='fnvpair_value_int16' mangled-name='fnvpair_value_int16' filepath='../../module/nvpair/fnvpair.c' line='519' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_int16'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/fnvpair.c' line='519' column='1'/>
+    <function-decl name='fnvpair_value_int16' mangled-name='fnvpair_value_int16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_int16'>
+      <parameter type-id='type-id-243' name='nvp'/>
       <return type-id='type-id-94'/>
     </function-decl>
-    <function-decl name='fnvpair_value_int32' mangled-name='fnvpair_value_int32' filepath='../../module/nvpair/fnvpair.c' line='527' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_int32'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/fnvpair.c' line='527' column='1'/>
+    <function-decl name='fnvpair_value_int32' mangled-name='fnvpair_value_int32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_int32'>
+      <parameter type-id='type-id-243' name='nvp'/>
       <return type-id='type-id-65'/>
     </function-decl>
-    <function-decl name='fnvpair_value_int64' mangled-name='fnvpair_value_int64' filepath='../../module/nvpair/fnvpair.c' line='535' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_int64'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/fnvpair.c' line='535' column='1'/>
+    <function-decl name='fnvpair_value_int64' mangled-name='fnvpair_value_int64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_int64'>
+      <parameter type-id='type-id-243' name='nvp'/>
       <return type-id='type-id-106'/>
     </function-decl>
-    <function-decl name='fnvpair_value_uint8' mangled-name='fnvpair_value_uint8' filepath='../../module/nvpair/fnvpair.c' line='543' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_uint8'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/fnvpair.c' line='543' column='1'/>
+    <function-decl name='fnvpair_value_uint8' mangled-name='fnvpair_value_uint8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_uint8'>
+      <parameter type-id='type-id-243' name='nvp'/>
       <return type-id='type-id-89'/>
     </function-decl>
-    <function-decl name='fnvpair_value_uint16' mangled-name='fnvpair_value_uint16' filepath='../../module/nvpair/fnvpair.c' line='551' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_uint16'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/fnvpair.c' line='551' column='1'/>
+    <function-decl name='fnvpair_value_uint16' mangled-name='fnvpair_value_uint16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_uint16'>
+      <parameter type-id='type-id-243' name='nvp'/>
       <return type-id='type-id-98'/>
     </function-decl>
-    <function-decl name='fnvpair_value_uint32' mangled-name='fnvpair_value_uint32' filepath='../../module/nvpair/fnvpair.c' line='559' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_uint32'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/fnvpair.c' line='559' column='1'/>
+    <function-decl name='fnvpair_value_uint32' mangled-name='fnvpair_value_uint32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_uint32'>
+      <parameter type-id='type-id-243' name='nvp'/>
       <return type-id='type-id-66'/>
     </function-decl>
-    <function-decl name='fnvpair_value_uint64' mangled-name='fnvpair_value_uint64' filepath='../../module/nvpair/fnvpair.c' line='567' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_uint64'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/fnvpair.c' line='567' column='1'/>
+    <function-decl name='fnvpair_value_uint64' mangled-name='fnvpair_value_uint64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_uint64'>
+      <parameter type-id='type-id-243' name='nvp'/>
       <return type-id='type-id-67'/>
     </function-decl>
-    <function-decl name='fnvpair_value_string' mangled-name='fnvpair_value_string' filepath='../../module/nvpair/fnvpair.c' line='575' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_string'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/fnvpair.c' line='575' column='1'/>
+    <function-decl name='fnvpair_value_string' mangled-name='fnvpair_value_string' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_string'>
+      <parameter type-id='type-id-243' name='nvp'/>
       <return type-id='type-id-9'/>
     </function-decl>
-    <function-decl name='fnvpair_value_nvlist' mangled-name='fnvpair_value_nvlist' filepath='../../module/nvpair/fnvpair.c' line='583' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_nvlist'>
-      <parameter type-id='type-id-243' name='nvp' filepath='../../module/nvpair/fnvpair.c' line='583' column='1'/>
+    <function-decl name='fnvpair_value_nvlist' mangled-name='fnvpair_value_nvlist' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fnvpair_value_nvlist'>
+      <parameter type-id='type-id-243' name='nvp'/>
       <return type-id='type-id-73'/>
     </function-decl>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='assert.c' comp-dir-path='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libspl' language='LANG_C99'>
-    <var-decl name='libspl_assert_ok' type-id='type-id-5' mangled-name='libspl_assert_ok' visibility='default' filepath='/mnt/filling/store/nabijaczleweli/code/zfs/lib/libspl/assert.c' line='28' column='1' elf-symbol-id='libspl_assert_ok'/>
+  <abi-instr version='1.0' address-size='64' path='assert.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libspl' language='LANG_C99'>
+    <var-decl name='libspl_assert_ok' type-id='type-id-5' mangled-name='libspl_assert_ok' visibility='default' elf-symbol-id='libspl_assert_ok'/>
   </abi-instr>
 </abi-corpus>
diff --git a/lib/libshare/Makefile.am b/lib/libshare/Makefile.am
index e42609c64..dff3e5382 100644
--- a/lib/libshare/Makefile.am
+++ b/lib/libshare/Makefile.am
@@ -2,6 +2,8 @@ include $(top_srcdir)/config/Rules.am
 
 DEFAULT_INCLUDES += -I$(srcdir)
 
+AM_CFLAGS += -fvisibility=hidden
+
 noinst_LTLIBRARIES = libshare.la
 
 USER_C = \
diff --git a/lib/libshare/nfs.c b/lib/libshare/nfs.c
index 44d3e93d4..e339ebc81 100644
--- a/lib/libshare/nfs.c
+++ b/lib/libshare/nfs.c
@@ -119,7 +119,7 @@ nfs_fini_tmpfile(const char *exports, char *tmpfile)
 	return (SA_OK);
 }
 
-__attribute__((visibility("hidden"))) int
+int
 nfs_toggle_share(const char *lockfile, const char *exports,
     const char *expdir, sa_share_impl_t impl_share,
     int(*cbk)(sa_share_impl_t impl_share, char *filename))
diff --git a/lib/libshare/os/freebsd/nfs.c b/lib/libshare/os/freebsd/nfs.c
index b82491f2e..0041bc228 100644
--- a/lib/libshare/os/freebsd/nfs.c
+++ b/lib/libshare/os/freebsd/nfs.c
@@ -147,7 +147,7 @@ translate_opts(const char *shareopts)
  * This function copies all entries from the exports file to "filename",
  * omitting any entries for the specified mountpoint.
  */
-__attribute__((visibility("hidden"))) int
+int
 nfs_copy_entries(char *filename, const char *mountpoint)
 {
 	int error = SA_OK;
diff --git a/lib/libshare/os/linux/nfs.c b/lib/libshare/os/linux/nfs.c
index c236f2569..bd578adee 100644
--- a/lib/libshare/os/linux/nfs.c
+++ b/lib/libshare/os/linux/nfs.c
@@ -400,7 +400,7 @@ nfs_add_entry(const char *filename, const char *sharepath,
  * This function copies all entries from the exports file to "filename",
  * omitting any entries for the specified mountpoint.
  */
-__attribute__((visibility("hidden"))) int
+int
 nfs_copy_entries(char *filename, const char *mountpoint)
 {
 	char *buf = NULL;
diff --git a/lib/libspl/include/libshare.h b/lib/libspl/include/libshare.h
index ea53f8c15..5d06b163a 100644
--- a/lib/libspl/include/libshare.h
+++ b/lib/libspl/include/libshare.h
@@ -25,7 +25,7 @@
  * Copyright (c) 2019, 2020 by Delphix. All rights reserved.
  */
 #ifndef _LIBSPL_LIBSHARE_H
-#define	_LIBSPL_LIBSHARE_H
+#define	_LIBSPL_LIBSHARE_H extern __attribute__((visibility("default")))
 
 /* API Initialization */
 #define	SA_INIT_SHARE_API	0x0001	/* init share specific interface */
@@ -71,16 +71,16 @@
 #define	SA_SHARE_EXISTS		33	/* path or file is already shared */
 
 /* initialization */
-extern char *sa_errorstr(int);
+_LIBSPL_LIBSHARE_H char *sa_errorstr(int);
 
 /* share control */
-extern int sa_enable_share(const char *, const char *, const char *,
+_LIBSPL_LIBSHARE_H int sa_enable_share(const char *, const char *, const char *,
     char *);
-extern int sa_disable_share(const char *, char *);
-extern boolean_t sa_is_shared(const char *, char *);
-extern void sa_commit_shares(const char *);
+_LIBSPL_LIBSHARE_H int sa_disable_share(const char *, char *);
+_LIBSPL_LIBSHARE_H boolean_t sa_is_shared(const char *, char *);
+_LIBSPL_LIBSHARE_H void sa_commit_shares(const char *);
 
 /* protocol specific interfaces */
-extern int sa_validate_shareopts(char *, char *);
+_LIBSPL_LIBSHARE_H int sa_validate_shareopts(char *, char *);
 
 #endif /* _LIBSPL_LIBSHARE_H */
diff --git a/lib/libtpool/Makefile.am b/lib/libtpool/Makefile.am
index aa8bde32f..40fd137b4 100644
--- a/lib/libtpool/Makefile.am
+++ b/lib/libtpool/Makefile.am
@@ -1,5 +1,7 @@
 include $(top_srcdir)/config/Rules.am
 
+AM_CFLAGS += -fvisibility=hidden
+
 noinst_LTLIBRARIES = libtpool.la
 
 USER_C = \
diff --git a/lib/libzfs/libzfs.abi b/lib/libzfs/libzfs.abi
index 3dd8b2b14..9a1d95d96 100644
--- a/lib/libzfs/libzfs.abi
+++ b/lib/libzfs/libzfs.abi
@@ -34,8 +34,6 @@
     <elf-symbol name='get_dataset_depth' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='getprop_uint64' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='is_mounted' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='libshare_nfs_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='libshare_smb_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='libzfs_add_handle' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='libzfs_envvar_is_set' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='libzfs_errno' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -59,7 +57,6 @@
     <elf-symbol name='permset_namecheck' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='pool_namecheck' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='printf_color' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='register_fstype' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='sa_commit_shares' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='sa_disable_share' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='sa_enable_share' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -350,7 +347,6 @@
     <elf-symbol name='fletcher_4_superscalar4_ops' size='64' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='fletcher_4_superscalar_ops' size='64' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='libzfs_config_ops' size='16' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='smb_shares' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='spa_feature_table' size='1904' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zfeature_checks_disable' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zfs_deleg_perm_tab' size='512' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -2686,13 +2682,6 @@
       <parameter type-id='type-id-104'/>
       <return type-id='type-id-8'/>
     </function-decl>
-    <function-decl name='zfs_setprop_error' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-91'/>
-      <parameter type-id='type-id-85'/>
-      <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-17'/>
-      <return type-id='type-id-6'/>
-    </function-decl>
     <function-decl name='changelist_free' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-231'/>
       <return type-id='type-id-6'/>
@@ -2701,6 +2690,13 @@
       <parameter type-id='type-id-231'/>
       <return type-id='type-id-8'/>
     </function-decl>
+    <function-decl name='zfs_setprop_error' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-91'/>
+      <parameter type-id='type-id-85'/>
+      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-17'/>
+      <return type-id='type-id-6'/>
+    </function-decl>
     <function-decl name='nvlist_remove_all' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-104'/>
       <parameter type-id='type-id-84'/>
@@ -7576,6 +7572,51 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='libshare.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libshare' language='LANG_C99'>
+    <function-decl name='libshare_nfs_init' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-6'/>
+    </function-decl>
+    <function-decl name='libshare_smb_init' visibility='default' binding='global' size-in-bits='64'>
+      <return type-id='type-id-6'/>
+    </function-decl>
+    <function-decl name='sa_is_shared' mangled-name='sa_is_shared' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sa_is_shared'>
+      <parameter type-id='type-id-84' name='mountpoint'/>
+      <parameter type-id='type-id-17' name='protocol'/>
+      <return type-id='type-id-16'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='nfs.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libshare' language='LANG_C99'>
+    <function-decl name='mkdir' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-84'/>
+      <parameter type-id='type-id-5'/>
+      <return type-id='type-id-8'/>
+    </function-decl>
+    <function-decl name='mkostemp' mangled-name='mkostemp64' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-17'/>
+      <parameter type-id='type-id-8'/>
+      <return type-id='type-id-8'/>
+    </function-decl>
+    <function-decl name='flock' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-8'/>
+      <parameter type-id='type-id-8'/>
+      <return type-id='type-id-8'/>
+    </function-decl>
+    <function-decl name='nfs_copy_entries' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-17'/>
+      <parameter type-id='type-id-84'/>
+      <return type-id='type-id-8'/>
+    </function-decl>
+    <function-decl name='rename' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-84'/>
+      <parameter type-id='type-id-84'/>
+      <return type-id='type-id-8'/>
+    </function-decl>
+  </abi-instr>
+  <abi-instr version='1.0' address-size='64' path='os/linux/nfs.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libshare' language='LANG_C99'>
+    <function-decl name='fputs' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-84'/>
+      <parameter type-id='type-id-150'/>
+      <return type-id='type-id-8'/>
+    </function-decl>
     <class-decl name='sa_fstype' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-533'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='next' type-id='type-id-534' visibility='default'/>
@@ -7643,23 +7684,21 @@
     <typedef-decl name='sa_share_ops_t' type-id='type-id-536' id='type-id-555'/>
     <qualified-type-def type-id='type-id-555' const='yes' id='type-id-556'/>
     <pointer-type-def type-id='type-id-556' size-in-bits='64' id='type-id-535'/>
-    <typedef-decl name='sa_fstype_t' type-id='type-id-533' id='type-id-557'/>
+    <qualified-type-def type-id='type-id-536' const='yes' id='type-id-557'/>
     <pointer-type-def type-id='type-id-557' size-in-bits='64' id='type-id-558'/>
-    <function-decl name='register_fstype' mangled-name='register_fstype' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='register_fstype'>
-      <parameter type-id='type-id-84' name='name'/>
-      <parameter type-id='type-id-535' name='ops'/>
-      <return type-id='type-id-558'/>
-    </function-decl>
-    <function-decl name='libshare_nfs_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-6'/>
-    </function-decl>
-    <function-decl name='libshare_smb_init' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-6'/>
+    <function-decl name='register_fstype' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-84'/>
+      <parameter type-id='type-id-558'/>
+      <return type-id='type-id-534'/>
     </function-decl>
-    <function-decl name='sa_is_shared' mangled-name='sa_is_shared' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sa_is_shared'>
-      <parameter type-id='type-id-84' name='mountpoint'/>
-      <parameter type-id='type-id-17' name='protocol'/>
-      <return type-id='type-id-16'/>
+    <pointer-type-def type-id='type-id-559' size-in-bits='64' id='type-id-560'/>
+    <function-decl name='nfs_toggle_share' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-84'/>
+      <parameter type-id='type-id-84'/>
+      <parameter type-id='type-id-84'/>
+      <parameter type-id='type-id-547'/>
+      <parameter type-id='type-id-560'/>
+      <return type-id='type-id-8'/>
     </function-decl>
     <function-type size-in-bits='64' id='type-id-554'>
       <return type-id='type-id-8'/>
@@ -7668,6 +7707,11 @@
       <parameter type-id='type-id-84'/>
       <return type-id='type-id-8'/>
     </function-type>
+    <function-type size-in-bits='64' id='type-id-559'>
+      <parameter type-id='type-id-547'/>
+      <parameter type-id='type-id-17'/>
+      <return type-id='type-id-8'/>
+    </function-type>
     <function-type size-in-bits='64' id='type-id-549'>
       <parameter type-id='type-id-548'/>
       <return type-id='type-id-8'/>
@@ -7686,93 +7730,12 @@
       <return type-id='type-id-6'/>
     </function-type>
   </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='nfs.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libshare' language='LANG_C99'>
-    <function-decl name='mkdir' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-84'/>
-      <parameter type-id='type-id-5'/>
-      <return type-id='type-id-8'/>
-    </function-decl>
-    <function-decl name='mkostemp' mangled-name='mkostemp64' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-8'/>
-      <return type-id='type-id-8'/>
-    </function-decl>
-    <function-decl name='flock' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-8'/>
-      <parameter type-id='type-id-8'/>
-      <return type-id='type-id-8'/>
-    </function-decl>
-    <function-decl name='nfs_copy_entries' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-17'/>
-      <parameter type-id='type-id-84'/>
-      <return type-id='type-id-8'/>
-    </function-decl>
-    <function-decl name='rename' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-84'/>
-      <parameter type-id='type-id-84'/>
-      <return type-id='type-id-8'/>
-    </function-decl>
-  </abi-instr>
-  <abi-instr version='1.0' address-size='64' path='os/linux/nfs.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libshare' language='LANG_C99'>
-    <function-decl name='fputs' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-84'/>
-      <parameter type-id='type-id-150'/>
-      <return type-id='type-id-8'/>
-    </function-decl>
-    <qualified-type-def type-id='type-id-536' const='yes' id='type-id-559'/>
-    <pointer-type-def type-id='type-id-559' size-in-bits='64' id='type-id-560'/>
-    <function-decl name='register_fstype' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-84'/>
-      <parameter type-id='type-id-560'/>
-      <return type-id='type-id-534'/>
-    </function-decl>
-    <pointer-type-def type-id='type-id-561' size-in-bits='64' id='type-id-562'/>
-    <function-decl name='nfs_toggle_share' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-84'/>
-      <parameter type-id='type-id-84'/>
-      <parameter type-id='type-id-84'/>
-      <parameter type-id='type-id-547'/>
-      <parameter type-id='type-id-562'/>
-      <return type-id='type-id-8'/>
-    </function-decl>
-    <function-type size-in-bits='64' id='type-id-561'>
-      <parameter type-id='type-id-547'/>
-      <parameter type-id='type-id-17'/>
-      <return type-id='type-id-8'/>
-    </function-type>
-  </abi-instr>
   <abi-instr version='1.0' address-size='64' path='os/linux/smb.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libshare' language='LANG_C99'>
-    <class-decl name='smb_share_s' size-in-bits='36992' is-struct='yes' visibility='default' id='type-id-563'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='name' type-id='type-id-564' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='2040'>
-        <var-decl name='path' type-id='type-id-109' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='34808'>
-        <var-decl name='comment' type-id='type-id-564' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='36864'>
-        <var-decl name='guest_ok' type-id='type-id-16' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='36928'>
-        <var-decl name='next' type-id='type-id-565' visibility='default'/>
-      </data-member>
-    </class-decl>
-
-    <array-type-def dimensions='1' type-id='type-id-32' size-in-bits='2040' id='type-id-564'>
-      <subrange length='255' type-id='type-id-33' id='type-id-566'/>
-
-    </array-type-def>
-    <pointer-type-def type-id='type-id-563' size-in-bits='64' id='type-id-565'/>
-    <typedef-decl name='smb_share_t' type-id='type-id-563' id='type-id-567'/>
-    <pointer-type-def type-id='type-id-567' size-in-bits='64' id='type-id-568'/>
-    <var-decl name='smb_shares' type-id='type-id-568' mangled-name='smb_shares' visibility='default' elf-symbol-id='smb_shares'/>
     <function-decl name='opendir' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-84'/>
       <return type-id='type-id-305'/>
     </function-decl>
-    <class-decl name='dirent' size-in-bits='2240' is-struct='yes' visibility='default' id='type-id-569'>
+    <class-decl name='dirent' size-in-bits='2240' is-struct='yes' visibility='default' id='type-id-561'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='d_ino' type-id='type-id-307' visibility='default'/>
       </data-member>
@@ -7789,10 +7752,10 @@
         <var-decl name='d_name' type-id='type-id-12' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-569' size-in-bits='64' id='type-id-570'/>
+    <pointer-type-def type-id='type-id-561' size-in-bits='64' id='type-id-562'/>
     <function-decl name='readdir' mangled-name='readdir64' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-305'/>
-      <return type-id='type-id-570'/>
+      <return type-id='type-id-562'/>
     </function-decl>
     <function-decl name='fgets' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-17'/>
diff --git a/lib/libzfs_core/Makefile.am b/lib/libzfs_core/Makefile.am
index 67e554dc8..b2101e211 100644
--- a/lib/libzfs_core/Makefile.am
+++ b/lib/libzfs_core/Makefile.am
@@ -2,6 +2,8 @@ include $(top_srcdir)/config/Rules.am
 
 pkgconfig_DATA = libzfs_core.pc
 
+AM_CFLAGS += -fvisibility=hidden
+
 lib_LTLIBRARIES = libzfs_core.la
 
 include $(top_srcdir)/config/Abigail.am
diff --git a/lib/libzfs_core/libzfs_core.abi b/lib/libzfs_core/libzfs_core.abi
index 79567d150..f397929e1 100644
--- a/lib/libzfs_core/libzfs_core.abi
+++ b/lib/libzfs_core/libzfs_core.abi
@@ -166,7 +166,6 @@
     <elf-symbol name='getmntany' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='getzoneid' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='is_mpath_whole_disk' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='label_paths' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='libspl_assertf' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='libzfs_core_fini' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='libzfs_core_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -240,7 +239,6 @@
     <elf-symbol name='membar_producer' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='mkdirp' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='print_timestamp' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='slice_cache_compare' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='spl_pagesize' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='strlcat' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='strlcpy' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
@@ -276,17 +274,12 @@
     <elf-symbol name='zpool_default_search_paths' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zpool_dump_ddt' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zpool_find_config' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='zpool_find_import_blkid' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zpool_history_unpack' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zpool_label_disk_wait' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='zpool_open_func' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zpool_read_label' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='zpool_search_import' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='zutil_alloc' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
-    <elf-symbol name='zutil_strdup' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-function-symbols>
   <elf-variable-symbols>
-    <elf-symbol name='default_vtoc_map' size='64' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='efi_debug' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
     <elf-symbol name='libspl_assert_ok' size='4' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
   </elf-variable-symbols>
@@ -1802,63 +1795,11 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='zutil_import.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libzutil' language='LANG_C99'>
-    <class-decl name='libpc_handle' size-in-bits='8448' is-struct='yes' visibility='default' id='type-id-127'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='lpc_printerr' type-id='type-id-41' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='lpc_open_access_error' type-id='type-id-41' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='lpc_desc_active' type-id='type-id-41' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='96'>
-        <var-decl name='lpc_desc' type-id='type-id-128' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='8320'>
-        <var-decl name='lpc_ops' type-id='type-id-129' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='8384'>
-        <var-decl name='lpc_lib_handle' type-id='type-id-73' visibility='default'/>
-      </data-member>
-    </class-decl>
-
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='8192' id='type-id-128'>
-      <subrange length='1024' type-id='type-id-12' id='type-id-130'/>
-
-    </array-type-def>
-    <class-decl name='pool_config_ops' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-131'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='pco_refresh_config' type-id='type-id-132' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='pco_pool_active' type-id='type-id-133' visibility='default'/>
-      </data-member>
-    </class-decl>
-    <typedef-decl name='refresh_config_func_t' type-id='type-id-134' id='type-id-135'/>
-    <pointer-type-def type-id='type-id-135' size-in-bits='64' id='type-id-132'/>
-    <typedef-decl name='pool_active_func_t' type-id='type-id-136' id='type-id-137'/>
-    <pointer-type-def type-id='type-id-137' size-in-bits='64' id='type-id-133'/>
-    <qualified-type-def type-id='type-id-131' const='yes' id='type-id-138'/>
-    <typedef-decl name='pool_config_ops_t' type-id='type-id-138' id='type-id-139'/>
-    <pointer-type-def type-id='type-id-139' size-in-bits='64' id='type-id-129'/>
-    <typedef-decl name='libpc_handle_t' type-id='type-id-127' id='type-id-141'/>
-    <pointer-type-def type-id='type-id-141' size-in-bits='64' id='type-id-142'/>
-    <function-decl name='zutil_alloc' mangled-name='zutil_alloc' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zutil_alloc'>
-      <parameter type-id='type-id-142' name='hdl'/>
-      <parameter type-id='type-id-123' name='size'/>
-      <return type-id='type-id-73'/>
-    </function-decl>
-    <function-decl name='zutil_strdup' mangled-name='zutil_strdup' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zutil_strdup'>
-      <parameter type-id='type-id-142' name='hdl'/>
-      <parameter type-id='type-id-16' name='str'/>
-      <return type-id='type-id-37'/>
-    </function-decl>
-    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-143'/>
+    <pointer-type-def type-id='type-id-1' size-in-bits='64' id='type-id-127'/>
     <function-decl name='zpool_read_label' mangled-name='zpool_read_label' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zpool_read_label'>
       <parameter type-id='type-id-1' name='fd'/>
       <parameter type-id='type-id-64' name='config'/>
-      <parameter type-id='type-id-143' name='num_labels'/>
+      <parameter type-id='type-id-127' name='num_labels'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='ioctl' visibility='default' binding='global' size-in-bits='64'>
@@ -1870,14 +1811,14 @@
     <function-decl name='spl_pagesize' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-26'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-144'/>
+    <pointer-type-def type-id='type-id-73' size-in-bits='64' id='type-id-128'/>
     <function-decl name='posix_memalign' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-144'/>
+      <parameter type-id='type-id-128'/>
       <parameter type-id='type-id-26'/>
       <parameter type-id='type-id-26'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <class-decl name='aiocb' size-in-bits='1344' is-struct='yes' visibility='default' id='type-id-145'>
+    <class-decl name='aiocb' size-in-bits='1344' is-struct='yes' visibility='default' id='type-id-129'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='aio_fildes' type-id='type-id-1' visibility='default'/>
       </data-member>
@@ -1888,16 +1829,16 @@
         <var-decl name='aio_reqprio' type-id='type-id-1' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='aio_buf' type-id='type-id-146' visibility='default'/>
+        <var-decl name='aio_buf' type-id='type-id-130' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
         <var-decl name='aio_nbytes' type-id='type-id-123' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='aio_sigevent' type-id='type-id-147' visibility='default'/>
+        <var-decl name='aio_sigevent' type-id='type-id-131' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='__next_prio' type-id='type-id-148' visibility='default'/>
+        <var-decl name='__next_prio' type-id='type-id-132' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
         <var-decl name='__abs_prio' type-id='type-id-1' visibility='default'/>
@@ -1909,20 +1850,20 @@
         <var-decl name='__error_code' type-id='type-id-1' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='__return_value' type-id='type-id-149' visibility='default'/>
+        <var-decl name='__return_value' type-id='type-id-133' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='aio_offset' type-id='type-id-150' visibility='default'/>
+        <var-decl name='aio_offset' type-id='type-id-134' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1088'>
-        <var-decl name='__glibc_reserved' type-id='type-id-151' visibility='default'/>
+        <var-decl name='__glibc_reserved' type-id='type-id-135' visibility='default'/>
       </data-member>
     </class-decl>
-    <qualified-type-def type-id='type-id-17' volatile='yes' id='type-id-152'/>
-    <pointer-type-def type-id='type-id-152' size-in-bits='64' id='type-id-146'/>
-    <class-decl name='sigevent' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-147'>
+    <qualified-type-def type-id='type-id-17' volatile='yes' id='type-id-136'/>
+    <pointer-type-def type-id='type-id-136' size-in-bits='64' id='type-id-130'/>
+    <class-decl name='sigevent' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-131'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='sigev_value' type-id='type-id-153' visibility='default'/>
+        <var-decl name='sigev_value' type-id='type-id-137' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='sigev_signo' type-id='type-id-1' visibility='default'/>
@@ -1931,10 +1872,10 @@
         <var-decl name='sigev_notify' type-id='type-id-1' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='_sigev_un' type-id='type-id-154' visibility='default'/>
+        <var-decl name='_sigev_un' type-id='type-id-138' visibility='default'/>
       </data-member>
     </class-decl>
-    <union-decl name='sigval' size-in-bits='64' visibility='default' id='type-id-155'>
+    <union-decl name='sigval' size-in-bits='64' visibility='default' id='type-id-139'>
       <data-member access='private'>
         <var-decl name='sival_int' type-id='type-id-1' visibility='default'/>
       </data-member>
@@ -1942,74 +1883,74 @@
         <var-decl name='sival_ptr' type-id='type-id-73' visibility='default'/>
       </data-member>
     </union-decl>
-    <typedef-decl name='__sigval_t' type-id='type-id-155' id='type-id-153'/>
-    <union-decl name='__anonymous_union__' size-in-bits='384' is-anonymous='yes' visibility='default' id='type-id-154'>
+    <typedef-decl name='__sigval_t' type-id='type-id-139' id='type-id-137'/>
+    <union-decl name='__anonymous_union__' size-in-bits='384' is-anonymous='yes' visibility='default' id='type-id-138'>
       <data-member access='private'>
-        <var-decl name='_pad' type-id='type-id-156' visibility='default'/>
+        <var-decl name='_pad' type-id='type-id-140' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='_tid' type-id='type-id-157' visibility='default'/>
+        <var-decl name='_tid' type-id='type-id-141' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='_sigev_thread' type-id='type-id-158' visibility='default'/>
+        <var-decl name='_sigev_thread' type-id='type-id-142' visibility='default'/>
       </data-member>
     </union-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='384' id='type-id-156'>
+    <array-type-def dimensions='1' type-id='type-id-1' size-in-bits='384' id='type-id-140'>
       <subrange length='12' type-id='type-id-12' id='type-id-103'/>
 
     </array-type-def>
-    <typedef-decl name='__pid_t' type-id='type-id-1' id='type-id-157'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-158'>
+    <typedef-decl name='__pid_t' type-id='type-id-1' id='type-id-141'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-142'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='_function' type-id='type-id-159' visibility='default'/>
+        <var-decl name='_function' type-id='type-id-143' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='_attribute' type-id='type-id-160' visibility='default'/>
+        <var-decl name='_attribute' type-id='type-id-144' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-161' size-in-bits='64' id='type-id-159'/>
-    <union-decl name='pthread_attr_t' size-in-bits='448' visibility='default' id='type-id-162'>
+    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-143'/>
+    <union-decl name='pthread_attr_t' size-in-bits='448' visibility='default' id='type-id-146'>
       <data-member access='private'>
-        <var-decl name='__size' type-id='type-id-163' visibility='default'/>
+        <var-decl name='__size' type-id='type-id-147' visibility='default'/>
       </data-member>
       <data-member access='private'>
         <var-decl name='__align' type-id='type-id-5' visibility='default'/>
       </data-member>
     </union-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='448' id='type-id-163'>
-      <subrange length='56' type-id='type-id-12' id='type-id-164'/>
+    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='448' id='type-id-147'>
+      <subrange length='56' type-id='type-id-12' id='type-id-148'/>
 
     </array-type-def>
-    <typedef-decl name='pthread_attr_t' type-id='type-id-162' id='type-id-165'/>
-    <pointer-type-def type-id='type-id-165' size-in-bits='64' id='type-id-160'/>
-    <pointer-type-def type-id='type-id-145' size-in-bits='64' id='type-id-148'/>
-    <typedef-decl name='__ssize_t' type-id='type-id-5' id='type-id-149'/>
-    <typedef-decl name='__off64_t' type-id='type-id-5' id='type-id-150'/>
+    <typedef-decl name='pthread_attr_t' type-id='type-id-146' id='type-id-149'/>
+    <pointer-type-def type-id='type-id-149' size-in-bits='64' id='type-id-144'/>
+    <pointer-type-def type-id='type-id-129' size-in-bits='64' id='type-id-132'/>
+    <typedef-decl name='__ssize_t' type-id='type-id-5' id='type-id-133'/>
+    <typedef-decl name='__off64_t' type-id='type-id-5' id='type-id-134'/>
 
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='256' id='type-id-151'>
-      <subrange length='32' type-id='type-id-12' id='type-id-166'/>
+    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='256' id='type-id-135'>
+      <subrange length='32' type-id='type-id-12' id='type-id-150'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-148' const='yes' id='type-id-167'/>
-    <pointer-type-def type-id='type-id-167' size-in-bits='64' id='type-id-168'/>
-    <pointer-type-def type-id='type-id-147' size-in-bits='64' id='type-id-169'/>
+    <qualified-type-def type-id='type-id-132' const='yes' id='type-id-151'/>
+    <pointer-type-def type-id='type-id-151' size-in-bits='64' id='type-id-152'/>
+    <pointer-type-def type-id='type-id-131' size-in-bits='64' id='type-id-153'/>
     <function-decl name='lio_listio' mangled-name='lio_listio64' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-168'/>
+      <parameter type-id='type-id-152'/>
       <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-169'/>
+      <parameter type-id='type-id-153'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-145' const='yes' id='type-id-170'/>
-    <pointer-type-def type-id='type-id-170' size-in-bits='64' id='type-id-171'/>
+    <qualified-type-def type-id='type-id-129' const='yes' id='type-id-154'/>
+    <pointer-type-def type-id='type-id-154' size-in-bits='64' id='type-id-155'/>
     <function-decl name='aio_error' mangled-name='aio_error64' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-171'/>
+      <parameter type-id='type-id-155'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='aio_return' mangled-name='aio_return64' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-148'/>
+      <parameter type-id='type-id-132'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='pread64' visibility='default' binding='global' size-in-bits='64'>
@@ -2019,25 +1960,13 @@
       <parameter type-id='type-id-5'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <function-decl name='slice_cache_compare' mangled-name='slice_cache_compare' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='slice_cache_compare'>
-      <parameter type-id='type-id-73' name='arg1'/>
-      <parameter type-id='type-id-73' name='arg2'/>
-      <return type-id='type-id-1'/>
-    </function-decl>
-    <function-decl name='label_paths' mangled-name='label_paths' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='label_paths'>
-      <parameter type-id='type-id-142' name='hdl'/>
-      <parameter type-id='type-id-29' name='label'/>
-      <parameter type-id='type-id-124' name='path'/>
-      <parameter type-id='type-id-124' name='devid'/>
-      <return type-id='type-id-1'/>
-    </function-decl>
-    <pointer-type-def type-id='type-id-74' size-in-bits='64' id='type-id-172'/>
-    <pointer-type-def type-id='type-id-6' size-in-bits='64' id='type-id-173'/>
+    <pointer-type-def type-id='type-id-74' size-in-bits='64' id='type-id-156'/>
+    <pointer-type-def type-id='type-id-6' size-in-bits='64' id='type-id-157'/>
     <function-decl name='nvlist_lookup_nvlist_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-35'/>
       <parameter type-id='type-id-16'/>
-      <parameter type-id='type-id-172'/>
-      <parameter type-id='type-id-173'/>
+      <parameter type-id='type-id-156'/>
+      <parameter type-id='type-id-157'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='nvlist_lookup_string' visibility='default' binding='global' size-in-bits='64'>
@@ -2046,7 +1975,7 @@
       <parameter type-id='type-id-124'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <class-decl name='importargs' size-in-bits='448' is-struct='yes' visibility='default' id='type-id-174'>
+    <class-decl name='importargs' size-in-bits='448' is-struct='yes' visibility='default' id='type-id-158'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='path' type-id='type-id-124' visibility='default'/>
       </data-member>
@@ -2072,12 +2001,27 @@
         <var-decl name='policy' type-id='type-id-29' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='importargs_t' type-id='type-id-174' id='type-id-175'/>
-    <pointer-type-def type-id='type-id-175' size-in-bits='64' id='type-id-176'/>
+    <typedef-decl name='importargs_t' type-id='type-id-158' id='type-id-159'/>
+    <pointer-type-def type-id='type-id-159' size-in-bits='64' id='type-id-160'/>
+    <class-decl name='pool_config_ops' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-161'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='pco_refresh_config' type-id='type-id-162' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='pco_pool_active' type-id='type-id-163' visibility='default'/>
+      </data-member>
+    </class-decl>
+    <typedef-decl name='refresh_config_func_t' type-id='type-id-164' id='type-id-165'/>
+    <pointer-type-def type-id='type-id-165' size-in-bits='64' id='type-id-162'/>
+    <typedef-decl name='pool_active_func_t' type-id='type-id-166' id='type-id-167'/>
+    <pointer-type-def type-id='type-id-167' size-in-bits='64' id='type-id-163'/>
+    <qualified-type-def type-id='type-id-161' const='yes' id='type-id-168'/>
+    <typedef-decl name='pool_config_ops_t' type-id='type-id-168' id='type-id-169'/>
+    <pointer-type-def type-id='type-id-169' size-in-bits='64' id='type-id-171'/>
     <function-decl name='zpool_search_import' mangled-name='zpool_search_import' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zpool_search_import'>
       <parameter type-id='type-id-73' name='hdl'/>
-      <parameter type-id='type-id-176' name='import'/>
-      <parameter type-id='type-id-129' name='pco'/>
+      <parameter type-id='type-id-160' name='import'/>
+      <parameter type-id='type-id-171' name='pco'/>
       <return type-id='type-id-29'/>
     </function-decl>
     <function-decl name='dcgettext' visibility='default' binding='global' size-in-bits='64'>
@@ -2086,72 +2030,97 @@
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-37'/>
     </function-decl>
-    <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' id='type-id-177'>
+    <union-decl name='__anonymous_union__' size-in-bits='32' is-anonymous='yes' visibility='default' id='type-id-172'>
       <data-member access='private'>
-        <var-decl name='__size' type-id='type-id-178' visibility='default'/>
+        <var-decl name='__size' type-id='type-id-173' visibility='default'/>
       </data-member>
       <data-member access='private'>
         <var-decl name='__align' type-id='type-id-1' visibility='default'/>
       </data-member>
     </union-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='32' id='type-id-178'>
+    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='32' id='type-id-173'>
       <subrange length='4' type-id='type-id-12' id='type-id-92'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-177' const='yes' id='type-id-179'/>
-    <pointer-type-def type-id='type-id-179' size-in-bits='64' id='type-id-180'/>
+    <qualified-type-def type-id='type-id-172' const='yes' id='type-id-174'/>
+    <pointer-type-def type-id='type-id-174' size-in-bits='64' id='type-id-175'/>
     <function-decl name='pthread_mutex_init' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-14'/>
-      <parameter type-id='type-id-180'/>
+      <parameter type-id='type-id-175'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-127' size-in-bits='64' id='type-id-181'/>
-    <class-decl name='avl_tree' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-182'>
+    <class-decl name='libpc_handle' size-in-bits='8448' is-struct='yes' visibility='default' id='type-id-176'>
+      <data-member access='public' layout-offset-in-bits='0'>
+        <var-decl name='lpc_printerr' type-id='type-id-41' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='32'>
+        <var-decl name='lpc_open_access_error' type-id='type-id-41' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='64'>
+        <var-decl name='lpc_desc_active' type-id='type-id-41' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='96'>
+        <var-decl name='lpc_desc' type-id='type-id-177' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='8320'>
+        <var-decl name='lpc_ops' type-id='type-id-171' visibility='default'/>
+      </data-member>
+      <data-member access='public' layout-offset-in-bits='8384'>
+        <var-decl name='lpc_lib_handle' type-id='type-id-73' visibility='default'/>
+      </data-member>
+    </class-decl>
+
+    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='8192' id='type-id-177'>
+      <subrange length='1024' type-id='type-id-12' id='type-id-178'/>
+
+    </array-type-def>
+    <pointer-type-def type-id='type-id-176' size-in-bits='64' id='type-id-179'/>
+    <class-decl name='avl_tree' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-180'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='avl_root' type-id='type-id-183' visibility='default'/>
+        <var-decl name='avl_root' type-id='type-id-181' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='avl_compar' type-id='type-id-184' visibility='default'/>
+        <var-decl name='avl_compar' type-id='type-id-182' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='avl_offset' type-id='type-id-123' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='avl_numnodes' type-id='type-id-185' visibility='default'/>
+        <var-decl name='avl_numnodes' type-id='type-id-183' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='avl_size' type-id='type-id-123' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='avl_node' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-186'>
+    <class-decl name='avl_node' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-184'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='avl_child' type-id='type-id-187' visibility='default'/>
+        <var-decl name='avl_child' type-id='type-id-185' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='avl_pcb' type-id='type-id-188' visibility='default'/>
+        <var-decl name='avl_pcb' type-id='type-id-186' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-186' size-in-bits='64' id='type-id-183'/>
+    <pointer-type-def type-id='type-id-184' size-in-bits='64' id='type-id-181'/>
 
-    <array-type-def dimensions='1' type-id='type-id-183' size-in-bits='128' id='type-id-187'>
+    <array-type-def dimensions='1' type-id='type-id-181' size-in-bits='128' id='type-id-185'>
       <subrange length='2' type-id='type-id-12' id='type-id-62'/>
 
     </array-type-def>
-    <typedef-decl name='uintptr_t' type-id='type-id-26' id='type-id-188'/>
-    <pointer-type-def type-id='type-id-189' size-in-bits='64' id='type-id-184'/>
-    <typedef-decl name='ulong_t' type-id='type-id-26' id='type-id-185'/>
-    <pointer-type-def type-id='type-id-182' size-in-bits='64' id='type-id-190'/>
-    <pointer-type-def type-id='type-id-190' size-in-bits='64' id='type-id-191'/>
+    <typedef-decl name='uintptr_t' type-id='type-id-26' id='type-id-186'/>
+    <pointer-type-def type-id='type-id-187' size-in-bits='64' id='type-id-182'/>
+    <typedef-decl name='ulong_t' type-id='type-id-26' id='type-id-183'/>
+    <pointer-type-def type-id='type-id-180' size-in-bits='64' id='type-id-188'/>
+    <pointer-type-def type-id='type-id-188' size-in-bits='64' id='type-id-189'/>
     <function-decl name='zpool_find_import_blkid' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-181'/>
+      <parameter type-id='type-id-179'/>
       <parameter type-id='type-id-14'/>
-      <parameter type-id='type-id-191'/>
+      <parameter type-id='type-id-189'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='avl_create' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-190'/>
-      <parameter type-id='type-id-184'/>
+      <parameter type-id='type-id-188'/>
+      <parameter type-id='type-id-182'/>
       <parameter type-id='type-id-26'/>
       <parameter type-id='type-id-26'/>
       <return type-id='type-id-17'/>
@@ -2197,8 +2166,8 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='avl_destroy_nodes' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-190'/>
-      <parameter type-id='type-id-144'/>
+      <parameter type-id='type-id-188'/>
+      <parameter type-id='type-id-128'/>
       <return type-id='type-id-73'/>
     </function-decl>
     <function-decl name='nvlist_empty' visibility='default' binding='global' size-in-bits='64'>
@@ -2212,8 +2181,8 @@
       <parameter type-id='type-id-73' name='hdl'/>
       <parameter type-id='type-id-16' name='target'/>
       <parameter type-id='type-id-64' name='configp'/>
-      <parameter type-id='type-id-176' name='args'/>
-      <parameter type-id='type-id-129' name='pco'/>
+      <parameter type-id='type-id-160' name='args'/>
+      <parameter type-id='type-id-171' name='pco'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='nvpair_value_nvlist' visibility='default' binding='global' size-in-bits='64'>
@@ -2225,42 +2194,42 @@
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-5'/>
     </function-decl>
-    <class-decl name='tpool' size-in-bits='2496' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-192'/>
-    <pointer-type-def type-id='type-id-192' size-in-bits='64' id='type-id-193'/>
+    <class-decl name='tpool' size-in-bits='2496' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-190'/>
+    <pointer-type-def type-id='type-id-190' size-in-bits='64' id='type-id-191'/>
     <function-decl name='tpool_create' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-6'/>
       <parameter type-id='type-id-6'/>
-      <parameter type-id='type-id-160'/>
-      <return type-id='type-id-193'/>
+      <parameter type-id='type-id-144'/>
+      <return type-id='type-id-191'/>
     </function-decl>
     <function-decl name='avl_first' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-190'/>
+      <parameter type-id='type-id-188'/>
       <return type-id='type-id-73'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-194' size-in-bits='64' id='type-id-195'/>
+    <pointer-type-def type-id='type-id-192' size-in-bits='64' id='type-id-193'/>
     <function-decl name='tpool_dispatch' visibility='default' binding='global' size-in-bits='64'>
+      <parameter type-id='type-id-191'/>
       <parameter type-id='type-id-193'/>
-      <parameter type-id='type-id-195'/>
       <parameter type-id='type-id-73'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='avl_walk' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-190'/>
+      <parameter type-id='type-id-188'/>
       <parameter type-id='type-id-73'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-73'/>
     </function-decl>
     <function-decl name='tpool_wait' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-193'/>
+      <parameter type-id='type-id-191'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='tpool_destroy' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-193'/>
+      <parameter type-id='type-id-191'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='avl_destroy' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-190'/>
+      <parameter type-id='type-id-188'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='nvlist_remove' visibility='default' binding='global' size-in-bits='64'>
@@ -2275,12 +2244,12 @@
       <parameter type-id='type-id-26'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-38' size-in-bits='64' id='type-id-196'/>
+    <pointer-type-def type-id='type-id-38' size-in-bits='64' id='type-id-194'/>
     <function-decl name='nvlist_lookup_uint64_array' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-35'/>
       <parameter type-id='type-id-16'/>
-      <parameter type-id='type-id-196'/>
-      <parameter type-id='type-id-173'/>
+      <parameter type-id='type-id-194'/>
+      <parameter type-id='type-id-157'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='nvlist_add_uint64_array' visibility='default' binding='global' size-in-bits='64'>
@@ -2303,21 +2272,21 @@
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-197'/>
-    <pointer-type-def type-id='type-id-197' size-in-bits='64' id='type-id-198'/>
+    <class-decl name='__dirstream' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-195'/>
+    <pointer-type-def type-id='type-id-195' size-in-bits='64' id='type-id-196'/>
     <function-decl name='opendir' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-16'/>
-      <return type-id='type-id-198'/>
+      <return type-id='type-id-196'/>
     </function-decl>
-    <class-decl name='dirent64' size-in-bits='2240' is-struct='yes' visibility='default' id='type-id-199'>
+    <class-decl name='dirent64' size-in-bits='2240' is-struct='yes' visibility='default' id='type-id-197'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='d_ino' type-id='type-id-200' visibility='default'/>
+        <var-decl name='d_ino' type-id='type-id-198' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='d_off' type-id='type-id-150' visibility='default'/>
+        <var-decl name='d_off' type-id='type-id-134' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='d_reclen' type-id='type-id-201' visibility='default'/>
+        <var-decl name='d_reclen' type-id='type-id-199' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='144'>
         <var-decl name='d_type' type-id='type-id-30' visibility='default'/>
@@ -2326,15 +2295,15 @@
         <var-decl name='d_name' type-id='type-id-43' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__ino64_t' type-id='type-id-26' id='type-id-200'/>
-    <type-decl name='unsigned short int' size-in-bits='16' id='type-id-201'/>
-    <pointer-type-def type-id='type-id-199' size-in-bits='64' id='type-id-202'/>
+    <typedef-decl name='__ino64_t' type-id='type-id-26' id='type-id-198'/>
+    <type-decl name='unsigned short int' size-in-bits='16' id='type-id-199'/>
+    <pointer-type-def type-id='type-id-197' size-in-bits='64' id='type-id-200'/>
     <function-decl name='readdir64' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-198'/>
-      <return type-id='type-id-202'/>
+      <parameter type-id='type-id-196'/>
+      <return type-id='type-id-200'/>
     </function-decl>
     <function-decl name='closedir' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-198'/>
+      <parameter type-id='type-id-196'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='asprintf' visibility='default' binding='global' size-in-bits='64'>
@@ -2344,13 +2313,13 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='avl_find' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-190'/>
+      <parameter type-id='type-id-188'/>
       <parameter type-id='type-id-73'/>
       <parameter type-id='type-id-38'/>
       <return type-id='type-id-73'/>
     </function-decl>
     <function-decl name='avl_insert' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-190'/>
+      <parameter type-id='type-id-188'/>
       <parameter type-id='type-id-73'/>
       <parameter type-id='type-id-26'/>
       <return type-id='type-id-17'/>
@@ -2359,28 +2328,28 @@
       <parameter type-id='type-id-35'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-136'>
+    <function-type size-in-bits='64' id='type-id-166'>
       <parameter type-id='type-id-73'/>
       <parameter type-id='type-id-16'/>
       <parameter type-id='type-id-23'/>
       <parameter type-id='type-id-118'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-189'>
+    <function-type size-in-bits='64' id='type-id-187'>
       <parameter type-id='type-id-73'/>
       <parameter type-id='type-id-73'/>
       <return type-id='type-id-1'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-134'>
+    <function-type size-in-bits='64' id='type-id-164'>
       <parameter type-id='type-id-73'/>
       <parameter type-id='type-id-29'/>
       <return type-id='type-id-29'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-161'>
-      <parameter type-id='type-id-153'/>
+    <function-type size-in-bits='64' id='type-id-145'>
+      <parameter type-id='type-id-137'/>
       <return type-id='type-id-17'/>
     </function-type>
-    <function-type size-in-bits='64' id='type-id-194'>
+    <function-type size-in-bits='64' id='type-id-192'>
       <parameter type-id='type-id-73'/>
       <return type-id='type-id-17'/>
     </function-type>
@@ -2390,7 +2359,7 @@
       <parameter type-id='type-id-16' name='str'/>
       <return type-id='type-id-41'/>
     </function-decl>
-    <enum-decl name='zfs_nicenum_format' id='type-id-203'>
+    <enum-decl name='zfs_nicenum_format' id='type-id-201'>
       <underlying-type type-id='type-id-18'/>
       <enumerator name='ZFS_NICENUM_1024' value='0'/>
       <enumerator name='ZFS_NICENUM_BYTES' value='1'/>
@@ -2402,7 +2371,7 @@
       <parameter type-id='type-id-23' name='num'/>
       <parameter type-id='type-id-37' name='buf'/>
       <parameter type-id='type-id-123' name='buflen'/>
-      <parameter type-id='type-id-203' name='format'/>
+      <parameter type-id='type-id-201' name='format'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zfs_nicenum' mangled-name='zfs_nicenum' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_nicenum'>
@@ -2431,7 +2400,7 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='zutil_pool.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libzutil' language='LANG_C99'>
-    <class-decl name='ddt_stat' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-204'>
+    <class-decl name='ddt_stat' size-in-bits='512' is-struct='yes' visibility='default' id='type-id-202'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='dds_blocks' type-id='type-id-23' visibility='default'/>
       </data-member>
@@ -2457,25 +2426,25 @@
         <var-decl name='dds_ref_dsize' type-id='type-id-23' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='ddt_stat_t' type-id='type-id-204' id='type-id-205'/>
-    <qualified-type-def type-id='type-id-205' const='yes' id='type-id-206'/>
-    <pointer-type-def type-id='type-id-206' size-in-bits='64' id='type-id-207'/>
-    <class-decl name='ddt_histogram' size-in-bits='32768' is-struct='yes' visibility='default' id='type-id-208'>
+    <typedef-decl name='ddt_stat_t' type-id='type-id-202' id='type-id-203'/>
+    <qualified-type-def type-id='type-id-203' const='yes' id='type-id-204'/>
+    <pointer-type-def type-id='type-id-204' size-in-bits='64' id='type-id-205'/>
+    <class-decl name='ddt_histogram' size-in-bits='32768' is-struct='yes' visibility='default' id='type-id-206'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='ddh_stat' type-id='type-id-209' visibility='default'/>
+        <var-decl name='ddh_stat' type-id='type-id-207' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-205' size-in-bits='32768' id='type-id-209'>
-      <subrange length='64' type-id='type-id-12' id='type-id-210'/>
+    <array-type-def dimensions='1' type-id='type-id-203' size-in-bits='32768' id='type-id-207'>
+      <subrange length='64' type-id='type-id-12' id='type-id-208'/>
 
     </array-type-def>
-    <typedef-decl name='ddt_histogram_t' type-id='type-id-208' id='type-id-211'/>
-    <qualified-type-def type-id='type-id-211' const='yes' id='type-id-212'/>
-    <pointer-type-def type-id='type-id-212' size-in-bits='64' id='type-id-213'/>
+    <typedef-decl name='ddt_histogram_t' type-id='type-id-206' id='type-id-209'/>
+    <qualified-type-def type-id='type-id-209' const='yes' id='type-id-210'/>
+    <pointer-type-def type-id='type-id-210' size-in-bits='64' id='type-id-211'/>
     <function-decl name='zpool_dump_ddt' mangled-name='zpool_dump_ddt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zpool_dump_ddt'>
-      <parameter type-id='type-id-207' name='dds_total'/>
-      <parameter type-id='type-id-213' name='ddh'/>
+      <parameter type-id='type-id-205' name='dds_total'/>
+      <parameter type-id='type-id-211' name='ddh'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zfs_nicenum' visibility='default' binding='global' size-in-bits='64'>
@@ -2490,14 +2459,14 @@
       <parameter type-id='type-id-26'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-64' size-in-bits='64' id='type-id-214'/>
-    <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-215'/>
+    <pointer-type-def type-id='type-id-64' size-in-bits='64' id='type-id-212'/>
+    <pointer-type-def type-id='type-id-34' size-in-bits='64' id='type-id-213'/>
     <function-decl name='zpool_history_unpack' mangled-name='zpool_history_unpack' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zpool_history_unpack'>
       <parameter type-id='type-id-37' name='buf'/>
       <parameter type-id='type-id-23' name='bytes_read'/>
       <parameter type-id='type-id-71' name='leftover'/>
-      <parameter type-id='type-id-214' name='records'/>
-      <parameter type-id='type-id-215' name='numrecords'/>
+      <parameter type-id='type-id-212' name='records'/>
+      <parameter type-id='type-id-213' name='numrecords'/>
       <return type-id='type-id-1'/>
     </function-decl>
   </abi-instr>
@@ -2519,15 +2488,15 @@
       <parameter type-id='type-id-16' name='dev_name'/>
       <return type-id='type-id-37'/>
     </function-decl>
-    <class-decl name='dirent' size-in-bits='2240' is-struct='yes' visibility='default' id='type-id-216'>
+    <class-decl name='dirent' size-in-bits='2240' is-struct='yes' visibility='default' id='type-id-214'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='d_ino' type-id='type-id-200' visibility='default'/>
+        <var-decl name='d_ino' type-id='type-id-198' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='d_off' type-id='type-id-150' visibility='default'/>
+        <var-decl name='d_off' type-id='type-id-134' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='d_reclen' type-id='type-id-201' visibility='default'/>
+        <var-decl name='d_reclen' type-id='type-id-199' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='144'>
         <var-decl name='d_type' type-id='type-id-30' visibility='default'/>
@@ -2536,10 +2505,10 @@
         <var-decl name='d_name' type-id='type-id-43' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-216' size-in-bits='64' id='type-id-217'/>
+    <pointer-type-def type-id='type-id-214' size-in-bits='64' id='type-id-215'/>
     <function-decl name='readdir' mangled-name='readdir64' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-198'/>
-      <return type-id='type-id-217'/>
+      <parameter type-id='type-id-196'/>
+      <return type-id='type-id-215'/>
     </function-decl>
     <function-decl name='readlink' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-16'/>
@@ -2555,7 +2524,7 @@
       <parameter type-id='type-id-16' name='dev_name'/>
       <return type-id='type-id-41'/>
     </function-decl>
-    <class-decl name='dk_gpt' size-in-bits='1920' is-struct='yes' visibility='default' id='type-id-218'>
+    <class-decl name='dk_gpt' size-in-bits='1920' is-struct='yes' visibility='default' id='type-id-216'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='efi_version' type-id='type-id-34' visibility='default'/>
       </data-member>
@@ -2569,16 +2538,16 @@
         <var-decl name='efi_lbasize' type-id='type-id-34' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='efi_last_lba' type-id='type-id-219' visibility='default'/>
+        <var-decl name='efi_last_lba' type-id='type-id-217' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='efi_first_u_lba' type-id='type-id-219' visibility='default'/>
+        <var-decl name='efi_first_u_lba' type-id='type-id-217' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='efi_last_u_lba' type-id='type-id-219' visibility='default'/>
+        <var-decl name='efi_last_u_lba' type-id='type-id-217' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='efi_disk_uguid' type-id='type-id-220' visibility='default'/>
+        <var-decl name='efi_disk_uguid' type-id='type-id-218' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
         <var-decl name='efi_flags' type-id='type-id-34' visibility='default'/>
@@ -2587,27 +2556,27 @@
         <var-decl name='efi_reserved1' type-id='type-id-34' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='efi_altern_lba' type-id='type-id-219' visibility='default'/>
+        <var-decl name='efi_altern_lba' type-id='type-id-217' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='efi_reserved' type-id='type-id-221' visibility='default'/>
+        <var-decl name='efi_reserved' type-id='type-id-219' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='efi_parts' type-id='type-id-222' visibility='default'/>
+        <var-decl name='efi_parts' type-id='type-id-220' visibility='default'/>
       </data-member>
     </class-decl>
-    <type-decl name='long long int' size-in-bits='64' id='type-id-223'/>
-    <typedef-decl name='longlong_t' type-id='type-id-223' id='type-id-224'/>
-    <typedef-decl name='diskaddr_t' type-id='type-id-224' id='type-id-219'/>
-    <class-decl name='uuid' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-220'>
+    <type-decl name='long long int' size-in-bits='64' id='type-id-221'/>
+    <typedef-decl name='longlong_t' type-id='type-id-221' id='type-id-222'/>
+    <typedef-decl name='diskaddr_t' type-id='type-id-222' id='type-id-217'/>
+    <class-decl name='uuid' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-218'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='time_low' type-id='type-id-22' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='32'>
-        <var-decl name='time_mid' type-id='type-id-225' visibility='default'/>
+        <var-decl name='time_mid' type-id='type-id-223' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='48'>
-        <var-decl name='time_hi_and_version' type-id='type-id-225' visibility='default'/>
+        <var-decl name='time_hi_and_version' type-id='type-id-223' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
         <var-decl name='clock_seq_hi_and_reserved' type-id='type-id-32' visibility='default'/>
@@ -2619,65 +2588,65 @@
         <var-decl name='node_addr' type-id='type-id-105' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__uint16_t' type-id='type-id-201' id='type-id-226'/>
-    <typedef-decl name='uint16_t' type-id='type-id-226' id='type-id-225'/>
+    <typedef-decl name='__uint16_t' type-id='type-id-199' id='type-id-224'/>
+    <typedef-decl name='uint16_t' type-id='type-id-224' id='type-id-223'/>
 
-    <array-type-def dimensions='1' type-id='type-id-34' size-in-bits='384' id='type-id-221'>
+    <array-type-def dimensions='1' type-id='type-id-34' size-in-bits='384' id='type-id-219'>
       <subrange length='12' type-id='type-id-12' id='type-id-103'/>
 
     </array-type-def>
-    <class-decl name='dk_part' size-in-bits='960' is-struct='yes' visibility='default' id='type-id-227'>
+    <class-decl name='dk_part' size-in-bits='960' is-struct='yes' visibility='default' id='type-id-225'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='p_start' type-id='type-id-219' visibility='default'/>
+        <var-decl name='p_start' type-id='type-id-217' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='p_size' type-id='type-id-219' visibility='default'/>
+        <var-decl name='p_size' type-id='type-id-217' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='p_guid' type-id='type-id-220' visibility='default'/>
+        <var-decl name='p_guid' type-id='type-id-218' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='p_tag' type-id='type-id-228' visibility='default'/>
+        <var-decl name='p_tag' type-id='type-id-226' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='272'>
-        <var-decl name='p_flag' type-id='type-id-228' visibility='default'/>
+        <var-decl name='p_flag' type-id='type-id-226' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
-        <var-decl name='p_name' type-id='type-id-229' visibility='default'/>
+        <var-decl name='p_name' type-id='type-id-227' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='p_uguid' type-id='type-id-220' visibility='default'/>
+        <var-decl name='p_uguid' type-id='type-id-218' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='p_resv' type-id='type-id-230' visibility='default'/>
+        <var-decl name='p_resv' type-id='type-id-228' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='ushort_t' type-id='type-id-201' id='type-id-228'/>
+    <typedef-decl name='ushort_t' type-id='type-id-199' id='type-id-226'/>
 
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='288' id='type-id-229'>
-      <subrange length='36' type-id='type-id-12' id='type-id-231'/>
+    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='288' id='type-id-227'>
+      <subrange length='36' type-id='type-id-12' id='type-id-229'/>
 
     </array-type-def>
 
-    <array-type-def dimensions='1' type-id='type-id-34' size-in-bits='256' id='type-id-230'>
+    <array-type-def dimensions='1' type-id='type-id-34' size-in-bits='256' id='type-id-228'>
       <subrange length='8' type-id='type-id-12' id='type-id-102'/>
 
     </array-type-def>
 
-    <array-type-def dimensions='1' type-id='type-id-227' size-in-bits='960' id='type-id-222'>
-      <subrange length='1' type-id='type-id-12' id='type-id-232'/>
+    <array-type-def dimensions='1' type-id='type-id-225' size-in-bits='960' id='type-id-220'>
+      <subrange length='1' type-id='type-id-12' id='type-id-230'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-218' size-in-bits='64' id='type-id-233'/>
-    <pointer-type-def type-id='type-id-233' size-in-bits='64' id='type-id-234'/>
+    <pointer-type-def type-id='type-id-216' size-in-bits='64' id='type-id-231'/>
+    <pointer-type-def type-id='type-id-231' size-in-bits='64' id='type-id-232'/>
     <function-decl name='efi_alloc_and_init' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-6'/>
-      <parameter type-id='type-id-234'/>
+      <parameter type-id='type-id-232'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='efi_free' mangled-name='efi_free' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_free'>
-      <parameter type-id='type-id-233'/>
+      <parameter type-id='type-id-231'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='zfs_get_underlying_path' mangled-name='zfs_get_underlying_path' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_get_underlying_path'>
@@ -2688,27 +2657,27 @@
       <parameter type-id='type-id-16' name='path'/>
       <return type-id='type-id-41'/>
     </function-decl>
-    <class-decl name='udev' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-235'/>
-    <pointer-type-def type-id='type-id-235' size-in-bits='64' id='type-id-236'/>
+    <class-decl name='udev' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-233'/>
+    <pointer-type-def type-id='type-id-233' size-in-bits='64' id='type-id-234'/>
     <function-decl name='udev_new' visibility='default' binding='global' size-in-bits='64'>
-      <return type-id='type-id-236'/>
+      <return type-id='type-id-234'/>
     </function-decl>
-    <class-decl name='udev_device' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-237'/>
-    <pointer-type-def type-id='type-id-237' size-in-bits='64' id='type-id-238'/>
+    <class-decl name='udev_device' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-235'/>
+    <pointer-type-def type-id='type-id-235' size-in-bits='64' id='type-id-236'/>
     <function-decl name='udev_device_new_from_subsystem_sysname' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-236'/>
+      <parameter type-id='type-id-234'/>
       <parameter type-id='type-id-16'/>
       <parameter type-id='type-id-16'/>
-      <return type-id='type-id-238'/>
+      <return type-id='type-id-236'/>
     </function-decl>
     <function-decl name='udev_device_get_property_value' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-238'/>
+      <parameter type-id='type-id-236'/>
       <parameter type-id='type-id-16'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='udev_device_unref' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-238'/>
-      <return type-id='type-id-238'/>
+      <parameter type-id='type-id-236'/>
+      <return type-id='type-id-236'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='os/linux/zutil_import_os.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libzutil' language='LANG_C99'>
@@ -2716,23 +2685,19 @@
       <parameter type-id='type-id-1' name='fd'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-decl name='zpool_open_func' mangled-name='zpool_open_func' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zpool_open_func'>
-      <parameter type-id='type-id-73' name='arg'/>
-      <return type-id='type-id-17'/>
-    </function-decl>
     <function-decl name='zutil_strdup' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-181'/>
+      <parameter type-id='type-id-179'/>
       <parameter type-id='type-id-16'/>
       <return type-id='type-id-37'/>
     </function-decl>
     <function-decl name='zpool_read_label' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
       <parameter type-id='type-id-74'/>
-      <parameter type-id='type-id-143'/>
+      <parameter type-id='type-id-127'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='label_paths' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-181'/>
+      <parameter type-id='type-id-179'/>
       <parameter type-id='type-id-35'/>
       <parameter type-id='type-id-124'/>
       <parameter type-id='type-id-124'/>
@@ -2744,122 +2709,111 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='zutil_alloc' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-181'/>
+      <parameter type-id='type-id-179'/>
       <parameter type-id='type-id-26'/>
       <return type-id='type-id-73'/>
     </function-decl>
-    <class-decl name='timespec' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-239'>
+    <class-decl name='timespec' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-237'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='tv_sec' type-id='type-id-240' visibility='default'/>
+        <var-decl name='tv_sec' type-id='type-id-238' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tv_nsec' type-id='type-id-241' visibility='default'/>
+        <var-decl name='tv_nsec' type-id='type-id-239' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__time_t' type-id='type-id-5' id='type-id-240'/>
-    <typedef-decl name='__syscall_slong_t' type-id='type-id-5' id='type-id-241'/>
-    <pointer-type-def type-id='type-id-239' size-in-bits='64' id='type-id-242'/>
+    <typedef-decl name='__time_t' type-id='type-id-5' id='type-id-238'/>
+    <typedef-decl name='__syscall_slong_t' type-id='type-id-5' id='type-id-239'/>
+    <pointer-type-def type-id='type-id-237' size-in-bits='64' id='type-id-240'/>
     <function-decl name='clock_gettime' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-242'/>
+      <parameter type-id='type-id-240'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='usleep' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <class-decl name='udev_list_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-243'/>
-    <pointer-type-def type-id='type-id-243' size-in-bits='64' id='type-id-244'/>
+    <class-decl name='udev_list_entry' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-241'/>
+    <pointer-type-def type-id='type-id-241' size-in-bits='64' id='type-id-242'/>
     <function-decl name='udev_device_get_devlinks_list_entry' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-238'/>
-      <return type-id='type-id-244'/>
+      <parameter type-id='type-id-236'/>
+      <return type-id='type-id-242'/>
     </function-decl>
     <function-decl name='udev_list_entry_get_name' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-244'/>
+      <parameter type-id='type-id-242'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='udev_list_entry_get_next' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-244'/>
-      <return type-id='type-id-244'/>
+      <parameter type-id='type-id-242'/>
+      <return type-id='type-id-242'/>
     </function-decl>
     <function-decl name='udev_unref' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-236'/>
-      <return type-id='type-id-236'/>
+      <parameter type-id='type-id-234'/>
+      <return type-id='type-id-234'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-245'/>
+    <pointer-type-def type-id='type-id-123' size-in-bits='64' id='type-id-243'/>
     <function-decl name='zpool_default_search_paths' mangled-name='zpool_default_search_paths' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zpool_default_search_paths'>
-      <parameter type-id='type-id-245' name='count'/>
+      <parameter type-id='type-id-243' name='count'/>
       <return type-id='type-id-126'/>
     </function-decl>
-    <typedef-decl name='pthread_mutex_t' type-id='type-id-2' id='type-id-246'/>
-    <pointer-type-def type-id='type-id-246' size-in-bits='64' id='type-id-247'/>
-    <typedef-decl name='avl_tree_t' type-id='type-id-182' id='type-id-248'/>
-    <pointer-type-def type-id='type-id-248' size-in-bits='64' id='type-id-249'/>
-    <pointer-type-def type-id='type-id-249' size-in-bits='64' id='type-id-250'/>
-    <function-decl name='zpool_find_import_blkid' mangled-name='zpool_find_import_blkid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zpool_find_import_blkid'>
-      <parameter type-id='type-id-142' name='hdl'/>
-      <parameter type-id='type-id-247' name='lock'/>
-      <parameter type-id='type-id-250' name='slice_cache'/>
-      <return type-id='type-id-1'/>
-    </function-decl>
-    <class-decl name='blkid_struct_cache' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-251'/>
-    <pointer-type-def type-id='type-id-251' size-in-bits='64' id='type-id-252'/>
-    <pointer-type-def type-id='type-id-252' size-in-bits='64' id='type-id-253'/>
+    <class-decl name='blkid_struct_cache' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-244'/>
+    <pointer-type-def type-id='type-id-244' size-in-bits='64' id='type-id-245'/>
+    <pointer-type-def type-id='type-id-245' size-in-bits='64' id='type-id-246'/>
     <function-decl name='blkid_get_cache' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-253'/>
+      <parameter type-id='type-id-246'/>
       <parameter type-id='type-id-16'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='blkid_probe_all_new' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-252'/>
+      <parameter type-id='type-id-245'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <class-decl name='blkid_struct_dev_iterate' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-254'/>
-    <pointer-type-def type-id='type-id-254' size-in-bits='64' id='type-id-255'/>
+    <class-decl name='blkid_struct_dev_iterate' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-247'/>
+    <pointer-type-def type-id='type-id-247' size-in-bits='64' id='type-id-248'/>
     <function-decl name='blkid_dev_iterate_begin' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-252'/>
-      <return type-id='type-id-255'/>
+      <parameter type-id='type-id-245'/>
+      <return type-id='type-id-248'/>
     </function-decl>
     <function-decl name='blkid_dev_set_search' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-255'/>
+      <parameter type-id='type-id-248'/>
       <parameter type-id='type-id-16'/>
       <parameter type-id='type-id-16'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='blkid_dev_iterate_end' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-255'/>
+      <parameter type-id='type-id-248'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <class-decl name='blkid_struct_dev' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-256'/>
-    <pointer-type-def type-id='type-id-256' size-in-bits='64' id='type-id-257'/>
-    <pointer-type-def type-id='type-id-257' size-in-bits='64' id='type-id-258'/>
+    <class-decl name='blkid_struct_dev' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-249'/>
+    <pointer-type-def type-id='type-id-249' size-in-bits='64' id='type-id-250'/>
+    <pointer-type-def type-id='type-id-250' size-in-bits='64' id='type-id-251'/>
     <function-decl name='blkid_dev_next' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-255'/>
-      <parameter type-id='type-id-258'/>
+      <parameter type-id='type-id-248'/>
+      <parameter type-id='type-id-251'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='blkid_put_cache' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-252'/>
+      <parameter type-id='type-id-245'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='blkid_dev_devname' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-257'/>
+      <parameter type-id='type-id-250'/>
       <return type-id='type-id-16'/>
     </function-decl>
     <function-decl name='zfs_device_get_devid' mangled-name='zfs_device_get_devid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_device_get_devid'>
-      <parameter type-id='type-id-238' name='dev'/>
+      <parameter type-id='type-id-236' name='dev'/>
       <parameter type-id='type-id-37' name='bufptr'/>
       <parameter type-id='type-id-123' name='buflen'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='udev_device_get_parent_with_subsystem_devtype' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-238'/>
+      <parameter type-id='type-id-236'/>
       <parameter type-id='type-id-16'/>
       <parameter type-id='type-id-16'/>
-      <return type-id='type-id-238'/>
+      <return type-id='type-id-236'/>
     </function-decl>
     <function-decl name='zfs_device_get_physical' mangled-name='zfs_device_get_physical' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_device_get_physical'>
-      <parameter type-id='type-id-238' name='dev'/>
+      <parameter type-id='type-id-236' name='dev'/>
       <parameter type-id='type-id-37' name='bufptr'/>
       <parameter type-id='type-id-123' name='buflen'/>
       <return type-id='type-id-1'/>
@@ -2878,143 +2832,145 @@
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='os/linux/zutil_compat.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libzutil' language='LANG_C99'>
-    <typedef-decl name='zfs_cmd_t' type-id='type-id-39' id='type-id-259'/>
-    <pointer-type-def type-id='type-id-259' size-in-bits='64' id='type-id-260'/>
+    <typedef-decl name='zfs_cmd_t' type-id='type-id-39' id='type-id-252'/>
+    <pointer-type-def type-id='type-id-252' size-in-bits='64' id='type-id-253'/>
     <function-decl name='zfs_ioctl_fd' mangled-name='zfs_ioctl_fd' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='zfs_ioctl_fd'>
       <parameter type-id='type-id-1' name='fd'/>
       <parameter type-id='type-id-26' name='request'/>
-      <parameter type-id='type-id-260' name='zc'/>
+      <parameter type-id='type-id-253' name='zc'/>
       <return type-id='type-id-1'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='../../module/avl/avl.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libavl' language='LANG_C99'>
+    <typedef-decl name='avl_tree_t' type-id='type-id-180' id='type-id-254'/>
+    <pointer-type-def type-id='type-id-254' size-in-bits='64' id='type-id-255'/>
     <function-decl name='avl_walk' mangled-name='avl_walk' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='avl_walk'>
-      <parameter type-id='type-id-249' name='tree'/>
+      <parameter type-id='type-id-255' name='tree'/>
       <parameter type-id='type-id-73' name='oldnode'/>
       <parameter type-id='type-id-1' name='left'/>
       <return type-id='type-id-73'/>
     </function-decl>
     <function-decl name='avl_first' mangled-name='avl_first' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='avl_first'>
-      <parameter type-id='type-id-249' name='tree'/>
+      <parameter type-id='type-id-255' name='tree'/>
       <return type-id='type-id-73'/>
     </function-decl>
     <function-decl name='avl_last' mangled-name='avl_last' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='avl_last'>
-      <parameter type-id='type-id-249' name='tree'/>
+      <parameter type-id='type-id-255' name='tree'/>
       <return type-id='type-id-73'/>
     </function-decl>
-    <typedef-decl name='avl_index_t' type-id='type-id-188' id='type-id-261'/>
+    <typedef-decl name='avl_index_t' type-id='type-id-186' id='type-id-256'/>
     <function-decl name='avl_nearest' mangled-name='avl_nearest' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='avl_nearest'>
-      <parameter type-id='type-id-249' name='tree'/>
-      <parameter type-id='type-id-261' name='where'/>
+      <parameter type-id='type-id-255' name='tree'/>
+      <parameter type-id='type-id-256' name='where'/>
       <parameter type-id='type-id-1' name='direction'/>
       <return type-id='type-id-73'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-261' size-in-bits='64' id='type-id-262'/>
+    <pointer-type-def type-id='type-id-256' size-in-bits='64' id='type-id-257'/>
     <function-decl name='avl_find' mangled-name='avl_find' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='avl_find'>
-      <parameter type-id='type-id-249' name='tree'/>
+      <parameter type-id='type-id-255' name='tree'/>
       <parameter type-id='type-id-73' name='value'/>
-      <parameter type-id='type-id-262' name='where'/>
+      <parameter type-id='type-id-257' name='where'/>
       <return type-id='type-id-73'/>
     </function-decl>
     <function-decl name='avl_insert' mangled-name='avl_insert' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='avl_insert'>
-      <parameter type-id='type-id-249' name='tree'/>
+      <parameter type-id='type-id-255' name='tree'/>
       <parameter type-id='type-id-73' name='new_data'/>
-      <parameter type-id='type-id-261' name='where'/>
+      <parameter type-id='type-id-256' name='where'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='avl_insert_here' mangled-name='avl_insert_here' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='avl_insert_here'>
-      <parameter type-id='type-id-249' name='tree'/>
+      <parameter type-id='type-id-255' name='tree'/>
       <parameter type-id='type-id-73' name='new_data'/>
       <parameter type-id='type-id-73' name='here'/>
       <parameter type-id='type-id-1' name='direction'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='avl_add' mangled-name='avl_add' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='avl_add'>
-      <parameter type-id='type-id-249' name='tree'/>
+      <parameter type-id='type-id-255' name='tree'/>
       <parameter type-id='type-id-73' name='new_node'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='avl_remove' mangled-name='avl_remove' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='avl_remove'>
-      <parameter type-id='type-id-249' name='tree'/>
+      <parameter type-id='type-id-255' name='tree'/>
       <parameter type-id='type-id-73' name='data'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='avl_update_lt' mangled-name='avl_update_lt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='avl_update_lt'>
-      <parameter type-id='type-id-249' name='t'/>
+      <parameter type-id='type-id-255' name='t'/>
       <parameter type-id='type-id-73' name='obj'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='avl_update_gt' mangled-name='avl_update_gt' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='avl_update_gt'>
-      <parameter type-id='type-id-249' name='t'/>
+      <parameter type-id='type-id-255' name='t'/>
       <parameter type-id='type-id-73' name='obj'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='avl_update' mangled-name='avl_update' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='avl_update'>
-      <parameter type-id='type-id-249' name='t'/>
+      <parameter type-id='type-id-255' name='t'/>
       <parameter type-id='type-id-73' name='obj'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='avl_swap' mangled-name='avl_swap' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='avl_swap'>
-      <parameter type-id='type-id-249' name='tree1'/>
-      <parameter type-id='type-id-249' name='tree2'/>
+      <parameter type-id='type-id-255' name='tree1'/>
+      <parameter type-id='type-id-255' name='tree2'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='avl_create' mangled-name='avl_create' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='avl_create'>
-      <parameter type-id='type-id-249' name='tree'/>
-      <parameter type-id='type-id-184' name='compar'/>
+      <parameter type-id='type-id-255' name='tree'/>
+      <parameter type-id='type-id-182' name='compar'/>
       <parameter type-id='type-id-123' name='size'/>
       <parameter type-id='type-id-123' name='offset'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='avl_destroy' mangled-name='avl_destroy' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='avl_destroy'>
-      <parameter type-id='type-id-249' name='tree'/>
+      <parameter type-id='type-id-255' name='tree'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='avl_numnodes' mangled-name='avl_numnodes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='avl_numnodes'>
-      <parameter type-id='type-id-249' name='tree'/>
-      <return type-id='type-id-185'/>
+      <parameter type-id='type-id-255' name='tree'/>
+      <return type-id='type-id-183'/>
     </function-decl>
     <function-decl name='avl_is_empty' mangled-name='avl_is_empty' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='avl_is_empty'>
-      <parameter type-id='type-id-249' name='tree'/>
+      <parameter type-id='type-id-255' name='tree'/>
       <return type-id='type-id-41'/>
     </function-decl>
     <function-decl name='avl_destroy_nodes' mangled-name='avl_destroy_nodes' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='avl_destroy_nodes'>
-      <parameter type-id='type-id-249' name='tree'/>
-      <parameter type-id='type-id-144' name='cookie'/>
+      <parameter type-id='type-id-255' name='tree'/>
+      <parameter type-id='type-id-128' name='cookie'/>
       <return type-id='type-id-73'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='thread_pool.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libtpool' language='LANG_C99'>
-    <class-decl name='tpool' size-in-bits='2496' is-struct='yes' visibility='default' id='type-id-192'>
+    <class-decl name='tpool' size-in-bits='2496' is-struct='yes' visibility='default' id='type-id-190'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='tp_forw' type-id='type-id-263' visibility='default'/>
+        <var-decl name='tp_forw' type-id='type-id-258' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tp_back' type-id='type-id-263' visibility='default'/>
+        <var-decl name='tp_back' type-id='type-id-258' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='tp_mutex' type-id='type-id-246' visibility='default'/>
+        <var-decl name='tp_mutex' type-id='type-id-259' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='tp_busycv' type-id='type-id-264' visibility='default'/>
+        <var-decl name='tp_busycv' type-id='type-id-260' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='tp_workcv' type-id='type-id-264' visibility='default'/>
+        <var-decl name='tp_workcv' type-id='type-id-260' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='tp_waitcv' type-id='type-id-264' visibility='default'/>
+        <var-decl name='tp_waitcv' type-id='type-id-260' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1600'>
-        <var-decl name='tp_active' type-id='type-id-265' visibility='default'/>
+        <var-decl name='tp_active' type-id='type-id-261' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1664'>
-        <var-decl name='tp_head' type-id='type-id-266' visibility='default'/>
+        <var-decl name='tp_head' type-id='type-id-262' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1728'>
-        <var-decl name='tp_tail' type-id='type-id-266' visibility='default'/>
+        <var-decl name='tp_tail' type-id='type-id-262' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1792'>
-        <var-decl name='tp_attr' type-id='type-id-165' visibility='default'/>
+        <var-decl name='tp_attr' type-id='type-id-149' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='2240'>
         <var-decl name='tp_flags' type-id='type-id-1' visibility='default'/>
@@ -3038,38 +2994,39 @@
         <var-decl name='tp_idle' type-id='type-id-1' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='tpool_t' type-id='type-id-192' id='type-id-267'/>
-    <pointer-type-def type-id='type-id-267' size-in-bits='64' id='type-id-263'/>
-    <union-decl name='__anonymous_union__' size-in-bits='384' is-anonymous='yes' visibility='default' id='type-id-268'>
+    <typedef-decl name='tpool_t' type-id='type-id-190' id='type-id-263'/>
+    <pointer-type-def type-id='type-id-263' size-in-bits='64' id='type-id-258'/>
+    <typedef-decl name='pthread_mutex_t' type-id='type-id-2' id='type-id-259'/>
+    <union-decl name='__anonymous_union__' size-in-bits='384' is-anonymous='yes' visibility='default' id='type-id-264'>
       <data-member access='private'>
-        <var-decl name='__data' type-id='type-id-269' visibility='default'/>
+        <var-decl name='__data' type-id='type-id-265' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='__size' type-id='type-id-270' visibility='default'/>
+        <var-decl name='__size' type-id='type-id-266' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='__align' type-id='type-id-223' visibility='default'/>
+        <var-decl name='__align' type-id='type-id-221' visibility='default'/>
       </data-member>
     </union-decl>
-    <class-decl name='__pthread_cond_s' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-269'>
+    <class-decl name='__pthread_cond_s' size-in-bits='384' is-struct='yes' visibility='default' id='type-id-265'>
       <member-type access='public'>
-        <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' id='type-id-271'>
+        <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' id='type-id-267'>
           <data-member access='private'>
-            <var-decl name='__g1_start' type-id='type-id-272' visibility='default'/>
+            <var-decl name='__g1_start' type-id='type-id-268' visibility='default'/>
           </data-member>
           <data-member access='private'>
-            <var-decl name='__g1_start32' type-id='type-id-273' visibility='default'/>
+            <var-decl name='__g1_start32' type-id='type-id-269' visibility='default'/>
           </data-member>
         </union-decl>
       </member-type>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='' type-id='type-id-274' visibility='default'/>
+        <var-decl name='' type-id='type-id-270' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='__g_refs' type-id='type-id-275' visibility='default'/>
+        <var-decl name='__g_refs' type-id='type-id-271' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='__g_size' type-id='type-id-275' visibility='default'/>
+        <var-decl name='__g_size' type-id='type-id-271' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
         <var-decl name='__g1_orig_size' type-id='type-id-6' visibility='default'/>
@@ -3078,19 +3035,19 @@
         <var-decl name='__wrefs' type-id='type-id-6' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='__g_signals' type-id='type-id-275' visibility='default'/>
+        <var-decl name='__g_signals' type-id='type-id-271' visibility='default'/>
       </data-member>
     </class-decl>
-    <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' id='type-id-274'>
+    <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' id='type-id-270'>
       <data-member access='private'>
-        <var-decl name='__wseq' type-id='type-id-272' visibility='default'/>
+        <var-decl name='__wseq' type-id='type-id-268' visibility='default'/>
       </data-member>
       <data-member access='private'>
-        <var-decl name='__wseq32' type-id='type-id-273' visibility='default'/>
+        <var-decl name='__wseq32' type-id='type-id-269' visibility='default'/>
       </data-member>
     </union-decl>
-    <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-272'/>
-    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-273'>
+    <type-decl name='long long unsigned int' size-in-bits='64' id='type-id-268'/>
+    <class-decl name='__anonymous_struct__' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-269'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='__low' type-id='type-id-6' visibility='default'/>
       </data-member>
@@ -3099,212 +3056,212 @@
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='64' id='type-id-275'>
+    <array-type-def dimensions='1' type-id='type-id-6' size-in-bits='64' id='type-id-271'>
       <subrange length='2' type-id='type-id-12' id='type-id-62'/>
 
     </array-type-def>
 
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='384' id='type-id-270'>
-      <subrange length='48' type-id='type-id-12' id='type-id-276'/>
+    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='384' id='type-id-266'>
+      <subrange length='48' type-id='type-id-12' id='type-id-272'/>
 
     </array-type-def>
-    <typedef-decl name='pthread_cond_t' type-id='type-id-268' id='type-id-264'/>
-    <class-decl name='tpool_active' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-277'>
+    <typedef-decl name='pthread_cond_t' type-id='type-id-264' id='type-id-260'/>
+    <class-decl name='tpool_active' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-273'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='tpa_next' type-id='type-id-265' visibility='default'/>
+        <var-decl name='tpa_next' type-id='type-id-261' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tpa_tid' type-id='type-id-278' visibility='default'/>
+        <var-decl name='tpa_tid' type-id='type-id-274' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='tpool_active_t' type-id='type-id-277' id='type-id-279'/>
-    <pointer-type-def type-id='type-id-279' size-in-bits='64' id='type-id-265'/>
-    <typedef-decl name='pthread_t' type-id='type-id-26' id='type-id-278'/>
-    <class-decl name='tpool_job' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-280'>
+    <typedef-decl name='tpool_active_t' type-id='type-id-273' id='type-id-275'/>
+    <pointer-type-def type-id='type-id-275' size-in-bits='64' id='type-id-261'/>
+    <typedef-decl name='pthread_t' type-id='type-id-26' id='type-id-274'/>
+    <class-decl name='tpool_job' size-in-bits='192' is-struct='yes' visibility='default' id='type-id-276'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='tpj_next' type-id='type-id-266' visibility='default'/>
+        <var-decl name='tpj_next' type-id='type-id-262' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='tpj_func' type-id='type-id-195' visibility='default'/>
+        <var-decl name='tpj_func' type-id='type-id-193' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
         <var-decl name='tpj_arg' type-id='type-id-73' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='tpool_job_t' type-id='type-id-280' id='type-id-281'/>
-    <pointer-type-def type-id='type-id-281' size-in-bits='64' id='type-id-266'/>
+    <typedef-decl name='tpool_job_t' type-id='type-id-276' id='type-id-277'/>
+    <pointer-type-def type-id='type-id-277' size-in-bits='64' id='type-id-262'/>
     <function-decl name='tpool_create' mangled-name='tpool_create' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tpool_create'>
       <parameter type-id='type-id-34' name='min_threads'/>
       <parameter type-id='type-id-34' name='max_threads'/>
       <parameter type-id='type-id-34' name='linger'/>
-      <parameter type-id='type-id-160' name='attr'/>
-      <return type-id='type-id-263'/>
+      <parameter type-id='type-id-144' name='attr'/>
+      <return type-id='type-id-258'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-162' const='yes' id='type-id-282'/>
-    <pointer-type-def type-id='type-id-282' size-in-bits='64' id='type-id-283'/>
+    <qualified-type-def type-id='type-id-146' const='yes' id='type-id-278'/>
+    <pointer-type-def type-id='type-id-278' size-in-bits='64' id='type-id-279'/>
     <function-decl name='pthread_attr_getstack' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-283'/>
-      <parameter type-id='type-id-144'/>
+      <parameter type-id='type-id-279'/>
+      <parameter type-id='type-id-128'/>
       <parameter type-id='type-id-38'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-268' size-in-bits='64' id='type-id-284'/>
+    <pointer-type-def type-id='type-id-264' size-in-bits='64' id='type-id-280'/>
     <function-decl name='pthread_cond_init' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-284'/>
-      <parameter type-id='type-id-180'/>
+      <parameter type-id='type-id-280'/>
+      <parameter type-id='type-id-175'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-162' size-in-bits='64' id='type-id-285'/>
+    <pointer-type-def type-id='type-id-146' size-in-bits='64' id='type-id-281'/>
     <function-decl name='pthread_attr_init' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-285'/>
+      <parameter type-id='type-id-281'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='1024' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-286'>
+    <class-decl name='__anonymous_struct__' size-in-bits='1024' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-282'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__bits' type-id='type-id-287' visibility='default'/>
+        <var-decl name='__bits' type-id='type-id-283' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__cpu_mask' type-id='type-id-26' id='type-id-288'/>
+    <typedef-decl name='__cpu_mask' type-id='type-id-26' id='type-id-284'/>
 
-    <array-type-def dimensions='1' type-id='type-id-288' size-in-bits='1024' id='type-id-287'>
+    <array-type-def dimensions='1' type-id='type-id-284' size-in-bits='1024' id='type-id-283'>
       <subrange length='16' type-id='type-id-12' id='type-id-104'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-286' size-in-bits='64' id='type-id-289'/>
+    <pointer-type-def type-id='type-id-282' size-in-bits='64' id='type-id-285'/>
     <function-decl name='pthread_attr_getaffinity_np' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-283'/>
+      <parameter type-id='type-id-279'/>
       <parameter type-id='type-id-26'/>
-      <parameter type-id='type-id-289'/>
+      <parameter type-id='type-id-285'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-286' const='yes' id='type-id-290'/>
-    <pointer-type-def type-id='type-id-290' size-in-bits='64' id='type-id-291'/>
+    <qualified-type-def type-id='type-id-282' const='yes' id='type-id-286'/>
+    <pointer-type-def type-id='type-id-286' size-in-bits='64' id='type-id-287'/>
     <function-decl name='pthread_attr_setaffinity_np' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-285'/>
+      <parameter type-id='type-id-281'/>
       <parameter type-id='type-id-26'/>
-      <parameter type-id='type-id-291'/>
+      <parameter type-id='type-id-287'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='pthread_attr_getdetachstate' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-283'/>
-      <parameter type-id='type-id-143'/>
+      <parameter type-id='type-id-279'/>
+      <parameter type-id='type-id-127'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='pthread_attr_setdetachstate' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-285'/>
+      <parameter type-id='type-id-281'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='pthread_attr_getguardsize' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-283'/>
+      <parameter type-id='type-id-279'/>
       <parameter type-id='type-id-38'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='pthread_attr_setguardsize' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-285'/>
+      <parameter type-id='type-id-281'/>
       <parameter type-id='type-id-26'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='pthread_attr_getinheritsched' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-283'/>
-      <parameter type-id='type-id-143'/>
+      <parameter type-id='type-id-279'/>
+      <parameter type-id='type-id-127'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='pthread_attr_setinheritsched' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-285'/>
+      <parameter type-id='type-id-281'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <class-decl name='sched_param' size-in-bits='32' is-struct='yes' visibility='default' id='type-id-292'>
+    <class-decl name='sched_param' size-in-bits='32' is-struct='yes' visibility='default' id='type-id-288'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='sched_priority' type-id='type-id-1' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-292' size-in-bits='64' id='type-id-293'/>
+    <pointer-type-def type-id='type-id-288' size-in-bits='64' id='type-id-289'/>
     <function-decl name='pthread_attr_getschedparam' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-283'/>
-      <parameter type-id='type-id-293'/>
+      <parameter type-id='type-id-279'/>
+      <parameter type-id='type-id-289'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-292' const='yes' id='type-id-294'/>
-    <pointer-type-def type-id='type-id-294' size-in-bits='64' id='type-id-295'/>
+    <qualified-type-def type-id='type-id-288' const='yes' id='type-id-290'/>
+    <pointer-type-def type-id='type-id-290' size-in-bits='64' id='type-id-291'/>
     <function-decl name='pthread_attr_setschedparam' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-285'/>
-      <parameter type-id='type-id-295'/>
+      <parameter type-id='type-id-281'/>
+      <parameter type-id='type-id-291'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='pthread_attr_getschedpolicy' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-283'/>
-      <parameter type-id='type-id-143'/>
+      <parameter type-id='type-id-279'/>
+      <parameter type-id='type-id-127'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='pthread_attr_setschedpolicy' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-285'/>
+      <parameter type-id='type-id-281'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='pthread_attr_getscope' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-283'/>
-      <parameter type-id='type-id-143'/>
+      <parameter type-id='type-id-279'/>
+      <parameter type-id='type-id-127'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='pthread_attr_setscope' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-285'/>
+      <parameter type-id='type-id-281'/>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='pthread_attr_setstack' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-285'/>
+      <parameter type-id='type-id-281'/>
       <parameter type-id='type-id-73'/>
       <parameter type-id='type-id-26'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='pthread_attr_destroy' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-285'/>
+      <parameter type-id='type-id-281'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='tpool_dispatch' mangled-name='tpool_dispatch' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tpool_dispatch'>
-      <parameter type-id='type-id-263' name='tpool'/>
-      <parameter type-id='type-id-195' name='func'/>
+      <parameter type-id='type-id-258' name='tpool'/>
+      <parameter type-id='type-id-193' name='func'/>
       <parameter type-id='type-id-73' name='arg'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='pthread_cond_signal' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-280'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <class-decl name='__anonymous_struct__' size-in-bits='1024' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-296'>
+    <class-decl name='__anonymous_struct__' size-in-bits='1024' is-struct='yes' is-anonymous='yes' visibility='default' id='type-id-292'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='__val' type-id='type-id-297' visibility='default'/>
+        <var-decl name='__val' type-id='type-id-293' visibility='default'/>
       </data-member>
     </class-decl>
 
-    <array-type-def dimensions='1' type-id='type-id-26' size-in-bits='1024' id='type-id-297'>
+    <array-type-def dimensions='1' type-id='type-id-26' size-in-bits='1024' id='type-id-293'>
       <subrange length='16' type-id='type-id-12' id='type-id-104'/>
 
     </array-type-def>
-    <qualified-type-def type-id='type-id-296' const='yes' id='type-id-298'/>
-    <pointer-type-def type-id='type-id-296' size-in-bits='64' id='type-id-299'/>
+    <qualified-type-def type-id='type-id-292' const='yes' id='type-id-294'/>
+    <pointer-type-def type-id='type-id-292' size-in-bits='64' id='type-id-295'/>
     <function-decl name='pthread_sigmask' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-291'/>
-      <parameter type-id='type-id-299'/>
+      <parameter type-id='type-id-287'/>
+      <parameter type-id='type-id-295'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-300' size-in-bits='64' id='type-id-301'/>
+    <pointer-type-def type-id='type-id-296' size-in-bits='64' id='type-id-297'/>
     <function-decl name='pthread_create' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-38'/>
-      <parameter type-id='type-id-283'/>
-      <parameter type-id='type-id-301'/>
+      <parameter type-id='type-id-279'/>
+      <parameter type-id='type-id-297'/>
       <parameter type-id='type-id-73'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='tpool_destroy' mangled-name='tpool_destroy' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tpool_destroy'>
-      <parameter type-id='type-id-263' name='tpool'/>
+      <parameter type-id='type-id-258' name='tpool'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='pthread_cond_broadcast' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-280'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='pthread_cancel' visibility='default' binding='global' size-in-bits='64'>
@@ -3312,56 +3269,56 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='pthread_cond_wait' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-280'/>
       <parameter type-id='type-id-14'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='tpool_abandon' mangled-name='tpool_abandon' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tpool_abandon'>
-      <parameter type-id='type-id-263' name='tpool'/>
+      <parameter type-id='type-id-258' name='tpool'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='tpool_wait' mangled-name='tpool_wait' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tpool_wait'>
-      <parameter type-id='type-id-263' name='tpool'/>
+      <parameter type-id='type-id-258' name='tpool'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='tpool_suspend' mangled-name='tpool_suspend' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tpool_suspend'>
-      <parameter type-id='type-id-263' name='tpool'/>
+      <parameter type-id='type-id-258' name='tpool'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='tpool_suspended' mangled-name='tpool_suspended' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tpool_suspended'>
-      <parameter type-id='type-id-263' name='tpool'/>
+      <parameter type-id='type-id-258' name='tpool'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='tpool_resume' mangled-name='tpool_resume' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tpool_resume'>
-      <parameter type-id='type-id-263' name='tpool'/>
+      <parameter type-id='type-id-258' name='tpool'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='tpool_member' mangled-name='tpool_member' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tpool_member'>
-      <parameter type-id='type-id-263' name='tpool'/>
+      <parameter type-id='type-id-258' name='tpool'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='pthread_self' visibility='default' binding='global' size-in-bits='64'>
       <return type-id='type-id-26'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-239' const='yes' id='type-id-302'/>
-    <pointer-type-def type-id='type-id-302' size-in-bits='64' id='type-id-303'/>
+    <qualified-type-def type-id='type-id-237' const='yes' id='type-id-298'/>
+    <pointer-type-def type-id='type-id-298' size-in-bits='64' id='type-id-299'/>
     <function-decl name='pthread_cond_timedwait' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-284'/>
+      <parameter type-id='type-id-280'/>
       <parameter type-id='type-id-14'/>
-      <parameter type-id='type-id-303'/>
+      <parameter type-id='type-id-299'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='pthread_setcanceltype' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-143'/>
+      <parameter type-id='type-id-127'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='pthread_setcancelstate' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
-      <parameter type-id='type-id-143'/>
+      <parameter type-id='type-id-127'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <function-type size-in-bits='64' id='type-id-300'>
+    <function-type size-in-bits='64' id='type-id-296'>
       <parameter type-id='type-id-73'/>
       <return type-id='type-id-73'/>
     </function-type>
@@ -3370,603 +3327,603 @@
     <var-decl name='libspl_assert_ok' type-id='type-id-1' mangled-name='libspl_assert_ok' visibility='default' elf-symbol-id='libspl_assert_ok'/>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='atomic.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libspl' language='LANG_C99'>
-    <qualified-type-def type-id='type-id-32' volatile='yes' id='type-id-304'/>
-    <pointer-type-def type-id='type-id-304' size-in-bits='64' id='type-id-305'/>
+    <qualified-type-def type-id='type-id-32' volatile='yes' id='type-id-300'/>
+    <pointer-type-def type-id='type-id-300' size-in-bits='64' id='type-id-301'/>
     <function-decl name='atomic_inc_8' mangled-name='atomic_inc_8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_inc_8'>
-      <parameter type-id='type-id-305' name='target'/>
+      <parameter type-id='type-id-301' name='target'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <typedef-decl name='uchar_t' type-id='type-id-30' id='type-id-306'/>
-    <qualified-type-def type-id='type-id-306' volatile='yes' id='type-id-307'/>
-    <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-308'/>
+    <typedef-decl name='uchar_t' type-id='type-id-30' id='type-id-302'/>
+    <qualified-type-def type-id='type-id-302' volatile='yes' id='type-id-303'/>
+    <pointer-type-def type-id='type-id-303' size-in-bits='64' id='type-id-304'/>
     <function-decl name='atomic_inc_uchar' mangled-name='atomic_inc_uchar' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_inc_uchar'>
-      <parameter type-id='type-id-308' name='target'/>
+      <parameter type-id='type-id-304' name='target'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-225' volatile='yes' id='type-id-309'/>
-    <pointer-type-def type-id='type-id-309' size-in-bits='64' id='type-id-310'/>
+    <qualified-type-def type-id='type-id-223' volatile='yes' id='type-id-305'/>
+    <pointer-type-def type-id='type-id-305' size-in-bits='64' id='type-id-306'/>
     <function-decl name='atomic_inc_16' mangled-name='atomic_inc_16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_inc_16'>
-      <parameter type-id='type-id-310' name='target'/>
+      <parameter type-id='type-id-306' name='target'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-228' volatile='yes' id='type-id-311'/>
-    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-312'/>
+    <qualified-type-def type-id='type-id-226' volatile='yes' id='type-id-307'/>
+    <pointer-type-def type-id='type-id-307' size-in-bits='64' id='type-id-308'/>
     <function-decl name='atomic_inc_ushort' mangled-name='atomic_inc_ushort' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_inc_ushort'>
-      <parameter type-id='type-id-312' name='target'/>
+      <parameter type-id='type-id-308' name='target'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-22' volatile='yes' id='type-id-313'/>
-    <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-314'/>
+    <qualified-type-def type-id='type-id-22' volatile='yes' id='type-id-309'/>
+    <pointer-type-def type-id='type-id-309' size-in-bits='64' id='type-id-310'/>
     <function-decl name='atomic_inc_32' mangled-name='atomic_inc_32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_inc_32'>
-      <parameter type-id='type-id-314' name='target'/>
+      <parameter type-id='type-id-310' name='target'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-34' volatile='yes' id='type-id-315'/>
-    <pointer-type-def type-id='type-id-315' size-in-bits='64' id='type-id-316'/>
+    <qualified-type-def type-id='type-id-34' volatile='yes' id='type-id-311'/>
+    <pointer-type-def type-id='type-id-311' size-in-bits='64' id='type-id-312'/>
     <function-decl name='atomic_inc_uint' mangled-name='atomic_inc_uint' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_inc_uint'>
-      <parameter type-id='type-id-316' name='target'/>
+      <parameter type-id='type-id-312' name='target'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-185' volatile='yes' id='type-id-317'/>
-    <pointer-type-def type-id='type-id-317' size-in-bits='64' id='type-id-318'/>
+    <qualified-type-def type-id='type-id-183' volatile='yes' id='type-id-313'/>
+    <pointer-type-def type-id='type-id-313' size-in-bits='64' id='type-id-314'/>
     <function-decl name='atomic_inc_ulong' mangled-name='atomic_inc_ulong' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_inc_ulong'>
-      <parameter type-id='type-id-318' name='target'/>
+      <parameter type-id='type-id-314' name='target'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-23' volatile='yes' id='type-id-319'/>
-    <pointer-type-def type-id='type-id-319' size-in-bits='64' id='type-id-320'/>
+    <qualified-type-def type-id='type-id-23' volatile='yes' id='type-id-315'/>
+    <pointer-type-def type-id='type-id-315' size-in-bits='64' id='type-id-316'/>
     <function-decl name='atomic_inc_64' mangled-name='atomic_inc_64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_inc_64'>
-      <parameter type-id='type-id-320' name='target'/>
+      <parameter type-id='type-id-316' name='target'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_dec_8' mangled-name='atomic_dec_8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_dec_8'>
-      <parameter type-id='type-id-305' name='target'/>
+      <parameter type-id='type-id-301' name='target'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_dec_uchar' mangled-name='atomic_dec_uchar' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_dec_uchar'>
-      <parameter type-id='type-id-308' name='target'/>
+      <parameter type-id='type-id-304' name='target'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_dec_16' mangled-name='atomic_dec_16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_dec_16'>
-      <parameter type-id='type-id-310' name='target'/>
+      <parameter type-id='type-id-306' name='target'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_dec_ushort' mangled-name='atomic_dec_ushort' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_dec_ushort'>
-      <parameter type-id='type-id-312' name='target'/>
+      <parameter type-id='type-id-308' name='target'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_dec_32' mangled-name='atomic_dec_32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_dec_32'>
-      <parameter type-id='type-id-314' name='target'/>
+      <parameter type-id='type-id-310' name='target'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_dec_uint' mangled-name='atomic_dec_uint' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_dec_uint'>
-      <parameter type-id='type-id-316' name='target'/>
+      <parameter type-id='type-id-312' name='target'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_dec_ulong' mangled-name='atomic_dec_ulong' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_dec_ulong'>
-      <parameter type-id='type-id-318' name='target'/>
+      <parameter type-id='type-id-314' name='target'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_dec_64' mangled-name='atomic_dec_64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_dec_64'>
-      <parameter type-id='type-id-320' name='target'/>
+      <parameter type-id='type-id-316' name='target'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <type-decl name='signed char' size-in-bits='8' id='type-id-321'/>
-    <typedef-decl name='__int8_t' type-id='type-id-321' id='type-id-322'/>
-    <typedef-decl name='int8_t' type-id='type-id-322' id='type-id-323'/>
+    <type-decl name='signed char' size-in-bits='8' id='type-id-317'/>
+    <typedef-decl name='__int8_t' type-id='type-id-317' id='type-id-318'/>
+    <typedef-decl name='int8_t' type-id='type-id-318' id='type-id-319'/>
     <function-decl name='atomic_add_8' mangled-name='atomic_add_8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_add_8'>
-      <parameter type-id='type-id-305' name='target'/>
-      <parameter type-id='type-id-323' name='bits'/>
+      <parameter type-id='type-id-301' name='target'/>
+      <parameter type-id='type-id-319' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_add_char' mangled-name='atomic_add_char' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_add_char'>
-      <parameter type-id='type-id-308' name='target'/>
-      <parameter type-id='type-id-321' name='bits'/>
+      <parameter type-id='type-id-304' name='target'/>
+      <parameter type-id='type-id-317' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_add_16' mangled-name='atomic_add_16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_add_16'>
-      <parameter type-id='type-id-310' name='target'/>
+      <parameter type-id='type-id-306' name='target'/>
       <parameter type-id='type-id-66' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_add_short' mangled-name='atomic_add_short' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_add_short'>
-      <parameter type-id='type-id-312' name='target'/>
+      <parameter type-id='type-id-308' name='target'/>
       <parameter type-id='type-id-7' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_add_32' mangled-name='atomic_add_32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_add_32'>
-      <parameter type-id='type-id-314' name='target'/>
+      <parameter type-id='type-id-310' name='target'/>
       <parameter type-id='type-id-21' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_add_int' mangled-name='atomic_add_int' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_add_int'>
-      <parameter type-id='type-id-316' name='target'/>
+      <parameter type-id='type-id-312' name='target'/>
       <parameter type-id='type-id-1' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_add_long' mangled-name='atomic_add_long' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_add_long'>
-      <parameter type-id='type-id-318' name='target'/>
+      <parameter type-id='type-id-314' name='target'/>
       <parameter type-id='type-id-5' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <typedef-decl name='__int64_t' type-id='type-id-5' id='type-id-324'/>
-    <typedef-decl name='int64_t' type-id='type-id-324' id='type-id-325'/>
+    <typedef-decl name='__int64_t' type-id='type-id-5' id='type-id-320'/>
+    <typedef-decl name='int64_t' type-id='type-id-320' id='type-id-321'/>
     <function-decl name='atomic_add_64' mangled-name='atomic_add_64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_add_64'>
-      <parameter type-id='type-id-320' name='target'/>
-      <parameter type-id='type-id-325' name='bits'/>
+      <parameter type-id='type-id-316' name='target'/>
+      <parameter type-id='type-id-321' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <typedef-decl name='ssize_t' type-id='type-id-149' id='type-id-326'/>
+    <typedef-decl name='ssize_t' type-id='type-id-133' id='type-id-322'/>
     <function-decl name='atomic_add_ptr' mangled-name='atomic_add_ptr' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_add_ptr'>
-      <parameter type-id='type-id-146' name='target'/>
-      <parameter type-id='type-id-326' name='bits'/>
+      <parameter type-id='type-id-130' name='target'/>
+      <parameter type-id='type-id-322' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_sub_8' mangled-name='atomic_sub_8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_sub_8'>
-      <parameter type-id='type-id-305' name='target'/>
-      <parameter type-id='type-id-323' name='bits'/>
+      <parameter type-id='type-id-301' name='target'/>
+      <parameter type-id='type-id-319' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_sub_char' mangled-name='atomic_sub_char' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_sub_char'>
-      <parameter type-id='type-id-308' name='target'/>
-      <parameter type-id='type-id-321' name='bits'/>
+      <parameter type-id='type-id-304' name='target'/>
+      <parameter type-id='type-id-317' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_sub_16' mangled-name='atomic_sub_16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_sub_16'>
-      <parameter type-id='type-id-310' name='target'/>
+      <parameter type-id='type-id-306' name='target'/>
       <parameter type-id='type-id-66' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_sub_short' mangled-name='atomic_sub_short' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_sub_short'>
-      <parameter type-id='type-id-312' name='target'/>
+      <parameter type-id='type-id-308' name='target'/>
       <parameter type-id='type-id-7' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_sub_32' mangled-name='atomic_sub_32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_sub_32'>
-      <parameter type-id='type-id-314' name='target'/>
+      <parameter type-id='type-id-310' name='target'/>
       <parameter type-id='type-id-21' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_sub_int' mangled-name='atomic_sub_int' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_sub_int'>
-      <parameter type-id='type-id-316' name='target'/>
+      <parameter type-id='type-id-312' name='target'/>
       <parameter type-id='type-id-1' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_sub_long' mangled-name='atomic_sub_long' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_sub_long'>
-      <parameter type-id='type-id-318' name='target'/>
+      <parameter type-id='type-id-314' name='target'/>
       <parameter type-id='type-id-5' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_sub_64' mangled-name='atomic_sub_64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_sub_64'>
-      <parameter type-id='type-id-320' name='target'/>
-      <parameter type-id='type-id-325' name='bits'/>
+      <parameter type-id='type-id-316' name='target'/>
+      <parameter type-id='type-id-321' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_sub_ptr' mangled-name='atomic_sub_ptr' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_sub_ptr'>
-      <parameter type-id='type-id-146' name='target'/>
-      <parameter type-id='type-id-326' name='bits'/>
+      <parameter type-id='type-id-130' name='target'/>
+      <parameter type-id='type-id-322' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_or_8' mangled-name='atomic_or_8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_or_8'>
-      <parameter type-id='type-id-305' name='target'/>
+      <parameter type-id='type-id-301' name='target'/>
       <parameter type-id='type-id-32' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_or_uchar' mangled-name='atomic_or_uchar' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_or_uchar'>
-      <parameter type-id='type-id-308' name='target'/>
-      <parameter type-id='type-id-306' name='bits'/>
+      <parameter type-id='type-id-304' name='target'/>
+      <parameter type-id='type-id-302' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_or_16' mangled-name='atomic_or_16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_or_16'>
-      <parameter type-id='type-id-310' name='target'/>
-      <parameter type-id='type-id-225' name='bits'/>
+      <parameter type-id='type-id-306' name='target'/>
+      <parameter type-id='type-id-223' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_or_ushort' mangled-name='atomic_or_ushort' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_or_ushort'>
-      <parameter type-id='type-id-312' name='target'/>
-      <parameter type-id='type-id-228' name='bits'/>
+      <parameter type-id='type-id-308' name='target'/>
+      <parameter type-id='type-id-226' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_or_32' mangled-name='atomic_or_32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_or_32'>
-      <parameter type-id='type-id-314' name='target'/>
+      <parameter type-id='type-id-310' name='target'/>
       <parameter type-id='type-id-22' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_or_uint' mangled-name='atomic_or_uint' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_or_uint'>
-      <parameter type-id='type-id-316' name='target'/>
+      <parameter type-id='type-id-312' name='target'/>
       <parameter type-id='type-id-34' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_or_ulong' mangled-name='atomic_or_ulong' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_or_ulong'>
-      <parameter type-id='type-id-318' name='target'/>
-      <parameter type-id='type-id-185' name='bits'/>
+      <parameter type-id='type-id-314' name='target'/>
+      <parameter type-id='type-id-183' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_or_64' mangled-name='atomic_or_64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_or_64'>
-      <parameter type-id='type-id-320' name='target'/>
+      <parameter type-id='type-id-316' name='target'/>
       <parameter type-id='type-id-23' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_and_8' mangled-name='atomic_and_8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_and_8'>
-      <parameter type-id='type-id-305' name='target'/>
+      <parameter type-id='type-id-301' name='target'/>
       <parameter type-id='type-id-32' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_and_uchar' mangled-name='atomic_and_uchar' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_and_uchar'>
-      <parameter type-id='type-id-308' name='target'/>
-      <parameter type-id='type-id-306' name='bits'/>
+      <parameter type-id='type-id-304' name='target'/>
+      <parameter type-id='type-id-302' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_and_16' mangled-name='atomic_and_16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_and_16'>
-      <parameter type-id='type-id-310' name='target'/>
-      <parameter type-id='type-id-225' name='bits'/>
+      <parameter type-id='type-id-306' name='target'/>
+      <parameter type-id='type-id-223' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_and_ushort' mangled-name='atomic_and_ushort' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_and_ushort'>
-      <parameter type-id='type-id-312' name='target'/>
-      <parameter type-id='type-id-228' name='bits'/>
+      <parameter type-id='type-id-308' name='target'/>
+      <parameter type-id='type-id-226' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_and_32' mangled-name='atomic_and_32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_and_32'>
-      <parameter type-id='type-id-314' name='target'/>
+      <parameter type-id='type-id-310' name='target'/>
       <parameter type-id='type-id-22' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_and_uint' mangled-name='atomic_and_uint' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_and_uint'>
-      <parameter type-id='type-id-316' name='target'/>
+      <parameter type-id='type-id-312' name='target'/>
       <parameter type-id='type-id-34' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_and_ulong' mangled-name='atomic_and_ulong' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_and_ulong'>
-      <parameter type-id='type-id-318' name='target'/>
-      <parameter type-id='type-id-185' name='bits'/>
+      <parameter type-id='type-id-314' name='target'/>
+      <parameter type-id='type-id-183' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_and_64' mangled-name='atomic_and_64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_and_64'>
-      <parameter type-id='type-id-320' name='target'/>
+      <parameter type-id='type-id-316' name='target'/>
       <parameter type-id='type-id-23' name='bits'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='atomic_inc_8_nv' mangled-name='atomic_inc_8_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_inc_8_nv'>
-      <parameter type-id='type-id-305' name='target'/>
+      <parameter type-id='type-id-301' name='target'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='atomic_inc_uchar_nv' mangled-name='atomic_inc_uchar_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_inc_uchar_nv'>
-      <parameter type-id='type-id-308' name='target'/>
-      <return type-id='type-id-306'/>
+      <parameter type-id='type-id-304' name='target'/>
+      <return type-id='type-id-302'/>
     </function-decl>
     <function-decl name='atomic_inc_16_nv' mangled-name='atomic_inc_16_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_inc_16_nv'>
-      <parameter type-id='type-id-310' name='target'/>
-      <return type-id='type-id-225'/>
+      <parameter type-id='type-id-306' name='target'/>
+      <return type-id='type-id-223'/>
     </function-decl>
     <function-decl name='atomic_inc_ushort_nv' mangled-name='atomic_inc_ushort_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_inc_ushort_nv'>
-      <parameter type-id='type-id-312' name='target'/>
-      <return type-id='type-id-228'/>
+      <parameter type-id='type-id-308' name='target'/>
+      <return type-id='type-id-226'/>
     </function-decl>
     <function-decl name='atomic_inc_32_nv' mangled-name='atomic_inc_32_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_inc_32_nv'>
-      <parameter type-id='type-id-314' name='target'/>
+      <parameter type-id='type-id-310' name='target'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='atomic_inc_uint_nv' mangled-name='atomic_inc_uint_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_inc_uint_nv'>
-      <parameter type-id='type-id-316' name='target'/>
+      <parameter type-id='type-id-312' name='target'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='atomic_inc_ulong_nv' mangled-name='atomic_inc_ulong_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_inc_ulong_nv'>
-      <parameter type-id='type-id-318' name='target'/>
-      <return type-id='type-id-185'/>
+      <parameter type-id='type-id-314' name='target'/>
+      <return type-id='type-id-183'/>
     </function-decl>
     <function-decl name='atomic_inc_64_nv' mangled-name='atomic_inc_64_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_inc_64_nv'>
-      <parameter type-id='type-id-320' name='target'/>
+      <parameter type-id='type-id-316' name='target'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='atomic_dec_8_nv' mangled-name='atomic_dec_8_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_dec_8_nv'>
-      <parameter type-id='type-id-305' name='target'/>
+      <parameter type-id='type-id-301' name='target'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='atomic_dec_uchar_nv' mangled-name='atomic_dec_uchar_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_dec_uchar_nv'>
-      <parameter type-id='type-id-308' name='target'/>
-      <return type-id='type-id-306'/>
+      <parameter type-id='type-id-304' name='target'/>
+      <return type-id='type-id-302'/>
     </function-decl>
     <function-decl name='atomic_dec_16_nv' mangled-name='atomic_dec_16_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_dec_16_nv'>
-      <parameter type-id='type-id-310' name='target'/>
-      <return type-id='type-id-225'/>
+      <parameter type-id='type-id-306' name='target'/>
+      <return type-id='type-id-223'/>
     </function-decl>
     <function-decl name='atomic_dec_ushort_nv' mangled-name='atomic_dec_ushort_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_dec_ushort_nv'>
-      <parameter type-id='type-id-312' name='target'/>
-      <return type-id='type-id-228'/>
+      <parameter type-id='type-id-308' name='target'/>
+      <return type-id='type-id-226'/>
     </function-decl>
     <function-decl name='atomic_dec_32_nv' mangled-name='atomic_dec_32_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_dec_32_nv'>
-      <parameter type-id='type-id-314' name='target'/>
+      <parameter type-id='type-id-310' name='target'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='atomic_dec_uint_nv' mangled-name='atomic_dec_uint_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_dec_uint_nv'>
-      <parameter type-id='type-id-316' name='target'/>
+      <parameter type-id='type-id-312' name='target'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='atomic_dec_ulong_nv' mangled-name='atomic_dec_ulong_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_dec_ulong_nv'>
-      <parameter type-id='type-id-318' name='target'/>
-      <return type-id='type-id-185'/>
+      <parameter type-id='type-id-314' name='target'/>
+      <return type-id='type-id-183'/>
     </function-decl>
     <function-decl name='atomic_dec_64_nv' mangled-name='atomic_dec_64_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_dec_64_nv'>
-      <parameter type-id='type-id-320' name='target'/>
+      <parameter type-id='type-id-316' name='target'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='atomic_add_8_nv' mangled-name='atomic_add_8_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_add_8_nv'>
-      <parameter type-id='type-id-305' name='target'/>
-      <parameter type-id='type-id-323' name='bits'/>
+      <parameter type-id='type-id-301' name='target'/>
+      <parameter type-id='type-id-319' name='bits'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='atomic_add_char_nv' mangled-name='atomic_add_char_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_add_char_nv'>
-      <parameter type-id='type-id-308' name='target'/>
-      <parameter type-id='type-id-321' name='bits'/>
-      <return type-id='type-id-306'/>
+      <parameter type-id='type-id-304' name='target'/>
+      <parameter type-id='type-id-317' name='bits'/>
+      <return type-id='type-id-302'/>
     </function-decl>
     <function-decl name='atomic_add_16_nv' mangled-name='atomic_add_16_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_add_16_nv'>
-      <parameter type-id='type-id-310' name='target'/>
+      <parameter type-id='type-id-306' name='target'/>
       <parameter type-id='type-id-66' name='bits'/>
-      <return type-id='type-id-225'/>
+      <return type-id='type-id-223'/>
     </function-decl>
     <function-decl name='atomic_add_short_nv' mangled-name='atomic_add_short_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_add_short_nv'>
-      <parameter type-id='type-id-312' name='target'/>
+      <parameter type-id='type-id-308' name='target'/>
       <parameter type-id='type-id-7' name='bits'/>
-      <return type-id='type-id-228'/>
+      <return type-id='type-id-226'/>
     </function-decl>
     <function-decl name='atomic_add_32_nv' mangled-name='atomic_add_32_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_add_32_nv'>
-      <parameter type-id='type-id-314' name='target'/>
+      <parameter type-id='type-id-310' name='target'/>
       <parameter type-id='type-id-21' name='bits'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='atomic_add_int_nv' mangled-name='atomic_add_int_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_add_int_nv'>
-      <parameter type-id='type-id-316' name='target'/>
+      <parameter type-id='type-id-312' name='target'/>
       <parameter type-id='type-id-1' name='bits'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='atomic_add_long_nv' mangled-name='atomic_add_long_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_add_long_nv'>
-      <parameter type-id='type-id-318' name='target'/>
+      <parameter type-id='type-id-314' name='target'/>
       <parameter type-id='type-id-5' name='bits'/>
-      <return type-id='type-id-185'/>
+      <return type-id='type-id-183'/>
     </function-decl>
     <function-decl name='atomic_add_64_nv' mangled-name='atomic_add_64_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_add_64_nv'>
-      <parameter type-id='type-id-320' name='target'/>
-      <parameter type-id='type-id-325' name='bits'/>
+      <parameter type-id='type-id-316' name='target'/>
+      <parameter type-id='type-id-321' name='bits'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='atomic_add_ptr_nv' mangled-name='atomic_add_ptr_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_add_ptr_nv'>
-      <parameter type-id='type-id-146' name='target'/>
-      <parameter type-id='type-id-326' name='bits'/>
+      <parameter type-id='type-id-130' name='target'/>
+      <parameter type-id='type-id-322' name='bits'/>
       <return type-id='type-id-73'/>
     </function-decl>
     <function-decl name='atomic_sub_8_nv' mangled-name='atomic_sub_8_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_sub_8_nv'>
-      <parameter type-id='type-id-305' name='target'/>
-      <parameter type-id='type-id-323' name='bits'/>
+      <parameter type-id='type-id-301' name='target'/>
+      <parameter type-id='type-id-319' name='bits'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='atomic_sub_char_nv' mangled-name='atomic_sub_char_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_sub_char_nv'>
-      <parameter type-id='type-id-308' name='target'/>
-      <parameter type-id='type-id-321' name='bits'/>
-      <return type-id='type-id-306'/>
+      <parameter type-id='type-id-304' name='target'/>
+      <parameter type-id='type-id-317' name='bits'/>
+      <return type-id='type-id-302'/>
     </function-decl>
     <function-decl name='atomic_sub_16_nv' mangled-name='atomic_sub_16_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_sub_16_nv'>
-      <parameter type-id='type-id-310' name='target'/>
+      <parameter type-id='type-id-306' name='target'/>
       <parameter type-id='type-id-66' name='bits'/>
-      <return type-id='type-id-225'/>
+      <return type-id='type-id-223'/>
     </function-decl>
     <function-decl name='atomic_sub_short_nv' mangled-name='atomic_sub_short_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_sub_short_nv'>
-      <parameter type-id='type-id-312' name='target'/>
+      <parameter type-id='type-id-308' name='target'/>
       <parameter type-id='type-id-7' name='bits'/>
-      <return type-id='type-id-228'/>
+      <return type-id='type-id-226'/>
     </function-decl>
     <function-decl name='atomic_sub_32_nv' mangled-name='atomic_sub_32_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_sub_32_nv'>
-      <parameter type-id='type-id-314' name='target'/>
+      <parameter type-id='type-id-310' name='target'/>
       <parameter type-id='type-id-21' name='bits'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='atomic_sub_int_nv' mangled-name='atomic_sub_int_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_sub_int_nv'>
-      <parameter type-id='type-id-316' name='target'/>
+      <parameter type-id='type-id-312' name='target'/>
       <parameter type-id='type-id-1' name='bits'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='atomic_sub_long_nv' mangled-name='atomic_sub_long_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_sub_long_nv'>
-      <parameter type-id='type-id-318' name='target'/>
+      <parameter type-id='type-id-314' name='target'/>
       <parameter type-id='type-id-5' name='bits'/>
-      <return type-id='type-id-185'/>
+      <return type-id='type-id-183'/>
     </function-decl>
     <function-decl name='atomic_sub_64_nv' mangled-name='atomic_sub_64_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_sub_64_nv'>
-      <parameter type-id='type-id-320' name='target'/>
-      <parameter type-id='type-id-325' name='bits'/>
+      <parameter type-id='type-id-316' name='target'/>
+      <parameter type-id='type-id-321' name='bits'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='atomic_sub_ptr_nv' mangled-name='atomic_sub_ptr_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_sub_ptr_nv'>
-      <parameter type-id='type-id-146' name='target'/>
-      <parameter type-id='type-id-326' name='bits'/>
+      <parameter type-id='type-id-130' name='target'/>
+      <parameter type-id='type-id-322' name='bits'/>
       <return type-id='type-id-73'/>
     </function-decl>
     <function-decl name='atomic_or_8_nv' mangled-name='atomic_or_8_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_or_8_nv'>
-      <parameter type-id='type-id-305' name='target'/>
+      <parameter type-id='type-id-301' name='target'/>
       <parameter type-id='type-id-32' name='bits'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='atomic_or_uchar_nv' mangled-name='atomic_or_uchar_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_or_uchar_nv'>
-      <parameter type-id='type-id-308' name='target'/>
-      <parameter type-id='type-id-306' name='bits'/>
-      <return type-id='type-id-306'/>
+      <parameter type-id='type-id-304' name='target'/>
+      <parameter type-id='type-id-302' name='bits'/>
+      <return type-id='type-id-302'/>
     </function-decl>
     <function-decl name='atomic_or_16_nv' mangled-name='atomic_or_16_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_or_16_nv'>
-      <parameter type-id='type-id-310' name='target'/>
-      <parameter type-id='type-id-225' name='bits'/>
-      <return type-id='type-id-225'/>
+      <parameter type-id='type-id-306' name='target'/>
+      <parameter type-id='type-id-223' name='bits'/>
+      <return type-id='type-id-223'/>
     </function-decl>
     <function-decl name='atomic_or_ushort_nv' mangled-name='atomic_or_ushort_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_or_ushort_nv'>
-      <parameter type-id='type-id-312' name='target'/>
-      <parameter type-id='type-id-228' name='bits'/>
-      <return type-id='type-id-228'/>
+      <parameter type-id='type-id-308' name='target'/>
+      <parameter type-id='type-id-226' name='bits'/>
+      <return type-id='type-id-226'/>
     </function-decl>
     <function-decl name='atomic_or_32_nv' mangled-name='atomic_or_32_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_or_32_nv'>
-      <parameter type-id='type-id-314' name='target'/>
+      <parameter type-id='type-id-310' name='target'/>
       <parameter type-id='type-id-22' name='bits'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='atomic_or_uint_nv' mangled-name='atomic_or_uint_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_or_uint_nv'>
-      <parameter type-id='type-id-316' name='target'/>
+      <parameter type-id='type-id-312' name='target'/>
       <parameter type-id='type-id-34' name='bits'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='atomic_or_ulong_nv' mangled-name='atomic_or_ulong_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_or_ulong_nv'>
-      <parameter type-id='type-id-318' name='target'/>
-      <parameter type-id='type-id-185' name='bits'/>
-      <return type-id='type-id-185'/>
+      <parameter type-id='type-id-314' name='target'/>
+      <parameter type-id='type-id-183' name='bits'/>
+      <return type-id='type-id-183'/>
     </function-decl>
     <function-decl name='atomic_or_64_nv' mangled-name='atomic_or_64_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_or_64_nv'>
-      <parameter type-id='type-id-320' name='target'/>
+      <parameter type-id='type-id-316' name='target'/>
       <parameter type-id='type-id-23' name='bits'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='atomic_and_8_nv' mangled-name='atomic_and_8_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_and_8_nv'>
-      <parameter type-id='type-id-305' name='target'/>
+      <parameter type-id='type-id-301' name='target'/>
       <parameter type-id='type-id-32' name='bits'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='atomic_and_uchar_nv' mangled-name='atomic_and_uchar_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_and_uchar_nv'>
-      <parameter type-id='type-id-308' name='target'/>
-      <parameter type-id='type-id-306' name='bits'/>
-      <return type-id='type-id-306'/>
+      <parameter type-id='type-id-304' name='target'/>
+      <parameter type-id='type-id-302' name='bits'/>
+      <return type-id='type-id-302'/>
     </function-decl>
     <function-decl name='atomic_and_16_nv' mangled-name='atomic_and_16_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_and_16_nv'>
-      <parameter type-id='type-id-310' name='target'/>
-      <parameter type-id='type-id-225' name='bits'/>
-      <return type-id='type-id-225'/>
+      <parameter type-id='type-id-306' name='target'/>
+      <parameter type-id='type-id-223' name='bits'/>
+      <return type-id='type-id-223'/>
     </function-decl>
     <function-decl name='atomic_and_ushort_nv' mangled-name='atomic_and_ushort_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_and_ushort_nv'>
-      <parameter type-id='type-id-312' name='target'/>
-      <parameter type-id='type-id-228' name='bits'/>
-      <return type-id='type-id-228'/>
+      <parameter type-id='type-id-308' name='target'/>
+      <parameter type-id='type-id-226' name='bits'/>
+      <return type-id='type-id-226'/>
     </function-decl>
     <function-decl name='atomic_and_32_nv' mangled-name='atomic_and_32_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_and_32_nv'>
-      <parameter type-id='type-id-314' name='target'/>
+      <parameter type-id='type-id-310' name='target'/>
       <parameter type-id='type-id-22' name='bits'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='atomic_and_uint_nv' mangled-name='atomic_and_uint_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_and_uint_nv'>
-      <parameter type-id='type-id-316' name='target'/>
+      <parameter type-id='type-id-312' name='target'/>
       <parameter type-id='type-id-34' name='bits'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='atomic_and_ulong_nv' mangled-name='atomic_and_ulong_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_and_ulong_nv'>
-      <parameter type-id='type-id-318' name='target'/>
-      <parameter type-id='type-id-185' name='bits'/>
-      <return type-id='type-id-185'/>
+      <parameter type-id='type-id-314' name='target'/>
+      <parameter type-id='type-id-183' name='bits'/>
+      <return type-id='type-id-183'/>
     </function-decl>
     <function-decl name='atomic_and_64_nv' mangled-name='atomic_and_64_nv' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_and_64_nv'>
-      <parameter type-id='type-id-320' name='target'/>
+      <parameter type-id='type-id-316' name='target'/>
       <parameter type-id='type-id-23' name='bits'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='atomic_cas_8' mangled-name='atomic_cas_8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_cas_8'>
-      <parameter type-id='type-id-305' name='target'/>
+      <parameter type-id='type-id-301' name='target'/>
       <parameter type-id='type-id-32' name='exp'/>
       <parameter type-id='type-id-32' name='des'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='atomic_cas_uchar' mangled-name='atomic_cas_uchar' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_cas_uchar'>
-      <parameter type-id='type-id-308' name='target'/>
-      <parameter type-id='type-id-306' name='exp'/>
-      <parameter type-id='type-id-306' name='des'/>
-      <return type-id='type-id-306'/>
+      <parameter type-id='type-id-304' name='target'/>
+      <parameter type-id='type-id-302' name='exp'/>
+      <parameter type-id='type-id-302' name='des'/>
+      <return type-id='type-id-302'/>
     </function-decl>
     <function-decl name='atomic_cas_16' mangled-name='atomic_cas_16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_cas_16'>
-      <parameter type-id='type-id-310' name='target'/>
-      <parameter type-id='type-id-225' name='exp'/>
-      <parameter type-id='type-id-225' name='des'/>
-      <return type-id='type-id-225'/>
+      <parameter type-id='type-id-306' name='target'/>
+      <parameter type-id='type-id-223' name='exp'/>
+      <parameter type-id='type-id-223' name='des'/>
+      <return type-id='type-id-223'/>
     </function-decl>
     <function-decl name='atomic_cas_ushort' mangled-name='atomic_cas_ushort' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_cas_ushort'>
-      <parameter type-id='type-id-312' name='target'/>
-      <parameter type-id='type-id-228' name='exp'/>
-      <parameter type-id='type-id-228' name='des'/>
-      <return type-id='type-id-228'/>
+      <parameter type-id='type-id-308' name='target'/>
+      <parameter type-id='type-id-226' name='exp'/>
+      <parameter type-id='type-id-226' name='des'/>
+      <return type-id='type-id-226'/>
     </function-decl>
     <function-decl name='atomic_cas_32' mangled-name='atomic_cas_32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_cas_32'>
-      <parameter type-id='type-id-314' name='target'/>
+      <parameter type-id='type-id-310' name='target'/>
       <parameter type-id='type-id-22' name='exp'/>
       <parameter type-id='type-id-22' name='des'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='atomic_cas_uint' mangled-name='atomic_cas_uint' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_cas_uint'>
-      <parameter type-id='type-id-316' name='target'/>
+      <parameter type-id='type-id-312' name='target'/>
       <parameter type-id='type-id-34' name='exp'/>
       <parameter type-id='type-id-34' name='des'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='atomic_cas_ulong' mangled-name='atomic_cas_ulong' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_cas_ulong'>
-      <parameter type-id='type-id-318' name='target'/>
-      <parameter type-id='type-id-185' name='exp'/>
-      <parameter type-id='type-id-185' name='des'/>
-      <return type-id='type-id-185'/>
+      <parameter type-id='type-id-314' name='target'/>
+      <parameter type-id='type-id-183' name='exp'/>
+      <parameter type-id='type-id-183' name='des'/>
+      <return type-id='type-id-183'/>
     </function-decl>
     <function-decl name='atomic_cas_64' mangled-name='atomic_cas_64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_cas_64'>
-      <parameter type-id='type-id-320' name='target'/>
+      <parameter type-id='type-id-316' name='target'/>
       <parameter type-id='type-id-23' name='exp'/>
       <parameter type-id='type-id-23' name='des'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='atomic_cas_ptr' mangled-name='atomic_cas_ptr' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_cas_ptr'>
-      <parameter type-id='type-id-146' name='target'/>
+      <parameter type-id='type-id-130' name='target'/>
       <parameter type-id='type-id-73' name='exp'/>
       <parameter type-id='type-id-73' name='des'/>
       <return type-id='type-id-73'/>
     </function-decl>
     <function-decl name='atomic_swap_8' mangled-name='atomic_swap_8' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_swap_8'>
-      <parameter type-id='type-id-305' name='target'/>
+      <parameter type-id='type-id-301' name='target'/>
       <parameter type-id='type-id-32' name='bits'/>
       <return type-id='type-id-32'/>
     </function-decl>
     <function-decl name='atomic_swap_uchar' mangled-name='atomic_swap_uchar' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_swap_uchar'>
-      <parameter type-id='type-id-308' name='target'/>
-      <parameter type-id='type-id-306' name='bits'/>
-      <return type-id='type-id-306'/>
+      <parameter type-id='type-id-304' name='target'/>
+      <parameter type-id='type-id-302' name='bits'/>
+      <return type-id='type-id-302'/>
     </function-decl>
     <function-decl name='atomic_swap_16' mangled-name='atomic_swap_16' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_swap_16'>
-      <parameter type-id='type-id-310' name='target'/>
-      <parameter type-id='type-id-225' name='bits'/>
-      <return type-id='type-id-225'/>
+      <parameter type-id='type-id-306' name='target'/>
+      <parameter type-id='type-id-223' name='bits'/>
+      <return type-id='type-id-223'/>
     </function-decl>
     <function-decl name='atomic_swap_ushort' mangled-name='atomic_swap_ushort' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_swap_ushort'>
-      <parameter type-id='type-id-312' name='target'/>
-      <parameter type-id='type-id-228' name='bits'/>
-      <return type-id='type-id-228'/>
+      <parameter type-id='type-id-308' name='target'/>
+      <parameter type-id='type-id-226' name='bits'/>
+      <return type-id='type-id-226'/>
     </function-decl>
     <function-decl name='atomic_swap_32' mangled-name='atomic_swap_32' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_swap_32'>
-      <parameter type-id='type-id-314' name='target'/>
+      <parameter type-id='type-id-310' name='target'/>
       <parameter type-id='type-id-22' name='bits'/>
       <return type-id='type-id-22'/>
     </function-decl>
     <function-decl name='atomic_swap_uint' mangled-name='atomic_swap_uint' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_swap_uint'>
-      <parameter type-id='type-id-316' name='target'/>
+      <parameter type-id='type-id-312' name='target'/>
       <parameter type-id='type-id-34' name='bits'/>
       <return type-id='type-id-34'/>
     </function-decl>
     <function-decl name='atomic_swap_ulong' mangled-name='atomic_swap_ulong' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_swap_ulong'>
-      <parameter type-id='type-id-318' name='target'/>
-      <parameter type-id='type-id-185' name='bits'/>
-      <return type-id='type-id-185'/>
+      <parameter type-id='type-id-314' name='target'/>
+      <parameter type-id='type-id-183' name='bits'/>
+      <return type-id='type-id-183'/>
     </function-decl>
     <function-decl name='atomic_swap_64' mangled-name='atomic_swap_64' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_swap_64'>
-      <parameter type-id='type-id-320' name='target'/>
+      <parameter type-id='type-id-316' name='target'/>
       <parameter type-id='type-id-23' name='bits'/>
       <return type-id='type-id-23'/>
     </function-decl>
     <function-decl name='atomic_swap_ptr' mangled-name='atomic_swap_ptr' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_swap_ptr'>
-      <parameter type-id='type-id-146' name='target'/>
+      <parameter type-id='type-id-130' name='target'/>
       <parameter type-id='type-id-73' name='bits'/>
       <return type-id='type-id-73'/>
     </function-decl>
     <function-decl name='atomic_set_long_excl' mangled-name='atomic_set_long_excl' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_set_long_excl'>
-      <parameter type-id='type-id-318' name='target'/>
+      <parameter type-id='type-id-314' name='target'/>
       <parameter type-id='type-id-34' name='value'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='atomic_clear_long_excl' mangled-name='atomic_clear_long_excl' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='atomic_clear_long_excl'>
-      <parameter type-id='type-id-318' name='target'/>
+      <parameter type-id='type-id-314' name='target'/>
       <parameter type-id='type-id-34' name='value'/>
       <return type-id='type-id-1'/>
     </function-decl>
@@ -3996,7 +3953,7 @@
     <function-decl name='get_system_hostid' mangled-name='get_system_hostid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_system_hostid'>
       <return type-id='type-id-26'/>
     </function-decl>
-    <class-decl name='_IO_FILE' size-in-bits='1728' is-struct='yes' visibility='default' id='type-id-327'>
+    <class-decl name='_IO_FILE' size-in-bits='1728' is-struct='yes' visibility='default' id='type-id-323'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='_flags' type-id='type-id-1' visibility='default'/>
       </data-member>
@@ -4034,10 +3991,10 @@
         <var-decl name='_IO_save_end' type-id='type-id-37' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='768'>
-        <var-decl name='_markers' type-id='type-id-328' visibility='default'/>
+        <var-decl name='_markers' type-id='type-id-324' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='_chain' type-id='type-id-329' visibility='default'/>
+        <var-decl name='_chain' type-id='type-id-325' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='896'>
         <var-decl name='_fileno' type-id='type-id-1' visibility='default'/>
@@ -4046,28 +4003,28 @@
         <var-decl name='_flags2' type-id='type-id-1' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='_old_offset' type-id='type-id-330' visibility='default'/>
+        <var-decl name='_old_offset' type-id='type-id-326' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1024'>
-        <var-decl name='_cur_column' type-id='type-id-201' visibility='default'/>
+        <var-decl name='_cur_column' type-id='type-id-199' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1040'>
-        <var-decl name='_vtable_offset' type-id='type-id-321' visibility='default'/>
+        <var-decl name='_vtable_offset' type-id='type-id-317' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1048'>
-        <var-decl name='_shortbuf' type-id='type-id-331' visibility='default'/>
+        <var-decl name='_shortbuf' type-id='type-id-327' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1152'>
-        <var-decl name='_offset' type-id='type-id-150' visibility='default'/>
+        <var-decl name='_offset' type-id='type-id-134' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1216'>
-        <var-decl name='_codecvt' type-id='type-id-332' visibility='default'/>
+        <var-decl name='_codecvt' type-id='type-id-328' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1280'>
-        <var-decl name='_wide_data' type-id='type-id-333' visibility='default'/>
+        <var-decl name='_wide_data' type-id='type-id-329' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1344'>
-        <var-decl name='_freeres_list' type-id='type-id-329' visibility='default'/>
+        <var-decl name='_freeres_list' type-id='type-id-325' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1408'>
         <var-decl name='_freeres_buf' type-id='type-id-73' visibility='default'/>
@@ -4079,36 +4036,36 @@
         <var-decl name='_mode' type-id='type-id-1' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='1568'>
-        <var-decl name='_unused2' type-id='type-id-334' visibility='default'/>
+        <var-decl name='_unused2' type-id='type-id-330' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='_IO_marker' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-335'/>
-    <pointer-type-def type-id='type-id-335' size-in-bits='64' id='type-id-328'/>
-    <pointer-type-def type-id='type-id-327' size-in-bits='64' id='type-id-329'/>
-    <typedef-decl name='__off_t' type-id='type-id-5' id='type-id-330'/>
+    <class-decl name='_IO_marker' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-331'/>
+    <pointer-type-def type-id='type-id-331' size-in-bits='64' id='type-id-324'/>
+    <pointer-type-def type-id='type-id-323' size-in-bits='64' id='type-id-325'/>
+    <typedef-decl name='__off_t' type-id='type-id-5' id='type-id-326'/>
 
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='8' id='type-id-331'>
-      <subrange length='1' type-id='type-id-12' id='type-id-232'/>
+    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='8' id='type-id-327'>
+      <subrange length='1' type-id='type-id-12' id='type-id-230'/>
 
     </array-type-def>
-    <class-decl name='_IO_codecvt' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-336'/>
-    <pointer-type-def type-id='type-id-336' size-in-bits='64' id='type-id-332'/>
-    <class-decl name='_IO_wide_data' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-337'/>
-    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-333'/>
+    <class-decl name='_IO_codecvt' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-332'/>
+    <pointer-type-def type-id='type-id-332' size-in-bits='64' id='type-id-328'/>
+    <class-decl name='_IO_wide_data' is-struct='yes' visibility='default' is-declaration-only='yes' id='type-id-333'/>
+    <pointer-type-def type-id='type-id-333' size-in-bits='64' id='type-id-329'/>
 
-    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='160' id='type-id-334'>
-      <subrange length='20' type-id='type-id-12' id='type-id-338'/>
+    <array-type-def dimensions='1' type-id='type-id-11' size-in-bits='160' id='type-id-330'>
+      <subrange length='20' type-id='type-id-12' id='type-id-334'/>
 
     </array-type-def>
     <function-decl name='fclose' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-329'/>
+      <parameter type-id='type-id-325'/>
       <return type-id='type-id-1'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='os/linux/getmntany.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libspl' language='LANG_C99'>
-    <typedef-decl name='FILE' type-id='type-id-327' id='type-id-339'/>
-    <pointer-type-def type-id='type-id-339' size-in-bits='64' id='type-id-340'/>
-    <class-decl name='mnttab' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-341'>
+    <typedef-decl name='FILE' type-id='type-id-323' id='type-id-335'/>
+    <pointer-type-def type-id='type-id-335' size-in-bits='64' id='type-id-336'/>
+    <class-decl name='mnttab' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-337'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='mnt_special' type-id='type-id-37' visibility='default'/>
       </data-member>
@@ -4122,14 +4079,14 @@
         <var-decl name='mnt_mntopts' type-id='type-id-37' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-341' size-in-bits='64' id='type-id-342'/>
+    <pointer-type-def type-id='type-id-337' size-in-bits='64' id='type-id-338'/>
     <function-decl name='getmntany' mangled-name='getmntany' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getmntany'>
-      <parameter type-id='type-id-340' name='fp'/>
-      <parameter type-id='type-id-342' name='mgetp'/>
-      <parameter type-id='type-id-342' name='mrefp'/>
+      <parameter type-id='type-id-336' name='fp'/>
+      <parameter type-id='type-id-338' name='mgetp'/>
+      <parameter type-id='type-id-338' name='mrefp'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <class-decl name='mntent' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-343'>
+    <class-decl name='mntent' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-339'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='mnt_fsname' type-id='type-id-37' visibility='default'/>
       </data-member>
@@ -4149,24 +4106,24 @@
         <var-decl name='mnt_passno' type-id='type-id-1' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-343' size-in-bits='64' id='type-id-344'/>
+    <pointer-type-def type-id='type-id-339' size-in-bits='64' id='type-id-340'/>
     <function-decl name='getmntent_r' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-329'/>
-      <parameter type-id='type-id-344'/>
+      <parameter type-id='type-id-325'/>
+      <parameter type-id='type-id-340'/>
       <parameter type-id='type-id-37'/>
       <parameter type-id='type-id-1'/>
-      <return type-id='type-id-344'/>
+      <return type-id='type-id-340'/>
     </function-decl>
     <function-decl name='feof' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-329'/>
+      <parameter type-id='type-id-325'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='_sol_getmntent' mangled-name='_sol_getmntent' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_sol_getmntent'>
-      <parameter type-id='type-id-340' name='fp'/>
-      <parameter type-id='type-id-342' name='mgetp'/>
+      <parameter type-id='type-id-336' name='fp'/>
+      <parameter type-id='type-id-338' name='mgetp'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <class-decl name='extmnttab' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-345'>
+    <class-decl name='extmnttab' size-in-bits='320' is-struct='yes' visibility='default' id='type-id-341'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='mnt_special' type-id='type-id-37' visibility='default'/>
       </data-member>
@@ -4186,76 +4143,76 @@
         <var-decl name='mnt_minor' type-id='type-id-34' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-345' size-in-bits='64' id='type-id-346'/>
-    <class-decl name='stat64' size-in-bits='1152' is-struct='yes' visibility='default' id='type-id-347'>
+    <pointer-type-def type-id='type-id-341' size-in-bits='64' id='type-id-342'/>
+    <class-decl name='stat64' size-in-bits='1152' is-struct='yes' visibility='default' id='type-id-343'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='st_dev' type-id='type-id-348' visibility='default'/>
+        <var-decl name='st_dev' type-id='type-id-344' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='st_ino' type-id='type-id-200' visibility='default'/>
+        <var-decl name='st_ino' type-id='type-id-198' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='st_nlink' type-id='type-id-349' visibility='default'/>
+        <var-decl name='st_nlink' type-id='type-id-345' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='192'>
-        <var-decl name='st_mode' type-id='type-id-350' visibility='default'/>
+        <var-decl name='st_mode' type-id='type-id-346' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='224'>
-        <var-decl name='st_uid' type-id='type-id-351' visibility='default'/>
+        <var-decl name='st_uid' type-id='type-id-347' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='256'>
-        <var-decl name='st_gid' type-id='type-id-352' visibility='default'/>
+        <var-decl name='st_gid' type-id='type-id-348' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='288'>
         <var-decl name='__pad0' type-id='type-id-1' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='320'>
-        <var-decl name='st_rdev' type-id='type-id-348' visibility='default'/>
+        <var-decl name='st_rdev' type-id='type-id-344' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='384'>
-        <var-decl name='st_size' type-id='type-id-330' visibility='default'/>
+        <var-decl name='st_size' type-id='type-id-326' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='448'>
-        <var-decl name='st_blksize' type-id='type-id-353' visibility='default'/>
+        <var-decl name='st_blksize' type-id='type-id-349' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='512'>
-        <var-decl name='st_blocks' type-id='type-id-354' visibility='default'/>
+        <var-decl name='st_blocks' type-id='type-id-350' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='576'>
-        <var-decl name='st_atim' type-id='type-id-239' visibility='default'/>
+        <var-decl name='st_atim' type-id='type-id-237' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='704'>
-        <var-decl name='st_mtim' type-id='type-id-239' visibility='default'/>
+        <var-decl name='st_mtim' type-id='type-id-237' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='832'>
-        <var-decl name='st_ctim' type-id='type-id-239' visibility='default'/>
+        <var-decl name='st_ctim' type-id='type-id-237' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='960'>
-        <var-decl name='__glibc_reserved' type-id='type-id-355' visibility='default'/>
+        <var-decl name='__glibc_reserved' type-id='type-id-351' visibility='default'/>
       </data-member>
     </class-decl>
-    <typedef-decl name='__dev_t' type-id='type-id-26' id='type-id-348'/>
-    <typedef-decl name='__nlink_t' type-id='type-id-26' id='type-id-349'/>
-    <typedef-decl name='__mode_t' type-id='type-id-6' id='type-id-350'/>
-    <typedef-decl name='__uid_t' type-id='type-id-6' id='type-id-351'/>
-    <typedef-decl name='__gid_t' type-id='type-id-6' id='type-id-352'/>
-    <typedef-decl name='__blksize_t' type-id='type-id-5' id='type-id-353'/>
-    <typedef-decl name='__blkcnt64_t' type-id='type-id-5' id='type-id-354'/>
+    <typedef-decl name='__dev_t' type-id='type-id-26' id='type-id-344'/>
+    <typedef-decl name='__nlink_t' type-id='type-id-26' id='type-id-345'/>
+    <typedef-decl name='__mode_t' type-id='type-id-6' id='type-id-346'/>
+    <typedef-decl name='__uid_t' type-id='type-id-6' id='type-id-347'/>
+    <typedef-decl name='__gid_t' type-id='type-id-6' id='type-id-348'/>
+    <typedef-decl name='__blksize_t' type-id='type-id-5' id='type-id-349'/>
+    <typedef-decl name='__blkcnt64_t' type-id='type-id-5' id='type-id-350'/>
 
-    <array-type-def dimensions='1' type-id='type-id-241' size-in-bits='192' id='type-id-355'>
+    <array-type-def dimensions='1' type-id='type-id-239' size-in-bits='192' id='type-id-351'>
       <subrange length='3' type-id='type-id-12' id='type-id-59'/>
 
     </array-type-def>
-    <pointer-type-def type-id='type-id-347' size-in-bits='64' id='type-id-356'/>
+    <pointer-type-def type-id='type-id-343' size-in-bits='64' id='type-id-352'/>
     <function-decl name='getextmntent' mangled-name='getextmntent' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getextmntent'>
       <parameter type-id='type-id-16' name='path'/>
-      <parameter type-id='type-id-346' name='entry'/>
-      <parameter type-id='type-id-356' name='statbuf'/>
+      <parameter type-id='type-id-342' name='entry'/>
+      <parameter type-id='type-id-352' name='statbuf'/>
       <return type-id='type-id-1'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='list.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libspl' language='LANG_C99'>
-    <class-decl name='list' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-357'>
+    <class-decl name='list' size-in-bits='256' is-struct='yes' visibility='default' id='type-id-353'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='list_size' type-id='type-id-123' visibility='default'/>
       </data-member>
@@ -4263,126 +4220,126 @@
         <var-decl name='list_offset' type-id='type-id-123' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='128'>
-        <var-decl name='list_head' type-id='type-id-358' visibility='default'/>
+        <var-decl name='list_head' type-id='type-id-354' visibility='default'/>
       </data-member>
     </class-decl>
-    <class-decl name='list_node' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-358'>
+    <class-decl name='list_node' size-in-bits='128' is-struct='yes' visibility='default' id='type-id-354'>
       <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='next' type-id='type-id-359' visibility='default'/>
+        <var-decl name='next' type-id='type-id-355' visibility='default'/>
       </data-member>
       <data-member access='public' layout-offset-in-bits='64'>
-        <var-decl name='prev' type-id='type-id-359' visibility='default'/>
+        <var-decl name='prev' type-id='type-id-355' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-358' size-in-bits='64' id='type-id-359'/>
-    <typedef-decl name='list_t' type-id='type-id-357' id='type-id-360'/>
-    <pointer-type-def type-id='type-id-360' size-in-bits='64' id='type-id-361'/>
+    <pointer-type-def type-id='type-id-354' size-in-bits='64' id='type-id-355'/>
+    <typedef-decl name='list_t' type-id='type-id-353' id='type-id-356'/>
+    <pointer-type-def type-id='type-id-356' size-in-bits='64' id='type-id-357'/>
     <function-decl name='list_create' mangled-name='list_create' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_create'>
-      <parameter type-id='type-id-361' name='list'/>
+      <parameter type-id='type-id-357' name='list'/>
       <parameter type-id='type-id-123' name='size'/>
       <parameter type-id='type-id-123' name='offset'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='list_destroy' mangled-name='list_destroy' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_destroy'>
-      <parameter type-id='type-id-361' name='list'/>
+      <parameter type-id='type-id-357' name='list'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='list_insert_after' mangled-name='list_insert_after' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_insert_after'>
-      <parameter type-id='type-id-361' name='list'/>
+      <parameter type-id='type-id-357' name='list'/>
       <parameter type-id='type-id-73' name='object'/>
       <parameter type-id='type-id-73' name='nobject'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='list_insert_head' mangled-name='list_insert_head' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_insert_head'>
-      <parameter type-id='type-id-361' name='list'/>
+      <parameter type-id='type-id-357' name='list'/>
       <parameter type-id='type-id-73' name='object'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='list_insert_before' mangled-name='list_insert_before' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_insert_before'>
-      <parameter type-id='type-id-361' name='list'/>
+      <parameter type-id='type-id-357' name='list'/>
       <parameter type-id='type-id-73' name='object'/>
       <parameter type-id='type-id-73' name='nobject'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='list_insert_tail' mangled-name='list_insert_tail' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_insert_tail'>
-      <parameter type-id='type-id-361' name='list'/>
+      <parameter type-id='type-id-357' name='list'/>
       <parameter type-id='type-id-73' name='object'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='list_remove' mangled-name='list_remove' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_remove'>
-      <parameter type-id='type-id-361' name='list'/>
+      <parameter type-id='type-id-357' name='list'/>
       <parameter type-id='type-id-73' name='object'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='list_remove_head' mangled-name='list_remove_head' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_remove_head'>
-      <parameter type-id='type-id-361' name='list'/>
+      <parameter type-id='type-id-357' name='list'/>
       <return type-id='type-id-73'/>
     </function-decl>
     <function-decl name='list_remove_tail' mangled-name='list_remove_tail' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_remove_tail'>
-      <parameter type-id='type-id-361' name='list'/>
+      <parameter type-id='type-id-357' name='list'/>
       <return type-id='type-id-73'/>
     </function-decl>
     <function-decl name='list_head' mangled-name='list_head' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_head'>
-      <parameter type-id='type-id-361' name='list'/>
+      <parameter type-id='type-id-357' name='list'/>
       <return type-id='type-id-73'/>
     </function-decl>
     <function-decl name='list_tail' mangled-name='list_tail' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_tail'>
-      <parameter type-id='type-id-361' name='list'/>
+      <parameter type-id='type-id-357' name='list'/>
       <return type-id='type-id-73'/>
     </function-decl>
     <function-decl name='list_next' mangled-name='list_next' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_next'>
-      <parameter type-id='type-id-361' name='list'/>
+      <parameter type-id='type-id-357' name='list'/>
       <parameter type-id='type-id-73' name='object'/>
       <return type-id='type-id-73'/>
     </function-decl>
     <function-decl name='list_prev' mangled-name='list_prev' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_prev'>
-      <parameter type-id='type-id-361' name='list'/>
+      <parameter type-id='type-id-357' name='list'/>
       <parameter type-id='type-id-73' name='object'/>
       <return type-id='type-id-73'/>
     </function-decl>
     <function-decl name='list_move_tail' mangled-name='list_move_tail' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_move_tail'>
-      <parameter type-id='type-id-361' name='dst'/>
-      <parameter type-id='type-id-361' name='src'/>
+      <parameter type-id='type-id-357' name='dst'/>
+      <parameter type-id='type-id-357' name='src'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <typedef-decl name='list_node_t' type-id='type-id-358' id='type-id-362'/>
-    <pointer-type-def type-id='type-id-362' size-in-bits='64' id='type-id-363'/>
+    <typedef-decl name='list_node_t' type-id='type-id-354' id='type-id-358'/>
+    <pointer-type-def type-id='type-id-358' size-in-bits='64' id='type-id-359'/>
     <function-decl name='list_link_replace' mangled-name='list_link_replace' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_link_replace'>
-      <parameter type-id='type-id-363' name='lold'/>
-      <parameter type-id='type-id-363' name='lnew'/>
+      <parameter type-id='type-id-359' name='lold'/>
+      <parameter type-id='type-id-359' name='lnew'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='list_link_init' mangled-name='list_link_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_link_init'>
-      <parameter type-id='type-id-363' name='ln'/>
+      <parameter type-id='type-id-359' name='ln'/>
       <return type-id='type-id-17'/>
     </function-decl>
     <function-decl name='list_link_active' mangled-name='list_link_active' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_link_active'>
-      <parameter type-id='type-id-363' name='ln'/>
+      <parameter type-id='type-id-359' name='ln'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='list_is_empty' mangled-name='list_is_empty' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='list_is_empty'>
-      <parameter type-id='type-id-361' name='list'/>
+      <parameter type-id='type-id-357' name='list'/>
       <return type-id='type-id-1'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='mkdirp.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libspl' language='LANG_C99'>
-    <typedef-decl name='mode_t' type-id='type-id-350' id='type-id-364'/>
+    <typedef-decl name='mode_t' type-id='type-id-346' id='type-id-360'/>
     <function-decl name='mkdirp' mangled-name='mkdirp' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mkdirp'>
       <parameter type-id='type-id-16' name='d'/>
-      <parameter type-id='type-id-364' name='mode'/>
+      <parameter type-id='type-id-360' name='mode'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='mbstowcs' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-143'/>
+      <parameter type-id='type-id-127'/>
       <parameter type-id='type-id-16'/>
       <parameter type-id='type-id-26'/>
       <return type-id='type-id-26'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-365'/>
-    <pointer-type-def type-id='type-id-365' size-in-bits='64' id='type-id-366'/>
+    <qualified-type-def type-id='type-id-1' const='yes' id='type-id-361'/>
+    <pointer-type-def type-id='type-id-361' size-in-bits='64' id='type-id-362'/>
     <function-decl name='wcstombs' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-37'/>
-      <parameter type-id='type-id-366'/>
+      <parameter type-id='type-id-362'/>
       <parameter type-id='type-id-26'/>
       <return type-id='type-id-26'/>
     </function-decl>
@@ -4418,16 +4375,16 @@
       <parameter type-id='type-id-34' name='timestamp_fmt'/>
       <return type-id='type-id-17'/>
     </function-decl>
-    <pointer-type-def type-id='type-id-5' size-in-bits='64' id='type-id-367'/>
+    <pointer-type-def type-id='type-id-5' size-in-bits='64' id='type-id-363'/>
     <function-decl name='time' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-367'/>
+      <parameter type-id='type-id-363'/>
       <return type-id='type-id-5'/>
     </function-decl>
     <function-decl name='nl_langinfo' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-1'/>
       <return type-id='type-id-37'/>
     </function-decl>
-    <class-decl name='tm' size-in-bits='448' is-struct='yes' visibility='default' id='type-id-368'>
+    <class-decl name='tm' size-in-bits='448' is-struct='yes' visibility='default' id='type-id-364'>
       <data-member access='public' layout-offset-in-bits='0'>
         <var-decl name='tm_sec' type-id='type-id-1' visibility='default'/>
       </data-member>
@@ -4462,49 +4419,35 @@
         <var-decl name='tm_zone' type-id='type-id-16' visibility='default'/>
       </data-member>
     </class-decl>
-    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-369'/>
-    <qualified-type-def type-id='type-id-5' const='yes' id='type-id-370'/>
-    <pointer-type-def type-id='type-id-370' size-in-bits='64' id='type-id-371'/>
+    <pointer-type-def type-id='type-id-364' size-in-bits='64' id='type-id-365'/>
+    <qualified-type-def type-id='type-id-5' const='yes' id='type-id-366'/>
+    <pointer-type-def type-id='type-id-366' size-in-bits='64' id='type-id-367'/>
     <function-decl name='localtime' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-371'/>
-      <return type-id='type-id-369'/>
+      <parameter type-id='type-id-367'/>
+      <return type-id='type-id-365'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-368' const='yes' id='type-id-372'/>
-    <pointer-type-def type-id='type-id-372' size-in-bits='64' id='type-id-373'/>
+    <qualified-type-def type-id='type-id-364' const='yes' id='type-id-368'/>
+    <pointer-type-def type-id='type-id-368' size-in-bits='64' id='type-id-369'/>
     <function-decl name='strftime' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-37'/>
       <parameter type-id='type-id-26'/>
       <parameter type-id='type-id-16'/>
-      <parameter type-id='type-id-373'/>
+      <parameter type-id='type-id-369'/>
       <return type-id='type-id-26'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='os/linux/zone.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libspl' language='LANG_C99'>
-    <typedef-decl name='zoneid_t' type-id='type-id-1' id='type-id-374'/>
+    <typedef-decl name='zoneid_t' type-id='type-id-1' id='type-id-370'/>
     <function-decl name='getzoneid' mangled-name='getzoneid' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getzoneid'>
-      <return type-id='type-id-374'/>
+      <return type-id='type-id-370'/>
     </function-decl>
   </abi-instr>
   <abi-instr version='1.0' address-size='64' path='rdwr_efi.c' comp-dir-path='/home/nabijaczleweli/store/code/zfs/lib/libefi' language='LANG_C99'>
-    <class-decl name='dk_map2' size-in-bits='32' is-struct='yes' visibility='default' id='type-id-375'>
-      <data-member access='public' layout-offset-in-bits='0'>
-        <var-decl name='p_tag' type-id='type-id-225' visibility='default'/>
-      </data-member>
-      <data-member access='public' layout-offset-in-bits='16'>
-        <var-decl name='p_flag' type-id='type-id-225' visibility='default'/>
-      </data-member>
-    </class-decl>
-
-    <array-type-def dimensions='1' type-id='type-id-375' size-in-bits='512' id='type-id-376'>
-      <subrange length='16' type-id='type-id-12' id='type-id-104'/>
-
-    </array-type-def>
-    <var-decl name='default_vtoc_map' type-id='type-id-376' mangled-name='default_vtoc_map' visibility='default' elf-symbol-id='default_vtoc_map'/>
     <var-decl name='efi_debug' type-id='type-id-1' mangled-name='efi_debug' visibility='default' elf-symbol-id='efi_debug'/>
     <function-decl name='efi_alloc_and_init' mangled-name='efi_alloc_and_init' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_alloc_and_init'>
       <parameter type-id='type-id-1' name='fd'/>
       <parameter type-id='type-id-22' name='nparts'/>
-      <parameter type-id='type-id-234' name='vtoc'/>
+      <parameter type-id='type-id-232' name='vtoc'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='uuid_generate' visibility='default' binding='global' size-in-bits='64'>
@@ -4513,7 +4456,7 @@
     </function-decl>
     <function-decl name='efi_alloc_and_read' mangled-name='efi_alloc_and_read' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_alloc_and_read'>
       <parameter type-id='type-id-1' name='fd'/>
-      <parameter type-id='type-id-234' name='vtoc'/>
+      <parameter type-id='type-id-232' name='vtoc'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='efi_rescan' mangled-name='efi_rescan' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_rescan'>
@@ -4526,18 +4469,18 @@
     </function-decl>
     <function-decl name='efi_write' mangled-name='efi_write' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_write'>
       <parameter type-id='type-id-1' name='fd'/>
-      <parameter type-id='type-id-233' name='vtoc'/>
+      <parameter type-id='type-id-231' name='vtoc'/>
       <return type-id='type-id-1'/>
     </function-decl>
-    <qualified-type-def type-id='type-id-30' const='yes' id='type-id-377'/>
-    <pointer-type-def type-id='type-id-377' size-in-bits='64' id='type-id-378'/>
+    <qualified-type-def type-id='type-id-30' const='yes' id='type-id-371'/>
+    <pointer-type-def type-id='type-id-371' size-in-bits='64' id='type-id-372'/>
     <function-decl name='uuid_is_null' visibility='default' binding='global' size-in-bits='64'>
-      <parameter type-id='type-id-378'/>
+      <parameter type-id='type-id-372'/>
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='crc32' visibility='default' binding='global' size-in-bits='64'>
       <parameter type-id='type-id-26'/>
-      <parameter type-id='type-id-378'/>
+      <parameter type-id='type-id-372'/>
       <parameter type-id='type-id-6'/>
       <return type-id='type-id-26'/>
     </function-decl>
@@ -4562,7 +4505,7 @@
       <return type-id='type-id-1'/>
     </function-decl>
     <function-decl name='efi_err_check' mangled-name='efi_err_check' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='efi_err_check'>
-      <parameter type-id='type-id-233' name='vtoc'/>
+      <parameter type-id='type-id-231' name='vtoc'/>
       <return type-id='type-id-17'/>
     </function-decl>
   </abi-instr>
diff --git a/lib/libzfsbootenv/Makefile.am b/lib/libzfsbootenv/Makefile.am
index 984df0b8a..0c454a5e0 100644
--- a/lib/libzfsbootenv/Makefile.am
+++ b/lib/libzfsbootenv/Makefile.am
@@ -2,6 +2,8 @@ include $(top_srcdir)/config/Rules.am
 
 pkgconfig_DATA = libzfsbootenv.pc
 
+AM_CFLAGS += -fvisibility=hidden
+
 lib_LTLIBRARIES = libzfsbootenv.la
 
 include $(top_srcdir)/config/Abigail.am
diff --git a/lib/libzutil/Makefile.am b/lib/libzutil/Makefile.am
index 2f0357e9f..0bc29f05e 100644
--- a/lib/libzutil/Makefile.am
+++ b/lib/libzutil/Makefile.am
@@ -3,6 +3,7 @@ include $(top_srcdir)/config/Rules.am
 # Suppress unused but set variable warnings often due to ASSERTs
 AM_CFLAGS += $(NO_UNUSED_BUT_SET_VARIABLE)
 AM_CFLAGS += $(LIBBLKID_CFLAGS) $(LIBUDEV_CFLAGS)
+AM_CFLAGS += -fvisibility=hidden
 
 DEFAULT_INCLUDES += -I$(srcdir)