From: mpi <mpi@openbsd.org>
Date: Tue, 22 Jul 2014 13:12:11 +0000 (+0000)
Subject: Fewer <netinet/in_systm.h>
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=9e6eaca1cc61f407122eaf0e917f4779426d0832;p=openbsd

Fewer <netinet/in_systm.h>
---

diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c
index 4103e850fa6..8b73df6db95 100644
--- a/sys/dev/ic/acx.c
+++ b/sys/dev/ic/acx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acx.c,v 1.103 2014/07/12 18:48:17 tedu Exp $ */
+/*	$OpenBSD: acx.c,v 1.104 2014/07/22 13:12:11 mpi Exp $ */
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -115,9 +115,7 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
-#include <netinet/ip.h>
 #endif
 
 #include <net80211/ieee80211_var.h>
diff --git a/sys/dev/ic/aic6915.c b/sys/dev/ic/aic6915.c
index 8f2ea5fde3f..6f183b5b087 100644
--- a/sys/dev/ic/aic6915.c
+++ b/sys/dev/ic/aic6915.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic6915.c,v 1.12 2014/07/08 17:19:25 deraadt Exp $	*/
+/*	$OpenBSD: aic6915.c,v 1.13 2014/07/22 13:12:11 mpi Exp $	*/
 /*	$NetBSD: aic6915.c,v 1.15 2005/12/24 20:27:29 perry Exp $	*/
 
 /*-
@@ -54,8 +54,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/dev/ic/am7990.c b/sys/dev/ic/am7990.c
index 137592a9860..3f5af7e825f 100644
--- a/sys/dev/ic/am7990.c
+++ b/sys/dev/ic/am7990.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: am7990.c,v 1.47 2013/09/24 20:10:55 miod Exp $	*/
+/*	$OpenBSD: am7990.c,v 1.48 2014/07/22 13:12:11 mpi Exp $	*/
 /*	$NetBSD: am7990.c,v 1.74 2012/02/02 19:43:02 tls Exp $	*/
 
 /*-
@@ -83,8 +83,6 @@
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 #endif
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/am79900.c b/sys/dev/ic/am79900.c
index 5541f187cda..10bd6681b94 100644
--- a/sys/dev/ic/am79900.c
+++ b/sys/dev/ic/am79900.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: am79900.c,v 1.1 2013/09/24 20:10:55 miod Exp $	*/
+/*	$OpenBSD: am79900.c,v 1.2 2014/07/22 13:12:11 mpi Exp $	*/
 /*	$NetBSD: am79900.c,v 1.23 2012/02/02 19:43:02 tls Exp $	*/
 
 /*-
@@ -121,8 +121,6 @@
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 #endif
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/an.c b/sys/dev/ic/an.c
index 3a855cd8039..e53dc521565 100644
--- a/sys/dev/ic/an.c
+++ b/sys/dev/ic/an.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: an.c,v 1.60 2013/08/07 01:06:27 bluhm Exp $	*/
+/*	$OpenBSD: an.c,v 1.61 2014/07/22 13:12:11 mpi Exp $	*/
 /*	$NetBSD: an.c,v 1.34 2005/06/20 02:49:18 atatat Exp $	*/
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -102,8 +102,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/dev/ic/ar5008.c b/sys/dev/ic/ar5008.c
index 0cd073591c0..f52ae5c88cc 100644
--- a/sys/dev/ic/ar5008.c
+++ b/sys/dev/ic/ar5008.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar5008.c,v 1.25 2014/07/13 23:10:23 deraadt Exp $	*/
+/*	$OpenBSD: ar5008.c,v 1.26 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -51,9 +51,7 @@
 #include <net/if_types.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
-#include <netinet/ip.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_amrr.h>
diff --git a/sys/dev/ic/ar5416.c b/sys/dev/ic/ar5416.c
index a7ca9c5df02..b2a0ca4b9a9 100644
--- a/sys/dev/ic/ar5416.c
+++ b/sys/dev/ic/ar5416.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar5416.c,v 1.13 2013/08/07 01:06:28 bluhm Exp $	*/
+/*	$OpenBSD: ar5416.c,v 1.14 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -50,9 +50,7 @@
 #include <net/if_types.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
-#include <netinet/ip.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_amrr.h>
diff --git a/sys/dev/ic/ar9003.c b/sys/dev/ic/ar9003.c
index e0ec780f740..ac50ecb5ba2 100644
--- a/sys/dev/ic/ar9003.c
+++ b/sys/dev/ic/ar9003.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9003.c,v 1.29 2014/07/13 23:10:23 deraadt Exp $	*/
+/*	$OpenBSD: ar9003.c,v 1.30 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -51,9 +51,7 @@
 #include <net/if_types.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
-#include <netinet/ip.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_amrr.h>
diff --git a/sys/dev/ic/ar9280.c b/sys/dev/ic/ar9280.c
index d2e5eaaaa96..297eb665eff 100644
--- a/sys/dev/ic/ar9280.c
+++ b/sys/dev/ic/ar9280.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9280.c,v 1.19 2013/08/07 01:06:28 bluhm Exp $	*/
+/*	$OpenBSD: ar9280.c,v 1.20 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -50,9 +50,7 @@
 #include <net/if_types.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
-#include <netinet/ip.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_amrr.h>
diff --git a/sys/dev/ic/ar9285.c b/sys/dev/ic/ar9285.c
index d7652006a75..4c738b11197 100644
--- a/sys/dev/ic/ar9285.c
+++ b/sys/dev/ic/ar9285.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9285.c,v 1.20 2013/08/07 01:06:28 bluhm Exp $	*/
+/*	$OpenBSD: ar9285.c,v 1.21 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -51,9 +51,7 @@
 #include <net/if_types.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
-#include <netinet/ip.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_amrr.h>
diff --git a/sys/dev/ic/ar9287.c b/sys/dev/ic/ar9287.c
index 3daf8e64ea9..3b05e0c281f 100644
--- a/sys/dev/ic/ar9287.c
+++ b/sys/dev/ic/ar9287.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9287.c,v 1.18 2013/08/07 01:06:28 bluhm Exp $	*/
+/*	$OpenBSD: ar9287.c,v 1.19 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -50,9 +50,7 @@
 #include <net/if_types.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
-#include <netinet/ip.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_amrr.h>
diff --git a/sys/dev/ic/ar9380.c b/sys/dev/ic/ar9380.c
index a3abe7f1496..092de1a1622 100644
--- a/sys/dev/ic/ar9380.c
+++ b/sys/dev/ic/ar9380.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9380.c,v 1.18 2013/08/07 01:06:28 bluhm Exp $	*/
+/*	$OpenBSD: ar9380.c,v 1.19 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2011 Damien Bergamini <damien.bergamini@free.fr>
@@ -48,7 +48,6 @@
 #include <net/if_types.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
 
 #include <net80211/ieee80211_var.h>
diff --git a/sys/dev/ic/athn.c b/sys/dev/ic/athn.c
index 213178085f0..4ea035b874a 100644
--- a/sys/dev/ic/athn.c
+++ b/sys/dev/ic/athn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: athn.c,v 1.82 2014/07/12 18:48:17 tedu Exp $	*/
+/*	$OpenBSD: athn.c,v 1.83 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -51,9 +51,7 @@
 #include <net/if_types.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
-#include <netinet/ip.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_amrr.h>
diff --git a/sys/dev/ic/ax88190.c b/sys/dev/ic/ax88190.c
index 0fcfb41ea6a..35dc7ffe416 100644
--- a/sys/dev/ic/ax88190.c
+++ b/sys/dev/ic/ax88190.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ax88190.c,v 1.4 2013/08/07 01:06:28 bluhm Exp $	*/
+/*	$OpenBSD: ax88190.c,v 1.5 2014/07/22 13:12:11 mpi Exp $	*/
 /*	$NetBSD$	*/
 
 /*-
@@ -40,12 +40,8 @@
 #include <net/if_types.h>
 #include <net/if_media.h>
 
-#ifdef INET
-#include <netinet/in.h>   
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
+#include <netinet/in.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <machine/bus.h>
 
diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c
index 8d170b34293..80d1ef78266 100644
--- a/sys/dev/ic/bwi.c
+++ b/sys/dev/ic/bwi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bwi.c,v 1.106 2014/07/20 11:59:12 stsp Exp $	*/
+/*	$OpenBSD: bwi.c,v 1.107 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
@@ -63,7 +63,6 @@
 #endif
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
 
 #include <net80211/ieee80211_var.h>
diff --git a/sys/dev/ic/dc.c b/sys/dev/ic/dc.c
index f87d8dc15e5..dfcb5cca5f3 100644
--- a/sys/dev/ic/dc.c
+++ b/sys/dev/ic/dc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dc.c,v 1.133 2014/07/12 18:48:17 tedu Exp $	*/
+/*	$OpenBSD: dc.c,v 1.134 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -107,12 +107,8 @@
 #include <net/if_dl.h>
 #include <net/if_types.h>
 
-#ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 #include <netinet/if_ether.h>
-#endif
 
 #include <net/if_media.h>
 
diff --git a/sys/dev/ic/dl10019.c b/sys/dev/ic/dl10019.c
index 4cf32c78408..ff10975a829 100644
--- a/sys/dev/ic/dl10019.c
+++ b/sys/dev/ic/dl10019.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dl10019.c,v 1.5 2013/08/07 01:06:29 bluhm Exp $	*/
+/*	$OpenBSD: dl10019.c,v 1.6 2014/07/22 13:12:11 mpi Exp $	*/
 /*	$NetBSD$	*/
 
 /*-
@@ -42,12 +42,8 @@
 #include <net/if_types.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/bus.h>
 
diff --git a/sys/dev/ic/dp8390.c b/sys/dev/ic/dp8390.c
index b4ec9323467..28ebd764ce1 100644
--- a/sys/dev/ic/dp8390.c
+++ b/sys/dev/ic/dp8390.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dp8390.c,v 1.46 2013/11/26 09:50:33 mpi Exp $	*/
+/*	$OpenBSD: dp8390.c,v 1.47 2014/07/22 13:12:11 mpi Exp $	*/
 /*	$NetBSD: dp8390.c,v 1.13 1998/07/05 06:49:11 jonathan Exp $	*/
 
 /*
@@ -30,12 +30,8 @@
 #include <net/if_types.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
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c
index 09ed3914789..bf7c7ec0293 100644
--- a/sys/dev/ic/elink3.c
+++ b/sys/dev/ic/elink3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: elink3.c,v 1.79 2013/08/07 01:06:29 bluhm Exp $	*/
+/*	$OpenBSD: elink3.c,v 1.80 2014/07/22 13:12:11 mpi Exp $	*/
 /*	$NetBSD: elink3.c,v 1.32 1997/05/14 00:22:00 thorpej Exp $	*/
 
 /*
@@ -51,12 +51,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
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
diff --git a/sys/dev/ic/fxp.c b/sys/dev/ic/fxp.c
index d9df07c37ea..7129e9aa862 100644
--- a/sys/dev/ic/fxp.c
+++ b/sys/dev/ic/fxp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fxp.c,v 1.116 2014/07/12 18:48:17 tedu Exp $	*/
+/*	$OpenBSD: fxp.c,v 1.117 2014/07/22 13:12:11 mpi Exp $	*/
 /*	$NetBSD: if_fxp.c,v 1.2 1997/06/05 02:01:55 thorpej Exp $	*/
 
 /*
@@ -55,7 +55,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #endif
 
diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c
index d3d654bb9b8..5cc0dd60ff8 100644
--- a/sys/dev/ic/gem.c
+++ b/sys/dev/ic/gem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gem.c,v 1.104 2014/07/08 05:35:18 dlg Exp $	*/
+/*	$OpenBSD: gem.c,v 1.105 2014/07/22 13:12:12 mpi Exp $	*/
 /*	$NetBSD: gem.c,v 1.1 2001/09/16 00:11:43 eeh Exp $ */
 
 /*
@@ -54,14 +54,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>
-#include <netinet/tcp.h>
-#include <netinet/udp.h>
-#endif
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
diff --git a/sys/dev/ic/hme.c b/sys/dev/ic/hme.c
index e235987a082..1a197064f63 100644
--- a/sys/dev/ic/hme.c
+++ b/sys/dev/ic/hme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hme.c,v 1.66 2014/07/08 05:35:18 dlg Exp $	*/
+/*	$OpenBSD: hme.c,v 1.67 2014/07/22 13:12:12 mpi Exp $	*/
 /*	$NetBSD: hme.c,v 1.21 2001/07/07 15:59:37 thorpej Exp $	*/
 
 /*-
@@ -56,11 +56,7 @@
 
 #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
diff --git a/sys/dev/ic/i82596.c b/sys/dev/ic/i82596.c
index 8be1e5a491a..b4ad779a47c 100644
--- a/sys/dev/ic/i82596.c
+++ b/sys/dev/ic/i82596.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82596.c,v 1.38 2014/07/12 18:48:17 tedu Exp $	*/
+/*	$OpenBSD: i82596.c,v 1.39 2014/07/22 13:12:12 mpi Exp $	*/
 /*	$NetBSD: i82586.c,v 1.18 1998/08/15 04:42:42 mycroft Exp $	*/
 
 /*-
@@ -156,8 +156,6 @@ Mode of operation:
 
 #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/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c
index 71dd4280c7b..54f0d417327 100644
--- a/sys/dev/ic/if_wi.c
+++ b/sys/dev/ic/if_wi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi.c,v 1.155 2014/07/12 18:48:17 tedu Exp $	*/
+/*	$OpenBSD: if_wi.c,v 1.156 2014/07/22 13:12:12 mpi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -81,8 +81,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/dev/ic/if_wi_hostap.c b/sys/dev/ic/if_wi_hostap.c
index fb1ae619337..7ce07f3a765 100644
--- a/sys/dev/ic/if_wi_hostap.c
+++ b/sys/dev/ic/if_wi_hostap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi_hostap.c,v 1.43 2014/07/12 18:48:17 tedu Exp $	*/
+/*	$OpenBSD: if_wi_hostap.c,v 1.44 2014/07/22 13:12:12 mpi Exp $	*/
 
 /*
  * Copyright (c) 2002
@@ -63,8 +63,6 @@
 #include <net/if_types.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 #include <netinet/if_ether.h>
 
 #include <net80211/ieee80211_var.h>
diff --git a/sys/dev/ic/lance.c b/sys/dev/ic/lance.c
index 7f1b6492f60..c959a8e2055 100644
--- a/sys/dev/ic/lance.c
+++ b/sys/dev/ic/lance.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lance.c,v 1.3 2014/07/13 23:10:23 deraadt Exp $	*/
+/*	$OpenBSD: lance.c,v 1.4 2014/07/22 13:12:12 mpi Exp $	*/
 /*	$NetBSD: lance.c,v 1.46 2012/02/02 19:43:03 tls Exp $	*/
 
 /*-
@@ -83,8 +83,6 @@
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 #endif
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/lemac.c b/sys/dev/ic/lemac.c
index 0720126a5b4..8a5d3338249 100644
--- a/sys/dev/ic/lemac.c
+++ b/sys/dev/ic/lemac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lemac.c,v 1.16 2014/07/08 17:19:25 deraadt Exp $ */
+/* $OpenBSD: lemac.c,v 1.17 2014/07/22 13:12:12 mpi Exp $ */
 /* $NetBSD: lemac.c,v 1.20 2001/06/13 10:46:02 wiz Exp $ */
 
 /*-
@@ -52,8 +52,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/dev/ic/malo.c b/sys/dev/ic/malo.c
index 80f442d5447..d906c4962a9 100644
--- a/sys/dev/ic/malo.c
+++ b/sys/dev/ic/malo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: malo.c,v 1.100 2014/07/13 23:10:23 deraadt Exp $ */
+/*	$OpenBSD: malo.c,v 1.101 2014/07/22 13:12:12 mpi Exp $ */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -43,7 +43,6 @@
 #endif
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
 
 #include <net80211/ieee80211_var.h>
