Remove commons; inspired by netbsd.

31 files changed, 88 insertions, 57 deletions

diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index d2e5ba3da11..2edf162fa4b 100644
--- a/sys/ddb/db_command.c
+++ b/sys/ddb/db_command.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_command.c,v 1.29 2002/05/18 09:49:17 art Exp $	*/
+/*	$OpenBSD: db_command.c,v 1.30 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: db_command.c,v 1.20 1996/03/30 22:30:05 christos Exp $	*/
 
 /* 
@@ -66,6 +66,13 @@ label_t		*db_recover;
  */
 boolean_t	db_ed_style = TRUE;
 
+db_addr_t	db_dot;		/* current location */
+db_addr_t	db_last_addr;	/* last explicit address typed */
+db_addr_t	db_prev;	/* last address examined
+				   or written */
+db_addr_t	db_next;	/* next address to be examined
+				   or written */
+
 /*
  * Utility routine - discard tokens through end-of-line.
  */
diff --git a/sys/ddb/db_command.h b/sys/ddb/db_command.h
index ff38839284d..d76dac736c3 100644
--- a/sys/ddb/db_command.h
+++ b/sys/ddb/db_command.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_command.h,v 1.15 2002/05/18 09:49:17 art Exp $	*/
+/*	$OpenBSD: db_command.h,v 1.16 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: db_command.h,v 1.8 1996/02/05 01:56:55 christos Exp $	*/
 
 /* 
@@ -58,12 +58,7 @@ void db_boot_reboot_cmd(db_expr_t, int, db_expr_t, char *);
 void db_boot_poweroff_cmd(db_expr_t, int, db_expr_t, char *);
 void db_stack_trace_cmd(db_expr_t, int, db_expr_t, char *);
 
-db_addr_t	db_dot;		/* current location */
-db_addr_t	db_last_addr;	/* last explicit address typed */
-db_addr_t	db_prev;	/* last address examined
-				   or written */
-db_addr_t	db_next;	/* next address to be examined
-				   or written */
+extern	db_addr_t db_dot, db_last_addr, db_prev, db_next;
 
 /*
  * Command table
diff --git a/sys/ddb/db_run.c b/sys/ddb/db_run.c
index e89ce68fdf3..1d8a78593c8 100644
--- a/sys/ddb/db_run.c
+++ b/sys/ddb/db_run.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_run.c,v 1.15 2001/11/06 19:53:18 miod Exp $	*/
+/*	$OpenBSD: db_run.c,v 1.16 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: db_run.c,v 1.8 1996/02/05 01:57:12 christos Exp $	*/
 
 /* 
@@ -49,6 +49,10 @@ db_breakpoint_t	db_not_taken_bkpt = 0;
 db_breakpoint_t	db_taken_bkpt = 0;
 #endif
 
+int		db_inst_count;
+int		db_load_count;
+int		db_store_count;
+
 #ifndef KGDB
 
 #include <ddb/db_lex.h>
diff --git a/sys/ddb/db_run.h b/sys/ddb/db_run.h
index ff8e3df300d..e9fcca75da5 100644
--- a/sys/ddb/db_run.h
+++ b/sys/ddb/db_run.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_run.h,v 1.7 2002/03/14 01:26:51 millert Exp $	*/
+/*	$OpenBSD: db_run.h,v 1.8 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: db_run.h,v 1.3 1996/02/05 01:57:14 christos Exp $	*/
 
 /* 
@@ -36,9 +36,9 @@
 /*
  * Commands to run process.
  */
-int		db_inst_count;
-int		db_load_count;
-int		db_store_count;
+extern	int db_inst_count;
+extern	int db_load_count;
+extern	int db_store_count;
 
 boolean_t db_stop_at_pc(db_regs_t *, boolean_t *);
 void db_restart_at_pc(db_regs_t *, boolean_t);
