Index: external/cddl/osnet/sys/sys/uio.h
===================================================================
RCS file: /cvsroot/src/external/cddl/osnet/sys/sys/uio.h,v
retrieving revision 1.12
diff -u -r1.12 uio.h
--- external/cddl/osnet/sys/sys/uio.h	30 Nov 2018 09:53:40 -0000	1.12
+++ external/cddl/osnet/sys/sys/uio.h	14 Jun 2019 11:33:26 -0000
@@ -61,6 +61,7 @@
 #define	_OPENSOLARIS_SYS_UIO_H_
 
 #include_next <sys/uio.h>
+#if !HAVE_NBTOOL_CONFIG_H
 #include <sys/debug.h>
 
 #ifndef _KERNEL
@@ -163,5 +164,6 @@
 #define	uiomove(cp, n, dir, uio)	zfs_uiomove((cp), (n), (dir), (uio))
 #define uiocopy(cp, n, dir, uio, cbytes) 	zfs_uiocopy((cp), (n), (dir), (uio), (cbytes))
 #define uioskip(uio, size) 		zfs_uioskip((uio), (size))
+#endif
 
 #endif	/* !_OPENSOLARIS_SYS_UIO_H_ */