diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c
index 209c5a54e99..d3ab5cdcf8a 100644
--- a/sbin/restore/interactive.c
+++ b/sbin/restore/interactive.c
@@ -31,10 +31,11 @@
 #if 0
 static char sccsid[] = "@(#)interactive.c	8.5 (Berkeley) 5/1/95";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/stat.h>
 
@@ -753,7 +754,7 @@ fcmp(const void *f1, const void *f2)
  * respond to interrupts
  */
 void
-onintr(int signo)
+onintr(int signo __unused)
 {
 	if (command == 'i' && runshell)
 		longjmp(reset, 1);
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index d8825c9e3df..63fb4efd347 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -37,10 +37,11 @@ static const char copyright[] =
 #if 0
 static char sccsid[] = "@(#)main.c	8.6 (Berkeley) 5/4/95";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/stat.h>
 
diff --git a/sbin/restore/restore.c b/sbin/restore/restore.c
index a1a8c885348..046c0d27afc 100644
--- a/sbin/restore/restore.c
+++ b/sbin/restore/restore.c
@@ -31,10 +31,11 @@
 #if 0
 static char sccsid[] = "@(#)restore.c	8.3 (Berkeley) 9/13/94";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 
 #include <limits.h>
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index ea5d37f2edb..32459260c13 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -36,10 +36,11 @@
 #if 0
 static char sccsid[] = "@(#)tape.c	8.9 (Berkeley) 5/1/95";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/mtio.h>