diff --git a/sys/dev/ic/pgt.c b/sys/dev/ic/pgt.c
index 7e5c4f0aaa7..5e707288d64 100644
--- a/sys/dev/ic/pgt.c
+++ b/sys/dev/ic/pgt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pgt.c,v 1.74 2014/07/12 18:48:17 tedu Exp $  */
+/*	$OpenBSD: pgt.c,v 1.75 2014/07/22 13:12:12 mpi Exp $  */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -76,9 +76,7 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
-#include <netinet/ip.h>
 #endif
 
 #include <net80211/ieee80211_var.h>
diff --git a/sys/dev/ic/re.c b/sys/dev/ic/re.c
index abf81f47950..12a0bed6e8f 100644
--- a/sys/dev/ic/re.c
+++ b/sys/dev/ic/re.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: re.c,v 1.154 2014/07/08 05:35:18 dlg Exp $	*/
+/*	$OpenBSD: re.c,v 1.155 2014/07/22 13:12:12 mpi Exp $	*/
 /*	$FreeBSD: if_re.c,v 1.31 2004/09/04 07:54:05 ru Exp $	*/
 /*
  * Copyright (c) 1997, 1998-2003
@@ -127,8 +127,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/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c
index f460c801a65..7783d519a71 100644
--- a/sys/dev/ic/rt2560.c
+++ b/sys/dev/ic/rt2560.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2560.c,v 1.65 2014/07/13 23:10:23 deraadt Exp $  */
+/*	$OpenBSD: rt2560.c,v 1.66 2014/07/22 13:12:12 mpi Exp $  */
 
 /*-
  * Copyright (c) 2005, 2006
@@ -49,9 +49,7 @@
 #include <net/if_types.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
-#include <netinet/ip.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_amrr.h>
diff --git a/sys/dev/ic/rt2661.c b/sys/dev/ic/rt2661.c
index 798ff295f28..1cf1834951a 100644
--- a/sys/dev/ic/rt2661.c
+++ b/sys/dev/ic/rt2661.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2661.c,v 1.74 2014/07/13 23:10:23 deraadt Exp $	*/
+/*	$OpenBSD: rt2661.c,v 1.75 2014/07/22 13:12:12 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2006
@@ -50,9 +50,7 @@
 #include <net/if_types.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
-#include <netinet/ip.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_amrr.h>
diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c
index ac22ff942ba..1ee6aa35663 100644
--- a/sys/dev/ic/rt2860.c
+++ b/sys/dev/ic/rt2860.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2860.c,v 1.73 2014/07/12 18:48:17 tedu Exp $	*/
+/*	$OpenBSD: rt2860.c,v 1.74 2014/07/22 13:12:12 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -49,9 +49,7 @@
 #include <net/if_types.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
-#include <netinet/ip.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_amrr.h>
diff --git a/sys/dev/ic/rtl81x9.c b/sys/dev/ic/rtl81x9.c
index 7557c6174df..7fbb768b5a0 100644
--- a/sys/dev/ic/rtl81x9.c
+++ b/sys/dev/ic/rtl81x9.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtl81x9.c,v 1.81 2013/12/28 03:35:00 deraadt Exp $ */
+/*	$OpenBSD: rtl81x9.c,v 1.82 2014/07/22 13:12:12 mpi Exp $ */
 
 /*
  * Copyright (c) 1997, 1998
@@ -101,8 +101,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/dev/ic/smc83c170.c b/sys/dev/ic/smc83c170.c
index befdee44846..f41b13219d5 100644
--- a/sys/dev/ic/smc83c170.c
+++ b/sys/dev/ic/smc83c170.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smc83c170.c,v 1.16 2013/11/26 09:50:33 mpi Exp $	*/
+/*	$OpenBSD: smc83c170.c,v 1.17 2014/07/22 13:12:12 mpi Exp $	*/
 /*	$NetBSD: smc83c170.c,v 1.59 2005/02/27 00:27:02 perry Exp $	*/
 
 /*-
@@ -54,8 +54,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/dev/ic/smc91cxx.c b/sys/dev/ic/smc91cxx.c
index 20a50ae614a..b94d6e06c5f 100644
--- a/sys/dev/ic/smc91cxx.c
+++ b/sys/dev/ic/smc91cxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smc91cxx.c,v 1.34 2013/08/07 01:06:31 bluhm Exp $	*/
+/*	$OpenBSD: smc91cxx.c,v 1.35 2014/07/22 13:12:12 mpi Exp $	*/
 /*	$NetBSD: smc91cxx.c,v 1.11 1998/08/08 23:51:41 mycroft Exp $	*/
 
 /*-
@@ -95,8 +95,6 @@
 #ifdef INET
 #include <netinet/in.h> 
 #include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 #endif
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/ti.c b/sys/dev/ic/ti.c
index e547913cdf5..e31867624cf 100644
--- a/sys/dev/ic/ti.c
+++ b/sys/dev/ic/ti.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ti.c,v 1.8 2014/07/12 18:48:17 tedu Exp $	*/
+/*	$OpenBSD: ti.c,v 1.9 2014/07/22 13:12:12 mpi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -90,8 +90,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/dev/ic/xl.c b/sys/dev/ic/xl.c
index f28caf4f32c..cbee422edff 100644
--- a/sys/dev/ic/xl.c
+++ b/sys/dev/ic/xl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xl.c,v 1.114 2014/07/08 05:35:18 dlg Exp $	*/
+/*	$OpenBSD: xl.c,v 1.115 2014/07/22 13:12:12 mpi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -121,8 +121,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/dev/pci/if_age.c b/sys/dev/pci/if_age.c
index 5c52ea372f0..087e1ace304 100644
--- a/sys/dev/pci/if_age.c
+++ b/sys/dev/pci/if_age.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_age.c,v 1.21 2013/08/07 01:06:33 bluhm Exp $	*/
+/*	$OpenBSD: if_age.c,v 1.22 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
@@ -52,8 +52,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/dev/pci/if_alc.c b/sys/dev/pci/if_alc.c
index efb1c17afce..453baf44225 100644
--- a/sys/dev/pci/if_alc.c
+++ b/sys/dev/pci/if_alc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_alc.c,v 1.26 2013/12/28 03:34:53 deraadt Exp $	*/
+/*	$OpenBSD: if_alc.c,v 1.27 2014/07/22 13:12:11 mpi Exp $	*/
 /*-
  * Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -51,8 +51,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/dev/pci/if_ale.c b/sys/dev/pci/if_ale.c
index 748410ccc85..b75655ed387 100644
--- a/sys/dev/pci/if_ale.c
+++ b/sys/dev/pci/if_ale.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ale.c,v 1.30 2013/12/28 03:34:54 deraadt Exp $	*/
+/*	$OpenBSD: if_ale.c,v 1.31 2014/07/22 13:12:11 mpi Exp $	*/
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -54,7 +54,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/dev/pci/if_bce.c b/sys/dev/pci/if_bce.c
index 5b745973e6e..6567177b5a4 100644
--- a/sys/dev/pci/if_bce.c
+++ b/sys/dev/pci/if_bce.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bce.c,v 1.37 2013/08/21 05:21:43 dlg Exp $ */
+/* $OpenBSD: if_bce.c,v 1.38 2014/07/22 13:12:11 mpi Exp $ */
 /* $NetBSD: if_bce.c,v 1.3 2003/09/29 01:53:02 mrg Exp $	 */
 
 /*
@@ -53,8 +53,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 #include <netinet/if_ether.h>
 #endif
 #if NBPFILTER > 0
diff --git a/sys/dev/pci/if_bge.c b/sys/dev/pci/if_bge.c
index fad3939f12b..5d239b1cc51 100644
--- a/sys/dev/pci/if_bge.c
+++ b/sys/dev/pci/if_bge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bge.c,v 1.357 2014/07/12 18:48:51 tedu Exp $	*/
+/*	$OpenBSD: if_bge.c,v 1.358 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -91,8 +91,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/dev/pci/if_bnxreg.h b/sys/dev/pci/if_bnxreg.h
index 83b358ead98..41260872181 100644
--- a/sys/dev/pci/if_bnxreg.h
+++ b/sys/dev/pci/if_bnxreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bnxreg.h,v 1.43 2014/07/08 05:35:18 dlg Exp $	*/
+/*	$OpenBSD: if_bnxreg.h,v 1.44 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2006 Broadcom Corporation
@@ -57,8 +57,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/dev/pci/if_dc_pci.c b/sys/dev/pci/if_dc_pci.c
index 20e7aba5b71..20a93db08d3 100644
--- a/sys/dev/pci/if_dc_pci.c
+++ b/sys/dev/pci/if_dc_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_dc_pci.c,v 1.69 2013/08/07 01:06:34 bluhm Exp $	*/
+/*	$OpenBSD: if_dc_pci.c,v 1.70 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -54,8 +54,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/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index c3f8f6aef45..d48a878b8dd 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_de.c,v 1.114 2014/04/22 14:41:03 mpi Exp $	*/
+/*	$OpenBSD: if_de.c,v 1.115 2014/07/22 13:12:11 mpi Exp $	*/
 /*	$NetBSD: if_de.c,v 1.58 1998/01/12 09:39:58 thorpej Exp $	*/
 
 /*-
@@ -62,12 +62,7 @@
 #include <net/bpf.h>
 #endif
 
-#ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#endif
-
 #include <netinet/if_ether.h>
 
 #include <machine/bus.h>
diff --git a/sys/dev/pci/if_em.h b/sys/dev/pci/if_em.h
index f391e62375b..f85af705c35 100644
--- a/sys/dev/pci/if_em.h
+++ b/sys/dev/pci/if_em.h
@@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
 ***************************************************************************/
 
 /* $FreeBSD: if_em.h,v 1.26 2004/09/01 23:22:41 pdeuskar Exp $ */
