From b56b18a5afaaa17ff886532be38f211b9cb48fb4 Mon Sep 17 00:00:00 2001
From: mpi <mpi@openbsd.org>
Date: Thu, 21 Aug 2014 14:24:08 +0000
Subject: [PATCH] Kill the remaining <netinet/in_systm.h> inclusion!

---
 sys/arch/alpha/alpha/in_cksum.c           | 3 +--
 sys/arch/alpha/stand/netboot/if_prom.c    | 3 +--
 sys/arch/amd64/stand/libsa/pxe.c          | 5 +----
 sys/arch/amd64/stand/libsa/pxe_net.c      | 3 +--
 sys/arch/arm/arm/genassym.cf              | 5 +----
 sys/arch/armv7/imx/imxenet.c              | 6 +-----
 sys/arch/armv7/sunxi/sxie.c               | 6 +-----
 sys/arch/aviion/stand/boot/conf.c         | 3 +--
 sys/arch/aviion/stand/boot/dev_net.c      | 3 +--
 sys/arch/aviion/stand/boot/if_le.c        | 3 +--
 sys/arch/i386/stand/libsa/pxe.c           | 5 +----
 sys/arch/i386/stand/libsa/pxe_net.c       | 3 +--
 sys/arch/landisk/stand/boot/getsecs.c     | 1 -
 sys/arch/luna88k/stand/boot/conf.c        | 3 +--
 sys/arch/luna88k/stand/boot/if_le.c       | 3 +--
 sys/arch/m88k/m88k/in_cksum.c             | 3 +--
 sys/arch/macppc/stand/net.c               | 3 +--
 sys/arch/macppc/stand/netif_of.c          | 3 +--
 sys/arch/sparc/stand/common/net.c         | 3 +--
 sys/arch/sparc/stand/common/netif_sun.c   | 3 +--
 sys/arch/sparc64/sparc64/in4_cksum.c      | 5 ++---
 sys/arch/sparc64/stand/ofwboot/net.c      | 3 +--
 sys/arch/sparc64/stand/ofwboot/netif_of.c | 3 +--
 sys/arch/vax/if/if_de.c                   | 3 +--
 sys/arch/vax/stand/boot/if_de.c           | 3 +--
 sys/arch/vax/stand/boot/if_le.c           | 3 +--
 sys/arch/vax/stand/boot/if_qe.c           | 3 +--
 sys/arch/vax/stand/boot/if_ze.c           | 3 +--
 sys/arch/vax/stand/boot/netio.c           | 3 +--
 sys/arch/vax/vax/in4_cksum.c              | 3 +--
 30 files changed, 30 insertions(+), 72 deletions(-)

