From 0d280c5f69f6ef21f5dca2b37e738de752505c51 Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Sun, 14 Aug 2022 01:58:27 +0000
Subject: [PATCH] remove unneeded includes in sys/kern ok mpi@ miod@

---
 sys/kern/exec_elf.c      |  6 +-----
 sys/kern/init_main.c     | 12 +-----------
 sys/kern/kern_acct.c     |  3 +--
 sys/kern/kern_bufq.c     |  3 +--
 sys/kern/kern_clock.c    |  4 +---
 sys/kern/kern_descrip.c  |  7 +------
 sys/kern/kern_event.c    |  7 +------
 sys/kern/kern_exec.c     |  4 +---
 sys/kern/kern_exit.c     |  8 +-------
 sys/kern/kern_fork.c     |  5 +----
 sys/kern/kern_ktrace.c   |  4 +---
 sys/kern/kern_malloc.c   |  3 +--
 sys/kern/kern_pledge.c   |  5 +----
 sys/kern/kern_proc.c     |  9 +--------
 sys/kern/kern_prot.c     |  3 +--
 sys/kern/kern_sched.c    |  5 +----
 sys/kern/kern_sig.c      |  6 +-----
 sys/kern/kern_smr.c      |  3 +--
 sys/kern/kern_subr.c     |  3 +--
 sys/kern/kern_synch.c    |  5 +----
 sys/kern/kern_sysctl.c   |  3 +--
 sys/kern/kern_time.c     |  4 +---
 sys/kern/kern_unveil.c   |  5 +----
 sys/kern/kern_watchdog.c |  4 +---
 sys/kern/kern_xxx.c      |  4 +---
 sys/kern/sched_bsd.c     |  3 +--
 sys/kern/spec_vnops.c    |  7 +------
 sys/kern/subr_disk.c     |  5 +----
 sys/kern/subr_evcount.c  |  3 +--
 sys/kern/subr_poison.c   |  4 +---
 sys/kern/subr_pool.c     |  4 +---
 sys/kern/subr_prf.c      |  6 +-----
 sys/kern/subr_suspend.c  |  5 +----
 sys/kern/subr_userconf.c |  3 +--
 sys/kern/sys_futex.c     |  3 +--
 sys/kern/sys_generic.c   |  7 +------
 sys/kern/sys_pipe.c      |  3 +--
 sys/kern/sys_socket.c    |  3 +--
 sys/kern/sysv_msg.c      |  3 +--
 sys/kern/sysv_shm.c      |  3 +--
 sys/kern/tty.c           |  3 +--
 sys/kern/tty_subr.c      |  3 +--
 sys/kern/tty_tty.c       |  3 +--
 sys/kern/uipc_domain.c   |  3 +--
 sys/kern/uipc_mbuf.c     |  6 +-----
 sys/kern/uipc_proto.c    |  4 +---
 sys/kern/uipc_socket.c   |  4 +---
 sys/kern/uipc_syscalls.c |  7 ++-----
 sys/kern/vfs_bio.c       |  5 +----
 sys/kern/vfs_cache.c     |  4 +---
 sys/kern/vfs_getcwd.c    |  3 +--
 sys/kern/vfs_lockf.c     |  4 +---
 sys/kern/vfs_lookup.c    |  3 +--
 sys/kern/vfs_subr.c      |  4 +---
 sys/kern/vfs_sync.c      |  5 +----
 sys/kern/vfs_syscalls.c  |  6 +-----
 sys/kern/vfs_vnops.c     |  5 +----
 57 files changed, 58 insertions(+), 201 deletions(-)

