Index: amd64/amd64/uma_machdep.c
===================================================================
--- amd64/amd64/uma_machdep.c
+++ amd64/amd64/uma_machdep.c
@@ -30,15 +30,10 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/malloc.h>
-#include <sys/mutex.h>
-#include <sys/systm.h>
-#include <sys/vmmeter.h>
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/vm_page.h>
-#include <vm/vm_pageout.h>
 #include <vm/vm_dumpset.h>
 #include <vm/uma.h>
 #include <vm/uma_int.h>
Index: arm64/arm64/uma_machdep.c
===================================================================
--- arm64/arm64/uma_machdep.c
+++ arm64/arm64/uma_machdep.c
@@ -28,11 +28,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/malloc.h>
-#include <sys/mutex.h>
-#include <sys/systm.h>
-#include <sys/vmmeter.h>
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/vm_page.h>
Index: mips/mips/uma_machdep.c
===================================================================
--- mips/mips/uma_machdep.c
+++ mips/mips/uma_machdep.c
@@ -30,11 +30,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/malloc.h>
-#include <sys/mutex.h>
-#include <sys/systm.h>
-#include <sys/vmmeter.h>
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/vm_page.h>
@@ -42,7 +38,6 @@
 #include <vm/vm_dumpset.h>
 #include <vm/uma.h>
 #include <vm/uma_int.h>
-#include <machine/md_var.h>
 
 void *
 uma_small_alloc(uma_zone_t zone, vm_size_t bytes, int domain, u_int8_t *flags,
Index: powerpc/powerpc/uma_machdep.c
===================================================================
--- powerpc/powerpc/uma_machdep.c
+++ powerpc/powerpc/uma_machdep.c
@@ -28,22 +28,15 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
+#include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/mutex.h>
-#include <sys/systm.h>
 #include <sys/sysctl.h>
-#include <sys/vmmeter.h>
 #include <vm/vm.h>
 #include <vm/vm_param.h>
+#include <vm/pmap.h>
 #include <vm/vm_page.h>
-#include <vm/vm_kern.h>
-#include <vm/vm_pageout.h>
-#include <vm/vm_extern.h>
 #include <vm/vm_dumpset.h>
 #include <vm/uma.h>
-#include <vm/uma.h>
 #include <vm/uma_int.h>
 #include <machine/md_var.h>
 
Index: riscv/riscv/uma_machdep.c
===================================================================
--- riscv/riscv/uma_machdep.c
+++ riscv/riscv/uma_machdep.c
@@ -28,19 +28,13 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/lock.h>
 #include <sys/malloc.h>
-#include <sys/mutex.h>
-#include <sys/systm.h>
-#include <sys/vmmeter.h>
 #include <vm/vm.h>
 #include <vm/vm_param.h>
 #include <vm/vm_page.h>
-#include <vm/vm_pageout.h>
 #include <vm/vm_dumpset.h>
 #include <vm/uma.h>
 #include <vm/uma_int.h>
-#include <machine/md_var.h>
 
 void *
 uma_small_alloc(uma_zone_t zone, vm_size_t bytes, int domain, u_int8_t *flags,