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.

1 files changed, 6 insertions, 7 deletions

diff --git a/sys/sys/diskmbr.h b/sys/sys/diskmbr.h
index 3f8e4bceb76a..9b001047455a 100644
--- a/sys/sys/diskmbr.h
+++ b/sys/sys/diskmbr.h
@@ -31,12 +31,15 @@
  * SUCH DAMAGE.
  *
  *	@(#)disklabel.h	8.2 (Berkeley) 7/10/94
- * $Id: disklabel.h,v 1.22 1996/06/14 11:02:27 asami Exp $
+ * $Id: disklabel.h,v 1.23 1996/09/20 17:39:32 bde Exp $
  */
 
-#ifndef _SYS_DISKLABEL_H_
+#ifndef	_SYS_DISKLABEL_H_
 #define	_SYS_DISKLABEL_H_
 
+#ifndef KERNEL
+#include <sys/types.h>
+#endif
 #include <sys/ioccom.h>
 
 /*
@@ -443,14 +446,10 @@ int	writedisklabel __P((dev_t dev, void (*strat)(struct buf *bp),
 
 #endif /* LOCORE */
 
-#if !defined(KERNEL) && !defined(LOCORE)
-
-#include <sys/cdefs.h>
-
+#ifndef KERNEL
 __BEGIN_DECLS
 struct disklabel *getdiskbyname __P((const char *));
 __END_DECLS
-
 #endif
 
 #endif /* !_SYS_DISKLABEL_H_ */