From owner-svn-src-all@FreeBSD.ORG  Mon Apr  6 09:42:44 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 665C4CCB;
 Mon,  6 Apr 2015 09:42:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4DE9BE86;
 Mon,  6 Apr 2015 09:42:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t369gh0m021185;
 Mon, 6 Apr 2015 09:42:43 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t369gOM5021093;
 Mon, 6 Apr 2015 09:42:24 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201504060942.t369gOM5021093@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Mon, 6 Apr 2015 09:42:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r281143 - in head: contrib/ipfilter/ipsend
 contrib/ipfilter/lib contrib/ipfilter/tools lib/libc/net sbin/ifconfig
 tools/tools/ath/athratestats tools/tools/cxgbtool tools/tools/iwn/iwnst...
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Apr 2015 09:42:44 -0000

Author: glebius
Date: Mon Apr  6 09:42:23 2015
New Revision: 281143
URL: https://svnweb.freebsd.org/changeset/base/281143

Log:
  Stop including if_var.h from userland.
  
  Sponsored by:	Nginx, Inc.

Modified:
  head/contrib/ipfilter/ipsend/44arp.c
  head/contrib/ipfilter/ipsend/ip.c
  head/contrib/ipfilter/ipsend/resend.c
  head/contrib/ipfilter/lib/kmem.c
  head/contrib/ipfilter/tools/ipfs.c
  head/contrib/ipfilter/tools/ipnat.c
  head/contrib/ipfilter/tools/ipnat_y.y
  head/contrib/ipfilter/tools/ippool.c
  head/contrib/ipfilter/tools/ippool_y.y
  head/lib/libc/net/getaddrinfo.c
  head/lib/libc/net/name6.c
  head/sbin/ifconfig/af_inet.c
  head/sbin/ifconfig/af_inet6.c
  head/sbin/ifconfig/af_nd6.c
  head/sbin/ifconfig/carp.c
  head/sbin/ifconfig/ifconfig.c
  head/sbin/ifconfig/ifvlan.c
  head/sbin/ifconfig/ifvxlan.c
  head/tools/tools/ath/athratestats/main.c
  head/tools/tools/cxgbtool/cxgbtool.c
  head/tools/tools/iwn/iwnstats/iwn_ioctl.c
  head/usr.bin/bluetooth/btsockstat/btsockstat.c
  head/usr.bin/kdump/mkioctls
  head/usr.bin/netstat/bpf.c
  head/usr.bin/netstat/if.c
  head/usr.bin/netstat/inet6.c
  head/usr.sbin/amd/include/config.h
  head/usr.sbin/ancontrol/ancontrol.c
  head/usr.sbin/ifmcstat/ifmcstat.c
  head/usr.sbin/ip6addrctl/ip6addrctl.c
  head/usr.sbin/mld6query/mld6.c
  head/usr.sbin/ndp/ndp.c
  head/usr.sbin/ntp/config.h
  head/usr.sbin/ppp/iface.c
  head/usr.sbin/rip6query/rip6query.c
  head/usr.sbin/route6d/route6d.c
  head/usr.sbin/rrenumd/lexer.l
  head/usr.sbin/rrenumd/parser.y
  head/usr.sbin/rtadvctl/rtadvctl.c
  head/usr.sbin/rtadvd/config.c
  head/usr.sbin/rtadvd/if.c
  head/usr.sbin/rtadvd/rrenum.c
  head/usr.sbin/rtadvd/rtadvd.c
  head/usr.sbin/rtsold/if.c
  head/usr.sbin/rtsold/probe.c
  head/usr.sbin/rtsold/rtsold.c
  head/usr.sbin/uhsoctl/uhsoctl.c
  head/usr.sbin/wpa/ndis_events/ndis_events.c
  head/usr.sbin/wpa/wpa_supplicant/Packet32.c

Modified: head/contrib/ipfilter/ipsend/44arp.c
==============================================================================
--- head/contrib/ipfilter/ipsend/44arp.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/contrib/ipfilter/ipsend/44arp.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -8,9 +8,6 @@
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 #include <net/if.h>
-#if __FreeBSD_version >= 300000
-# include <net/if_var.h>
-#endif
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #ifndef __osf__

