From 38044d701808f721d42f3c41a510a5735a36a120 Mon Sep 17 00:00:00 2001
From: mpi <mpi@openbsd.org>
Date: Tue, 22 Jul 2014 10:35:34 +0000
Subject: [PATCH] <netinet/in_systm.h> is no longer needed.

---
 sys/arch/i386/i386/genassym.cf      | 3 +--
 sys/arch/macppc/dev/if_mc.c         | 8 +-------
 sys/arch/octeon/dev/cn30xxipd.c     | 4 +---
 sys/arch/octeon/dev/if_cnmac.c      | 7 +------
 sys/arch/powerpc/powerpc/in_cksum.c | 4 ++--
 sys/arch/sgi/dev/if_iec.c           | 9 ++-------
 sys/arch/sgi/dev/if_mec.c           | 9 ++-------
 sys/arch/sgi/hpc/if_sq.c            | 9 ++-------
 sys/arch/sparc/dev/be.c             | 6 +-----
 sys/arch/sparc/dev/hme.c            | 8 +-------
 sys/arch/sparc/dev/if_gem_sbus.c    | 6 +-----
 sys/arch/sparc/dev/if_ie.c          | 7 +------
 sys/arch/sparc/dev/if_ti_sbus.c     | 6 +-----
 sys/arch/sparc/dev/qe.c             | 6 +-----
 sys/arch/sparc/dev/qec.c            | 6 +-----
 sys/arch/sparc/sparc/in_cksum.c     | 4 ++--
 16 files changed, 21 insertions(+), 81 deletions(-)

diff --git a/sys/arch/i386/i386/genassym.cf b/sys/arch/i386/i386/genassym.cf
index 2f1aaa61af1..81e0be6fecf 100644
--- a/sys/arch/i386/i386/genassym.cf
+++ b/sys/arch/i386/i386/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.34 2011/07/04 22:53:53 tedu Exp $
+#	$OpenBSD: genassym.cf,v 1.35 2014/07/22 10:35:34 mpi Exp $
 #
 # Copyright (c) 1982, 1990 The Regents of the University of California.
 # All rights reserved.
@@ -39,7 +39,6 @@ ifdef INET
 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>
 endif
