diff --git a/sys/netatalk/at.h b/sys/netatalk/at.h
index d6c5245dbd07..8d2f90a0df94 100644
--- a/sys/netatalk/at.h
+++ b/sys/netatalk/at.h
@@ -89,9 +89,4 @@ struct sockaddr_at {
 
 #define sat_zero sat_range.r_zero
 
-#ifdef KERNEL
-extern struct domain	atalkdomain;
-extern struct protosw	atalksw[];
-#endif
-
 #endif __AT_HEADER__
diff --git a/sys/netatalk/at_proto.c b/sys/netatalk/at_proto.c
index d2c4b01f48dc..abf945f385ae 100644
--- a/sys/netatalk/at_proto.c
+++ b/sys/netatalk/at_proto.c
@@ -41,8 +41,9 @@
 #include <netatalk/ddp_var.h>
 #include <netatalk/at_extern.h>
 
+extern struct domain	atalkdomain;
 
-struct protosw		atalksw[] = {
+static struct protosw	atalksw[] = {
     {
 	/* Identifiers */
 	SOCK_DGRAM,	&atalkdomain,	ATPROTO_DDP,	PR_ATOMIC|PR_ADDR,
@@ -63,7 +64,7 @@ struct protosw		atalksw[] = {
     },
 };
 
-struct domain		atalkdomain = {
+static struct domain	atalkdomain = {
     AF_APPLETALK,	"appletalk",	0,	0,	0,
     atalksw, &atalksw[sizeof(atalksw)/sizeof(atalksw[0])],
     0, rn_inithead,
diff --git a/sys/netatalk/ddp_input.c b/sys/netatalk/ddp_input.c
index bdcca0ca2d31..f0cf9b1cd55d 100644
--- a/sys/netatalk/ddp_input.c
+++ b/sys/netatalk/ddp_input.c
@@ -26,12 +26,12 @@
 
 struct ifqueue		atintrq1, atintrq2;
 
-int		ddp_forward = 1;
-int		ddp_firewall = 0;
-extern int	ddp_cksum;
+static volatile int	ddp_forward = 1;
+static volatile int	ddp_firewall = 0;
 static struct ddpstat	ddpstat;
+static struct route	forwro;
 
-void     ddp_input( struct mbuf	*, struct ifnet *, struct elaphdr *, int );
+static void     ddp_input(struct mbuf *, struct ifnet *, struct elaphdr *, int);
 
 /*
  * Could probably merge these two code segments a little better...
@@ -113,9 +113,7 @@ atintr( void )
 
 NETISR_SET(NETISR_ATALK, atintr);
 
-struct route	forwro;
-
-void
+static void
 ddp_input( m, ifp, elh, phase )
     struct mbuf		*m;
     struct ifnet	*ifp;