diff -r d566a2e855aa sys/arch/aarch64/include/asan.h
--- a/sys/arch/aarch64/include/asan.h	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/arch/aarch64/include/asan.h	Fri Sep 04 02:38:29 2020 +0000
@@ -32,6 +32,8 @@
 #include <sys/atomic.h>
 #include <sys/ksyms.h>
 
+#include <uvm/uvm.h>
+
 #include <aarch64/pmap.h>
 #include <aarch64/vmparam.h>
 #include <aarch64/cpufunc.h>
diff -r d566a2e855aa sys/arch/amd64/include/asan.h
--- a/sys/arch/amd64/include/asan.h	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/arch/amd64/include/asan.h	Fri Sep 04 02:38:29 2020 +0000
@@ -31,6 +31,8 @@
 
 #include <sys/ksyms.h>
 
+#include <uvm/uvm.h>
+
 #include <amd64/pmap.h>
 #include <amd64/vmparam.h>
 
diff -r d566a2e855aa sys/arch/arm/include/asan.h
--- a/sys/arch/arm/include/asan.h	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/arch/arm/include/asan.h	Fri Sep 04 02:38:29 2020 +0000
@@ -32,6 +32,8 @@
 #include <sys/atomic.h>
 #include <sys/ksyms.h>
 
+#include <uvm/uvm.h>
+
 #include <arm/vmparam.h>
 #include <arm/arm32/machdep.h>
 #include <arm/arm32/pmap.h>
diff -r d566a2e855aa sys/compat/common/uvm_13.c
--- a/sys/compat/common/uvm_13.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/compat/common/uvm_13.c	Fri Sep 04 02:38:29 2020 +0000
@@ -49,7 +49,7 @@
 #include <sys/systm.h>
 #include <sys/syscallargs.h>
 #include <sys/swap.h>
-#include <uvm/uvm.h>
+
 #include <uvm/uvm_swap.h>
 
 #include <compat/sys/uvm.h>
diff -r d566a2e855aa sys/compat/common/uvm_50.c
--- a/sys/compat/common/uvm_50.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/compat/common/uvm_50.c	Fri Sep 04 02:38:29 2020 +0000
@@ -49,7 +49,8 @@
 #include <sys/systm.h>
 #include <sys/syscallargs.h>
 #include <sys/swap.h>
-#include <uvm/uvm.h>
+
+#include <uvm/uvm_swap.h>
 
 #include <compat/sys/uvm.h>
 
diff -r d566a2e855aa sys/compat/linux/arch/amd64/linux_exec_machdep.c
--- a/sys/compat/linux/arch/amd64/linux_exec_machdep.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/compat/linux/arch/amd64/linux_exec_machdep.c	Fri Sep 04 02:38:29 2020 +0000
@@ -55,8 +55,6 @@
 #include <machine/vmparam.h>
 #include <sys/syscallargs.h>
 
-#include <uvm/uvm.h>
-
 #include <compat/linux/common/linux_types.h>
 #include <compat/linux/common/linux_signal.h>
 #include <compat/linux/common/linux_machdep.h>
diff -r d566a2e855aa sys/compat/linux/arch/i386/linux_exec_machdep.c
--- a/sys/compat/linux/arch/i386/linux_exec_machdep.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/compat/linux/arch/i386/linux_exec_machdep.c	Fri Sep 04 02:38:29 2020 +0000
@@ -45,8 +45,6 @@
 #include <sys/cpu.h>
 #include <machine/vmparam.h>
 
-#include <uvm/uvm.h>
-
 #include <sys/syscallargs.h>
 
 #ifndef DEBUG_LINUX
diff -r d566a2e855aa sys/compat/netbsd32/netbsd32_kern_proc.c
--- a/sys/compat/netbsd32/netbsd32_kern_proc.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/compat/netbsd32/netbsd32_kern_proc.c	Fri Sep 04 02:38:29 2020 +0000
@@ -102,9 +102,6 @@
 #include <sys/cpu.h>
 #include <sys/compat_stub.h>
 
-#include <uvm/uvm_extern.h>
-#include <uvm/uvm.h>
-
 #include <compat/netbsd32/netbsd32.h>
 #include <compat/netbsd32/netbsd32_kern_proc.h>
 
diff -r d566a2e855aa sys/dev/bus_dma/bus_dmamem_common.c
--- a/sys/dev/bus_dma/bus_dmamem_common.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/dev/bus_dma/bus_dmamem_common.c	Fri Sep 04 02:38:29 2020 +0000
@@ -39,7 +39,7 @@
 #include <sys/proc.h>
 #include <sys/bus.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <dev/bus_dma/bus_dmamem_common.h>
 
