remove unneeded includes

diff --git a/sys/dev/pv/hvs.c b/sys/dev/pv/hvs.c
index 812d119..2758640 100644 (file)
--- a/sys/dev/pv/hvs.c
+++ b/sys/dev/pv/hvs.c
@@ -37,8 +37,6 @@
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/device.h>
-#include <sys/kernel.h>
-#include <sys/buf.h>
 #include <sys/malloc.h>
 #include <sys/task.h>
 
@@ -50,8 +48,6 @@
 #include <dev/pv/hypervvar.h>
 
 #include <scsi/scsi_all.h>
-#include <scsi/cd.h>
-#include <scsi/scsi_disk.h>
 #include <scsi/scsiconf.h>
 
 #define HVS_PROTO_VERSION_WIN6          0x200

diff --git a/sys/dev/pv/hyperv.c b/sys/dev/pv/hyperv.c
index da9bf3a..afb7eaa 100644 (file)
--- a/sys/dev/pv/hyperv.c
+++ b/sys/dev/pv/hyperv.c
@@ -45,15 +45,10 @@
 #endif
 
 #include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/signal.h>
-#include <sys/signalvar.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/timetc.h>
 #include <sys/task.h>
-#include <sys/syslog.h>
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
@@ -64,7 +59,6 @@
 #include <machine/i82489var.h>
 
 #include <dev/pv/pvvar.h>
-#include <dev/pv/pvreg.h>
 #include <dev/pv/hypervreg.h>
 #include <dev/pv/hypervvar.h>
 

diff --git a/sys/dev/pv/hypervic.c b/sys/dev/pv/hypervic.c
index b3ce2d9..d78e0f8 100644 (file)
--- a/sys/dev/pv/hypervic.c
+++ b/sys/dev/pv/hypervic.c
@@ -45,24 +45,14 @@
 #endif
 
 #include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/signal.h>
-#include <sys/signalvar.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/pool.h>
-#include <sys/timetc.h>
 #include <sys/task.h>
-#include <sys/syslog.h>
-#include <sys/socket.h>
 #include <sys/sensors.h>
 
 #include <machine/bus.h>
-#include <machine/cpu.h>
-#include <machine/cpufunc.h>
-
-#include <machine/i82489var.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
@@ -70,7 +60,6 @@
 #include <netinet/if_ether.h>
 
 #include <dev/pv/pvvar.h>
-#include <dev/pv/pvreg.h>
 #include <dev/pv/hypervreg.h>
 #include <dev/pv/hypervvar.h>
 #include <dev/pv/hypervicreg.h>

diff --git a/sys/dev/pv/if_hvn.c b/sys/dev/pv/if_hvn.c
index 5254093..1ed4bba 100644 (file)
--- a/sys/dev/pv/if_hvn.c
+++ b/sys/dev/pv/if_hvn.c
@@ -33,21 +33,16 @@
 
 #include "bpfilter.h"
 #include "vlan.h"
-#include "hyperv.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/device.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/pool.h>
 #include <sys/queue.h>
-#include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/task.h>
-#include <sys/timeout.h>
 
 #include <machine/bus.h>
 
@@ -66,10 +61,6 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#ifdef INET6
-#include <netinet/ip6.h>
-#endif
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif

diff --git a/sys/dev/pv/if_vio.c b/sys/dev/pv/if_vio.c
index 7d0e4ec..3d0a4f5 100644 (file)
--- a/sys/dev/pv/if_vio.c
+++ b/sys/dev/pv/if_vio.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_vio.c,v 1.34 2024/05/17 16:37:10 sf Exp $  */
+/*     $OpenBSD: if_vio.c,v 1.35 2024/05/24 10:05:55 jsg Exp $ */
 
 /*
  * Copyright (c) 2012 Stefan Fritsch, Alexander Fiveg.
@@ -31,10 +31,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/mbuf.h>
-#include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/timeout.h>
 

diff --git a/sys/dev/pv/if_xnf.c b/sys/dev/pv/if_xnf.c
index b8aa9bb..3c423ae 100644 (file)
--- a/sys/dev/pv/if_xnf.c
+++ b/sys/dev/pv/if_xnf.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_xnf.c,v 1.69 2023/11/10 15:51:24 bluhm Exp $       */
+/*     $OpenBSD: if_xnf.c,v 1.70 2024/05/24 10:05:55 jsg Exp $ */
 
 /*
  * Copyright (c) 2015, 2016 Mike Belopuhov
@@ -17,22 +17,15 @@
  */
 
 #include "bpfilter.h"
-#include "vlan.h"
-#include "xen.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/device.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/pool.h>
 #include <sys/queue.h>
-#include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/task.h>
-#include <sys/timeout.h>
 
 #include <machine/bus.h>
 
@@ -45,10 +38,6 @@
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
-#ifdef INET6
-#include <netinet/ip6.h>
-#endif
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif

