diff --git a/sys/arm64/include/debug_monitor.h b/sys/arm64/include/debug_monitor.h
--- a/sys/arm64/include/debug_monitor.h
+++ b/sys/arm64/include/debug_monitor.h
@@ -31,6 +31,8 @@
 #ifndef _MACHINE_DEBUG_MONITOR_H_
 #define	_MACHINE_DEBUG_MONITOR_H_
 
+#include <sys/types.h>
+
 #define	DBG_BRP_MAX	16
 #define	DBG_WRP_MAX	16
 
diff --git a/sys/arm64/include/vfp.h b/sys/arm64/include/vfp.h
--- a/sys/arm64/include/vfp.h
+++ b/sys/arm64/include/vfp.h
@@ -31,6 +31,9 @@
 #ifndef _MACHINE_VFP_H_
 #define	_MACHINE_VFP_H_
 
+#include <sys/types.h>
+#include <sys/ucontext.h>
+
 /* VFPCR */
 #define	VFPCR_AHP		(0x04000000)	/* alt. half-precision: */
 #define	VFPCR_DN		(0x02000000)	/* default NaN enable */
diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h
--- a/sys/compat/freebsd32/freebsd32.h
+++ b/sys/compat/freebsd32/freebsd32.h
@@ -32,6 +32,7 @@
 #define _COMPAT_FREEBSD32_FREEBSD32_H_
 
 #include <sys/abi_compat.h>
+#include <sys/mount.h>
 #include <sys/procfs.h>
 #include <sys/socket.h>
 #include <sys/user.h>
diff --git a/sys/sys/_lock.h b/sys/sys/_lock.h
--- a/sys/sys/_lock.h
+++ b/sys/sys/_lock.h
@@ -33,6 +33,8 @@
 #ifndef _SYS__LOCK_H_
 #define	_SYS__LOCK_H_
 
+#include <sys/types.h>
+
 struct lock_object {
 	const	char *lo_name;		/* Individual lock name. */
 	u_int	lo_flags;
diff --git a/sys/sys/_mutex.h b/sys/sys/_mutex.h
--- a/sys/sys/_mutex.h
+++ b/sys/sys/_mutex.h
@@ -33,6 +33,8 @@
 #ifndef _SYS__MUTEX_H_
 #define	_SYS__MUTEX_H_
 
+#include <sys/types.h>
+#include <sys/_lock.h>
 #include <machine/param.h>
 
 /*
diff --git a/sys/sys/priority.h b/sys/sys/priority.h
--- a/sys/sys/priority.h
+++ b/sys/sys/priority.h
@@ -36,6 +36,8 @@
 #ifndef _SYS_PRIORITY_H_
 #define _SYS_PRIORITY_H_
 
+#include <sys/types.h>
+
 /*
  * Process priority specifications.
  */
diff --git a/sys/sys/resourcevar.h b/sys/sys/resourcevar.h
--- a/sys/sys/resourcevar.h
+++ b/sys/sys/resourcevar.h
@@ -35,8 +35,10 @@
 #ifndef	_SYS_RESOURCEVAR_H_
 #define	_SYS_RESOURCEVAR_H_
 
-#include <sys/resource.h>
+#include <sys/types.h>
 #include <sys/queue.h>
+#include <sys/resource.h>
+#include <sys/time.h>
 #ifdef _KERNEL
 #include <sys/_lock.h>
 #include <sys/_mutex.h>
diff --git a/sys/sys/user.h b/sys/sys/user.h
--- a/sys/sys/user.h
+++ b/sys/sys/user.h
@@ -37,6 +37,9 @@
 #ifndef _SYS_USER_H_
 #define _SYS_USER_H_
 
+#include <sys/param.h>
+#include <sys/priority.h>
+#include <sys/syslimits.h>
 #include <machine/pcb.h>
 #ifndef _KERNEL
 /* stuff that *used* to be included by user.h, or is now needed */