diff --git a/usr.bin/rpcgen/rpc_cout.c b/usr.bin/rpcgen/rpc_cout.c
index 7a695f4bd3aa..6ce80ee0dac6 100644
--- a/usr.bin/rpcgen/rpc_cout.c
+++ b/usr.bin/rpcgen/rpc_cout.c
@@ -40,8 +40,8 @@ static char sccsid[] = "@(#)rpc_cout.c 1.8 87/06/24 (C) 1987 SMI";
 #include "rpc_util.h"
 #include "rpc_parse.h"
 
-int print_header(), print_trailer(), space(), emit_enum(),
-    emit_union(), emit_struct(), emit_typedef(), print_stat();
+static int print_header(), print_trailer(), space(), emit_enum(),
+	   emit_union(), emit_struct(), emit_typedef(), print_stat();
 
 
 /*
diff --git a/usr.bin/rpcgen/rpc_hout.c b/usr.bin/rpcgen/rpc_hout.c
index 6646f4b4627d..6f247feed5f3 100644
--- a/usr.bin/rpcgen/rpc_hout.c
+++ b/usr.bin/rpcgen/rpc_hout.c
@@ -31,8 +31,8 @@
 static char sccsid[] = "@(#)rpc_hout.c 1.6 87/07/28 (C) 1987 SMI";
 #endif
 
-int pconstdef(), pstructdef(), puniondef(), pdefine(), pprogramdef(),
-    penumdef(), ptypedef(), pdeclaration(), undefined2();
+static int pconstdef(), pstructdef(), puniondef(), pdefine(), pprogramdef(),
+	   penumdef(), ptypedef(), pdeclaration(), undefined2();
 
 /*
  * rpc_hout.c, Header file outputter for the RPC protocol compiler 
diff --git a/usr.bin/rpcgen/rpc_main.c b/usr.bin/rpcgen/rpc_main.c
index 1b40c2eaf644..bbd7bc9ecc4d 100644
--- a/usr.bin/rpcgen/rpc_main.c
+++ b/usr.bin/rpcgen/rpc_main.c
@@ -64,8 +64,8 @@ static char *allv[] = {
 static int allc = sizeof(allv)/sizeof(allv[0]);
 
 
-int h_output(), c_output(), s_output(), l_output(), do_registers(),
-    parseargs();
+static int h_output(), c_output(), s_output(), l_output(), do_registers(),
+	   parseargs();
 
 main(argc, argv)
 	int argc;
diff --git a/usr.bin/rpcgen/rpc_parse.c b/usr.bin/rpcgen/rpc_parse.c
index b5c771342a9a..dbe84f58e54f 100644
--- a/usr.bin/rpcgen/rpc_parse.c
+++ b/usr.bin/rpcgen/rpc_parse.c
@@ -40,9 +40,9 @@ static char sccsid[] = "@(#)rpc_parse.c 1.4 87/04/28 (C) 1987 SMI";
 #include "rpc_scan.h"
 #include "rpc_parse.h"
 
-int isdefined(), def_struct(), def_program(), def_enum(), def_const(),
-    def_union(), def_typedef(), get_declaration(), get_type(),
-    unsigned_dec();
+static int isdefined(), def_struct(), def_program(), def_enum(), def_const(),
+	   def_union(), def_typedef(), get_declaration(), get_type(),
+	   unsigned_dec();
 /*
  * return the next definition you see
  */
diff --git a/usr.bin/rpcgen/rpc_scan.c b/usr.bin/rpcgen/rpc_scan.c
index c74904998c40..0e18514c5a20 100644
--- a/usr.bin/rpcgen/rpc_scan.c
+++ b/usr.bin/rpcgen/rpc_scan.c
@@ -47,8 +47,8 @@ static char sccsid[] = "@(#)rpc_scan.c 1.6 87/06/24 (C) 1987 SMI";
 static int pushed = 0;	/* is a token pushed */
 static token lasttok;	/* last token, if pushed */
 
-int unget_token(), findstrconst(), findconst(), findkind(), cppline(),
-    directive(), printdirective(), docppline();
+static int unget_token(), findstrconst(), findconst(), findkind(), cppline(),
+	   directive(), printdirective(), docppline();
 /*
  * scan expecting 1 given token 
  */
diff --git a/usr.bin/rpcgen/rpc_svcout.c b/usr.bin/rpcgen/rpc_svcout.c
index 94b3acefd709..bc2a65dec968 100644
--- a/usr.bin/rpcgen/rpc_svcout.c
+++ b/usr.bin/rpcgen/rpc_svcout.c
@@ -46,7 +46,7 @@ static char ARG[] = "argument";
 static char RESULT[] = "result";
 static char ROUTINE[] = "local";
 
-int write_program(), printerr(), printif();
+static int write_program(), printerr(), printif();
 /*
  * write most of the service, that is, everything but the registrations. 
  */