diff --git a/sys/dev/pv/pvbus.c b/sys/dev/pv/pvbus.c
index 2f4cdd3..3891097 100644 (file)
--- a/sys/dev/pv/pvbus.c
+++ b/sys/dev/pv/pvbus.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pvbus.c,v 1.27 2023/01/07 06:40:21 asou Exp $ */
+/*     $OpenBSD: pvbus.c,v 1.28 2024/05/24 10:05:55 jsg Exp $  */
 
 /*
  * Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
@@ -22,13 +22,10 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
-#include <sys/timeout.h>
 #include <sys/signalvar.h>
 #include <sys/syslog.h>
 #include <sys/proc.h>
-#include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 

diff --git a/sys/dev/pv/pvclock.c b/sys/dev/pv/pvclock.c
index 815d8af..994fc4a 100644 (file)
--- a/sys/dev/pv/pvclock.c
+++ b/sys/dev/pv/pvclock.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pvclock.c,v 1.10 2024/05/14 08:26:13 jsg Exp $        */
+/*     $OpenBSD: pvclock.c,v 1.11 2024/05/24 10:05:55 jsg Exp $        */
 
 /*
  * Copyright (c) 2018 Reyk Floeter <reyk@openbsd.org>
@@ -22,11 +22,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/timetc.h>
-#include <sys/timeout.h>
-#include <sys/malloc.h>
-#include <sys/atomic.h>
 
 #include <machine/cpu.h>
 #include <machine/atomic.h>

diff --git a/sys/dev/pv/vioblk.c b/sys/dev/pv/vioblk.c
index 05ecc75..5b657fa 100644 (file)
--- a/sys/dev/pv/vioblk.c
+++ b/sys/dev/pv/vioblk.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: vioblk.c,v 1.37 2023/07/28 16:54:48 dv Exp $  */
+/*     $OpenBSD: vioblk.c,v 1.38 2024/05/24 10:05:55 jsg Exp $ */
 
 /*
  * Copyright (c) 2012 Stefan Fritsch.
@@ -48,12 +48,9 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <machine/bus.h>
 
 #include <sys/device.h>
-#include <sys/stat.h>
-#include <sys/buf.h>
 #include <sys/mutex.h>
 #include <dev/pv/virtioreg.h>
 #include <dev/pv/virtiovar.h>

diff --git a/sys/dev/pv/viocon.c b/sys/dev/pv/viocon.c
index 313d3ac..112e317 100644 (file)
--- a/sys/dev/pv/viocon.c
+++ b/sys/dev/pv/viocon.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: viocon.c,v 1.10 2023/07/28 16:54:48 dv Exp $  */
+/*     $OpenBSD: viocon.c,v 1.11 2024/05/24 10:05:55 jsg Exp $ */
 
 /*
  * Copyright (c) 2013-2015 Stefan Fritsch <sf@sfritsch.de>
@@ -18,13 +18,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/timeout.h>
+#include <sys/malloc.h>
 #include <machine/bus.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
-#include <dev/pci/pcivar.h>
 #include <dev/pv/virtioreg.h>
 #include <dev/pv/virtiovar.h>
 

diff --git a/sys/dev/pv/viogpu.c b/sys/dev/pv/viogpu.c
index 2d8d307..81844e3 100644 (file)
--- a/sys/dev/pv/viogpu.c
+++ b/sys/dev/pv/viogpu.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: viogpu.c,v 1.5 2024/05/14 08:26:13 jsg Exp $ */
+/*     $OpenBSD: viogpu.c,v 1.6 2024/05/24 10:05:55 jsg Exp $ */
 
 /*
  * Copyright (c) 2021-2023 joshua stein <jcs@openbsd.org>
@@ -18,7 +18,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/timeout.h>
 

diff --git a/sys/dev/pv/viomb.c b/sys/dev/pv/viomb.c
index a14d085..a8906ec 100644 (file)
--- a/sys/dev/pv/viomb.c
+++ b/sys/dev/pv/viomb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: viomb.c,v 1.9 2023/05/29 08:13:35 sf Exp $         */
+/* $OpenBSD: viomb.c,v 1.10 2024/05/24 10:05:55 jsg Exp $       */
 /* $NetBSD: viomb.c,v 1.1 2011/10/30 12:12:21 hannken Exp $     */
 
 /*
@@ -29,7 +29,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/task.h>
 #include <sys/pool.h>

diff --git a/sys/dev/pv/viornd.c b/sys/dev/pv/viornd.c
index 5f5dfac..54c0640 100644 (file)
--- a/sys/dev/pv/viornd.c
+++ b/sys/dev/pv/viornd.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: viornd.c,v 1.7 2023/07/28 16:54:48 dv Exp $   */
+/*     $OpenBSD: viornd.c,v 1.8 2024/05/24 10:05:55 jsg Exp $  */
 
 /*
  * Copyright (c) 2014 Stefan Fritsch <sf@sfritsch.de>
@@ -18,7 +18,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/timeout.h>
 #include <machine/bus.h>
 #include <sys/device.h>

diff --git a/sys/dev/pv/virtio.c b/sys/dev/pv/virtio.c
index 53e27e2..49a7fe2 100644 (file)
--- a/sys/dev/pv/virtio.c
+++ b/sys/dev/pv/virtio.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: virtio.c,v 1.24 2023/12/02 10:01:35 sf Exp $  */
+/*     $OpenBSD: virtio.c,v 1.25 2024/05/24 10:05:55 jsg Exp $ */
 /*     $NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $ */
 
 /*
@@ -29,9 +29,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/device.h>
-#include <sys/mutex.h>
 #include <sys/atomic.h>
 #include <sys/malloc.h>
 

diff --git a/sys/dev/pv/vmmci.c b/sys/dev/pv/vmmci.c
index 2f3539e..f8385df 100644 (file)
--- a/sys/dev/pv/vmmci.c
+++ b/sys/dev/pv/vmmci.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: vmmci.c,v 1.10 2023/05/29 08:13:35 sf Exp $   */
+/*     $OpenBSD: vmmci.c,v 1.11 2024/05/24 10:05:55 jsg Exp $  */
 
 /*
  * Copyright (c) 2017 Reyk Floeter <reyk@openbsd.org>
@@ -18,13 +18,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/timeout.h>
-#include <sys/signalvar.h>
-#include <sys/syslog.h>
 #include <sys/device.h>
-#include <sys/pool.h>
-#include <sys/proc.h>
 #include <sys/sensors.h>
 
 #include <machine/bus.h>

diff --git a/sys/dev/pv/vmt.c b/sys/dev/pv/vmt.c
index 824d853..1910b82 100644 (file)
--- a/sys/dev/pv/vmt.c
+++ b/sys/dev/pv/vmt.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: vmt.c,v 1.31 2023/09/26 08:30:13 mvs Exp $ */
+/*     $OpenBSD: vmt.c,v 1.32 2024/05/24 10:05:55 jsg Exp $ */
 
 /*
  * Copyright (c) 2007 David Crawshaw <david@zentus.com>
@@ -28,14 +28,9 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/timeout.h>
-#include <sys/signalvar.h>
 #include <sys/syslog.h>
-#include <sys/proc.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <sys/mount.h>
 #include <sys/task.h>
 #include <sys/sensors.h>

diff --git a/sys/dev/pv/xbf.c b/sys/dev/pv/xbf.c
index 08c285d..b26a73a 100644 (file)
--- a/sys/dev/pv/xbf.c
+++ b/sys/dev/pv/xbf.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: xbf.c,v 1.53 2023/11/08 12:01:21 krw Exp $    */
+/*     $OpenBSD: xbf.c,v 1.54 2024/05/24 10:05:55 jsg Exp $    */
 
 /*
  * Copyright (c) 2016, 2017 Mike Belopuhov
@@ -17,14 +17,10 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "bio.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/device.h>
-#include <sys/kernel.h>
-#include <sys/buf.h>
 #include <sys/malloc.h>
 #include <sys/task.h>
 

diff --git a/sys/dev/pv/xen.c b/sys/dev/pv/xen.c
index 11ce4ca..0c6ad0a 100644 (file)
--- a/sys/dev/pv/xen.c
+++ b/sys/dev/pv/xen.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: xen.c,v 1.97 2020/06/29 06:50:52 jsg Exp $    */
+/*     $OpenBSD: xen.c,v 1.98 2024/05/24 10:05:55 jsg Exp $    */
 
 /*
  * Copyright (c) 2015, 2016, 2017 Mike Belopuhov
@@ -31,15 +31,11 @@
 
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/signal.h>
-#include <sys/signalvar.h>
 #include <sys/refcnt.h>
 #include <sys/malloc.h>
-#include <sys/kernel.h>
 #include <sys/stdint.h>
 #include <sys/device.h>
 #include <sys/task.h>
-#include <sys/syslog.h>
 
 #include <machine/bus.h>
 #include <machine/cpu.h>

diff --git a/sys/dev/pv/xenstore.c b/sys/dev/pv/xenstore.c
index 2719959..0c00dbf 100644 (file)
--- a/sys/dev/pv/xenstore.c
+++ b/sys/dev/pv/xenstore.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: xenstore.c,v 1.49 2023/04/11 00:45:08 jsg Exp $       */
+/*     $OpenBSD: xenstore.c,v 1.50 2024/05/24 10:05:55 jsg Exp $       */
 
 /*
  * Copyright (c) 2015 Mike Belopuhov
@@ -19,12 +19,10 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/mutex.h>
 #include <sys/rwlock.h>
-#include <sys/ioctl.h>
 #include <sys/task.h>
 
 #include <machine/bus.h>