diff --git a/sys/kern/spec_vnops.c b/sys/kern/spec_vnops.c
index 067be255e05..0c948f296c3 100644
--- a/sys/kern/spec_vnops.c
+++ b/sys/kern/spec_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spec_vnops.c,v 1.24 2002/11/08 04:34:17 art Exp $	*/
+/*	$OpenBSD: spec_vnops.c,v 1.25 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $	*/
 
 /*
@@ -56,6 +56,8 @@
 
 #define v_lastr v_specinfo->si_lastr
 
+struct vnode *speclisth[SPECHSZ];
+
 /* symbolic sleep message strings for devices */
 char	devopn[] = "devopn";
 char	devio[] = "devio";
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 5e945e355d6..d3294797913 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_mbuf.c,v 1.58 2002/07/03 21:19:08 miod Exp $	*/
+/*	$OpenBSD: uipc_mbuf.c,v 1.59 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $	*/
 
 /*
@@ -92,6 +92,7 @@
 
 #include <uvm/uvm_extern.h>
 
+struct	mbstat mbstat;		/* mbuf stats */
 struct	pool mbpool;		/* mbuf pool */
 struct	pool mclpool;		/* mbuf cluster pool */
 
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index 067be255e05..0c948f296c3 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spec_vnops.c,v 1.24 2002/11/08 04:34:17 art Exp $	*/
+/*	$OpenBSD: spec_vnops.c,v 1.25 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $	*/
 
 /*
@@ -56,6 +56,8 @@
 
 #define v_lastr v_specinfo->si_lastr
 
+struct vnode *speclisth[SPECHSZ];
+
 /* symbolic sleep message strings for devices */
 char	devopn[] = "devopn";
 char	devio[] = "devio";
diff --git a/sys/miscfs/specfs/specdev.h b/sys/miscfs/specfs/specdev.h
index 31e53f79f3a..3a298e3723f 100644
--- a/sys/miscfs/specfs/specdev.h
+++ b/sys/miscfs/specfs/specdev.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: specdev.h,v 1.14 2002/11/08 04:34:17 art Exp $	*/
+/*	$OpenBSD: specdev.h,v 1.15 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: specdev.h,v 1.12 1996/02/13 13:13:01 mycroft Exp $	*/
 
 /*
@@ -68,7 +68,7 @@ struct specinfo {
 #define	SPECHASH(rdev)	(((unsigned)((rdev>>5)+(rdev)))%SPECHSZ)
 #endif
 
-struct vnode *speclisth[SPECHSZ];
+extern struct vnode *speclisth[SPECHSZ];
 
 /*
  * Prototypes for special file operations on vnodes.
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index 7ee803b7dbc..738535168dd 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ppp.c,v 1.32 2003/01/07 09:00:33 kjc Exp $	*/
+/*	$OpenBSD: if_ppp.c,v 1.33 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: if_ppp.c,v 1.39 1997/05/17 21:11:59 christos Exp $	*/
 
 /*
@@ -162,6 +162,8 @@
 #include <net/ppp-comp.h>
 #endif
 
+struct	ppp_softc ppp_softc[NPPP];
+
 static int	pppsioctl(struct ifnet *, u_long, caddr_t);
 static void	ppp_requeue(struct ppp_softc *);
 static void	ppp_ccp(struct ppp_softc *, struct mbuf *m, int rcvd);
diff --git a/sys/net/if_pppvar.h b/sys/net/if_pppvar.h
index a90f77a2b87..835b0d37fa9 100644
--- a/sys/net/if_pppvar.h
+++ b/sys/net/if_pppvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pppvar.h,v 1.13 2002/09/13 00:12:07 deraadt Exp $	*/
+/*	$OpenBSD: if_pppvar.h,v 1.14 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: if_pppvar.h,v 1.5 1997/01/03 07:23:29 mikel Exp $	*/
 /*
  * if_pppvar.h - private structures and declarations for PPP.
@@ -133,7 +133,7 @@ struct ppp_softc {
 };
 
 #ifdef _KERNEL
-struct	ppp_softc ppp_softc[NPPP];
+extern	struct ppp_softc ppp_softc[];
 
 struct	ppp_softc *pppalloc(pid_t pid);
 void	pppdealloc(struct ppp_softc *sc);
diff --git a/sys/net/pf.c b/sys/net/pf.c
index 079df8073a7..af5e23f582e 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.319 2003/02/12 12:50:29 mcbride Exp $ */
+/*	$OpenBSD: pf.c,v 1.320 2003/02/12 14:41:07 jason Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -142,7 +142,6 @@ int			*pftm_timeouts[PFTM_MAX] = { &pftm_tcp_first_packet,
 
 struct pool		 pf_tree_pl, pf_rule_pl, pf_addr_pl;
 struct pool		 pf_state_pl, pf_altq_pl, pf_pooladdr_pl;
-struct pool		 pfr_ktable_pl, pfr_kentry_pl;
 
 void			 pf_addrcpy(struct pf_addr *, struct pf_addr *,
 			    sa_family_t);
diff --git a/sys/net/route.c b/sys/net/route.c
index 81a4b24eb71..a9df5dcdec9 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.34 2002/09/11 05:38:47 itojun Exp $	*/
+/*	$OpenBSD: route.c,v 1.35 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: route.c,v 1.14 1996/02/13 22:00:46 christos Exp $	*/
 
 /*
@@ -135,6 +135,10 @@ extern struct ifnet encif;
 
 #define	SA(p) ((struct sockaddr *)(p))
 
+struct	route_cb route_cb;
+struct	rtstat  rtstat;
+struct	radix_node_head *rt_tables[AF_MAX+1];
+
 int	rttrash;		/* routes not in table but not freed */
 struct	sockaddr wildcard;	/* zero valued cookie for wildcard searches */
 
