No need to include <net/if_arp.h>

This header is only needed because <netinet/if_ether.h> declares a
structure that needs it.  But it turns out that <net/if.h> already
includes it as workaround.

A proper solution would be to stop declarting "struct ether_arp"
there.  But no driver should need this header.

31 files changed, 31 insertions, 62 deletions

diff --git a/sys/dev/ic/acx100.c b/sys/dev/ic/acx100.c
index 7dd25fe1524..640b5872f9a 100644
--- a/sys/dev/ic/acx100.c
+++ b/sys/dev/ic/acx100.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acx100.c,v 1.25 2014/12/22 02:28:51 tedu Exp $ */
+/*	$OpenBSD: acx100.c,v 1.26 2015/11/24 13:45:06 mpi Exp $ */
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -62,7 +62,6 @@
 #include <machine/bus.h>
 
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_media.h>
 
 #include <netinet/in.h>
diff --git a/sys/dev/ic/acx111.c b/sys/dev/ic/acx111.c
index efd7a4c1b7e..29f8da85542 100644
--- a/sys/dev/ic/acx111.c
+++ b/sys/dev/ic/acx111.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acx111.c,v 1.22 2014/12/22 02:28:51 tedu Exp $ */
+/*	$OpenBSD: acx111.c,v 1.23 2015/11/24 13:45:06 mpi Exp $ */
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -61,7 +61,6 @@
 #include <machine/bus.h>
 
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_media.h>
 
 #include <netinet/in.h>
diff --git a/sys/dev/ic/ar5008.c b/sys/dev/ic/ar5008.c
index fd2968ef4d2..8fdc2031b41 100644
--- a/sys/dev/ic/ar5008.c
+++ b/sys/dev/ic/ar5008.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar5008.c,v 1.31 2015/11/24 13:33:17 mpi Exp $	*/
+/*	$OpenBSD: ar5008.c,v 1.32 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -44,7 +44,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/ic/ar5416.c b/sys/dev/ic/ar5416.c
index ebfd793f5f8..1850a8c8fcd 100644
--- a/sys/dev/ic/ar5416.c
+++ b/sys/dev/ic/ar5416.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar5416.c,v 1.16 2015/11/24 13:33:17 mpi Exp $	*/
+/*	$OpenBSD: ar5416.c,v 1.17 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -44,7 +44,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/ic/ar5xxx.h b/sys/dev/ic/ar5xxx.h
index fc9ae6e8a94..e479620d1ff 100644
--- a/sys/dev/ic/ar5xxx.h
+++ b/sys/dev/ic/ar5xxx.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar5xxx.h,v 1.53 2014/12/26 05:46:32 tedu Exp $	*/
+/*	$OpenBSD: ar5xxx.h,v 1.54 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*
  * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
@@ -47,7 +47,6 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
-#include <net/if_arp.h>
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
diff --git a/sys/dev/ic/ar9003.c b/sys/dev/ic/ar9003.c
index ab0de2edceb..e5ff4d6e3e6 100644
--- a/sys/dev/ic/ar9003.c
+++ b/sys/dev/ic/ar9003.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9003.c,v 1.35 2015/11/24 13:33:17 mpi Exp $	*/
+/*	$OpenBSD: ar9003.c,v 1.36 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -44,7 +44,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/ic/ar9280.c b/sys/dev/ic/ar9280.c
index 80c9618028a..282fd3c8b30 100644
--- a/sys/dev/ic/ar9280.c
+++ b/sys/dev/ic/ar9280.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9280.c,v 1.22 2015/11/24 13:33:17 mpi Exp $	*/
+/*	$OpenBSD: ar9280.c,v 1.23 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -44,7 +44,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/ic/ar9285.c b/sys/dev/ic/ar9285.c
index 1e56a49549e..fbea63af535 100644
--- a/sys/dev/ic/ar9285.c
+++ b/sys/dev/ic/ar9285.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9285.c,v 1.23 2015/11/24 13:33:17 mpi Exp $	*/
+/*	$OpenBSD: ar9285.c,v 1.24 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -45,7 +45,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/ic/ar9287.c b/sys/dev/ic/ar9287.c
index 95cc5c2745d..baeb83c66b0 100644
--- a/sys/dev/ic/ar9287.c
+++ b/sys/dev/ic/ar9287.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9287.c,v 1.21 2015/11/24 13:33:17 mpi Exp $	*/
+/*	$OpenBSD: ar9287.c,v 1.22 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -44,7 +44,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/ic/ar9380.c b/sys/dev/ic/ar9380.c
index c3954edadc5..3bf2eb936e8 100644
--- a/sys/dev/ic/ar9380.c
+++ b/sys/dev/ic/ar9380.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9380.c,v 1.21 2015/11/24 13:33:17 mpi Exp $	*/
+/*	$OpenBSD: ar9380.c,v 1.22 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2011 Damien Bergamini <damien.bergamini@free.fr>
@@ -42,7 +42,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/ic/if_wi_hostap.c b/sys/dev/ic/if_wi_hostap.c
index 86595020359..d6552ea9241 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.49 2015/11/24 13:33:17 mpi Exp $	*/
+/*	$OpenBSD: if_wi_hostap.c,v 1.50 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*
  * Copyright (c) 2002
@@ -56,7 +56,6 @@
 #include <machine/bus.h>
 
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/ic/pgt.c b/sys/dev/ic/pgt.c
index 900a1f9e513..e6f08ec555a 100644
--- a/sys/dev/ic/pgt.c
+++ b/sys/dev/ic/pgt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pgt.c,v 1.81 2015/11/24 13:33:17 mpi Exp $  */
+/*	$OpenBSD: pgt.c,v 1.82 2015/11/24 13:45:06 mpi Exp $  */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -63,7 +63,6 @@
 #include <machine/intr.h>
 
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_llc.h>
 #include <net/if_media.h>
