Remove various external variable declaration from sources files and

move them to the corresponding header with an appropriate comment if
necessary.

ok guenther@

21 files changed, 55 insertions, 80 deletions

diff --git a/sys/net/if_pflow.c b/sys/net/if_pflow.c
index 28644c9c204..f7faadca460 100644
--- a/sys/net/if_pflow.c
+++ b/sys/net/if_pflow.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pflow.c,v 1.27 2013/03/28 23:10:05 tedu Exp $	*/
+/*	$OpenBSD: if_pflow.c,v 1.28 2013/04/10 08:50:59 mpi Exp $	*/
 
 /*
  * Copyright (c) 2011 Florian Obser <florian@narrans.de>
@@ -106,10 +106,6 @@ struct if_clone	pflow_cloner =
     IF_CLONE_INITIALIZER("pflow", pflow_clone_create,
     pflow_clone_destroy);
 
-/* from in_pcb.c */
-extern int ipport_hifirstauto;
-extern int ipport_hilastauto;
-
 /* from udp_usrreq.c */
 extern int udpcksum;
 
diff --git a/sys/net/if_pppoe.c b/sys/net/if_pppoe.c
index 170b6858590..7991871a790 100644
--- a/sys/net/if_pppoe.c
+++ b/sys/net/if_pppoe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_pppoe.c,v 1.36 2013/03/28 16:45:16 tedu Exp $ */
+/* $OpenBSD: if_pppoe.c,v 1.37 2013/04/10 08:50:59 mpi Exp $ */
 /* $NetBSD: if_pppoe.c,v 1.51 2003/11/28 08:56:48 keihan Exp $ */
 
 /*
@@ -152,8 +152,6 @@ struct pppoe_softc {
 struct ifqueue pppoediscinq;
 struct ifqueue pppoeinq;
 
-extern int sppp_ioctl(struct ifnet *, unsigned long, void *);
-
 /* input routines */
 static void pppoe_disc_input(struct mbuf *);
 static void pppoe_dispatch_disc_pkt(struct mbuf *, int);