Modified: head/contrib/ipfilter/ipsend/ip.c
==============================================================================
--- head/contrib/ipfilter/ipsend/ip.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/contrib/ipfilter/ipsend/ip.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -21,9 +21,6 @@ static const char rcsid[] = "@(#)$Id$";
 # include <net/route.h>
 # include <netinet/if_ether.h>
 # include <netinet/ip_var.h>
-# if __FreeBSD_version >= 300000
-#  include <net/if_var.h>
-# endif
 #endif
 #include <errno.h>
 #include <stdio.h>

Modified: head/contrib/ipfilter/ipsend/resend.c
==============================================================================
--- head/contrib/ipfilter/ipsend/resend.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/contrib/ipfilter/ipsend/resend.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -22,9 +22,6 @@ static const char rcsid[] = "@(#)$Id$";
 #ifndef	linux
 # include <netinet/ip_var.h>
 # include <netinet/if_ether.h>
-# if __FreeBSD_version >= 300000
-#  include <net/if_var.h>
-# endif
 #endif
 #include <stdio.h>
 #include <netdb.h>

Modified: head/contrib/ipfilter/lib/kmem.c
==============================================================================
--- head/contrib/ipfilter/lib/kmem.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/contrib/ipfilter/lib/kmem.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -29,9 +29,6 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <net/if.h>
-#if __FreeBSD_version >= 300000
-# include <net/if_var.h>
-#endif
 #if defined(linux) || defined(__osf__) || defined(__sgi) || defined(__hpux)
 # include <stdlib.h>
 #endif

Modified: head/contrib/ipfilter/tools/ipfs.c
==============================================================================
--- head/contrib/ipfilter/tools/ipfs.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/contrib/ipfilter/tools/ipfs.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -33,9 +33,6 @@
 #include <netinet/in_systm.h>
 #include <sys/time.h>
 #include <net/if.h>
-#if __FreeBSD_version >= 300000
-# include <net/if_var.h>
-#endif
 #include <netinet/ip.h>
 #include <netdb.h>
 #include <arpa/nameser.h>

Modified: head/contrib/ipfilter/tools/ipnat.c
==============================================================================
--- head/contrib/ipfilter/tools/ipnat.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/contrib/ipfilter/tools/ipnat.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -37,9 +37,6 @@
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 #include <net/if.h>
-#if __FreeBSD_version >= 300000
-# include <net/if_var.h>
-#endif
 #include <netdb.h>
 #include <arpa/nameser.h>
 #include <arpa/inet.h>

Modified: head/contrib/ipfilter/tools/ipnat_y.y
==============================================================================
--- head/contrib/ipfilter/tools/ipnat_y.y	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/contrib/ipfilter/tools/ipnat_y.y	Mon Apr  6 09:42:23 2015	(r281143)
@@ -35,9 +35,6 @@
 #include <sys/time.h>
 #include <syslog.h>
 #include <net/if.h>
-#if __FreeBSD_version >= 300000
-# include <net/if_var.h>
-#endif
 #include <netdb.h>
 #include <arpa/nameser.h>
 #include <resolv.h>

Modified: head/contrib/ipfilter/tools/ippool.c
==============================================================================
--- head/contrib/ipfilter/tools/ippool.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/contrib/ipfilter/tools/ippool.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -15,9 +15,6 @@
 #include <sys/ioctl.h>
 
 #include <net/if.h>
-#if __FreeBSD_version >= 300000
-# include <net/if_var.h>
-#endif
 #include <netinet/in.h>
 
 #include <arpa/inet.h>

Modified: head/contrib/ipfilter/tools/ippool_y.y
==============================================================================
--- head/contrib/ipfilter/tools/ippool_y.y	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/contrib/ipfilter/tools/ippool_y.y	Mon Apr  6 09:42:23 2015	(r281143)
@@ -16,9 +16,6 @@
 #include <sys/ioctl.h>
 
 #include <net/if.h>
