===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rdist/common.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- src/usr.bin/rdist/common.c	2015/01/20 04:45:43	1.35
+++ src/usr.bin/rdist/common.c	2015/01/20 09:00:16	1.36
@@ -1,4 +1,4 @@
-/*	$OpenBSD: common.c,v 1.35 2015/01/20 04:45:43 guenther Exp $	*/
+/*	$OpenBSD: common.c,v 1.36 2015/01/20 09:00:16 guenther Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -29,15 +29,27 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/wait.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <limits.h>
+#include <paths.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
 #include "defs.h"
 
 /*
  * Things common to both the client and server.
  */
 
-#include <sys/wait.h>
-#include <sys/socket.h>
-
 /*
  * Variables common to both client and server
  */
@@ -55,7 +67,6 @@
 int			rem_w = -1;		/* Client file descriptor */
 struct passwd	       *pw = NULL;		/* Local user's pwd entry */
 volatile sig_atomic_t 	contimedout = FALSE;	/* Connection timed out */
-int			proto_version = -1;	/* Protocol version */
 int			rtimeout = RTIMEOUT;	/* Response time out */
 jmp_buf			finish_jmpbuf;		/* Finish() jmp buffer */
 int			setjmp_ok = FALSE;	/* setjmp()/longjmp() status */
@@ -142,8 +153,6 @@
 void
 finish(void)
 {
-	extern jmp_buf finish_jmpbuf;
-
 	debugmsg(DM_CALL, 
 		 "finish() called: do_fork = %d amchild = %d isserver = %d",
 		 do_fork, amchild, isserver);
@@ -565,7 +574,6 @@
 {
 	char *pw_dir, *rest;
 	size_t len;
-	extern char *homedir;
 
 	if (*file != '~') {
 notilde: