From cf05e311ea4a7924f6530caab574060fa78d661b Mon Sep 17 00:00:00 2001
From: Ed Schouten <ed@FreeBSD.org>
Date: Fri, 21 Oct 2011 12:58:34 +0000
Subject: [PATCH] Add missing #includes.

According to POSIX, these two header files should be able to be included
by themselves, not depending on other headers. The <net/if.h> header
uses struct sockaddr when __BSD_VISIBLE=1, while <netinet/tcp.h> uses
integer datatypes (u_int32_t, u_short, etc).

MFC after:	2 months
---
 sys/net/if.h      | 2 ++
 sys/netinet/tcp.h | 1 +
 2 files changed, 3 insertions(+)

diff --git a/sys/net/if.h b/sys/net/if.h
index d1f3883e1ed..4f2dc6f6245 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -43,9 +43,11 @@
 /*
  * <net/if.h> does not depend on <sys/time.h> on most other systems.  This
  * helps userland compatibility.  (struct timeval ifi_lastchange)
+ * The same holds for <sys/socket.h>.  (struct sockaddr ifru_addr)
  */
 #ifndef _KERNEL
 #include <sys/time.h>
+#include <sys/socket.h>
 #endif
 
 struct ifnet;
diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h
index 443425f7c72..805a5616dc1 100644
--- a/sys/netinet/tcp.h
+++ b/sys/netinet/tcp.h
@@ -34,6 +34,7 @@
 #define _NETINET_TCP_H_
 
 #include <sys/cdefs.h>
+#include <sys/types.h>
 
 #if __BSD_VISIBLE