From 65bbee46cad7861cd5a570f338df9e976422e3ab Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Thu, 26 Sep 2024 01:45:13 +0000
Subject: [PATCH] remove unneeded includes; ok dv@ mlarkin@

---
 usr.sbin/vmd/config.c       |  7 +------
 usr.sbin/vmd/control.c      |  7 +------
 usr.sbin/vmd/dhcp.c         |  3 +--
 usr.sbin/vmd/fw_cfg.c       |  3 +--
 usr.sbin/vmd/i8253.c        |  3 +--
 usr.sbin/vmd/loadfile_elf.c |  6 +-----
 usr.sbin/vmd/parse.y        |  5 +----
 usr.sbin/vmd/pci.c          |  4 +---
 usr.sbin/vmd/priv.c         |  9 +--------
 usr.sbin/vmd/proc.c         |  3 +--
 usr.sbin/vmd/proc.h         |  3 +--
 usr.sbin/vmd/psp.c          |  5 +----
 usr.sbin/vmd/sev.c          |  5 +----
 usr.sbin/vmd/vioblk.c       |  6 ++----
 usr.sbin/vmd/vionet.c       |  3 +--
 usr.sbin/vmd/vioqcow2.c     |  5 +----
 usr.sbin/vmd/vioscsi.c      |  4 +---
 usr.sbin/vmd/virtio.c       |  7 +------
 usr.sbin/vmd/vm.c           | 14 +-------------
 usr.sbin/vmd/vm_agentx.c    |  4 +---
 usr.sbin/vmd/vmd.c          |  4 +---
 usr.sbin/vmd/vmm.c          | 12 +-----------
 usr.sbin/vmd/x86_vm.c       |  3 +--
 23 files changed, 24 insertions(+), 101 deletions(-)

diff --git a/usr.sbin/vmd/config.c b/usr.sbin/vmd/config.c
index 3fb2c9b4003..45a9fddc3f1 100644
--- a/usr.sbin/vmd/config.c
+++ b/usr.sbin/vmd/config.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.c,v 1.75 2024/02/05 21:58:09 dv Exp $	*/
+/*	$OpenBSD: config.c,v 1.76 2024/09/26 01:45:13 jsg Exp $	*/
 
 /*
  * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -19,20 +19,15 @@
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/time.h>
-#include <sys/uio.h>
-#include <sys/stat.h>
-#include <sys/socket.h>
 
 #include <net/if.h>
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <termios.h>
 #include <unistd.h>
 #include <limits.h>
 #include <string.h>
 #include <fcntl.h>
-#include <util.h>
 #include <errno.h>
 #include <imsg.h>
 
diff --git a/usr.sbin/vmd/control.c b/usr.sbin/vmd/control.c
index e465ff13bb6..50279d45833 100644
--- a/usr.sbin/vmd/control.c
+++ b/usr.sbin/vmd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.42 2024/01/18 14:49:59 claudio Exp $	*/
+/*	$OpenBSD: control.c,v 1.43 2024/09/26 01:45:13 jsg Exp $	*/
 
 /*
  * Copyright (c) 2010-2015 Reyk Floeter <reyk@openbsd.org>
@@ -22,14 +22,9 @@
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <sys/tree.h>
-
-#include <net/if.h>
 
 #include <errno.h>
 #include <event.h>
-#include <fcntl.h>
-#include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/usr.sbin/vmd/dhcp.c b/usr.sbin/vmd/dhcp.c
index 67ab546b442..256a29f5126 100644
--- a/usr.sbin/vmd/dhcp.c
+++ b/usr.sbin/vmd/dhcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dhcp.c,v 1.13 2023/07/13 18:31:59 dv Exp $	*/
+/*	$OpenBSD: dhcp.c,v 1.14 2024/09/26 01:45:13 jsg Exp $	*/
 
 /*
  * Copyright (c) 2017 Reyk Floeter <reyk@openbsd.org>
@@ -17,7 +17,6 @@
  */
 
 #include <sys/types.h>
-#include <sys/socket.h>
 
 #include <net/if.h>
 #include <netinet/in.h>
