diff --git a/appl/ftp/ftp/ftp_locl.h b/appl/ftp/ftp/ftp_locl.h
index d5400fb08..0b87484d6 100644
--- a/appl/ftp/ftp/ftp_locl.h
+++ b/appl/ftp/ftp/ftp_locl.h
@@ -55,9 +55,6 @@
 
 #include "krb4.h"
 
-extern char *optarg;
-extern int optind, opterr;
-
 #if defined(__sun__) && !defined(__svr4)
 int fclose(FILE*);
 int pclose(FILE*);
diff --git a/appl/ftp/ftpd/ftpd.c b/appl/ftp/ftpd/ftpd.c
index 8fe4983a0..0855560d5 100644
--- a/appl/ftp/ftpd/ftpd.c
+++ b/appl/ftp/ftpd/ftpd.c
@@ -99,9 +99,6 @@ RCSID("$Id$");
 
 void yyparse();
 
-extern char *optarg;
-extern int optind, opterr;
-
 #ifndef LOG_FTP
 #define LOG_FTP LOG_DAEMON
 #endif
@@ -155,15 +152,6 @@ static char ttyline[20];
    authorized and anonymous connections, 2 only authorized */
 static int auth_level = 1;
 
-#ifdef sun
-extern char *optarg;
-extern int optind, opterr;
-
-int fclose(FILE*);
-#endif
-
-char *getusershell(void);
-
 /*
  * Timeout intervals for retrying connections
  * to hosts that don't accept PORT cmds.  This
@@ -206,7 +194,7 @@ static void	 dolog (struct sockaddr_in *);
 static void	 end_login (void);
 static FILE	*getdatasock (char *);
 static char	*gunique (char *);
-static void	 lostconn (int);
+static RETSIGTYPE	 lostconn (int);
 static int	 receive_data (FILE *, FILE *);
 static void	 send_data (FILE *, FILE *, off_t);
 static struct passwd * sgetpwnam (char *);
@@ -436,7 +424,7 @@ main(int argc, char **argv)
 	/* NOTREACHED */
 }
 
-static void
+static RETSIGTYPE
 lostconn(int signo)
 {
 
diff --git a/appl/popper/pop_init.c b/appl/popper/pop_init.c
index f5449baed..17ab7193c 100644
--- a/appl/popper/pop_init.c
+++ b/appl/popper/pop_init.c
@@ -77,7 +77,6 @@ pop_init(POP *p,int argcount,char **argmessage)
     int                     errflag = 0;
     int                     c;
     int                     len;
-    extern char         *   optarg;
     int                     options = 0;
     int                     sp = 0;             /*  Socket pointer */
     char                *   trace_file_name;
diff --git a/appl/telnet/telnet/main.c b/appl/telnet/telnet/main.c
index 6a9281ca0..78d62e566 100644
--- a/appl/telnet/telnet/main.c
+++ b/appl/telnet/telnet/main.c
@@ -38,6 +38,7 @@ static char copyright[] =
 #endif /* not lint */
 
 #include <config.h>
+#include "roken.h"
 
 RCSID("$Id$");
 
@@ -99,8 +100,6 @@ void usage(void)
 
 int main(int argc, char **argv)
 {
-	extern char *optarg;
-	extern int optind;
 	int ch;
 	char *user;
 #ifdef	FORWARD
diff --git a/appl/telnet/telnetd/telnetd.c b/appl/telnet/telnetd/telnetd.c
index 55e63dd2f..04ce6c4fb 100644
--- a/appl/telnet/telnetd/telnetd.c
+++ b/appl/telnet/telnetd/telnetd.c
@@ -186,8 +186,6 @@ int main(int argc, char **argv)
 	struct sockaddr_in from;
 	int on = 1, fromlen;
 	register int ch;
-	extern char *optarg;
-	extern int optind;
 #if	defined(IPPROTO_IP) && defined(IP_TOS)
 	int tos = -1;
 #endif