diff --git a/sys/net/route.h b/sys/net/route.h
index b30ca9b86fb..a92ffdb17f5 100644
--- a/sys/net/route.h
+++ b/sys/net/route.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.h,v 1.15 2003/01/17 17:48:25 camield Exp $	*/
+/*	$OpenBSD: route.h,v 1.16 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: route.h,v 1.9 1996/02/13 22:00:49 christos Exp $	*/
 
 /*
@@ -284,9 +284,9 @@ struct rttimer_queue {
 #define	ONNET_CLONING 1
 #define	NO_CLONING 2
 
-struct	route_cb route_cb;
-struct	rtstat	rtstat;
-struct	radix_node_head *rt_tables[AF_MAX+1];
+extern struct route_cb route_cb;
+extern struct rtstat rtstat;
+extern struct radix_node_head *rt_tables[];
 
 struct	socket;
 void	 route_init(void);
diff --git a/sys/netinet/icmp_var.h b/sys/netinet/icmp_var.h
index dcc9233d40b..e233cc58d28 100644
--- a/sys/netinet/icmp_var.h
+++ b/sys/netinet/icmp_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: icmp_var.h,v 1.9 2002/06/09 02:11:47 jsyn Exp $	*/
+/*	$OpenBSD: icmp_var.h,v 1.10 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: icmp_var.h,v 1.8 1995/03/26 20:32:19 jtc Exp $	*/
 
 /*
@@ -81,6 +81,6 @@ struct	icmpstat {
 }
 
 #ifdef _KERNEL
-struct	icmpstat icmpstat;
+extern struct	icmpstat icmpstat;
 #endif /* _KERNEL */
 #endif /* _NETINET_ICMP_VAR_H_ */
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index db98e185411..33ad717ab19 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: igmp.c,v 1.16 2002/08/28 15:43:03 pefo Exp $	*/
+/*	$OpenBSD: igmp.c,v 1.17 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: igmp.c,v 1.15 1996/02/13 23:41:25 christos Exp $	*/
 
 /*
@@ -34,6 +34,7 @@
 
 int		igmp_timers_are_running;
 static struct router_info *rti_head;
+struct igmpstat igmpstat;
 
 void igmp_sendpkt(struct in_multi *, int, in_addr_t);
 static int rti_fill(struct in_multi *);
diff --git a/sys/netinet/igmp_var.h b/sys/netinet/igmp_var.h
index 2c7605f9585..0397e66d567 100644
--- a/sys/netinet/igmp_var.h
+++ b/sys/netinet/igmp_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: igmp_var.h,v 1.5 2002/03/14 01:27:11 millert Exp $	*/
+/*	$OpenBSD: igmp_var.h,v 1.6 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: igmp_var.h,v 1.9 1996/02/13 23:41:31 christos Exp $	*/
 
 /*
@@ -67,7 +67,7 @@ struct igmpstat {
 };
 
 #ifdef _KERNEL
-struct igmpstat igmpstat;
+extern struct igmpstat igmpstat;
 
 /*
  * Macro to compute a random timer value between 1 and (IGMP_MAX_REPORTING_
diff --git a/sys/netinet/ip_ah.c b/sys/netinet/ip_ah.c
index dd34a5c4ad8..c8a6ca640db 100644
--- a/sys/netinet/ip_ah.c
+++ b/sys/netinet/ip_ah.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ah.c,v 1.70 2002/07/05 23:20:53 angelos Exp $ */
+/*	$OpenBSD: ip_ah.c,v 1.71 2003/02/12 14:41:07 jason Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -73,6 +73,8 @@
 #define DPRINTF(x)
 #endif
 
+struct ahstat ahstat;
+
 /*
  * ah_attach() is called from the transformation initialization code.
  */
