From f4e7063748a2ac72b2bab4389c0a7efc72d82189 Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Mon, 30 Jan 2023 10:49:04 +0000
Subject: [PATCH] remove unneeded includes in arch/i386 ok krw@ miod@

---
 sys/arch/i386/i386/acpi_machdep.c      |  5 ++---
 sys/arch/i386/i386/acpiapm.c           |  4 +---
 sys/arch/i386/i386/amdmsr.c            | 10 ++--------
 sys/arch/i386/i386/apic.c              |  3 +--
 sys/arch/i386/i386/apm.c               | 10 +---------
 sys/arch/i386/i386/autoconf.c          | 15 +--------------
 sys/arch/i386/i386/bios.c              | 14 ++------------
 sys/arch/i386/i386/bus_dma.c           |  6 +-----
 sys/arch/i386/i386/bus_space.c         |  5 +----
 sys/arch/i386/i386/conf.c              |  4 +---
 sys/arch/i386/i386/cpu.c               |  6 +-----
 sys/arch/i386/i386/db_interface.c      |  8 +-------
 sys/arch/i386/i386/db_mp.c             |  4 +---
 sys/arch/i386/i386/db_trace.c          |  3 +--
 sys/arch/i386/i386/esm.c               |  3 +--
 sys/arch/i386/i386/est.c               |  3 +--
 sys/arch/i386/i386/gdt.c               |  6 +-----
 sys/arch/i386/i386/hibernate_machdep.c |  7 +------
 sys/arch/i386/i386/i686_mem.c          |  4 +---
 sys/arch/i386/i386/ioapic.c            |  8 +-------
 sys/arch/i386/i386/ipifuncs.c          |  8 +-------
 sys/arch/i386/i386/k1x-pstate.c        |  4 +---
 sys/arch/i386/i386/k6_mem.c            |  5 +----
 sys/arch/i386/i386/lapic.c             |  5 +----
 sys/arch/i386/i386/longrun.c           |  3 +--
 sys/arch/i386/i386/machdep.c           | 25 +------------------------
 sys/arch/i386/i386/mainbus.c           |  5 ++---
 sys/arch/i386/i386/mem.c               |  5 +----
 sys/arch/i386/i386/mpbios.c            |  5 +----
 sys/arch/i386/i386/nvram.c             |  4 +---
 sys/arch/i386/i386/pctr.c              |  5 +----
 sys/arch/i386/i386/pmap.c              |  7 +------
 sys/arch/i386/i386/pmapae.c            |  9 +--------
 sys/arch/i386/i386/powernow-k7.c       |  4 +---
 sys/arch/i386/i386/powernow-k8.c       |  4 +---
 sys/arch/i386/i386/process_machdep.c   |  5 +----
 sys/arch/i386/i386/rbus_machdep.c      |  5 +----
 sys/arch/i386/i386/sys_machdep.c       | 17 +----------------
 sys/arch/i386/i386/trap.c              |  9 +--------
 sys/arch/i386/i386/vm_machdep.c        | 12 +-----------
 sys/arch/i386/i386/wscons_machdep.c    |  6 +-----
 sys/arch/i386/isa/clock.c              |  5 +----
 sys/arch/i386/isa/isapnp_machdep.c     |  4 +---
 sys/arch/i386/isa/joy.c                |  4 +---
 sys/arch/i386/isa/joy_isapnp.c         |  9 +--------
 sys/arch/i386/isa/npx.c                |  6 +-----
 sys/arch/i386/pci/agp_machdep.c        |  4 +---
 sys/arch/i386/pci/ali1543.c            |  7 +------
 sys/arch/i386/pci/amd756.c             |  5 +----
 sys/arch/i386/pci/glxsb.c              |  3 +--
 sys/arch/i386/pci/gscpcib.c            |  3 +--
 sys/arch/i386/pci/ichpcib.c            |  5 +----
 sys/arch/i386/pci/opti82c558.c         |  5 +----
 sys/arch/i386/pci/opti82c700.c         |  5 +----
 sys/arch/i386/pci/pchb.c               |  3 +--
 sys/arch/i386/pci/pci_addr_fixup.c     |  5 +----
 sys/arch/i386/pci/pci_bus_fixup.c      |  4 +---
 sys/arch/i386/pci/pci_intr_fixup.c     |  4 +---
 sys/arch/i386/pci/piix.c               |  5 +----
 sys/arch/i386/pci/rccosb4.c            |  4 +---
 sys/arch/i386/pci/sis85c503.c          |  5 +----
 sys/arch/i386/pci/vga_post.c           |  3 +--
 sys/arch/i386/pci/via8231.c            |  3 +--
 sys/arch/i386/pci/via82c586.c          |  5 +----
 64 files changed, 68 insertions(+), 318 deletions(-)

