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.

2 files changed, 22 insertions, 2 deletions

diff --git a/sys/pccard/card.h b/sys/pccard/card.h
index 424098b..7076c95 100644
--- a/sys/pccard/card.h
+++ b/sys/pccard/card.h
@@ -27,6 +27,15 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#ifndef	_PCCARD_CARD_H_
+#define	_PCCARD_CARD_H_
+
+#ifndef KERNEL
+#include <sys/types.h>
+#endif
+#include <sys/ioccom.h>
+
 #define	PIOCGSTATE	_IOR('P', 1, struct slotstate)	/* Get slot state */
 #define	PIOCGMEM	_IOWR('P', 2, struct mem_desc)	/* Get memory map */
 #define	PIOCSMEM	_IOW('P', 3, struct mem_desc)	/* Set memory map */
@@ -42,7 +51,6 @@
 #define PIOCGREG	_IOWR('P',100, struct pcic_reg)	/* get reg */
 #define PIOCSREG	_IOW('P', 101, struct pcic_reg)	/* Set reg */
 
-
 /*
  *	Slot states for PIOCGSTATE
  */
@@ -138,3 +146,5 @@ struct power {
 #define	NUM_MEM_WINDOWS	10
 #define	NUM_IO_WINDOWS	6
 #define	CARD_DEVICE	"/dev/card%d"		/* String for sprintf */
+
+#endif /* !_PCCARD_CARD_H_ */
diff --git a/sys/pccard/cardinfo.h b/sys/pccard/cardinfo.h
index 424098b..7076c95 100644
--- a/sys/pccard/cardinfo.h
+++ b/sys/pccard/cardinfo.h
@@ -27,6 +27,15 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#ifndef	_PCCARD_CARD_H_
+#define	_PCCARD_CARD_H_
+
+#ifndef KERNEL
+#include <sys/types.h>
+#endif
+#include <sys/ioccom.h>
+
 #define	PIOCGSTATE	_IOR('P', 1, struct slotstate)	/* Get slot state */
 #define	PIOCGMEM	_IOWR('P', 2, struct mem_desc)	/* Get memory map */
 #define	PIOCSMEM	_IOW('P', 3, struct mem_desc)	/* Set memory map */
@@ -42,7 +51,6 @@
 #define PIOCGREG	_IOWR('P',100, struct pcic_reg)	/* get reg */
 #define PIOCSREG	_IOW('P', 101, struct pcic_reg)	/* Set reg */
 
-
 /*
  *	Slot states for PIOCGSTATE
  */
@@ -138,3 +146,5 @@ struct power {
 #define	NUM_MEM_WINDOWS	10
 #define	NUM_IO_WINDOWS	6
 #define	CARD_DEVICE	"/dev/card%d"		/* String for sprintf */
+
+#endif /* !_PCCARD_CARD_H_ */