From c7d0d8678af18d7cb65b96c8e60f9fe91d0638d9 Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Wed, 11 May 2011 14:35:03 +0000
Subject: Make self-contained.

---
 cpukit/libnetworking/net/bpf.h           |  2 ++
 cpukit/libnetworking/net/if.h            |  1 +
 cpukit/libnetworking/net/if_ppp.h        |  3 +++
 cpukit/libnetworking/net/if_pppvar.h     | 14 ++++++++++----
 cpukit/libnetworking/net/if_var.h        |  3 +++
 cpukit/libnetworking/net/raw_cb.h        |  2 ++
 cpukit/libnetworking/net/slcompress.h    |  4 ++++
 cpukit/libnetworking/netinet/icmp_var.h  |  2 ++
 cpukit/libnetworking/netinet/if_ether.h  |  1 +
 cpukit/libnetworking/netinet/igmp.h      |  2 ++
 cpukit/libnetworking/netinet/in_pcb.h    |  2 ++
 cpukit/libnetworking/netinet/in_var.h    |  3 +++
 cpukit/libnetworking/netinet/ip.h        |  2 ++
 cpukit/libnetworking/netinet/ip_fw.h     |  2 ++
 cpukit/libnetworking/netinet/ip_icmp.h   |  3 +++
 cpukit/libnetworking/netinet/ip_mroute.h |  3 +++
 cpukit/libnetworking/netinet/ip_var.h    |  2 ++
 cpukit/libnetworking/netinet/tcp.h       |  1 +
 cpukit/libnetworking/netinet/tcp_debug.h |  3 +++
 cpukit/libnetworking/netinet/tcpip.h     |  5 +++++
 cpukit/libnetworking/netinet/udp_var.h   |  3 +++
 21 files changed, 59 insertions(+), 4 deletions(-)

(limited to 'cpukit')

diff --git a/cpukit/libnetworking/net/bpf.h b/cpukit/libnetworking/net/bpf.h
index df21575640..4fc93a399f 100644
--- a/cpukit/libnetworking/net/bpf.h
+++ b/cpukit/libnetworking/net/bpf.h
@@ -44,6 +44,8 @@
 #ifndef _NET_BPF_H_
 #define _NET_BPF_H_
 
+#include <sys/time.h> /* struct timeval */
+
 /* BSD style release date */
 #define	BPF_RELEASE 199606
 
diff --git a/cpukit/libnetworking/net/if.h b/cpukit/libnetworking/net/if.h
index 31e256fcd4..286e6da8e3 100644
--- a/cpukit/libnetworking/net/if.h
+++ b/cpukit/libnetworking/net/if.h
@@ -48,6 +48,7 @@
 #define __BSD_VISIBLE 1
 #endif
 #include <inttypes.h>
+#include <sys/socket.h> /* struct sockaddr */
 #endif
 
 #ifdef _KERNEL
diff --git a/cpukit/libnetworking/net/if_ppp.h b/cpukit/libnetworking/net/if_ppp.h
index 820f722070..b5679646b6 100644
--- a/cpukit/libnetworking/net/if_ppp.h
+++ b/cpukit/libnetworking/net/if_ppp.h
@@ -26,6 +26,9 @@
 #ifndef _IF_PPP_H_
 #define _IF_PPP_H_
 
+#include <net/ppp_defs.h> /* NPmode */
+#include <net/if.h> /* IFNAMSIZ */
+
 /*
  * Packet sizes
  */
diff --git a/cpukit/libnetworking/net/if_pppvar.h b/cpukit/libnetworking/net/if_pppvar.h
index 4bb6a086b0..b55204bf85 100644
--- a/cpukit/libnetworking/net/if_pppvar.h
+++ b/cpukit/libnetworking/net/if_pppvar.h
@@ -42,17 +42,23 @@
  * $FreeBSD: src/sys/net/if_pppvar.h,v 1.26 2006/12/05 18:54:21 ume Exp $
  */
 