-/* $OpenBSD: if_em.h,v 1.52 2014/07/10 14:21:20 deraadt Exp $ */
+/* $OpenBSD: if_em.h,v 1.53 2014/07/22 13:12:11 mpi Exp $ */
 
 #ifndef _EM_H_DEFINED_
 #define _EM_H_DEFINED_
@@ -56,7 +56,6 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/if_ether.h>
 #include <netinet/tcp.h>
diff --git a/sys/dev/pci/if_em_hw.c b/sys/dev/pci/if_em_hw.c
index 3a1f0cdaed8..02543e928f5 100644
--- a/sys/dev/pci/if_em_hw.c
+++ b/sys/dev/pci/if_em_hw.c
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/* $OpenBSD: if_em_hw.c,v 1.79 2014/03/10 04:09:53 jsg Exp $ */
+/* $OpenBSD: if_em_hw.c,v 1.80 2014/07/22 13:12:11 mpi Exp $ */
 /*
  * if_em_hw.c Shared functions for accessing and configuring the MAC
  */
@@ -51,8 +51,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/dev/pci/if_ep_pci.c b/sys/dev/pci/if_ep_pci.c
index 9690de7d7b8..1fb020b9055 100644
--- a/sys/dev/pci/if_ep_pci.c
+++ b/sys/dev/pci/if_ep_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ep_pci.c,v 1.29 2013/08/07 01:06:34 bluhm Exp $	*/
+/*	$OpenBSD: if_ep_pci.c,v 1.30 2014/07/22 13:12:11 mpi Exp $	*/
 /*	$NetBSD: if_ep_pci.c,v 1.13 1996/10/21 22:56:38 thorpej Exp $	*/
 
 /*
@@ -51,8 +51,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/dev/pci/if_epic_pci.c b/sys/dev/pci/if_epic_pci.c
index e037984dff0..4e8ad359983 100644
--- a/sys/dev/pci/if_epic_pci.c
+++ b/sys/dev/pci/if_epic_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_epic_pci.c,v 1.12 2013/08/07 01:06:35 bluhm Exp $	*/
+/*	$OpenBSD: if_epic_pci.c,v 1.13 2014/07/22 13:12:11 mpi Exp $	*/
 /*	$NetBSD: if_epic_pci.c,v 1.28 2005/02/27 00:27:32 perry Exp $	*/
 
 /*-
@@ -52,8 +52,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/dev/pci/if_et.c b/sys/dev/pci/if_et.c
index ea9fed1c0f9..bc6f8092ea4 100644
--- a/sys/dev/pci/if_et.c
+++ b/sys/dev/pci/if_et.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_et.c,v 1.22 2013/08/07 01:06:35 bluhm Exp $	*/
+/*	$OpenBSD: if_et.c,v 1.23 2014/07/22 13:12:11 mpi Exp $	*/
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
  * 
