On 30/08/13(Fri) 21:50, Alexander Bluhm wrote:
> Hi,
>
> The file netinet/in_var.h includes netinet6/in6_var.h. This creates
> a bunch of useless dependencies. For an upcomming change in in6_var.h
> I would like to split that up.
>
> Is this a good idea? comments/ok?
I like the idea but we should be careful about ports assuming that
in_var.h includes in6_var.h even if there's no RFC requirement.
ok mpi@
> The important part of my diff is in sys/netinet/in_var.h:
> -/* INET6 stuff */
> -#include <netinet6/in6_var.h>
>
> bluhm
>
> Index: sbin/ifconfig/ifconfig.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sbin/ifconfig/ifconfig.c,v
> retrieving revision 1.269
> diff -u -p -u -p -r1.269 ifconfig.c
> --- sbin/ifconfig/ifconfig.c 19 Aug 2013 11:20:57 -0000 1.269
> +++ sbin/ifconfig/ifconfig.c 27 Aug 2013 22:40:10 -0000
> @@ -70,6 +70,7 @@
> #include <net/if_types.h>
> #include <netinet/in.h>
> #include <netinet/in_var.h>
> +#include <netinet6/in6_var.h>
> #include <netinet6/nd6.h>
> #include <arpa/inet.h>
> #include <netinet/ip_ipsp.h>
> Index: sys/net/bridgestp.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/net/bridgestp.c,v
> retrieving revision 1.44
> diff -u -p -u -p -r1.44 bridgestp.c
> --- sys/net/bridgestp.c 20 Jun 2013 12:03:40 -0000 1.44
> +++ sys/net/bridgestp.c 27 Aug 2013 22:27:28 -0000
> @@ -60,7 +60,6 @@ __FBSDID("$FreeBSD: /repoman/r/ncvs/src/
> #ifdef INET
> #include <netinet/in.h>
> #include <netinet/in_systm.h>
> -#include <netinet/in_var.h>
> #include <netinet/ip.h>
> #include <netinet/if_ether.h>
> #endif
> Index: sys/net/if.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/net/if.c,v
> retrieving revision 1.264
> diff -u -p -u -p -r1.264 if.c
> --- sys/net/if.c 28 Aug 2013 07:38:50 -0000 1.264
> +++ sys/net/if.c 29 Aug 2013 20:49:43 -0000
> @@ -103,6 +103,7 @@
> #ifndef INET
> #include <netinet/in.h>
> #endif
> +#include <netinet6/in6_var.h>
> #include <netinet6/in6_ifattach.h>
> #include <netinet6/nd6.h>
> #include <netinet/ip6.h>
> Index: sys/net/if_bridge.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/net/if_bridge.c,v
> retrieving revision 1.214
> diff -u -p -u -p -r1.214 if_bridge.c
> --- sys/net/if_bridge.c 21 Aug 2013 13:53:48 -0000 1.214
> +++ sys/net/if_bridge.c 27 Aug 2013 22:27:28 -0000
> @@ -71,6 +71,7 @@
> #endif
>
> #ifdef INET6
> +#include <netinet6/in6_var.h>
> #include <netinet/ip6.h>
> #include <netinet6/ip6_var.h>
> #endif
> Index: sys/net/if_fddisubr.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/net/if_fddisubr.c,v
> retrieving revision 1.61
> diff -u -p -u -p -r1.61 if_fddisubr.c
> --- sys/net/if_fddisubr.c 28 Mar 2013 16:55:27 -0000 1.61
> +++ sys/net/if_fddisubr.c 27 Aug 2013 22:27:28 -0000
> @@ -103,8 +103,8 @@
> #ifdef INET6
> #ifndef INET
> #include <netinet/in.h>
> -#include <netinet/in_var.h>
> #endif
> +#include <netinet6/in6_var.h>
> #include <netinet6/nd6.h>
> #endif
>
> Index: sys/net/if_gif.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/net/if_gif.c,v
> retrieving revision 1.62
> diff -u -p -u -p -r1.62 if_gif.c
> --- sys/net/if_gif.c 17 Jun 2013 18:19:44 -0000 1.62
> +++ sys/net/if_gif.c 27 Aug 2013 22:27:28 -0000
> @@ -57,6 +57,7 @@
> #ifndef INET
> #include <netinet/in.h>
> #endif
> +#include <netinet6/in6_var.h>
> #include <netinet/ip6.h>
> #include <netinet6/ip6_var.h>
> #include <netinet6/in6_gif.h>
> Index: sys/net/if_gre.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/net/if_gre.c,v
> retrieving revision 1.62
> diff -u -p -u -p -r1.62 if_gre.c
> --- sys/net/if_gre.c 5 Jun 2013 15:17:40 -0000 1.62
> +++ sys/net/if_gre.c 27 Aug 2013 22:27:28 -0000
> @@ -60,7 +60,6 @@
> #ifdef INET
> #include <netinet/in.h>
> #include <netinet/in_systm.h>
> -#include <netinet/in_var.h>
> #include <netinet/ip.h>
> #include <netinet/ip_var.h>
> #include <netinet/if_ether.h>
> Index: sys/net/if_mpe.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/net/if_mpe.c,v
> retrieving revision 1.29
> diff -u -p -u -p -r1.29 if_mpe.c
> --- sys/net/if_mpe.c 28 Mar 2013 16:45:16 -0000 1.29
> +++ sys/net/if_mpe.c 27 Aug 2013 22:27:28 -0000
> @@ -37,6 +37,7 @@
> #endif
>
> #ifdef INET6
> +#include <netinet6/in6_var.h>
> #include <netinet/ip6.h>
> #ifndef INET
> #include <netinet/in.h>
> Index: sys/net/if_pflog.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/net/if_pflog.c,v
> retrieving revision 1.54
> diff -u -p -u -p -r1.54 if_pflog.c
> --- sys/net/if_pflog.c 26 Jun 2013 09:12:39 -0000 1.54
> +++ sys/net/if_pflog.c 27 Aug 2013 22:27:28 -0000
> @@ -63,6 +63,7 @@
> #ifndef INET
> #include <netinet/in.h>
> #endif
> +#include <netinet6/in6_var.h>
> #include <netinet/ip6.h>
> #include <netinet6/nd6.h>
> #include <netinet/icmp6.h>
> Index: sys/net/if_pflow.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/net/if_pflow.c,v
> retrieving revision 1.34
> diff -u -p -u -p -r1.34 if_pflow.c
> --- sys/net/if_pflow.c 13 Aug 2013 08:44:05 -0000 1.34
> +++ sys/net/if_pflow.c 27 Aug 2013 22:27:28 -0000
> @@ -41,7 +41,6 @@
>
> #ifdef INET
> #include <netinet/in.h>
> -#include <netinet/in_var.h>
> #include <netinet/in_systm.h>
> #include <netinet/ip.h>
> #include <netinet/ip_var.h>
> Index: sys/net/if_pfsync.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/net/if_pfsync.c,v
> retrieving revision 1.201
> diff -u -p -u -p -r1.201 if_pfsync.c
> --- sys/net/if_pfsync.c 7 Aug 2013 05:39:05 -0000 1.201
> +++ sys/net/if_pfsync.c 27 Aug 2013 22:27:28 -0000
> @@ -73,6 +73,7 @@
> #endif
>
> #ifdef INET6
> +#include <netinet6/in6_var.h>
> #include <netinet/ip6.h>
> #include <netinet/in_pcb.h>
> #include <netinet/icmp6.h>
> Index: sys/net/if_pppx.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/net/if_pppx.c,v
> retrieving revision 1.24
> diff -u -p -u -p -r1.24 if_pppx.c
> --- sys/net/if_pppx.c 8 Aug 2013 07:39:13 -0000 1.24
> +++ sys/net/if_pppx.c 27 Aug 2013 22:27:28 -0000
> @@ -77,6 +77,7 @@
> #endif
>
> #ifdef INET6
> +#include <netinet6/in6_var.h>
> #include <netinet/ip6.h>
> #include <netinet6/nd6.h>
> #endif /* INET6 */
> Index: sys/net/if_tun.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/net/if_tun.c,v
> retrieving revision 1.115
> diff -u -p -u -p -r1.115 if_tun.c
> --- sys/net/if_tun.c 25 May 2013 10:05:52 -0000 1.115
> +++ sys/net/if_tun.c 27 Aug 2013 22:27:28 -0000
> @@ -70,6 +70,10 @@
> #include <netinet/if_ether.h>
> #endif
>
> +#ifdef INET6
> +#include <netinet6/in6_var.h>
> +#endif
> +
> #ifdef PIPEX
> #include <net/pipex.h>
> #endif
> Index: sys/net/pf.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/net/pf.c,v
> retrieving revision 1.839
> diff -u -p -u -p -r1.839 pf.c
> --- sys/net/pf.c 19 Aug 2013 09:16:25 -0000 1.839
> +++ sys/net/pf.c 27 Aug 2013 22:27:28 -0000
> @@ -88,6 +88,7 @@
> #endif /* NPFSYNC > 0 */
>
> #ifdef INET6
> +#include <netinet6/in6_var.h>
> #include <netinet/ip6.h>
> #include <netinet6/ip6_var.h>
> #include <netinet/icmp6.h>
> Index: sys/net/pf_if.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/net/pf_if.c,v
> retrieving revision 1.66
> diff -u -p -u -p -r1.66 pf_if.c
> --- sys/net/pf_if.c 20 Jun 2013 12:03:40 -0000 1.66
> +++ sys/net/pf_if.c 30 Aug 2013 17:58:28 -0000
> @@ -48,7 +48,6 @@
> #include <net/if_types.h>
>
> #include <netinet/in.h>
> -#include <netinet/in_var.h>
> #include <netinet/in_systm.h>
> #include <netinet/ip.h>
> #include <netinet/ip_var.h>
> Index: sys/net/pf_ioctl.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/net/pf_ioctl.c,v
> retrieving revision 1.259
> diff -u -p -u -p -r1.259 pf_ioctl.c
> --- sys/net/pf_ioctl.c 28 Mar 2013 16:45:16 -0000 1.259
> +++ sys/net/pf_ioctl.c 27 Aug 2013 22:27:28 -0000
> @@ -60,7 +60,6 @@
> #include <net/route.h>
>
> #include <netinet/in.h>
> -#include <netinet/in_var.h>
> #include <netinet/in_systm.h>
> #include <netinet/ip.h>
> #include <netinet/ip_var.h>
> Index: sys/net/pf_lb.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/net/pf_lb.c,v
> retrieving revision 1.25
> diff -u -p -u -p -r1.25 pf_lb.c
> --- sys/net/pf_lb.c 28 Mar 2013 16:45:16 -0000 1.25
> +++ sys/net/pf_lb.c 27 Aug 2013 22:27:28 -0000
> @@ -87,6 +87,7 @@
> #endif /* NPFSYNC > 0 */
>
> #ifdef INET6
> +#include <netinet6/in6_var.h>
> #include <netinet/ip6.h>
> #include <netinet/in_pcb.h>
> #include <netinet/icmp6.h>
> Index: sys/net/pf_norm.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/net/pf_norm.c,v
> retrieving revision 1.160
> diff -u -p -u -p -r1.160 pf_norm.c
> --- sys/net/pf_norm.c 23 Jul 2013 22:47:10 -0000 1.160
> +++ sys/net/pf_norm.c 27 Aug 2013 22:27:28 -0000
> @@ -48,7 +48,6 @@
> #include <net/if_pflog.h>
>
> #include <netinet/in.h>
> -#include <netinet/in_var.h>
> #include <netinet/in_systm.h>
> #include <netinet/ip.h>
> #include <netinet/ip_var.h>
> Index: sys/net/pipex.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/net/pipex.c,v
> retrieving revision 1.42
> diff -u -p -u -p -r1.42 pipex.c
> --- sys/net/pipex.c 8 Jun 2013 14:24:38 -0000 1.42
> +++ sys/net/pipex.c 27 Aug 2013 22:27:28 -0000
> @@ -69,6 +69,7 @@
> #include <netinet/ip.h>
> #include <netinet/ip_var.h>
> #ifdef INET6
> +#include <netinet6/in6_var.h>
> #include <netinet/ip6.h>
> #include <netinet6/ip6_var.h>
> #endif
> Index: sys/net/route.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/net/route.c,v
> retrieving revision 1.145
> diff -u -p -u -p -r1.145 route.c
> --- sys/net/route.c 28 Aug 2013 06:58:57 -0000 1.145
> +++ sys/net/route.c 29 Aug 2013 20:49:43 -0000
> @@ -119,7 +119,6 @@
> #include <net/raw_cb.h>
>
> #include <netinet/in.h>
> -#include <netinet/in_var.h>
>
> #ifdef MPLS
> #include <netmpls/mpls.h>
> Index: sys/netinet/in_pcb.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet/in_pcb.c,v
> retrieving revision 1.139
> diff -u -p -u -p -r1.139 in_pcb.c
> --- sys/netinet/in_pcb.c 1 Jun 2013 13:25:40 -0000 1.139
> +++ sys/netinet/in_pcb.c 27 Aug 2013 22:27:28 -0000
> @@ -96,6 +96,7 @@
> #include <nfs/nfsproto.h>
>
> #ifdef INET6
> +#include <netinet6/in6_var.h>
> #include <netinet6/ip6_var.h>
> #endif /* INET6 */
> #ifdef IPSEC
> Index: sys/netinet/in_var.h
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet/in_var.h,v
> retrieving revision 1.21
> diff -u -p -u -p -r1.21 in_var.h
> --- sys/netinet/in_var.h 28 Aug 2013 21:19:16 -0000 1.21
> +++ sys/netinet/in_var.h 29 Aug 2013 20:49:43 -0000
> @@ -222,8 +222,4 @@ int inet_nat46(int, const void *, void *
> int in_mask2len(struct in_addr *);
> #endif
>
> -
> -/* INET6 stuff */
> -#include <netinet6/in6_var.h>
> -
> #endif /* _NETINET_IN_VAR_H_ */
> Index: sys/netinet/ip_carp.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet/ip_carp.c,v
> retrieving revision 1.210
> diff -u -p -u -p -r1.210 ip_carp.c
> --- sys/netinet/ip_carp.c 12 Aug 2013 06:24:28 -0000 1.210
> +++ sys/netinet/ip_carp.c 27 Aug 2013 22:27:28 -0000
> @@ -78,6 +78,7 @@
> #endif
>
> #ifdef INET6
> +#include <netinet6/in6_var.h>
> #include <netinet/icmp6.h>
> #include <netinet/ip6.h>
> #include <netinet6/ip6_var.h>
> Index: sys/netinet/ip_gre.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet/ip_gre.c,v
> retrieving revision 1.44
> diff -u -p -u -p -r1.44 ip_gre.c
> --- sys/netinet/ip_gre.c 9 Jul 2011 00:47:18 -0000 1.44
> +++ sys/netinet/ip_gre.c 27 Aug 2013 22:27:28 -0000
> @@ -66,6 +66,10 @@
> #error "ip_gre used without inet"
> #endif
>
> +#ifdef INET6
> +#include <netinet6/in6_var.h>
> +#endif
> +
> #ifdef MPLS
> #include <netmpls/mpls.h>
> #endif
> Index: sys/netinet/ip_ipip.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet/ip_ipip.c,v
> retrieving revision 1.48
> diff -u -p -u -p -r1.48 ip_ipip.c
> --- sys/netinet/ip_ipip.c 15 Mar 2012 16:37:11 -0000 1.48
> +++ sys/netinet/ip_ipip.c 27 Aug 2013 22:27:28 -0000
> @@ -68,6 +68,10 @@
> #include <netinet/ip_ipsp.h>
> #include <netinet/ip_ipip.h>
>
> +#ifdef INET6
> +#include <netinet6/in6_var.h>
> +#endif
> +
> #include "bpfilter.h"
>
> #if NPF > 0
> Index: sys/netinet/ipsec_input.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet/ipsec_input.c,v
> retrieving revision 1.115
> diff -u -p -u -p -r1.115 ipsec_input.c
> --- sys/netinet/ipsec_input.c 1 Jun 2013 16:29:00 -0000 1.115
> +++ sys/netinet/ipsec_input.c 27 Aug 2013 22:27:28 -0000
> @@ -68,6 +68,7 @@
> #ifndef INET
> #include <netinet/in.h>
> #endif
> +#include <netinet6/in6_var.h>
> #include <netinet/ip6.h>
> #include <netinet6/ip6_var.h>
> #include <netinet6/ip6protosw.h>
> Index: sys/netinet/tcp_usrreq.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet/tcp_usrreq.c,v
> retrieving revision 1.114
> diff -u -p -u -p -r1.114 tcp_usrreq.c
> --- sys/netinet/tcp_usrreq.c 12 Aug 2013 21:57:16 -0000 1.114
> +++ sys/netinet/tcp_usrreq.c 27 Aug 2013 22:27:28 -0000
> @@ -100,6 +100,10 @@
> #include <netinet/tcpip.h>
> #include <netinet/tcp_debug.h>
>
> +#ifdef INET6
> +#include <netinet6/in6_var.h>
> +#endif
> +
> #ifndef TCP_SENDSPACE
> #define TCP_SENDSPACE 1024*16
> #endif
> Index: sys/netinet/udp_usrreq.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet/udp_usrreq.c,v
> retrieving revision 1.165
> diff -u -p -u -p -r1.165 udp_usrreq.c
> --- sys/netinet/udp_usrreq.c 31 Jul 2013 15:41:52 -0000 1.165
> +++ sys/netinet/udp_usrreq.c 27 Aug 2013 22:27:28 -0000
> @@ -99,6 +99,7 @@
> #ifndef INET
> #include <netinet/in.h>
> #endif
> +#include <netinet6/in6_var.h>
> #include <netinet6/ip6_var.h>
> #include <netinet6/ip6protosw.h>
> #endif /* INET6 */
> Index: sys/netinet6/dest6.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet6/dest6.c,v
> retrieving revision 1.11
> diff -u -p -u -p -r1.11 dest6.c
> --- sys/netinet6/dest6.c 11 Jun 2008 19:00:50 -0000 1.11
> +++ sys/netinet6/dest6.c 27 Aug 2013 22:27:28 -0000
> @@ -45,7 +45,6 @@
> #include <net/route.h>
>
> #include <netinet/in.h>
> -#include <netinet/in_var.h>
> #include <netinet/ip6.h>
> #include <netinet6/ip6_var.h>
> #include <netinet/icmp6.h>
> Index: sys/netinet6/frag6.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet6/frag6.c,v
> retrieving revision 1.48
> diff -u -p -u -p -r1.48 frag6.c
> --- sys/netinet6/frag6.c 27 Aug 2013 08:20:32 -0000 1.48
> +++ sys/netinet6/frag6.c 29 Aug 2013 20:49:43 -0000
> @@ -46,7 +46,7 @@
> #include <net/route.h>
>
> #include <netinet/in.h>
> -#include <netinet/in_var.h>
> +#include <netinet6/in6_var.h>
> #include <netinet/ip6.h>
> #include <netinet6/ip6_var.h>
> #include <netinet/icmp6.h>
> Index: sys/netinet6/icmp6.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet6/icmp6.c,v
> retrieving revision 1.130
> diff -u -p -u -p -r1.130 icmp6.c
> --- sys/netinet6/icmp6.c 5 Jun 2013 15:22:32 -0000 1.130
> +++ sys/netinet6/icmp6.c 27 Aug 2013 22:27:28 -0000
> @@ -82,9 +82,9 @@
> #include <net/if_types.h>
>
> #include <netinet/in.h>
> -#include <netinet/in_var.h>
> #include <netinet/in_systm.h>
> #include <netinet/ip.h>
> +#include <netinet6/in6_var.h>
> #include <netinet/ip6.h>
> #include <netinet6/ip6_var.h>
> #include <netinet/icmp6.h>
> Index: sys/netinet6/in6.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet6/in6.c,v
> retrieving revision 1.118
> diff -u -p -u -p -r1.118 in6.c
> --- sys/netinet6/in6.c 26 Aug 2013 07:15:58 -0000 1.118
> +++ sys/netinet6/in6.c 27 Aug 2013 22:27:28 -0000
> @@ -82,12 +82,12 @@
> #include <net/if_dl.h>
>
> #include <netinet/in.h>
> -#include <netinet/in_var.h>
> #include <netinet/if_ether.h>
> #if NBRIDGE > 0
> #include <net/if_bridge.h>
> #endif
>
> +#include <netinet6/in6_var.h>
> #include <netinet/ip6.h>
> #include <netinet6/ip6_var.h>
> #include <netinet6/nd6.h>
> Index: sys/netinet6/in6_ifattach.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet6/in6_ifattach.c,v
> retrieving revision 1.61
> diff -u -p -u -p -r1.61 in6_ifattach.c
> --- sys/netinet6/in6_ifattach.c 31 May 2013 15:04:23 -0000 1.61
> +++ sys/netinet6/in6_ifattach.c 27 Aug 2013 22:27:28 -0000
> @@ -46,9 +46,9 @@
> #include <net/route.h>
>
> #include <netinet/in.h>
> -#include <netinet/in_var.h>
> #include <netinet/if_ether.h>
>
> +#include <netinet6/in6_var.h>
> #include <netinet/ip6.h>
> #include <netinet6/ip6_var.h>
> #include <netinet6/in6_ifattach.h>
> Index: sys/netinet6/in6_proto.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet6/in6_proto.c,v
> retrieving revision 1.67
> diff -u -p -u -p -r1.67 in6_proto.c
> --- sys/netinet6/in6_proto.c 24 Apr 2013 10:17:08 -0000 1.67
> +++ sys/netinet6/in6_proto.c 27 Aug 2013 22:27:28 -0000
> @@ -77,7 +77,6 @@
>
> #include <netinet/in.h>
> #include <netinet/in_systm.h>
> -#include <netinet/in_var.h>
> #include <netinet/ip.h>
> #include <netinet/ip_var.h>
> #include <netinet/in_pcb.h>
> @@ -99,8 +98,8 @@
> #include <netinet6/pim6_var.h>
> #endif
>
> +#include <netinet6/in6_var.h>
> #include <netinet6/nd6.h>
> -
> #include <netinet6/ip6protosw.h>
>
> #include "gif.h"
> Index: sys/netinet6/in6_src.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet6/in6_src.c,v
> retrieving revision 1.32
> diff -u -p -u -p -r1.32 in6_src.c
> --- sys/netinet6/in6_src.c 31 May 2013 15:04:24 -0000 1.32
> +++ sys/netinet6/in6_src.c 27 Aug 2013 22:27:28 -0000
> @@ -76,7 +76,6 @@
> #include <net/route.h>
>
> #include <netinet/in.h>
> -#include <netinet/in_var.h>
> #include <netinet/in_systm.h>
> #include <netinet/ip.h>
> #include <netinet/in_pcb.h>
> Index: sys/netinet6/ip6_divert.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet6/ip6_divert.c,v
> retrieving revision 1.13
> diff -u -p -u -p -r1.13 ip6_divert.c
> --- sys/netinet6/ip6_divert.c 26 Jun 2013 09:12:40 -0000 1.13
> +++ sys/netinet6/ip6_divert.c 27 Aug 2013 22:27:28 -0000
> @@ -31,7 +31,6 @@
>
> #include <netinet/in.h>
> #include <netinet/in_systm.h>
> -#include <netinet/in_var.h>
> #include <netinet/ip.h>
> #include <netinet/ip_var.h>
> #include <netinet/in_pcb.h>
> Index: sys/netinet6/ip6_forward.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet6/ip6_forward.c,v
> retrieving revision 1.61
> diff -u -p -u -p -r1.61 ip6_forward.c
> --- sys/netinet6/ip6_forward.c 31 Jul 2013 15:41:52 -0000 1.61
> +++ sys/netinet6/ip6_forward.c 27 Aug 2013 22:27:28 -0000
> @@ -49,8 +49,8 @@
> #include <net/route.h>
>
> #include <netinet/in.h>
> -#include <netinet/in_var.h>
> #include <netinet/ip_var.h>
> +#include <netinet6/in6_var.h>
> #include <netinet/ip6.h>
> #include <netinet6/ip6_var.h>
> #include <netinet/icmp6.h>
> Index: sys/netinet6/ip6_input.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet6/ip6_input.c,v
> retrieving revision 1.114
> diff -u -p -u -p -r1.114 ip6_input.c
> --- sys/netinet6/ip6_input.c 26 Jun 2013 09:12:40 -0000 1.114
> +++ sys/netinet6/ip6_input.c 27 Aug 2013 22:27:28 -0000
> @@ -113,7 +113,6 @@
> #endif
>
> #if NCARP > 0
> -#include <netinet/in_var.h>
> #include <netinet/ip_carp.h>
> #endif
>
> Index: sys/netinet6/ip6_mroute.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet6/ip6_mroute.c,v
> retrieving revision 1.62
> diff -u -p -u -p -r1.62 ip6_mroute.c
> --- sys/netinet6/ip6_mroute.c 31 May 2013 15:04:24 -0000 1.62
> +++ sys/netinet6/ip6_mroute.c 27 Aug 2013 22:27:28 -0000
> @@ -100,9 +100,9 @@
> #include <net/raw_cb.h>
>
> #include <netinet/in.h>
> -#include <netinet/in_var.h>
> #include <netinet/icmp6.h>
>
> +#include <netinet6/in6_var.h>
> #include <netinet/ip6.h>
> #include <netinet6/ip6_var.h>
> #include <netinet6/ip6_mroute.h>
> Index: sys/netinet6/ip6_output.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet6/ip6_output.c,v
> retrieving revision 1.143
> diff -u -p -u -p -r1.143 ip6_output.c
> --- sys/netinet6/ip6_output.c 31 Jul 2013 15:41:52 -0000 1.143
> +++ sys/netinet6/ip6_output.c 27 Aug 2013 22:27:28 -0000
> @@ -77,13 +77,13 @@
> #include <net/route.h>
>
> #include <netinet/in.h>
> -#include <netinet/in_var.h>
> #include <netinet/in_systm.h>
> #include <netinet/ip.h>
> #include <netinet/in_pcb.h>
> #include <netinet/udp.h>
> #include <netinet/tcp.h>
>
> +#include <netinet6/in6_var.h>
> #include <netinet/ip6.h>
> #include <netinet/icmp6.h>
> #include <netinet6/ip6_var.h>
> Index: sys/netinet6/mld6.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet6/mld6.c,v
> retrieving revision 1.28
> diff -u -p -u -p -r1.28 mld6.c
> --- sys/netinet6/mld6.c 24 Nov 2011 17:39:55 -0000 1.28
> +++ sys/netinet6/mld6.c 27 Aug 2013 22:27:28 -0000
> @@ -76,7 +76,7 @@
> #include <net/if.h>
>
> #include <netinet/in.h>
> -#include <netinet/in_var.h>
> +#include <netinet6/in6_var.h>
> #include <netinet/ip6.h>
> #include <netinet6/ip6_var.h>
> #include <netinet/icmp6.h>
> Index: sys/netinet6/nd6_nbr.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet6/nd6_nbr.c,v
> retrieving revision 1.67
> diff -u -p -u -p -r1.67 nd6_nbr.c
> --- sys/netinet6/nd6_nbr.c 31 May 2013 15:04:24 -0000 1.67
> +++ sys/netinet6/nd6_nbr.c 27 Aug 2013 22:27:28 -0000
> @@ -50,7 +50,6 @@
> #include <net/route.h>
>
> #include <netinet/in.h>
> -#include <netinet/in_var.h>
> #include <netinet6/in6_var.h>
> #include <netinet/ip6.h>
> #include <netinet6/ip6_var.h>
> Index: sys/netinet6/raw_ip6.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet6/raw_ip6.c,v
> retrieving revision 1.58
> diff -u -p -u -p -r1.58 raw_ip6.c
> --- sys/netinet6/raw_ip6.c 4 Jun 2013 19:11:52 -0000 1.58
> +++ sys/netinet6/raw_ip6.c 27 Aug 2013 22:27:28 -0000
> @@ -81,7 +81,7 @@
> #endif
>
> #include <netinet/in.h>
> -#include <netinet/in_var.h>
> +#include <netinet6/in6_var.h>
> #include <netinet/ip6.h>
> #include <netinet6/ip6_var.h>
> #ifdef MROUTING
> Index: sys/netinet6/udp6_output.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netinet6/udp6_output.c,v
> retrieving revision 1.19
> diff -u -p -u -p -r1.19 udp6_output.c
> --- sys/netinet6/udp6_output.c 28 Mar 2013 16:45:16 -0000 1.19
> +++ sys/netinet6/udp6_output.c 27 Aug 2013 22:27:28 -0000
> @@ -77,7 +77,7 @@
> #include <net/if_types.h>
>
> #include <netinet/in.h>
> -#include <netinet/in_var.h>
> +#include <netinet6/in6_var.h>
> #include <netinet/in_systm.h>
> #include <netinet/ip.h>
> #include <netinet/ip_var.h>
> Index: sys/netmpls/mpls_input.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/netmpls/mpls_input.c,v
> retrieving revision 1.35
> diff -u -p -u -p -r1.35 mpls_input.c
> --- sys/netmpls/mpls_input.c 10 Jul 2013 07:30:39 -0000 1.35
> +++ sys/netmpls/mpls_input.c 27 Aug 2013 22:27:28 -0000
> @@ -38,6 +38,7 @@
> #endif
>
> #ifdef INET6
> +#include <netinet6/in6_var.h>
> #include <netinet/ip6.h>
> #ifndef INET
> #include <netinet/in.h>
> Index: sys/nfs/nfs_vnops.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/sys/nfs/nfs_vnops.c,v
> retrieving revision 1.145
> diff -u -p -u -p -r1.145 nfs_vnops.c
> --- sys/nfs/nfs_vnops.c 13 Aug 2013 05:52:25 -0000 1.145
> +++ sys/nfs/nfs_vnops.c 27 Aug 2013 22:27:28 -0000
> @@ -78,7 +78,6 @@
>
> #include <net/if.h>
> #include <netinet/in.h>
> -#include <netinet/in_var.h>
>
> #include <dev/rndvar.h>
>
> Index: usr.sbin/ppp/ppp/iface.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/ppp/ppp/iface.c,v
> retrieving revision 1.30
> diff -u -p -u -p -r1.30 iface.c
> --- usr.sbin/ppp/ppp/iface.c 23 Jan 2012 09:13:16 -0000 1.30
> +++ usr.sbin/ppp/ppp/iface.c 27 Aug 2013 23:25:38 -0000
> @@ -39,6 +39,7 @@
> #include <netinet/in_var.h>
> #include <netinet/ip.h>
> #ifndef NOINET6
> +#include <netinet6/in6_var.h>
> #include <netinet6/nd6.h>
> #endif
> #include <sys/un.h>
> Index: usr.sbin/route6d/route6d.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/route6d/route6d.c,v
> retrieving revision 1.58
> diff -u -p -u -p -r1.58 route6d.c
> --- usr.sbin/route6d/route6d.c 26 Aug 2013 14:15:08 -0000 1.58
> +++ usr.sbin/route6d/route6d.c 27 Aug 2013 23:25:00 -0000
> @@ -56,7 +56,7 @@
> #include <net/if.h>
> #include <net/route.h>
> #include <netinet/in.h>
> -#include <netinet/in_var.h>
> +#include <netinet6/in6_var.h>
> #include <netinet/ip6.h>
> #include <netinet/udp.h>
> #include <netdb.h>
> Index: usr.sbin/rtadvd/config.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/rtadvd/config.c,v
> retrieving revision 1.39
> diff -u -p -u -p -r1.39 config.c
> --- usr.sbin/rtadvd/config.c 1 Jun 2013 21:57:12 -0000 1.39
> +++ usr.sbin/rtadvd/config.c 27 Aug 2013 23:26:40 -0000
> @@ -41,7 +41,7 @@
> #include <net/if_dl.h>
>
> #include <netinet/in.h>
> -#include <netinet/in_var.h>
> +#include <netinet6/in6_var.h>
> #include <netinet/ip6.h>
> #include <netinet6/ip6_var.h>
> #include <netinet/icmp6.h>
> Index: usr.sbin/rtadvd/rrenum.c
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/rtadvd/rrenum.c,v
> retrieving revision 1.15
> diff -u -p -u -p -r1.15 rrenum.c
> --- usr.sbin/rtadvd/rrenum.c 18 May 2013 07:34:59 -0000 1.15
> +++ usr.sbin/rtadvd/rrenum.c 27 Aug 2013 23:26:59 -0000
> @@ -38,7 +38,7 @@
> #include <net/if.h>
> #include <net/route.h>
> #include <netinet/in.h>
> -#include <netinet/in_var.h>
> +#include <netinet6/in6_var.h>
> #include <netinet/icmp6.h>
>
> #include <arpa/inet.h>
>