+/*
+ * $Id$
+ */
+ 
 #ifndef _NET_IF_PPPVAR_H_
 #define _NET_IF_PPPVAR_H_
 
+#include <net/if_var.h> /* struct ifnet */
+#include <net/ppp_defs.h> /* struct pppstat */
+#include <rtems/rtems/types.h> /* rtems_id */
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/*
- * $Id$
- */
- 
+struct proc;
+
 /*
  * Supported network protocols.  These values are used for
  * indexing sc_npmode.
diff --git a/cpukit/libnetworking/net/if_var.h b/cpukit/libnetworking/net/if_var.h
index 7aa0ddbf43..e24d2403cc 100644
--- a/cpukit/libnetworking/net/if_var.h
+++ b/cpukit/libnetworking/net/if_var.h
@@ -37,6 +37,9 @@
 #ifndef	_NET_IF_VAR_H_
 #define	_NET_IF_VAR_H_
 
+#include <net/if.h> /* struct if_data */
+#include <sys/ioccom.h> /* ioctl_command_t */
+
 /*
  * Structures defining a network interface, providing a packet
  * transport mechanism (ala level 0 of the PUP protocols).
diff --git a/cpukit/libnetworking/net/raw_cb.h b/cpukit/libnetworking/net/raw_cb.h
index 02881e32b2..9a0097a559 100644
--- a/cpukit/libnetworking/net/raw_cb.h
+++ b/cpukit/libnetworking/net/raw_cb.h
@@ -37,6 +37,8 @@
 #ifndef _NET_RAW_CB_H_
 #define _NET_RAW_CB_H_
 
+#include <sys/socket.h>
+
 #include <sys/queue.h>
 
 /*
diff --git a/cpukit/libnetworking/net/slcompress.h b/cpukit/libnetworking/net/slcompress.h
index e1dd9b0c3f..511a8d8554 100644
--- a/cpukit/libnetworking/net/slcompress.h
+++ b/cpukit/libnetworking/net/slcompress.h
@@ -36,6 +36,10 @@
 #ifndef _NET_SLCOMPRESS_H_
 #define _NET_SLCOMPRESS_H_
 
+#include <netinet/ip.h> /* struct ip */
+
+struct mbuf;
+
 #define MAX_STATES 16		/* must be > 2 and < 256 */
 #define MAX_HDR 128
 
diff --git a/cpukit/libnetworking/netinet/icmp_var.h b/cpukit/libnetworking/netinet/icmp_var.h
index da74e58f98..8ee0f27406 100644
--- a/cpukit/libnetworking/netinet/icmp_var.h
+++ b/cpukit/libnetworking/netinet/icmp_var.h
@@ -37,6 +37,8 @@
 #ifndef _NETINET_ICMP_VAR_H_
 #define _NETINET_ICMP_VAR_H_
 
+#include <netinet/ip_icmp.h> /* ICMP_MAXTYPE */
+
 /*
  * Variables related to this implementation
  * of the internet control message protocol.
diff --git a/cpukit/libnetworking/netinet/if_ether.h b/cpukit/libnetworking/netinet/if_ether.h
index 9c3ce62b76..7f36864b26 100644
--- a/cpukit/libnetworking/netinet/if_ether.h
+++ b/cpukit/libnetworking/netinet/if_ether.h
@@ -37,6 +37,7 @@
 #ifndef _NETINET_IF_ETHER_H_
 #define _NETINET_IF_ETHER_H_
 
+#include <netinet/in.h> /* struct in_addr */
 #include <net/ethernet.h>
 #include <net/if_arp.h>
 
diff --git a/cpukit/libnetworking/netinet/igmp.h b/cpukit/libnetworking/netinet/igmp.h
index 01d6d09179..e9ac9fe7d3 100644
--- a/cpukit/libnetworking/netinet/igmp.h
+++ b/cpukit/libnetworking/netinet/igmp.h
@@ -41,6 +41,8 @@
 #ifndef _NETINET_IGMP_H_
 #define _NETINET_IGMP_H_
 