-#if __FreeBSD_version >= 300000
-# include <net/if_var.h>
-#endif
 #include <netinet/in.h>
 
 #include <arpa/inet.h>

Modified: head/lib/libc/net/getaddrinfo.c
==============================================================================
--- head/lib/libc/net/getaddrinfo.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/lib/libc/net/getaddrinfo.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$");
 #include <ifaddrs.h>
 #include <sys/queue.h>
 #ifdef INET6
-#include <net/if_var.h>
 #include <sys/sysctl.h>
 #include <sys/ioctl.h>
 #include <netinet6/in6_var.h>

Modified: head/lib/libc/net/name6.c
==============================================================================
--- head/lib/libc/net/name6.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/lib/libc/net/name6.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -94,7 +94,6 @@ __FBSDID("$FreeBSD$");
 #include <netinet/in.h>
 #ifdef INET6
 #include <net/if.h>
-#include <net/if_var.h>
 #include <sys/sysctl.h>
 #include <sys/ioctl.h>
 #include <netinet6/in6_var.h>	/* XXX */

Modified: head/sbin/ifconfig/af_inet.c
==============================================================================
--- head/sbin/ifconfig/af_inet.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/sbin/ifconfig/af_inet.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -46,7 +46,6 @@ static const char rcsid[] =
 #include <ifaddrs.h>
 
 #include <netinet/in.h>
-#include <net/if_var.h>		/* for struct ifaddr */
 #include <netinet/in_var.h>
 #include <arpa/inet.h>
 #include <netdb.h>

Modified: head/sbin/ifconfig/af_inet6.c
==============================================================================
--- head/sbin/ifconfig/af_inet6.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/sbin/ifconfig/af_inet6.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -48,7 +48,6 @@ static const char rcsid[] =
 #include <arpa/inet.h>
 
 #include <netinet/in.h>
-#include <net/if_var.h>		/* for struct ifaddr */
 #include <netinet/in_var.h>
 #include <arpa/inet.h>
 #include <netdb.h>

Modified: head/sbin/ifconfig/af_nd6.c
==============================================================================
--- head/sbin/ifconfig/af_nd6.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/sbin/ifconfig/af_nd6.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -46,7 +46,6 @@ static const char rcsid[] =
 #include <arpa/inet.h>
 
 #include <netinet/in.h>
-#include <net/if_var.h>
 #include <netinet/in_var.h>
 #include <arpa/inet.h>
 #include <netdb.h>

Modified: head/sbin/ifconfig/carp.c
==============================================================================
--- head/sbin/ifconfig/carp.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/sbin/ifconfig/carp.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -36,7 +36,6 @@
 #include <unistd.h>
 
 #include <net/if.h>
-#include <net/if_var.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #include <netinet/ip_carp.h>

Modified: head/sbin/ifconfig/ifconfig.c
==============================================================================
--- head/sbin/ifconfig/ifconfig.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/sbin/ifconfig/ifconfig.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -51,7 +51,6 @@ static const char rcsid[] =
 
 #include <net/ethernet.h>
 #include <net/if.h>
-#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/route.h>

Modified: head/sbin/ifconfig/ifvlan.c
==============================================================================
--- head/sbin/ifconfig/ifvlan.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/sbin/ifconfig/ifvlan.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -40,7 +40,6 @@
 
 #include <net/ethernet.h>
 #include <net/if.h>
-#include <net/if_var.h>
 #include <net/if_vlan_var.h>
 #include <net/route.h>
 

Modified: head/sbin/ifconfig/ifvxlan.c
==============================================================================
--- head/sbin/ifconfig/ifvxlan.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/sbin/ifconfig/ifvxlan.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
-#include <net/if_var.h>
 #include <net/if_vxlan.h>
 #include <net/route.h>
 #include <netinet/in.h>

Modified: head/tools/tools/ath/athratestats/main.c
==============================================================================
--- head/tools/tools/ath/athratestats/main.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/tools/tools/ath/athratestats/main.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -38,7 +38,6 @@
 #include <net/ethernet.h>
 #include <net/if.h>
 #include <net/if_media.h>
