Index: cddl/lib/libnvpair/Makefile
===================================================================
--- cddl/lib/libnvpair/Makefile
+++ cddl/lib/libnvpair/Makefile
@@ -7,7 +7,11 @@
 LIBADD=	spl
 
 PACKAGE=	runtime
+VERSION_DEF=	${.CURDIR}/Versions.def
+SYMBOL_MAPS=	${.CURDIR}/Symbol.map
+
 # user
+INCS=	libnvpair.h
 SRCS=	libnvpair.c \
 	libnvpair_json.c \
 	nvpair_alloc_system.c
Index: cddl/lib/libnvpair/Symbol.map
===================================================================
--- /dev/null
+++ cddl/lib/libnvpair/Symbol.map
@@ -0,0 +1,230 @@
+LIBNVPAIR_1.0 {
+	aok;
+	dump_nvlist;
+	fnvlist_add_boolean;
+	fnvlist_add_boolean_array;
+	fnvlist_add_boolean_value;
+	fnvlist_add_byte;
+	fnvlist_add_byte_array;
+	fnvlist_add_int16;
+	fnvlist_add_int16_array;
+	fnvlist_add_int32;
+	fnvlist_add_int32_array;
+	fnvlist_add_int64;
+	fnvlist_add_int64_array;
+	fnvlist_add_int8;
+	fnvlist_add_int8_array;
+	fnvlist_add_nvlist;
+	fnvlist_add_nvlist_array;
+	fnvlist_add_nvpair;
+	fnvlist_add_string;
+	fnvlist_add_string_array;
+	fnvlist_add_uint16;
+	fnvlist_add_uint16_array;
+	fnvlist_add_uint32;
+	fnvlist_add_uint32_array;
+	fnvlist_add_uint64;
+	fnvlist_add_uint64_array;
+	fnvlist_add_uint8;
+	fnvlist_add_uint8_array;
+	fnvlist_alloc;
+	fnvlist_dup;
+	fnvlist_free;
+	fnvlist_lookup_boolean;
+	fnvlist_lookup_boolean_array;
+	fnvlist_lookup_boolean_value;
+	fnvlist_lookup_byte;
+	fnvlist_lookup_byte_array;
+	fnvlist_lookup_int16;
+	fnvlist_lookup_int16_array;
+	fnvlist_lookup_int32;
+	fnvlist_lookup_int32_array;
+	fnvlist_lookup_int64;
+	fnvlist_lookup_int64_array;
+	fnvlist_lookup_int8;
+	fnvlist_lookup_int8_array;
+	fnvlist_lookup_nvlist;
+	fnvlist_lookup_nvpair;
+	fnvlist_lookup_string;
+	fnvlist_lookup_uint16;
+	fnvlist_lookup_uint16_array;
+	fnvlist_lookup_uint32;
+	fnvlist_lookup_uint32_array;
+	fnvlist_lookup_uint64;
+	fnvlist_lookup_uint64_array;
+	fnvlist_lookup_uint8;
+	fnvlist_lookup_uint8_array;
+	fnvlist_merge;
+	fnvlist_num_pairs;
+	fnvlist_pack;
+	fnvlist_pack_free;
+	fnvlist_remove;
+	fnvlist_remove_nvpair;
+	fnvlist_size;
+	fnvlist_unpack;
+	fnvpair_value_boolean_value;
+	fnvpair_value_byte;
+	fnvpair_value_int16;
+	fnvpair_value_int32;
+	fnvpair_value_int64;
+	fnvpair_value_int8;
+	fnvpair_value_nvlist;
+	fnvpair_value_string;
+	fnvpair_value_uint16;
+	fnvpair_value_uint32;
+	fnvpair_value_uint64;
+	fnvpair_value_uint8;
+	nv_alloc_fini;
+	nv_alloc_init;
+	nv_alloc_nosleep;
+	nv_alloc_reset;
+	nv_alloc_sleep;
+	nv_fixed_ops;
+	nvlist_add_boolean;
+	nvlist_add_boolean_array;
+	nvlist_add_boolean_value;
+	nvlist_add_byte;
+	nvlist_add_byte_array;
+	nvlist_add_double;
+	nvlist_add_hrtime;
+	nvlist_add_int16;
+	nvlist_add_int16_array;
+	nvlist_add_int32;
+	nvlist_add_int32_array;
+	nvlist_add_int64;
+	nvlist_add_int64_array;
+	nvlist_add_int8;
+	nvlist_add_int8_array;
+	nvlist_add_nvlist;
+	nvlist_add_nvlist_array;
+	nvlist_add_nvpair;
+	nvlist_add_string;
+	nvlist_add_string_array;
+	nvlist_add_uint16;
+	nvlist_add_uint16_array;
+	nvlist_add_uint32;
+	nvlist_add_uint32_array;
+	nvlist_add_uint64;
+	nvlist_add_uint64_array;
+	nvlist_add_uint8;
+	nvlist_add_uint8_array;
+	nvlist_alloc;
+	nvlist_dup;
+	nvlist_empty;
+	nvlist_exists;
+	nvlist_free;
+	nvlist_lookup_boolean;
+	nvlist_lookup_boolean_array;
+	nvlist_lookup_boolean_value;
+	nvlist_lookup_byte;
+	nvlist_lookup_byte_array;
+	nvlist_lookup_double;
+	nvlist_lookup_hrtime;
+	nvlist_lookup_int16;
+	nvlist_lookup_int16_array;
+	nvlist_lookup_int32;
+	nvlist_lookup_int32_array;
+	nvlist_lookup_int64;
+	nvlist_lookup_int64_array;
+	nvlist_lookup_int8;
+	nvlist_lookup_int8_array;
+	nvlist_lookup_nv_alloc;
+	nvlist_lookup_nvlist;
+	nvlist_lookup_nvlist_array;
+	nvlist_lookup_nvpair;
+	nvlist_lookup_nvpair_embedded_index;
+	nvlist_lookup_pairs;
+	nvlist_lookup_string;
+	nvlist_lookup_string_array;
+	nvlist_lookup_uint16;
+	nvlist_lookup_uint16_array;
+	nvlist_lookup_uint32;
+	nvlist_lookup_uint32_array;
+	nvlist_lookup_uint64;
+	nvlist_lookup_uint64_array;
+	nvlist_lookup_uint8;
+	nvlist_lookup_uint8_array;
+	nvlist_merge;
+	nvlist_next_nvpair;
+	nvlist_nvflag;
+	nvlist_pack;
+	nvlist_prev_nvpair;
+	nvlist_print;
+	nvlist_print_json;
+	nvlist_prt;
+	nvlist_prtctl_alloc;
+	nvlist_prtctl_dofmt;
+	nvlist_prtctl_doindent;
+	nvlist_prtctl_free;
+	nvlist_prtctl_getdest;
+	nvlist_prtctl_setdest;
+	nvlist_prtctl_setfmt;
+	nvlist_prtctl_setindent;
+	nvlist_prtctlop_boolean;
+	nvlist_prtctlop_boolean_array;
+	nvlist_prtctlop_boolean_value;
+	nvlist_prtctlop_byte;
+	nvlist_prtctlop_byte_array;
+	nvlist_prtctlop_double;
+	nvlist_prtctlop_hrtime;
+	nvlist_prtctlop_int16;
+	nvlist_prtctlop_int16_array;
+	nvlist_prtctlop_int32;
+	nvlist_prtctlop_int32_array;
+	nvlist_prtctlop_int64;
+	nvlist_prtctlop_int64_array;
+	nvlist_prtctlop_int8;
+	nvlist_prtctlop_int8_array;
+	nvlist_prtctlop_nvlist;
+	nvlist_prtctlop_nvlist_array;
+	nvlist_prtctlop_string;
+	nvlist_prtctlop_string_array;
+	nvlist_prtctlop_uint16;
+	nvlist_prtctlop_uint16_array;
+	nvlist_prtctlop_uint32;
+	nvlist_prtctlop_uint32_array;
+	nvlist_prtctlop_uint64;
+	nvlist_prtctlop_uint64_array;
+	nvlist_prtctlop_uint8;
+	nvlist_prtctlop_uint8_array;
+	nvlist_remove;
+	nvlist_remove_all;
+	nvlist_remove_nvpair;
+	nvlist_size;
+	nvlist_unpack;
+	nvlist_xalloc;
+	nvlist_xdup;
+	nvlist_xpack;
+	nvlist_xunpack;
+	nvpair_name;
+	nvpair_type;
+	nvpair_type_is_array;
+	nvpair_value_boolean_array;
+	nvpair_value_boolean_value;
+	nvpair_value_byte;
+	nvpair_value_byte_array;
+	nvpair_value_double;
+	nvpair_value_hrtime;
+	nvpair_value_int16;
+	nvpair_value_int16_array;
+	nvpair_value_int32;
+	nvpair_value_int32_array;
+	nvpair_value_int64;
+	nvpair_value_int64_array;
+	nvpair_value_int8;
+	nvpair_value_int8_array;
+	nvpair_value_match;
+	nvpair_value_match_regex;
+	nvpair_value_nvlist;
+	nvpair_value_nvlist_array;
+	nvpair_value_string;
+	nvpair_value_string_array;
+	nvpair_value_uint16;
+	nvpair_value_uint16_array;
+	nvpair_value_uint32;
+	nvpair_value_uint32_array;
+	nvpair_value_uint64;
+	nvpair_value_uint64_array;
+	nvpair_value_uint8;
+	nvpair_value_uint8_array;
+};
Index: cddl/lib/libnvpair/Versions.def
===================================================================
--- /dev/null
+++ cddl/lib/libnvpair/Versions.def
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+LIBNVPAIR_1.0 {
+};
Index: lib/libnv/Makefile
===================================================================
--- lib/libnv/Makefile
+++ lib/libnv/Makefile
@@ -8,6 +8,9 @@
 LIB=	nv
 SHLIB_MAJOR= 0
 
