Delete superfluous #includes of <ifaddrs.h>, <net/if_dl.h>, and <net/if_enc.h>

ok krw@, jsg@

21 files changed, 25 insertions, 46 deletions

diff --git a/sbin/dhclient/dispatch.c b/sbin/dhclient/dispatch.c
index 0dbb2bf5da4..0b43f190519 100644
--- a/sbin/dhclient/dispatch.c
+++ b/sbin/dhclient/dispatch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dispatch.c,v 1.164 2019/02/16 18:42:07 krw Exp $	*/
+/*	$OpenBSD: dispatch.c,v 1.165 2019/05/10 01:29:31 guenther Exp $	*/
 
 /*
  * Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -55,7 +55,6 @@
 #include <arpa/inet.h>
 
 #include <errno.h>
-#include <ifaddrs.h>
 #include <imsg.h>
 #include <limits.h>
 #include <poll.h>
diff --git a/sbin/ifconfig/brconfig.c b/sbin/ifconfig/brconfig.c
index c84d4d0d1cc..53bbcd3e241 100644
--- a/sbin/ifconfig/brconfig.c
+++ b/sbin/ifconfig/brconfig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: brconfig.c,v 1.20 2018/07/13 08:41:32 krw Exp $	*/
+/*	$OpenBSD: brconfig.c,v 1.21 2019/05/10 01:29:31 guenther Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -36,7 +36,6 @@
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
 #include <net/if_bridge.h>
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 7570b61f451..6189461ea49 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ifconfig.c,v 1.401 2019/04/19 04:24:25 dlg Exp $	*/
+/*	$OpenBSD: ifconfig.c,v 1.402 2019/05/10 01:29:31 guenther Exp $	*/
 /*	$NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $	*/
 
 /*
@@ -75,7 +75,6 @@
 #include <arpa/inet.h>
 #include <netinet/ip_ipsp.h>
 #include <netinet/if_ether.h>
-#include <net/if_enc.h>
 #include <net80211/ieee80211.h>
 #include <net80211/ieee80211_ioctl.h>
 #include <net/pfvar.h>
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index c13d5ca8d4e..dab2489970a 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.102 2019/04/28 17:59:51 mpi Exp $	*/
+/*	$OpenBSD: route.c,v 1.103 2019/05/10 01:29:31 guenther Exp $	*/
 /*	$NetBSD: route.c,v 1.15 1996/05/07 02:55:06 thorpej Exp $	*/
 
 /*
@@ -36,7 +36,6 @@
 #include <sys/socket.h>
 
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/route.h>
 #include <netinet/ip_ipsp.h>
diff --git a/usr.sbin/hostapd/apme.c b/usr.sbin/hostapd/apme.c
index df4ca930253..d478eac7c5d 100644
--- a/usr.sbin/hostapd/apme.c
+++ b/usr.sbin/hostapd/apme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apme.c,v 1.16 2015/01/16 06:40:17 deraadt Exp $	*/
+/*	$OpenBSD: apme.c,v 1.17 2019/05/10 01:29:31 guenther Exp $	*/
 
 /*
  * Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
@@ -23,7 +23,6 @@
 #include <sys/uio.h>
 
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_arp.h>
 #include <net/if_llc.h>
diff --git a/usr.sbin/hostapd/handle.c b/usr.sbin/hostapd/handle.c
index 77c6d07d875..47a443f3a41 100644
--- a/usr.sbin/hostapd/handle.c
+++ b/usr.sbin/hostapd/handle.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: handle.c,v 1.12 2015/01/16 06:40:17 deraadt Exp $	*/
+/*	$OpenBSD: handle.c,v 1.13 2019/05/10 01:29:31 guenther Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006 Reyk Floeter <reyk@openbsd.org>
@@ -22,7 +22,6 @@
 #include <sys/time.h>
 
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_arp.h>
 #include <net/if_llc.h>
diff --git a/usr.sbin/hostapd/hostapd.c b/usr.sbin/hostapd/hostapd.c
index 9e84a0700b1..2808d3f57e1 100644
--- a/usr.sbin/hostapd/hostapd.c
+++ b/usr.sbin/hostapd/hostapd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hostapd.c,v 1.38 2017/04/19 05:36:13 natano Exp $	*/
+/*	$OpenBSD: hostapd.c,v 1.39 2019/05/10 01:29:31 guenther Exp $	*/
 
 /*
  * Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
@@ -26,7 +26,6 @@
 #include <sys/stat.h>
 
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_arp.h>
 #include <net/if_llc.h>
diff --git a/usr.sbin/hostapd/iapp.c b/usr.sbin/hostapd/iapp.c
index 68222c77c35..2de9fdf3a9f 100644
--- a/usr.sbin/hostapd/iapp.c
+++ b/usr.sbin/hostapd/iapp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iapp.c,v 1.19 2015/01/16 06:40:17 deraadt Exp $	*/
+/*	$OpenBSD: iapp.c,v 1.20 2019/05/10 01:29:31 guenther Exp $	*/
 
 /*
  * Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
@@ -23,7 +23,6 @@
 #include <sys/uio.h>
 
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_arp.h>
 #include <net/if_llc.h>
diff --git a/usr.sbin/hostapd/llc.c b/usr.sbin/hostapd/llc.c
index c12043043d4..483870fa091 100644
--- a/usr.sbin/hostapd/llc.c
+++ b/usr.sbin/hostapd/llc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: llc.c,v 1.6 2015/01/16 06:40:17 deraadt Exp $	*/
+/*	$OpenBSD: llc.c,v 1.7 2019/05/10 01:29:31 guenther Exp $	*/
 
 /*
  * Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
@@ -22,7 +22,6 @@
 #include <sys/time.h>
 
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_arp.h>
 #include <net/if_llc.h>
diff --git a/usr.sbin/hostapd/parse.y b/usr.sbin/hostapd/parse.y
index cc2e91ed893..b749e8bc830 100644
--- a/usr.sbin/hostapd/parse.y
+++ b/usr.sbin/hostapd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.60 2019/02/13 22:57:08 deraadt Exp $	*/
+/*	$OpenBSD: parse.y,v 1.61 2019/05/10 01:29:31 guenther Exp $	*/
 
 /*
  * Copyright (c) 2004, 2005, 2006 Reyk Floeter <reyk@openbsd.org>
@@ -29,7 +29,6 @@
 #include <sys/stat.h>
 
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_arp.h>
 #include <net/if_llc.h>
diff --git a/usr.sbin/hostapd/print-802_11.c b/usr.sbin/hostapd/print-802_11.c
index 29e27eb2f5f..1f37c6f5918 100644
--- a/usr.sbin/hostapd/print-802_11.c
+++ b/usr.sbin/hostapd/print-802_11.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print-802_11.c,v 1.10 2018/04/26 12:42:51 guenther Exp $	*/
+/*	$OpenBSD: print-802_11.c,v 1.11 2019/05/10 01:29:31 guenther Exp $	*/
 
 /*
  * Copyright (c) 2005 Reyk Floeter <reyk@openbsd.org>
@@ -22,7 +22,6 @@
 #include <sys/socket.h>
 
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_arp.h>
 #include <net/if_llc.h>
diff --git a/usr.sbin/hostapd/privsep.c b/usr.sbin/hostapd/privsep.c
index f115f7c7190..5144e267cb5 100644
--- a/usr.sbin/hostapd/privsep.c
+++ b/usr.sbin/hostapd/privsep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: privsep.c,v 1.25 2016/02/02 17:51:11 sthen Exp $	*/
+/*	$OpenBSD: privsep.c,v 1.26 2019/05/10 01:29:31 guenther Exp $	*/
 
 /*
  * Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
@@ -23,7 +23,6 @@
 #include <sys/time.h>
 
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_arp.h>
 #include <net/if_llc.h>
diff --git a/usr.sbin/hostapd/roaming.c b/usr.sbin/hostapd/roaming.c
index 47ddec60096..9d43112445d 100644
--- a/usr.sbin/hostapd/roaming.c
+++ b/usr.sbin/hostapd/roaming.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: roaming.c,v 1.6 2015/01/16 06:40:17 deraadt Exp $	*/
+/*	$OpenBSD: roaming.c,v 1.7 2019/05/10 01:29:31 guenther Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006 Reyk Floeter <reyk@openbsd.org>
@@ -22,7 +22,6 @@
 #include <sys/ioctl.h>
 
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_arp.h>
 #include <net/if_llc.h>
diff --git a/usr.sbin/npppd/l2tp/l2tp_ctrl.c b/usr.sbin/npppd/l2tp/l2tp_ctrl.c
index 7255d735872..710a0431d00 100644
--- a/usr.sbin/npppd/l2tp/l2tp_ctrl.c
+++ b/usr.sbin/npppd/l2tp/l2tp_ctrl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: l2tp_ctrl.c,v 1.22 2018/03/16 12:31:09 mpi Exp $	*/
+/*	$OpenBSD: l2tp_ctrl.c,v 1.23 2019/05/10 01:29:31 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  */
 /**@file Control connection processing functions for L2TP LNS */