diff --git a/usr.sbin/vmd/fw_cfg.c b/usr.sbin/vmd/fw_cfg.c
index be84dc18361..a423633659b 100644
--- a/usr.sbin/vmd/fw_cfg.c
+++ b/usr.sbin/vmd/fw_cfg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fw_cfg.c,v 1.9 2024/07/09 09:31:37 dv Exp $	*/
+/*	$OpenBSD: fw_cfg.c,v 1.10 2024/09/26 01:45:13 jsg Exp $	*/
 /*
  * Copyright (c) 2018 Claudio Jeker <claudio@openbsd.org>
  *
@@ -15,7 +15,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/types.h>
-#include <sys/uio.h>
 #include <machine/biosvar.h>	/* bios_memmap_t */
 #include <dev/pv/virtioreg.h>
 #include <dev/vmm/vmm.h>
diff --git a/usr.sbin/vmd/i8253.c b/usr.sbin/vmd/i8253.c
index 7cea3fa3869..9c3cced61b6 100644
--- a/usr.sbin/vmd/i8253.c
+++ b/usr.sbin/vmd/i8253.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i8253.c,v 1.41 2024/07/10 09:27:33 dv Exp $ */
+/* $OpenBSD: i8253.c,v 1.42 2024/09/26 01:45:13 jsg Exp $ */
 /*
  * Copyright (c) 2016 Mike Larkin <mlarkin@openbsd.org>
  *
@@ -23,7 +23,6 @@
 
 #include <event.h>
 #include <string.h>
-#include <stddef.h>
 #include <time.h>
 #include <unistd.h>
 
diff --git a/usr.sbin/vmd/loadfile_elf.c b/usr.sbin/vmd/loadfile_elf.c
index efe1e974b5c..2b62ca07565 100644
--- a/usr.sbin/vmd/loadfile_elf.c
+++ b/usr.sbin/vmd/loadfile_elf.c
@@ -1,5 +1,5 @@
 /* $NetBSD: loadfile.c,v 1.10 2000/12/03 02:53:04 tsutsui Exp $ */
-/* $OpenBSD: loadfile_elf.c,v 1.49 2024/09/11 15:42:52 bluhm Exp $ */
+/* $OpenBSD: loadfile_elf.c,v 1.50 2024/09/26 01:45:13 jsg Exp $ */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -82,19 +82,15 @@
  */
 
 #include <sys/param.h>	/* PAGE_SIZE PAGE_MASK roundup */
-#include <sys/ioctl.h>
 #include <sys/reboot.h>
 #include <sys/exec.h>
 
 #include <elf.h>
-#include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <fcntl.h>
 #include <err.h>
-#include <stddef.h>
 
 #include <dev/vmm/vmm.h>
 
diff --git a/usr.sbin/vmd/parse.y b/usr.sbin/vmd/parse.y
index 18211393eba..3f6866eb592 100644
--- a/usr.sbin/vmd/parse.y
+++ b/usr.sbin/vmd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.70 2024/09/11 15:42:52 bluhm Exp $	*/
+/*	$OpenBSD: parse.y,v 1.71 2024/09/26 01:45:13 jsg Exp $	*/
 
 /*
  * Copyright (c) 2007-2016 Reyk Floeter <reyk@openbsd.org>
@@ -26,7 +26,6 @@
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/socket.h>
-#include <sys/uio.h>
 
 #include <dev/vmm/vmm.h>
 
@@ -37,10 +36,8 @@
 
 #include <agentx.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <limits.h>
 #include <stdarg.h>
-#include <string.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <netdb.h>
diff --git a/usr.sbin/vmd/pci.c b/usr.sbin/vmd/pci.c
index 0dbe846fd01..b159977f464 100644
--- a/usr.sbin/vmd/pci.c
+++ b/usr.sbin/vmd/pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci.c,v 1.33 2024/07/10 09:27:33 dv Exp $	*/
+/*	$OpenBSD: pci.c,v 1.34 2024/09/26 01:45:13 jsg Exp $	*/
 
 /*
  * Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
@@ -20,7 +20,6 @@
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcidevs.h>
-#include <dev/pv/virtioreg.h>
 #include <dev/vmm/vmm.h>
 
 #include <string.h>
@@ -28,7 +27,6 @@
 
 #include "vmd.h"
 #include "pci.h"
-#include "i8259.h"
 #include "atomicio.h"
 
 struct pci pci;
diff --git a/usr.sbin/vmd/priv.c b/usr.sbin/vmd/priv.c
index 744f9c56330..44e096cae28 100644
--- a/usr.sbin/vmd/priv.c
+++ b/usr.sbin/vmd/priv.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: priv.c,v 1.24 2024/01/18 14:49:59 claudio Exp $	*/
+/*	$OpenBSD: priv.c,v 1.25 2024/09/26 01:45:13 jsg Exp $	*/
 
 /*
  * Copyright (c) 2016 Reyk Floeter <reyk@openbsd.org>
@@ -17,12 +17,8 @@
  */
 
 #include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/stat.h>
 #include <sys/socket.h>