diff --git a/sys/arch/alpha/alpha/in_cksum.c b/sys/arch/alpha/alpha/in_cksum.c
index c29fd6f85e0..d5e9578fccb 100644
--- a/sys/arch/alpha/alpha/in_cksum.c
+++ b/sys/arch/alpha/alpha/in_cksum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_cksum.c,v 1.8 2008/02/16 23:01:16 miod Exp $	*/
+/*	$OpenBSD: in_cksum.c,v 1.9 2014/08/21 14:24:08 mpi Exp $	*/
 /*	$NetBSD: in_cksum.c,v 1.4 1996/11/13 21:13:06 cgd Exp $	*/
 
 /*
@@ -39,7 +39,6 @@
 #include <sys/systm.h>
 #include <sys/socketvar.h>
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 
diff --git a/sys/arch/alpha/stand/netboot/if_prom.c b/sys/arch/alpha/stand/netboot/if_prom.c
index 93eb7b77076..0226997ff58 100644
--- a/sys/arch/alpha/stand/netboot/if_prom.c
+++ b/sys/arch/alpha/stand/netboot/if_prom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_prom.c,v 1.5 2010/12/06 18:44:49 jasper Exp $	*/
+/*	$OpenBSD: if_prom.c,v 1.6 2014/08/21 14:24:08 mpi Exp $	*/
 /*	$NetBSD: if_prom.c,v 1.9 1997/04/06 08:41:26 cgd Exp $	*/
 
 /*
@@ -36,7 +36,6 @@
 #include <sys/types.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 
 #include <include/rpb.h>
 #include <include/prom.h>
diff --git a/sys/arch/amd64/stand/libsa/pxe.c b/sys/arch/amd64/stand/libsa/pxe.c
index a71e37f1b95..6502b84a711 100644
--- a/sys/arch/amd64/stand/libsa/pxe.c
+++ b/sys/arch/amd64/stand/libsa/pxe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxe.c,v 1.5 2007/07/27 17:48:01 tom Exp $ */
+/*	$OpenBSD: pxe.c,v 1.6 2014/08/21 14:24:08 mpi Exp $ */
 /*	$NetBSD: pxe.c,v 1.5 2003/03/11 18:29:00 drochner Exp $	*/
 
 /*
@@ -87,11 +87,8 @@
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
-#include <netinet/ip_var.h>
 #include <netinet/udp.h>
-#include <netinet/udp_var.h>
 
 #include <lib/libsa/stand.h>
 #include <lib/libsa/net.h>
diff --git a/sys/arch/amd64/stand/libsa/pxe_net.c b/sys/arch/amd64/stand/libsa/pxe_net.c
index 1a398d61bc3..31b7a62cd5a 100644
--- a/sys/arch/amd64/stand/libsa/pxe_net.c
+++ b/sys/arch/amd64/stand/libsa/pxe_net.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxe_net.c,v 1.3 2011/03/13 00:13:52 deraadt Exp $	*/
+/*	$OpenBSD: pxe_net.c,v 1.4 2014/08/21 14:24:08 mpi Exp $	*/
 /*	$NetBSD: dev_net.c,v 1.4 2003/03/12 13:15:08 drochner Exp $	*/
 
 /*-
@@ -47,7 +47,6 @@
 #include <sys/socket.h>
 #include <net/if.h>
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 
 #include <lib/libkern/libkern.h>
 
diff --git a/sys/arch/arm/arm/genassym.cf b/sys/arch/arm/arm/genassym.cf
index a9c30a9d9e5..d3d551a0015 100644
--- a/sys/arch/arm/arm/genassym.cf
+++ b/sys/arch/arm/arm/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.13 2013/09/12 11:43:51 patrick Exp $
+#	$OpenBSD: genassym.cf,v 1.14 2014/08/21 14:24:08 mpi Exp $
 #	$NetBSD: genassym.cf,v 1.27 2003/11/04 10:33:16 dsl Exp$
 
 # Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -42,10 +42,7 @@ include <sys/signal.h>
 include <sys/mbuf.h>
 include <sys/socketvar.h>
 include <netinet/in.h>
-include <netinet/in_systm.h>
 include <netinet/ip.h>
-include <netinet/ip6.h>
-include <netinet/ip_var.h>
 
 include <machine/cpu.h>
 include <uvm/uvm_extern.h>
diff --git a/sys/arch/armv7/imx/imxenet.c b/sys/arch/armv7/imx/imxenet.c
index fbf3f2b631d..784942c1c0f 100644
--- a/sys/arch/armv7/imx/imxenet.c
+++ b/sys/arch/armv7/imx/imxenet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imxenet.c,v 1.6 2014/07/12 20:07:34 brad Exp $ */
+/* $OpenBSD: imxenet.c,v 1.7 2014/08/21 14:24:08 mpi Exp $ */
 /*
  * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
  *
@@ -37,12 +37,8 @@
 #include <net/bpf.h>
 #endif
 
-#ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
diff --git a/sys/arch/armv7/sunxi/sxie.c b/sys/arch/armv7/sunxi/sxie.c
index ac714ec8dac..c0283796c77 100644
--- a/sys/arch/armv7/sunxi/sxie.c
+++ b/sys/arch/armv7/sunxi/sxie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sxie.c,v 1.5 2013/11/06 19:03:07 syl Exp $	*/
+/*	$OpenBSD: sxie.c,v 1.6 2014/08/21 14:24:08 mpi Exp $	*/
 /*
  * Copyright (c) 2012-2013 Patrick Wildt <patrick@blueri.se>
  * Copyright (c) 2013 Artturi Alm
@@ -40,12 +40,8 @@
 #include <net/bpf.h>
 #endif
 
-#ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
diff --git a/sys/arch/aviion/stand/boot/conf.c b/sys/arch/aviion/stand/boot/conf.c
index 6e3852cac0a..83dd548c59f 100644
--- a/sys/arch/aviion/stand/boot/conf.c
+++ b/sys/arch/aviion/stand/boot/conf.c
@@ -1,8 +1,7 @@
-/*	$OpenBSD: conf.c,v 1.2 2013/10/17 16:30:07 miod Exp $ */
+/*	$OpenBSD: conf.c,v 1.3 2014/08/21 14:24:08 mpi Exp $ */
 
 #include <sys/types.h>
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 
 #include <stand.h>
 #include <ufs.h>
