11 files changed, 3 insertions, 68 deletions
diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile
index f23258a00cd5..99fc7e190bfd 100644
--- a/sbin/restore/Makefile
+++ b/sbin/restore/Makefile
@@ -1,5 +1,3 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/5/93
-
 .PATH: ${.CURDIR:H}/dump
 
 PACKAGE=ufs
diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index 4a25b728e8a0..16fdecba6c18 100644
--- a/sbin/restore/dirs.c
+++ b/sbin/restore/dirs.c
@@ -34,14 +34,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)dirs.c	8.7 (Berkeley) 5/1/95";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
-
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/stat.h>
diff --git a/sbin/restore/extern.h b/sbin/restore/extern.h
index fac58891a355..0b2f85d878c3 100644
--- a/sbin/restore/extern.h
+++ b/sbin/restore/extern.h
@@ -27,8 +27,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)extern.h	8.2 (Berkeley) 1/7/94
  */
 
 struct entry	*addentry(char *, ino_t, int);
diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c
index 336ab61221dc..ea7fc0f18b64 100644
--- a/sbin/restore/interactive.c
+++ b/sbin/restore/interactive.c
@@ -29,13 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)interactive.c	8.5 (Berkeley) 5/1/95";
-#endif
-#endif /* not lint */
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index 6eba6954b6e4..f94b37503d18 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -29,19 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1983, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
-
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/4/95";
-#endif
-#endif /* not lint */
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/stat.h>
 
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index 1499b8d737de..b7b96a1a0d2a 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -25,8 +25,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     @(#)restore.8	8.4 (Berkeley) 5/1/95
-.\"
 .Dd October 12, 2006
 .Dt RESTORE 8
 .Os
diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index 33e97c18c41c..1a5e16174b2c 100644
--- a/sbin/restore/restore.c
+++ b/sbin/restore/restore.c
@@ -29,13 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)restore.c	8.3 (Berkeley) 9/13/94";
-#endif
-#endif /* not lint */
-
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 #include <limits.h>
diff --git a/sbin/restore/restore.h b/sbin/restore/restore.h
index e4db29340b8e..407816993196 100644
--- a/sbin/restore/restore.h
+++ b/sbin/restore/restore.h
@@ -32,8 +32,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)restore.h	8.3 (Berkeley) 9/13/94
  */
 
 /*
@@ -59,7 +57,7 @@ extern long	volno;		/* current volume being read */
 extern long	ntrec;		/* number of TP_BSIZE records per tape block */
 extern time_t	dumptime;	/* time that this dump begins */
 extern time_t	dumpdate;	/* time that this dump was made */
-extern char	command;	/* opration being performed */
+extern char	command;	/* operation being performed */
 extern FILE	*terminal;	/* file descriptor for the terminal input */
 extern int	Bcvt;		/* need byte swapping on inodes and dirs */
 extern int	oldinofmt;	/* reading tape with FreeBSD 1 format inodes */
@@ -73,7 +71,7 @@ struct entry {
 	char	e_type;			/* type of this entry, see below */
 	short	e_flags;		/* status flags, see below */
 	ino_t	e_ino;			/* inode number in previous file sys */
-	long	e_index;		/* unique index (for dumpped table) */
+	long	e_index;		/* unique index (for dumped table) */
 	struct	entry *e_parent;	/* pointer to parent directory (..) */
 	struct	entry *e_sibling;	/* next element in this directory (.) */
 	struct	entry *e_links;		/* hard links to this inode */
diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c
index 49ed39dd2022..3ae6bf20c7be 100644
--- a/sbin/restore/symtab.c
+++ b/sbin/restore/symtab.c
@@ -29,14 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)symtab.c	8.3 (Berkeley) 4/28/95";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
-
 /*
  * These routines maintain the symbol table which tracks the state
  * of the file system being restored. They provide lookup by either
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index c3fe0d7d8b05..5b7cde10c670 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -34,16 +34,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tape.c	8.9 (Berkeley) 5/1/95";
-#endif
-#endif /* not lint */
-
-#include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/mtio.h>
+#include <sys/queue.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/extattr.h>
diff --git a/sbin/restore/utilities.c b/sbin/restore/utilities.c
index a53d42f9e600..c4d4fb1ea42f 100644
--- a/sbin/restore/utilities.c
+++ b/sbin/restore/utilities.c
@@ -29,14 +29,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)utilities.c	8.5 (Berkeley) 4/28/95";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
-
 #include <sys/param.h>
 #include <sys/stat.h>