-#include <sys/un.h>
 #include <sys/ioctl.h>
-#include <sys/tree.h>
 
 #include <net/if.h>
 #include <netinet/in.h>
@@ -34,13 +30,10 @@
 #include <arpa/inet.h>
 
 #include <errno.h>
-#include <event.h>
-#include <fcntl.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <signal.h>
 #include <ctype.h>
 
 #include "proc.h"
diff --git a/usr.sbin/vmd/proc.c b/usr.sbin/vmd/proc.c
index 950c17d6e0e..ef14fa3e1bb 100644
--- a/usr.sbin/vmd/proc.c
+++ b/usr.sbin/vmd/proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.c,v 1.25 2024/04/09 15:48:01 tobhe Exp $	*/
+/*	$OpenBSD: proc.c,v 1.26 2024/09/26 01:45:13 jsg Exp $	*/
 
 /*
  * Copyright (c) 2010 - 2016 Reyk Floeter <reyk@openbsd.org>
@@ -29,7 +29,6 @@
 #include <string.h>
 #include <errno.h>
 #include <signal.h>
-#include <paths.h>
 #include <pwd.h>
 #include <event.h>
 #include <imsg.h>
diff --git a/usr.sbin/vmd/proc.h b/usr.sbin/vmd/proc.h
index 4ec431fab26..562135aac94 100644
--- a/usr.sbin/vmd/proc.h
+++ b/usr.sbin/vmd/proc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.h,v 1.24 2024/02/20 21:40:37 dv Exp $	*/
+/*	$OpenBSD: proc.h,v 1.25 2024/09/26 01:45:13 jsg Exp $	*/
 
 /*
  * Copyright (c) 2010-2015 Reyk Floeter <reyk@openbsd.org>
@@ -18,7 +18,6 @@
 
 #include <sys/queue.h>
 #include <sys/socket.h>
-#include <sys/uio.h>
 
 #include <event.h>
 #include <imsg.h>
diff --git a/usr.sbin/vmd/psp.c b/usr.sbin/vmd/psp.c
index 3e69a1c1293..5705e1bb0e9 100644
--- a/usr.sbin/vmd/psp.c
+++ b/usr.sbin/vmd/psp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: psp.c,v 1.1 2024/09/11 15:42:52 bluhm Exp $	*/
+/*	$OpenBSD: psp.c,v 1.2 2024/09/26 01:45:13 jsg Exp $	*/
 
 /*
  * Copyright (c) 2023, 2024 Hans-Joerg Hoexer <hshoexer@genua.de>
@@ -17,11 +17,8 @@
  */
 
 #include <sys/types.h>
-#include <sys/device.h>
 #include <sys/ioctl.h>
-#include <sys/rwlock.h>
 
-#include <machine/bus.h>
 #include <dev/ic/pspvar.h>
 
 #include <string.h>
diff --git a/usr.sbin/vmd/sev.c b/usr.sbin/vmd/sev.c
index 6869f257f6d..89272c8b3ad 100644
--- a/usr.sbin/vmd/sev.c
+++ b/usr.sbin/vmd/sev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sev.c,v 1.3 2024/09/25 04:19:36 deraadt Exp $	*/
+/*	$OpenBSD: sev.c,v 1.4 2024/09/26 01:45:13 jsg Exp $	*/
 
 /*
  * Copyright (c) 2023, 2024 Hans-Joerg Hoexer <hshoexer@genua.de>
@@ -18,10 +18,7 @@
 
 #include <sys/types.h>
 #include <sys/param.h>	/* roundup */
-#include <sys/device.h>
-#include <sys/rwlock.h>
 
-#include <machine/bus.h>
 #include <crypto/xform.h>
 #include <dev/ic/pspvar.h>
 