diff --git a/sys/netinet/ip_ah.h b/sys/netinet/ip_ah.h
index a0a353e1305..91c1eba52cd 100644
--- a/sys/netinet/ip_ah.h
+++ b/sys/netinet/ip_ah.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ah.h,v 1.29 2002/06/09 16:26:10 itojun Exp $	*/
+/*	$OpenBSD: ip_ah.h,v 1.30 2003/02/12 14:41:07 jason Exp $	*/
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -88,6 +88,6 @@ struct ah
 
 #ifdef _KERNEL
 extern int ah_enable;
-struct ahstat ahstat;
+extern struct ahstat ahstat;
 #endif /* _KERNEL */
 #endif /* _NETINET_IP_AH_H_ */
diff --git a/sys/netinet/ip_esp.c b/sys/netinet/ip_esp.c
index 97b47eb8cd8..87100c7b875 100644
--- a/sys/netinet/ip_esp.c
+++ b/sys/netinet/ip_esp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_esp.c,v 1.77 2003/02/01 14:11:40 dhartmei Exp $ */
+/*	$OpenBSD: ip_esp.c,v 1.78 2003/02/12 14:41:07 jason Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -74,6 +74,8 @@
 #define DPRINTF(x)
 #endif
 
+struct espstat espstat;
+
 /*
  * esp_attach() is called from the transformation initialization code.
  */
diff --git a/sys/netinet/ip_esp.h b/sys/netinet/ip_esp.h
index fb6a0f26228..6be3aafcf23 100644
--- a/sys/netinet/ip_esp.h
+++ b/sys/netinet/ip_esp.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_esp.h,v 1.37 2002/06/09 16:26:10 itojun Exp $	*/
+/*	$OpenBSD: ip_esp.h,v 1.38 2003/02/12 14:41:07 jason Exp $	*/
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -76,6 +76,6 @@ struct espstat
 
 #ifdef _KERNEL
 extern int esp_enable;
-struct espstat espstat;
+extern struct espstat espstat;
 #endif /* _KERNEL */
 #endif /* _NETINET_IP_ESP_H_ */
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index abc3b15b329..bd675f1015d 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_icmp.c,v 1.56 2003/02/01 19:34:06 henning Exp $	*/
+/*	$OpenBSD: ip_icmp.c,v 1.57 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: ip_icmp.c,v 1.19 1996/02/13 23:42:22 christos Exp $	*/
 
 /*
@@ -108,6 +108,7 @@ struct timeval icmperrppslim_last;
 int	icmp_rediraccept = 1;
 int	icmp_redirtimeout = 10 * 60;
 static struct rttimer_queue *icmp_redirect_timeout_q = NULL;
+struct	icmpstat icmpstat;
 
 void icmp_mtudisc_timeout(struct rtentry *, struct rttimer *);
 int icmp_ratelimit(const struct in_addr *, const int, const int);
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 8fe498db903..cee5710847a 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_input.c,v 1.109 2003/02/11 21:08:04 cedric Exp $	*/
+/*	$OpenBSD: ip_input.c,v 1.110 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $	*/
 
 /*
@@ -86,6 +86,8 @@
 #define IPMTUDISCTIMEOUT (10 * 60)	/* as per RFC 1191 */
 #endif
 
