diff --git a/external/cddl/osnet/OPENSOLARIS.LICENSE b/external/cddl/osnet/dist/OPENSOLARIS.LICENSE
similarity index 100%
rename from external/cddl/osnet/OPENSOLARIS.LICENSE
rename to external/cddl/osnet/dist/OPENSOLARIS.LICENSE
diff --git a/external/cddl/osnet/usr.sbin/zdb/zdb.8 b/external/cddl/osnet/dist/cmd/zdb/zdb.8
similarity index 100%
rename from external/cddl/osnet/usr.sbin/zdb/zdb.8
rename to external/cddl/osnet/dist/cmd/zdb/zdb.8
diff --git a/external/cddl/osnet/sbin/zfs/zfs.8 b/external/cddl/osnet/dist/cmd/zfs/zfs.8
similarity index 100%
rename from external/cddl/osnet/sbin/zfs/zfs.8
rename to external/cddl/osnet/dist/cmd/zfs/zfs.8
diff --git a/external/cddl/osnet/sbin/zpool/zpool-features.7 b/external/cddl/osnet/dist/cmd/zpool/zpool-features.7
similarity index 100%
rename from external/cddl/osnet/sbin/zpool/zpool-features.7
rename to external/cddl/osnet/dist/cmd/zpool/zpool-features.7
diff --git a/external/cddl/osnet/sbin/zpool/zpool.8 b/external/cddl/osnet/dist/cmd/zpool/zpool.8
similarity index 100%
rename from external/cddl/osnet/sbin/zpool/zpool.8
rename to external/cddl/osnet/dist/cmd/zpool/zpool.8
diff --git a/external/cddl/osnet/include/libintl.h b/external/cddl/osnet/dist/head/libintl.h
similarity index 100%
rename from external/cddl/osnet/include/libintl.h
rename to external/cddl/osnet/dist/head/libintl.h
diff --git a/external/cddl/osnet/include/stdio_ext.h b/external/cddl/osnet/dist/head/stdio_ext.h
similarity index 100%
rename from external/cddl/osnet/include/stdio_ext.h
rename to external/cddl/osnet/dist/head/stdio_ext.h
diff --git a/external/cddl/osnet/include/thread.h b/external/cddl/osnet/dist/head/thread.h
similarity index 100%
rename from external/cddl/osnet/include/thread.h
rename to external/cddl/osnet/dist/head/thread.h
diff --git a/external/cddl/osnet/sys/kern/callb.c b/external/cddl/osnet/dist/uts/common/os/callb.c
similarity index 100%
rename from external/cddl/osnet/sys/kern/callb.c
rename to external/cddl/osnet/dist/uts/common/os/callb.c
diff --git a/external/cddl/osnet/sys/kern/fm.c b/external/cddl/osnet/dist/uts/common/os/fm.c
similarity index 100%
rename from external/cddl/osnet/sys/kern/fm.c
rename to external/cddl/osnet/dist/uts/common/os/fm.c
diff --git a/external/cddl/osnet/sys/sys/extdirent.h b/external/cddl/osnet/dist/uts/common/sys/extdirent.h
similarity index 97%
rename from external/cddl/osnet/sys/sys/extdirent.h
rename to external/cddl/osnet/dist/uts/common/sys/extdirent.h
index 7edd7d2d2bab..ff12a1c456dc 100644
--- a/external/cddl/osnet/sys/sys/extdirent.h
+++ b/external/cddl/osnet/dist/uts/common/sys/extdirent.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: extdirent.h,v 1.1 2009/08/07 20:57:57 haad Exp $	*/
+/*	$NetBSD: extdirent.h,v 1.1 2019/06/24 08:27:20 hannken Exp $	*/
 
 /*
  * CDDL HEADER START
diff --git a/external/cddl/osnet/sys/sys/isa_defs.h b/external/cddl/osnet/dist/uts/common/sys/isa_defs.h
similarity index 100%
rename from external/cddl/osnet/sys/sys/isa_defs.h
rename to external/cddl/osnet/dist/uts/common/sys/isa_defs.h
diff --git a/external/cddl/osnet/sys/sys/procset.h b/external/cddl/osnet/dist/uts/common/sys/procset.h
similarity index 100%
rename from external/cddl/osnet/sys/sys/procset.h
rename to external/cddl/osnet/dist/uts/common/sys/procset.h
diff --git a/external/cddl/osnet/sys/sys/sysmacros.h b/external/cddl/osnet/dist/uts/common/sys/sysmacros.h
similarity index 100%
rename from external/cddl/osnet/sys/sys/sysmacros.h
rename to external/cddl/osnet/dist/uts/common/sys/sysmacros.h
diff --git a/usr.sbin/fstyp/Makefile b/usr.sbin/fstyp/Makefile
index db67fa3e3af3..9e660b90d227 100644
--- a/usr.sbin/fstyp/Makefile
+++ b/usr.sbin/fstyp/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2019/06/22 09:48:39 hannken Exp $
+#	$NetBSD: Makefile,v 1.5 2019/06/24 08:27:21 hannken Exp $
 
 .include <bsd.own.mk>
 
@@ -21,6 +21,7 @@ COPTS.zfs.c+=	-Wno-strict-prototypes
 COPTS.zfs.c+=	-I${NETBSDSRCDIR}/external
 COPTS.zfs.c+=	-I${NETBSDSRCDIR}/external/cddl/osnet/include
 COPTS.zfs.c+=	-I${NETBSDSRCDIR}/external/cddl/osnet/sys
+COPTS.zfs.c+=	-I${NETBSDSRCDIR}/external/cddl/osnet/dist/head
 COPTS.zfs.c+=	-I${NETBSDSRCDIR}/external/cddl/osnet/dist/lib/libzpool/common
 COPTS.zfs.c+=	-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
 COPTS.zfs.c+=	-I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common/fs/zfs