diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c
index 6ddee0e4e302..7b5580547454 100644
--- a/usr.bin/systat/main.c
+++ b/usr.bin/systat/main.c
@@ -42,7 +42,7 @@ static char copyright[] =
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: main.c,v 1.6 1997/08/13 06:45:10 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -81,7 +81,7 @@ int     CMDLINE;
 
 static	WINDOW *wload;			/* one line window for load average */
 
-void
+int
 main(argc, argv)
 	int argc;
 	char **argv;
diff --git a/usr.bin/ul/ul.c b/usr.bin/ul/ul.c
index 19a74e6b56ad..f6fbdf035b7e 100644
--- a/usr.bin/ul/ul.c
+++ b/usr.bin/ul/ul.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)ul.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: ul.c,v 1.4 1997/08/20 11:01:59 charnier Exp $";
 #endif /* not lint */
 
 #include <err.h>
@@ -99,7 +99,7 @@ void outc __P((int));
 
 #define	PRINT(s)	if (s == NULL) /* void */; else tputs(s, 1, outchar)
 
-void
+int
 main(argc, argv)
 	int argc;
 	char **argv;
diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c
index 8c0ffc6843b7..b0c069bcb897 100644
--- a/usr.bin/unexpand/unexpand.c
+++ b/usr.bin/unexpand/unexpand.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)unexpand.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: unexpand.c,v 1.2 1997/08/20 11:05:28 charnier Exp $";
 #endif /* not lint */
 
 /*
@@ -58,7 +58,7 @@ int	all;
 static void usage __P((void));
 void tabify __P((char));
 
-void
+int
 main(argc, argv)
 	int argc;
 	char *argv[];
diff --git a/usr.bin/unifdef/unifdef.c b/usr.bin/unifdef/unifdef.c
index f97d296679cc..58b92de9ceaf 100644
--- a/usr.bin/unifdef/unifdef.c
+++ b/usr.bin/unifdef/unifdef.c
@@ -45,7 +45,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)unifdef.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: unifdef.c,v 1.2 1997/08/20 11:07:53 charnier Exp $";
 #endif /* not lint */
 
 /*
@@ -108,7 +108,7 @@ void pfile __P((void));
 int doif __P((int, int, Reject_level, int));
 int findsym __P((char *));
 
-void
+int
 main (argc, argv)
 int argc;
 char **argv;
diff --git a/usr.bin/unvis/unvis.c b/usr.bin/unvis/unvis.c
index cdec94c20fce..1549fd9ac249 100644
--- a/usr.bin/unvis/unvis.c
+++ b/usr.bin/unvis/unvis.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)unvis.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: unvis.c,v 1.3 1997/08/21 06:52:43 charnier Exp $";
 #endif /* not lint */
 
 #include <err.h>
@@ -53,7 +53,7 @@ static const char rcsid[] =
 void process __P((FILE *, char *));
 static void usage __P((void));
 
-void
+int
 main(argc, argv)
 	char *argv[];
 {
diff --git a/usr.bin/users/users.c b/usr.bin/users/users.c
index 5e5c2bba9f66..a3ab2b5ba8c9 100644
--- a/usr.bin/users/users.c
+++ b/usr.bin/users/users.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)users.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: users.c,v 1.3 1997/08/22 06:50:33 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -58,7 +58,7 @@ typedef char   namebuf[UT_NAMESIZE];
 int scmp __P((const void *, const void *));
 static void usage __P((void));
 
-void
+int
 main(argc, argv)
 	int argc;
 	char **argv;
diff --git a/usr.bin/vgrind/vfontedpr.c b/usr.bin/vgrind/vfontedpr.c
index fd812b0791e4..9edb65a5cd11 100644
--- a/usr.bin/vgrind/vfontedpr.c
+++ b/usr.bin/vgrind/vfontedpr.c
@@ -42,7 +42,7 @@ static const char copyright[] =
 static char sccsid[] = "@(#)vfontedpr.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id$";
+	"$Id: vfontedpr.c,v 1.8 1997/08/25 06:36:03 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -131,7 +131,7 @@ char	*language = "c";	/* the language indicator */
 
 #define	ps(x)	printf("%s", x)
 
-void
+int
 main(argc, argv)
     int argc;
     char *argv[];