+struct ipqhead ipq;
+
 int encdebug = 0;
 int ipsec_keep_invalid = IPSEC_DEFAULT_EMBRYONIC_SA_TIMEOUT;
 int ipsec_require_pfs = IPSEC_DEFAULT_PFS;
diff --git a/sys/netinet/ip_ipcomp.c b/sys/netinet/ip_ipcomp.c
index 5a84f2e6e7d..a7afa74975f 100644
--- a/sys/netinet/ip_ipcomp.c
+++ b/sys/netinet/ip_ipcomp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ipcomp.c,v 1.9 2002/09/12 10:11:39 ho Exp $ */
+/* $OpenBSD: ip_ipcomp.c,v 1.10 2003/02/12 14:41:07 jason Exp $ */
 
 /*
  * Copyright (c) 2001 Jean-Jacques Bernard-Gundol (jj@wabbitt.org)
@@ -69,6 +69,8 @@
 #define DPRINTF(x)
 #endif
 
+struct ipcompstat ipcompstat;
+
 /*
  * ipcomp_attach() is called from the transformation code
  */
diff --git a/sys/netinet/ip_ipcomp.h b/sys/netinet/ip_ipcomp.h
index 64090947985..638e4015bab 100644
--- a/sys/netinet/ip_ipcomp.h
+++ b/sys/netinet/ip_ipcomp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_ipcomp.h,v 1.3 2001/07/17 12:35:35 jjbg Exp $ */
+/* $OpenBSD: ip_ipcomp.h,v 1.4 2003/02/12 14:41:08 jason Exp $ */
 
 /*
  * Copyright (c) 2001 Jean-Jacques Bernard-Gundol (jj@wabbitt.org)
@@ -76,6 +76,6 @@ struct ipcomp {
 
 #ifdef _KERNEL
 extern int ipcomp_enable;
-struct ipcompstat ipcompstat;
+extern struct ipcompstat ipcompstat;
 #endif				/* _KERNEL */
 #endif	/* _NETINET_IP_IPCOMP_H_ */
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index f9229be2d7f..cc4924d5f69 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_var.h,v 1.27 2002/12/09 00:45:37 millert Exp $	*/
+/*	$OpenBSD: ip_var.h,v 1.28 2003/02/12 14:41:08 jason Exp $	*/
 /*	$NetBSD: ip_var.h,v 1.16 1996/02/13 23:43:20 christos Exp $	*/
 
 /*
@@ -159,7 +159,7 @@ struct	ipstat {
 #define	IP_MTUDISC		0x0400		/* pmtu discovery, set DF */
 
 extern struct ipstat ipstat;
-LIST_HEAD(ipqhead, ipq)	ipq;		/* ip reass. queue */
+extern LIST_HEAD(ipqhead, ipq)	ipq;	/* ip reass. queue */
 extern int ip_defttl;			/* default IP ttl */
 
 extern int ip_mtudisc;			/* mtu discovery */
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index 96792abdb5c..0cb17be3322 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_usrreq.c,v 1.67 2002/09/11 03:15:36 itojun Exp $	*/
+/*	$OpenBSD: tcp_usrreq.c,v 1.68 2003/02/12 14:41:08 jason Exp $	*/
 /*	$NetBSD: tcp_usrreq.c,v 1.20 1996/02/13 23:44:16 christos Exp $	*/
 
 /*
@@ -111,6 +111,8 @@ extern int tcp_rst_ppslim;
 /* from in_pcb.c */
 extern	struct baddynamicports baddynamicports;
 
+struct	inpcbtable tcbtable;
+
 int tcp_ident(void *, size_t *, void *, size_t);
 
 #ifdef INET6