diff --git a/usr.sbin/vmd/vioblk.c b/usr.sbin/vmd/vioblk.c
index cef10e32cf4..270016ff3c7 100644
--- a/usr.sbin/vmd/vioblk.c
+++ b/usr.sbin/vmd/vioblk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vioblk.c,v 1.14 2024/07/10 09:27:33 dv Exp $	*/
+/*	$OpenBSD: vioblk.c,v 1.15 2024/09/26 01:45:13 jsg Exp $	*/
 
 /*
  * Copyright (c) 2023 Dave Voutila <dv@openbsd.org>
@@ -16,8 +16,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#include <sys/mman.h>
-#include <sys/param.h> /* PAGE_SIZE */
+#include <stdint.h>
 
 #include <dev/pci/virtio_pcireg.h>
 #include <dev/pv/vioblkreg.h>
@@ -25,7 +24,6 @@
 
 #include <errno.h>
 #include <event.h>
-#include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/usr.sbin/vmd/vionet.c b/usr.sbin/vmd/vionet.c
index 8a82e302221..377861ca941 100644
--- a/usr.sbin/vmd/vionet.c
+++ b/usr.sbin/vmd/vionet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vionet.c,v 1.16 2024/07/12 14:34:08 jan Exp $	*/
+/*	$OpenBSD: vionet.c,v 1.17 2024/09/26 01:45:13 jsg Exp $	*/
 
 /*
  * Copyright (c) 2023 Dave Voutila <dv@openbsd.org>
@@ -16,7 +16,6 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#include <sys/socket.h>
 #include <sys/types.h>
 
 #include <dev/pci/virtio_pcireg.h>
diff --git a/usr.sbin/vmd/vioqcow2.c b/usr.sbin/vmd/vioqcow2.c
index 753cce6e40a..72e83be1679 100644
--- a/usr.sbin/vmd/vioqcow2.c
+++ b/usr.sbin/vmd/vioqcow2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vioqcow2.c,v 1.24 2023/09/14 15:25:43 dv Exp $	*/
+/*	$OpenBSD: vioqcow2.c,v 1.25 2024/09/26 01:45:13 jsg Exp $	*/
 
 /*
  * Copyright (c) 2018 Ori Bernstein <ori@eigenstate.org>
@@ -19,9 +19,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <dev/pci/pcireg.h>
-
-#include <assert.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/usr.sbin/vmd/vioscsi.c b/usr.sbin/vmd/vioscsi.c
index 3fb3d4eaeba..95bc1f46dee 100644
--- a/usr.sbin/vmd/vioscsi.c
+++ b/usr.sbin/vmd/vioscsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vioscsi.c,v 1.24 2023/09/06 19:26:39 dv Exp $  */
+/*	$OpenBSD: vioscsi.c,v 1.25 2024/09/26 01:45:13 jsg Exp $  */
 
 /*
  * Copyright (c) 2017 Carlos Cardenas <ccardenas@openbsd.org>
@@ -25,10 +25,8 @@
 #include <scsi/scsiconf.h>
 #include <scsi/cd.h>
 
-#include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include "vmd.h"
 #include "vioscsi.h"
diff --git a/usr.sbin/vmd/virtio.c b/usr.sbin/vmd/virtio.c
index f203f822adc..79402d04e01 100644
--- a/usr.sbin/vmd/virtio.c
+++ b/usr.sbin/vmd/virtio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: virtio.c,v 1.115 2024/07/10 09:27:33 dv Exp $	*/
+/*	$OpenBSD: virtio.c,v 1.116 2024/09/26 01:45:13 jsg Exp $	*/
 
 /*
  * Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
@@ -25,19 +25,14 @@
 #include <dev/pv/virtioreg.h>
 #include <dev/pci/virtio_pcireg.h>
 #include <dev/pv/vioblkreg.h>
-#include <dev/pv/vioscsireg.h>
 #include <dev/vmm/vmm.h>
 
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#include <netinet/ip.h>
 
 #include <errno.h>
 #include <event.h>
-#include <fcntl.h>
-#include <poll.h>
-#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/usr.sbin/vmd/vm.c b/usr.sbin/vmd/vm.c
index 01c7c4a8d95..8b94fbc8a59 100644
--- a/usr.sbin/vmd/vm.c
+++ b/usr.sbin/vmd/vm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm.c,v 1.105 2024/09/11 15:42:52 bluhm Exp $	*/
+/*	$OpenBSD: vm.c,v 1.106 2024/09/26 01:45:13 jsg Exp $	*/
 
 /*
  * Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
@@ -19,28 +19,18 @@
 #include <sys/param.h>	/* PAGE_SIZE, MAXCOMLEN */
 #include <sys/types.h>
 #include <sys/ioctl.h>