diff --git a/sys/dev/pci/if_ath_pci.c b/sys/dev/pci/if_ath_pci.c
index 4756c8ae188..b02ae7ddd92 100644
--- a/sys/dev/pci/if_ath_pci.c
+++ b/sys/dev/pci/if_ath_pci.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: if_ath_pci.c,v 1.24 2014/12/22 02:28:51 tedu Exp $   */
+/*      $OpenBSD: if_ath_pci.c,v 1.25 2015/11/24 13:45:06 mpi Exp $   */
 /*	$NetBSD: if_ath_pci.c,v 1.7 2004/06/30 05:58:17 mycroft Exp $	*/
 
 /*-
@@ -54,7 +54,6 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
-#include <net/if_arp.h>
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 
diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c
index 69242bf70c0..b228876010a 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.112 2015/11/24 13:33:17 mpi Exp $	*/
+/*	$OpenBSD: if_ipw.c,v 1.113 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2004-2008
@@ -45,7 +45,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c
index 1c215aa8c4d..c511f0dc675 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.129 2015/11/24 13:33:17 mpi Exp $	*/
+/*	$OpenBSD: if_iwi.c,v 1.130 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2004-2008
@@ -45,7 +45,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c
index 9fc4778157d..e0cabd02694 100644
--- a/sys/dev/pci/if_iwm.c
+++ b/sys/dev/pci/if_iwm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwm.c,v 1.64 2015/11/24 13:33:17 mpi Exp $	*/
+/*	$OpenBSD: if_iwm.c,v 1.65 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*
  * Copyright (c) 2014 genua mbh <info@genua.de>
@@ -129,7 +129,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/pci/if_rtwn.c b/sys/dev/pci/if_rtwn.c
index 65107f56afe..a2e87189f0e 100644
--- a/sys/dev/pci/if_rtwn.c
+++ b/sys/dev/pci/if_rtwn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rtwn.c,v 1.9 2015/11/24 13:33:17 mpi Exp $	*/
+/*	$OpenBSD: if_rtwn.c,v 1.10 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -42,7 +42,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/pci/if_vmx.c b/sys/dev/pci/if_vmx.c
index 371afd8d567..fff926398de 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.37 2015/11/24 13:33:17 mpi Exp $	*/
+/*	$OpenBSD: if_vmx.c,v 1.38 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*
  * Copyright (c) 2013 Tsubai Masanari
@@ -29,7 +29,6 @@
 
 #include <net/bpf.h>
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_media.h>
 
 #include <netinet/in.h>
diff --git a/sys/dev/pci/ixgbe.h b/sys/dev/pci/ixgbe.h
index e2d2278759a..6d225fb7fcd 100644
--- a/sys/dev/pci/ixgbe.h
+++ b/sys/dev/pci/ixgbe.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ixgbe.h,v 1.18 2015/11/24 12:32:53 mpi Exp $	*/
+/*	$OpenBSD: ixgbe.h,v 1.19 2015/11/24 13:45:06 mpi Exp $	*/
 
 /******************************************************************************
 
@@ -54,7 +54,6 @@
 #include <sys/rwlock.h>
 
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/bpf.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/usb/if_athn_usb.c b/sys/dev/usb/if_athn_usb.c
index 5ab5abf21fe..b3f256f12e1 100644
--- a/sys/dev/usb/if_athn_usb.c
+++ b/sys/dev/usb/if_athn_usb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_athn_usb.c,v 1.39 2015/11/24 13:33:18 mpi Exp $	*/
+/*	$OpenBSD: if_athn_usb.c,v 1.40 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2011 Damien Bergamini <damien.bergamini@free.fr>
@@ -40,7 +40,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/usb/if_otus.c b/sys/dev/usb/if_otus.c
index e87dd58a533..52df4d0ac56 100644
--- a/sys/dev/usb/if_otus.c
+++ b/sys/dev/usb/if_otus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_otus.c,v 1.49 2015/11/24 13:33:18 mpi Exp $	*/
+/*	$OpenBSD: if_otus.c,v 1.50 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -39,7 +39,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/usb/if_ral.c b/sys/dev/usb/if_ral.c
index 1982b631c09..75e9e4a8186 100644
--- a/sys/dev/usb/if_ral.c
+++ b/sys/dev/usb/if_ral.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ral.c,v 1.136 2015/11/24 13:33:18 mpi Exp $	*/
+/*	$OpenBSD: if_ral.c,v 1.137 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006
@@ -41,7 +41,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/usb/if_rsu.c b/sys/dev/usb/if_rsu.c
index eeb46f69254..8d8755899b1 100644
--- a/sys/dev/usb/if_rsu.c
+++ b/sys/dev/usb/if_rsu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rsu.c,v 1.30 2015/11/24 13:33:18 mpi Exp $	*/
+/*	$OpenBSD: if_rsu.c,v 1.31 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -39,7 +39,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c
index f9c5d84481e..774773f1630 100644
--- a/sys/dev/usb/if_rum.c
+++ b/sys/dev/usb/if_rum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rum.c,v 1.115 2015/11/24 13:33:18 mpi Exp $	*/
+/*	$OpenBSD: if_rum.c,v 1.116 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -41,7 +41,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/usb/if_run.c b/sys/dev/usb/if_run.c
index b405ec62c2d..5db42fade86 100644
--- a/sys/dev/usb/if_run.c
+++ b/sys/dev/usb/if_run.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_run.c,v 1.113 2015/11/24 13:33:18 mpi Exp $	*/
+/*	$OpenBSD: if_run.c,v 1.114 2015/11/24 13:45:06 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2008-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -41,7 +41,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c
index edb8570769c..00ed3939ab7 100644
--- a/sys/dev/usb/if_uath.c
+++ b/sys/dev/usb/if_uath.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_uath.c,v 1.73 2015/11/24 13:33:18 mpi Exp $	*/
+/*	$OpenBSD: if_uath.c,v 1.74 2015/11/24 13:45:07 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2006
@@ -46,7 +46,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index ec0531eba92..2adf3843725 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_udav.c,v 1.74 2015/11/20 03:35:23 dlg Exp $ */
+/*	$OpenBSD: if_udav.c,v 1.75 2015/11/24 13:45:07 mpi Exp $ */
 /*	$NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $	*/
 /*	$nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $	*/
 /*
@@ -57,7 +57,6 @@
 #include <sys/device.h>
 
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/usb/if_upgt.c b/sys/dev/usb/if_upgt.c
index 265a86bc878..ea03a3ede63 100644
--- a/sys/dev/usb/if_upgt.c
+++ b/sys/dev/usb/if_upgt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_upgt.c,v 1.73 2015/11/24 13:33:18 mpi Exp $ */
+/*	$OpenBSD: if_upgt.c,v 1.74 2015/11/24 13:45:07 mpi Exp $ */
 
 /*
  * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org>
@@ -35,7 +35,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/usb/if_urtw.c b/sys/dev/usb/if_urtw.c
index b2c09a31e92..4d45b04d642 100644
--- a/sys/dev/usb/if_urtw.c
+++ b/sys/dev/usb/if_urtw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_urtw.c,v 1.58 2015/11/24 13:33:18 mpi Exp $	*/
+/*	$OpenBSD: if_urtw.c,v 1.59 2015/11/24 13:45:07 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009 Martynas Venckus <martynas@openbsd.org>
@@ -35,7 +35,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/usb/if_urtwn.c b/sys/dev/usb/if_urtwn.c
index 7034dbfccba..3442db4f489 100644
--- a/sys/dev/usb/if_urtwn.c
+++ b/sys/dev/usb/if_urtwn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_urtwn.c,v 1.55 2015/11/24 13:33:18 mpi Exp $	*/
+/*	$OpenBSD: if_urtwn.c,v 1.56 2015/11/24 13:45:07 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -40,7 +40,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c
index 62c770044ed..9f44b40742d 100644
--- a/sys/dev/usb/if_zyd.c
+++ b/sys/dev/usb/if_zyd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_zyd.c,v 1.111 2015/11/24 13:33:18 mpi Exp $	*/
+/*	$OpenBSD: if_zyd.c,v 1.112 2015/11/24 13:45:07 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
@@ -39,7 +39,6 @@
 #include <net/bpf.h>
 #endif
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>