diff --git a/usr.bin/hexdump/display.c b/usr.bin/hexdump/display.c
index 9da5bf942bae..ec957b721a83 100644
--- a/usr.bin/hexdump/display.c
+++ b/usr.bin/hexdump/display.c
@@ -233,7 +233,6 @@ static char **_argv;
 u_char *
 get()
 {
-	extern int length;
 	static int ateof = 1;
 	static u_char *curp, *savp;
 	register int n;
@@ -304,8 +303,6 @@ get()
 	}
 }
 
-extern off_t skip;			/* bytes to skip */
-
 int
 next(argv)
 	char **argv;
diff --git a/usr.bin/hexdump/hexdump.h b/usr.bin/hexdump/hexdump.h
index 70cad3e78a54..360fe5da35ba 100644
--- a/usr.bin/hexdump/hexdump.h
+++ b/usr.bin/hexdump/hexdump.h
@@ -74,7 +74,10 @@ typedef struct _fs {			/* format strings */
 extern FS *fshead;			/* head of format strings list */
 extern int blocksize;			/* data block size */
 extern int odmode;			/* are we acting as od(1)? */
+extern int length;			/* amount of data to read */
+extern off_t skip;			/* amount of data to skip at start */
 enum _vflag { ALL, DUP, FIRST, WAIT };	/* -v values */
+extern enum _vflag vflag;
 
 void	 add(const char *);
 void	 addfile(char *);
diff --git a/usr.bin/hexdump/hexsyntax.c b/usr.bin/hexdump/hexsyntax.c
index 72ec69f338ef..74b64c615a07 100644
--- a/usr.bin/hexdump/hexsyntax.c
+++ b/usr.bin/hexdump/hexsyntax.c
@@ -56,9 +56,6 @@ newsyntax(argc, argvp)
 	int argc;
 	char ***argvp;
 {
-	extern enum _vflag vflag;
-	extern FS *fshead;
-	extern int length;
 	int ch;
 	char *p, **argv;
 
diff --git a/usr.bin/hexdump/odsyntax.c b/usr.bin/hexdump/odsyntax.c
index 2f378882dfd5..214b94963f6d 100644
--- a/usr.bin/hexdump/odsyntax.c
+++ b/usr.bin/hexdump/odsyntax.c
@@ -59,8 +59,6 @@ oldsyntax(argc, argvp)
 	int argc;
 	char ***argvp;
 {
-	extern enum _vflag vflag;
-	extern FS *fshead;
 	int ch;
 	char **argv;
 
@@ -159,7 +157,6 @@ odoffset(argc, argvp)
 	int argc;
 	char ***argvp;
 {
-	extern off_t skip;
 	unsigned char *p, *num, *end;
 	int base;