-#include <net/if_var.h>
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: head/tools/tools/cxgbtool/cxgbtool.c
==============================================================================
--- head/tools/tools/cxgbtool/cxgbtool.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/tools/tools/cxgbtool/cxgbtool.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
 #include <arpa/inet.h>
 
 #include <net/if.h>
-#include <net/if_var.h>
 #include <net/if_types.h>
 #include <sys/endian.h>
 

Modified: head/tools/tools/iwn/iwnstats/iwn_ioctl.c
==============================================================================
--- head/tools/tools/iwn/iwnstats/iwn_ioctl.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/tools/tools/iwn/iwnstats/iwn_ioctl.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -38,7 +38,6 @@
 #include <sys/socket.h>
 #include <net/if.h>
 #include <net/if_media.h>
-#include <net/if_var.h>
 
 #include <stdio.h>
 #include <stdlib.h>

Modified: head/usr.bin/bluetooth/btsockstat/btsockstat.c
==============================================================================
--- head/usr.bin/bluetooth/btsockstat/btsockstat.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.bin/bluetooth/btsockstat/btsockstat.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -38,7 +38,6 @@
 #include <sys/socketvar.h>
 
 #include <net/if.h>
-#include <net/if_var.h>
 
 #include <bluetooth.h>
 #include <err.h>