@@ -58,8 +58,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/dev/pci/if_fxp_pci.c b/sys/dev/pci/if_fxp_pci.c
index e23a1218670..f70dcbf730c 100644
--- a/sys/dev/pci/if_fxp_pci.c
+++ b/sys/dev/pci/if_fxp_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fxp_pci.c,v 1.61 2014/06/21 01:14:32 deraadt Exp $	*/
+/*	$OpenBSD: if_fxp_pci.c,v 1.62 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*
  * Copyright (c) 1995, David Greenman
@@ -54,8 +54,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 #endif
 
 #include <sys/ioctl.h>
diff --git a/sys/dev/pci/if_hme_pci.c b/sys/dev/pci/if_hme_pci.c
index e1d9b26139b..ed3b0793ac3 100644
--- a/sys/dev/pci/if_hme_pci.c
+++ b/sys/dev/pci/if_hme_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_hme_pci.c,v 1.17 2013/08/07 01:06:35 bluhm Exp $	*/
+/*	$OpenBSD: if_hme_pci.c,v 1.18 2014/07/22 13:12:11 mpi Exp $	*/
 /*	$NetBSD: if_hme_pci.c,v 1.3 2000/12/28 22:59:13 sommerfeld Exp $	*/
 
 /*
@@ -46,8 +46,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/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c
index 35d22a08832..752829375b4 100644
--- a/sys/dev/pci/if_ipw.c
+++ b/sys/dev/pci/if_ipw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ipw.c,v 1.100 2014/07/12 18:48:51 tedu Exp $	*/
+/*	$OpenBSD: if_ipw.c,v 1.101 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2004-2008
@@ -51,9 +51,7 @@
 #include <net/if_types.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
-#include <netinet/ip.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_radiotap.h>
diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c
index 9766ba969e2..c6baddbbeec 100644
--- a/sys/dev/pci/if_iwi.c
+++ b/sys/dev/pci/if_iwi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwi.c,v 1.117 2014/07/12 18:48:51 tedu Exp $	*/
+/*	$OpenBSD: if_iwi.c,v 1.118 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2004-2008
@@ -51,9 +51,7 @@
 #include <net/if_types.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
-#include <netinet/ip.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_radiotap.h>
diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c
index 8e9b1a86087..1868de2f13d 100644
--- a/sys/dev/pci/if_iwn.c
+++ b/sys/dev/pci/if_iwn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwn.c,v 1.132 2014/07/12 18:48:51 tedu Exp $	*/
+/*	$OpenBSD: if_iwn.c,v 1.133 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -52,9 +52,7 @@
 #include <net/if_types.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
-#include <netinet/ip.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_amrr.h>
diff --git a/sys/dev/pci/if_ixgb.h b/sys/dev/pci/if_ixgb.h
index 5d8a6f9993b..f375b2dfd1f 100644
--- a/sys/dev/pci/if_ixgb.h
+++ b/sys/dev/pci/if_ixgb.h
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/* $OpenBSD: if_ixgb.h,v 1.15 2014/07/10 14:21:20 deraadt Exp $ */
+/* $OpenBSD: if_ixgb.h,v 1.16 2014/07/22 13:12:11 mpi Exp $ */
 
 #ifndef _IXGB_H_DEFINED_
 #define _IXGB_H_DEFINED_