+#include <netinet/in.h> /* struct in_addr */
+
 /*
  * Internet Group Management Protocol (IGMP) definitions.
  *
diff --git a/cpukit/libnetworking/netinet/in_pcb.h b/cpukit/libnetworking/netinet/in_pcb.h
index f3a3cc178d..776f6c10d2 100644
--- a/cpukit/libnetworking/netinet/in_pcb.h
+++ b/cpukit/libnetworking/netinet/in_pcb.h
@@ -38,6 +38,8 @@
 #define _NETINET_IN_PCB_H_
 
 #include <sys/queue.h>
+#include <netinet/in.h> /* struct in_addr */
+#include <net/route.h>  /* struct route */
 
 /*
  * Common structure pcb for internet protocol implementation.
diff --git a/cpukit/libnetworking/netinet/in_var.h b/cpukit/libnetworking/netinet/in_var.h
index 3d555803f8..1cec1f74b0 100644
--- a/cpukit/libnetworking/netinet/in_var.h
+++ b/cpukit/libnetworking/netinet/in_var.h
@@ -35,6 +35,9 @@
 #define _NETINET_IN_VAR_H_
 
 #include <sys/queue.h>
+#include <net/if_var.h> /* struct ifaddr */
+#include <netinet/in.h> /* struct in_addr */
+
 #if !defined(__rtems__)
 #include <sys/fnv_hash.h>
 #endif
diff --git a/cpukit/libnetworking/netinet/ip.h b/cpukit/libnetworking/netinet/ip.h
index a17d0194c3..4476494a16 100644
--- a/cpukit/libnetworking/netinet/ip.h
+++ b/cpukit/libnetworking/netinet/ip.h
@@ -38,6 +38,8 @@
 #define _NETINET_IP_H_
 
 #include <sys/cdefs.h>
+#include <netinet/in.h> /* struct in_addr */
+#include <netinet/in_systm.h> /* n_long */
 
 /*
  * Definitions for internet protocol version 4.
diff --git a/cpukit/libnetworking/netinet/ip_fw.h b/cpukit/libnetworking/netinet/ip_fw.h
index f90deb96c2..523e95d27e 100644
--- a/cpukit/libnetworking/netinet/ip_fw.h
+++ b/cpukit/libnetworking/netinet/ip_fw.h
@@ -17,7 +17,9 @@
 #ifndef _IP_FW_H
 #define _IP_FW_H
 
+#include <sys/queue.h> /* LIST_ENTRY */
 #include <net/if.h>
+#include <netinet/in.h> /* struct in_addr */
 
 /*
  * This union structure identifies an interface, either explicitly
diff --git a/cpukit/libnetworking/netinet/ip_icmp.h b/cpukit/libnetworking/netinet/ip_icmp.h
index 655e687b62..44115a3051 100644
--- a/cpukit/libnetworking/netinet/ip_icmp.h
+++ b/cpukit/libnetworking/netinet/ip_icmp.h
@@ -37,6 +37,9 @@
 #ifndef _NETINET_IP_ICMP_H_
 #define _NETINET_IP_ICMP_H_
 
+#include <netinet/in.h> /* struct in_addr */
+#include <netinet/ip.h> /* struct ip */
+
 /*
  * Interface Control Message Protocol Definitions.
  * Per RFC 792, September 1981.
diff --git a/cpukit/libnetworking/netinet/ip_mroute.h b/cpukit/libnetworking/netinet/ip_mroute.h
index 139c755675..1f514d3d06 100644
--- a/cpukit/libnetworking/netinet/ip_mroute.h
+++ b/cpukit/libnetworking/netinet/ip_mroute.h
@@ -41,6 +41,9 @@
 #ifndef _NETINET_IP_MROUTE_H_
 #define _NETINET_IP_MROUTE_H_
 
+#include <netinet/in.h> /* struct in_addr */
+#include <net/route.h>  /* struct route */
+
 /*
  * Definitions for IP multicast forwarding.
  *
diff --git a/cpukit/libnetworking/netinet/ip_var.h b/cpukit/libnetworking/netinet/ip_var.h
index 6b06a1cd79..89945192f7 100644
--- a/cpukit/libnetworking/netinet/ip_var.h
+++ b/cpukit/libnetworking/netinet/ip_var.h
@@ -37,6 +37,8 @@
 #ifndef _NETINET_IP_VAR_H_
 #define	_NETINET_IP_VAR_H_
 
+#include <netinet/in.h> /* struct in_addr */
+
 /*
  * Overlay for ip header used by other protocols (tcp, udp).
  */
