From 38f98a5b013ed171c80c280c884518df551cbbd3 Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Sun, 26 May 2024 10:01:01 +0000
Subject: [PATCH] remove unneeded includes

---
 sys/dev/ata/ata.c             |  9 +--------
 sys/dev/ata/ata_wdc.c         |  6 +-----
 sys/dev/ata/atascsi.c         |  5 +----
 sys/dev/ata/wd.c              |  6 +-----
 sys/dev/atapiscsi/atapiscsi.c | 12 +-----------
 5 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/sys/dev/ata/ata.c b/sys/dev/ata/ata.c
index 6940aba8372..1cf2a24aa21 100644
--- a/sys/dev/ata/ata.c
+++ b/sys/dev/ata/ata.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ata.c,v 1.36 2017/12/30 20:46:59 guenther Exp $      */
+/*      $OpenBSD: ata.c,v 1.37 2024/05/26 10:01:01 jsg Exp $      */
 /*      $NetBSD: ata.c,v 1.9 1999/04/15 09:41:09 bouyer Exp $      */
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -26,15 +26,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/stat.h>
-#include <sys/malloc.h>
-#include <sys/device.h>
-#include <sys/syslog.h>
 #include <sys/pool.h>
 
-#include <machine/bus.h>
-
 #include <dev/ata/atareg.h>
 #include <dev/ata/atavar.h>
 #include <dev/ic/wdcreg.h>
diff --git a/sys/dev/ata/ata_wdc.c b/sys/dev/ata/ata_wdc.c
index d165d92a7bf..f2731090bdb 100644
--- a/sys/dev/ata/ata_wdc.c
+++ b/sys/dev/ata/ata_wdc.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ata_wdc.c,v 1.52 2018/11/02 09:59:36 fcambus Exp $	*/
+/*      $OpenBSD: ata_wdc.c,v 1.53 2024/05/26 10:01:01 jsg Exp $	*/
 /*	$NetBSD: ata_wdc.c,v 1.21 1999/08/09 09:43:11 bouyer Exp $	*/
 
 /*
@@ -57,16 +57,12 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/stat.h>
 #include <sys/buf.h>
-#include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
-#include <sys/syslog.h>
 
-#include <machine/intr.h>
 #include <machine/bus.h>
 
 #include <dev/ata/atavar.h>
diff --git a/sys/dev/ata/atascsi.c b/sys/dev/ata/atascsi.c
index 029354e13b2..24d60fedfc2 100644
--- a/sys/dev/ata/atascsi.c
+++ b/sys/dev/ata/atascsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atascsi.c,v 1.154 2024/05/13 01:15:50 jsg Exp $ */
+/*	$OpenBSD: atascsi.c,v 1.155 2024/05/26 10:01:01 jsg Exp $ */
 
 /*
  * Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -20,11 +20,8 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/buf.h>
-#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
-#include <sys/queue.h>
 #include <sys/pool.h>
 
 #include <scsi/scsi_all.h>
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c
index 6a89ea34d18..549f49cc57d 100644
--- a/sys/dev/ata/wd.c
+++ b/sys/dev/ata/wd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wd.c,v 1.130 2022/10/23 14:39:19 krw Exp $ */
+/*	$OpenBSD: wd.c,v 1.131 2024/05/26 10:01:01 jsg Exp $ */
 /*	$NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */
 
 /*
@@ -60,12 +60,9 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <sys/mutex.h>
 #include <sys/buf.h>
 #include <sys/uio.h>
 #include <sys/malloc.h>
@@ -74,7 +71,6 @@
 #include <sys/disk.h>
 #include <sys/syslog.h>
 #include <sys/timeout.h>
-#include <sys/vnode.h>
 #include <sys/dkio.h>
 #include <sys/reboot.h>
 
diff --git a/sys/dev/atapiscsi/atapiscsi.c b/sys/dev/atapiscsi/atapiscsi.c
index 5a2d58f7e9f..19e11a79e7d 100644
--- a/sys/dev/atapiscsi/atapiscsi.c
+++ b/sys/dev/atapiscsi/atapiscsi.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: atapiscsi.c,v 1.120 2022/04/16 19:19:58 naddy Exp $     */
+/*      $OpenBSD: atapiscsi.c,v 1.121 2024/05/26 10:01:01 jsg Exp $     */
 
 /*
  * This code is derived from code with the copyright below.
@@ -30,19 +30,12 @@
  *
  */
 
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
-#include <sys/buf.h>
-#include <sys/disklabel.h>
-#include <sys/malloc.h>
-#include <sys/reboot.h>
-#include <sys/ioctl.h>
 #include <sys/timeout.h>
 #include <scsi/scsi_all.h>
-#include <scsi/scsi_disk.h>
 #include <scsi/scsi_tape.h>
 #include <scsi/scsiconf.h>
 
@@ -134,9 +127,6 @@ void  wdc_atapi_reset_2(struct channel_softc *, struct wdc_xfer *,
 void  wdc_atapi_tape_done(struct channel_softc *, struct wdc_xfer *,
 	int, struct atapi_return_args *);
 
-struct atapiscsi_softc;
-struct atapiscsi_xfer;
-
 int	atapiscsi_match(struct device *, void *, void *);
 void	atapiscsi_attach(struct device *, struct device *, void *);
 int	atapiscsi_activate(struct device *, int);
-- 
2.20.1