diff --git a/sys/kern/exec_elf.c b/sys/kern/exec_elf.c
index da29b0fc37d..10a03459f9f 100644
--- a/sys/kern/exec_elf.c
+++ b/sys/kern/exec_elf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_elf.c,v 1.166 2022/05/12 16:29:58 claudio Exp $	*/
+/*	$OpenBSD: exec_elf.c,v 1.167 2022/08/14 01:58:27 jsg Exp $	*/
 
 /*
  * Copyright (c) 1996 Per Fogelstrom
@@ -68,7 +68,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/pool.h>
@@ -76,14 +75,11 @@
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/core.h>
-#include <sys/syslog.h>
 #include <sys/exec.h>
 #include <sys/exec_elf.h>
 #include <sys/fcntl.h>
 #include <sys/ptrace.h>
-#include <sys/syscall.h>
 #include <sys/signalvar.h>
-#include <sys/stat.h>
 #include <sys/pledge.h>
 
 #include <sys/mman.h>
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index a7413dc59ab..4e0d2e4497f 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init_main.c,v 1.316 2022/07/23 22:10:58 cheloha Exp $	*/
+/*	$OpenBSD: init_main.c,v 1.317 2022/08/14 01:58:27 jsg Exp $	*/
 /*	$NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $	*/
 
 /*
@@ -40,10 +40,7 @@
 
 #include <sys/param.h>
 #include <sys/filedesc.h>
-#include <sys/file.h>
 #include <sys/errno.h>
-#include <sys/exec.h>
-#include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
@@ -53,13 +50,11 @@
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/tty.h>
-#include <sys/conf.h>
 #include <sys/buf.h>
 #include <sys/device.h>
 #include <sys/socketvar.h>
 #include <sys/lockf.h>
 #include <sys/reboot.h>
-#include <sys/user.h>
 #ifdef SYSVSHM
 #include <sys/shm.h>
 #endif
@@ -74,20 +69,15 @@
 #include <sys/msgbuf.h>
 #include <sys/mbuf.h>
 #include <sys/pipe.h>
-#include <sys/task.h>
 #include <sys/witness.h>
 #include <sys/smr.h>
 
-#include <sys/syscall.h>
 #include <sys/syscallargs.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <ufs/ufs/quota.h>
-
 #include <net/if.h>
 #include <net/rtable.h>
-#include <net/netisr.h>
 
 #if defined(CRYPTO)
 #include <crypto/cryptodev.h>
diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c
index 4ffb88f2e93..590bed70426 100644
--- a/sys/kern/kern_acct.c
+++ b/sys/kern/kern_acct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_acct.c,v 1.46 2022/02/22 17:22:29 deraadt Exp $	*/
+/*	$OpenBSD: kern_acct.c,v 1.47 2022/08/14 01:58:27 jsg Exp $	*/
 /*	$NetBSD: kern_acct.c,v 1.42 1996/02/04 02:15:12 christos Exp $	*/
 
 /*-
@@ -50,7 +50,6 @@
 #include <sys/errno.h>
 #include <sys/acct.h>
 #include <sys/resourcevar.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/kthread.h>
 #include <sys/rwlock.h>
diff --git a/sys/kern/kern_bufq.c b/sys/kern/kern_bufq.c
index 97cc1fb51ef..d42b2eccdb7 100644
--- a/sys/kern/kern_bufq.c
+++ b/sys/kern/kern_bufq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_bufq.c,v 1.33 2019/12/19 17:40:10 mpi Exp $	*/
+/*	$OpenBSD: kern_bufq.c,v 1.34 2022/08/14 01:58:27 jsg Exp $	*/
 /*
  * Copyright (c) 2010 Thordur I. Bjornsson <thib@openbsd.org>
  * Copyright (c) 2010 David Gwynne <dlg@openbsd.org>
@@ -18,7 +18,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 0d8e194e135..c3942987b4f 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_clock.c,v 1.104 2022/07/10 20:16:15 mlarkin Exp $	*/
+/*	$OpenBSD: kern_clock.c,v 1.105 2022/08/14 01:58:27 jsg Exp $	*/
 /*	$NetBSD: kern_clock.c,v 1.34 1996/06/09 04:51:03 briggs Exp $	*/
 
 /*-
@@ -45,12 +45,10 @@
 #include <sys/proc.h>
 #include <sys/user.h>
 #include <sys/resourcevar.h>
-#include <sys/signalvar.h>
 #include <sys/sysctl.h>
 #include <sys/sched.h>
 #include <sys/timetc.h>
 
-
 #if defined(GPROF) || defined(DDBPROF)
 #include <sys/gmon.h>
 #endif
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index fe98eb87843..af547122ec3 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_descrip.c,v 1.205 2022/01/20 11:06:57 bluhm Exp $	*/
+/*	$OpenBSD: kern_descrip.c,v 1.206 2022/08/14 01:58:27 jsg Exp $	*/
 /*	$NetBSD: kern_descrip.c,v 1.42 1996/03/30 22:24:38 christos Exp $	*/
 
 /*
@@ -40,18 +40,15 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/filedesc.h>
-#include <sys/kernel.h>
 #include <sys/vnode.h>
 #include <sys/proc.h>
 #include <sys/file.h>
 #include <sys/socket.h>
-#include <sys/socketvar.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
-#include <sys/syslog.h>
 #include <sys/ucred.h>
 #include <sys/unistd.h>
 #include <sys/resourcevar.h>
@@ -62,8 +59,6 @@
 #include <sys/ktrace.h>
 #include <sys/pledge.h>
 
-#include <sys/pipe.h>
-
 /*
  * Descriptor management.
  *
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index cb65dd9c183..159531d30e9 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_event.c,v 1.192 2022/07/09 12:48:21 visa Exp $	*/
+/*	$OpenBSD: kern_event.c,v 1.193 2022/08/14 01:58:27 jsg Exp $	*/
 
 /*-
  * Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org>
@@ -30,11 +30,9 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/pledge.h>
 #include <sys/malloc.h>
-#include <sys/unistd.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/fcntl.h>
@@ -43,10 +41,7 @@
 #include <sys/eventvar.h>
 #include <sys/ktrace.h>
 #include <sys/pool.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
 #include <sys/stat.h>
-#include <sys/uio.h>
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 #include <sys/time.h>
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index bf0e51ca696..54aefc0fda5 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_exec.c,v 1.230 2022/02/22 17:14:14 deraadt Exp $	*/
+/*	$OpenBSD: kern_exec.c,v 1.231 2022/08/14 01:58:27 jsg Exp $	*/
 /*	$NetBSD: kern_exec.c,v 1.75 1996/02/09 18:59:28 christos Exp $	*/
 
 /*-
@@ -36,7 +36,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/filedesc.h>
-#include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/malloc.h>
@@ -50,7 +49,6 @@
 #include <sys/exec_elf.h>
 #include <sys/ktrace.h>
 #include <sys/resourcevar.h>
-#include <sys/wait.h>
 #include <sys/mman.h>
 #include <sys/signalvar.h>
 #include <sys/stat.h>
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 85ec2d5d51e..7eb8d5d3617 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_exit.c,v 1.203 2022/03/31 01:41:22 millert Exp $	*/
+/*	$OpenBSD: kern_exit.c,v 1.204 2022/08/14 01:58:27 jsg Exp $	*/
 /*	$NetBSD: kern_exit.c,v 1.39 1996/04/22 01:38:25 christos Exp $	*/
 
 /*
@@ -39,16 +39,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/ioctl.h>
 #include <sys/proc.h>
-#include <sys/tty.h>
 #include <sys/time.h>
 #include <sys/resource.h>
-#include <sys/kernel.h>
-#include <sys/sysctl.h>
 #include <sys/wait.h>
 #include <sys/vnode.h>
-#include <sys/syslog.h>
 #include <sys/malloc.h>
 #include <sys/resourcevar.h>
 #include <sys/ptrace.h>
@@ -59,7 +54,6 @@
 #include <sys/ktrace.h>
 #include <sys/pool.h>
 #include <sys/mutex.h>
-#include <sys/pledge.h>
 #ifdef SYSVSEM
 #include <sys/sem.h>
 #endif
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index e5bdcc7e9bc..4c3b5d071f3 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_fork.c,v 1.241 2022/07/23 22:10:58 cheloha Exp $	*/
+/*	$OpenBSD: kern_fork.c,v 1.242 2022/08/14 01:58:27 jsg Exp $	*/
 /*	$NetBSD: kern_fork.c,v 1.29 1996/02/09 18:59:34 christos Exp $	*/
 
 /*
@@ -40,11 +40,9 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/filedesc.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
-#include <sys/exec.h>
 #include <sys/resourcevar.h>
 #include <sys/signalvar.h>
 #include <sys/vnode.h>
@@ -57,7 +55,6 @@
 #include <sys/mman.h>
 #include <sys/ptrace.h>
 #include <sys/atomic.h>
-#include <sys/pledge.h>
 #include <sys/unistd.h>
 
 #include <sys/syscallargs.h>
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index fa8e6bf4d21..eb3a9557647 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_ktrace.c,v 1.107 2022/07/20 05:56:36 deraadt Exp $	*/
+/*	$OpenBSD: kern_ktrace.c,v 1.108 2022/08/14 01:58:27 jsg Exp $	*/
 /*	$NetBSD: kern_ktrace.c,v 1.23 1996/02/09 18:59:36 christos Exp $	*/
 
 /*
@@ -50,8 +50,6 @@
 #include <sys/syscall.h>
 #include <sys/syscallargs.h>
 
-#include <uvm/uvm_extern.h>
-
 void	ktrinitheaderraw(struct ktr_header *, uint, pid_t, pid_t);
 void	ktrinitheader(struct ktr_header *, struct proc *, int);
 int	ktrstart(struct proc *, struct vnode *, struct ucred *);
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 583f82c328e..3acf5a2cb7d 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_malloc.c,v 1.147 2022/05/04 21:24:33 bluhm Exp $	*/
+/*	$OpenBSD: kern_malloc.c,v 1.148 2022/08/14 01:58:27 jsg Exp $	*/
 /*	$NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $	*/
 
 /*
@@ -33,7 +33,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/stdint.h>
diff --git a/sys/kern/kern_pledge.c b/sys/kern/kern_pledge.c
index 57ebe45aa18..c44c846783a 100644
--- a/sys/kern/kern_pledge.c
+++ b/sys/kern/kern_pledge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_pledge.c,v 1.293 2022/08/11 09:13:21 claudio Exp $	*/
+/*	$OpenBSD: kern_pledge.c,v 1.294 2022/08/14 01:58:27 jsg Exp $	*/
 
 /*
  * Copyright (c) 2015 Nicholas Marriott <nicm@openbsd.org>
@@ -23,12 +23,9 @@
 #include <sys/mutex.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
-#include <sys/filedesc.h>
 #include <sys/namei.h>
-#include <sys/pool.h>
 #include <sys/socketvar.h>
 #include <sys/vnode.h>
-#include <sys/mbuf.h>
 #include <sys/mman.h>
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index d99310d0fa5..932b53b73ac 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_proc.c,v 1.91 2021/10/24 00:02:25 jsg Exp $	*/
+/*	$OpenBSD: kern_proc.c,v 1.92 2022/08/14 01:58:27 jsg Exp $	*/
 /*	$NetBSD: kern_proc.c,v 1.14 1996/02/09 18:59:41 christos Exp $	*/
 
 /*
@@ -34,17 +34,10 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/proc.h>
-#include <sys/buf.h>
-#include <sys/acct.h>
 #include <sys/wait.h>
 #include <sys/rwlock.h>
-#include <ufs/ufs/quota.h>
-#include <sys/uio.h>
 #include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/signalvar.h>
 #include <sys/pool.h>
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c
index 77b5bc002b3..d593a43a29e 100644
--- a/sys/kern/kern_prot.c
+++ b/sys/kern/kern_prot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_prot.c,v 1.79 2022/03/17 14:23:34 visa Exp $	*/
+/*	$OpenBSD: kern_prot.c,v 1.80 2022/08/14 01:58:27 jsg Exp $	*/
 /*	$NetBSD: kern_prot.c,v 1.33 1996/02/09 18:59:42 christos Exp $	*/
 
 /*
@@ -42,7 +42,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/acct.h>
 #include <sys/atomic.h>
 #include <sys/systm.h>
 #include <sys/ucred.h>
diff --git a/sys/kern/kern_sched.c b/sys/kern/kern_sched.c
index 06e4bfde38f..6a6057f16d8 100644
--- a/sys/kern/kern_sched.c
+++ b/sys/kern/kern_sched.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_sched.c,v 1.74 2022/01/20 11:06:57 bluhm Exp $	*/
+/*	$OpenBSD: kern_sched.c,v 1.75 2022/08/14 01:58:27 jsg Exp $	*/
 /*
  * Copyright (c) 2007, 2008 Artur Grabowski <art@openbsd.org>
  *
@@ -21,9 +21,6 @@
 #include <sys/proc.h>
 #include <sys/kthread.h>
 #include <sys/systm.h>
-#include <sys/resourcevar.h>
-#include <sys/signalvar.h>
-#include <sys/mutex.h>
 #include <sys/task.h>
 #include <sys/smr.h>
 #include <sys/tracepoint.h>
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index e6eee8ff810..5ead4e030ba 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_sig.c,v 1.298 2022/06/29 10:48:22 claudio Exp $	*/
+/*	$OpenBSD: kern_sig.c,v 1.299 2022/08/14 01:58:27 jsg Exp $	*/
 /*	$NetBSD: kern_sig.c,v 1.54 1996/04/22 01:38:32 christos Exp $	*/
 
 /*
@@ -40,7 +40,6 @@
 
 #include <sys/param.h>
 #include <sys/signalvar.h>
-#include <sys/resourcevar.h>
 #include <sys/queue.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
@@ -50,14 +49,11 @@
 #include <sys/acct.h>
 #include <sys/fcntl.h>
 #include <sys/filedesc.h>
-#include <sys/kernel.h>
 #include <sys/wait.h>
 #include <sys/ktrace.h>
 #include <sys/stat.h>
-#include <sys/core.h>
 #include <sys/malloc.h>
 #include <sys/pool.h>
-#include <sys/ptrace.h>
 #include <sys/sched.h>
 #include <sys/user.h>
 #include <sys/syslog.h>
diff --git a/sys/kern/kern_smr.c b/sys/kern/kern_smr.c
index d85941093c2..6227c1df8fc 100644
--- a/sys/kern/kern_smr.c
+++ b/sys/kern/kern_smr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_smr.c,v 1.15 2021/11/24 13:17:37 visa Exp $	*/
+/*	$OpenBSD: kern_smr.c,v 1.16 2022/08/14 01:58:27 jsg Exp $	*/
 
 /*
  * Copyright (c) 2019-2020 Visa Hankala
@@ -18,7 +18,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/mutex.h>
 #include <sys/percpu.h>
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index 1c333451def..c0e0d401a81 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_subr.c,v 1.50 2018/04/29 17:26:31 anton Exp $	*/
+/*	$OpenBSD: kern_subr.c,v 1.51 2022/08/14 01:58:27 jsg Exp $	*/
 /*	$NetBSD: kern_subr.c,v 1.15 1996/04/09 17:21:56 ragge Exp $	*/
 
 /*
@@ -43,7 +43,6 @@
 #include <sys/sched.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
-#include <sys/resourcevar.h>
 
 int
 uiomove(void *cp, size_t n, struct uio *uio)
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index be5dc4633f3..e2c6f2247ac 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_synch.c,v 1.189 2022/06/28 09:32:27 bluhm Exp $	*/
+/*	$OpenBSD: kern_synch.c,v 1.190 2022/08/14 01:58:27 jsg Exp $	*/
 /*	$NetBSD: kern_synch.c,v 1.37 1996/04/22 01:38:37 christos Exp $	*/
 
 /*
@@ -42,15 +42,12 @@
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/signalvar.h>
-#include <sys/resourcevar.h>
 #include <sys/sched.h>
 #include <sys/timeout.h>
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
-#include <sys/pool.h>
 #include <sys/refcnt.h>
 #include <sys/atomic.h>
-#include <sys/witness.h>
 #include <sys/tracepoint.h>
 
 #include <ddb/db_output.h>
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index 1be54b0c156..2e80e884871 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_sysctl.c,v 1.404 2022/07/26 14:53:45 deraadt Exp $	*/
+/*	$OpenBSD: kern_sysctl.c,v 1.405 2022/08/14 01:58:27 jsg Exp $	*/
 /*	$NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $	*/
 
 /*-
@@ -53,7 +53,6 @@
 #include <sys/vnode.h>
 #include <sys/unistd.h>
 #include <sys/buf.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c
index ddc4421445f..7745cd88782 100644
--- a/sys/kern/kern_time.c
+++ b/sys/kern/kern_time.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_time.c,v 1.156 2022/05/05 09:45:15 bluhm Exp $	*/
+/*	$OpenBSD: kern_time.c,v 1.157 2022/08/14 01:58:27 jsg Exp $	*/
 /*	$NetBSD: kern_time.c,v 1.20 1996/02/18 11:57:06 fvdl Exp $	*/
 
 /*
@@ -33,14 +33,12 @@
  */
 
 #include <sys/param.h>
