diff --git a/include/protocols/rwhod.h b/include/protocols/rwhod.h
index f63bf76b489..49191a2cb70 100644
--- a/include/protocols/rwhod.h
+++ b/include/protocols/rwhod.h
@@ -34,13 +34,15 @@
 #ifndef _PROTOCOLS_RWHOD_H_
 #define	_PROTOCOLS_RWHOD_H_
 
+#include <sys/_types.h>
+
 /*
  * rwho protocol packet format.
  */
 struct	outmp {
 	char	out_line[8];		/* tty name */
 	char	out_name[8];		/* user id */
-	int32_t	out_time;		/* time on */
+	__int32_t out_time;		/* time on */
 };
 
 struct	whod {
diff --git a/sys/sys/timex.h b/sys/sys/timex.h
index cf877ffc47d..d9d13a81275 100644
--- a/sys/sys/timex.h
+++ b/sys/sys/timex.h
@@ -97,6 +97,9 @@
 #define _SYS_TIMEX_H_ 1
 #define NTP_API		4	/* NTP API version */
 
+#ifdef __FreeBSD__
+#include <sys/_timespec.h>
+#endif /* __FreeBSD__ */
 #ifndef MSDOS			/* Microsoft specific */
 #include <sys/syscall.h>
 #endif /* MSDOS */