Fewer <netinet/in_systm.h> !

26 files changed, 26 insertions, 52 deletions

diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c
index 20312766543..b506ce9b023 100644
--- a/sys/net/bridgestp.c
+++ b/sys/net/bridgestp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bridgestp.c,v 1.48 2014/07/12 18:44:22 tedu Exp $	*/
+/*	$OpenBSD: bridgestp.c,v 1.49 2014/07/22 11:06:09 mpi Exp $	*/
 
 /*
  * Copyright (c) 2000 Jason L. Wright (jason@thought.net)
@@ -55,7 +55,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/if_ether.h>
 #endif
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index 756aac0ef9a..10c8d1336bc 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bridge.c,v 1.225 2014/07/12 18:44:22 tedu Exp $	*/
+/*	$OpenBSD: if_bridge.c,v 1.226 2014/07/22 11:06:09 mpi Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -57,7 +57,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/if_ether.h>
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c
index f0082580ed9..ad0f6d1b1d3 100644
--- a/sys/net/if_gif.c
+++ b/sys/net/if_gif.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_gif.c,v 1.68 2014/07/12 18:44:22 tedu Exp $	*/
+/*	$OpenBSD: if_gif.c,v 1.69 2014/07/22 11:06:09 mpi Exp $	*/
 /*	$KAME: if_gif.c,v 1.43 2001/02/20 08:51:07 itojun Exp $	*/
 
 /*
@@ -45,7 +45,6 @@
 
 #ifdef	INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/in_gif.h>
 #include <netinet/ip.h>
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index 9fc289dcf1a..7eb3ab496d3 100644
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: if_gre.c,v 1.69 2014/07/12 18:44:22 tedu Exp $ */
+/*      $OpenBSD: if_gre.c,v 1.70 2014/07/22 11:06:09 mpi Exp $ */
 /*	$NetBSD: if_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */
 
 /*
@@ -59,7 +59,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/if_ether.h>
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 75af9049426..1e9172ce622 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_loop.c,v 1.56 2014/07/12 18:44:22 tedu Exp $	*/
+/*	$OpenBSD: if_loop.c,v 1.57 2014/07/22 11:06:09 mpi Exp $	*/
 /*	$NetBSD: if_loop.c,v 1.15 1996/05/07 02:40:33 thorpej Exp $	*/
 
 /*
@@ -124,7 +124,6 @@
 
 #ifdef	INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #endif
 
diff --git a/sys/net/if_mpe.c b/sys/net/if_mpe.c
index 0c708de75cd..74039dcda59 100644
--- a/sys/net/if_mpe.c
+++ b/sys/net/if_mpe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_mpe.c,v 1.34 2014/07/12 18:44:22 tedu Exp $ */
+/* $OpenBSD: if_mpe.c,v 1.35 2014/07/22 11:06:09 mpi Exp $ */
 
 /*
  * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -31,7 +31,6 @@
 
 #ifdef	INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #endif
 
diff --git a/sys/net/if_pflog.c b/sys/net/if_pflog.c
index 7a597e8fa5e..d992b95ebfc 100644
--- a/sys/net/if_pflog.c
+++ b/sys/net/if_pflog.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pflog.c,v 1.61 2014/07/12 18:44:22 tedu Exp $	*/
+/*	$OpenBSD: if_pflog.c,v 1.62 2014/07/22 11:06:09 mpi Exp $	*/
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and 
@@ -51,7 +51,6 @@
 
 #ifdef	INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 #include <netinet/udp.h>