-#include <sys/resourcevar.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/mutex.h>
 #include <sys/rwlock.h>
 #include <sys/proc.h>
 #include <sys/ktrace.h>
-#include <sys/vnode.h>
 #include <sys/signalvar.h>
 #include <sys/stdint.h>
 #include <sys/pledge.h>
diff --git a/sys/kern/kern_unveil.c b/sys/kern/kern_unveil.c
index 2c0d06b257f..1ef665bf91c 100644
--- a/sys/kern/kern_unveil.c
+++ b/sys/kern/kern_unveil.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_unveil.c,v 1.53 2022/01/11 07:31:50 semarie Exp $	*/
+/*	$OpenBSD: kern_unveil.c,v 1.54 2022/08/14 01:58:27 jsg Exp $	*/
 
 /*
  * Copyright (c) 2017-2019 Bob Beck <beck@openbsd.org>
@@ -23,15 +23,12 @@
 #include <sys/filedesc.h>
 #include <sys/proc.h>
 #include <sys/namei.h>
-#include <sys/pool.h>
 #include <sys/vnode.h>
-#include <sys/ktrace.h>
 #include <sys/types.h>
 #include <sys/malloc.h>
 #include <sys/tree.h>
 #include <sys/lock.h>
 
-#include <sys/conf.h>
 #include <sys/syscall.h>
 #include <sys/syscallargs.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_watchdog.c b/sys/kern/kern_watchdog.c
index 6a6ccac2955..1aab0325aa2 100644
--- a/sys/kern/kern_watchdog.c
+++ b/sys/kern/kern_watchdog.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: kern_watchdog.c,v 1.15 2021/01/09 20:59:23 gnezdo Exp $        */
+/*      $OpenBSD: kern_watchdog.c,v 1.16 2022/08/14 01:58:27 jsg Exp $        */
 
 /*
  * Copyright (c) 2003 Markus Friedl.  All rights reserved.
@@ -24,11 +24,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/timeout.h>
 #include <sys/sysctl.h>
-#include <sys/time.h>
 
 void	wdog_tickle(void *arg);
 int	(*wdog_ctl_cb)(void *, int) = NULL;
diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c
index cd72f263879..154f0b97329 100644
--- a/sys/kern/kern_xxx.c
+++ b/sys/kern/kern_xxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_xxx.c,v 1.38 2021/12/09 00:26:10 guenther Exp $	*/
+/*	$OpenBSD: kern_xxx.c,v 1.39 2022/08/14 01:58:27 jsg Exp $	*/
 /*	$NetBSD: kern_xxx.c,v 1.32 1996/04/22 01:38:41 christos Exp $	*/
 
 /*
@@ -34,9 +34,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/reboot.h>
-#include <sys/sysctl.h>
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 
diff --git a/sys/kern/sched_bsd.c b/sys/kern/sched_bsd.c
index 7419b26c6f2..0954e6c55b8 100644
--- a/sys/kern/sched_bsd.c
+++ b/sys/kern/sched_bsd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sched_bsd.c,v 1.71 2022/05/10 22:18:06 solene Exp $	*/
+/*	$OpenBSD: sched_bsd.c,v 1.72 2022/08/14 01:58:27 jsg Exp $	*/
 /*	$NetBSD: kern_synch.c,v 1.37 1996/04/22 01:38:37 christos Exp $	*/
 
 /*-
@@ -42,7 +42,6 @@
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <sys/signalvar.h>
 #include <sys/resourcevar.h>
 #include <uvm/uvm_extern.h>
 #include <sys/sched.h>
diff --git a/sys/kern/spec_vnops.c b/sys/kern/spec_vnops.c
index 34e6c2d4fb9..8d50c04a44e 100644
--- a/sys/kern/spec_vnops.c
+++ b/sys/kern/spec_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spec_vnops.c,v 1.108 2022/06/26 05:20:42 visa Exp $	*/
+/*	$OpenBSD: spec_vnops.c,v 1.109 2022/08/14 01:58:27 jsg Exp $	*/
 /*	$NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $	*/
 
 /*
@@ -35,16 +35,13 @@
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/buf.h>
 #include <sys/mount.h>
-#include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/lock.h>
 #include <sys/stat.h>
 #include <sys/errno.h>
-#include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/disklabel.h>
 #include <sys/lockf.h>
@@ -53,8 +50,6 @@
 #include <sys/specdev.h>
 #include <sys/unistd.h>
 
-#include <uvm/uvm_extern.h>
-
 #define v_lastr v_specinfo->si_lastr
 
 int	spec_open_clone(struct vop_open_args *);
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index 9e12d8a2c71..1f0f97ca3bc 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_disk.c,v 1.252 2022/08/12 20:05:49 krw Exp $	*/
+/*	$OpenBSD: subr_disk.c,v 1.253 2022/08/14 01:58:27 jsg Exp $	*/
 /*	$NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $	*/
 
 /*
@@ -40,7 +40,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/fcntl.h>
 #include <sys/buf.h>
@@ -50,7 +49,6 @@
 #include <sys/time.h>
 #include <sys/disklabel.h>
 #include <sys/conf.h>
-#include <sys/lock.h>
 #include <sys/disk.h>
 #include <sys/reboot.h>
 #include <sys/dkio.h>
@@ -59,7 +57,6 @@
 #include <sys/stdint.h>
 
 #include <sys/socket.h>
-#include <sys/socketvar.h>
 
 #include <net/if.h>
 
diff --git a/sys/kern/subr_evcount.c b/sys/kern/subr_evcount.c
index ea737fae608..82dd6d4fb72 100644
--- a/sys/kern/subr_evcount.c
+++ b/sys/kern/subr_evcount.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_evcount.c,v 1.12 2015/03/14 03:38:50 jsg Exp $ */
+/*	$OpenBSD: subr_evcount.c,v 1.13 2022/08/14 01:58:28 jsg Exp $ */
 /*
  * Copyright (c) 2004 Artur Grabowski <art@openbsd.org>
  * Copyright (c) 2004 Aaron Campbell <aaron@openbsd.org>
@@ -27,7 +27,6 @@
 
 #include <sys/param.h>
 #include <sys/evcount.h>
-#include <sys/timeout.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 
diff --git a/sys/kern/subr_poison.c b/sys/kern/subr_poison.c
index d3577e20484..b676f83d64d 100644
--- a/sys/kern/subr_poison.c
+++ b/sys/kern/subr_poison.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_poison.c,v 1.14 2017/09/08 05:36:53 deraadt Exp $ */
+/*	$OpenBSD: subr_poison.c,v 1.15 2022/08/14 01:58:28 jsg Exp $ */
 /*
  * Copyright (c) 2013 Ted Unangst <tedu@openbsd.org>
  *
@@ -17,8 +17,6 @@
 
 #include <sys/param.h>
 
-#include <uvm/uvm_extern.h>
-
 /*
  * The POISON is used as known text to copy into free objects so
  * that modifications after frees can be detected.
diff --git a/sys/kern/subr_pool.c b/sys/kern/subr_pool.c
index 744f4e1ca64..587eff13676 100644
--- a/sys/kern/subr_pool.c
+++ b/sys/kern/subr_pool.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_pool.c,v 1.235 2022/01/20 11:06:57 bluhm Exp $	*/
+/*	$OpenBSD: subr_pool.c,v 1.236 2022/08/14 01:58:28 jsg Exp $	*/
 /*	$NetBSD: subr_pool.c,v 1.61 2001/09/26 07:14:56 chs Exp $	*/
 
 /*-
@@ -34,11 +34,9 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/pool.h>
 #include <sys/proc.h>
-#include <sys/syslog.h>
 #include <sys/sysctl.h>
 #include <sys/task.h>
 #include <sys/time.h>
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index f1d74024e4f..0dac11bd7cf 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_prf.c,v 1.105 2022/01/20 17:11:30 bluhm Exp $	*/
+/*	$OpenBSD: subr_prf.c,v 1.106 2022/08/14 01:58:28 jsg Exp $	*/
 /*	$NetBSD: subr_prf.c,v 1.45 1997/10/24 18:14:25 chuck Exp $	*/
 
 /*-
@@ -39,16 +39,12 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/reboot.h>
 #include <sys/msgbuf.h>
 #include <sys/proc.h>
-#include <sys/ioctl.h>
-#include <sys/vnode.h>
 #include <sys/tty.h>
 #include <sys/tprintf.h>
 #include <sys/syslog.h>
-#include <sys/malloc.h>
 #include <sys/pool.h>
 #include <sys/mutex.h>
 
diff --git a/sys/kern/subr_suspend.c b/sys/kern/subr_suspend.c
index 77a54976595..84512766916 100644
--- a/sys/kern/subr_suspend.c
+++ b/sys/kern/subr_suspend.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_suspend.c,v 1.10 2022/02/16 16:44:17 deraadt Exp $ */
+/* $OpenBSD: subr_suspend.c,v 1.11 2022/08/14 01:58:28 jsg Exp $ */
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -19,10 +19,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
-#include <sys/malloc.h>
-#include <sys/pool.h>
 #include <sys/reboot.h>
