Remove the number of in6_var.h inclusions by moving some functions and

global variables to in6.h.

ok deraadt@

9 files changed, 9 insertions, 30 deletions

diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index b78857354cd..5e873cb8c36 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_loop.c,v 1.52 2013/10/23 15:12:42 mpi Exp $	*/
+/*	$OpenBSD: if_loop.c,v 1.53 2013/10/24 11:31:43 mpi Exp $	*/
 /*	$NetBSD: if_loop.c,v 1.15 1996/05/07 02:40:33 thorpej Exp $	*/
 
 /*
@@ -132,7 +132,6 @@
 #ifndef INET
 #include <netinet/in.h>
 #endif
-#include <netinet6/in6_var.h>
 #include <netinet/ip6.h>
 #endif
 
diff --git a/sys/net/if_mpe.c b/sys/net/if_mpe.c
index eaf75b562a5..9270e7beeb3 100644
--- a/sys/net/if_mpe.c
+++ b/sys/net/if_mpe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_mpe.c,v 1.31 2013/10/23 15:12:42 mpi Exp $ */
+/* $OpenBSD: if_mpe.c,v 1.32 2013/10/24 11:31:43 mpi Exp $ */
 
 /*
  * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -36,7 +36,6 @@
 #endif
 
 #ifdef INET6
-#include <netinet6/in6_var.h>
 #include <netinet/ip6.h>
 #ifndef INET
 #include <netinet/in.h>
diff --git a/sys/net/if_pflog.c b/sys/net/if_pflog.c
index 369b8d7be57..5be313f307a 100644
--- a/sys/net/if_pflog.c
+++ b/sys/net/if_pflog.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pflog.c,v 1.56 2013/10/23 15:12:42 mpi Exp $	*/
+/*	$OpenBSD: if_pflog.c,v 1.57 2013/10/24 11:31:43 mpi Exp $	*/
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and 
@@ -62,9 +62,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>
 #endif /* INET6 */
 
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 66a61597b2d..5dd6c1d9368 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_spppsubr.c,v 1.108 2013/10/01 20:22:13 sf Exp $	*/
+/*	$OpenBSD: if_spppsubr.c,v 1.109 2013/10/24 11:31:43 mpi Exp $	*/
 /*
  * Synchronous PPP/Cisco link level subroutines.
  * Keepalive protocol implemented in both Cisco and PPP modes.
@@ -83,10 +83,6 @@
 # endif
 #endif
 
-#ifdef INET6
-#include <netinet6/in6_var.h>
-#endif
-
 #include <net/if_sppp.h>
 
 #if defined (__FreeBSD__)
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index a258b99fc93..d36479b438e 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tun.c,v 1.119 2013/10/23 15:12:42 mpi Exp $	*/
+/*	$OpenBSD: if_tun.c,v 1.120 2013/10/24 11:31:43 mpi Exp $	*/
 /*	$NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $	*/
 
 /*
@@ -69,10 +69,6 @@
 #include <netinet/if_ether.h>
 #endif
 
-#ifdef INET6
-#include <netinet6/in6_var.h>
-#endif
-
 #ifdef PIPEX
 #include <net/pipex.h>
 #endif
diff --git a/sys/net/pf_lb.c b/sys/net/pf_lb.c
index f313bfade01..58bd7af9078 100644
--- a/sys/net/pf_lb.c
+++ b/sys/net/pf_lb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_lb.c,v 1.27 2013/10/23 15:12:42 mpi Exp $ */
+/*	$OpenBSD: pf_lb.c,v 1.28 2013/10/24 11:31:43 mpi Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -86,11 +86,9 @@
 #endif /* NPFSYNC > 0 */
 
 #ifdef INET6
-#include <netinet6/in6_var.h>
 #include <netinet/ip6.h>
 #include <netinet/in_pcb.h>
 #include <netinet/icmp6.h>
-#include <netinet6/nd6.h>
 #endif /* INET6 */
 
 
diff --git a/sys/net/pf_osfp.c b/sys/net/pf_osfp.c
index eff891848b7..e778ecca255 100644
--- a/sys/net/pf_osfp.c
+++ b/sys/net/pf_osfp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_osfp.c,v 1.26 2011/09/28 17:15:45 bluhm Exp $ */
+/*	$OpenBSD: pf_osfp.c,v 1.27 2013/10/24 11:31:43 mpi Exp $ */
 
 /*
  * Copyright (c) 2003 Mike Frantzen <frantzen@w4g.org>
@@ -35,9 +35,6 @@
 #include <net/pfvar.h>
 
 #include <netinet/ip6.h>
-#ifdef _KERNEL
-#include <netinet6/in6_var.h>
-#endif
 
 
 #ifdef _KERNEL
diff --git a/sys/net/pfkeyv2_convert.c b/sys/net/pfkeyv2_convert.c
index 3ba2f29177d..47d0dc4b027 100644
--- a/sys/net/pfkeyv2_convert.c
+++ b/sys/net/pfkeyv2_convert.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfkeyv2_convert.c,v 1.41 2013/10/12 11:55:46 henning Exp $	*/
+/*	$OpenBSD: pfkeyv2_convert.c,v 1.42 2013/10/24 11:31:43 mpi Exp $	*/
 /*
  * The author of this code is Angelos D. Keromytis (angelos@keromytis.org)
  *
@@ -108,9 +108,6 @@
 #endif
 
 #include <netinet/ip_ipsp.h>
-#ifdef INET6
-#include <netinet6/in6_var.h>
-#endif
 #include <net/pfkeyv2.h>
 #include <crypto/cryptodev.h>
 #include <crypto/xform.h>
diff --git a/sys/net/pipex.c b/sys/net/pipex.c
index ad5122cdc5e..89cb33c71b0 100644
--- a/sys/net/pipex.c
+++ b/sys/net/pipex.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pipex.c,v 1.46 2013/10/23 15:12:42 mpi Exp $	*/
+/*	$OpenBSD: pipex.c,v 1.47 2013/10/24 11:31:43 mpi Exp $	*/
 
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -68,7 +68,6 @@
 #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