-/* $Id: l2tp_ctrl.c,v 1.22 2018/03/16 12:31:09 mpi Exp $ */
+/* $Id: l2tp_ctrl.c,v 1.23 2019/05/10 01:29:31 guenther Exp $ */
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
@@ -36,7 +36,6 @@
 #include <endian.h>
 #include <errno.h>
 #include <event.h>
-#include <ifaddrs.h>
 #include <netdb.h>
 #include <stdarg.h>
 #include <stddef.h>
diff --git a/usr.sbin/npppd/npppd/npppd.c b/usr.sbin/npppd/npppd/npppd.c
index b580af0028a..cb73939016e 100644
--- a/usr.sbin/npppd/npppd/npppd.c
+++ b/usr.sbin/npppd/npppd/npppd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: npppd.c,v 1.49 2018/12/30 23:09:58 guenther Exp $ */
+/*	$OpenBSD: npppd.c,v 1.50 2019/05/10 01:29:31 guenther Exp $ */
 
 /*-
  * Copyright (c) 2005-2008,2009 Internet Initiative Japan Inc.
@@ -29,7 +29,7 @@
  * Next pppd(nppd). This file provides a npppd daemon process and operations
  * for npppd instance.
  * @author	Yasuoka Masahiko
- * $Id: npppd.c,v 1.49 2018/12/30 23:09:58 guenther Exp $
+ * $Id: npppd.c,v 1.50 2019/05/10 01:29:31 guenther Exp $
  */
 #include "version.h"
 #include <sys/param.h>	/* ALIGNED_POINTER */