diff --git a/sys/net/if_pflow.c b/sys/net/if_pflow.c
index b3ad4befd14..df62535eaa3 100644
--- a/sys/net/if_pflow.c
+++ b/sys/net/if_pflow.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pflow.c,v 1.44 2014/07/12 18:44:22 tedu Exp $	*/
+/*	$OpenBSD: if_pflow.c,v 1.45 2014/07/22 11:06:09 mpi Exp $	*/
 
 /*
  * Copyright (c) 2011 Florian Obser <florian@narrans.de>
@@ -41,7 +41,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/udp.h>
diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c
index 365b81c782d..e30e29cd842 100644
--- a/sys/net/if_pfsync.c
+++ b/sys/net/if_pfsync.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pfsync.c,v 1.207 2014/07/12 18:44:22 tedu Exp $	*/
+/*	$OpenBSD: if_pfsync.c,v 1.208 2014/07/22 11:06:09 mpi Exp $	*/
 
 /*
  * Copyright (c) 2002 Michael Shalayeff
@@ -66,7 +66,6 @@
 #include <netinet/tcp_seq.h>
 
 #ifdef	INET
-#include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index cff0149e64b..8cad6026791 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ppp.c,v 1.75 2014/07/12 18:44:22 tedu Exp $	*/
+/*	$OpenBSD: if_ppp.c,v 1.76 2014/07/22 11:06:09 mpi Exp $	*/
 /*	$NetBSD: if_ppp.c,v 1.39 1997/05/17 21:11:59 christos Exp $	*/
 
 /*
@@ -127,7 +127,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #else
 #ifdef _KERNEL
diff --git a/sys/net/if_pppx.c b/sys/net/if_pppx.c
index 3e71ec6b54f..9c1160d78ed 100644
--- a/sys/net/if_pppx.c
+++ b/sys/net/if_pppx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pppx.c,v 1.31 2014/07/12 18:44:22 tedu Exp $ */
+/*	$OpenBSD: if_pppx.c,v 1.32 2014/07/22 11:06:09 mpi Exp $ */
 
 /*
  * Copyright (c) 2010 Claudio Jeker <claudio@openbsd.org>
@@ -70,7 +70,6 @@
 #include <net/if_dl.h>
 
 #ifdef INET
-#include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c
index 052124f49aa..f03725585c2 100644
--- a/sys/net/if_sl.c
+++ b/sys/net/if_sl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sl.c,v 1.52 2014/07/12 18:44:22 tedu Exp $	*/
+/*	$OpenBSD: if_sl.c,v 1.53 2014/07/22 11:06:09 mpi Exp $	*/
 /*	$NetBSD: if_sl.c,v 1.39.4.1 1996/06/02 16:26:31 thorpej Exp $	*/
 
 /*
@@ -81,7 +81,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #else
 #error Huh? Slip without inet?
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index d3ff56ac9a8..222475e32f2 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_spppsubr.c,v 1.124 2014/07/12 18:44:22 tedu Exp $	*/
+/*	$OpenBSD: if_spppsubr.c,v 1.125 2014/07/22 11:06:09 mpi Exp $	*/
 /*
  * Synchronous PPP/Cisco link level subroutines.
  * Keepalive protocol implemented in both Cisco and PPP modes.
@@ -60,7 +60,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/in_var.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
diff --git a/sys/net/if_trunk.c b/sys/net/if_trunk.c
index aadf2d7bd28..b9f19b3b0bf 100644
--- a/sys/net/if_trunk.c
+++ b/sys/net/if_trunk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_trunk.c,v 1.89 2014/07/12 18:44:22 tedu Exp $	*/
+/*	$OpenBSD: if_trunk.c,v 1.90 2014/07/22 11:06:09 mpi Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
@@ -43,7 +43,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
 #include <netinet/ip.h>
 #endif
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 9f62d5b8314..2742c2e456c 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tun.c,v 1.126 2014/07/12 18:44:22 tedu Exp $	*/
+/*	$OpenBSD: if_tun.c,v 1.127 2014/07/22 11:06:09 mpi Exp $	*/
 /*	$NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $	*/
 
 /*
@@ -64,7 +64,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/if_ether.h>
 #endif
diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c
index 5adc84b5d31..3e676c8f31e 100644
--- a/sys/net/if_vxlan.c
+++ b/sys/net/if_vxlan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vxlan.c,v 1.14 2014/07/12 18:44:22 tedu Exp $	*/
+/*	$OpenBSD: if_vxlan.c,v 1.15 2014/07/22 11:06:09 mpi Exp $	*/
 
 /*
  * Copyright (c) 2013 Reyk Floeter <reyk@openbsd.org>
@@ -44,7 +44,6 @@
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
diff --git a/sys/net/pf.c b/sys/net/pf.c
index 247d6c63ddd..a5d9aadbf33 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.882 2014/07/13 16:58:43 bluhm Exp $ */
+/*	$OpenBSD: pf.c,v 1.883 2014/07/22 11:06:09 mpi Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -62,7 +62,6 @@
 #include <net/radix_mpath.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/tcp.h>
diff --git a/sys/net/pf_if.c b/sys/net/pf_if.c
index 638cccf715f..f6edb5348e2 100644
--- a/sys/net/pf_if.c
+++ b/sys/net/pf_if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_if.c,v 1.73 2014/07/12 18:44:22 tedu Exp $ */
+/*	$OpenBSD: pf_if.c,v 1.74 2014/07/22 11:06:09 mpi Exp $ */
 
 /*
  * Copyright 2005 Henning Brauer <henning@openbsd.org>
@@ -48,7 +48,6 @@
 #include <net/if_types.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 
diff --git a/sys/net/pf_ioctl.c b/sys/net/pf_ioctl.c
index 56330d994eb..735ff7d6ffd 100644
--- a/sys/net/pf_ioctl.c
+++ b/sys/net/pf_ioctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_ioctl.c,v 1.273 2014/07/12 18:44:22 tedu Exp $ */
+/*	$OpenBSD: pf_ioctl.c,v 1.274 2014/07/22 11:06:09 mpi Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -60,7 +60,6 @@
 #include <net/route.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_icmp.h>
diff --git a/sys/net/pf_lb.c b/sys/net/pf_lb.c
index 0dda25502a3..fd862ce9dc5 100644
--- a/sys/net/pf_lb.c
+++ b/sys/net/pf_lb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_lb.c,v 1.31 2014/07/02 13:06:00 mikeb Exp $ */
+/*	$OpenBSD: pf_lb.c,v 1.32 2014/07/22 11:06:10 mpi Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -62,7 +62,6 @@
 #include <net/radix_mpath.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/tcp.h>
diff --git a/sys/net/pf_norm.c b/sys/net/pf_norm.c
index 0601fe2c794..6913db37936 100644
--- a/sys/net/pf_norm.c
+++ b/sys/net/pf_norm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_norm.c,v 1.166 2014/07/13 17:41:04 bluhm Exp $ */
+/*	$OpenBSD: pf_norm.c,v 1.167 2014/07/22 11:06:10 mpi Exp $ */
 
 /*
  * Copyright 2001 Niels Provos <provos@citi.umich.edu>
@@ -48,7 +48,6 @@
 #include <net/if_pflog.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/tcp.h>
diff --git a/sys/net/pf_osfp.c b/sys/net/pf_osfp.c
index 7fbec60a355..366452be629 100644
--- a/sys/net/pf_osfp.c
+++ b/sys/net/pf_osfp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_osfp.c,v 1.28 2013/11/11 09:15:34 mpi Exp $ */
+/*	$OpenBSD: pf_osfp.c,v 1.29 2014/07/22 11:06:10 mpi Exp $ */
 
 /*
  * Copyright (c) 2003 Mike Frantzen <frantzen@w4g.org>
@@ -27,7 +27,6 @@
 #include <sys/syslog.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 
diff --git a/sys/net/pf_ruleset.c b/sys/net/pf_ruleset.c
index bca6acfd3b6..d8abc403dbe 100644
--- a/sys/net/pf_ruleset.c
+++ b/sys/net/pf_ruleset.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_ruleset.c,v 1.8 2014/07/12 18:44:22 tedu Exp $ */
+/*	$OpenBSD: pf_ruleset.c,v 1.9 2014/07/22 11:06:10 mpi Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -44,7 +44,6 @@
 #include <sys/syslog.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 
diff --git a/sys/net/pipex.c b/sys/net/pipex.c
index dfd5cb332c5..657cd969558 100644
--- a/sys/net/pipex.c
+++ b/sys/net/pipex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pipex.c,v 1.54 2014/07/12 18:44:22 tedu Exp $	*/
+/*	$OpenBSD: pipex.c,v 1.55 2014/07/22 11:06:10 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -64,7 +64,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #ifdef INET6
diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c
index 54cc0761c7e..30c3bc525bd 100644
--- a/sys/net/ppp_tty.c
+++ b/sys/net/ppp_tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ppp_tty.c,v 1.27 2014/04/19 12:18:35 henning Exp $	*/
+/*	$OpenBSD: ppp_tty.c,v 1.28 2014/07/22 11:06:10 mpi Exp $	*/
 /*	$NetBSD: ppp_tty.c,v 1.12 1997/03/24 21:23:10 christos Exp $	*/
 
 /*
@@ -117,7 +117,6 @@
 
 #ifdef VJC
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <net/slcompress.h>
 #endif
diff --git a/sys/net/slcompress.c b/sys/net/slcompress.c
index 7b6e73e7cc4..bd98b877b8a 100644
--- a/sys/net/slcompress.c
+++ b/sys/net/slcompress.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: slcompress.c,v 1.10 2013/06/11 18:15:53 deraadt Exp $	*/
+/*	$OpenBSD: slcompress.c,v 1.11 2014/07/22 11:06:10 mpi Exp $	*/
 /*	$NetBSD: slcompress.c,v 1.17 1997/05/17 21:12:10 christos Exp $	*/
 
 /*
@@ -45,7 +45,6 @@
 #include <sys/systm.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>