Modified: head/usr.bin/kdump/mkioctls
==============================================================================
--- head/usr.bin/kdump/mkioctls	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.bin/kdump/mkioctls	Mon Apr  6 09:42:23 2015	(r281143)
@@ -54,7 +54,6 @@ BEGIN {
 	print "#include <bsm/audit.h>"
 	print "#include <net/ethernet.h>"
 	print "#include <net/if.h>"
-	print "#include <net/if_var.h>"
 	print "#ifdef PF"
 	print "#include <net/pfvar.h>"
 	print "#include <net/if_pfsync.h>"

Modified: head/usr.bin/netstat/bpf.c
==============================================================================
--- head/usr.bin/netstat/bpf.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.bin/netstat/bpf.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/user.h>
 
 #include <net/if.h>
-#include <net/if_var.h>
 #include <net/bpf.h>
 #include <net/bpfdesc.h>
 #include <arpa/inet.h>

Modified: head/usr.bin/netstat/if.c
==============================================================================
--- head/usr.bin/netstat/if.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.bin/netstat/if.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/time.h>
 
 #include <net/if.h>
-#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/ethernet.h>

Modified: head/usr.bin/netstat/inet6.c
==============================================================================
--- head/usr.bin/netstat/inet6.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.bin/netstat/inet6.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
 
 #include <net/route.h>
 #include <net/if.h>
-#include <net/if_var.h>
 #include <netinet/in.h>
 #include <netinet/ip6.h>
 #include <netinet/icmp6.h>

Modified: head/usr.sbin/amd/include/config.h
==============================================================================
--- head/usr.sbin/amd/include/config.h	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.sbin/amd/include/config.h	Mon Apr  6 09:42:23 2015	(r281143)
@@ -668,9 +668,6 @@
 /* Define to 1 if you have the <net/if.h> header file. */
 #define HAVE_NET_IF_H 1
 
-/* Define to 1 if you have the <net/if_var.h> header file. */
-#define HAVE_NET_IF_VAR_H 1
-
 /* Define to 1 if you have the <net/route.h> header file. */
 #define HAVE_NET_ROUTE_H 1
 

Modified: head/usr.sbin/ancontrol/ancontrol.c
==============================================================================
--- head/usr.sbin/ancontrol/ancontrol.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.sbin/ancontrol/ancontrol.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
 #include <arpa/inet.h>
 
 #include <net/if.h>
-#include <net/if_var.h>
 #include <net/ethernet.h>
 
 #include <dev/an/if_aironet_ieee.h>

Modified: head/usr.sbin/ifmcstat/ifmcstat.c
==============================================================================
--- head/usr.sbin/ifmcstat/ifmcstat.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.sbin/ifmcstat/ifmcstat.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/tree.h>
 
 #include <net/if.h>
-#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/if_dl.h>
 #include <net/route.h>

Modified: head/usr.sbin/ip6addrctl/ip6addrctl.c
==============================================================================
--- head/usr.sbin/ip6addrctl/ip6addrctl.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.sbin/ip6addrctl/ip6addrctl.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -39,7 +39,6 @@
 #include <sys/sysctl.h>
 
 #include <net/if.h>
-#include <net/if_var.h>
 
 #include <netinet/in.h>
 #include <netinet6/in6_var.h>

Modified: head/usr.sbin/mld6query/mld6.c
==============================================================================
--- head/usr.sbin/mld6query/mld6.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.sbin/mld6query/mld6.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 #include <signal.h>
 
 #include <net/if.h>
-#include <net/if_var.h>
 
 #include <netinet/in.h>
 #include <netinet/ip6.h>

Modified: head/usr.sbin/ndp/ndp.c
==============================================================================
--- head/usr.sbin/ndp/ndp.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.sbin/ndp/ndp.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -83,7 +83,6 @@
 #include <sys/queue.h>
 
 #include <net/if.h>
-#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/route.h>

Modified: head/usr.sbin/ntp/config.h
==============================================================================
--- head/usr.sbin/ntp/config.h	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.sbin/ntp/config.h	Mon Apr  6 09:42:23 2015	(r281143)
@@ -613,9 +613,6 @@
 /* Define to 1 if you have the <net/if.h> header file. */
 #define HAVE_NET_IF_H 1
 
-/* Define to 1 if you have the <net/if_var.h> header file. */
-#define HAVE_NET_IF_VAR_H 1
-
 /* Define to 1 if you have the <net/route.h> header file. */
 #define HAVE_NET_ROUTE_H 1
 

Modified: head/usr.sbin/ppp/iface.c
==============================================================================
--- head/usr.sbin/ppp/iface.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.sbin/ppp/iface.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -31,9 +31,6 @@
 #include <netinet/in.h>
 #include <net/if.h>
 #include <net/if_dl.h>
-#ifdef __FreeBSD__
-#include <net/if_var.h>
-#endif
 #include <net/route.h>
 #include <netinet/in_systm.h>
 #include <netinet/in_var.h>

Modified: head/usr.sbin/rip6query/rip6query.c
==============================================================================
--- head/usr.sbin/rip6query/rip6query.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.sbin/rip6query/rip6query.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -46,9 +46,6 @@
 #include <sys/queue.h>
 
 #include <net/if.h>
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
-#include <net/if_var.h>
-#endif /* __FreeBSD__ >= 3 */
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #include <arpa/inet.h>

Modified: head/usr.sbin/route6d/route6d.c
==============================================================================
--- head/usr.sbin/route6d/route6d.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.sbin/route6d/route6d.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -63,7 +63,6 @@ static const char _rcsid[] = "$KAME: rou
 #include <sys/sysctl.h>
 #include <sys/uio.h>
 #include <net/if.h>
-#include <net/if_var.h>
 #include <net/route.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>

Modified: head/usr.sbin/rrenumd/lexer.l
==============================================================================
--- head/usr.sbin/rrenumd/lexer.l	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.sbin/rrenumd/lexer.l	Mon Apr  6 09:42:23 2015	(r281143)
@@ -40,10 +40,6 @@
 #include <string.h>
 
 #include <net/if.h>
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
-#include <net/if_var.h>
-#endif /* __FreeBSD__ >= 3 */
-
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #include <netinet/icmp6.h>

Modified: head/usr.sbin/rrenumd/parser.y
==============================================================================
--- head/usr.sbin/rrenumd/parser.y	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.sbin/rrenumd/parser.y	Mon Apr  6 09:42:23 2015	(r281143)
@@ -39,9 +39,6 @@
 #include <sys/queue.h>
 
 #include <net/if.h>
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
-#include <net/if_var.h>
-#endif /* __FreeBSD__ >= 3 */
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>

Modified: head/usr.sbin/rtadvctl/rtadvctl.c
==============================================================================
--- head/usr.sbin/rtadvctl/rtadvctl.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.sbin/rtadvctl/rtadvctl.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -36,7 +36,6 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
-#include <net/if_var.h>
 #include <net/ethernet.h>
 #include <netinet/in.h>
 #include <netinet/ip6.h>

Modified: head/usr.sbin/rtadvd/config.c
==============================================================================
--- head/usr.sbin/rtadvd/config.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.sbin/rtadvd/config.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -36,7 +36,6 @@
 #include <sys/socket.h>
 
 #include <net/if.h>
-#include <net/if_var.h>
 #include <net/route.h>
 #include <net/if_dl.h>
 

Modified: head/usr.sbin/rtadvd/if.c
==============================================================================
--- head/usr.sbin/rtadvd/if.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.sbin/rtadvd/if.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -38,7 +38,6 @@
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
-#include <net/if_var.h>
 #include <net/ethernet.h>
 #include <net/route.h>
 #include <netinet/in.h>

Modified: head/usr.sbin/rtadvd/rrenum.c
==============================================================================
--- head/usr.sbin/rtadvd/rrenum.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.sbin/rtadvd/rrenum.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -37,7 +37,6 @@
 
 #include <net/if.h>
 #include <net/if_dl.h>
-#include <net/if_var.h>
 #include <net/route.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>

Modified: head/usr.sbin/rtadvd/rtadvd.c
==============================================================================
--- head/usr.sbin/rtadvd/rtadvd.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.sbin/rtadvd/rtadvd.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -51,7 +51,6 @@
 
 #include <arpa/inet.h>
 
-#include <net/if_var.h>
 #include <netinet/in_var.h>
 #include <netinet6/nd6.h>
 

Modified: head/usr.sbin/rtsold/if.c
==============================================================================
--- head/usr.sbin/rtsold/if.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.sbin/rtsold/if.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -38,7 +38,6 @@
 #include <sys/queue.h>
 
 #include <net/if.h>
-#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/route.h>
 #include <net/if_dl.h>

Modified: head/usr.sbin/rtsold/probe.c
==============================================================================
--- head/usr.sbin/rtsold/probe.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.sbin/rtsold/probe.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -40,7 +40,6 @@
 #include <sys/queue.h>
 
 #include <net/if.h>
-#include <net/if_var.h>
 #include <net/if_dl.h>
 
 #include <netinet/in.h>

Modified: head/usr.sbin/rtsold/rtsold.c
==============================================================================
--- head/usr.sbin/rtsold/rtsold.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.sbin/rtsold/rtsold.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -38,7 +38,6 @@
 
 #include <net/if.h>
 #include <net/if_dl.h>
-#include <net/if_var.h>
 
 #include <netinet/in.h>
 #include <netinet/icmp6.h>

Modified: head/usr.sbin/uhsoctl/uhsoctl.c
==============================================================================
--- head/usr.sbin/uhsoctl/uhsoctl.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.sbin/uhsoctl/uhsoctl.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -37,7 +37,6 @@
 
 #include <arpa/inet.h>
 #include <net/if.h>
-#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/route.h>
 #include <netinet/in.h>

Modified: head/usr.sbin/wpa/ndis_events/ndis_events.c
==============================================================================
--- head/usr.sbin/wpa/ndis_events/ndis_events.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.sbin/wpa/ndis_events/ndis_events.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <net/if.h>
 #include <net/if_dl.h>
-#include <net/if_var.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>

Modified: head/usr.sbin/wpa/wpa_supplicant/Packet32.c
==============================================================================
--- head/usr.sbin/wpa/wpa_supplicant/Packet32.c	Mon Apr  6 09:15:18 2015	(r281142)
+++ head/usr.sbin/wpa/wpa_supplicant/Packet32.c	Mon Apr  6 09:42:23 2015	(r281143)
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/fcntl.h>
 #include <net/if.h>
 #include <net/if_dl.h>
-#include <net/if_var.h>
 
 #include <netinet/in.h>
 #include <arpa/inet.h>