-#include <sys/proc.h>
 #include <sys/sensors.h>
 #include <sys/sysctl.h>
 #include <sys/mount.h>
diff --git a/sys/kern/subr_userconf.c b/sys/kern/subr_userconf.c
index 6f080f54dc1..9e20e11c522 100644
--- a/sys/kern/subr_userconf.c
+++ b/sys/kern/subr_userconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_userconf.c,v 1.47 2021/10/24 00:02:25 jsg Exp $	*/
+/*	$OpenBSD: subr_userconf.c,v 1.48 2022/08/14 01:58:28 jsg Exp $	*/
 
 /*
  * Copyright (c) 1996-2001 Mats O Jansson <moj@stacken.kth.se>
@@ -30,7 +30,6 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
-#include <sys/time.h>
 
 #include <dev/cons.h>
 
diff --git a/sys/kern/sys_futex.c b/sys/kern/sys_futex.c
index b9303a91cc4..4aafc4f3fe0 100644
--- a/sys/kern/sys_futex.c
+++ b/sys/kern/sys_futex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_futex.c,v 1.20 2021/11/22 14:57:17 visa Exp $ */
+/*	$OpenBSD: sys_futex.c,v 1.21 2022/08/14 01:58:28 jsg Exp $ */
 
 /*
  * Copyright (c) 2016-2017 Martin Pieuchot
@@ -19,7 +19,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/kernel.h>
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 #include <sys/pool.h>
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 3beaac8f82a..6828259196c 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_generic.c,v 1.148 2022/07/05 15:06:16 visa Exp $	*/
+/*	$OpenBSD: sys_generic.c,v 1.149 2022/08/14 01:58:28 jsg Exp $	*/
 /*	$NetBSD: sys_generic.c,v 1.24 1996/03/29 00:25:32 cgd Exp $	*/
 
 /*
@@ -50,8 +50,6 @@
 #include <sys/socketvar.h>
 #include <sys/signalvar.h>
 #include <sys/uio.h>
-#include <sys/kernel.h>
-#include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/malloc.h>
 #include <sys/poll.h>
@@ -59,14 +57,11 @@
 #ifdef KTRACE
 #include <sys/ktrace.h>
 #endif
-#include <sys/sched.h>
 #include <sys/pledge.h>
 
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 
-#include <uvm/uvm_extern.h>
-
 /*
  * Debug values:
  *  1 - print implementation errors, things that should not happen.
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index 9b37fde89c0..96cd4656cab 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_pipe.c,v 1.141 2022/07/09 12:48:21 visa Exp $	*/
+/*	$OpenBSD: sys_pipe.c,v 1.142 2022/08/14 01:58:28 jsg Exp $	*/
 
 /*
  * Copyright (c) 1996 John S. Dyson
@@ -39,7 +39,6 @@
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 #include <sys/event.h>
-#include <sys/lock.h>
 #ifdef KTRACE
 #include <sys/ktrace.h>
 #endif
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c
index 6064d8c5c93..20b9913670f 100644
--- a/sys/kern/sys_socket.c
+++ b/sys/kern/sys_socket.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_socket.c,v 1.52 2022/08/13 21:01:46 mvs Exp $	*/
+/*	$OpenBSD: sys_socket.c,v 1.53 2022/08/14 01:58:28 jsg Exp $	*/
 /*	$NetBSD: sys_socket.c,v 1.13 1995/08/12 23:59:09 mycroft Exp $	*/
 
 /*
@@ -45,7 +45,6 @@
 #include <sys/fcntl.h>
 
 #include <net/if.h>
-#include <net/route.h>
 
 const struct fileops socketops = {
 	.fo_read	= soo_read,
diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c
index 1fa5c95aca0..602c81feac4 100644
--- a/sys/kern/sysv_msg.c
+++ b/sys/kern/sysv_msg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysv_msg.c,v 1.38 2022/02/21 13:51:04 jsg Exp $	*/
+/*	$OpenBSD: sysv_msg.c,v 1.39 2022/08/14 01:58:28 jsg Exp $	*/
 /*	$NetBSD: sysv_msg.c,v 1.19 1996/02/09 19:00:18 christos Exp $	*/
 /*
  * Copyright (c) 2009 Bret S. Lambert <blambert@openbsd.org>
@@ -45,7 +45,6 @@
 #include <sys/syscallargs.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
-#include <sys/uio.h>
 
 struct que *que_create(key_t, struct ucred *, int);
 struct que *que_lookup(int);
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index d332662c761..e090fa3b32d 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sysv_shm.c,v 1.79 2021/12/21 06:12:49 anton Exp $	*/
+/*	$OpenBSD: sysv_shm.c,v 1.80 2022/08/14 01:58:28 jsg Exp $	*/
 /*	$NetBSD: sysv_shm.c,v 1.50 1998/10/21 22:24:29 tron Exp $	*/
 
 /*
@@ -53,7 +53,6 @@
 #include <sys/param.h>
 #include <sys/shm.h>
 #include <sys/proc.h>
-#include <sys/uio.h>
 #include <sys/time.h>
 #include <sys/malloc.h>
 #include <sys/mman.h>
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index de46bcbb2d1..ec184248348 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tty.c,v 1.175 2022/07/02 08:50:42 visa Exp $	*/
+/*	$OpenBSD: tty.c,v 1.176 2022/08/14 01:58:28 jsg Exp $	*/
 /*	$NetBSD: tty.c,v 1.68.4.2 1996/06/06 16:04:52 thorpej Exp $	*/
 
 /*-
@@ -50,7 +50,6 @@
 #include <sys/kernel.h>
 #include <sys/vnode.h>
 #include <sys/lock.h>
-#include <sys/syslog.h>
 #include <sys/malloc.h>
 #include <sys/msgbuf.h>
 #include <sys/signalvar.h>
diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c
index c680d2466a4..3a3179c6a89 100644
--- a/sys/kern/tty_subr.c
+++ b/sys/kern/tty_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tty_subr.c,v 1.35 2021/12/02 15:13:49 deraadt Exp $	*/
+/*	$OpenBSD: tty_subr.c,v 1.36 2022/08/14 01:58:28 jsg Exp $	*/
 /*	$NetBSD: tty_subr.c,v 1.13 1996/02/09 19:00:43 christos Exp $	*/
 
 /*
@@ -31,7 +31,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/malloc.h>
 
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index 493ebf12bdb..d34aa0cee9f 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tty_tty.c,v 1.31 2022/07/02 08:50:42 visa Exp $	*/
+/*	$OpenBSD: tty_tty.c,v 1.32 2022/08/14 01:58:28 jsg Exp $	*/
 /*	$NetBSD: tty_tty.c,v 1.13 1996/03/30 22:24:46 christos Exp $	*/
 
 /*-
@@ -37,7 +37,6 @@
  */
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/ioctl.h>
 #include <sys/proc.h>
 #include <sys/tty.h>
 #include <sys/vnode.h>
