From b5e81ea6b081ac5ec8d75d895daff4e174b5ea84 Mon Sep 17 00:00:00 2001
From: Allan Jude <allanjude@FreeBSD.org>
Date: Sat, 26 Dec 2015 19:48:36 +0000
Subject: [PATCH] Fix includes in usr.sbin/fstyp/zfs.c

Approved by:	bapt (mentor)
MFC after:	1 week
Sponsored by:	ScaleEngine Inc.
Differential Revision:	https://reviews.freebsd.org/D4710
---
 usr.sbin/fstyp/Makefile | 4 ++--
 usr.sbin/fstyp/zfs.c    | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/usr.sbin/fstyp/Makefile b/usr.sbin/fstyp/Makefile
index e82dd040c229..5eba12bcabf7 100644
--- a/usr.sbin/fstyp/Makefile
+++ b/usr.sbin/fstyp/Makefile
@@ -19,6 +19,8 @@ WARNS?=	2
 SUBDIR+=	tests
 .endif
 
+CFLAGS+=-I${.CURDIR}/../../sys
+
 .if ${MK_ZFS} != "no"
 IGNORE_PRAGMA=  YES
 
@@ -34,8 +36,6 @@ CFLAGS+= -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common/sys
 CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/head
 .endif
 
-CFLAGS+=-I${.CURDIR}/../../sys
-
 LIBADD=	geom md
 
 .if ${MK_ZFS} != "no"
diff --git a/usr.sbin/fstyp/zfs.c b/usr.sbin/fstyp/zfs.c
index 1c9ca4d52f7d..c37a5dbb72b7 100644
--- a/usr.sbin/fstyp/zfs.c
+++ b/usr.sbin/fstyp/zfs.c
@@ -29,6 +29,9 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
+#include <cddl/compat/opensolaris/sys/types.h>
+#include <sys/time.h>
+#include <cddl/compat/opensolaris/sys/time.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>