diff --git a/stand/kshim/bsd_kernel.h b/stand/kshim/bsd_kernel.h
index d99d9ef0cecb..808b1b078db5 100644
--- a/stand/kshim/bsd_kernel.h
+++ b/stand/kshim/bsd_kernel.h
@@ -242,6 +242,8 @@ typedef signed long ssize_t;
 #define	_OFF_T_DECLARED
 typedef unsigned long off_t;
 
+typedef int64_t sbintime_t;
+
 typedef unsigned char   u_char;
 typedef unsigned short  u_short;
 typedef unsigned int    u_int;
diff --git a/sys/sys/gpio.h b/sys/sys/gpio.h
index 50b9b9dbb0e5..9ea1d6636c20 100644
--- a/sys/sys/gpio.h
+++ b/sys/sys/gpio.h
@@ -53,7 +53,7 @@
 #define __GPIO_H__
 
 #include <sys/ioccom.h>
-#ifndef _KERNEL
+#if !defined(_KERNEL) && !defined(_STANDALONE)
 #include <stdbool.h>
 #endif