@@ -55,7 +55,6 @@ POSSIBILITY OF SUCH DAMAGE.
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/if_ether.h>
 #include <netinet/tcp.h>
diff --git a/sys/dev/pci/if_jme.c b/sys/dev/pci/if_jme.c
index fe3d67d0d11..90b70d05687 100644
--- a/sys/dev/pci/if_jme.c
+++ b/sys/dev/pci/if_jme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_jme.c,v 1.35 2014/01/27 12:04:46 brad Exp $	*/
+/*	$OpenBSD: if_jme.c,v 1.36 2014/07/22 13:12:11 mpi Exp $	*/
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -52,8 +52,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/dev/pci/if_lge.c b/sys/dev/pci/if_lge.c
index 62c93269c68..ea655e0eacc 100644
--- a/sys/dev/pci/if_lge.c
+++ b/sys/dev/pci/if_lge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_lge.c,v 1.61 2013/11/26 09:50:33 mpi Exp $	*/
+/*	$OpenBSD: if_lge.c,v 1.62 2014/07/22 13:12:11 mpi Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -91,8 +91,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/dev/pci/if_msk.c b/sys/dev/pci/if_msk.c
index c4e460af451..78e8b9b998d 100644
--- a/sys/dev/pci/if_msk.c
+++ b/sys/dev/pci/if_msk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_msk.c,v 1.105 2014/07/12 18:48:51 tedu Exp $	*/
+/*	$OpenBSD: if_msk.c,v 1.106 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -105,10 +105,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/udp.h>
-#include <netinet/tcp.h>
 #include <netinet/if_ether.h>
 #endif
 
diff --git a/sys/dev/pci/if_nfe.c b/sys/dev/pci/if_nfe.c
index 40a33a0af11..f7bc1c90309 100644
--- a/sys/dev/pci/if_nfe.c
+++ b/sys/dev/pci/if_nfe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_nfe.c,v 1.104 2013/12/28 03:34:54 deraadt Exp $	*/
+/*	$OpenBSD: if_nfe.c,v 1.105 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -42,8 +42,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/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c
index d61109555e4..e5cb1730f90 100644
--- a/sys/dev/pci/if_nge.c
+++ b/sys/dev/pci/if_nge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_nge.c,v 1.78 2013/11/26 09:50:33 mpi Exp $	*/
+/*	$OpenBSD: if_nge.c,v 1.79 2014/07/22 13:12:11 mpi Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -106,8 +106,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/dev/pci/if_oce.c b/sys/dev/pci/if_oce.c
index a34e5a35cb7..7f2b1911c0e 100644
--- a/sys/dev/pci/if_oce.c
+++ b/sys/dev/pci/if_oce.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_oce.c,v 1.76 2014/07/12 18:48:52 tedu Exp $	*/
+/*	$OpenBSD: if_oce.c,v 1.77 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*
  * Copyright (c) 2012 Mike Belopuhov
@@ -75,8 +75,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/dev/pci/if_pcn.c b/sys/dev/pci/if_pcn.c
index 0ba818bea9d..07e92a7d703 100644
--- a/sys/dev/pci/if_pcn.c
+++ b/sys/dev/pci/if_pcn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pcn.c,v 1.29 2013/12/07 20:12:15 brad Exp $	*/
+/*	$OpenBSD: if_pcn.c,v 1.30 2014/07/22 13:12:11 mpi Exp $	*/
 /*	$NetBSD: if_pcn.c,v 1.26 2005/05/07 09:15:44 is Exp $	*/
 
 /*
@@ -84,8 +84,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/dev/pci/if_re_pci.c b/sys/dev/pci/if_re_pci.c
index 5661a5eab06..afb4c0a400f 100644
--- a/sys/dev/pci/if_re_pci.c
+++ b/sys/dev/pci/if_re_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_re_pci.c,v 1.40 2013/11/18 22:21:27 brad Exp $	*/
+/*	$OpenBSD: if_re_pci.c,v 1.41 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*
  * Copyright (c) 2005 Peter Valchev <pvalchev@openbsd.org>
@@ -37,8 +37,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/dev/pci/if_rl_pci.c b/sys/dev/pci/if_rl_pci.c
index fbc719836dc..f38432d1c79 100644
--- a/sys/dev/pci/if_rl_pci.c
+++ b/sys/dev/pci/if_rl_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rl_pci.c,v 1.27 2013/08/07 01:06:36 bluhm Exp $ */
+/*	$OpenBSD: if_rl_pci.c,v 1.28 2014/07/22 13:12:11 mpi Exp $ */
 
 /*
  * Copyright (c) 1997, 1998
@@ -50,8 +50,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/dev/pci/if_san_common.c b/sys/dev/pci/if_san_common.c
index a4c4e2e4409..b259667a64b 100644
--- a/sys/dev/pci/if_san_common.c
+++ b/sys/dev/pci/if_san_common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_san_common.c,v 1.17 2014/07/12 18:48:52 tedu Exp $	*/
+/*	$OpenBSD: if_san_common.c,v 1.18 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2001-2004 Sangoma Technologies (SAN)
@@ -59,7 +59,6 @@
 # include <net/ppp_defs.h>
 # include <net/if_ppp.h>
 # include <net/if_sppp.h>
-# include <netinet/in_systm.h>
 # include <netinet/in.h>
 # include <netinet/udp.h>
 # include <netinet/ip.h>
diff --git a/sys/dev/pci/if_san_obsd.c b/sys/dev/pci/if_san_obsd.c
index 3dc5ca2007f..70810a7559f 100644
--- a/sys/dev/pci/if_san_obsd.c
+++ b/sys/dev/pci/if_san_obsd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_san_obsd.c,v 1.14 2013/11/18 23:36:09 deraadt Exp $	*/
+/*	$OpenBSD: if_san_obsd.c,v 1.15 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2001-2004 Sangoma Technologies (SAN)
@@ -58,7 +58,6 @@
 #include <net/if_media.h>
 #include <net/netisr.h>
 #include <net/if_sppp.h>
-#include <netinet/in_systm.h>
 #include <netinet/in.h>
 
 #include <netinet/udp.h>
diff --git a/sys/dev/pci/if_san_te1.c b/sys/dev/pci/if_san_te1.c
index 014dd438eab..acd8c4a2ac2 100644
--- a/sys/dev/pci/if_san_te1.c
+++ b/sys/dev/pci/if_san_te1.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_san_te1.c,v 1.12 2013/08/07 01:06:37 bluhm Exp $	*/
+/*	$OpenBSD: if_san_te1.c,v 1.13 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2001-2004 Sangoma Technologies (SAN)
@@ -49,7 +49,6 @@
 #include <net/if.h>
 #include <net/if_media.h>
 #include <net/if_sppp.h>
-#include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/udp.h>
 #include <netinet/ip.h>
diff --git a/sys/dev/pci/if_san_xilinx.c b/sys/dev/pci/if_san_xilinx.c
index 7cba72e04ea..06ab0b98098 100644
--- a/sys/dev/pci/if_san_xilinx.c
+++ b/sys/dev/pci/if_san_xilinx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_san_xilinx.c,v 1.29 2014/07/12 18:48:52 tedu Exp $	*/
+/*	$OpenBSD: if_san_xilinx.c,v 1.30 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2001-2004 Sangoma Technologies (SAN)
@@ -52,7 +52,6 @@
 #include <net/if_media.h>
 #include <net/netisr.h>
 #include <net/if_sppp.h>
-#include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/udp.h>
 #include <netinet/ip.h>
diff --git a/sys/dev/pci/if_sf_pci.c b/sys/dev/pci/if_sf_pci.c
index 653b73fd6cb..af03cbf47ab 100644
--- a/sys/dev/pci/if_sf_pci.c
+++ b/sys/dev/pci/if_sf_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sf_pci.c,v 1.10 2013/08/07 01:06:37 bluhm Exp $	*/
+/*	$OpenBSD: if_sf_pci.c,v 1.11 2014/07/22 13:12:11 mpi Exp $	*/
 /*	$NetBSD: if_sf_pci.c,v 1.10 2006/06/17 23:34:27 christos Exp $	*/
 
 /*-
@@ -51,8 +51,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/dev/pci/if_sis.c b/sys/dev/pci/if_sis.c
index a51ca8e26b1..3285e9d938d 100644
--- a/sys/dev/pci/if_sis.c
+++ b/sys/dev/pci/if_sis.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sis.c,v 1.116 2014/07/08 05:35:18 dlg Exp $ */
+/*	$OpenBSD: if_sis.c,v 1.117 2014/07/22 13:12:11 mpi Exp $ */
 /*
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
@@ -77,8 +77,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/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index d4a50c63b67..2b499683e0d 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_sk.c,v 1.169 2014/07/12 18:48:52 tedu Exp $	*/
+/*	$OpenBSD: if_sk.c,v 1.170 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -105,10 +105,6 @@
 
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/udp.h>
-#include <netinet/tcp.h>
 #include <netinet/if_ether.h>
 #endif
 
diff --git a/sys/dev/pci/if_ste.c b/sys/dev/pci/if_ste.c
index 36415fa68dc..9b741d370b0 100644
--- a/sys/dev/pci/if_ste.c
+++ b/sys/dev/pci/if_ste.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ste.c,v 1.54 2013/08/07 01:06:38 bluhm Exp $ */
+/*	$OpenBSD: if_ste.c,v 1.55 2014/07/22 13:12:11 mpi Exp $ */
 /*
  * Copyright (c) 1997, 1998, 1999
  *	Bill Paul <wpaul@ctr.columbia.edu>.  All rights reserved.
@@ -52,8 +52,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/dev/pci/if_stge.c b/sys/dev/pci/if_stge.c
index 51c8df9c305..e19131cebc7 100644
--- a/sys/dev/pci/if_stge.c
+++ b/sys/dev/pci/if_stge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_stge.c,v 1.55 2013/08/07 01:06:38 bluhm Exp $	*/
+/*	$OpenBSD: if_stge.c,v 1.56 2014/07/22 13:12:11 mpi Exp $	*/
 /*	$NetBSD: if_stge.c,v 1.27 2005/05/16 21:35:32 bouyer Exp $	*/
 
 /*-
@@ -55,8 +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/dev/pci/if_ti_pci.c b/sys/dev/pci/if_ti_pci.c
index 6c7aa8ffa0c..9ff5ea4647f 100644
--- a/sys/dev/pci/if_ti_pci.c
+++ b/sys/dev/pci/if_ti_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ti_pci.c,v 1.2 2013/08/07 01:06:38 bluhm Exp $	*/
+/*	$OpenBSD: if_ti_pci.c,v 1.3 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -82,8 +82,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/dev/pci/if_tl.c b/sys/dev/pci/if_tl.c
index 5e474793dab..2c85d4718ad 100644
--- a/sys/dev/pci/if_tl.c
+++ b/sys/dev/pci/if_tl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tl.c,v 1.59 2014/01/31 08:58:32 brad Exp $	*/
+/*	$OpenBSD: if_tl.c,v 1.60 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -196,8 +196,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/dev/pci/if_txp.c b/sys/dev/pci/if_txp.c
index 3fc6240caf5..37fcde407e1 100644
--- a/sys/dev/pci/if_txp.c
+++ b/sys/dev/pci/if_txp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_txp.c,v 1.110 2014/07/13 23:10:23 deraadt Exp $	*/
+/*	$OpenBSD: if_txp.c,v 1.111 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*
  * Copyright (c) 2001
@@ -50,8 +50,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/dev/pci/if_vge.c b/sys/dev/pci/if_vge.c
index 658fa5114f1..77b2eb749f1 100644
--- a/sys/dev/pci/if_vge.c
+++ b/sys/dev/pci/if_vge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vge.c,v 1.57 2013/08/21 05:21:44 dlg Exp $	*/
+/*	$OpenBSD: if_vge.c,v 1.58 2014/07/22 13:12:11 mpi Exp $	*/
 /*	$FreeBSD: if_vge.c,v 1.3 2004/09/11 22:13:25 wpaul Exp $	*/
 /*
  * Copyright (c) 2004
@@ -101,8 +101,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/dev/pci/if_vmx.c b/sys/dev/pci/if_vmx.c
index c156a5f5827..631e3cfa31d 100644
--- a/sys/dev/pci/if_vmx.c
+++ b/sys/dev/pci/if_vmx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vmx.c,v 1.18 2014/07/08 08:54:00 stsp Exp $	*/
+/*	$OpenBSD: if_vmx.c,v 1.19 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*
  * Copyright (c) 2013 Tsubai Masanari
@@ -34,7 +34,6 @@
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 #include <netinet/udp.h>
diff --git a/sys/dev/pci/if_vr.c b/sys/dev/pci/if_vr.c
index 9a6f9441abc..96c9836ea48 100644
--- a/sys/dev/pci/if_vr.c
+++ b/sys/dev/pci/if_vr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vr.c,v 1.134 2014/07/08 05:35:19 dlg Exp $	*/
+/*	$OpenBSD: if_vr.c,v 1.135 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -76,8 +76,6 @@
 #include <sys/device.h>
 #ifdef INET
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
 #include <netinet/if_ether.h>
 #endif	/* INET */
 #include <net/if_dl.h>
