From ebedb5ad97718c0a271659c2563834837607f03f Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Sat, 21 Sep 1996 14:59:43 +0000
Subject: Cleaned up all headers that include <sys/ioctl.h> or <sys/ioccom.h>:
 - don't include <sys/ioctl.h> in any header.  Include <sys/ioccom.h>  
 instead.  This was already done in 4.4Lite for the most important   ioctl
 headers.  Header spam currently increases kernel build   times by 10-20%. 
 There are more than 30000 #includes (not counting   duplicates) for compiling
 LINT. - include <sys/types.h> if and only it is necessary to make the header 
  almost self-sufficient (some ioctl headers still need structs from  
 elsewhere). - uniformized idempotency ifdefs.  Copied the style in the
 4.4Lite   ioctl headers.

---
 sys/dev/bktr/ioctl_meteor.h | 11 +++++++----
 sys/dev/ppbus/lptio.h       | 11 +++++------
 sys/dev/speaker/speaker.h   | 12 +++++-------
 3 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'sys/dev')

diff --git a/sys/dev/bktr/ioctl_meteor.h b/sys/dev/bktr/ioctl_meteor.h
index f4325504e723..919100f8d534 100644
--- a/sys/dev/bktr/ioctl_meteor.h
+++ b/sys/dev/bktr/ioctl_meteor.h
@@ -32,10 +32,13 @@
  *	ioctl constants for Matrox Meteor Capture card.
  */
 
-#ifndef _MACHINE_IOCTL_METEOR_H
-#define _MACHINE_IOCTL_METEOR_H
+#ifndef	_MACHINE_IOCTL_METEOR_H_
+#define	_MACHINE_IOCTL_METEOR_H_
 
-#include <sys/ioctl.h>
+#ifndef KERNEL
+#include <sys/types.h>
+#endif
+#include <sys/ioccom.h>
 
 struct meteor_capframe {
 	short	command;	/* see below for valid METEORCAPFRM commands */
@@ -179,4 +182,4 @@ struct meteor_mem {
 	caddr_t	buf;		 /* The real space (virtual addr) */
 } ;
 
-#endif /* ifndef _MACHINE_IOCTL_METEOR_H */
+#endif /* !_MACHINE_IOCTL_METEOR_H_ */
diff --git a/sys/dev/ppbus/lptio.h b/sys/dev/ppbus/lptio.h
index a203c7d69d54..14ea3d325534 100644
--- a/sys/dev/ppbus/lptio.h
+++ b/sys/dev/ppbus/lptio.h
@@ -11,15 +11,14 @@
  *
  *	Geoff Rehmet, Rhodes University, South Africa <csgr@cs.ru.ac.za>
  *
- * $Id: lpt.h,v 1.2 1994/08/02 07:38:52 davidg Exp $
+ * $Id: lpt.h,v 1.3 1995/05/30 08:00:41 rgrimes Exp $
  */
 
-#ifndef _LPT_PRINTER_H_
-#define _LPT_PRINTER_H_
+#ifndef	_MACHINE_LPT_H_
+#define	_MACHINE_LPT_H_
 
-#include <sys/types.h>
-#include <sys/ioctl.h>
+#include <sys/ioccom.h>
 
 #define	LPT_IRQ		_IOW('p', 1, long)	/* set interrupt status */
 
-#endif
+#endif /* !_MACHINE_LPT_H_ */
diff --git a/sys/dev/speaker/speaker.h b/sys/dev/speaker/speaker.h
index f097e4807cf8..7a233c712a0c 100644
--- a/sys/dev/speaker/speaker.h
+++ b/sys/dev/speaker/speaker.h
@@ -4,13 +4,13 @@
  * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
  *      modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
  *
- * $Id$
+ * $Id: speaker.h,v 1.2 1994/08/02 07:39:05 davidg Exp $
  */
 
-#ifndef _SPEAKER_H_
-#define _SPEAKER_H_
+#ifndef	_MACHINE_SPEAKER_H_
+#define	_MACHINE_SPEAKER_H_
 
-#include <sys/ioctl.h>
+#include <sys/ioccom.h>
 
 #define SPKRTONE        _IOW('S', 1, tone_t)    /* emit tone */
 #define SPKRTUNE        _IO('S', 2)             /* emit tone sequence*/
@@ -27,6 +27,4 @@ tone_t;
  * see the spkr(4) man page for details.
  */
 
-#endif /* _SPEAKER_H_ */
-
-/* speaker.h ends here */
+#endif /* !_MACHINE_SPEAKER_H_ */
-- 
cgit v1.3