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, 9 insertions, 1 deletions

diff --git a/sys/i386/include/spigot.h b/sys/i386/include/spigot.h
index b7e3470..32dcd37 100644
--- a/sys/i386/include/spigot.h
+++ b/sys/i386/include/spigot.h
@@ -25,6 +25,12 @@
  *
  * Version 1.2, Aug 30, 1995.
  */
+
+#ifndef	_MACHINE_SPIGOT_H_
+#define	_MACHINE_SPIGOT_H_
+
+#include <sys/ioccom.h>
+
 struct spigot_info {
 	unsigned long	maddr;
 	unsigned short	irq;
@@ -85,4 +91,6 @@ unsigned char		spigot_status(void);
  *
  * spigot_status() will return the above status bits.
  */
-#endif
+#endif /* !KERNEL */
+
+#endif /* !_MACHINE_SPIGOT_H_ */