diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c
index 0c803df7dd1..03fdf3126b9 100644
--- a/usr.bin/m4/eval.c
+++ b/usr.bin/m4/eval.c
@@ -37,9 +37,17 @@
  * SUCH DAMAGE.
  */
 
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)eval.c	8.2 (Berkeley) 4/27/95";
+#else
+#if 0
+static char rcsid[] = "$OpenBSD: eval.c,v 1.44 2002/04/26 16:15:16 espie Exp $";
+#endif
+#endif
+#endif /* not lint */
+
 #include <sys/cdefs.h>
-__SCCSID("@(#)eval.c	8.2 (Berkeley) 4/27/95");
-__RCSID_SOURCE("$OpenBSD: eval.c,v 1.44 2002/04/26 16:15:16 espie Exp $");
 __FBSDID("$FreeBSD$");
 
 /*
diff --git a/usr.bin/m4/expr.c b/usr.bin/m4/expr.c
index eb52b3a2f2a..997a5a6d7cc 100644
--- a/usr.bin/m4/expr.c
+++ b/usr.bin/m4/expr.c
@@ -37,9 +37,17 @@
  * SUCH DAMAGE.
  */
 
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)expr.c	8.2 (Berkeley) 4/29/95";
+#else
+#if 0
+static char rcsid[] = "$OpenBSD: expr.c,v 1.14 2002/04/26 16:15:16 espie Exp $";
+#endif
+#endif
+#endif /* not lint */
+
 #include <sys/cdefs.h>
-__SCCSID("@(#)expr.c	8.2 (Berkeley) 4/29/95");
-__RCSID_SOURCE("$OpenBSD: expr.c,v 1.14 2002/04/26 16:15:16 espie Exp $");
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
diff --git a/usr.bin/m4/look.c b/usr.bin/m4/look.c
index ed9039c3cf3..2a3e5c7b83e 100644
--- a/usr.bin/m4/look.c
+++ b/usr.bin/m4/look.c
@@ -36,9 +36,13 @@
  * SUCH DAMAGE.
  */
 
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)look.c	8.1 (Berkeley) 6/6/93";
+#endif /* not lint */
+#endif
+
 #include <sys/cdefs.h>
-__SCCSID("@(#)look.c	8.1 (Berkeley) 6/6/93");
-__RCSID_SOURCE("$OpenBSD: look.c,v 1.10 2002/04/26 16:15:16 espie Exp $");
 __FBSDID("$FreeBSD$");
 
 /*
diff --git a/usr.bin/m4/main.c b/usr.bin/m4/main.c
index ca01cb07d9e..18dccb4a8ef 100644
--- a/usr.bin/m4/main.c
+++ b/usr.bin/m4/main.c
@@ -37,11 +37,23 @@
  * SUCH DAMAGE.
  */
 
+#ifndef lint
+static char copyright[] =
+"@(#) Copyright (c) 1989, 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.1 (Berkeley) 6/6/93";
+#else
+#if 0
+static char rcsid[] = "$OpenBSD: main.c,v 1.53 2002/04/26 16:15:16 espie Exp $";
+#endif
+#endif
+#endif /* not lint */
+
 #include <sys/cdefs.h>
-__COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
-	The Regents of the University of California.  All rights reserved.\n");
-__SCCSID("@(#)main.c	8.1 (Berkeley) 6/6/93");
-__RCSID_SOURCE("$OpenBSD: main.c,v 1.53 2002/04/26 16:15:16 espie Exp $");
 __FBSDID("$FreeBSD$");
 
 /*
diff --git a/usr.bin/m4/misc.c b/usr.bin/m4/misc.c
index fe1e3ed01c0..dd4941a3154 100644
--- a/usr.bin/m4/misc.c
+++ b/usr.bin/m4/misc.c
@@ -37,9 +37,17 @@
  * SUCH DAMAGE.
  */
 
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
+#else
+#if 0
+static char rcsid[] = "$OpenBSD: misc.c,v 1.27 2002/04/26 16:15:16 espie Exp $";
+#endif
+#endif
+#endif /* not lint */
+
 #include <sys/cdefs.h>
-__SCCSID("@(#)misc.c	8.1 (Berkeley) 6/6/93");
-__RCSID_SOURCE("$OpenBSD: misc.c,v 1.27 2002/04/26 16:15:16 espie Exp $");
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
diff --git a/usr.bin/m4/trace.c b/usr.bin/m4/trace.c
index 7765a4a5b58..a9f66d2722a 100644
--- a/usr.bin/m4/trace.c
+++ b/usr.bin/m4/trace.c
@@ -25,7 +25,6 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID_SOURCE("$OpenBSD: trace.c,v 1.6 2002/04/26 16:15:16 espie Exp $");
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>