From c3f59bb6a1166e4167a00446aa78f6862a4b1ff7 Mon Sep 17 00:00:00 2001
From: mpi <mpi@openbsd.org>
Date: Thu, 14 Aug 2014 12:55:50 +0000
Subject: [PATCH] No need for <netinet/in_systm.h> nor <netinet/tcpip.h>.

---
 usr.bin/netstat/inet.c     | 5 +----
 usr.bin/netstat/inet6.c    | 3 +--
 usr.bin/netstat/net80211.c | 3 +--
 usr.bin/systat/netstat.c   | 5 +----
 usr.bin/systat/pf.c        | 3 +--
 5 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index a993ad7b240..cf64fbb49b1 100644
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet.c,v 1.133 2014/06/23 03:46:17 guenther Exp $	*/
+/*	$OpenBSD: inet.c,v 1.134 2014/08/14 12:55:50 mpi Exp $	*/
 /*	$NetBSD: inet.c,v 1.14 1995/10/03 21:42:37 thorpej Exp $	*/
 
 /*
@@ -40,7 +40,6 @@
 
 #include <net/route.h>
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet/ip_icmp.h>
@@ -49,13 +48,11 @@
 #include <netinet/ip_var.h>
 #include <netinet/pim_var.h>
 #include <netinet/tcp.h>
-#include <netinet/tcpip.h>
 #include <netinet/tcp_seq.h>
 #define TCPSTATES
 #include <netinet/tcp_fsm.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
-#include <netinet/tcp_debug.h>
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 #include <netinet/ip_ipsp.h>
diff --git a/usr.bin/netstat/inet6.c b/usr.bin/netstat/inet6.c
index 867a177418d..a321ae369cc 100644
--- a/usr.bin/netstat/inet6.c
+++ b/usr.bin/netstat/inet6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inet6.c,v 1.45 2014/06/23 03:46:17 guenther Exp $	*/
+/*	$OpenBSD: inet6.c,v 1.46 2014/08/14 12:55:50 mpi Exp $	*/
 /*	BSDI inet.c,v 2.3 1995/10/24 02:19:29 prb Exp	*/
 /*
  * Copyright (c) 1983, 1988, 1993
@@ -41,7 +41,6 @@
 #include <netinet/in.h>
 #include <netinet/ip6.h>
 #include <netinet/icmp6.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet6/ip6_var.h>
diff --git a/usr.bin/netstat/net80211.c b/usr.bin/netstat/net80211.c
index b4ed7cc0019..dc40c098818 100644
--- a/usr.bin/netstat/net80211.c
+++ b/usr.bin/netstat/net80211.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: net80211.c,v 1.10 2013/11/21 17:32:13 mikeb Exp $	*/
+/*	$OpenBSD: net80211.c,v 1.11 2014/08/14 12:55:50 mpi Exp $	*/
 
 /*
  * Copyright (c) 2005 Reyk Floeter <reyk@openbsd.org>
@@ -26,7 +26,6 @@
 #include <net/if_var.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
 
 #include <net80211/ieee80211.h>
diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c
index 3bca253376e..ccf5db747d4 100644
--- a/usr.bin/systat/netstat.c
+++ b/usr.bin/systat/netstat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netstat.c,v 1.39 2013/12/25 01:46:00 tedu Exp $	*/
+/*	$OpenBSD: netstat.c,v 1.40 2014/08/14 12:55:50 mpi Exp $	*/
 /*	$NetBSD: netstat.c,v 1.3 1995/06/18 23:53:07 cgd Exp $	*/
 
 /*-
@@ -41,20 +41,17 @@
 
 #include <netinet/in.h>
 #include <net/route.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
 #include <netinet/ip_icmp.h>
 #include <netinet/icmp_var.h>
 #include <netinet/ip_var.h>
 #include <netinet/tcp.h>
-#include <netinet/tcpip.h>
 #include <netinet/tcp_seq.h>
 #define TCPSTATES
 #include <netinet/tcp_fsm.h>
 #include <netinet/tcp_timer.h>
 #include <netinet/tcp_var.h>
-#include <netinet/tcp_debug.h>
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 #include <arpa/inet.h>
diff --git a/usr.bin/systat/pf.c b/usr.bin/systat/pf.c
index 520a1c47ecb..0cfc56d887a 100644
--- a/usr.bin/systat/pf.c
+++ b/usr.bin/systat/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.5 2012/12/04 02:24:47 deraadt Exp $ */
+/*	$OpenBSD: pf.c,v 1.6 2014/08/14 12:55:50 mpi Exp $ */
 /*
  * Copyright (c) 2001, 2007 Can Erkin Acar <canacar@openbsd.org>
  *
@@ -20,7 +20,6 @@
 #include <sys/socket.h>
 #include <net/if.h>
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <net/pfvar.h>
 
-- 
2.20.1