diff --git a/sys/kern/uipc_domain.c b/sys/kern/uipc_domain.c
index 6f31217e26c..1534c0dbffc 100644
--- a/sys/kern/uipc_domain.c
+++ b/sys/kern/uipc_domain.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_domain.c,v 1.59 2021/05/25 22:45:09 bluhm Exp $	*/
+/*	$OpenBSD: uipc_domain.c,v 1.60 2022/08/14 01:58:28 jsg Exp $	*/
 /*	$NetBSD: uipc_domain.c,v 1.14 1996/02/09 19:00:44 christos Exp $	*/
 
 /*
@@ -37,7 +37,6 @@
 #include <sys/protosw.h>
 #include <sys/domain.h>
 #include <sys/mbuf.h>
-#include <sys/time.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/timeout.h>
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index ce0d6f2c25e..ffafd228522 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_mbuf.c,v 1.283 2022/02/22 01:15:01 guenther Exp $	*/
+/*	$OpenBSD: uipc_mbuf.c,v 1.284 2022/08/14 01:58:28 jsg Exp $	*/
 /*	$NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $	*/
 
 /*
@@ -77,16 +77,12 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/kernel.h>
-#include <sys/syslog.h>
 #include <sys/pool.h>
 #include <sys/percpu.h>
 #include <sys/sysctl.h>
 
 #include <sys/socket.h>
-#include <sys/socketvar.h>
 #include <net/if.h>
 
 
diff --git a/sys/kern/uipc_proto.c b/sys/kern/uipc_proto.c
index 1d19002cc1c..01e07364c93 100644
--- a/sys/kern/uipc_proto.c
+++ b/sys/kern/uipc_proto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_proto.c,v 1.22 2022/02/25 23:51:03 guenther Exp $	*/
+/*	$OpenBSD: uipc_proto.c,v 1.23 2022/08/14 01:58:28 jsg Exp $	*/
 /*	$NetBSD: uipc_proto.c,v 1.8 1996/02/13 21:10:47 christos Exp $	*/
 
 /*-
@@ -36,9 +36,7 @@
 #include <sys/socket.h>
 #include <sys/protosw.h>
 #include <sys/domain.h>
-#include <sys/mbuf.h>
 #include <sys/unpcb.h>
-#include <sys/socketvar.h>
 
 /*
  * Definitions of protocols supported in the UNIX domain.
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index c8d10b5c531..1e6fac656a4 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_socket.c,v 1.281 2022/08/13 21:01:46 mvs Exp $	*/
+/*	$OpenBSD: uipc_socket.c,v 1.282 2022/08/14 01:58:28 jsg Exp $	*/
 /*	$NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $	*/
 
 /*
@@ -40,14 +40,12 @@
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/domain.h>
-#include <sys/kernel.h>
 #include <sys/event.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/unpcb.h>
 #include <sys/socketvar.h>
 #include <sys/signalvar.h>
-#include <net/if.h>
 #include <sys/pool.h>
 #include <sys/atomic.h>
 #include <sys/rwlock.h>
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 6b72be16c58..dbd6373285e 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_syscalls.c,v 1.200 2022/08/13 21:01:46 mvs Exp $	*/
+/*	$OpenBSD: uipc_syscalls.c,v 1.201 2022/08/14 01:58:28 jsg Exp $	*/
 /*	$NetBSD: uipc_syscalls.c,v 1.19 1996/02/09 19:00:48 christos Exp $	*/
 
 /*
@@ -42,7 +42,6 @@
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/vnode.h>
-#include <sys/ioctl.h>
 #include <sys/malloc.h>
 #include <sys/event.h>
 #include <sys/mbuf.h>
@@ -51,8 +50,6 @@
 #include <sys/socketvar.h>
 #include <sys/signalvar.h>
 #include <sys/pledge.h>
-#include <sys/unpcb.h>
-#include <sys/un.h>
 #ifdef KTRACE
 #include <sys/ktrace.h>
 #endif
@@ -63,7 +60,7 @@
 
 #include <sys/domain.h>
 #include <netinet/in.h>
-#include <net/route.h>
+#include <net/rtable.h>
 
 int	copyaddrout(struct proc *, struct mbuf *, struct sockaddr *, socklen_t,
 	    socklen_t *);
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 7ff46e196b9..9729467b71b 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_bio.c,v 1.209 2022/08/12 14:30:52 visa Exp $	*/
+/*	$OpenBSD: vfs_bio.c,v 1.210 2022/08/14 01:58:28 jsg Exp $	*/
 /*	$NetBSD: vfs_bio.c,v 1.44 1996/06/11 11:15:36 pk Exp $	*/
 
 /*
@@ -53,9 +53,6 @@
 #include <sys/mount.h>
 #include <sys/malloc.h>
 #include <sys/pool.h>
-#include <sys/resourcevar.h>
-#include <sys/conf.h>
-#include <sys/kernel.h>
 #include <sys/specdev.h>
 #include <sys/tracepoint.h>
 #include <uvm/uvm_extern.h>
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index 28744745fed..78c9904adad 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_cache.c,v 1.57 2018/06/04 19:42:54 kn Exp $	*/
+/*	$OpenBSD: vfs_cache.c,v 1.58 2022/08/14 01:58:28 jsg Exp $	*/
 /*	$NetBSD: vfs_cache.c,v 1.13 1996/02/04 02:18:09 christos Exp $	*/
 
 /*
@@ -34,8 +34,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/lock.h>
 #include <sys/namei.h>
diff --git a/sys/kern/vfs_getcwd.c b/sys/kern/vfs_getcwd.c
index 2d1bf64fa3b..8020b039099 100644
--- a/sys/kern/vfs_getcwd.c
+++ b/sys/kern/vfs_getcwd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_getcwd.c,v 1.36 2019/05/30 13:34:54 beck Exp $ */
+/* $OpenBSD: vfs_getcwd.c,v 1.37 2022/08/14 01:58:28 jsg Exp $ */
 /* $NetBSD: vfs_getcwd.c,v 1.3.2.3 1999/07/11 10:24:09 sommerfeld Exp $ */
 
 /*
@@ -34,7 +34,6 @@
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/filedesc.h>
-#include <sys/kernel.h>
 #include <sys/stat.h>
 #include <sys/lock.h>
 #include <sys/vnode.h>
diff --git a/sys/kern/vfs_lockf.c b/sys/kern/vfs_lockf.c
index fcd5489cc5f..daae1275ae2 100644
--- a/sys/kern/vfs_lockf.c
+++ b/sys/kern/vfs_lockf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_lockf.c,v 1.49 2022/06/02 05:32:28 anton Exp $	*/
+/*	$OpenBSD: vfs_lockf.c,v 1.50 2022/08/14 01:58:28 jsg Exp $	*/
 /*	$NetBSD: vfs_lockf.c,v 1.7 1996/02/04 02:18:21 christos Exp $	*/
 
 /*
@@ -37,9 +37,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/proc.h>
-#include <sys/vnode.h>
 #include <sys/pool.h>
 #include <sys/fcntl.h>
 #include <sys/lockf.h>
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index 16a42e905b8..912574f1ce4 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_lookup.c,v 1.86 2021/10/24 00:02:25 jsg Exp $	*/
+/*	$OpenBSD: vfs_lookup.c,v 1.87 2022/08/14 01:58:28 jsg Exp $	*/
 /*	$NetBSD: vfs_lookup.c,v 1.17 1996/02/09 19:00:59 christos Exp $	*/
 
 /*
@@ -40,7 +40,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/syslimits.h>
-#include <sys/time.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/lock.h>
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 4ace1adde8d..322e6833592 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_subr.c,v 1.316 2022/08/12 14:30:52 visa Exp $	*/
+/*	$OpenBSD: vfs_subr.c,v 1.317 2022/08/14 01:58:28 jsg Exp $	*/
 /*	$NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $	*/
 
 /*
@@ -46,9 +46,7 @@
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/mount.h>
-#include <sys/time.h>
 #include <sys/fcntl.h>
-#include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/vnode.h>
 #include <sys/lock.h>
diff --git a/sys/kern/vfs_sync.c b/sys/kern/vfs_sync.c
index db5340e8628..ff1b072ee85 100644
--- a/sys/kern/vfs_sync.c
+++ b/sys/kern/vfs_sync.c
@@ -1,4 +1,4 @@
-/*       $OpenBSD: vfs_sync.c,v 1.67 2021/10/15 06:30:06 semarie Exp $  */
+/*       $OpenBSD: vfs_sync.c,v 1.68 2022/08/14 01:58:28 jsg Exp $  */
 
 /*
  *  Portions of this code are:
@@ -50,9 +50,6 @@
 #include <sys/malloc.h>
 #include <sys/time.h>
 
-#include <sys/kernel.h>
-#include <sys/sched.h>
-
 #ifdef FFS_SOFTUPDATES
 int   softdep_process_worklist(struct mount *);
 #endif
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 13695585ee9..897773c9a7e 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_syscalls.c,v 1.359 2022/08/01 14:56:59 deraadt Exp $	*/
+/*	$OpenBSD: vfs_syscalls.c,v 1.360 2022/08/14 01:58:28 jsg Exp $	*/
 /*	$NetBSD: vfs_syscalls.c,v 1.71 1996/04/23 10:29:02 mycroft Exp $	*/
 
 /*
@@ -41,9 +41,7 @@
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/filedesc.h>
-#include <sys/kernel.h>
 #include <sys/conf.h>
-#include <sys/sysctl.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/stat.h>
@@ -55,8 +53,6 @@
 #include <sys/uio.h>
 #include <sys/malloc.h>
 #include <sys/pool.h>
-#include <sys/dkio.h>
-#include <sys/disklabel.h>
 #include <sys/ktrace.h>
 #include <sys/unistd.h>
 #include <sys/specdev.h>
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 9a646ae9bcb..e6a175e9f16 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_vnops.c,v 1.120 2022/06/20 01:39:44 visa Exp $	*/
+/*	$OpenBSD: vfs_vnops.c,v 1.121 2022/08/14 01:58:28 jsg Exp $	*/
 /*	$NetBSD: vfs_vnops.c,v 1.20 1996/02/04 02:18:41 christos Exp $	*/
 
 /*
@@ -39,7 +39,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
@@ -53,8 +52,6 @@
 #include <sys/vnode.h>
 #include <sys/ioctl.h>
 #include <sys/tty.h>
-#include <sys/cdio.h>
-#include <sys/filedesc.h>
 #include <sys/specdev.h>
 #include <sys/unistd.h>
 
-- 
2.20.1