diff --git a/sys/dev/pci/if_vte.c b/sys/dev/pci/if_vte.c
index 12cd391a52a..3fc50284a46 100644
--- a/sys/dev/pci/if_vte.c
+++ b/sys/dev/pci/if_vte.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vte.c,v 1.8 2013/11/21 16:16:08 mpi Exp $	*/
+/*	$OpenBSD: if_vte.c,v 1.9 2014/07/22 13:12:11 mpi Exp $	*/
 /*-
  * Copyright (c) 2010, Pyun YongHyeon <yongari@FreeBSD.org>
  * All rights reserved.
@@ -51,8 +51,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/dev/pci/if_wb.c b/sys/dev/pci/if_wb.c
index 70afc260646..40c23fb7469 100644
--- a/sys/dev/pci/if_wb.c
+++ b/sys/dev/pci/if_wb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wb.c,v 1.55 2013/11/26 09:50:33 mpi Exp $	*/
+/*	$OpenBSD: if_wb.c,v 1.56 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998
@@ -104,8 +104,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/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c
index f2195884529..9910ecdd999 100644
--- a/sys/dev/pci/if_wpi.c
+++ b/sys/dev/pci/if_wpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wpi.c,v 1.119 2014/07/12 18:48:52 tedu Exp $	*/
+/*	$OpenBSD: if_wpi.c,v 1.120 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2006-2008
@@ -52,9 +52,7 @@
 #include <net/if_types.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/if_ether.h>
-#include <netinet/ip.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_amrr.h>
diff --git a/sys/dev/pci/if_xge.c b/sys/dev/pci/if_xge.c
index bd286e36740..edd937f5b1b 100644
--- a/sys/dev/pci/if_xge.c
+++ b/sys/dev/pci/if_xge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_xge.c,v 1.56 2013/11/26 09:50:33 mpi Exp $	*/
+/*	$OpenBSD: if_xge.c,v 1.57 2014/07/22 13:12:11 mpi Exp $	*/
 /*	$NetBSD: if_xge.c,v 1.1 2005/09/09 10:30:27 ragge Exp $	*/
 
 /*
@@ -57,11 +57,7 @@
 
 #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 NVLAN > 0
diff --git a/sys/dev/pci/if_xl_pci.c b/sys/dev/pci/if_xl_pci.c
index bd6608579b4..c59af2588bc 100644
--- a/sys/dev/pci/if_xl_pci.c
+++ b/sys/dev/pci/if_xl_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_xl_pci.c,v 1.41 2013/08/07 01:06:39 bluhm Exp $	*/
+/*	$OpenBSD: if_xl_pci.c,v 1.42 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -54,8 +54,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/dev/pci/ixgb_ee.c b/sys/dev/pci/ixgb_ee.c
index 00060e7d8d3..f9659b41480 100644
--- a/sys/dev/pci/ixgb_ee.c
+++ b/sys/dev/pci/ixgb_ee.c
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/* $OpenBSD: ixgb_ee.c,v 1.3 2013/08/07 01:06:39 bluhm Exp $ */
+/* $OpenBSD: ixgb_ee.c,v 1.4 2014/07/22 13:12:11 mpi Exp $ */
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -48,8 +48,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/dev/pci/ixgb_hw.c b/sys/dev/pci/ixgb_hw.c
index 7eb655e44e9..7961645c5e8 100644
--- a/sys/dev/pci/ixgb_hw.c
+++ b/sys/dev/pci/ixgb_hw.c
@@ -31,7 +31,7 @@
 
 *******************************************************************************/
 
-/* $OpenBSD: ixgb_hw.c,v 1.4 2013/08/07 01:06:39 bluhm Exp $ */
+/* $OpenBSD: ixgb_hw.c,v 1.5 2014/07/22 13:12:11 mpi Exp $ */
 
 /* ixgb_hw.c
  * Shared functions for accessing and configuring the adapter
@@ -52,8 +52,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/dev/pci/ixgbe.h b/sys/dev/pci/ixgbe.h
index 8520452690a..07ca29729b8 100644
--- a/sys/dev/pci/ixgbe.h
+++ b/sys/dev/pci/ixgbe.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ixgbe.h,v 1.15 2014/07/10 14:21:20 deraadt Exp $	*/
+/*	$OpenBSD: ixgbe.h,v 1.16 2014/07/22 13:12:11 mpi Exp $	*/
 
 /******************************************************************************
 
@@ -59,13 +59,9 @@
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
-#include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 #include <netinet/ip.h>
-#include <netinet/ip6.h>
-#include <netinet/tcp.h>
-#include <netinet/udp.h>
 
 #if NBPFILTER > 0
 #include <net/bpf.h>