diff --git a/usr.bin/rpcgen/rpc_util.c b/usr.bin/rpcgen/rpc_util.c
index cd88b3febd11..3db1c15550cd 100644
--- a/usr.bin/rpcgen/rpc_util.c
+++ b/usr.bin/rpcgen/rpc_util.c
@@ -55,7 +55,7 @@ FILE *fin;	/* file pointer of current input */
 
 list *defined;	/* list of defined things */
 
-int printwhere();
+static int printwhere();
 
 /*
  * Reinitialize the world 
diff --git a/usr.bin/telnet/commands.c b/usr.bin/telnet/commands.c
index 1d8e6a8c8e3e..bb38efb419f5 100644
--- a/usr.bin/telnet/commands.c
+++ b/usr.bin/telnet/commands.c
@@ -57,6 +57,7 @@ static char sccsid[] = "@(#)commands.c	5.5 (Berkeley) 3/22/91";
 #include <varargs.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
 #include <arpa/telnet.h>
 
 #include "general.h"
@@ -246,7 +247,7 @@ struct sendlist {
 };
 
 
-extern int
+static int
 	send_esc P((void)),
 	send_help P((void)),
 	send_docmd P((char *)),
@@ -254,6 +255,12 @@ extern int
 	send_willcmd P((char *)),
 	send_wontcmd P((char *));
 
+extern int
+	send_do P((int, int)),
+	send_dont P((int, int)),
+	send_will P((int, int)),
+	send_wont P((int, int));
+
 static struct sendlist Sendlist[] = {
     { "ao",	"Send Telnet Abort output",		1, 0, 0, 2, AO },
     { "ayt",	"Send Telnet 'Are You There'",		1, 0, 0, 2, AYT },
@@ -382,7 +389,6 @@ send_esc()
 send_docmd(name)
     char *name;
 {
-    void send_do();
     return(send_tncmd(send_do, "do", name));
 }
 
@@ -390,21 +396,18 @@ send_docmd(name)
 send_dontcmd(name)
     char *name;
 {
-    void send_dont();
     return(send_tncmd(send_dont, "dont", name));
 }
     static int
 send_willcmd(name)
     char *name;
 {
-    void send_will();
     return(send_tncmd(send_will, "will", name));
 }
     static int
 send_wontcmd(name)
     char *name;
 {
-    void send_wont();
     return(send_tncmd(send_wont, "wont", name));
 }
 
@@ -603,7 +606,7 @@ togxbinary(val)
 }
 
 
-extern int togglehelp P((void));
+static int togglehelp P((void));
 #if	defined(AUTHENTICATE)
 extern int auth_togdebug P((int));
 #endif
@@ -1465,7 +1468,7 @@ struct slclist {
 	int	arg;
 };
 
-extern void slc_help();
+static void slc_help();
 
 struct slclist SlcList[] = {
     { "export",	"Use local special character definitions",
@@ -1548,7 +1551,8 @@ extern void
 	env_export P((unsigned char *)),
 	env_unexport P((unsigned char *)),
 	env_send P((unsigned char *)),
-	env_list P((void)),
+	env_list P((void));
+static void
 	env_help P((void));
 
 struct envlist EnvList[] = {
@@ -2134,7 +2138,7 @@ tn(argc, argv)
     register struct hostent *host = 0;
     struct sockaddr_in sin;
     struct servent *sp = 0;
-    unsigned long temp, inet_addr();
+    unsigned long temp;
     extern char *inet_ntoa();
 #if	defined(IP_OPTIONS) && defined(IPPROTO_IP)
     char *srp = 0, *strrchr();
@@ -2389,7 +2393,7 @@ static char
 	envhelp[] =	"change environment variables ('environ ?' for more)",
 	modestring[] = "try to enter line or character mode ('mode ?' for more)";
 
-extern int	help();
+static int	help();
 
 static Command cmdtab[] = {
 	{ "close",	closehelp,	bye,		1 },
diff --git a/usr.bin/telnet/sys_bsd.c b/usr.bin/telnet/sys_bsd.c
index 52b28554d0c3..0b799eef090c 100644
--- a/usr.bin/telnet/sys_bsd.c
+++ b/usr.bin/telnet/sys_bsd.c
@@ -171,11 +171,13 @@ extern int kludgelinemode;
  *	1	Do add this character
  */
 
+void intp(), sendbrk(), sendabort();
+
     int
 TerminalSpecialChars(c)
     int	c;
 {
-    void xmitAO(), xmitEL(), xmitEC(), intp(), sendbrk();
+    void xmitAO(), xmitEL(), xmitEC();
 
     if (c == termIntChar) {
 	intp();
@@ -375,6 +377,7 @@ TerminalRestoreState()
  *		local/no signal mapping
  */
 
+SIG_FUNC_RET ayt_status();
 
     void
 TerminalNewMode(f)
@@ -649,8 +652,6 @@ TerminalNewMode(f)
 #endif
     } else {
 #ifdef	SIGINFO
-	SIG_FUNC_RET ayt_status();
-
 	(void) signal(SIGINFO, ayt_status);
 #endif	SIGINFO
 #ifdef	SIGTSTP