diff --git a/sys/arch/aviion/stand/boot/dev_net.c b/sys/arch/aviion/stand/boot/dev_net.c
index 49091af3182..ae8324adef8 100644
--- a/sys/arch/aviion/stand/boot/dev_net.c
+++ b/sys/arch/aviion/stand/boot/dev_net.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dev_net.c,v 1.1 2013/10/17 16:30:07 miod Exp $ */
+/*	$OpenBSD: dev_net.c,v 1.2 2014/08/21 14:24:08 mpi Exp $ */
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -53,7 +53,6 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
 
 #include <machine/prom.h>
 
diff --git a/sys/arch/aviion/stand/boot/if_le.c b/sys/arch/aviion/stand/boot/if_le.c
index 94baea3b5b1..60495de2a06 100644
--- a/sys/arch/aviion/stand/boot/if_le.c
+++ b/sys/arch/aviion/stand/boot/if_le.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le.c,v 1.2 2013/10/17 16:44:23 miod Exp $ */
+/*	$OpenBSD: if_le.c,v 1.3 2014/08/21 14:24:08 mpi Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -58,7 +58,6 @@
 #include <sys/types.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 
 #include <machine/prom.h>
 
diff --git a/sys/arch/i386/stand/libsa/pxe.c b/sys/arch/i386/stand/libsa/pxe.c
index 5c5fc8fe977..6502b84a711 100644
--- a/sys/arch/i386/stand/libsa/pxe.c
+++ b/sys/arch/i386/stand/libsa/pxe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxe.c,v 1.5 2007/07/27 17:46:56 tom Exp $ */
+/*	$OpenBSD: pxe.c,v 1.6 2014/08/21 14:24:08 mpi Exp $ */
 /*	$NetBSD: pxe.c,v 1.5 2003/03/11 18:29:00 drochner Exp $	*/
 
 /*
@@ -87,11 +87,8 @@
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
-#include <netinet/ip_var.h>
 #include <netinet/udp.h>
-#include <netinet/udp_var.h>
 
 #include <lib/libsa/stand.h>
 #include <lib/libsa/net.h>
diff --git a/sys/arch/i386/stand/libsa/pxe_net.c b/sys/arch/i386/stand/libsa/pxe_net.c
index 331efeb1a21..f5c8807e2f9 100644
--- a/sys/arch/i386/stand/libsa/pxe_net.c
+++ b/sys/arch/i386/stand/libsa/pxe_net.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxe_net.c,v 1.4 2011/03/13 00:13:53 deraadt Exp $	*/
+/*	$OpenBSD: pxe_net.c,v 1.5 2014/08/21 14:24:08 mpi Exp $	*/
 /*	$NetBSD: dev_net.c,v 1.4 2003/03/12 13:15:08 drochner Exp $	*/
 
 /*-
@@ -47,7 +47,6 @@
 #include <sys/socket.h>
 #include <net/if.h>
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 
 #include <lib/libkern/libkern.h>
 
diff --git a/sys/arch/landisk/stand/boot/getsecs.c b/sys/arch/landisk/stand/boot/getsecs.c
index 27661b1c1f9..0e236d6761d 100644
--- a/sys/arch/landisk/stand/boot/getsecs.c
+++ b/sys/arch/landisk/stand/boot/getsecs.c
@@ -3,7 +3,6 @@
 #include <sys/param.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 
 #include <lib/libsa/stand.h>
 #include <lib/libsa/net.h>
diff --git a/sys/arch/luna88k/stand/boot/conf.c b/sys/arch/luna88k/stand/boot/conf.c
index aaa41d3b17c..1991bcb0592 100644
--- a/sys/arch/luna88k/stand/boot/conf.c
+++ b/sys/arch/luna88k/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.2 2013/10/29 22:13:28 miod Exp $	*/
+/*	$OpenBSD: conf.c,v 1.3 2014/08/21 14:24:08 mpi Exp $	*/
 /*	$NetBSD: conf.c,v 1.3 2013/01/16 15:46:20 tsutsui Exp $	*/
 
 /*
@@ -39,7 +39,6 @@
 
 #include <net/if.h>
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 
 #include <luna88k/stand/boot/samachdep.h>
 #include <lib/libsa/nfs.h>
diff --git a/sys/arch/luna88k/stand/boot/if_le.c b/sys/arch/luna88k/stand/boot/if_le.c
index 33f0268840a..33334c6bec8 100644
--- a/sys/arch/luna88k/stand/boot/if_le.c
+++ b/sys/arch/luna88k/stand/boot/if_le.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le.c,v 1.3 2013/10/29 21:49:07 miod Exp $	*/
+/*	$OpenBSD: if_le.c,v 1.4 2014/08/21 14:24:08 mpi Exp $	*/
 /* $NetBSD: if_le.c,v 1.3 2013/01/22 15:48:40 tsutsui Exp $ */
 
 /*
@@ -62,7 +62,6 @@
 #include <sys/param.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 
 #include <luna88k/stand/boot/samachdep.h>
 #include <machine/board.h>
diff --git a/sys/arch/m88k/m88k/in_cksum.c b/sys/arch/m88k/m88k/in_cksum.c
index b5f3e652796..b6d4789b452 100644
--- a/sys/arch/m88k/m88k/in_cksum.c
+++ b/sys/arch/m88k/m88k/in_cksum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_cksum.c,v 1.3 2008/02/16 23:02:39 miod Exp $	*/
+/*	$OpenBSD: in_cksum.c,v 1.4 2014/08/21 14:24:08 mpi Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -36,7 +36,6 @@
 #include <sys/mbuf.h>
 #include <sys/socketvar.h>
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 
diff --git a/sys/arch/macppc/stand/net.c b/sys/arch/macppc/stand/net.c
index 4a876de51c6..75287945b63 100644
--- a/sys/arch/macppc/stand/net.c
+++ b/sys/arch/macppc/stand/net.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: net.c,v 1.4 2003/10/16 04:30:09 drahn Exp $	*/
+/*	$OpenBSD: net.c,v 1.5 2014/08/21 14:24:08 mpi Exp $	*/
 /*	$NetBSD: net.c,v 1.1 1997/04/16 20:29:18 thorpej Exp $	*/
 
 /*
@@ -56,7 +56,6 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
 
 #include <lib/libsa/stand.h>
 #include <lib/libsa/net.h>
diff --git a/sys/arch/macppc/stand/netif_of.c b/sys/arch/macppc/stand/netif_of.c
index 7f66c812694..b6f9bbb74ec 100644
--- a/sys/arch/macppc/stand/netif_of.c
+++ b/sys/arch/macppc/stand/netif_of.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netif_of.c,v 1.5 2008/05/25 16:55:31 miod Exp $	*/
+/*	$OpenBSD: netif_of.c,v 1.6 2014/08/21 14:24:08 mpi Exp $	*/
 /*	$NetBSD: netif_of.c,v 1.1 1997/04/16 20:29:19 thorpej Exp $	*/
 
 /*
@@ -52,7 +52,6 @@
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
 
 #include <lib/libsa/stand.h>
 #include <lib/libsa/net.h>
diff --git a/sys/arch/sparc/stand/common/net.c b/sys/arch/sparc/stand/common/net.c
index 8d59aac5883..6914258585d 100644
--- a/sys/arch/sparc/stand/common/net.c
+++ b/sys/arch/sparc/stand/common/net.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: net.c,v 1.3 2011/04/14 18:27:49 miod Exp $	*/
+/*	$OpenBSD: net.c,v 1.4 2014/08/21 14:24:08 mpi Exp $	*/
 /*	$NetBSD: net.c,v 1.2 1997/07/22 17:41:07 drochner Exp $	*/
 
 /*
@@ -53,7 +53,6 @@
 #include <sys/socket.h>
 #include <net/if.h>
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 
 #include <lib/libsa/stand.h>
 #include <lib/libsa/nfs.h>
diff --git a/sys/arch/sparc/stand/common/netif_sun.c b/sys/arch/sparc/stand/common/netif_sun.c
index 64a76a57081..af98959a96a 100644
--- a/sys/arch/sparc/stand/common/netif_sun.c
+++ b/sys/arch/sparc/stand/common/netif_sun.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netif_sun.c,v 1.3 2012/05/20 14:57:07 deraadt Exp $	*/
+/*	$OpenBSD: netif_sun.c,v 1.4 2014/08/21 14:24:08 mpi Exp $	*/
 /*	$NetBSD: netif_sun.c,v 1.2 1995/09/18 21:31:48 pk Exp $	*/
 
 /*
@@ -45,7 +45,6 @@
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
 
 #include <lib/libsa/stand.h>
 #include <lib/libsa/net.h>
diff --git a/sys/arch/sparc64/sparc64/in4_cksum.c b/sys/arch/sparc64/sparc64/in4_cksum.c
index e731c5f9d32..00227094501 100644
--- a/sys/arch/sparc64/sparc64/in4_cksum.c
+++ b/sys/arch/sparc64/sparc64/in4_cksum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in4_cksum.c,v 1.4 2014/03/29 18:09:30 guenther Exp $	*/
+/*	$OpenBSD: in4_cksum.c,v 1.5 2014/08/21 14:24:08 mpi Exp $	*/
 /*	$NetBSD: in4_cksum.c,v 1.5 2003/10/13 14:22:20 agc Exp $ */
 
 /*
@@ -82,9 +82,8 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
-#include <sys/socketvar.h>
+
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 
diff --git a/sys/arch/sparc64/stand/ofwboot/net.c b/sys/arch/sparc64/stand/ofwboot/net.c
index d40cdb58815..052a879f99a 100644
--- a/sys/arch/sparc64/stand/ofwboot/net.c
+++ b/sys/arch/sparc64/stand/ofwboot/net.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: net.c,v 1.5 2009/09/03 16:49:13 jsing Exp $	*/
+/*	$OpenBSD: net.c,v 1.6 2014/08/21 14:24:08 mpi Exp $	*/
 /*	$NetBSD: net.c,v 1.1 2000/08/20 14:58:38 mrg Exp $	*/
 
 /*
@@ -56,7 +56,6 @@
 
 #include <net/if.h>
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 
 #include <lib/libsa/stand.h>
 #include <lib/libsa/net.h>
diff --git a/sys/arch/sparc64/stand/ofwboot/netif_of.c b/sys/arch/sparc64/stand/ofwboot/netif_of.c
index ba43731d775..ea1d63db5b9 100644
--- a/sys/arch/sparc64/stand/ofwboot/netif_of.c
+++ b/sys/arch/sparc64/stand/ofwboot/netif_of.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netif_of.c,v 1.6 2009/11/04 12:03:57 jsing Exp $	*/
+/*	$OpenBSD: netif_of.c,v 1.7 2014/08/21 14:24:08 mpi Exp $	*/
 /*	$NetBSD: netif_of.c,v 1.1 2000/08/20 14:58:39 mrg Exp $	*/
 
 /*
@@ -46,7 +46,6 @@
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
 
 #include <lib/libsa/stand.h>
diff --git a/sys/arch/vax/if/if_de.c b/sys/arch/vax/if/if_de.c
index dfa91417a6a..0fb8fd41b05 100644
--- a/sys/arch/vax/if/if_de.c
+++ b/sys/arch/vax/if/if_de.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_de.c,v 1.24 2014/02/13 09:20:07 mpi Exp $	*/
+/*	$OpenBSD: if_de.c,v 1.25 2014/08/21 14:24:08 mpi Exp $	*/
 /*	$NetBSD: if_de.c,v 1.27 1997/04/19 15:02:29 ragge Exp $	*/
 
 /*
@@ -61,7 +61,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/arch/vax/stand/boot/if_de.c b/sys/arch/vax/stand/boot/if_de.c
index 3dd71bb6aa2..c7c5a3b0d73 100644
--- a/sys/arch/vax/stand/boot/if_de.c
+++ b/sys/arch/vax/stand/boot/if_de.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_de.c,v 1.3 2011/07/06 18:32:59 miod Exp $ */
+/*	$OpenBSD: if_de.c,v 1.4 2014/08/21 14:24:08 mpi Exp $ */
 /*	$NetBSD: if_de.c,v 1.2 2002/05/24 21:41:40 ragge Exp $	*/
 
 /*
@@ -41,7 +41,6 @@
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
 
 #include <lib/libsa/netif.h>
diff --git a/sys/arch/vax/stand/boot/if_le.c b/sys/arch/vax/stand/boot/if_le.c
index ade85d16e78..fb3651f1fef 100644
--- a/sys/arch/vax/stand/boot/if_le.c
+++ b/sys/arch/vax/stand/boot/if_le.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_le.c,v 1.8 2013/09/30 04:30:03 miod Exp $ */
+/*	$OpenBSD: if_le.c,v 1.9 2014/08/21 14:24:08 mpi Exp $ */
 /*	$NetBSD: if_le.c,v 1.6 2000/05/20 13:30:03 ragge Exp $ */
 /*
  * Copyright (c) 1997, 1999 Ludd, University of Lule}, Sweden.
@@ -43,7 +43,6 @@
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
 
 #include <machine/sid.h>
diff --git a/sys/arch/vax/stand/boot/if_qe.c b/sys/arch/vax/stand/boot/if_qe.c
index 36a6b30d376..c52e046c470 100644
--- a/sys/arch/vax/stand/boot/if_qe.c
+++ b/sys/arch/vax/stand/boot/if_qe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_qe.c,v 1.3 2002/06/11 09:36:23 hugh Exp $ */
+/*	$OpenBSD: if_qe.c,v 1.4 2014/08/21 14:24:08 mpi Exp $ */
 /*	$NetBSD: if_qe.c,v 1.3 2000/05/20 13:30:03 ragge Exp $ */
 
 /*
@@ -36,7 +36,6 @@
 #include <sys/types.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 
 #include <lib/libsa/netif.h>
 #include <lib/libsa/stand.h>
diff --git a/sys/arch/vax/stand/boot/if_ze.c b/sys/arch/vax/stand/boot/if_ze.c
index e0c6624e5a4..1e23e346b56 100644
--- a/sys/arch/vax/stand/boot/if_ze.c
+++ b/sys/arch/vax/stand/boot/if_ze.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ze.c,v 1.5 2006/08/24 22:10:36 miod Exp $ */
+/*	$OpenBSD: if_ze.c,v 1.6 2014/08/21 14:24:08 mpi Exp $ */
 /*	$NetBSD: if_ze.c,v 1.12 2002/05/27 16:54:18 ragge Exp $	*/
 /*
  * Copyright (c) 1998 James R. Maynard III.  All rights reserved.
@@ -39,7 +39,6 @@
 #include <net/if.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
 
 #include <lib/libsa/netif.h>
diff --git a/sys/arch/vax/stand/boot/netio.c b/sys/arch/vax/stand/boot/netio.c
index 90245c03140..91c6745eea2 100644
--- a/sys/arch/vax/stand/boot/netio.c
+++ b/sys/arch/vax/stand/boot/netio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: netio.c,v 1.5 2008/06/26 05:42:13 ray Exp $	*/
+/*	$OpenBSD: netio.c,v 1.6 2014/08/21 14:24:08 mpi Exp $	*/
 /*	$NetBSD: netio.c,v 1.6 2000/05/26 20:16:46 ragge Exp $	*/
 
 /*-
@@ -83,7 +83,6 @@
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
 
 #include "lib/libsa/stand.h"
 #include "lib/libsa/net.h"
diff --git a/sys/arch/vax/vax/in4_cksum.c b/sys/arch/vax/vax/in4_cksum.c
index fc916f53cc3..4997b04e0a1 100644
--- a/sys/arch/vax/vax/in4_cksum.c
+++ b/sys/arch/vax/vax/in4_cksum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in4_cksum.c,v 1.5 2014/03/29 18:09:30 guenther Exp $	*/
+/*	$OpenBSD: in4_cksum.c,v 1.6 2014/08/21 14:24:08 mpi Exp $	*/
 /*	$NetBSD: in4_cksum.c,v 1.8 2003/09/29 22:54:28 matt Exp $	*/
 
 /*
@@ -66,7 +66,6 @@
 #include <sys/mbuf.h>
 #include <sys/socketvar.h>
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 
-- 
2.20.1