diff --git a/sys/netinet/tcp_var.h b/sys/netinet/tcp_var.h
index 45cb0bdcd18..f195b68745e 100644
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcp_var.h,v 1.44 2002/06/09 16:26:11 itojun Exp $	*/
+/*	$OpenBSD: tcp_var.h,v 1.45 2003/02/12 14:41:08 jason Exp $	*/
 /*	$NetBSD: tcp_var.h,v 1.17 1996/02/13 23:44:24 christos Exp $	*/
 
 /*
@@ -369,7 +369,7 @@ struct tcp_ident_mapping {
 };
 
 #ifdef _KERNEL
-struct	inpcbtable tcbtable;	/* head of queue of active tcpcb's */
+extern	struct inpcbtable tcbtable;	/* head of queue of active tcpcb's */
 extern	struct tcpstat tcpstat;	/* tcp statistics */
 u_int32_t tcp_now;		/* for RFC 1323 timestamps */
 extern	int tcp_do_rfc1323;	/* enabled/disabled? */
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index 92fb0c4e3c1..e51d0e78d39 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mbuf.h,v 1.67 2002/10/08 05:12:08 kjc Exp $	*/
+/*	$OpenBSD: mbuf.h,v 1.68 2003/02/12 14:41:08 jason Exp $	*/
 /*	$NetBSD: mbuf.h,v 1.19 1996/02/09 18:25:14 christos Exp $	*/
 
 /*
@@ -529,7 +529,7 @@ struct mbstat {
 };
 
 #ifdef	_KERNEL
-struct	mbstat mbstat;
+extern	struct mbstat mbstat;
 extern	int nmbclust;			/* limit on the # of clusters */
 extern	int mblowat;			/* mbuf low water mark */
 extern	int mcllowat;			/* mbuf cluster low water mark */
diff --git a/sys/sys/specdev.h b/sys/sys/specdev.h
index 31e53f79f3a..3a298e3723f 100644
--- a/sys/sys/specdev.h
+++ b/sys/sys/specdev.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: specdev.h,v 1.14 2002/11/08 04:34:17 art Exp $	*/
+/*	$OpenBSD: specdev.h,v 1.15 2003/02/12 14:41:07 jason Exp $	*/
 /*	$NetBSD: specdev.h,v 1.12 1996/02/13 13:13:01 mycroft Exp $	*/
 
 /*
@@ -68,7 +68,7 @@ struct specinfo {
 #define	SPECHASH(rdev)	(((unsigned)((rdev>>5)+(rdev)))%SPECHSZ)
 #endif
 
-struct vnode *speclisth[SPECHSZ];
+extern struct vnode *speclisth[SPECHSZ];
 
 /*
  * Prototypes for special file operations on vnodes.
diff --git a/sys/ufs/ufs/ufs_lookup.c b/sys/ufs/ufs/ufs_lookup.c
index c4f60f3e25b..0f38da3e4a6 100644
--- a/sys/ufs/ufs/ufs_lookup.c
+++ b/sys/ufs/ufs/ufs_lookup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufs_lookup.c,v 1.20 2003/01/31 17:37:50 art Exp $	*/
+/*	$OpenBSD: ufs_lookup.c,v 1.21 2003/02/12 14:41:08 jason Exp $	*/
 /*	$NetBSD: ufs_lookup.c,v 1.7 1996/02/09 22:36:06 christos Exp $	*/
 
 /*
@@ -60,7 +60,8 @@
 #include <ufs/ufs/ufsmount.h>
 #include <ufs/ufs/ufs_extern.h>
 
-struct	nchstats nchstats;
+extern	struct nchstats nchstats;
+
 #ifdef DIAGNOSTIC
 int	dirchk = 1;
 #else
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index 720360cc123..7d1058e8478 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.50 2003/02/01 01:51:31 deraadt Exp $	*/
+/*	$OpenBSD: route.c,v 1.51 2003/02/12 14:41:08 jason Exp $	*/
 /*	$NetBSD: route.c,v 1.15 1996/05/07 02:55:06 thorpej Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "from: @(#)route.c	8.3 (Berkeley) 3/9/94";
 #else
-static char *rcsid = "$OpenBSD: route.c,v 1.50 2003/02/01 01:51:31 deraadt Exp $";
+static char *rcsid = "$OpenBSD: route.c,v 1.51 2003/02/12 14:41:08 jason Exp $";
 #endif
 #endif /* not lint */
 
@@ -88,6 +88,8 @@ static char *rcsid = "$OpenBSD: route.c,v 1.50 2003/02/01 01:51:31 deraadt Exp $
 	((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
 #define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len))
 
+struct radix_node_head *rt_tables[AF_MAX+1];
+
 /*
  * Definitions for showing gateway flags.
  */