diff --git a/sys/arch/i386/i386/acpi_machdep.c b/sys/arch/i386/i386/acpi_machdep.c
index c368b213ec7..74dba69b164 100644
--- a/sys/arch/i386/i386/acpi_machdep.c
+++ b/sys/arch/i386/i386/acpi_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acpi_machdep.c,v 1.86 2022/12/06 01:56:43 cheloha Exp $	*/
+/*	$OpenBSD: acpi_machdep.c,v 1.87 2023/01/30 10:49:04 jsg Exp $	*/
 /*
  * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com>
  *
@@ -32,13 +32,12 @@
 #include <machine/acpiapm.h>
 
 #include <machine/cpuvar.h>
+#include <machine/npx.h>
 
 #include <dev/acpi/acpivar.h>
 #include <dev/acpi/acpidev.h>
 #include <dev/isa/isareg.h>
 
-#include <machine/apmvar.h>
-
 #include "apm.h"
 #include "isa.h"
 #include "ioapic.h"
diff --git a/sys/arch/i386/i386/acpiapm.c b/sys/arch/i386/i386/acpiapm.c
index 18bcfc6c46e..d11faa19801 100644
--- a/sys/arch/i386/i386/acpiapm.c
+++ b/sys/arch/i386/i386/acpiapm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acpiapm.c,v 1.2 2020/04/03 08:24:52 mpi Exp $ */
+/*	$OpenBSD: acpiapm.c,v 1.3 2023/01/30 10:49:04 jsg Exp $ */
 /*
  * Copyright (c) 2007 Ted Unangst <tedu@openbsd.org>
  *
@@ -17,8 +17,6 @@
 
 #include <sys/param.h>
 #include <machine/conf.h>
-#include <sys/event.h>
-
 
 int (*acpiapm_open)(dev_t, int, int, struct proc *);
 int (*acpiapm_close)(dev_t, int, int, struct proc *);
diff --git a/sys/arch/i386/i386/amdmsr.c b/sys/arch/i386/i386/amdmsr.c
index 8d01a7974f8..e1e809d8c4c 100644
--- a/sys/arch/i386/i386/amdmsr.c
+++ b/sys/arch/i386/i386/amdmsr.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: amdmsr.c,v 1.11 2022/02/21 10:24:28 mpi Exp $	*/
+/*      $OpenBSD: amdmsr.c,v 1.12 2023/01/30 10:49:04 jsg Exp $	*/
 
 /*
  * Copyright (c) 2008 Marc Balmer <mbalmer@openbsd.org>
@@ -24,18 +24,12 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/gpio.h>
 #include <sys/ioctl.h>
 #include <sys/conf.h>
-#include <machine/amdmsr.h>
 
-#include <machine/bus.h>
+#include <machine/amdmsr.h>
 #include <machine/cpufunc.h>
 
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcivar.h>
-#include <dev/pci/pcidevs.h>
-
 #ifdef APERTURE
 static int amdmsr_open_cnt;
 extern int allowaperture;
diff --git a/sys/arch/i386/i386/apic.c b/sys/arch/i386/i386/apic.c
index a0ae3e9754b..041932d7b7b 100644
--- a/sys/arch/i386/i386/apic.c
+++ b/sys/arch/i386/i386/apic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apic.c,v 1.6 2009/08/13 13:24:48 kettenis Exp $	*/
+/*	$OpenBSD: apic.c,v 1.7 2023/01/30 10:49:04 jsg Exp $	*/
 /* $NetBSD: apic.c,v 1.1.2.2 2000/02/21 18:51:00 sommerfeld Exp $ */
 
 /*-
@@ -36,7 +36,6 @@
 #include <sys/systm.h>
 
 #include <machine/i82489reg.h>
-#include <machine/i82489var.h>
 #include <machine/apicvar.h>
 
 void
diff --git a/sys/arch/i386/i386/apm.c b/sys/arch/i386/i386/apm.c
index bf6087c7335..7cd1f27440c 100644
--- a/sys/arch/i386/i386/apm.c
+++ b/sys/arch/i386/i386/apm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apm.c,v 1.128 2022/12/06 01:56:44 cheloha Exp $	*/
+/*	$OpenBSD: apm.c,v 1.129 2023/01/30 10:49:04 jsg Exp $	*/
 
 /*-
  * Copyright (c) 1998-2001 Michael Shalayeff. All rights reserved.
@@ -38,30 +38,22 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/signalvar.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
 #include <sys/rwlock.h>
 #include <sys/sysctl.h>
-#include <sys/malloc.h>
 #include <sys/clockintr.h>
 #include <sys/device.h>
 #include <sys/fcntl.h>
-#include <sys/ioctl.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/event.h>
 
 #include <machine/conf.h>
-#include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/gdt.h>
-#include <machine/psl.h>
 
 #include <dev/isa/isareg.h>
-#include <i386/isa/isa_machdep.h>
-#include <i386/isa/nvram.h>
-#include <dev/isa/isavar.h>
 #include <dev/wscons/wsdisplayvar.h>
 
 #include <machine/acpiapm.h>
diff --git a/sys/arch/i386/i386/autoconf.c b/sys/arch/i386/i386/autoconf.c
index 6ddeee4fc35..db7970f616a 100644
--- a/sys/arch/i386/i386/autoconf.c
+++ b/sys/arch/i386/i386/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.108 2022/09/08 10:22:06 kn Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.109 2023/01/30 10:49:04 jsg Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.20 1996/05/03 19:41:56 christos Exp $	*/
 
 /*-
@@ -47,13 +47,8 @@
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/user.h>
-#include <sys/buf.h>
-#include <sys/disklabel.h>
-#include <sys/conf.h>
 #include <sys/reboot.h>
 #include <sys/device.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
 #include <sys/hibernate.h>
 
 #include <net/if.h>
@@ -63,13 +58,9 @@
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/pte.h>
-#include <machine/cpu.h>
 #include <machine/gdt.h>
 #include <machine/biosvar.h>
 
-#include <dev/cons.h>
-
 #include "ioapic.h"
 
 #include "acpi.h"
@@ -78,10 +69,6 @@
 #include <machine/i82093var.h>
 #endif
 
-#if NACPI > 0
-#include <dev/acpi/acpivar.h>
-#endif
-
 #ifdef MULTIPROCESSOR
 #include <machine/mpbiosvar.h>
 #endif
diff --git a/sys/arch/i386/i386/bios.c b/sys/arch/i386/i386/bios.c
index b0c8ea6bb5a..f0cfa72b8ba 100644
--- a/sys/arch/i386/i386/bios.c
+++ b/sys/arch/i386/i386/bios.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bios.c,v 1.127 2022/02/21 10:24:28 mpi Exp $	*/
+/*	$OpenBSD: bios.c,v 1.128 2023/01/30 10:49:04 jsg Exp $	*/
 
 /*
  * Copyright (c) 1997-2001 Michael Shalayeff
@@ -30,7 +30,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/errno.h>
 #include <sys/malloc.h>
@@ -43,14 +42,9 @@
 #include <dev/cons.h>
 #include <stand/boot/bootarg.h>
 
-#include <machine/cpu.h>
-#include <machine/pio.h>
-#include <machine/cpufunc.h>
 #include <machine/conf.h>
 #include <machine/gdt.h>
-#include <machine/pcb.h>
 #include <machine/biosvar.h>
-#include <machine/apmvar.h>
 #include <machine/mpbiosvar.h>
 #include <machine/smbiosvar.h>
 
@@ -59,9 +53,6 @@
 
 #include <dev/pci/pcivar.h>
 
-#include <dev/acpi/acpireg.h>
-#include <dev/acpi/acpivar.h>
-
 #include "apm.h"
 #include "acpi.h"
 #include "mpbios.h"
@@ -70,9 +61,8 @@
 
 #include "com.h"
 #if NCOM > 0
-#include <sys/tty.h>
+#include <sys/termios.h>
 #include <dev/ic/comvar.h>
-#include <dev/ic/comreg.h>
 #endif
 
 #include "softraid.h"
diff --git a/sys/arch/i386/i386/bus_dma.c b/sys/arch/i386/i386/bus_dma.c
index 0412ea6dcfa..70b16c5887d 100644
--- a/sys/arch/i386/i386/bus_dma.c
+++ b/sys/arch/i386/i386/bus_dma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus_dma.c,v 1.35 2015/12/17 17:16:04 tedu Exp $	*/
+/*	$OpenBSD: bus_dma.c,v 1.36 2023/01/30 10:49:04 jsg Exp $	*/
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -66,16 +66,12 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 
 #include <machine/bus.h>
 