+VERSION_DEF=	${SRCTOP}/lib/libc/Versions.def
+SYMBOL_MAPS=	${.CURDIR}/Symbol.map
+
 .PATH: ${SRCTOP}/sys/contrib/libnv ${SRCTOP}/sys/sys
 CFLAGS+=-I${.CURDIR}
 
Index: lib/libnv/Symbol.map
===================================================================
--- /dev/null
+++ lib/libnv/Symbol.map
@@ -0,0 +1,251 @@
+FBSD_1.0 {
+	buf_recv;
+	buf_send;
+	cnvlist_free_binary;
+	cnvlist_free_bool;
+	cnvlist_free_bool_array;
+	cnvlist_free_descriptor;
+	cnvlist_free_descriptor_array;
+	cnvlist_free_number;
+	cnvlist_free_number_array;
+	cnvlist_free_nvlist;
+	cnvlist_free_nvlist_array;
+	cnvlist_free_string;
+	cnvlist_free_string_array;
+	cnvlist_get_binary;
+	cnvlist_get_bool;
+	cnvlist_get_bool_array;
+	cnvlist_get_descriptor;
+	cnvlist_get_descriptor_array;
+	cnvlist_get_number;
+	cnvlist_get_number_array;
+	cnvlist_get_nvlist;
+	cnvlist_get_nvlist_array;
+	cnvlist_get_string;
+	cnvlist_get_string_array;
+	cnvlist_name;
+	cnvlist_take_binary;
+	cnvlist_take_bool;
+	cnvlist_take_bool_array;
+	cnvlist_take_descriptor;
+	cnvlist_take_descriptor_array;
+	cnvlist_take_number;
+	cnvlist_take_number_array;
+	cnvlist_take_nvlist;
+	cnvlist_take_nvlist_array;
+	cnvlist_take_string;
+	cnvlist_take_string_array;
+	cnvlist_type;
+	cred_recv;
+	cred_send;
+	dnvlist_get_binary;
+	dnvlist_get_bool;
+	dnvlist_get_descriptor;
+	dnvlist_get_number;
+	dnvlist_get_nvlist;
+	dnvlist_get_string;
+	dnvlist_take_binary;
+	dnvlist_take_bool;
+	dnvlist_take_descriptor;
+	dnvlist_take_number;
+	dnvlist_take_nvlist;
+	dnvlist_take_string;
+	fd_recv;
+	fd_send;
+	nvlist_add_binary;
+	nvlist_add_bool;
+	nvlist_add_bool_array;
+	nvlist_add_descriptor;
+	nvlist_add_descriptor_array;
+	nvlist_add_null;
+	nvlist_add_number;
+	nvlist_add_number_array;
+	nvlist_add_nvlist;
+	nvlist_add_nvlist_array;
+	nvlist_add_nvpair;
+	nvlist_add_string;
+	nvlist_add_string_array;
+	nvlist_add_stringf;
+	nvlist_add_stringv;
+	nvlist_append_bool_array;
+	nvlist_append_descriptor_array;
+	nvlist_append_number_array;
+	nvlist_append_nvlist_array;
+	nvlist_append_string_array;
+	nvlist_clone;
+	nvlist_create;
+	nvlist_descriptors;
+	nvlist_destroy;
+	nvlist_dump;
+	nvlist_empty;
+	nvlist_error;
+	nvlist_exists;
+	nvlist_exists_binary;
+	nvlist_exists_bool;
+	nvlist_exists_bool_array;
+	nvlist_exists_descriptor;
+	nvlist_exists_descriptor_array;
+	nvlist_exists_null;
+	nvlist_exists_number;
+	nvlist_exists_number_array;
+	nvlist_exists_nvlist;
+	nvlist_exists_nvlist_array;
+	nvlist_exists_string;
+	nvlist_exists_string_array;
+	nvlist_exists_type;
+	nvlist_fdump;
+	nvlist_first_nvpair;
+	nvlist_flags;
+	nvlist_free;
+	nvlist_free_binary;
+	nvlist_free_bool;
+	nvlist_free_bool_array;
+	nvlist_free_descriptor;
+	nvlist_free_descriptor_array;
+	nvlist_free_null;
+	nvlist_free_number;
+	nvlist_free_number_array;
+	nvlist_free_nvlist;
+	nvlist_free_nvlist_array;
+	nvlist_free_nvpair;
+	nvlist_free_string;
+	nvlist_free_string_array;
+	nvlist_free_type;
+	nvlist_get_array_next;
+	nvlist_get_array_next_nvpair;
+	nvlist_get_binary;
+	nvlist_get_bool;
+	nvlist_get_bool_array;
+	nvlist_get_descriptor;
+	nvlist_get_descriptor_array;
+	nvlist_get_number;
+	nvlist_get_number_array;
+	nvlist_get_nvlist;
+	nvlist_get_nvlist_array;
+	nvlist_get_nvpair;
+	nvlist_get_nvpair_parent;
+	nvlist_get_pararr;
+	nvlist_get_parent;
+	nvlist_get_string;
+	nvlist_get_string_array;
+	nvlist_in_array;
+	nvlist_move_binary;
+	nvlist_move_bool_array;
+	nvlist_move_descriptor;
+	nvlist_move_descriptor_array;
+	nvlist_move_number_array;
+	nvlist_move_nvlist;
+	nvlist_move_nvlist_array;
+	nvlist_move_nvpair;
+	nvlist_move_string;
+	nvlist_move_string_array;
+	nvlist_ndescriptors;
+	nvlist_next;
+	nvlist_next_nvpair;
+	nvlist_pack;
+	nvlist_prev_nvpair;
+	nvlist_recv;
+	nvlist_remove_nvpair;
+	nvlist_report_missing;
+	nvlist_send;
+	nvlist_set_array_next;
+	nvlist_set_error;
+	nvlist_set_flags;
+	nvlist_set_parent;
+	nvlist_size;
+	nvlist_take_binary;
+	nvlist_take_bool;
+	nvlist_take_bool_array;
+	nvlist_take_descriptor;
+	nvlist_take_descriptor_array;
+	nvlist_take_number;
+	nvlist_take_number_array;
+	nvlist_take_nvlist;
+	nvlist_take_nvlist_array;
+	nvlist_take_string;
+	nvlist_take_string_array;
+	nvlist_unpack;
+	nvlist_unpack_header;
+	nvlist_xfer;
+	nvpair_append_bool_array;
+	nvpair_append_descriptor_array;
+	nvpair_append_number_array;
+	nvpair_append_nvlist_array;
+	nvpair_append_string_array;
+	nvpair_assert;
+	nvpair_clone;
+	nvpair_create_binary;
+	nvpair_create_bool;
+	nvpair_create_bool_array;
+	nvpair_create_descriptor;
+	nvpair_create_descriptor_array;
+	nvpair_create_null;
+	nvpair_create_number;
+	nvpair_create_number_array;
+	nvpair_create_nvlist;
+	nvpair_create_nvlist_array;
+	nvpair_create_string;
+	nvpair_create_string_array;
+	nvpair_create_stringf;
+	nvpair_create_stringv;
+	nvpair_free;
+	nvpair_free_structure;
+	nvpair_get_binary;
+	nvpair_get_bool;
+	nvpair_get_bool_array;
+	nvpair_get_descriptor;
+	nvpair_get_descriptor_array;
+	nvpair_get_number;
+	nvpair_get_number_array;
+	nvpair_get_nvlist;
+	nvpair_get_nvlist_array;
+	nvpair_get_string;
+	nvpair_get_string_array;
+	nvpair_header_size;
+	nvpair_init_datasize;
+	nvpair_insert;
+	nvpair_move_binary;
+	nvpair_move_bool_array;
+	nvpair_move_descriptor;
+	nvpair_move_descriptor_array;
+	nvpair_move_number_array;
+	nvpair_move_nvlist;
+	nvpair_move_nvlist_array;
+	nvpair_move_string;
+	nvpair_move_string_array;
+	nvpair_name;
+	nvpair_next;
+	nvpair_nvlist;
+	nvpair_pack_binary;
+	nvpair_pack_bool;
+	nvpair_pack_bool_array;
+	nvpair_pack_descriptor;
+	nvpair_pack_descriptor_array;
+	nvpair_pack_header;
+	nvpair_pack_null;
+	nvpair_pack_number;
+	nvpair_pack_number_array;
+	nvpair_pack_nvlist_array_next;
+	nvpair_pack_nvlist_up;
+	nvpair_pack_string;
+	nvpair_pack_string_array;
+	nvpair_prev;
+	nvpair_remove;
+	nvpair_size;
+	nvpair_type;
+	nvpair_type_string;
+	nvpair_unpack;
+	nvpair_unpack_binary;
+	nvpair_unpack_bool;
+	nvpair_unpack_bool_array;
+	nvpair_unpack_descriptor;
+	nvpair_unpack_descriptor_array;
+	nvpair_unpack_header;
+	nvpair_unpack_null;
+	nvpair_unpack_number;
+	nvpair_unpack_number_array;
+	nvpair_unpack_nvlist;
+	nvpair_unpack_nvlist_array;
+	nvpair_unpack_string;
+	nvpair_unpack_string_array;
+};