diff --git a/sys/arch/macppc/dev/if_mc.c b/sys/arch/macppc/dev/if_mc.c
index 36693acc7b7..afdc9fad62c 100644
--- a/sys/arch/macppc/dev/if_mc.c
+++ b/sys/arch/macppc/dev/if_mc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mc.c,v 1.16 2013/10/23 10:31:19 mpi Exp $	*/
+/*	$OpenBSD: if_mc.c,v 1.17 2014/07/22 10:35:35 mpi Exp $	*/
 /*	$NetBSD: if_mc.c,v 1.9.16.1 2006/06/21 14:53:13 yamt Exp $	*/
 
 /*-
@@ -50,14 +50,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#include <uvm/uvm_extern.h>
-
-#ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#endif
 
 #include "bpfilter.h"
 #if NBPFILTER > 0
diff --git a/sys/arch/octeon/dev/cn30xxipd.c b/sys/arch/octeon/dev/cn30xxipd.c
index a92ca60a9b3..c0d632629da 100644
--- a/sys/arch/octeon/dev/cn30xxipd.c
+++ b/sys/arch/octeon/dev/cn30xxipd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cn30xxipd.c,v 1.3 2013/10/22 14:06:08 bcallah Exp $	*/
+/*	$OpenBSD: cn30xxipd.c,v 1.4 2014/07/22 10:35:35 mpi Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -40,8 +40,6 @@
 #include <octeon/dev/cn30xxipdvar.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 
 #define IP_OFFSET(data, word2) \
 	((caddr_t)(data) + ((word2 & PIP_WQE_WORD2_IP_OFFSET) >> PIP_WQE_WORD2_IP_OFFSET_SHIFT))
diff --git a/sys/arch/octeon/dev/if_cnmac.c b/sys/arch/octeon/dev/if_cnmac.c
index 385de3803d5..c059f220181 100644
--- a/sys/arch/octeon/dev/if_cnmac.c
+++ b/sys/arch/octeon/dev/if_cnmac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_cnmac.c,v 1.14 2014/05/10 22:25:16 jasper Exp $	*/
+/*	$OpenBSD: if_cnmac.c,v 1.15 2014/07/22 10:35:35 mpi Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -58,16 +58,11 @@
 #include <net/if_media.h>
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#include <net/route.h>
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
 
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-
 #include <machine/bus.h>
 #include <machine/intr.h>
 #include <machine/endian.h>
diff --git a/sys/arch/powerpc/powerpc/in_cksum.c b/sys/arch/powerpc/powerpc/in_cksum.c
index 27e918e6773..89e44090c75 100644
--- a/sys/arch/powerpc/powerpc/in_cksum.c
+++ b/sys/arch/powerpc/powerpc/in_cksum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_cksum.c,v 1.9 2014/03/29 18:09:30 guenther Exp $	*/
+/*	$OpenBSD: in_cksum.c,v 1.10 2014/07/22 10:35:35 mpi Exp $	*/
 /*	$NetBSD: in_cksum.c,v 1.7 2003/07/15 02:54:48 lukem Exp $	*/
 
 /*
@@ -40,8 +40,8 @@
 #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/sgi/dev/if_iec.c b/sys/arch/sgi/dev/if_iec.c
index 17c6322e1d1..5f917582b20 100644
--- a/sys/arch/sgi/dev/if_iec.c
+++ b/sys/arch/sgi/dev/if_iec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iec.c,v 1.10 2014/05/19 21:18:42 miod Exp $	*/
+/*	$OpenBSD: if_iec.c,v 1.11 2014/07/22 10:35:35 mpi Exp $	*/
 
 /*
  * Copyright (c) 2009 Miodrag Vallat.
@@ -98,16 +98,11 @@
 #include <net/if_media.h>
 #include <net/if_types.h>
 
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#endif
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
 
+#include <netinet/in.h>
 #include <netinet/if_ether.h>
 
 #include <machine/autoconf.h>
diff --git a/sys/arch/sgi/dev/if_mec.c b/sys/arch/sgi/dev/if_mec.c
index 6ad2f7b46c1..b030a0c2c86 100644
--- a/sys/arch/sgi/dev/if_mec.c
+++ b/sys/arch/sgi/dev/if_mec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mec.c,v 1.26 2013/08/17 15:44:08 bluhm Exp $ */
+/*	$OpenBSD: if_mec.c,v 1.27 2014/07/22 10:35:35 mpi Exp $ */
 /*	$NetBSD: if_mec_mace.c,v 1.5 2004/08/01 06:36:36 tsutsui Exp $ */
 
 /*
@@ -82,16 +82,11 @@
 #include <net/if_media.h>
 #include <net/if_types.h>
 
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#endif
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
 
+#include <netinet/in.h>
 #include <netinet/if_ether.h>
 
 #include <machine/bus.h>
diff --git a/sys/arch/sgi/hpc/if_sq.c b/sys/arch/sgi/hpc/if_sq.c
index 71b06142ed9..987bbd7985c 100644
--- a/sys/arch/sgi/hpc/if_sq.c
+++ b/sys/arch/sgi/hpc/if_sq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sq.c,v 1.9 2013/08/17 15:50:06 bluhm Exp $	*/
+/*	$OpenBSD: if_sq.c,v 1.10 2014/07/22 10:35:35 mpi Exp $	*/
 /*	$NetBSD: if_sq.c,v 1.42 2011/07/01 18:53:47 dyoung Exp $	*/
 
 /*
@@ -54,16 +54,11 @@
 #include <net/if_media.h>
 #include <net/if_types.h>
 
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#endif
-
 #if NBPFILTER > 0
 #include <net/bpf.h>
 #endif
 
+#include <netinet/in.h>
 #include <netinet/if_ether.h>
 
 #include <machine/autoconf.h>
diff --git a/sys/arch/sparc/dev/be.c b/sys/arch/sparc/dev/be.c
index 97b07758c60..08ced64a326 100644
--- a/sys/arch/sparc/dev/be.c
+++ b/sys/arch/sparc/dev/be.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: be.c,v 1.46 2013/12/24 01:11:04 dlg Exp $	*/
+/*	$OpenBSD: be.c,v 1.47 2014/07/22 10:35:35 mpi Exp $	*/
 
 /*
  * Copyright (c) 1998 Theo de Raadt and Jason L. Wright.
@@ -43,12 +43,8 @@
 #include <net/netisr.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include "bpfilter.h"
 #if NBPFILTER > 0
diff --git a/sys/arch/sparc/dev/hme.c b/sys/arch/sparc/dev/hme.c
index c736f518c35..834118955f2 100644
--- a/sys/arch/sparc/dev/hme.c
+++ b/sys/arch/sparc/dev/hme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hme.c,v 1.65 2014/04/22 15:52:05 naddy Exp $	*/
+/*	$OpenBSD: hme.c,v 1.66 2014/07/22 10:35:35 mpi Exp $	*/
 
 /*
  * Copyright (c) 1998 Jason L. Wright (jason@thought.net)
@@ -56,14 +56,8 @@
 #include <net/netisr.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 #include <netinet/if_ether.h>
-#include <netinet/tcp.h>
-#include <netinet/udp.h>
-#endif
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
diff --git a/sys/arch/sparc/dev/if_gem_sbus.c b/sys/arch/sparc/dev/if_gem_sbus.c
index ad2e8c4b22a..c65a924254f 100644
--- a/sys/arch/sparc/dev/if_gem_sbus.c
+++ b/sys/arch/sparc/dev/if_gem_sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_gem_sbus.c,v 1.2 2013/09/05 20:55:58 bluhm Exp $	*/
+/*	$OpenBSD: if_gem_sbus.c,v 1.3 2014/07/22 10:35:35 mpi Exp $	*/
 /*	$NetBSD: if_gem_sbus.c,v 1.1 2006/11/24 13:23:32 martin Exp $	*/
 
 /*-
@@ -45,12 +45,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#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/sparc/dev/if_ie.c b/sys/arch/sparc/dev/if_ie.c
index df4def1033d..f07eab3c829 100644
--- a/sys/arch/sparc/dev/if_ie.c
+++ b/sys/arch/sparc/dev/if_ie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ie.c,v 1.46 2014/07/09 09:30:49 henning Exp $	*/
+/*	$OpenBSD: if_ie.c,v 1.47 2014/07/22 10:35:35 mpi Exp $	*/
 /*	$NetBSD: if_ie.c,v 1.33 1997/07/29 17:55:38 fair Exp $	*/
 
 /*-
@@ -123,15 +123,10 @@ Mode of operation:
 #include <net/bpfdesc.h>
 #endif
 
-#ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <uvm/uvm_extern.h>
-#include <uvm/uvm_map.h>
 
 /*
  * ugly byte-order hack for SUNs
diff --git a/sys/arch/sparc/dev/if_ti_sbus.c b/sys/arch/sparc/dev/if_ti_sbus.c
index f2ce4ede4b8..3f928fea157 100644
--- a/sys/arch/sparc/dev/if_ti_sbus.c
+++ b/sys/arch/sparc/dev/if_ti_sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ti_sbus.c,v 1.2 2013/09/05 20:55:58 bluhm Exp $	*/
+/*	$OpenBSD: if_ti_sbus.c,v 1.3 2014/07/22 10:35:35 mpi Exp $	*/
 /*
  * Copyright (c) 2009 Mark Kettenis
  *
@@ -23,12 +23,8 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <machine/autoconf.h>
 #include <machine/bus.h>
diff --git a/sys/arch/sparc/dev/qe.c b/sys/arch/sparc/dev/qe.c
index e00ae00e460..06c36cf6fa7 100644
--- a/sys/arch/sparc/dev/qe.c
+++ b/sys/arch/sparc/dev/qe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qe.c,v 1.35 2013/11/27 08:56:31 mpi Exp $	*/
+/*	$OpenBSD: qe.c,v 1.36 2014/07/22 10:35:35 mpi Exp $	*/
 
 /*
  * Copyright (c) 1998, 2000 Jason L. Wright.
@@ -51,12 +51,8 @@
 #include <net/if_media.h>
 #include <net/netisr.h>
 
-#ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include "bpfilter.h"
 #if NBPFILTER > 0
diff --git a/sys/arch/sparc/dev/qec.c b/sys/arch/sparc/dev/qec.c
index bfe5247b38e..f532682f509 100644
--- a/sys/arch/sparc/dev/qec.c
+++ b/sys/arch/sparc/dev/qec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qec.c,v 1.20 2013/09/05 20:55:58 bluhm Exp $	*/
+/*	$OpenBSD: qec.c,v 1.21 2014/07/22 10:35:35 mpi Exp $	*/
 
 /*
  * Copyright (c) 1998 Theo de Raadt and Jason L. Wright.
@@ -44,12 +44,8 @@
 #include <net/netisr.h>
 #include <net/if_media.h>
 
-#ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <sparc/autoconf.h>
 #include <sparc/cpu.h>
diff --git a/sys/arch/sparc/sparc/in_cksum.c b/sys/arch/sparc/sparc/in_cksum.c
index e66499d0192..ea2b11a84e3 100644
--- a/sys/arch/sparc/sparc/in_cksum.c
+++ b/sys/arch/sparc/sparc/in_cksum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in_cksum.c,v 1.13 2014/03/29 18:09:30 guenther Exp $	*/
+/*	$OpenBSD: in_cksum.c,v 1.14 2014/07/22 10:35:35 mpi Exp $	*/
 /*	$NetBSD: in_cksum.c,v 1.7 1996/10/05 23:44:34 mrg Exp $ */
 
 /*
@@ -39,8 +39,8 @@
 #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>
 
-- 
2.20.1