@@ -53,7 +53,6 @@
 #include <fcntl.h>
 #include <event.h>
 #include <errno.h>
-#include <ifaddrs.h>
 #include <err.h>
 #include <pwd.h>
 
diff --git a/usr.sbin/npppd/npppd/npppd_subr.c b/usr.sbin/npppd/npppd/npppd_subr.c
index 213d3b50689..f9ed4c32212 100644
--- a/usr.sbin/npppd/npppd/npppd_subr.c
+++ b/usr.sbin/npppd/npppd/npppd_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: npppd_subr.c,v 1.19 2019/01/22 09:25:29 krw Exp $ */
+/*	$OpenBSD: npppd_subr.c,v 1.20 2019/05/10 01:29:31 guenther Exp $ */
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -38,7 +38,6 @@
 #include <net/route.h>
 #include <net/if_dl.h>
 #include <net/if.h>
-#include <ifaddrs.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <fcntl.h>
diff --git a/usr.sbin/npppd/pptp/pptpd.c b/usr.sbin/npppd/pptp/pptpd.c
index abbdd568fde..c8767e56f45 100644
--- a/usr.sbin/npppd/pptp/pptpd.c
+++ b/usr.sbin/npppd/pptp/pptpd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pptpd.c,v 1.31 2016/04/16 18:32:29 krw Exp $	*/
+/*	$OpenBSD: pptpd.c,v 1.32 2019/05/10 01:29:31 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -25,12 +25,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $Id: pptpd.c,v 1.31 2016/04/16 18:32:29 krw Exp $ */
+/* $Id: pptpd.c,v 1.32 2019/05/10 01:29:31 guenther Exp $ */
 
 /**@file
  * This file provides a implementation of PPTP daemon.  Currently it
  * provides functions for PAC (PPTP Access Concentrator) only.
- * $Id: pptpd.c,v 1.31 2016/04/16 18:32:29 krw Exp $
+ * $Id: pptpd.c,v 1.32 2019/05/10 01:29:31 guenther Exp $
  */
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -51,7 +51,6 @@
 #include <errno.h>
 #include <string.h>
 #include <event.h>
