From 19f9c232e3a3ff2c4c3a38bca2c09fe8813c3ef4 Mon Sep 17 00:00:00 2001
From: briggs <briggs@openbsd.org>
Date: Sun, 6 Apr 1997 02:59:52 +0000
Subject: [PATCH] Eradicate #include <sys/*> from machine/*.h.  Prompting from
 Gene.

---
 sys/arch/mac68k/dev/adb.c          | 4 +++-
 sys/arch/mac68k/include/adbsys.h   | 6 +-----
 sys/arch/mac68k/include/autoconf.h | 4 +---
 sys/arch/mac68k/include/iteioctl.h | 7 ++-----
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/sys/arch/mac68k/dev/adb.c b/sys/arch/mac68k/dev/adb.c
index 30a41769194..db2224f0821 100644
--- a/sys/arch/mac68k/dev/adb.c
+++ b/sys/arch/mac68k/dev/adb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adb.c,v 1.8 1997/03/12 13:36:56 briggs Exp $	*/
+/*	$OpenBSD: adb.c,v 1.9 1997/04/06 02:59:57 briggs Exp $	*/
 /*	$NetBSD: adb.c,v 1.13 1996/12/16 16:17:02 scottr Exp $	*/
 
 /*-
@@ -34,10 +34,12 @@ e*    notice, this list of conditions and the following disclaimer in the
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/fcntl.h>
+#include <sys/ioctl.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <sys/systm.h>
+#include <sys/time.h>
 
 #include <machine/autoconf.h>
 #include <machine/keyboard.h>
diff --git a/sys/arch/mac68k/include/adbsys.h b/sys/arch/mac68k/include/adbsys.h
index 20aed189324..96b8e019c74 100644
--- a/sys/arch/mac68k/include/adbsys.h
+++ b/sys/arch/mac68k/include/adbsys.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: adbsys.h,v 1.3 1996/05/26 18:35:42 briggs Exp $	*/
+/*	$OpenBSD: adbsys.h,v 1.4 1997/04/06 02:59:52 briggs Exp $	*/
 /*	$NetBSD: adbsys.h,v 1.5 1996/05/05 14:34:07 briggs Exp $	*/
 
 /*-
@@ -37,10 +37,6 @@
 #ifndef _ADBSYS_MACHINE_
 #define _ADBSYS_MACHINE_
 
-#include <sys/time.h>	/* timeval stuff */
-#include <sys/ioctl.h>	/* ioctls */
-
-
 /* Handy visual constants */
 #define ADB_MAX_HANDLERS	256
 #define ADB_MAX_DEVS	16
diff --git a/sys/arch/mac68k/include/autoconf.h b/sys/arch/mac68k/include/autoconf.h
index c44a5259ed0..00413f0d62f 100644
--- a/sys/arch/mac68k/include/autoconf.h
+++ b/sys/arch/mac68k/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.4 1997/01/24 01:35:40 briggs Exp $	*/
+/*	$OpenBSD: autoconf.h,v 1.5 1997/04/06 02:59:54 briggs Exp $	*/
 /*	$NetBSD: autoconf.h,v 1.5 1996/12/17 06:47:40 scottr Exp $	*/
 
 /*
@@ -33,8 +33,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/device.h>
-
 /*
  * Autoconfiguration information.
  * From sun3 port--adapted for mac68k platform by Allen Briggs.
diff --git a/sys/arch/mac68k/include/iteioctl.h b/sys/arch/mac68k/include/iteioctl.h
index 35e316eabe1..e5f3875bbd5 100644
--- a/sys/arch/mac68k/include/iteioctl.h
+++ b/sys/arch/mac68k/include/iteioctl.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iteioctl.h,v 1.2 1996/05/26 18:35:53 briggs Exp $	*/
+/*	$OpenBSD: iteioctl.h,v 1.3 1997/04/06 02:59:55 briggs Exp $	*/
 /*	$NetBSD: iteioctl.h,v 1.1 1994/12/03 23:34:31 briggs Exp $	*/
 
 /*-
@@ -33,14 +33,11 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: iteioctl.h,v 1.2 1996/05/26 18:35:53 briggs Exp $
+ * $Id: iteioctl.h,v 1.3 1997/04/06 02:59:55 briggs Exp $
  *
  */
 
 
-#include <sys/ioctl.h>
-
-
 struct bellparams{
 	int freq;	/* hertz frequency */
 	int len;	/* length in clock ticks */ 
-- 
2.20.1