diff -r d566a2e855aa sys/dev/ic/ssdfb.c
--- a/sys/dev/ic/ssdfb.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/dev/ic/ssdfb.c	Fri Sep 04 02:38:29 2020 +0000
@@ -37,12 +37,13 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
-#include <uvm/uvm.h>
-#include <uvm/uvm_page.h>
-#include <uvm/uvm_device.h>
 #include <sys/condvar.h>
 #include <sys/kmem.h>
 #include <sys/kthread.h>
+
+#include <uvm/uvm_device.h>
+#include <uvm/uvm_extern.h>
+
 #include <dev/wscons/wsdisplayvar.h>
 #include <dev/rasops/rasops.h>
 #include <dev/ic/ssdfbvar.h>
diff -r d566a2e855aa sys/dev/ic/sti.c
--- a/sys/dev/ic/sti.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/dev/ic/sti.c	Fri Sep 04 02:38:29 2020 +0000
@@ -44,7 +44,7 @@
 #include <sys/device.h>
 #include <sys/malloc.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <sys/bus.h>
 
diff -r d566a2e855aa sys/dev/kloader.c
--- a/sys/dev/kloader.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/dev/kloader.c	Fri Sep 04 02:38:29 2020 +0000
@@ -41,7 +41,7 @@
 #define	ELFSIZE	32
 #include <sys/exec_elf.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/kloader.h>
 
diff -r d566a2e855aa sys/dev/marvell/if_gfe.c
--- a/sys/dev/marvell/if_gfe.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/dev/marvell/if_gfe.c	Fri Sep 04 02:38:29 2020 +0000
@@ -56,7 +56,6 @@
 #include <sys/mutex.h>
 #include <sys/socket.h>
 
-#include <uvm/uvm.h>
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_ether.h>
diff -r d566a2e855aa sys/dev/nvmm/nvmm.c
--- a/sys/dev/nvmm/nvmm.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/dev/nvmm/nvmm.c	Fri Sep 04 02:38:29 2020 +0000
@@ -47,7 +47,8 @@
 #include <sys/filedesc.h>
 #include <sys/device.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_aobj.h>
+#include <uvm/uvm_extern.h>
 #include <uvm/uvm_page.h>
 
 #include "ioconf.h"
diff -r d566a2e855aa sys/dev/nvmm/x86/nvmm_x86.c
--- a/sys/dev/nvmm/x86/nvmm_x86.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/dev/nvmm/x86/nvmm_x86.c	Fri Sep 04 02:38:29 2020 +0000
@@ -37,9 +37,6 @@
 #include <sys/kernel.h>
 #include <sys/cpu.h>
 
-#include <uvm/uvm.h>
-#include <uvm/uvm_page.h>
-
 #include <x86/cputypes.h>
 #include <x86/specialreg.h>
 #include <x86/pmap.h>
diff -r d566a2e855aa sys/dev/nvmm/x86/nvmm_x86_svm.c
--- a/sys/dev/nvmm/x86/nvmm_x86_svm.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/dev/nvmm/x86/nvmm_x86_svm.c	Fri Sep 04 02:38:29 2020 +0000
@@ -40,8 +40,7 @@
 #include <sys/xcall.h>
 #include <sys/mman.h>
 
-#include <uvm/uvm.h>
-#include <uvm/uvm_page.h>
+#include <uvm/uvm_extern.h>
 
 #include <x86/cputypes.h>
 #include <x86/specialreg.h>
diff -r d566a2e855aa sys/dev/nvmm/x86/nvmm_x86_vmx.c
--- a/sys/dev/nvmm/x86/nvmm_x86_vmx.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/dev/nvmm/x86/nvmm_x86_vmx.c	Fri Sep 04 02:38:29 2020 +0000
@@ -41,8 +41,7 @@
 #include <sys/mman.h>
 #include <sys/bitops.h>
 
-#include <uvm/uvm.h>
-#include <uvm/uvm_page.h>
+#include <uvm/uvm_extern.h>
 
 #include <x86/cputypes.h>
 #include <x86/specialreg.h>
diff -r d566a2e855aa sys/dev/sbus/genfb_sbus.c
--- a/sys/dev/sbus/genfb_sbus.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/dev/sbus/genfb_sbus.c	Fri Sep 04 02:38:29 2020 +0000
@@ -38,8 +38,6 @@
 #include <sys/ioctl.h>
 #include <sys/conf.h>
 
-#include <uvm/uvm.h>
-
 #include <sys/bus.h>
 #include <machine/autoconf.h>
 #include <machine/pmap.h>
