Index: time.h
===================================================================
--- time.h	(revision 247452)
+++ time.h	(working copy)
@@ -109,7 +109,6 @@
 	    ((a)->frac cmp (b)->frac) :					\
 	    ((a)->sec cmp (b)->sec))
 
-typedef int64_t sbintime_t;
 #define	SBT_1S	((sbintime_t)1 << 32)
 #define	SBT_1M	(SBT_1S * 60)
 #define	SBT_1MS	(SBT_1S / 1000)
Index: types.h
===================================================================
--- types.h	(revision 247452)
+++ types.h	(working copy)
@@ -190,6 +190,11 @@
 
 typedef	__segsz_t	segsz_t;	/* segment size (in pages) */
 
+#ifndef	_SBINTIME_T_DECLARED
+typedef	__int64_t	sbintime_t;
+#define	_SBINTIME_T_DECLARED
+#endif
+
 #ifndef _SIZE_T_DECLARED
 typedef	__size_t	size_t;
 #define	_SIZE_T_DECLARED