remove extra externs not needed because of unistd.h (rest of tree will be done later.. contact me if you want to help)

22 files changed, 40 insertions, 71 deletions

diff --git a/bin/cat/cat.c b/bin/cat/cat.c
index 67e16c0269b..71439ce4cf3 100644
--- a/bin/cat/cat.c
+++ b/bin/cat/cat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cat.c,v 1.8 1997/06/18 18:37:56 kstailey Exp $	*/
+/*	$OpenBSD: cat.c,v 1.9 2000/01/22 20:24:45 deraadt Exp $	*/
 /*	$NetBSD: cat.c,v 1.11 1995/09/07 06:12:54 jtc Exp $	*/
 
 /*
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)cat.c	8.2 (Berkeley) 4/27/95";
 #else
-static char rcsid[] = "$OpenBSD: cat.c,v 1.8 1997/06/18 18:37:56 kstailey Exp $";
+static char rcsid[] = "$OpenBSD: cat.c,v 1.9 2000/01/22 20:24:45 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -78,7 +78,6 @@ main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	extern int optind;
 	int ch;
 
 	setlocale(LC_ALL, "");
diff --git a/bin/csh/printf.c b/bin/csh/printf.c
index 50b00eaf633..5c46dd5b591 100644
--- a/bin/csh/printf.c
+++ b/bin/csh/printf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: printf.c,v 1.8 1998/08/25 13:35:17 deraadt Exp $	*/
+/*	$OpenBSD: printf.c,v 1.9 2000/01/22 20:24:47 deraadt Exp $	*/
 /*	$NetBSD: printf.c,v 1.6 1995/03/21 09:03:15 cgd Exp $	*/
 
 /*
@@ -46,7 +46,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)printf.c	8.1 (Berkeley) 7/20/93";
 #else
-static char rcsid[] = "$OpenBSD: printf.c,v 1.8 1998/08/25 13:35:17 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: printf.c,v 1.9 2000/01/22 20:24:47 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -56,6 +56,7 @@ static char rcsid[] = "$OpenBSD: printf.c,v 1.8 1998/08/25 13:35:17 deraadt Exp
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 #include <string.h>
 #include <err.h>
 
@@ -92,7 +93,6 @@ main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	extern int optind;
 	static char *skip1, *skip2;
 	int ch, end, fieldwidth, precision;
 	char convch, nextch, *format, *fmt, *start;
diff --git a/bin/date/date.c b/bin/date/date.c
index 8a743363f4c..0f46a9f678e 100644
--- a/bin/date/date.c
+++ b/bin/date/date.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: date.c,v 1.13 1999/02/01 07:52:09 d Exp $	*/
+/*	$OpenBSD: date.c,v 1.14 2000/01/22 20:24:48 deraadt Exp $	*/
 /*	$NetBSD: date.c,v 1.11 1995/09/07 06:21:05 jtc Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)date.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$OpenBSD: date.c,v 1.13 1999/02/01 07:52:09 d Exp $";
+static char rcsid[] = "$OpenBSD: date.c,v 1.14 2000/01/22 20:24:48 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -78,8 +78,6 @@ main(argc, argv)
 	int argc;
 	char **argv;
 {
-	extern int optind;
-	extern char *optarg;
 	struct timezone tz;
 	int ch, rflag;
 	char *format, buf[1024];
diff --git a/bin/ed/main.c b/bin/ed/main.c
index 1e4fdc5ebb1..b033ed71ee3 100644
--- a/bin/ed/main.c
+++ b/bin/ed/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.16 1999/12/05 02:37:55 deraadt Exp $	*/
+/*	$OpenBSD: main.c,v 1.17 2000/01/22 20:24:49 deraadt Exp $	*/
 /*	$NetBSD: main.c,v 1.3 1995/03/21 09:04:44 cgd Exp $	*/
 
 /* main.c: This file contains the main control and user-interface routines
@@ -39,7 +39,7 @@ char *copyright =
 #if 0
 static char *rcsid = "@(#)main.c,v 1.1 1994/02/01 00:34:42 alm Exp";
 #else
-static char rcsid[] = "$OpenBSD: main.c,v 1.16 1999/12/05 02:37:55 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.17 2000/01/22 20:24:49 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -64,6 +64,7 @@ static char rcsid[] = "$OpenBSD: main.c,v 1.16 1999/12/05 02:37:55 deraadt Exp $
 #include <sys/wait.h>
 #include <ctype.h>
 #include <setjmp.h>
+#include <unistd.h>
 #include <pwd.h>
 
 #include "ed.h"
@@ -106,9 +107,6 @@ char *dps = "*";		/* default command-line prompt */
 
 char *usage = "usage: %s [-] [-sx] [-p string] [name]\n";
 
