diff --git a/dcc/cdcc/Makefile.in b/dcc/cdcc/Makefile.in

index b6ed8e5..9e0dac8 100644

--- a/dcc/cdcc/Makefile.in

+++ b/dcc/cdcc/Makefile.in

@@ -29,4 +29,8 @@ SRCS	=$(PROG).c

 SUID_PGM=yes		# cdcc needs to be SUID to read the server passwords

+# add server library due common symbols

+LDADD   +=$(SRVRLIBS)

+DPADD   +=$(SRVRLIBS)

+

 @INCLUDE_INC@

diff --git a/dcc/clntlib/ask.c b/dcc/clntlib/ask.c

index f877eb4..6242c15 100644

--- a/dcc/clntlib/ask.c

+++ b/dcc/clntlib/ask.c

@@ -39,7 +39,7 @@ static struct in6_addr grey_ip_mask;

 static void honor_cnt(const GOT_CKS *cks, u_int *, DCC_CK_TYPES, DCC_TGTS);

-

+u_char grey_on;

 #ifdef DCC_PKT_VERS5

 /* figure old server's target count before our latest report */

diff --git a/dcc/clntlib/clnt_send.c b/dcc/clntlib/clnt_send.c

index ba5ca23..e600eca 100644

--- a/dcc/clntlib/clnt_send.c

+++ b/dcc/clntlib/clnt_send.c

@@ -52,7 +52,7 @@ static int recv_fail;

 int dcc_debug_ttl;

-u_char grey_on;

+extern u_char grey_on;

 #define AGE_AVG(_v,_n,_a,_b) ((_v) = ((_v)*_a + (_n)*_b + (_a+_b)/2)/(_a+_b))

diff --git a/dcc/dccm/dccm.c b/dcc/dccm/dccm.c

index 833bd5b..c280c2c 100644

--- a/dcc/dccm/dccm.c

+++ b/dcc/dccm/dccm.c

@@ -183,6 +183,7 @@ main(int argc, char **argv)

 	const char *rundir = DCC_RUNDIR;

 	const char *homedir = 0;

 	const char *logdir = 0;

+	const char *userdirs;

 	int result, i;

 	emsg.c[0] = '\0';

diff --git a/dcc/thrlib/cmn_defs.h b/dcc/thrlib/cmn_defs.h

index 4398153..49eab1c 100644

--- a/dcc/thrlib/cmn_defs.h

+++ b/dcc/thrlib/cmn_defs.h

@@ -223,7 +223,7 @@ extern u_int dcc_ctxt_sn;		/* change X-DCC header server name */

 extern RCPT_ST *rcpt_st_free;

-const char *userdirs;

+extern const char *userdirs;

 extern u_char dcc_query_only;

 extern u_char can_discard_1;		/* 1=can trim targets after DATA */