diff --git a/ChangeLog b/ChangeLog
index 68d2342d..c6cad746 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-10  shemminger  <shemminger@osdl.org>
+
+	* Update to 2.6.16 headers
+	* Add fake version of include/linux/socket.h to fix warnings
+
 2006-01-12  Patrick McHardy <kaber@trash.net>
 
 	* Handle DCCP in ipxfrm.c to allow using port numbers in the selector.
diff --git a/include/linux/socket.h b/include/linux/socket.h
new file mode 100644
index 00000000..dc979c05
--- /dev/null
+++ b/include/linux/socket.h
@@ -0,0 +1 @@
+#include <sys/socket.h>
diff --git a/include/net/tcp_states.h b/include/net/tcp_states.h
index b9d4176b..b0b64598 100644
--- a/include/net/tcp_states.h
+++ b/include/net/tcp_states.h
@@ -31,4 +31,20 @@ enum {
 
 #define TCP_STATE_MASK	0xF
 
+#define TCP_ACTION_FIN	(1 << 7)
+
+enum {
+	TCPF_ESTABLISHED = (1 << 1),
+	TCPF_SYN_SENT	 = (1 << 2),
+	TCPF_SYN_RECV	 = (1 << 3),
+	TCPF_FIN_WAIT1	 = (1 << 4),
+	TCPF_FIN_WAIT2	 = (1 << 5),
+	TCPF_TIME_WAIT	 = (1 << 6),
+	TCPF_CLOSE	 = (1 << 7),
+	TCPF_CLOSE_WAIT	 = (1 << 8),
+	TCPF_LAST_ACK	 = (1 << 9),
+	TCPF_LISTEN	 = (1 << 10),
+	TCPF_CLOSING	 = (1 << 11) 
+};
+
 #endif	/* _LINUX_TCP_STATES_H */