-extern int optind;
-extern char *optarg;
-
 /* ed: line editor */
 int
 main(argc, argv)
diff --git a/bin/pax/getoldopt.c b/bin/pax/getoldopt.c
index 7da7f85e1aa..c9b29d0b29f 100644
--- a/bin/pax/getoldopt.c
+++ b/bin/pax/getoldopt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: getoldopt.c,v 1.3 1997/09/01 18:29:52 deraadt Exp $	*/
+/*	$OpenBSD: getoldopt.c,v 1.4 2000/01/22 20:24:51 deraadt Exp $	*/
 /*	$NetBSD: getoldopt.c,v 1.3 1995/03/21 09:07:28 cgd Exp $	*/
 
 /*
@@ -11,7 +11,7 @@
  */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: getoldopt.c,v 1.3 1997/09/01 18:29:52 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: getoldopt.c,v 1.4 2000/01/22 20:24:51 deraadt Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -24,8 +24,6 @@ getoldopt(argc, argv, optstring)
 	char	**argv;
 	char	*optstring;
 {
-	extern char	*optarg;	/* Points to next arg */
-	extern int	optind;		/* Global argv index */
 	static char	*key;		/* Points to next keyletter */
 	static char	use_getopt;	/* !=0 if argv[1][0] was '-' */
 	char		c;
diff --git a/bin/pax/options.c b/bin/pax/options.c
index bb9b25254c3..f1ecc81ce5b 100644
--- a/bin/pax/options.c
+++ b/bin/pax/options.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: options.c,v 1.40 1999/07/28 12:33:40 espie Exp $	*/
+/*	$OpenBSD: options.c,v 1.41 2000/01/22 20:24:52 deraadt Exp $	*/
 /*	$NetBSD: options.c,v 1.6 1996/03/26 23:54:18 mrg Exp $	*/
 
 /*-
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)options.c	8.2 (Berkeley) 4/18/94";
 #else
-static char rcsid[] = "$OpenBSD: options.c,v 1.40 1999/07/28 12:33:40 espie Exp $";
+static char rcsid[] = "$OpenBSD: options.c,v 1.41 2000/01/22 20:24:52 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -205,8 +205,6 @@ pax_options(argc, argv)
 	unsigned int bflg = 0;
 	register char *pt;
 	FSUB tmp;
-	extern char *optarg;
-	extern int optind;
 
 	/*
 	 * process option flags
diff --git a/bin/rmail/rmail.c b/bin/rmail/rmail.c
index 40752724312..496f015256f 100644
--- a/bin/rmail/rmail.c
+++ b/bin/rmail/rmail.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rmail.c,v 1.9 1998/04/30 05:55:06 deraadt Exp $	*/
+/*	$OpenBSD: rmail.c,v 1.10 2000/01/22 20:24:53 deraadt Exp $	*/
 /*	$NetBSD: rmail.c,v 1.8 1995/09/07 06:51:50 jtc Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)rmail.c	8.3 (Berkeley) 5/15/95";
 #else
-static char rcsid[] = "$OpenBSD: rmail.c,v 1.9 1998/04/30 05:55:06 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: rmail.c,v 1.10 2000/01/22 20:24:53 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -81,6 +81,7 @@ static char rcsid[] = "$OpenBSD: rmail.c,v 1.9 1998/04/30 05:55:06 deraadt Exp $
 #include <string.h>
 #include <sysexits.h>
 #include <unistd.h>
+#include <errno.h>
 
 #ifndef MAX
 # define MAX(a, b)	((a) < (b) ? (b) : (a))
@@ -96,8 +97,6 @@ main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	extern char *optarg;
-	extern int errno, optind;
 	FILE *fp;
 	struct stat sb;
 	size_t fplen, fptlen, len;
diff --git a/sbin/dump/dumprmt.c b/sbin/dump/dumprmt.c
index 48dda98ac63..3b659391c4a 100644
--- a/sbin/dump/dumprmt.c
+++ b/sbin/dump/dumprmt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dumprmt.c,v 1.12 1999/01/04 08:11:53 deraadt Exp $	*/
+/*	$OpenBSD: dumprmt.c,v 1.13 2000/01/22 20:24:54 deraadt Exp $	*/
 /*	$NetBSD: dumprmt.c,v 1.17 1997/06/05 16:10:47 mrg Exp $	*/
 
 /*-
@@ -215,7 +215,6 @@ rmtread(buf, count)
 {
 	char line[30];
 	int n, i, cc;
-	extern int errno;
 
 	(void)snprintf(line, sizeof(line), "R%d\n", count);
 	n = rmtcall("read", line);
diff --git a/sbin/dump/traverse.c b/sbin/dump/traverse.c
index 091423186cf..83ada2cb868 100644
--- a/sbin/dump/traverse.c
+++ b/sbin/dump/traverse.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: traverse.c,v 1.5 1998/11/24 01:25:47 deraadt Exp $	*/
+/*	$OpenBSD: traverse.c,v 1.6 2000/01/22 20:24:55 deraadt Exp $	*/
 /*	$NetBSD: traverse.c,v 1.17 1997/06/05 11:13:27 lukem Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)traverse.c	8.2 (Berkeley) 9/23/93";
 #else
-static char rcsid[] = "$OpenBSD: traverse.c,v 1.5 1998/11/24 01:25:47 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: traverse.c,v 1.6 2000/01/22 20:24:55 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -647,7 +647,6 @@ bread(blkno, buf, size)
 	int size;	
 {
 	int cnt, i;
-	extern int errno;
 
 loop:
 	if (lseek(diskfd, ((off_t)blkno << dev_bshift), 0) < 0)
diff --git a/sbin/fsck_ext2fs/main.c b/sbin/fsck_ext2fs/main.c
index 30a798b79d7..3ddd9b31a12 100644
--- a/sbin/fsck_ext2fs/main.c
+++ b/sbin/fsck_ext2fs/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.5 1999/05/23 17:19:22 aaron Exp $	*/
+/*	$OpenBSD: main.c,v 1.6 2000/01/22 20:24:55 deraadt Exp $	*/
 /*	$NetBSD: main.c,v 1.1 1997/06/11 11:21:50 bouyer Exp $	*/
 
 /*
@@ -48,7 +48,7 @@ static char sccsid[] = "@(#)main.c	8.2 (Berkeley) 1/23/94";
 #if 0
 static char rcsid[] = "$NetBSD: main.c,v 1.1 1997/06/11 11:21:50 bouyer Exp $";
 #else
-static char rcsid[] = "$OpenBSD: main.c,v 1.5 1999/05/23 17:19:22 aaron Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.6 2000/01/22 20:24:55 deraadt Exp $";
 #endif
 #endif
 #endif /* not lint */
@@ -86,8 +86,6 @@ main(argc, argv)
 {
 	int ch;
 	int ret = 0;
-	extern char *optarg;
-	extern int optind;
 
 	sync();
 	skipclean = 1;
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index 597a442852e..f1e8d722205 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.15 1999/03/01 07:45:17 d Exp $	*/
+/*	$OpenBSD: main.c,v 1.16 2000/01/22 20:24:56 deraadt Exp $	*/
 /*	$NetBSD: main.c,v 1.22 1996/10/11 20:15:48 thorpej Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)main.c	8.2 (Berkeley) 1/23/94";
 #else
-static char rcsid[] = "$OpenBSD: main.c,v 1.15 1999/03/01 07:45:17 d Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.16 2000/01/22 20:24:56 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -79,8 +79,6 @@ main(argc, argv)
 {
 	int ch;
 	int ret = 0;
-	extern char *optarg;
-	extern int optind;
 
 	sync();
 	skipclean = 1;
diff --git a/sbin/fsck_msdos/main.c b/sbin/fsck_msdos/main.c
index 269c29ba747..99394332a55 100644
--- a/sbin/fsck_msdos/main.c
+++ b/sbin/fsck_msdos/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.8 1997/07/25 19:13:15 mickey Exp $	*/
+/*	$OpenBSD: main.c,v 1.9 2000/01/22 20:24:57 deraadt Exp $	*/
 /*	$NetBSD: main.c,v 1.8 1996/10/17 20:29:53 cgd Exp $	*/
 
 /*
@@ -35,7 +35,7 @@
 
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: main.c,v 1.8 1997/07/25 19:13:15 mickey Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.9 2000/01/22 20:24:57 deraadt Exp $";
 #endif /* not lint */
 
 #include <stdlib.h>
@@ -71,7 +71,6 @@ main(argc, argv)
 	int argc;
 	char **argv;
 {
-	extern int optind;
 	int ret = 0, erg;
 	int ch;
 
diff --git a/sbin/init/init.c b/sbin/init/init.c
index 782bf1f6b72..67ff27722ed 100644
--- a/sbin/init/init.c
+++ b/sbin/init/init.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init.c,v 1.17 1999/09/03 18:11:49 deraadt Exp $	*/
+/*	$OpenBSD: init.c,v 1.18 2000/01/22 20:24:58 deraadt Exp $	*/
 /*	$NetBSD: init.c,v 1.22 1996/05/15 23:29:33 jtc Exp $	*/
 
 /*-
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)init.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$OpenBSD: init.c,v 1.17 1999/09/03 18:11:49 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: init.c,v 1.18 2000/01/22 20:24:58 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -451,7 +451,6 @@ getsecuritylevel()
 #ifdef KERN_SECURELVL
 	int name[2], curlevel;
 	size_t len;
-	extern int errno;
 
 	name[0] = CTL_KERN;
 	name[1] = KERN_SECURELVL;
diff --git a/sbin/mount_ext2fs/mount_ext2fs.c b/sbin/mount_ext2fs/mount_ext2fs.c
index 7af72de2ce9..41c6a133853 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.c
+++ b/sbin/mount_ext2fs/mount_ext2fs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_ext2fs.c,v 1.6 1997/08/20 05:10:19 millert Exp $	*/
+/*	$OpenBSD: mount_ext2fs.c,v 1.7 2000/01/22 20:25:00 deraadt Exp $	*/
 /*	$NetBSD: mount_ffs.c,v 1.3 1996/04/13 01:31:19 jtc Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount_ufs.c	8.2 (Berkeley) 3/27/94";
 #else
-static char rcsid[] = "$OpenBSD: mount_ext2fs.c,v 1.6 1997/08/20 05:10:19 millert Exp $";
+static char rcsid[] = "$OpenBSD: mount_ext2fs.c,v 1.7 2000/01/22 20:25:00 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -73,7 +73,6 @@ main(argc, argv)
 	int argc;
 	char * const argv[];
 {
-	extern int optreset;
 	struct ufs_args args;		/* XXX ffs_args */
 	int ch, mntflags;
 	char *fs_name, *errcause;
diff --git a/sbin/mount_ffs/mount_ffs.c b/sbin/mount_ffs/mount_ffs.c
index 2f0e2d073e9..ff6b53e5d8c 100644
--- a/sbin/mount_ffs/mount_ffs.c
+++ b/sbin/mount_ffs/mount_ffs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_ffs.c,v 1.8 1997/08/20 05:34:24 millert Exp $	*/
+/*	$OpenBSD: mount_ffs.c,v 1.9 2000/01/22 20:25:01 deraadt Exp $	*/
 /*	$NetBSD: mount_ffs.c,v 1.3 1996/04/13 01:31:19 jtc Exp $	*/
 
 /*-
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)mount_ufs.c	8.2 (Berkeley) 3/27/94";
 #else
-static char rcsid[] = "$OpenBSD: mount_ffs.c,v 1.8 1997/08/20 05:34:24 millert Exp $";
+static char rcsid[] = "$OpenBSD: mount_ffs.c,v 1.9 2000/01/22 20:25:01 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -76,7 +76,6 @@ main(argc, argv)
 	int argc;
 	char * const argv[];
 {
-	extern int optreset;
 	struct ufs_args args;		/* XXX ffs_args */
 	int ch, mntflags;
 	char *fs_name, *errcause;
diff --git a/sbin/mount_xfs/mount_xfs.c b/sbin/mount_xfs/mount_xfs.c
index 3aeb2029ea2..b789f90a65d 100644
--- a/sbin/mount_xfs/mount_xfs.c
+++ b/sbin/mount_xfs/mount_xfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount_xfs.c,v 1.5 1998/12/21 14:19:42 art Exp $	*/
+/*	$OpenBSD: mount_xfs.c,v 1.6 2000/01/22 20:25:02 deraadt Exp $	*/
 /*
  * Copyright (c) 1995, 1996, 1997 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
@@ -70,7 +70,6 @@ usage(void)
 int
 main(int argc, char **argv)
 {
-	extern int optreset;
 	int ch;
 	int mntflags = 0;
 
diff --git a/sbin/nfsd/nfsd.c b/sbin/nfsd/nfsd.c
index 6faa1305ea3..75fdfd6ba3f 100644
--- a/sbin/nfsd/nfsd.c
+++ b/sbin/nfsd/nfsd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfsd.c,v 1.10 1999/02/24 09:51:12 deraadt Exp $	*/
+/*	$OpenBSD: nfsd.c,v 1.11 2000/01/22 20:25:03 deraadt Exp $	*/
 /*	$NetBSD: nfsd.c,v 1.19 1996/02/18 23:18:56 mycroft Exp $	*/
 
 /*
@@ -139,7 +139,6 @@ main(argc, argv, envp)
 	int argc;
 	char *argv[], *envp[];
 {
-	extern int optind;
 	struct group *grp;
 	struct nfsd_args nfsdargs;
 	struct passwd *pwd;
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index 689883e2d1f..d78cd887fe9 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ping.c,v 1.40 1999/10/12 18:10:16 hugh Exp $	*/
+/*	$OpenBSD: ping.c,v 1.41 2000/01/22 20:25:04 deraadt Exp $	*/
 /*	$NetBSD: ping.c,v 1.20 1995/08/11 22:37:58 cgd Exp $	*/
 
 /*
@@ -47,7 +47,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)ping.c	8.1 (Berkeley) 6/5/93";
 #else
-static char rcsid[] = "$OpenBSD: ping.c,v 1.40 1999/10/12 18:10:16 hugh Exp $";
+static char rcsid[] = "$OpenBSD: ping.c,v 1.41 2000/01/22 20:25:04 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -187,8 +187,6 @@ main(argc, argv)
 	int argc;
 	char **argv;
 {
-	extern int errno, optind;
-	extern char *optarg;
 	struct timeval timeout;
 	struct hostent *hp;
 	struct sockaddr_in *to;
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index 1e01de66857..5f26066c92e 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ping6.c,v 1.1 1999/12/11 08:43:19 itojun Exp $	*/
+/*	$OpenBSD: ping6.c,v 1.2 2000/01/22 20:25:05 deraadt Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -246,8 +246,6 @@ main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	extern int errno, optind;
-	extern char *optarg;
 	struct itimerval itimer;
 	struct sockaddr_in6 from;
 	struct timeval timeout;
diff --git a/sbin/route/route.c b/sbin/route/route.c
index 79e6decb455..fda8da7984d 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: route.c,v 1.35 1999/12/08 07:55:54 itojun Exp $	*/
+/*	$OpenBSD: route.c,v 1.36 2000/01/22 20:25:06 deraadt Exp $	*/
 /*	$NetBSD: route.c,v 1.16 1996/04/15 18:27:05 cgd Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #if 0
 static char sccsid[] = "@(#)route.c	8.3 (Berkeley) 3/19/94";
 #else
-static char rcsid[] = "$OpenBSD: route.c,v 1.35 1999/12/08 07:55:54 itojun Exp $";
+static char rcsid[] = "$OpenBSD: route.c,v 1.36 2000/01/22 20:25:06 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -158,7 +158,6 @@ main(argc, argv)
 	int argc;
 	char **argv;
 {
-	extern int optind;
 	int ch;
 
 	if (argc < 2)
diff --git a/sbin/scsi/scsi.c b/sbin/scsi/scsi.c
index a23192e71f8..94c905c1899 100644
--- a/sbin/scsi/scsi.c
+++ b/sbin/scsi/scsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsi.c,v 1.5 1997/12/10 05:02:02 angelos Exp $	*/
+/*	$OpenBSD: scsi.c,v 1.6 2000/01/22 20:25:07 deraadt Exp $	*/
 /*	$FreeBSD: scsi.c,v 1.11 1996/04/06 11:00:28 joerg Exp $	*/
 
 /*
@@ -107,8 +107,6 @@ void procargs(int *argc_p, char ***argv_p)
 {
 	int argc = *argc_p;
 	char **argv = *argv_p;
-	extern char        *optarg;
-	extern int          optind;
 	int		    fflag,
 	                    ch;
 
diff --git a/sbin/sysctl/pathconf.c b/sbin/sysctl/pathconf.c
index e597f4d255d..6879372febf 100644
--- a/sbin/sysctl/pathconf.c
+++ b/sbin/sysctl/pathconf.c
@@ -86,8 +86,6 @@ main(argc, argv)
 	int argc;
 	char *argv[];
 {
-	extern char *optarg;
-	extern int optind;
 	char *path;
 	int ch;