diff --git a/sys/net/pf.c b/sys/net/pf.c
index c8baaf09b9a..e98f265405a 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.821 2013/03/29 13:16:14 bluhm Exp $ */
+/*	$OpenBSD: pf.c,v 1.822 2013/04/10 08:50:59 mpi Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -89,7 +89,7 @@
 
 #ifdef INET6
 #include <netinet/ip6.h>
-#include <netinet/in_pcb.h>
+#include <netinet6/ip6_var.h>
 #include <netinet/icmp6.h>
 #include <netinet6/nd6.h>
 #include <netinet6/ip6_divert.h>
@@ -5712,9 +5712,7 @@ pf_routable(struct pf_addr *addr, sa_family_t af, struct pfi_kif *kif,
 	struct sockaddr_in	*dst;
 	int			 ret = 1;
 	int			 check_mpath;
-	extern int		 ipmultipath;
 #ifdef INET6
-	extern int		 ip6_multipath;
 	struct sockaddr_in6	*dst6;
 	struct route_in6	 ro;
 #else
diff --git a/sys/net/pfkeyv2_parsemessage.c b/sys/net/pfkeyv2_parsemessage.c
index 2d8f6d26eaa..4be905bb45a 100644
--- a/sys/net/pfkeyv2_parsemessage.c
+++ b/sys/net/pfkeyv2_parsemessage.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfkeyv2_parsemessage.c,v 1.46 2012/06/29 14:48:04 mikeb Exp $	*/
+/*	$OpenBSD: pfkeyv2_parsemessage.c,v 1.47 2013/04/10 08:50:59 mpi Exp $	*/
 
 /*
  *	@(#)COPYRIGHT	1.1 (NRL) 17 January 1995
@@ -76,6 +76,7 @@
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 #include <netinet/ip_ipsp.h>
+#include <netinet/ip_var.h>
 #include <net/pfkeyv2.h>
 
 #if NPF > 0
@@ -83,8 +84,6 @@
 #include <net/pfvar.h>
 #endif
 
-extern int encdebug;
-
 #ifdef ENCDEBUG
 #define DPRINTF(x)	if (encdebug) printf x
 #else
diff --git a/sys/net/radix_mpath.c b/sys/net/radix_mpath.c
index 7e2bba7349b..317510a4b8b 100644
--- a/sys/net/radix_mpath.c
+++ b/sys/net/radix_mpath.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: radix_mpath.c,v 1.18 2010/05/07 13:33:16 claudio Exp $	*/
+/*	$OpenBSD: radix_mpath.c,v 1.19 2013/04/10 08:50:59 mpi Exp $	*/
 /*	$KAME: radix_mpath.c,v 1.13 2002/10/28 21:05:59 itojun Exp $	*/
 
 /*
@@ -47,9 +47,12 @@
 #include <dev/rndvar.h>
 
 #include <netinet/in.h>
+#include <netinet/ip_var.h>
 
-extern int ipmultipath;
-extern int ip6_multipath;
+#ifdef INET6
+#include <netinet/ip6.h>
+#include <netinet6/ip6_var.h>
+#endif
 
 u_int32_t rn_mpath_hash(struct route *, u_int32_t *);
 
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index f937cd4bdd7..fb7ee487365 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: igmp.c,v 1.31 2010/04/20 22:05:43 tedu Exp $	*/
+/*	$OpenBSD: igmp.c,v 1.32 2013/04/10 08:50:59 mpi Exp $	*/
 /*	$NetBSD: igmp.c,v 1.15 1996/02/13 23:41:25 christos Exp $	*/
 
 /*
@@ -563,9 +563,6 @@ igmp_sendpkt(struct in_multi *inm, int type, in_addr_t addr)
 	struct igmp *igmp;
 	struct ip *ip;
 	struct ip_moptions imo;
-#ifdef MROUTING
-	extern struct socket *ip_mrouter;
-#endif /* MROUTING */
 
 	MGETHDR(m, M_DONTWAIT, MT_HEADER);
 	if (m == NULL)
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index 3368c87ccd3..b0b976f04b1 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_icmp.c,v 1.96 2012/09/18 12:35:51 blambert Exp $	*/
+/*	$OpenBSD: ip_icmp.c,v 1.97 2013/04/10 08:50:59 mpi Exp $	*/
 /*	$NetBSD: ip_icmp.c,v 1.19 1996/02/13 23:42:22 christos Exp $	*/
 
 /*
@@ -125,6 +125,9 @@ void icmp_mtudisc_timeout(struct rtentry *, struct rttimer *);
 int icmp_ratelimit(const struct in_addr *, const int, const int);
 void icmp_redirect_timeout(struct rtentry *, struct rttimer *);
 
+/* from ip_input.c */
+extern	u_char ip_protox[];
+
 extern	struct protosw inetsw[];
 
 void
@@ -312,8 +315,6 @@ icmp_input(struct mbuf *m, ...)
 	struct in_ifaddr *ia;
 	void *(*ctlfunc)(int, struct sockaddr *, u_int, void *);
 	int code;
-	extern u_char ip_protox[];
-	extern int ipforwarding;
 	int hlen;
 	va_list ap;
 	struct rtentry *rt;