diff --git a/cpukit/libnetworking/netinet/tcp.h b/cpukit/libnetworking/netinet/tcp.h
index 96e28710c1..0be7f5a861 100644
--- a/cpukit/libnetworking/netinet/tcp.h
+++ b/cpukit/libnetworking/netinet/tcp.h
@@ -40,6 +40,7 @@
 #include <sys/cdefs.h>
 
 #if __BSD_VISIBLE
+#include <machine/endian.h> /* BYTE_ORDER */
 
 typedef	u_int32_t tcp_seq;
 
diff --git a/cpukit/libnetworking/netinet/tcp_debug.h b/cpukit/libnetworking/netinet/tcp_debug.h
index 11a2b003f4..a93ecb2b81 100644
--- a/cpukit/libnetworking/netinet/tcp_debug.h
+++ b/cpukit/libnetworking/netinet/tcp_debug.h
@@ -37,6 +37,9 @@
 #ifndef _NETINET_TCP_DEBUG_H_
 #define	_NETINET_TCP_DEBUG_H_
 
+#include <netinet/tcpip.h> /* struct tcpiphdr */
+#include <netinet/tcp_var.h> /* struct tcpcb */
+
 struct	tcp_debug {
 	uint32_t	td_time;	/* network format */
 	short	td_act;
diff --git a/cpukit/libnetworking/netinet/tcpip.h b/cpukit/libnetworking/netinet/tcpip.h
index 0b136633b7..e5e8715587 100644
--- a/cpukit/libnetworking/netinet/tcpip.h
+++ b/cpukit/libnetworking/netinet/tcpip.h
@@ -37,6 +37,10 @@
 #ifndef _NETINET_TCPIP_H_
 #define _NETINET_TCPIP_H_
 
+#ifdef __BSD_VISIBLE
+#include <netinet/tcp.h> /* struct tcphdr */
+#include <netinet/ip_var.h> /* struct ipovly */
+
 /*
  * Tcp+ip header, after ip options removed.
  */
@@ -61,5 +65,6 @@ struct tcpiphdr {
 #define	ti_win		ti_t.th_win
 #define	ti_sum		ti_t.th_sum
 #define	ti_urp		ti_t.th_urp
+#endif /* __BSD_VISIBLE */
 
 #endif
diff --git a/cpukit/libnetworking/netinet/udp_var.h b/cpukit/libnetworking/netinet/udp_var.h
index 9c86cf91dc..2c81d01ac7 100644
--- a/cpukit/libnetworking/netinet/udp_var.h
+++ b/cpukit/libnetworking/netinet/udp_var.h
@@ -37,6 +37,9 @@
 #ifndef _NETINET_UDP_VAR_H_
 #define _NETINET_UDP_VAR_H_
 
+#include <netinet/ip_var.h> /* struct ipovly */
+#include <netinet/udp.h> /* struct udphdr */
+
 /*
  * UDP kernel structures and variables.
  */
-- 
cgit v1.2.3