-#include <sys/queue.h>
-#include <sys/wait.h>
-#include <sys/uio.h>
-#include <sys/socket.h>
-#include <sys/time.h>
 #include <sys/mman.h>
 #include <sys/resource.h>
 
-#include <dev/pci/pcireg.h>
 #include <dev/vmm/vmm.h>
 
-#include <net/if.h>
-
 #include <errno.h>
 #include <event.h>
 #include <fcntl.h>
 #include <imsg.h>
-#include <limits.h>
 #include <poll.h>
 #include <pthread.h>
 #include <pthread_np.h>
-#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -48,8 +38,6 @@
 #include <util.h>
 
 #include "atomicio.h"
-#include "loadfile.h"
-#include "mmio.h"
 #include "pci.h"
 #include "virtio.h"
 #include "vmd.h"
diff --git a/usr.sbin/vmd/vm_agentx.c b/usr.sbin/vmd/vm_agentx.c
index af80964d68f..1b5428fc047 100644
--- a/usr.sbin/vmd/vm_agentx.c
+++ b/usr.sbin/vmd/vm_agentx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_agentx.c,v 1.2 2024/02/02 14:58:02 dv Exp $ */
+/*	$OpenBSD: vm_agentx.c,v 1.3 2024/09/26 01:45:13 jsg Exp $ */
 
 /*
  * Copyright (c) 2022 Martijn van Duren <martijn@openbsd.org>
@@ -21,11 +21,9 @@
 #include <sys/un.h>
 
 #include <agentx.h>
-#include <errno.h>
 #include <grp.h>
 #include <pwd.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/usr.sbin/vmd/vmd.c b/usr.sbin/vmd/vmd.c
index 3409b529ff8..91ac69e6c0d 100644
--- a/usr.sbin/vmd/vmd.c
+++ b/usr.sbin/vmd/vmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmd.c,v 1.160 2024/09/11 15:42:52 bluhm Exp $	*/
+/*	$OpenBSD: vmd.c,v 1.161 2024/09/26 01:45:13 jsg Exp $	*/
 
 /*
  * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -18,7 +18,6 @@
 
 #include <sys/types.h>
 #include <sys/queue.h>
-#include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
 #include <sys/tty.h>
@@ -28,7 +27,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <termios.h>
 #include <errno.h>
 #include <event.h>
 #include <fcntl.h>
diff --git a/usr.sbin/vmd/vmm.c b/usr.sbin/vmd/vmm.c
index 282716481cb..1da919fcbd4 100644
--- a/usr.sbin/vmd/vmm.c
+++ b/usr.sbin/vmd/vmm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmm.c,v 1.122 2024/09/11 15:42:52 bluhm Exp $	*/
+/*	$OpenBSD: vmm.c,v 1.123 2024/09/26 01:45:13 jsg Exp $	*/
 
 /*
  * Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
@@ -20,14 +20,8 @@
 #include <sys/ioctl.h>
 #include <sys/queue.h>
 #include <sys/wait.h>
-#include <sys/uio.h>
 #include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/mman.h>
 
-#include <dev/ic/i8253reg.h>
-#include <dev/isa/isareg.h>
-#include <dev/pci/pcireg.h>
 #include <dev/vmm/vmm.h>
 
 #include <net/if.h>
@@ -37,14 +31,10 @@
 #include <fcntl.h>
 #include <imsg.h>
 #include <limits.h>
-#include <poll.h>
-#include <pthread.h>
-#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <util.h>
 
 #include "vmd.h"
 #include "atomicio.h"
diff --git a/usr.sbin/vmd/x86_vm.c b/usr.sbin/vmd/x86_vm.c
index de8efccd5e1..729e0c5f9bd 100644
--- a/usr.sbin/vmd/x86_vm.c
+++ b/usr.sbin/vmd/x86_vm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: x86_vm.c,v 1.3 2024/09/11 15:42:52 bluhm Exp $	*/
+/*	$OpenBSD: x86_vm.c,v 1.4 2024/09/26 01:45:13 jsg Exp $	*/
 /*
  * Copyright (c) 2015 Mike Larkin <mlarkin@openbsd.org>
  *
@@ -21,7 +21,6 @@
 #include <dev/ic/i8253reg.h>
 #include <dev/isa/isareg.h>
 
-#include <machine/psl.h>
 #include <machine/pte.h>
 #include <machine/specialreg.h>
 #include <machine/vmmvar.h>
-- 
2.20.1