@@ -1007,7 +1008,6 @@ icmp_mtudisc_timeout(struct rtentry *rt, struct rttimer *r)
 	if ((rt->rt_flags & (RTF_DYNAMIC | RTF_HOST)) ==
 	    (RTF_DYNAMIC | RTF_HOST)) {
 		void *(*ctlfunc)(int, struct sockaddr *, u_int, void *);
-		extern u_char ip_protox[];
 		struct sockaddr_in sa;
 		struct rt_addrinfo info;
 
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 6631e8f0347..93ccbfac78d 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_input.c,v 1.207 2013/04/09 08:35:38 mpi Exp $	*/
+/*	$OpenBSD: ip_input.c,v 1.208 2013/04/10 08:50:59 mpi Exp $	*/
 /*	$NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $	*/
 
 /*
@@ -117,12 +117,7 @@ int	ip_maxqueue = 300;
 int	ip_frags = 0;
 
 /* from in_pcb.c */
-extern int ipport_firstauto;
-extern int ipport_lastauto;
-extern int ipport_hifirstauto;
-extern int ipport_hilastauto;
 extern struct baddynamicports baddynamicports;
-extern int la_hold_total;
 
 int *ipctl_vars[IPCTL_MAXID] = IPCTL_VARS;
 
@@ -386,8 +381,6 @@ ipv4_input(struct mbuf *m)
 	if (IN_MULTICAST(ip->ip_dst.s_addr)) {
 		struct in_multi *inm;
 #ifdef MROUTING
-		extern struct socket *ip_mrouter;
-
 		if (ipmforwarding && ip_mrouter) {
 			if (m->m_flags & M_EXT) {
 				if ((m = m_pullup(m, hlen)) == NULL) {
diff --git a/sys/netinet/ip_ipsp.c b/sys/netinet/ip_ipsp.c
index c1b14dc0fbd..ee95d666529 100644
--- a/sys/netinet/ip_ipsp.c
+++ b/sys/netinet/ip_ipsp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ipsp.c,v 1.187 2013/04/09 08:35:38 mpi Exp $	*/
+/*	$OpenBSD: ip_ipsp.c,v 1.188 2013/04/10 08:50:59 mpi Exp $	*/
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr),
@@ -64,6 +64,7 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
+#include <netinet/ip_var.h>
 #endif /* INET */
 
 #ifdef INET6
@@ -97,7 +98,6 @@ void		tdb_soft_timeout(void *v);
 void		tdb_soft_firstuse(void *v);
 int		tdb_hash(u_int, u_int32_t, union sockaddr_union *, u_int8_t);
 
-extern int encdebug;
 int ipsec_in_use = 0;
 u_int64_t ipsec_last_added = 0;
 
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 9ebf4010d45..943e6d35aa2 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_output.c,v 1.236 2013/04/09 08:35:38 mpi Exp $	*/
+/*	$OpenBSD: ip_output.c,v 1.237 2013/04/10 08:50:59 mpi Exp $	*/
 /*	$NetBSD: ip_output.c,v 1.28 1996/02/13 23:43:07 christos Exp $	*/
 
 /*
@@ -519,8 +519,6 @@ reroute:
 			 * above, will be forwarded by the ip_input() routine,
 			 * if necessary.
 			 */
-			extern struct socket *ip_mrouter;
-
 			if (ipmforwarding && ip_mrouter &&
 			    (flags & IP_FORWARDING) == 0) {
 				if (ip_mforward(m, ifp) != 0) {
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index fe60ebd6af8..9103b99d3bf 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_var.h,v 1.44 2012/07/16 18:05:36 markus Exp $	*/
+/*	$OpenBSD: ip_var.h,v 1.45 2013/04/10 08:50:59 mpi Exp $	*/
 /*	$NetBSD: ip_var.h,v 1.16 1996/02/13 23:43:20 christos Exp $	*/
 
 /*
@@ -148,9 +148,25 @@ struct	ipstat {
 extern struct ipstat ipstat;
 extern LIST_HEAD(ipqhead, ipq)	ipq;	/* ip reass. queue */
 extern int ip_defttl;			/* default IP ttl */
+#ifdef MROUTING
+extern struct socket *ip_mrouter;	/* multicast routing daemon */
+#endif
 
 extern int ip_mtudisc;			/* mtu discovery */
 extern u_int ip_mtudisc_timeout;	/* seconds to timeout mtu discovery */
+
+extern int ipport_firstauto;		/* min port for port allocation */
+extern int ipport_lastauto;		/* max port for port allocation */
+extern int ipport_hifirstauto;		/* min dynamic/private port number */
+extern int ipport_hilastauto;		/* max dynamic/private port number */
+extern int encdebug;			/* enable message reporting */
+extern int ipforwarding;		/* enable IP forwarding */
+#ifdef MROUTING
+extern int ipmforwarding;		/* enable multicast forwarding */
+#endif
+extern int ipmultipath;			/* enable multipath routing */
+extern int la_hold_total;
+
 extern struct rttimer_queue *ip_mtudisc_timeout_q;
 extern struct pool ipqent_pool;
 struct inpcb;
diff --git a/sys/netinet/ipsec_input.c b/sys/netinet/ipsec_input.c
index c19db72558c..3c371e98c3d 100644
--- a/sys/netinet/ipsec_input.c
+++ b/sys/netinet/ipsec_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipsec_input.c,v 1.111 2013/03/31 00:59:52 bluhm Exp $	*/
+/*	$OpenBSD: ipsec_input.c,v 1.112 2013/04/10 08:50:59 mpi Exp $	*/
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -952,7 +952,6 @@ void *
 ipsec_common_ctlinput(u_int rdomain, int cmd, struct sockaddr *sa,
     void *v, int proto)
 {
-	extern u_int ip_mtudisc_timeout;
 	struct ip *ip = v;
 	int s;
 
diff --git a/sys/netinet/ipsec_output.c b/sys/netinet/ipsec_output.c
index 4b7183c9493..153cdcb7be4 100644
--- a/sys/netinet/ipsec_output.c
+++ b/sys/netinet/ipsec_output.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipsec_output.c,v 1.47 2013/03/28 23:10:06 tedu Exp $ */
+/*	$OpenBSD: ipsec_output.c,v 1.48 2013/04/10 08:50:59 mpi Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
  *
@@ -375,8 +375,6 @@ ipsp_process_packet(struct mbuf *m, struct tdb *tdb, int af, int tunalready)
 	/* Non expansion policy for IPCOMP */
 	if (tdb->tdb_sproto == IPPROTO_IPCOMP) {
 		if ((m->m_pkthdr.len - i) < tdb->tdb_compalgxform->minlen) {
-			extern struct ipcompstat ipcompstat;
-
 			/* No need to compress, leave the packet untouched */
 			ipcompstat.ipcomps_minlen++;
 			return ipsp_process_done(m, tdb);
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index dfd498b12c7..7478906d4f0 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: raw_ip.c,v 1.65 2013/04/02 18:27:47 bluhm Exp $	*/
+/*	$OpenBSD: raw_ip.c,v 1.66 2013/04/10 08:50:59 mpi Exp $	*/
 /*	$NetBSD: raw_ip.c,v 1.25 1996/02/18 18:58:33 christos Exp $	*/
 
 /*
@@ -399,9 +399,7 @@ rip_usrreq(struct socket *so, int req, struct mbuf *m, struct mbuf *nam,
 	struct inpcb *inp = sotoinpcb(so);
 	int error = 0;
 	int s;
-#ifdef MROUTING
-	extern struct socket *ip_mrouter;
-#endif
+
 	if (req == PRU_CONTROL)
 		return (in_control(so, (u_long)m, (caddr_t)nam,
 		    (struct ifnet *)control));
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index a98381ebb03..f2b74f845dd 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_input.c,v 1.259 2013/04/02 18:27:47 bluhm Exp $	*/
+/*	$OpenBSD: tcp_input.c,v 1.260 2013/04/10 08:50:59 mpi Exp $	*/
 /*	$NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $	*/
 
 /*
@@ -121,8 +121,6 @@ struct  tcpipv6hdr tcp_saveti6;
 int	tcprexmtthresh = 3;
 int	tcptv_keep_init = TCPTV_KEEP_INIT;
 
-extern u_long sb_max;
-
 int tcp_rst_ppslim = 100;		/* 100pps */
 int tcp_rst_ppslim_count = 0;
 struct timeval tcp_rst_ppslim_last;
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 9954687ff55..1038cfb61ad 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_subr.c,v 1.117 2013/04/02 18:27:47 bluhm Exp $	*/
+/*	$OpenBSD: tcp_subr.c,v 1.118 2013/04/10 08:50:59 mpi Exp $	*/
 /*	$NetBSD: tcp_subr.c,v 1.22 1996/02/13 23:44:00 christos Exp $	*/
 
 /*
@@ -84,6 +84,7 @@
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
+#include <netinet/in_var.h>
 #include <netinet/in_pcb.h>
 #include <netinet/ip_var.h>
 #include <netinet/ip_icmp.h>
@@ -97,6 +98,7 @@
 
 #ifdef INET6
 #include <netinet6/in6_var.h>
+#include <netinet6/ip6_var.h>
 #include <netinet6/ip6protosw.h>
 #endif /* INET6 */
 
@@ -137,10 +139,6 @@ int tcp_reass_limit = NMBCLUSTERS / 2; /* hardlimit for tcpqe_pool */
 int tcp_sackhole_limit = 32*1024; /* hardlimit for sackhl_pool */
 #endif
 
-#ifdef INET6
-extern int ip6_defhlim;
-#endif /* INET6 */
-
 struct pool tcpcb_pool;
 struct pool tcpqe_pool;
 #ifdef TCP_SACK
@@ -778,7 +776,6 @@ tcp_ctlinput(int cmd, struct sockaddr *sa, u_int rdomain, void *v)
 	struct in_addr faddr;
 	tcp_seq seq;
 	u_int mtu;
-	extern int inetctlerrmap[];
 	void (*notify)(struct inpcb *, int) = tcp_notify;
 	int errno;
 
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index d2780b1e8e1..fbafe9d3fc7 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_usrreq.c,v 1.110 2012/02/24 06:19:00 guenther Exp $	*/
+/*	$OpenBSD: tcp_usrreq.c,v 1.111 2013/04/10 08:50:59 mpi Exp $	*/
 /*	$NetBSD: tcp_usrreq.c,v 1.20 1996/02/13 23:44:16 christos Exp $	*/
 
 /*
@@ -100,14 +100,6 @@
 #include <netinet/tcpip.h>
 #include <netinet/tcp_debug.h>
 
-/*
- * TCP protocol interface to socket abstraction.
- */
-extern	char *tcpstates[];
-extern	int tcptv_keep_init;
-
-extern int tcp_rst_ppslim;
-
 /* from in_pcb.c */
 extern	struct baddynamicports baddynamicports;
 
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 7a61253231f..f25ef5d8129 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_var.h,v 1.99 2011/07/06 23:44:20 sthen Exp $	*/
+/*	$OpenBSD: tcp_var.h,v 1.100 2013/04/10 08:50:59 mpi Exp $	*/
 /*	$NetBSD: tcp_var.h,v 1.17 1996/02/13 23:44:24 christos Exp $	*/
 
 /*
@@ -538,7 +538,9 @@ extern	struct inpcbtable tcbtable;	/* head of queue of active tcpcb's */
 extern	struct tcpstat tcpstat;	/* tcp statistics */
 extern	u_int32_t tcp_now;		/* for RFC 1323 timestamps */
 extern	int tcp_do_rfc1323;	/* enabled/disabled? */
+extern	int tcptv_keep_init;	/* time to keep alive the initial SYN packet */
 extern	int tcp_mssdflt;	/* default maximum segment size */
+extern	int tcp_rst_ppslim;	/* maximum outgoing RST packet per second */
 extern	int tcp_ack_on_push;	/* ACK immediately on PUSH */
 #ifdef TCP_SACK
 extern	int tcp_do_sack;	/* SACK enabled/disabled */
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index aa6476dc84d..ee306d33dd2 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udp_usrreq.c,v 1.159 2013/04/04 19:23:39 bluhm Exp $	*/
+/*	$OpenBSD: udp_usrreq.c,v 1.160 2013/04/10 08:50:59 mpi Exp $	*/
 /*	$NetBSD: udp_usrreq.c,v 1.28 1996/03/16 23:54:03 christos Exp $	*/
 
 /*
@@ -99,9 +99,8 @@
 #ifndef INET
 #include <netinet/in.h>
 #endif
+#include <netinet6/ip6_var.h>
 #include <netinet6/ip6protosw.h>
-
-extern int ip6_defhlim;
 #endif /* INET6 */
 
 #include "pf.h"
@@ -905,7 +904,6 @@ udp_ctlinput(int cmd, struct sockaddr *sa, u_int rdomain, void *v)
 	struct udphdr *uhp;
 	struct in_addr faddr;
 	struct inpcb *inp;
-	extern int inetctlerrmap[];
 	void (*notify)(struct inpcb *, int) = udp_notify;
 	int errno;
 
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
index 695bd8c60ad..acb628945a3 100644
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in6_pcb.c,v 1.53 2013/03/28 16:45:16 tedu Exp $	*/
+/*	$OpenBSD: in6_pcb.c,v 1.54 2013/04/10 08:50:59 mpi Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -117,6 +117,7 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/in_pcb.h>
+#include <netinet/ip_var.h>
 
 #include <netinet6/in6_var.h>
 #include <netinet/ip6.h>
@@ -134,11 +135,6 @@
 
 struct in6_addr zeroin6_addr;
 
-extern int ipport_firstauto;
-extern int ipport_lastauto;
-extern int ipport_hifirstauto;
-extern int ipport_hilastauto;
-
 /*
  * Keep separate inet6ctlerrmap, because I may remap some of these.
  * I also put it here, because, quite frankly, it belongs here, not in
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index eb2c8c82459..5b7af801348 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nd6.c,v 1.97 2013/03/25 14:40:57 mpi Exp $	*/
+/*	$OpenBSD: nd6.c,v 1.98 2013/04/10 08:50:59 mpi Exp $	*/
 /*	$KAME: nd6.c,v 1.280 2002/06/08 19:52:07 itojun Exp $	*/
 
 /*
@@ -103,7 +103,6 @@ void nd6_llinfo_timer(void *);
 
 struct timeout nd6_slowtimo_ch;
 struct timeout nd6_timer_ch;
-extern struct timeout in6_tmpaddrtimer_ch;
 
 int fill_drlist(void *, size_t *, size_t);
 int fill_prlist(void *, size_t *, size_t);