diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index 4c5d828027a5..5b7cde10c670 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -37,6 +37,7 @@
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/mtio.h>
+#include <sys/queue.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/extattr.h>
diff --git a/sys/amd64/sgx/sgx_linux.c b/sys/amd64/sgx/sgx_linux.c
index 55c5f7386d0c..6ecef9207a38 100644
--- a/sys/amd64/sgx/sgx_linux.c
+++ b/sys/amd64/sgx/sgx_linux.c
@@ -34,6 +34,7 @@
 #include <sys/capsicum.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/file.h>
 #include <sys/proc.h>
diff --git a/sys/compat/linux/linux_mmap.c b/sys/compat/linux/linux_mmap.c
index 223ff1733acb..a8e790a29da4 100644
--- a/sys/compat/linux/linux_mmap.c
+++ b/sys/compat/linux/linux_mmap.c
@@ -33,6 +33,7 @@
 #include <sys/file.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mman.h>
 #include <sys/proc.h>
 #include <sys/resourcevar.h>
diff --git a/sys/compat/linux/linux_util.h b/sys/compat/linux/linux_util.h
index e651eb391452..58f7c533d647 100644
--- a/sys/compat/linux/linux_util.h
+++ b/sys/compat/linux/linux_util.h
@@ -35,6 +35,7 @@
 #ifndef	_LINUX_UTIL_H_
 #define	_LINUX_UTIL_H_
 
+#include <sys/malloc.h>
 #include <sys/uio.h>
 
 extern int linux_debug;
diff --git a/sys/dev/nvme/nvme_test.c b/sys/dev/nvme/nvme_test.c
index 188ad4f86f85..d19376d9ef78 100644
--- a/sys/dev/nvme/nvme_test.c
+++ b/sys/dev/nvme/nvme_test.c
@@ -31,6 +31,7 @@
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/kthread.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/proc.h>
 #include <sys/syscallsubr.h>
diff --git a/sys/fs/autofs/autofs.h b/sys/fs/autofs/autofs.h
index 470aeb86de8b..704da7350541 100644
--- a/sys/fs/autofs/autofs.h
+++ b/sys/fs/autofs/autofs.h
@@ -31,6 +31,8 @@
 #ifndef AUTOFS_H
 #define	AUTOFS_H
 
+#include <vm/uma.h>
+
 #define VFSTOAUTOFS(mp)    ((struct autofs_mount *)((mp)->mnt_data))
 
 MALLOC_DECLARE(M_AUTOFS);
diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c
index c8961a819e7b..9bdcc4575511 100644
--- a/sys/fs/tmpfs/tmpfs_subr.c
+++ b/sys/fs/tmpfs/tmpfs_subr.c
@@ -64,6 +64,7 @@
 #include <vm/vm_pager.h>
 #include <vm/vm_extern.h>
 #include <vm/swap_pager.h>
+#include <vm/uma.h>
 
 #include <fs/tmpfs/tmpfs.h>
 #include <fs/tmpfs/tmpfs_fifoops.h>
diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c
index c07157db9c8d..0cb0f566a839 100644
--- a/sys/kern/kern_environment.c
+++ b/sys/kern/kern_environment.c
@@ -54,6 +54,8 @@
 
 #include <security/mac/mac_framework.h>
 
+#include <vm/uma.h>
+
 static char *_getenv_dynamic_locked(const char *name, int *idx);
 static char *_getenv_dynamic(const char *name, int *idx);
 
diff --git a/sys/kern/kern_membarrier.c b/sys/kern/kern_membarrier.c
index 9d101b955804..f0660bd7360e 100644
--- a/sys/kern/kern_membarrier.c
+++ b/sys/kern/kern_membarrier.c
@@ -30,6 +30,7 @@
 #include <sys/systm.h>
 #include <sys/cpuset.h>
 #include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/membarrier.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
diff --git a/sys/kern/kern_procctl.c b/sys/kern/kern_procctl.c
index 150a8612c2f8..2c8c638a2956 100644
--- a/sys/kern/kern_procctl.c
+++ b/sys/kern/kern_procctl.c
@@ -34,6 +34,7 @@
 #include <sys/systm.h>
 #include <sys/capsicum.h>
 #include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mman.h>
 #include <sys/mutex.h>
 #include <sys/priv.h>
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index be8e0b14add2..40cfa236a07d 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -72,6 +72,8 @@
 #include <sys/syscallsubr.h>
 #include <sys/sysctl.h>
 
+#include <vm/uma.h>
+
 #ifdef REGRESSION
 FEATURE(regression,
     "Kernel support for interfaces necessary for regression testing (SECURITY RISK!)");
diff --git a/sys/kern/kern_rctl.c b/sys/kern/kern_rctl.c
index 2e5051de05bc..4232c71f86fb 100644
--- a/sys/kern/kern_rctl.c
+++ b/sys/kern/kern_rctl.c
@@ -39,6 +39,7 @@
 #include <sys/kernel.h>
 #include <sys/limits.h>
 #include <sys/loginclass.h>
+#include <sys/malloc.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/racct.h>
@@ -2205,6 +2206,7 @@ rctl_init(void)
 #else /* !RCTL */
 
 #include <sys/types.h>
+#include <sys/errno.h>
 #include <sys/sysproto.h>
 
 int
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index 885804bacf71..c94ae49b6923 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -58,6 +58,7 @@
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
+#include <vm/uma.h>
 
 #define MAX_CLOCKS 	(CLOCK_MONOTONIC+1)
 #define CPUCLOCK_BIT		0x80000000
diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c
index 092fcade9d19..e6d5e2de5e88 100644
--- a/sys/kern/kern_umtx.c
+++ b/sys/kern/kern_umtx.c
@@ -67,6 +67,7 @@
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/pmap.h>
+#include <vm/uma.h>
 #include <vm/vm_map.h>
 #include <vm/vm_object.h>
 
diff --git a/sys/kern/kern_uuid.c b/sys/kern/kern_uuid.c
index 0e7e894664fe..fb27f7bbf736 100644
--- a/sys/kern/kern_uuid.c
+++ b/sys/kern/kern_uuid.c
@@ -30,6 +30,7 @@
 #include <sys/endian.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/sbuf.h>
 #include <sys/socket.h>
diff --git a/sys/sys/namei.h b/sys/sys/namei.h
index cb69fc96b112..08395c6d699f 100644
--- a/sys/sys/namei.h
+++ b/sys/sys/namei.h
@@ -38,6 +38,8 @@
 #include <sys/_seqc.h>
 #include <sys/_uio.h>
 
+#include <vm/uma.h>
+
 enum nameiop { LOOKUP, CREATE, DELETE, RENAME };
 
 struct componentname {