-#include <dev/isa/isareg.h>
-#include <dev/isa/isavar.h>
-
 #include <uvm/uvm_extern.h>
 
 int	_bus_dmamap_load_buffer(bus_dma_tag_t, bus_dmamap_t, void *,
diff --git a/sys/arch/i386/i386/bus_space.c b/sys/arch/i386/i386/bus_space.c
index 10dee17eb3f..56dd5333b47 100644
--- a/sys/arch/i386/i386/bus_space.c
+++ b/sys/arch/i386/i386/bus_space.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus_space.c,v 1.9 2015/04/25 21:31:24 guenther Exp $ */
+/*	$OpenBSD: bus_space.c,v 1.10 2023/01/30 10:49:04 jsg Exp $ */
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -62,9 +62,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/extent.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 4c7365f282b..dab1da63a89 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.174 2022/09/02 20:06:56 miod Exp $	*/
+/*	$OpenBSD: conf.c,v 1.175 2023/01/30 10:49:04 jsg Exp $	*/
 /*	$NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $	*/
 
 /*
@@ -32,10 +32,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/buf.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/vnode.h>
 
diff --git a/sys/arch/i386/i386/cpu.c b/sys/arch/i386/i386/cpu.c
index 5f6d94e22a6..1baf2c7f9bc 100644
--- a/sys/arch/i386/i386/cpu.c
+++ b/sys/arch/i386/i386/cpu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.c,v 1.110 2022/12/06 01:56:44 cheloha Exp $	*/
+/*	$OpenBSD: cpu.c,v 1.111 2023/01/30 10:49:04 jsg Exp $	*/
 /* $NetBSD: cpu.c,v 1.1.2.7 2000/06/26 02:04:05 sommerfeld Exp $ */
 
 /*-
@@ -72,7 +72,6 @@
 #include <sys/timeout.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/malloc.h>
 #include <sys/memrange.h>
 #include <sys/atomic.h>
 
@@ -84,9 +83,7 @@
 #include <machine/cpufunc.h>
 #include <machine/cpuvar.h>
 #include <machine/pmap.h>
-#include <machine/vmparam.h>
 #include <machine/mpbiosvar.h>
-#include <machine/npx.h>
 #include <machine/pcb.h>
 #include <machine/specialreg.h>
 #include <machine/segments.h>
@@ -94,7 +91,6 @@
 #include <machine/pio.h>
 
 #if NLAPIC > 0
-#include <machine/apicvar.h>
 #include <machine/i82489reg.h>
 #include <machine/i82489var.h>
 #endif
diff --git a/sys/arch/i386/i386/db_interface.c b/sys/arch/i386/i386/db_interface.c
index e1700e18f96..aa6d6151b14 100644
--- a/sys/arch/i386/i386/db_interface.c
+++ b/sys/arch/i386/i386/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.44 2022/04/14 19:47:11 naddy Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.45 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: db_interface.c,v 1.22 1996/05/03 19:42:00 christos Exp $	*/
 
 /*
@@ -33,20 +33,14 @@
  * Interface to new debugger.
  */
 #include <sys/param.h>
-#include <sys/reboot.h>
 #include <sys/systm.h>
-#include <sys/mutex.h>
-
-#include <uvm/uvm_extern.h>
 
 #include <dev/cons.h>
 
 #include <machine/db_machdep.h>
 
-#include <ddb/db_sym.h>
 #include <ddb/db_command.h>
 #include <ddb/db_extern.h>
-#include <ddb/db_access.h>
 #include <ddb/db_output.h>
 #include <ddb/db_run.h>
 #include <ddb/db_var.h>
diff --git a/sys/arch/i386/i386/db_mp.c b/sys/arch/i386/i386/db_mp.c
index d3c576bf5b1..83ac7c3c9d4 100644
--- a/sys/arch/i386/i386/db_mp.c
+++ b/sys/arch/i386/i386/db_mp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_mp.c,v 1.13 2020/09/11 09:27:10 mpi Exp $	*/
+/*	$OpenBSD: db_mp.c,v 1.14 2023/01/30 10:49:05 jsg Exp $	*/
 
 /*
  * Copyright (c) 2003, 2004 Andreas Gunnarsson <andreas@openbsd.org>
@@ -23,8 +23,6 @@
 
 #include <machine/db_machdep.h>
 
-#include <ddb/db_output.h>
-
 struct db_mutex ddb_mp_mutex = DB_MUTEX_INITIALIZER;
 
 volatile int ddb_state = DDB_STATE_NOT_RUNNING;	/* protected by ddb_mp_mutex */
diff --git a/sys/arch/i386/i386/db_trace.c b/sys/arch/i386/i386/db_trace.c
index cdd31038e45..8242374ab97 100644
--- a/sys/arch/i386/i386/db_trace.c
+++ b/sys/arch/i386/i386/db_trace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_trace.c,v 1.42 2020/05/14 06:58:54 mpi Exp $	*/
+/*	$OpenBSD: db_trace.c,v 1.43 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: db_trace.c,v 1.18 1996/05/03 19:42:01 christos Exp $	*/
 
 /*
@@ -38,7 +38,6 @@
 #include <ddb/db_sym.h>
 #include <ddb/db_access.h>
 #include <ddb/db_variables.h>
-#include <ddb/db_output.h>
 #include <ddb/db_interface.h>
 
 /*
diff --git a/sys/arch/i386/i386/esm.c b/sys/arch/i386/i386/esm.c
index 6d79e89f098..51535d0d197 100644
--- a/sys/arch/i386/i386/esm.c
+++ b/sys/arch/i386/i386/esm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: esm.c,v 1.63 2022/04/16 19:32:54 naddy Exp $ */
+/*	$OpenBSD: esm.c,v 1.64 2023/01/30 10:49:05 jsg Exp $ */
 
 /*
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
@@ -20,7 +20,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/timeout.h>
 #include <sys/queue.h>
diff --git a/sys/arch/i386/i386/est.c b/sys/arch/i386/i386/est.c
index bf98ef8ffdb..972d3bc5998 100644
--- a/sys/arch/i386/i386/est.c
+++ b/sys/arch/i386/i386/est.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: est.c,v 1.54 2021/08/17 19:44:01 tb Exp $ */
+/*	$OpenBSD: est.c,v 1.55 2023/01/30 10:49:05 jsg Exp $ */
 /*
  * Copyright (c) 2003 Michael Eriksson.
  * All rights reserved.
@@ -67,7 +67,6 @@
 
 #if NACPICPU > 0
 #include <dev/acpi/acpidev.h>
-#include <dev/acpi/acpivar.h>
 #endif
 
 /* Convert MHz and mV into IDs for passing to the MSR. */
diff --git a/sys/arch/i386/i386/gdt.c b/sys/arch/i386/i386/gdt.c
index 9482aa4cb5f..67438af6800 100644
--- a/sys/arch/i386/i386/gdt.c
+++ b/sys/arch/i386/i386/gdt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gdt.c,v 1.43 2018/06/22 13:21:14 bluhm Exp $	*/
+/*	$OpenBSD: gdt.c,v 1.44 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: gdt.c,v 1.28 2002/12/14 09:38:50 junyoung Exp $	*/
 
 /*-
@@ -44,11 +44,7 @@
 #include <sys/systm.h>
 #include <sys/mutex.h>
 
-#include <uvm/uvm_extern.h>
-
-#include <machine/cpu.h>
 #include <machine/gdt.h>
-#include <machine/pcb.h>
 #include <machine/tss.h>
 
 struct mutex gdt_lock_store = MUTEX_INITIALIZER(IPL_HIGH);
diff --git a/sys/arch/i386/i386/hibernate_machdep.c b/sys/arch/i386/i386/hibernate_machdep.c
index 0e902cf4dca..2e1be187544 100644
--- a/sys/arch/i386/i386/hibernate_machdep.c
+++ b/sys/arch/i386/i386/hibernate_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hibernate_machdep.c,v 1.60 2023/01/17 23:12:37 jsg Exp $	*/
+/*	$OpenBSD: hibernate_machdep.c,v 1.61 2023/01/30 10:49:05 jsg Exp $	*/
 
 /*
  * Copyright (c) 2011 Mike Larkin <mlarkin@openbsd.org>
@@ -18,17 +18,12 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/buf.h>
-#include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/disk.h>
 #include <sys/disklabel.h>
 #include <sys/hibernate.h>
-#include <sys/timeout.h>
-#include <sys/malloc.h>
 
 #include <uvm/uvm_extern.h>
-#include <uvm/uvm_pmemrange.h>
 
 #include <machine/biosvar.h>
 #include <machine/hibernate.h>
diff --git a/sys/arch/i386/i386/i686_mem.c b/sys/arch/i386/i386/i686_mem.c
index 8ac78325ede..985062caac4 100644
--- a/sys/arch/i386/i386/i686_mem.c
+++ b/sys/arch/i386/i386/i686_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i686_mem.c,v 1.19 2018/07/30 14:19:12 kettenis Exp $ */
+/* $OpenBSD: i686_mem.c,v 1.20 2023/01/30 10:49:05 jsg Exp $ */
 /*
  * Copyright (c) 1999 Michael Smith <msmith@freebsd.org>
  * All rights reserved.
@@ -28,13 +28,11 @@
  */
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/memrange.h>
 
 #include <machine/cpufunc.h>
-#include <machine/intr.h>
 #include <machine/specialreg.h>
 
 /*
diff --git a/sys/arch/i386/i386/ioapic.c b/sys/arch/i386/i386/ioapic.c
index 012f578cd7f..33e617cb217 100644
--- a/sys/arch/i386/i386/ioapic.c
+++ b/sys/arch/i386/i386/ioapic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ioapic.c,v 1.43 2022/02/21 10:24:28 mpi Exp $	*/
+/*	$OpenBSD: ioapic.c,v 1.44 2023/01/30 10:49:05 jsg Exp $	*/
 /* 	$NetBSD: ioapic.c,v 1.7 2003/07/14 22:32:40 lukem Exp $	*/
 
 /*-
@@ -73,20 +73,14 @@
 #include <machine/bus.h>
 #include <machine/psl.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <machine/i82093reg.h>
 #include <machine/i82093var.h>
 
 #include <machine/i82489reg.h>
 #include <machine/i82489var.h>
 
-#include <machine/pmap.h>
-
 #include <machine/mpbiosvar.h>
 
-#include "isa.h"
-
 /*
  * XXX locking
  */
diff --git a/sys/arch/i386/i386/ipifuncs.c b/sys/arch/i386/i386/ipifuncs.c
index aada9fb54d1..17a00c22e8d 100644
--- a/sys/arch/i386/i386/ipifuncs.c
+++ b/sys/arch/i386/i386/ipifuncs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipifuncs.c,v 1.33 2020/09/13 11:53:16 jsg Exp $	*/
+/*	$OpenBSD: ipifuncs.c,v 1.34 2023/01/30 10:49:05 jsg Exp $	*/
 /* $NetBSD: ipifuncs.c,v 1.1.2.3 2000/06/26 02:04:06 sommerfeld Exp $ */
 
 /*-
@@ -39,20 +39,14 @@
 #include "npx.h"
 
 #include <sys/param.h>
-#include <sys/device.h>
 #include <sys/memrange.h>
 #include <sys/systm.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <machine/cpufunc.h>
 #include <machine/cpuvar.h>
 #include <machine/intr.h>
 #include <machine/atomic.h>
-#include <machine/i82093var.h>
 #include <machine/db_machdep.h>
-#include <machine/mplock.h>
-#include <machine/vmmvar.h>
 
 void i386_ipi_nop(struct cpu_info *);
 void i386_ipi_halt(struct cpu_info *);
diff --git a/sys/arch/i386/i386/k1x-pstate.c b/sys/arch/i386/i386/k1x-pstate.c
index 89a46b33923..d2801330c9a 100644
--- a/sys/arch/i386/i386/k1x-pstate.c
+++ b/sys/arch/i386/i386/k1x-pstate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: k1x-pstate.c,v 1.13 2021/08/11 18:46:11 tb Exp $ */
+/*	$OpenBSD: k1x-pstate.c,v 1.14 2023/01/30 10:49:05 jsg Exp $ */
 /*
  * Copyright (c) 2011 Bryan Steele <brynet@gmail.com>
  *
@@ -29,7 +29,6 @@
 #include <sys/malloc.h>
 #include <sys/sysctl.h>
 
-#include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/bus.h>
 
@@ -37,7 +36,6 @@
 
 #if NACPICPU > 0
 #include <dev/acpi/acpidev.h>
-#include <dev/acpi/acpivar.h>
 #endif
 
 extern int setperf_prio;
diff --git a/sys/arch/i386/i386/k6_mem.c b/sys/arch/i386/i386/k6_mem.c
index 408ea72f28e..6aef4adb771 100644
--- a/sys/arch/i386/i386/k6_mem.c
+++ b/sys/arch/i386/i386/k6_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: k6_mem.c,v 1.13 2018/07/30 14:19:12 kettenis Exp $ */
+/* $OpenBSD: k6_mem.c,v 1.14 2023/01/30 10:49:05 jsg Exp $ */
 /*-
  * Copyright (c) 1999 Brian Fundakowski Feldman
  * All rights reserved.
@@ -29,14 +29,11 @@
  */
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
-#include <sys/ioccom.h>
 #include <sys/malloc.h>
 #include <sys/memrange.h>
 
 #include <machine/cpufunc.h>
-#include <machine/specialreg.h>
 
 /*
  * A K6-2 MTRR is defined as the highest 15 bits having the address, the next
diff --git a/sys/arch/i386/i386/lapic.c b/sys/arch/i386/i386/lapic.c
index f7a6ef55721..3671b31db40 100644
--- a/sys/arch/i386/i386/lapic.c
+++ b/sys/arch/i386/i386/lapic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lapic.c,v 1.53 2022/12/06 01:56:44 cheloha Exp $	*/
+/*	$OpenBSD: lapic.c,v 1.54 2023/01/30 10:49:05 jsg Exp $	*/
 /* $NetBSD: lapic.c,v 1.1.2.8 2000/02/23 06:10:50 sommerfeld Exp $ */
 
 /*-
@@ -40,13 +40,10 @@
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/cpuvar.h>
 #include <machine/pmap.h>
-#include <machine/vmparam.h>
 #include <machine/mpbiosvar.h>
-#include <machine/pcb.h>
 #include <machine/specialreg.h>
 #include <machine/segments.h>
 
diff --git a/sys/arch/i386/i386/longrun.c b/sys/arch/i386/i386/longrun.c
index 5d1579dd94e..ffea45bd37e 100644
--- a/sys/arch/i386/i386/longrun.c
+++ b/sys/arch/i386/i386/longrun.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: longrun.c,v 1.17 2018/07/30 14:19:12 kettenis Exp $ */
+/* $OpenBSD: longrun.c,v 1.18 2023/01/30 10:49:05 jsg Exp $ */
 /*
  * Copyright (c) 2003 Ted Unangst
  * Copyright (c) 2001 Tamotsu Hattori
@@ -30,7 +30,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/timeout.h>
 
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index b911a9734be..14949a6b913 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.662 2023/01/11 02:49:34 cheloha Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.663 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $	*/
 
 /*-
@@ -70,19 +70,15 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signalvar.h>
-#include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/user.h>
 #include <sys/exec.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/conf.h>
-#include <sys/timeout.h>
 #include <sys/malloc.h>
-#include <sys/mbuf.h>
 #include <sys/msgbuf.h>
 #include <sys/mount.h>
-#include <sys/vnode.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/sysctl.h>
@@ -103,11 +99,9 @@
 #include <machine/cpu_full.h>
 #include <machine/cpufunc.h>
 #include <machine/cpuvar.h>
-#include <machine/gdt.h>
 #include <machine/kcore.h>
 #include <machine/pio.h>
 #include <machine/psl.h>
-#include <machine/reg.h>
 #include <machine/specialreg.h>
 #include <machine/biosvar.h>
 #include <machine/pte.h>
@@ -116,11 +110,8 @@
 #endif /* MULTIPROCESSOR */
 
 #include <dev/isa/isareg.h>
-#include <dev/isa/isavar.h>
 #include <dev/ic/i8042reg.h>
-#include <dev/ic/mc146818reg.h>
 #include <i386/isa/isa_machdep.h>
-#include <i386/isa/nvram.h>
 
 #include "acpi.h"
 #if NACPI > 0
@@ -134,8 +125,6 @@
 
 #ifdef DDB
 #include <machine/db_machdep.h>
-#include <ddb/db_access.h>
-#include <ddb/db_sym.h>
 #include <ddb/db_extern.h>
 #endif
 
@@ -147,13 +136,6 @@ extern struct proc *npxproc;
 #endif
 
 #include "bios.h"
-#include "com.h"
-
-#if NCOM > 0
-#include <sys/termios.h>
-#include <dev/ic/comreg.h>
-#include <dev/ic/comvar.h>
-#endif /* NCOM > 0 */
 
 #ifdef HIBERNATE
 #include <machine/hibernate_var.h>
@@ -286,11 +268,6 @@ int allowaperture = 0;
 int has_rdrand;
 int has_rdseed;
 
-#include "pvbus.h"
-#if NPVBUS > 0
-#include <dev/pv/pvvar.h>
-#endif
-
 void	winchip_cpu_setup(struct cpu_info *);
 void	amd_family5_setperf_setup(struct cpu_info *);
 void	amd_family5_setup(struct cpu_info *);
diff --git a/sys/arch/i386/i386/mainbus.c b/sys/arch/i386/i386/mainbus.c
index 85e6254a68a..62c6ca3e9d7 100644
--- a/sys/arch/i386/i386/mainbus.c
+++ b/sys/arch/i386/i386/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.60 2022/02/21 10:24:28 mpi Exp $	*/
+/*	$OpenBSD: mainbus.c,v 1.61 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: mainbus.c,v 1.21 1997/06/06 23:14:20 thorpej Exp $	*/
 
 /*
@@ -47,8 +47,7 @@
 
 #include "pci.h"
 #include "eisa.h"
-#include "isa.h"
-#include "apm.h"
+#include "isadma.h"
 #include "bios.h"
 #include "acpi.h"
 #include "ipmi.h"
diff --git a/sys/arch/i386/i386/mem.c b/sys/arch/i386/i386/mem.c
index 903b3add790..174020c26ea 100644
--- a/sys/arch/i386/i386/mem.c
+++ b/sys/arch/i386/i386/mem.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: mem.c,v 1.31 1996/05/03 19:42:19 christos Exp $	*/
-/*	$OpenBSD: mem.c,v 1.54 2018/02/19 08:59:52 mpi Exp $ */
+/*	$OpenBSD: mem.c,v 1.55 2023/01/30 10:49:05 jsg Exp $ */
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -45,13 +45,10 @@
 #include <sys/filio.h>
 #include <sys/systm.h>
 #include <sys/uio.h>
-#include <sys/ioccom.h>
 #include <sys/malloc.h>
 #include <sys/memrange.h>
-#include <sys/fcntl.h>
 #include <sys/rwlock.h>
 
-#include <machine/cpu.h>
 #include <machine/conf.h>
 
 #include <uvm/uvm_extern.h>
diff --git a/sys/arch/i386/i386/mpbios.c b/sys/arch/i386/i386/mpbios.c
index 6bdcd2b9bee..25e07d88db3 100644
--- a/sys/arch/i386/i386/mpbios.c
+++ b/sys/arch/i386/i386/mpbios.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpbios.c,v 1.44 2022/02/21 10:24:28 mpi Exp $	*/
+/*	$OpenBSD: mpbios.c,v 1.45 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: mpbios.c,v 1.2 2002/10/01 12:56:57 fvdl Exp $	*/
 
 /*-
@@ -98,14 +98,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/specialreg.h>
-#include <machine/cputypes.h>
 #include <machine/cpuvar.h>
 #include <machine/bus.h>
 #include <machine/biosvar.h>
diff --git a/sys/arch/i386/i386/nvram.c b/sys/arch/i386/i386/nvram.c
index 516ef158284..c68ced2a2c2 100644
--- a/sys/arch/i386/i386/nvram.c
+++ b/sys/arch/i386/i386/nvram.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nvram.c,v 1.6 2016/03/07 05:32:47 naddy Exp $ */
+/*	$OpenBSD: nvram.c,v 1.7 2023/01/30 10:49:05 jsg Exp $ */
 
 /*
  * Copyright (c) 2004 Joshua Stein <jcs@openbsd.org>
@@ -29,10 +29,8 @@
 #include <sys/systm.h>
 #include <sys/uio.h>
 #include <sys/fcntl.h>
-#include <sys/conf.h>
 
 #include <dev/ic/mc146818reg.h>
-#include <i386/isa/nvram.h>
 
 /* checksum is calculated over bytes 2 to 31 and stored in byte 32 */
 #define NVRAM_CSUM_START	(MC_NVRAM_START + 2)
diff --git a/sys/arch/i386/i386/pctr.c b/sys/arch/i386/i386/pctr.c
index 88c5b5e0b61..29be98fd7eb 100644
--- a/sys/arch/i386/i386/pctr.c
+++ b/sys/arch/i386/i386/pctr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pctr.c,v 1.30 2017/09/08 05:36:51 deraadt Exp $	*/
+/*	$OpenBSD: pctr.c,v 1.31 2023/01/30 10:49:05 jsg Exp $	*/
 
 /*
  * Pentium performance counter driver for OpenBSD.
@@ -12,11 +12,8 @@
 #include <sys/param.h>
 #include <sys/errno.h>
 #include <sys/fcntl.h>
-#include <sys/ioccom.h>
 #include <sys/systm.h>
 
-#include <machine/cputypes.h>
-#include <machine/psl.h>
 #include <machine/pctr.h>
 #include <machine/cpu.h>
 #include <machine/specialreg.h>
diff --git a/sys/arch/i386/i386/pmap.c b/sys/arch/i386/i386/pmap.c
index 4abec69c710..63b7e1077a6 100644
--- a/sys/arch/i386/i386/pmap.c
+++ b/sys/arch/i386/i386/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.219 2022/06/29 14:24:29 dv Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.220 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: pmap.c,v 1.91 2000/06/02 17:46:37 thorpej Exp $	*/
 
 /*
@@ -57,19 +57,14 @@
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/proc.h>
-#include <sys/malloc.h>
 #include <sys/pool.h>
 #include <sys/user.h>
-#include <sys/kernel.h>
 #include <sys/mutex.h>
 
 #include <uvm/uvm.h>
 
-#include <machine/cpu.h>
 #include <machine/specialreg.h>
-#include <machine/gdt.h>
 
-#include <dev/isa/isareg.h>
 #include <sys/msgbuf.h>
 #include <stand/boot/bootarg.h>
 
diff --git a/sys/arch/i386/i386/pmapae.c b/sys/arch/i386/i386/pmapae.c
index f3fc242bc19..9acf7044955 100644
--- a/sys/arch/i386/i386/pmapae.c
+++ b/sys/arch/i386/i386/pmapae.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmapae.c,v 1.67 2022/06/29 14:24:29 dv Exp $	*/
+/*	$OpenBSD: pmapae.c,v 1.68 2023/01/30 10:49:05 jsg Exp $	*/
 
 /*
  * Copyright (c) 2006-2008 Michael Shalayeff
@@ -80,23 +80,16 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
-#include <sys/proc.h>
-#include <sys/malloc.h>
 #include <sys/pool.h>
 #include <sys/user.h>
-#include <sys/kernel.h>
 #include <sys/mutex.h>
 
 #include <uvm/uvm.h>
 
-#include <machine/cpu.h>
 #include <machine/specialreg.h>
-#include <machine/gdt.h>
 
 #include <dev/isa/isareg.h>
 #include <i386/isa/isa_machdep.h>
-#include <sys/msgbuf.h>
-#include <stand/boot/bootarg.h>
 
 #include "ksyms.h"
 
diff --git a/sys/arch/i386/i386/powernow-k7.c b/sys/arch/i386/i386/powernow-k7.c
index 8c29f073a22..e5626b0c562 100644
--- a/sys/arch/i386/i386/powernow-k7.c
+++ b/sys/arch/i386/i386/powernow-k7.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: powernow-k7.c,v 1.43 2018/07/30 14:19:12 kettenis Exp $ */
+/* $OpenBSD: powernow-k7.c,v 1.44 2023/01/30 10:49:05 jsg Exp $ */
 
 /*
  * Copyright (c) 2004 Martin Végiard.
@@ -33,7 +33,6 @@
 #include <sys/malloc.h>
 #include <sys/sysctl.h>
 
-#include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/bus.h>
 
@@ -44,7 +43,6 @@
 
 #if NACPICPU > 0
 #include <dev/acpi/acpidev.h>
-#include <dev/acpi/acpivar.h>
 #endif
 
 #define BIOS_START			0xe0000
diff --git a/sys/arch/i386/i386/powernow-k8.c b/sys/arch/i386/i386/powernow-k8.c
index 17185ced8eb..33c6007d5f8 100644
--- a/sys/arch/i386/i386/powernow-k8.c
+++ b/sys/arch/i386/i386/powernow-k8.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: powernow-k8.c,v 1.34 2018/07/04 02:06:15 mlarkin Exp $ */
+/*	$OpenBSD: powernow-k8.c,v 1.35 2023/01/30 10:49:05 jsg Exp $ */
 
 /*
  * Copyright (c) 2004 Martin Végiard.
@@ -35,7 +35,6 @@
 #include <dev/isa/isareg.h>
 #include <i386/isa/isa_machdep.h>
 
-#include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/bus.h>
 
@@ -43,7 +42,6 @@
 
 #if NACPICPU > 0
 #include <dev/acpi/acpidev.h>
-#include <dev/acpi/acpivar.h>
 #endif
 
 #define BIOS_START			0xe0000
diff --git a/sys/arch/i386/i386/process_machdep.c b/sys/arch/i386/i386/process_machdep.c
index 911f06a4c57..65a9e0c0ef3 100644
--- a/sys/arch/i386/i386/process_machdep.c
+++ b/sys/arch/i386/i386/process_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: process_machdep.c,v 1.29 2018/07/09 19:20:29 guenther Exp $	*/
+/*	$OpenBSD: process_machdep.c,v 1.30 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: process_machdep.c,v 1.22 1996/05/03 19:42:25 christos Exp $	*/
 
 /*
@@ -62,11 +62,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/time.h>
-#include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/user.h>
-#include <sys/vnode.h>
 #include <sys/ptrace.h>
 
 #include <machine/psl.h>
diff --git a/sys/arch/i386/i386/rbus_machdep.c b/sys/arch/i386/i386/rbus_machdep.c
index e123322becf..81938677751 100644
--- a/sys/arch/i386/i386/rbus_machdep.c
+++ b/sys/arch/i386/i386/rbus_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rbus_machdep.c,v 1.27 2010/09/22 02:28:37 jsg Exp $ */
+/*	$OpenBSD: rbus_machdep.c,v 1.28 2023/01/30 10:49:05 jsg Exp $ */
 /*	$NetBSD: rbus_machdep.c,v 1.2 1999/10/15 06:43:06 haya Exp $	*/
 
 /*
@@ -28,11 +28,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/device.h>
 #include <sys/extent.h>
 
-#include <uvm/uvm_extern.h>
-
 #include <machine/bus.h>
 #include <dev/cardbus/rbus.h>
 
diff --git a/sys/arch/i386/i386/sys_machdep.c b/sys/arch/i386/i386/sys_machdep.c
index aa1b6115639..1f35ab27d95 100644
--- a/sys/arch/i386/i386/sys_machdep.c
+++ b/sys/arch/i386/i386/sys_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_machdep.c,v 1.40 2018/07/09 19:20:29 guenther Exp $	*/
+/*	$OpenBSD: sys_machdep.c,v 1.41 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: sys_machdep.c,v 1.28 1996/05/03 19:42:29 christos Exp $	*/
 
 /*-
@@ -38,28 +38,13 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/ioctl.h>
-#include <sys/time.h>
 #include <sys/proc.h>
-#include <sys/signalvar.h>
 #include <sys/user.h>
-#include <sys/uio.h>
-#include <sys/kernel.h>
-#include <sys/mtio.h>
-#include <sys/buf.h>
-#include <sys/signal.h>
-#include <sys/malloc.h>
 
 #include <sys/mount.h>
 #include <sys/syscallargs.h>
 
-#include <uvm/uvm_extern.h>
-
-#include <machine/cpu.h>
-#include <machine/cpufunc.h>
-#include <machine/gdt.h>
 #include <machine/psl.h>
-#include <machine/reg.h>
 #include <machine/sysarch.h>
 
 extern struct vm_map *kernel_map;
diff --git a/sys/arch/i386/i386/trap.c b/sys/arch/i386/i386/trap.c
index bdbc90a416c..9751eb9e8ef 100644
--- a/sys/arch/i386/i386/trap.c
+++ b/sys/arch/i386/i386/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.158 2023/01/18 05:06:44 deraadt Exp $	*/
+/*	$OpenBSD: trap.c,v 1.159 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: trap.c,v 1.95 1996/05/05 06:50:02 mycroft Exp $	*/
 
 /*-
@@ -45,27 +45,20 @@
 #include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <sys/user.h>
-#include <sys/acct.h>
-#include <sys/kernel.h>
 #include <sys/signal.h>
 #include <sys/syscall.h>
 #include <sys/syscall_mi.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/psl.h>
-#include <machine/reg.h>
 #include <machine/trap.h>
 #ifdef DDB
 #include <machine/db_machdep.h>
 #endif
 
-#include <sys/exec.h>
-
 #include "isa.h"
-#include "npx.h"
 
 int upageflttrap(struct trapframe *, uint32_t);
 int kpageflttrap(struct trapframe *, uint32_t);
diff --git a/sys/arch/i386/i386/vm_machdep.c b/sys/arch/i386/i386/vm_machdep.c
index d887a9d308d..1b2624bcbe6 100644
--- a/sys/arch/i386/i386/vm_machdep.c
+++ b/sys/arch/i386/i386/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.72 2022/02/21 19:18:52 kettenis Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.73 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.61 1996/05/03 19:42:35 christos Exp $	*/
 
 /*-
@@ -45,21 +45,11 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/signalvar.h>
-#include <sys/malloc.h>
-#include <sys/vnode.h>
 #include <sys/buf.h>
 #include <sys/user.h>
-#include <sys/exec.h>
-#include <sys/ptrace.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/cpu.h>
-#include <machine/gdt.h>
-#include <machine/reg.h>
-#include <machine/specialreg.h>
-
 #include "npx.h"
 
 /*
diff --git a/sys/arch/i386/i386/wscons_machdep.c b/sys/arch/i386/i386/wscons_machdep.c
index d7cc1651cbc..bcdc7147c01 100644
--- a/sys/arch/i386/i386/wscons_machdep.c
+++ b/sys/arch/i386/i386/wscons_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wscons_machdep.c,v 1.19 2016/03/07 05:32:47 naddy Exp $ */
+/*	$OpenBSD: wscons_machdep.c,v 1.20 2023/01/30 10:49:05 jsg Exp $ */
 
 /*
  * Copyright (c) 2001 Aaron Campbell
@@ -28,10 +28,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/conf.h>
-#include <sys/device.h>
-#include <sys/extent.h>
 
 #include <machine/bus.h>
 
@@ -62,7 +59,6 @@
 #include <dev/ic/i8042reg.h>
 #include <dev/ic/pckbcvar.h>
 #endif
-#include "pckbd.h"
 #include "ukbd.h"
 #if (NUKBD > 0)
 #include <dev/usb/ukbdvar.h>
diff --git a/sys/arch/i386/isa/clock.c b/sys/arch/i386/isa/clock.c
index 7b0b60d1140..0f0b70e3f9a 100644
--- a/sys/arch/i386/isa/clock.c
+++ b/sys/arch/i386/isa/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.62 2022/12/06 01:56:44 cheloha Exp $	*/
+/*	$OpenBSD: clock.c,v 1.63 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: clock.c,v 1.39 1996/05/12 23:11:54 mycroft Exp $	*/
 
 /*-
@@ -90,13 +90,10 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/clockintr.h>
-#include <sys/device.h>
-#include <sys/stdint.h>
 #include <sys/timeout.h>
 #include <sys/timetc.h>
 #include <sys/mutex.h>
 
-#include <machine/cpu.h>
 #include <machine/intr.h>
 #include <machine/pio.h>
 #include <machine/cpufunc.h>
diff --git a/sys/arch/i386/isa/isapnp_machdep.c b/sys/arch/i386/isa/isapnp_machdep.c
index e2a0179d18e..08413ee104f 100644
--- a/sys/arch/i386/isa/isapnp_machdep.c
+++ b/sys/arch/i386/isa/isapnp_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isapnp_machdep.c,v 1.4 2008/06/26 05:42:11 ray Exp $	*/
+/*	$OpenBSD: isapnp_machdep.c,v 1.5 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: isapnp_machdep.c,v 1.5 1997/10/04 17:32:30 thorpej Exp $	*/
 
 /*-
@@ -76,8 +76,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/device.h>
-#include <sys/malloc.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/i386/isa/joy.c b/sys/arch/i386/isa/joy.c
index 204a5009d76..97d7bf0557e 100644
--- a/sys/arch/i386/isa/joy.c
+++ b/sys/arch/i386/isa/joy.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: joy.c,v 1.16 2018/07/30 14:19:12 kettenis Exp $	*/
+/*	$OpenBSD: joy.c,v 1.17 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: joy.c,v 1.3 1996/05/05 19:46:15 christos Exp $	*/
 
 /*-
@@ -38,13 +38,11 @@
 #include <sys/device.h>
 #include <sys/errno.h>
 
-#include <machine/cpu.h>
 #include <machine/pio.h>
 #include <machine/cpufunc.h>
 #include <machine/joystick.h>
 #include <machine/conf.h>
 
-#include <dev/isa/isavar.h>
 #include <dev/isa/isareg.h>
 #include <dev/ic/i8253reg.h>
 #include <i386/isa/joyreg.h>
diff --git a/sys/arch/i386/isa/joy_isapnp.c b/sys/arch/i386/isa/joy_isapnp.c
index d75c7ed30a5..17fe1ebf5f0 100644
--- a/sys/arch/i386/isa/joy_isapnp.c
+++ b/sys/arch/i386/isa/joy_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: joy_isapnp.c,v 1.8 2022/02/21 10:24:28 mpi Exp $	*/
+/*	$OpenBSD: joy_isapnp.c,v 1.9 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: joy.c,v 1.3 1996/05/05 19:46:15 christos Exp $	*/
 
 /*-
@@ -34,19 +34,12 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
-#include <sys/errno.h>
 
 #include <machine/cpu.h>
 #include <machine/pio.h>
-#include <machine/cpufunc.h>
-#include <machine/joystick.h>
-#include <machine/conf.h>
 
 #include <dev/isa/isavar.h>
-#include <dev/isa/isareg.h>
-#include <dev/ic/i8253reg.h>
 #include <i386/isa/joyreg.h>
 
 int		joy_isapnp_probe(struct device *, void *, void *);
diff --git a/sys/arch/i386/isa/npx.c b/sys/arch/i386/isa/npx.c
index b318d3a74f0..5e354d5d625 100644
--- a/sys/arch/i386/isa/npx.c
+++ b/sys/arch/i386/isa/npx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: npx.c,v 1.73 2022/02/21 10:24:28 mpi Exp $	*/
+/*	$OpenBSD: npx.c,v 1.74 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: npx.c,v 1.57 1996/05/12 23:12:24 mycroft Exp $	*/
 
 #if 0
@@ -42,16 +42,13 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/conf.h>
 #include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <sys/user.h>
-#include <sys/ioctl.h>
 #include <sys/device.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/cpu.h>
 #include <machine/intr.h>
 #include <machine/npx.h>
 #include <machine/pio.h>
@@ -61,7 +58,6 @@
 #include <machine/specialreg.h>
 #include <machine/i8259.h>
 
-#include <dev/isa/isareg.h>
 #include <dev/isa/isavar.h>
 
 /*
diff --git a/sys/arch/i386/pci/agp_machdep.c b/sys/arch/i386/pci/agp_machdep.c
index b144465e679..14738d58786 100644
--- a/sys/arch/i386/pci/agp_machdep.c
+++ b/sys/arch/i386/pci/agp_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: agp_machdep.c,v 1.20 2014/11/16 12:30:57 deraadt Exp $	*/
+/*	$OpenBSD: agp_machdep.c,v 1.21 2023/01/30 10:49:05 jsg Exp $	*/
 
 /*
  * Copyright (c) 2008 - 2009 Owain G. Ainsworth <oga@openbsd.org>
@@ -44,11 +44,9 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/rwlock.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
-#include <dev/pci/pcidevs.h>
 #include <dev/pci/agpvar.h>
 
 #include <uvm/uvm_extern.h>
diff --git a/sys/arch/i386/pci/ali1543.c b/sys/arch/i386/pci/ali1543.c
index df2216756ea..977833c4c85 100644
--- a/sys/arch/i386/pci/ali1543.c
+++ b/sys/arch/i386/pci/ali1543.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ali1543.c,v 1.5 2022/08/29 06:08:03 jsg Exp $	*/
+/*	$OpenBSD: ali1543.c,v 1.6 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: ali1543.c,v 1.2 2001/09/13 14:00:52 tshiozak Exp $	*/
 
 /*
@@ -89,16 +89,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/errno.h>
-#include <sys/device.h>
-#include <sys/malloc.h>
 
 #include <machine/intr.h>
 #include <machine/bus.h>
 
 #include <dev/pci/pcivar.h>
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcidevs.h>
 
 #include <i386/pci/pcibiosvar.h>
 #include <i386/pci/piixvar.h>
diff --git a/sys/arch/i386/pci/amd756.c b/sys/arch/i386/pci/amd756.c
index 39faed2bc55..042836bf408 100644
--- a/sys/arch/i386/pci/amd756.c
+++ b/sys/arch/i386/pci/amd756.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: amd756.c,v 1.5 2008/06/26 05:42:11 ray Exp $	*/
+/*	$OpenBSD: amd756.c,v 1.6 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD$	*/
 
 /*-
@@ -62,15 +62,12 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/device.h>
 #include <sys/malloc.h>
 
 #include <machine/intr.h>
 #include <machine/bus.h>
 
 #include <dev/pci/pcivar.h>
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcidevs.h>
 
 #include <i386/pci/pcibiosvar.h>
 #include <i386/pci/amd756reg.h>
diff --git a/sys/arch/i386/pci/glxsb.c b/sys/arch/i386/pci/glxsb.c
index 119159dc2bf..2b9f39cb24a 100644
--- a/sys/arch/i386/pci/glxsb.c
+++ b/sys/arch/i386/pci/glxsb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: glxsb.c,v 1.41 2022/02/21 10:24:28 mpi Exp $	*/
+/*	$OpenBSD: glxsb.c,v 1.42 2023/01/30 10:49:05 jsg Exp $	*/
 
 /*
  * Copyright (c) 2006 Tom Cosgrove <tom@openbsd.org>
@@ -38,7 +38,6 @@
 
 #ifdef CRYPTO
 #include <crypto/cryptodev.h>
-#include <crypto/aes.h>
 #include <crypto/xform.h>
 #include <crypto/cryptosoft.h>
 #endif
diff --git a/sys/arch/i386/pci/gscpcib.c b/sys/arch/i386/pci/gscpcib.c
index 1aa2c53085d..af9afa04a30 100644
--- a/sys/arch/i386/pci/gscpcib.c
+++ b/sys/arch/i386/pci/gscpcib.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gscpcib.c,v 1.7 2022/02/21 10:24:28 mpi Exp $	*/
+/*	$OpenBSD: gscpcib.c,v 1.8 2023/01/30 10:49:05 jsg Exp $	*/
 /*
  * Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
  *
@@ -25,7 +25,6 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/gpio.h>
-#include <sys/kernel.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/i386/pci/ichpcib.c b/sys/arch/i386/pci/ichpcib.c
index 0bf1c04b27d..6c9c1e85844 100644
--- a/sys/arch/i386/pci/ichpcib.c
+++ b/sys/arch/i386/pci/ichpcib.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ichpcib.c,v 1.31 2022/02/21 10:24:28 mpi Exp $	*/
+/*	$OpenBSD: ichpcib.c,v 1.32 2023/01/30 10:49:05 jsg Exp $	*/
 /*
  * Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org>
  *
@@ -36,9 +36,6 @@
 
 #include <dev/pci/ichreg.h>
 
-#include <machine/cpu.h>
-#include <machine/cpufunc.h>
-
 struct ichpcib_softc {
 	struct device sc_dev;
 
diff --git a/sys/arch/i386/pci/opti82c558.c b/sys/arch/i386/pci/opti82c558.c
index 0ff5ceccf48..dc961ac5651 100644
--- a/sys/arch/i386/pci/opti82c558.c
+++ b/sys/arch/i386/pci/opti82c558.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opti82c558.c,v 1.8 2008/06/26 05:42:11 ray Exp $	*/
+/*	$OpenBSD: opti82c558.c,v 1.9 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: opti82c558.c,v 1.2 2000/07/18 11:24:09 soda Exp $	*/
 
 /*-
@@ -62,15 +62,12 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/device.h>
 #include <sys/malloc.h>
 
 #include <machine/intr.h>
 #include <machine/bus.h>
 
 #include <dev/pci/pcivar.h>
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcidevs.h>
 
 #include <i386/pci/pcibiosvar.h>
 #include <i386/pci/opti82c558reg.h>
diff --git a/sys/arch/i386/pci/opti82c700.c b/sys/arch/i386/pci/opti82c700.c
index 833673b760a..5512ca95d0e 100644
--- a/sys/arch/i386/pci/opti82c700.c
+++ b/sys/arch/i386/pci/opti82c700.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: opti82c700.c,v 1.8 2008/06/26 05:42:11 ray Exp $	*/
+/*	$OpenBSD: opti82c700.c,v 1.9 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: opti82c700.c,v 1.2 2000/07/18 11:07:20 soda Exp $	*/
 
 /*-
@@ -62,15 +62,12 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/device.h>
 #include <sys/malloc.h>
 
 #include <machine/intr.h>
 #include <machine/bus.h>
 
 #include <dev/pci/pcivar.h>
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcidevs.h>
 
 #include <i386/pci/pcibiosvar.h>
 #include <i386/pci/opti82c700reg.h>
diff --git a/sys/arch/i386/pci/pchb.c b/sys/arch/i386/pci/pchb.c
index dc628e969aa..edae2fb7559 100644
--- a/sys/arch/i386/pci/pchb.c
+++ b/sys/arch/i386/pci/pchb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pchb.c,v 1.93 2022/02/21 10:24:28 mpi Exp $ */
+/*	$OpenBSD: pchb.c,v 1.94 2023/01/30 10:49:05 jsg Exp $ */
 /*	$NetBSD: pchb.c,v 1.65 2007/08/15 02:26:13 markd Exp $	*/
 
 /*
@@ -59,7 +59,6 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
-#include <sys/rwlock.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/i386/pci/pci_addr_fixup.c b/sys/arch/i386/pci/pci_addr_fixup.c
index 1757109c31e..27e3ca92977 100644
--- a/sys/arch/i386/pci/pci_addr_fixup.c
+++ b/sys/arch/i386/pci/pci_addr_fixup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_addr_fixup.c,v 1.25 2014/05/04 20:09:15 sf Exp $	*/
+/*	$OpenBSD: pci_addr_fixup.c,v 1.26 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: pci_addr_fixup.c,v 1.7 2000/08/03 20:10:45 nathanw Exp $	*/
 
 /*-
@@ -30,8 +30,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/device.h>
 #include <sys/extent.h>
 
 #include <uvm/uvm_extern.h>
@@ -40,7 +38,6 @@
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
-#include <dev/pci/pcidevs.h>
 
 #include <i386/pci/pcibiosvar.h>
 
diff --git a/sys/arch/i386/pci/pci_bus_fixup.c b/sys/arch/i386/pci/pci_bus_fixup.c
index fc1e58eba13..3e21d81e914 100644
--- a/sys/arch/i386/pci/pci_bus_fixup.c
+++ b/sys/arch/i386/pci/pci_bus_fixup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_bus_fixup.c,v 1.9 2006/08/18 22:18:18 kettenis Exp $	*/
+/*	$OpenBSD: pci_bus_fixup.c,v 1.10 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: pci_bus_fixup.c,v 1.1 1999/11/17 07:32:58 thorpej Exp $  */
 
 /*
@@ -32,8 +32,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/device.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/arch/i386/pci/pci_intr_fixup.c b/sys/arch/i386/pci/pci_intr_fixup.c
index b14b9b1ea0d..b58789bfb33 100644
--- a/sys/arch/i386/pci/pci_intr_fixup.c
+++ b/sys/arch/i386/pci/pci_intr_fixup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_intr_fixup.c,v 1.63 2021/03/06 09:20:50 jsg Exp $	*/
+/*	$OpenBSD: pci_intr_fixup.c,v 1.64 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: pci_intr_fixup.c,v 1.10 2000/08/10 21:18:27 soda Exp $	*/
 
 /*
@@ -86,14 +86,12 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/device.h>
 
 #include <machine/bus.h>
 #include <machine/intr.h>
-#include <machine/i8259.h>
 #include <machine/i82093var.h>
 
 #include <dev/pci/pcireg.h>
diff --git a/sys/arch/i386/pci/piix.c b/sys/arch/i386/pci/piix.c
index 9b0705b4249..d1692e18943 100644
--- a/sys/arch/i386/pci/piix.c
+++ b/sys/arch/i386/pci/piix.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: piix.c,v 1.11 2015/09/01 06:01:24 deraadt Exp $	*/
+/*	$OpenBSD: piix.c,v 1.12 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: piix.c,v 1.1 1999/11/17 01:21:20 thorpej Exp $	*/
 
 /*-
@@ -62,15 +62,12 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/device.h>
 #include <sys/malloc.h>
 
 #include <machine/intr.h>
 #include <machine/bus.h>
 
 #include <dev/pci/pcivar.h>
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcidevs.h>
 
 #include <i386/pci/pcibiosvar.h>
 #include <i386/pci/piixreg.h>
diff --git a/sys/arch/i386/pci/rccosb4.c b/sys/arch/i386/pci/rccosb4.c
index 4768c7a979c..a268dd39620 100644
--- a/sys/arch/i386/pci/rccosb4.c
+++ b/sys/arch/i386/pci/rccosb4.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rccosb4.c,v 1.6 2015/09/01 06:01:24 deraadt Exp $	*/
+/*	$OpenBSD: rccosb4.c,v 1.7 2023/01/30 10:49:05 jsg Exp $	*/
 
 /*
  * Copyright (c) 2004,2005 Michael Shalayeff
@@ -32,14 +32,12 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/device.h>
 #include <sys/malloc.h>
 
 #include <machine/intr.h>
 #include <machine/bus.h>
 
 #include <dev/pci/pcivar.h>
-#include <dev/pci/pcireg.h>
 
 #include <i386/pci/pcibiosvar.h>
 #include <i386/pci/piixvar.h>
diff --git a/sys/arch/i386/pci/sis85c503.c b/sys/arch/i386/pci/sis85c503.c
index 4b4e75cdc9b..604186daf13 100644
--- a/sys/arch/i386/pci/sis85c503.c
+++ b/sys/arch/i386/pci/sis85c503.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sis85c503.c,v 1.8 2008/06/26 05:42:11 ray Exp $	*/
+/*	$OpenBSD: sis85c503.c,v 1.9 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: sis85c503.c,v 1.2 2000/07/18 11:24:09 soda Exp $	*/
 
 /*-
@@ -62,14 +62,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/device.h>
 
 #include <machine/intr.h>
 #include <machine/bus.h>
 
 #include <dev/pci/pcivar.h>
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcidevs.h>
 
 #include <i386/pci/pcibiosvar.h>
 #include <i386/pci/sis85c503reg.h>
diff --git a/sys/arch/i386/pci/vga_post.c b/sys/arch/i386/pci/vga_post.c
index d9b38a43d7d..79b786a4232 100644
--- a/sys/arch/i386/pci/vga_post.c
+++ b/sys/arch/i386/pci/vga_post.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vga_post.c,v 1.10 2021/01/03 02:29:28 jmatthew Exp $ */
+/* $OpenBSD: vga_post.c,v 1.11 2023/01/30 10:49:05 jsg Exp $ */
 /* $NetBSD: vga_post.c,v 1.12 2009/03/15 21:32:36 cegger Exp $ */
 
 /*-
@@ -31,7 +31,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/device.h>
 #include <sys/malloc.h>
 
 #include <uvm/uvm_extern.h>
diff --git a/sys/arch/i386/pci/via8231.c b/sys/arch/i386/pci/via8231.c
index c7c85cfc7b9..8fa11a4faa6 100644
--- a/sys/arch/i386/pci/via8231.c
+++ b/sys/arch/i386/pci/via8231.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: via8231.c,v 1.8 2008/06/26 05:42:11 ray Exp $	*/
+/*	$OpenBSD: via8231.c,v 1.9 2023/01/30 10:49:05 jsg Exp $	*/
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -66,7 +66,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/device.h>
 #include <sys/malloc.h>
 
 #include <machine/intr.h>
diff --git a/sys/arch/i386/pci/via82c586.c b/sys/arch/i386/pci/via82c586.c
index 848b51dddef..24891bba69e 100644
--- a/sys/arch/i386/pci/via82c586.c
+++ b/sys/arch/i386/pci/via82c586.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: via82c586.c,v 1.11 2008/06/26 05:42:11 ray Exp $	*/
+/*	$OpenBSD: via82c586.c,v 1.12 2023/01/30 10:49:05 jsg Exp $	*/
 /*	$NetBSD: via82c586.c,v 1.2 2000/07/18 11:24:09 soda Exp $	*/
 
 /*-
@@ -62,14 +62,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/device.h>
 
 #include <machine/intr.h>
 #include <machine/bus.h>
 
 #include <dev/pci/pcivar.h>
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcidevs.h>
 
 #include <i386/pci/pcibiosvar.h>
 #include <i386/pci/via82c586reg.h>
-- 
2.20.1