From: Jonathan Gray <jsg@jsg.id.au>
Subject: remove unneeded includes in uvm
To: tech@openbsd.org
Date: Wed, 20 Nov 2024 13:28:26 +1100

remove unneeded includes in uvm

builds on amd64 arm64 i386 sparc64

user.h needs to stay in uvm_map.c and uvm_mmap.c as it is needed for
arm/arm64/riscv64 PROC_PC

diff --git sys/uvm/uvm_amap.c sys/uvm/uvm_amap.c
index d9296efad06..ba9ce43d3ab 100644
--- sys/uvm/uvm_amap.c
+++ sys/uvm/uvm_amap.c
@@ -36,12 +36,10 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/pool.h>
 #include <sys/atomic.h>
 
 #include <uvm/uvm.h>
-#include <uvm/uvm_swap.h>
 
 /*
  * pools for allocation of vm_amap structures.  note that in order to
diff --git sys/uvm/uvm_anon.c sys/uvm/uvm_anon.c
index 0fc2a0c899c..08c866010f7 100644
--- sys/uvm/uvm_anon.c
+++ sys/uvm/uvm_anon.c
@@ -32,9 +32,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/pool.h>
-#include <sys/kernel.h>
 #include <sys/atomic.h>
 
 #include <uvm/uvm.h>
diff --git sys/uvm/uvm_aobj.c sys/uvm/uvm_aobj.c
index 33e2cb432ab..a8916eab067 100644
--- sys/uvm/uvm_aobj.c
+++ sys/uvm/uvm_aobj.c
@@ -40,7 +40,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/pool.h>
 #include <sys/stdint.h>
 #include <sys/atomic.h>
diff --git sys/uvm/uvm_fault.c sys/uvm/uvm_fault.c
index efb37e2561d..ce1c2761bf2 100644
--- sys/uvm/uvm_fault.c
+++ sys/uvm/uvm_fault.c
@@ -34,7 +34,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/percpu.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
diff --git sys/uvm/uvm_init.c sys/uvm/uvm_init.c
index b15c4d7f9af..1a91eb818c2 100644
--- sys/uvm/uvm_init.c
+++ sys/uvm/uvm_init.c
@@ -34,12 +34,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/filedesc.h>
 #include <sys/percpu.h>
-#include <sys/resourcevar.h>
-#include <sys/mman.h>
-#include <sys/malloc.h>
-#include <sys/vnode.h>
 #include <sys/pool.h>
 
 #include <uvm/uvm.h>
diff --git sys/uvm/uvm_io.c sys/uvm/uvm_io.c
index 3bd0b4e249a..2df85cf4bd3 100644
--- sys/uvm/uvm_io.c
+++ sys/uvm/uvm_io.c
@@ -34,7 +34,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/mman.h>
 #include <sys/uio.h>
 
 #include <uvm/uvm.h>
diff --git sys/uvm/uvm_map.c sys/uvm/uvm_map.c
index 91b8a4632b4..a8bf2e24c23 100644
--- sys/uvm/uvm_map.c
+++ sys/uvm/uvm_map.c
@@ -93,7 +93,6 @@
 #include <sys/pool.h>
 #include <sys/sysctl.h>
 #include <sys/signalvar.h>
-#include <sys/syslog.h>
 #include <sys/user.h>
 #include <sys/tracepoint.h>
 
diff --git sys/uvm/uvm_meter.c sys/uvm/uvm_meter.c
index 3289cdb854a..a0bc463f3e9 100644
--- sys/uvm/uvm_meter.c
+++ sys/uvm/uvm_meter.c
@@ -38,7 +38,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/percpu.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
@@ -47,7 +46,6 @@
 #include <uvm/uvm_ddb.h>
 
 #ifdef UVM_SWAP_ENCRYPT
-#include <uvm/uvm_swap.h>
 #include <uvm/uvm_swap_encrypt.h>
 #endif
 
diff --git sys/uvm/uvm_mmap.c sys/uvm/uvm_mmap.c
index 5a69fa7578b..cd566765148 100644
--- sys/uvm/uvm_mmap.c
+++ sys/uvm/uvm_mmap.c
@@ -73,7 +73,6 @@
 
 #include <uvm/uvm.h>
 #include <uvm/uvm_device.h>
-#include <uvm/uvm_vnode.h>
 
 int uvm_mmapanon(vm_map_t, vaddr_t *, vsize_t, vm_prot_t, vm_prot_t, int,
     vsize_t, struct proc *);
diff --git sys/uvm/uvm_page.c sys/uvm/uvm_page.c
index 470aa1bdd2e..608d9eeb6a9 100644
--- sys/uvm/uvm_page.c
+++ sys/uvm/uvm_page.c
@@ -68,10 +68,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/sched.h>
-#include <sys/vnode.h>
-#include <sys/mount.h>
-#include <sys/proc.h>
 #include <sys/smr.h>
 
 #include <uvm/uvm.h>
diff --git sys/uvm/uvm_pager.c sys/uvm/uvm_pager.c
index 5b8efcd285d..4db92eb7219 100644
--- sys/uvm/uvm_pager.c
+++ sys/uvm/uvm_pager.c
@@ -34,7 +34,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/pool.h>
 #include <sys/buf.h>
 #include <sys/atomic.h>
diff --git sys/uvm/uvm_pdaemon.c sys/uvm/uvm_pdaemon.c
index 7a304354867..d1be5367734 100644
--- sys/uvm/uvm_pdaemon.c
+++ sys/uvm/uvm_pdaemon.c
@@ -68,8 +68,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/pool.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/mount.h>
diff --git sys/uvm/uvm_pmemrange.c sys/uvm/uvm_pmemrange.c
index 0a7ee456c99..5f2daa2ef1a 100644
--- sys/uvm/uvm_pmemrange.c
+++ sys/uvm/uvm_pmemrange.c
@@ -21,7 +21,6 @@
 #include <sys/systm.h>
 #include <uvm/uvm.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 
diff --git sys/uvm/uvm_swap.c sys/uvm/uvm_swap.c
index 934d049492c..2f29db3193a 100644
--- sys/uvm/uvm_swap.c
+++ sys/uvm/uvm_swap.c
@@ -38,7 +38,6 @@
 #include <sys/namei.h>
 #include <sys/disklabel.h>
 #include <sys/errno.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/vnode.h>
 #include <sys/fcntl.h>
diff --git sys/uvm/uvm_swap_encrypt.c sys/uvm/uvm_swap_encrypt.c
index deb2ff5b637..c726b8e5bbb 100644
--- sys/uvm/uvm_swap_encrypt.c
+++ sys/uvm/uvm_swap_encrypt.c
@@ -32,10 +32,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/sysctl.h>
-#include <sys/time.h>
 #include <crypto/rijndael.h>
 
 #include <uvm/uvm.h>
diff --git sys/uvm/uvm_unix.c sys/uvm/uvm_unix.c
index 56ee0370317..9adcc9de1b6 100644
--- sys/uvm/uvm_unix.c
+++ sys/uvm/uvm_unix.c
@@ -49,7 +49,6 @@
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/resourcevar.h>
-#include <sys/vnode.h>
 
 #include <sys/mount.h>
 #include <sys/syscallargs.h>