diff --git a/appl/ftp/ftp/ftp_locl.h b/appl/ftp/ftp/ftp_locl.h
index 84b9a342b..f374f2955 100644
--- a/appl/ftp/ftp/ftp_locl.h
+++ b/appl/ftp/ftp/ftp_locl.h
@@ -46,10 +46,12 @@ extern int h_errno;
 
 #include "krb4.h"
 
+extern char *optarg;
+extern int optind, opterr;
+
 #if defined(__sun__) && !defined(__svr4)
 int fclose(FILE*);
 int pclose(FILE*);
-extern int optind;
 #endif
 
 #endif /* __FTP_LOCL_H__ */
diff --git a/appl/ftp/ftpd/ftpcmd.y b/appl/ftp/ftpd/ftpcmd.y
index 0ede3cdd2..8c3ae683c 100644
--- a/appl/ftp/ftpd/ftpcmd.y
+++ b/appl/ftp/ftpd/ftpcmd.y
@@ -83,6 +83,8 @@ static char rcsid[] = "$NetBSD: ftpcmd.y,v 1.6 1995/06/03 22:46:45 mycroft Exp $
 #include "extern.h"
 #include "auth.h"
 
+#include <roken.h>
+
 off_t	restart_point;
 
 static	int cmd_type;
diff --git a/appl/ftp/ftpd/ftpd.c b/appl/ftp/ftpd/ftpd.c
index a87a24cb4..7c3b76d98 100644
--- a/appl/ftp/ftpd/ftpd.c
+++ b/appl/ftp/ftpd/ftpd.c
@@ -66,7 +66,6 @@ RCSID("$Id$");
 #include <fcntl.h>
 #include <glob.h>
 #include <limits.h>
-#include <netdb.h>
 #include <pwd.h>
 #include <setjmp.h>
 #include <signal.h>
@@ -92,6 +91,8 @@ RCSID("$Id$");
 
 void yyparse();
 
+extern char *optarg;
+extern int optind, opterr;
 
 #ifndef LOG_FTP
 #define LOG_FTP LOG_DAEMON
diff --git a/appl/ftp/ftpd/krb4.c b/appl/ftp/ftpd/krb4.c
index c001c1744..b822c49a0 100644
--- a/appl/ftp/ftpd/krb4.c
+++ b/appl/ftp/ftpd/krb4.c
@@ -7,7 +7,6 @@
 #include <netinet/in.h>
 
 #include <errno.h>
-#include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -17,6 +16,8 @@
 #include "extern.h"
 #include "auth.h"
 
+#include <roken.h>
+
 static AUTH_DAT auth_dat;
 static des_key_schedule schedule;
 
diff --git a/appl/ftp/ftpd/popen.c b/appl/ftp/ftpd/popen.c
index 68d78742a..49df82c08 100644
--- a/appl/ftp/ftpd/popen.c
+++ b/appl/ftp/ftpd/popen.c
@@ -63,6 +63,8 @@ static char rcsid[] = "$NetBSD: popen.c,v 1.5 1995/04/11 02:45:00 cgd Exp $";
 
 #include "extern.h"
 
+#include <roken.h>
+
 /*
  * Special version of popen which avoids call to shell.  This ensures noone
  * may create a pipe to a hidden program as a side effect of a list or dir