diff -r d566a2e855aa sys/dev/usb/udl.c
--- a/sys/dev/usb/udl.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/dev/usb/udl.c	Fri Sep 04 02:38:29 2020 +0000
@@ -67,11 +67,12 @@
 #include <sys/kmem.h>
 #include <sys/kthread.h>
 #include <sys/condvar.h>
-#include <uvm/uvm.h>
 
 #include <sys/bus.h>
 #include <sys/endian.h>
 
+#include <uvm/uvm_extern.h>
+
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdivar.h>
diff -r d566a2e855aa sys/external/bsd/sljit/dist/sljit_src/sljitExecAllocator.c
--- a/sys/external/bsd/sljit/dist/sljit_src/sljitExecAllocator.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/external/bsd/sljit/dist/sljit_src/sljitExecAllocator.c	Fri Sep 04 02:38:29 2020 +0000
@@ -99,7 +99,7 @@ static SLJIT_INLINE void free_chunk(void
 #ifdef _KERNEL
 #include <sys/param.h>
 #include <sys/module.h> /* for module_map */
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 #else
 #include <sys/mman.h>
 #endif
diff -r d566a2e855aa sys/external/bsd/sljit/dist/sljit_src/sljitUtils.c
--- a/sys/external/bsd/sljit/dist/sljit_src/sljitUtils.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/external/bsd/sljit/dist/sljit_src/sljitUtils.c	Fri Sep 04 02:38:29 2020 +0000
@@ -192,7 +192,7 @@ SLJIT_API_FUNC_ATTRIBUTE void SLJIT_CALL
 
 #ifdef _KERNEL
 #include <sys/param.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 #elif defined(_WIN32)
 #include "windows.h"
 #else
diff -r d566a2e855aa sys/fs/tmpfs/tmpfs_subr.c
--- a/sys/fs/tmpfs/tmpfs_subr.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/fs/tmpfs/tmpfs_subr.c	Fri Sep 04 02:38:29 2020 +0000
@@ -89,7 +89,9 @@
 #include <sys/kauth.h>
 #include <sys/atomic.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_aobj.h>
+#include <uvm/uvm_extern.h>
+#include <uvm/uvm_object.h>
 
 #include <miscfs/specfs/specdev.h>
 #include <miscfs/genfs/genfs.h>
diff -r d566a2e855aa sys/fs/tmpfs/tmpfs_vnops.c
--- a/sys/fs/tmpfs/tmpfs_vnops.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/fs/tmpfs/tmpfs_vnops.c	Fri Sep 04 02:38:29 2020 +0000
@@ -51,7 +51,7 @@
 #include <sys/kauth.h>
 #include <sys/atomic.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_object.h>
 
 #include <miscfs/fifofs/fifo.h>
 #include <miscfs/genfs/genfs.h>
diff -r d566a2e855aa sys/kern/kern_idle.c
--- a/sys/kern/kern_idle.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/kern/kern_idle.c	Fri Sep 04 02:38:29 2020 +0000
@@ -40,7 +40,6 @@
 #include <sys/atomic.h>
 
 #include <uvm/uvm.h>	/* uvm_idle */
-#include <uvm/uvm_extern.h>
 
 void
 idle_loop(void *dummy)
diff -r d566a2e855aa sys/kern/kern_proc.c
--- a/sys/kern/kern_proc.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/kern/kern_proc.c	Fri Sep 04 02:38:29 2020 +0000
@@ -110,7 +110,6 @@
 #include <sys/pserialize.h>
 
 #include <uvm/uvm_extern.h>
-#include <uvm/uvm.h>
 
 /*
  * Process lists.
diff -r d566a2e855aa sys/kern/subr_asan.c
--- a/sys/kern/subr_asan.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/kern/subr_asan.c	Fri Sep 04 02:38:29 2020 +0000
@@ -41,7 +41,7 @@
 #include <sys/types.h>
 #include <sys/asan.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #ifdef KASAN_PANIC
 #define REPORT panic
diff -r d566a2e855aa sys/kern/subr_msan.c
--- a/sys/kern/subr_msan.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/kern/subr_msan.c	Fri Sep 04 02:38:29 2020 +0000
@@ -46,8 +46,6 @@
 #include <sys/cpu.h>
 #include <sys/msan.h>
 
-#include <uvm/uvm.h>
-
 static void kmsan_printf(const char *, ...);
 
 void kmsan_init_arg(size_t);
diff -r d566a2e855aa sys/miscfs/genfs/genfs_vnops.c
--- a/sys/miscfs/genfs/genfs_vnops.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/miscfs/genfs/genfs_vnops.c	Fri Sep 04 02:38:29 2020 +0000
@@ -80,9 +80,6 @@
 #include <miscfs/genfs/genfs_node.h>
 #include <miscfs/specfs/specdev.h>
 
-#include <uvm/uvm.h>
-#include <uvm/uvm_pager.h>
-
 static void filt_genfsdetach(struct knote *);
 static int filt_genfsread(struct knote *, long);
 static int filt_genfsvnode(struct knote *, long);
diff -r d566a2e855aa sys/miscfs/procfs/procfs_linux.c
--- a/sys/miscfs/procfs/procfs_linux.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/miscfs/procfs/procfs_linux.c	Fri Sep 04 02:38:29 2020 +0000
@@ -64,8 +64,8 @@
 #include <compat/linux/common/linux_exec.h>
 #include <compat/linux32/common/linux32_sysctl.h>
 
+#include <uvm/uvm.h>
 #include <uvm/uvm_extern.h>
-#include <uvm/uvm.h>
 
 extern struct devsw_conv *devsw_conv;
 extern int max_devsw_convs;
diff -r d566a2e855aa sys/modules/examples/mapper/mapper.c
--- a/sys/modules/examples/mapper/mapper.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/modules/examples/mapper/mapper.c	Fri Sep 04 02:38:29 2020 +0000
@@ -37,8 +37,6 @@
 #include <sys/module.h>
 #include <sys/systm.h>
 
-#include <uvm/uvm.h>
-
 /*
  * Creating a device /dev/mapper for demonstration.
  * To use this device you need to do:
diff -r d566a2e855aa sys/nfs/nfs_bio.c
--- a/sys/nfs/nfs_bio.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/nfs/nfs_bio.c	Fri Sep 04 02:38:29 2020 +0000
@@ -55,8 +55,8 @@
 #include <sys/dirent.h>
 #include <sys/kauth.h>
 
+#include <uvm/uvm.h>
 #include <uvm/uvm_extern.h>
-#include <uvm/uvm.h>
 
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
diff -r d566a2e855aa sys/nfs/nfs_kq.c
--- a/sys/nfs/nfs_kq.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/nfs/nfs_kq.c	Fri Sep 04 02:38:29 2020 +0000
@@ -45,9 +45,6 @@
 #include <sys/file.h>
 #include <sys/kthread.h>
 
-#include <uvm/uvm_extern.h>
-#include <uvm/uvm.h>
-
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
 #include <nfs/nfs.h>
diff -r d566a2e855aa sys/nfs/nfs_serv.c
--- a/sys/nfs/nfs_serv.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/nfs/nfs_serv.c	Fri Sep 04 02:38:29 2020 +0000
@@ -78,7 +78,9 @@
 #include <sys/syscallargs.h>
 #include <sys/syscallvar.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
+#include <uvm/uvm_loan.h>
+#include <uvm/uvm_page.h>
 
 #include <nfs/nfsproto.h>
 #include <nfs/rpcv2.h>
diff -r d566a2e855aa sys/nfs/nfs_subs.c
--- a/sys/nfs/nfs_subs.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/nfs/nfs_subs.c	Fri Sep 04 02:38:29 2020 +0000
@@ -100,7 +100,7 @@
 #include <sys/atomic.h>
 #include <sys/cprng.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_page.h>
 #include <uvm/uvm_page_array.h>
 
 #include <nfs/rpcv2.h>
diff -r d566a2e855aa sys/nfs/nfs_vnops.c
--- a/sys/nfs/nfs_vnops.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/nfs/nfs_vnops.c	Fri Sep 04 02:38:29 2020 +0000
@@ -70,8 +70,11 @@
 #include <sys/kauth.h>
 #include <sys/cprng.h>
 
+#ifdef UVMHIST
+#include <uvm/uvm.h>
+#endif
 #include <uvm/uvm_extern.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_stat.h>
 
 #include <miscfs/fifofs/fifo.h>
 #include <miscfs/genfs/genfs.h>
diff -r d566a2e855aa sys/rump/dev/lib/libpci/rumpdev_bus_dma.c
--- a/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c	Fri Sep 04 02:38:29 2020 +0000
@@ -80,8 +80,6 @@
 #include <sys/bus.h>
 #include <sys/intr.h>
 
-#include <uvm/uvm.h>
-
 #include "pci_user.h"
 
 #define	EIEIO	membar_sync()
diff -r d566a2e855aa sys/ufs/chfs/chfs_pool.c
--- a/sys/ufs/chfs/chfs_pool.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/ufs/chfs/chfs_pool.c	Fri Sep 04 02:38:29 2020 +0000
@@ -40,8 +40,6 @@
 #include <sys/pool.h>
 #include <sys/atomic.h>
 
-#include <uvm/uvm.h>
-
 #include "chfs.h"
 
 /* --------------------------------------------------------------------- */
diff -r d566a2e855aa sys/ufs/chfs/chfs_subr.c
--- a/sys/ufs/chfs/chfs_subr.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/ufs/chfs/chfs_subr.c	Fri Sep 04 02:38:29 2020 +0000
@@ -49,7 +49,7 @@
 #include <sys/proc.h>
 #include <sys/atomic.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <miscfs/specfs/specdev.h>
 #include <miscfs/genfs/genfs.h>
diff -r d566a2e855aa sys/ufs/chfs/chfs_vfsops.c
--- a/sys/ufs/chfs/chfs_vfsops.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/ufs/chfs/chfs_vfsops.c	Fri Sep 04 02:38:29 2020 +0000
@@ -52,8 +52,8 @@
 #include <sys/lockdebug.h>
 #include <sys/ktrace.h>
 
-#include <uvm/uvm.h>
-#include <uvm/uvm_pager.h>
+#include <uvm/uvm_extern.h>
+
 #include <ufs/ufs/dir.h>
 #include <ufs/ufs/ufs_extern.h>
 #include <miscfs/genfs/genfs.h>
diff -r d566a2e855aa sys/ufs/chfs/chfs_vnops.c
--- a/sys/ufs/chfs/chfs_vnops.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/ufs/chfs/chfs_vnops.c	Fri Sep 04 02:38:29 2020 +0000
@@ -38,7 +38,7 @@
 #include <miscfs/genfs/genfs.h>
 #include <ufs/ufs/dir.h>
 #include <ufs/ufs/ufs_extern.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 #include <sys/namei.h>
 #include <sys/stat.h>
 #include <sys/fcntl.h>
diff -r d566a2e855aa sys/ufs/ext2fs/ext2fs_balloc.c
--- a/sys/ufs/ext2fs/ext2fs_balloc.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/ufs/ext2fs/ext2fs_balloc.c	Fri Sep 04 02:38:29 2020 +0000
@@ -75,7 +75,10 @@
 #include <sys/mount.h>
 #include <sys/kauth.h>
 
+#ifdef UVMHIST
 #include <uvm/uvm.h>
+#endif
+#include <uvm/uvm_stat.h>
 
 #include <ufs/ufs/inode.h>
 #include <ufs/ufs/ufs_extern.h>
diff -r d566a2e855aa sys/ufs/ffs/ffs_alloc.c
--- a/sys/ufs/ffs/ffs_alloc.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/ufs/ffs/ffs_alloc.c	Fri Sep 04 02:38:29 2020 +0000
@@ -103,7 +103,8 @@
 #include <ufs/ffs/ffs_extern.h>
 
 #ifdef UVM_PAGE_TRKOWN
-#include <uvm/uvm.h>
+#include <uvm/uvm_object.h>
+#include <uvm/uvm_page.h>
 #endif
 
 static daddr_t ffs_alloccg(struct inode *, int, daddr_t, int, int, int);
diff -r d566a2e855aa sys/ufs/ffs/ffs_balloc.c
--- a/sys/ufs/ffs/ffs_balloc.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/ufs/ffs/ffs_balloc.c	Fri Sep 04 02:38:29 2020 +0000
@@ -45,6 +45,7 @@
 
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
+#include "opt_uvmhist.h"
 #endif
 
 #include <sys/param.h>
@@ -65,7 +66,11 @@
 #include <ufs/ffs/fs.h>
 #include <ufs/ffs/ffs_extern.h>
 
+#ifdef UVMHIST
 #include <uvm/uvm.h>
+#endif
+#include <uvm/uvm_extern.h>
+#include <uvm/uvm_stat.h>
 
 static int ffs_balloc_ufs1(struct vnode *, off_t, int, kauth_cred_t, int,
     struct buf **);
diff -r d566a2e855aa sys/ufs/ffs/ffs_extattr.c
--- a/sys/ufs/ffs/ffs_extattr.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/ufs/ffs/ffs_extattr.c	Fri Sep 04 02:38:29 2020 +0000
@@ -105,8 +105,6 @@
 #include <ufs/ffs/fs.h>
 #include <ufs/ffs/ffs_extern.h>
 
-#include <uvm/uvm.h>
-
 #define ALIGNED_TO(ptr, s)  \
     (((uintptr_t)(ptr) & (_Alignof(s) - 1)) == 0)
 #define uoff_t uintmax_t
diff -r d566a2e855aa sys/ufs/ffs/ffs_vnops.c
--- a/sys/ufs/ffs/ffs_vnops.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/ufs/ffs/ffs_vnops.c	Fri Sep 04 02:38:29 2020 +0000
@@ -98,8 +98,6 @@
 #include <ufs/ffs/fs.h>
 #include <ufs/ffs/ffs_extern.h>
 
-#include <uvm/uvm.h>
-
 /* Global vfs data structures for ufs. */
 int (**ffs_vnodeop_p)(void *);
 const struct vnodeopv_entry_desc ffs_vnodeop_entries[] = {
diff -r d566a2e855aa sys/ufs/lfs/lfs_balloc.c
--- a/sys/ufs/lfs/lfs_balloc.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/ufs/lfs/lfs_balloc.c	Fri Sep 04 02:38:29 2020 +0000
@@ -89,7 +89,7 @@
 #include <ufs/lfs/lfs_extern.h>
 #include <ufs/lfs/lfs_kernel.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 static int lfs_fragextend(struct vnode *, int, int, daddr_t, struct buf **,
 			  kauth_cred_t);
diff -r d566a2e855aa sys/ufs/lfs/lfs_bio.c
--- a/sys/ufs/lfs/lfs_bio.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/ufs/lfs/lfs_bio.c	Fri Sep 04 02:38:29 2020 +0000
@@ -81,7 +81,7 @@
 #include <ufs/lfs/lfs_extern.h>
 #include <ufs/lfs/lfs_kernel.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 /*
  * LFS block write function.
diff -r d566a2e855aa sys/ufs/lfs/lfs_pages.c
--- a/sys/ufs/lfs/lfs_pages.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/ufs/lfs/lfs_pages.c	Fri Sep 04 02:38:29 2020 +0000
@@ -94,9 +94,10 @@
 #include <ufs/lfs/ulfs_extern.h>
 
 #include <uvm/uvm.h>
+#include <uvm/uvm_page.h>
+#include <uvm/uvm_pager.h>
 #include <uvm/uvm_pmap.h>
 #include <uvm/uvm_stat.h>
-#include <uvm/uvm_pager.h>
 
 #include <ufs/lfs/lfs.h>
 #include <ufs/lfs/lfs_accessors.h>
diff -r d566a2e855aa sys/ufs/lfs/lfs_rename.c
--- a/sys/ufs/lfs/lfs_rename.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/ufs/lfs/lfs_rename.c	Fri Sep 04 02:38:29 2020 +0000
@@ -109,11 +109,6 @@
 #include <sys/kauth.h>
 #include <sys/syslog.h>
 
-#include <uvm/uvm.h>
-#include <uvm/uvm_pmap.h>
-#include <uvm/uvm_stat.h>
-#include <uvm/uvm_pager.h>
-
 #include <miscfs/fifofs/fifo.h>
 #include <miscfs/genfs/genfs.h>
 #include <miscfs/specfs/specdev.h>
diff -r d566a2e855aa sys/ufs/lfs/lfs_rfw.c
--- a/sys/ufs/lfs/lfs_rfw.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/ufs/lfs/lfs_rfw.c	Fri Sep 04 02:38:29 2020 +0000
@@ -54,7 +54,6 @@
 #include <sys/pool.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
-#include <uvm/uvm_extern.h>
 #include <sys/sysctl.h>
 #include <sys/conf.h>
 #include <sys/kauth.h>
@@ -66,10 +65,7 @@
 #include <ufs/lfs/ulfsmount.h>
 #include <ufs/lfs/ulfs_extern.h>
 
-#include <uvm/uvm.h>
-#include <uvm/uvm_stat.h>
-#include <uvm/uvm_pager.h>
-#include <uvm/uvm_pdaemon.h>
+#include <uvm/uvm_extern.h>
 
 #include <ufs/lfs/lfs.h>
 #include <ufs/lfs/lfs_accessors.h>
diff -r d566a2e855aa sys/ufs/lfs/lfs_segment.c
--- a/sys/ufs/lfs/lfs_segment.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/ufs/lfs/lfs_segment.c	Fri Sep 04 02:38:29 2020 +0000
@@ -104,8 +104,8 @@
 #include <ufs/lfs/lfs_kernel.h>
 #include <ufs/lfs/lfs_extern.h>
 
-#include <uvm/uvm.h>
 #include <uvm/uvm_extern.h>
+#include <uvm/uvm_page.h>
 
 MALLOC_JUSTDEFINE(M_SEGMENT, "LFS segment", "Segment for LFS");
 
diff -r d566a2e855aa sys/ufs/lfs/lfs_subr.c
--- a/sys/ufs/lfs/lfs_subr.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/ufs/lfs/lfs_subr.c	Fri Sep 04 02:38:29 2020 +0000
@@ -78,8 +78,6 @@
 #include <ufs/lfs/lfs_kernel.h>
 #include <ufs/lfs/lfs_extern.h>
 
-#include <uvm/uvm.h>
-
 #ifdef DEBUG
 const char *lfs_res_names[LFS_NB_COUNT] = {
 	"summary",
diff -r d566a2e855aa sys/ufs/lfs/lfs_vfsops.c
--- a/sys/ufs/lfs/lfs_vfsops.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/ufs/lfs/lfs_vfsops.c	Fri Sep 04 02:38:29 2020 +0000
@@ -66,6 +66,7 @@
 #if defined(_KERNEL_OPT)
 #include "opt_lfs.h"
 #include "opt_quota.h"
+#include "opt_uvmhist.h"
 #endif
 
 #include <sys/param.h>
@@ -86,7 +87,6 @@
 #include <sys/pool.h>
 #include <sys/socket.h>
 #include <sys/syslog.h>
-#include <uvm/uvm_extern.h>
 #include <sys/sysctl.h>
 #include <sys/conf.h>
 #include <sys/kauth.h>
@@ -103,10 +103,13 @@
 #include <ufs/lfs/ulfs_bswap.h>
 #include <ufs/lfs/ulfs_extern.h>
 
+#ifdef UVMHIST
 #include <uvm/uvm.h>
+#endif
+#include <uvm/uvm_extern.h>
+#include <uvm/uvm_object.h>
+#include <uvm/uvm_page.h>
 #include <uvm/uvm_stat.h>
-#include <uvm/uvm_pager.h>
-#include <uvm/uvm_pdaemon.h>
 
 #include <ufs/lfs/lfs.h>
 #include <ufs/lfs/lfs_accessors.h>
diff -r d566a2e855aa sys/ufs/lfs/lfs_vnops.c
--- a/sys/ufs/lfs/lfs_vnops.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/ufs/lfs/lfs_vnops.c	Fri Sep 04 02:38:29 2020 +0000
@@ -157,10 +157,7 @@
 #include <ufs/lfs/ulfs_bswap.h>
 #include <ufs/lfs/ulfs_extern.h>
 
-#include <uvm/uvm.h>
-#include <uvm/uvm_pmap.h>
-#include <uvm/uvm_stat.h>
-#include <uvm/uvm_pager.h>
+#include <uvm/uvm_extern.h>
 
 #include <ufs/lfs/lfs.h>
 #include <ufs/lfs/lfs_accessors.h>
diff -r d566a2e855aa sys/ufs/lfs/ulfs_inode.c
--- a/sys/ufs/lfs/ulfs_inode.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/ufs/lfs/ulfs_inode.c	Fri Sep 04 02:38:29 2020 +0000
@@ -43,6 +43,7 @@
 #if defined(_KERNEL_OPT)
 #include "opt_lfs.h"
 #include "opt_quota.h"
+#include "opt_uvmhist.h"
 #endif
 
 #include <sys/param.h>
@@ -69,7 +70,11 @@
 #include <ufs/lfs/ulfs_extattr.h>
 #endif
 
+#ifdef UVMHIST
 #include <uvm/uvm.h>
+#endif
+#include <uvm/uvm_page.h>
+#include <uvm/uvm_stat.h>
 
 /*
  * Last reference to an inode.  If necessary, write or delete it.
diff -r d566a2e855aa sys/ufs/lfs/ulfs_snapshot.c
--- a/sys/ufs/lfs/ulfs_snapshot.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/ufs/lfs/ulfs_snapshot.c	Fri Sep 04 02:38:29 2020 +0000
@@ -73,8 +73,6 @@
 #include <ufs/lfs/lfs.h>
 #include <ufs/lfs/lfs_extern.h>
 
-#include <uvm/uvm.h>
-
 /*
  * Decrement extra reference on snapshot when last name is removed.
  * It will not be freed until the last open reference goes away.
diff -r d566a2e855aa sys/ufs/lfs/ulfs_vnops.c
--- a/sys/ufs/lfs/ulfs_vnops.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/ufs/lfs/ulfs_vnops.c	Fri Sep 04 02:38:29 2020 +0000
@@ -72,6 +72,7 @@
 #if defined(_KERNEL_OPT)
 #include "opt_lfs.h"
 #include "opt_quota.h"
+#include "opt_uvmhist.h"
 #endif
 
 #include <sys/param.h>
@@ -107,7 +108,10 @@
 #include <ufs/lfs/ulfs_dirhash.h>
 #endif
 
+#ifdef UVMHIST
 #include <uvm/uvm.h>
+#endif
+#include <uvm/uvm_stat.h>
 
 static int ulfs_chmod(struct vnode *, int, kauth_cred_t, struct lwp *);
 static int ulfs_chown(struct vnode *, uid_t, gid_t, kauth_cred_t,
diff -r d566a2e855aa sys/ufs/ufs/ufs_inode.c
--- a/sys/ufs/ufs/ufs_inode.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/ufs/ufs/ufs_inode.c	Fri Sep 04 02:38:29 2020 +0000
@@ -43,6 +43,7 @@
 #include "opt_ffs.h"
 #include "opt_quota.h"
 #include "opt_wapbl.h"
+#include "opt_uvmhist.h"
 #endif
 
 #include <sys/param.h>
@@ -67,7 +68,11 @@
 #include <ufs/ufs/extattr.h>
 #endif
 
+#ifdef UVMHIST
 #include <uvm/uvm.h>
+#endif
+#include <uvm/uvm_page.h>
+#include <uvm/uvm_stat.h>
 
 /*
  * Last reference to an inode.  If necessary, write or delete it.
diff -r d566a2e855aa sys/ufs/ufs/ufs_vnops.c
--- a/sys/ufs/ufs/ufs_vnops.c	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/ufs/ufs/ufs_vnops.c	Fri Sep 04 02:38:29 2020 +0000
@@ -71,6 +71,7 @@
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
 #include "opt_quota.h"
+#include "opt_uvmhist.h"
 #endif
 
 #include <sys/param.h>
@@ -112,7 +113,11 @@
 #include <ufs/lfs/lfs_extern.h>
 #include <ufs/lfs/lfs.h>
 
+#ifdef UVMHIST
 #include <uvm/uvm.h>
+#endif
+#include <uvm/uvm_extern.h>
+#include <uvm/uvm_stat.h>
 
 __CTASSERT(EXT2FS_MAXNAMLEN == FFS_MAXNAMLEN);
 __CTASSERT(LFS_MAXNAMLEN == FFS_MAXNAMLEN);
diff -r d566a2e855aa sys/uvm/uvm_device.h
--- a/sys/uvm/uvm_device.h	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/uvm/uvm_device.h	Fri Sep 04 02:38:29 2020 +0000
@@ -36,6 +36,12 @@
  * device handle into the VM system.
  */
 
+#include <sys/types.h>
+
+#include <sys/queue.h>
+
+#include <uvm/uvm_object.h>
+
 /*
  * the uvm_device structure.   object is put at the top of the data structure.
  * this allows:
@@ -58,6 +64,9 @@ struct uvm_device {
 
 #ifdef _KERNEL
 
+#include <uvm/uvm_param.h>
+#include <uvm/uvm_prot.h>
+
 /*
  * prototypes
  */
diff -r d566a2e855aa sys/uvm/uvm_pdaemon.h
--- a/sys/uvm/uvm_pdaemon.h	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/uvm/uvm_pdaemon.h	Fri Sep 04 02:38:29 2020 +0000
@@ -70,6 +70,15 @@
 
 #ifdef _KERNEL
 
+#ifdef _KERNEL_OPT
+#include "opt_vmswap.h"
+#endif
+
+#include <sys/stdbool.h>
+
+struct vm_page;
+struct krwlock;
+
 /*
  * prototypes
  */
@@ -77,7 +86,7 @@
 void uvm_wait(const char *);
 bool uvm_reclaimable(void);
 
-krwlock_t *uvmpd_trylockowner(struct vm_page *);
+struct krwlock *uvmpd_trylockowner(struct vm_page *);
 #ifdef VMSWAP
 bool uvmpd_dropswap(struct vm_page *);
 #else
diff -r d566a2e855aa sys/uvm/uvm_swap.h
--- a/sys/uvm/uvm_swap.h	Fri Sep 04 02:01:44 2020 +0000
+++ b/sys/uvm/uvm_swap.h	Fri Sep 04 02:38:29 2020 +0000
@@ -43,6 +43,7 @@ struct lwp;
 #if defined(VMSWAP)
 
 struct swapent;
+struct vm_page;
 
 int	uvm_swap_get(struct vm_page *, int, int);
 int	uvm_swap_put(int, struct vm_page **, int, int);