-#include <ifaddrs.h>
 
 #ifdef USE_LIBSOCKUTIL
 #include <seil/sockfromto.h>
diff --git a/usr.sbin/ospf6d/packet.c b/usr.sbin/ospf6d/packet.c
index bc887e2fcb3..be1f5ef862a 100644
--- a/usr.sbin/ospf6d/packet.c
+++ b/usr.sbin/ospf6d/packet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: packet.c,v 1.14 2015/05/05 01:26:37 jsg Exp $ */
+/*	$OpenBSD: packet.c,v 1.15 2019/05/10 01:29:31 guenther Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -24,7 +24,6 @@
 #include <netinet/ip.h>
 #include <netinet/ip6.h>
 #include <arpa/inet.h>
-#include <net/if_dl.h>
 
 #include <errno.h>
 #include <event.h>
diff --git a/usr.sbin/rad/frontend.c b/usr.sbin/rad/frontend.c
index b733bc837ef..193b9b52f75 100644
--- a/usr.sbin/rad/frontend.c
+++ b/usr.sbin/rad/frontend.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frontend.c,v 1.28 2019/04/12 07:03:11 florian Exp $	*/
+/*	$OpenBSD: frontend.c,v 1.29 2019/05/10 01:29:31 guenther Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -56,7 +56,6 @@
 #include <sys/uio.h>
 
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/route.h>
 
diff --git a/usr.sbin/rad/parse.y b/usr.sbin/rad/parse.y
index d69d6e603a4..004e5e22f92 100644
--- a/usr.sbin/rad/parse.y
+++ b/usr.sbin/rad/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.13 2019/03/01 16:35:17 florian Exp $	*/
+/*	$OpenBSD: parse.y,v 1.14 2019/05/10 01:29:31 guenther Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -37,7 +37,6 @@
 #include <err.h>
 #include <errno.h>
 #include <event.h>
-#include <ifaddrs.h>
 #include <imsg.h>
 #include <limits.h>
 #include <stdarg.h>
diff --git a/usr.sbin/ripd/parse.y b/usr.sbin/ripd/parse.y
index 5968b637c67..82170e45a5d 100644
--- a/usr.sbin/ripd/parse.y
+++ b/usr.sbin/ripd/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.46 2019/02/13 22:57:08 deraadt Exp $ */
+/*	$OpenBSD: parse.y,v 1.47 2019/05/10 01:29:31 guenther Exp $ */
 
 /*
  * Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
@@ -33,7 +33,6 @@
 #include <err.h>
 #include <errno.h>
 #include <unistd.h>
-#include <ifaddrs.h>
 #include <limits.h>
 #include <stdarg.h>
 #include <stdio.h>