Index: lib/libnv/dnv.h
===================================================================
--- lib/libnv/dnv.h
+++ lib/libnv/dnv.h
@@ -45,6 +45,8 @@
 typedef struct nvlist nvlist_t;
 #endif
 
+__BEGIN_DECLS
+
 /*
  * The dnvlist_get functions returns value associated with the given name.
  * If it returns a pointer, the pointer represents internal buffer and should
@@ -103,4 +105,6 @@
 int dnvlist_takev_descriptor(nvlist_t *nvl, int defval, const char *namefmt, va_list nameap) __printflike(3, 0);
 void *dnvlist_takev_binary(nvlist_t *nvl, size_t *sizep, void *defval, size_t defsize, const char *namefmt, va_list nameap) __printflike(5, 0);
 
+__END_DECLS
+
 #endif	/* !_DNV_H_ */
Index: lib/libnv/nv.h
===================================================================
--- lib/libnv/nv.h
+++ lib/libnv/nv.h
@@ -63,6 +63,7 @@
  */
 #define	NV_FLAG_IGNORE_CASE		0x01
 
+__BEGIN_DECLS
 nvlist_t	*nvlist_create(int flags);
 void		 nvlist_destroy(nvlist_t *nvl);
 int		 nvlist_error(const nvlist_t *nvl);
@@ -272,4 +273,6 @@
 void nvlist_freev_descriptor(nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
 void nvlist_freev_binary(nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
 
+__END_DECLS
+
 #endif	/* !_NV_H_ */