diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c
index 7ae642aa91b..c4763bc7542 100644
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -34,15 +34,13 @@
  * 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.
+ *
+ * @(#)arch.c	8.2 (Berkeley) 1/2/94
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)arch.c	8.2 (Berkeley) 1/2/94";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
+#include <sys/cdefs.h>
+__RCSID("$FreeBSD$");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c
index f1ebfc178d9..dfa624041ba 100644
--- a/usr.bin/make/buf.c
+++ b/usr.bin/make/buf.c
@@ -34,15 +34,13 @@
  * 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.
+ *
+ * @(#)buf.c	8.1 (Berkeley) 6/6/93
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)buf.c	8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
+#include <sys/cdefs.h>
+__RCSID("$FreeBSD$");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c
index 4e14429dbf5..c5dcf5c420c 100644
--- a/usr.bin/make/compat.c
+++ b/usr.bin/make/compat.c
@@ -34,15 +34,13 @@
  * 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.
+ *
+ * @(#)compat.c	8.2 (Berkeley) 3/19/94
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)compat.c	8.2 (Berkeley) 3/19/94";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
+#include <sys/cdefs.h>
+__RCSID("$FreeBSD$");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index 88917aaad56..e0929352c4d 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -34,15 +34,13 @@
  * 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.
+ *
+ * @(#)cond.c	8.2 (Berkeley) 1/2/94
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)cond.c	8.2 (Berkeley) 1/2/94";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
+#include <sys/cdefs.h>
+__RCSID("$FreeBSD$");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index 614acd1f518..b5b762af9f1 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -34,15 +34,13 @@
  * 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.
+ *
+ * @(#)dir.c	8.2 (Berkeley) 1/2/94
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)dir.c	8.2 (Berkeley) 1/2/94";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
+#include <sys/cdefs.h>
+__RCSID("$FreeBSD$");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/for.c b/usr.bin/make/for.c
index 9db93c3eeaf..882de11422e 100644
--- a/usr.bin/make/for.c
+++ b/usr.bin/make/for.c
@@ -29,15 +29,13 @@
  * 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.
+ *
+ * @(#)for.c	8.1 (Berkeley) 6/6/93
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)for.c	8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
+#include <sys/cdefs.h>
+__RCSID("$FreeBSD$");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/hash.c b/usr.bin/make/hash.c
index 6b50fd364cc..5053c287d6d 100644
--- a/usr.bin/make/hash.c
+++ b/usr.bin/make/hash.c
@@ -34,15 +34,13 @@
  * 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.
+ *
+ * @(#)hash.c	8.1 (Berkeley) 6/6/93
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)hash.c	8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
+#include <sys/cdefs.h>
+__RCSID("$FreeBSD$");
 #endif /* not lint */
 
 /* hash.c --
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index 25d9bebb51f..f553768322b 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -34,15 +34,13 @@
  * 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.
+ *
+ * @(#)job.c	8.2 (Berkeley) 3/19/94
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)job.c	8.2 (Berkeley) 3/19/94";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
+#include <sys/cdefs.h>
+__RCSID("$FreeBSD$");
 #endif /* not lint */
 
 #ifndef OLD_JOKE
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index 3fe39ed432e..6f58f4813b7 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -34,21 +34,15 @@
  * 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.
+ *
+ * @(#)main.c      8.3 (Berkeley) 3/19/94
  */
 
 #ifndef lint
-static const char copyright[] =
-"@(#) Copyright (c) 1988, 1989, 1990, 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.3 (Berkeley) 3/19/94";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
+#include <sys/cdefs.h>
+__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n");
+__RCSID("$FreeBSD$");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c
index fcf8422df55..5829f60024a 100644
--- a/usr.bin/make/make.c
+++ b/usr.bin/make/make.c
@@ -34,15 +34,13 @@
  * 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.
+ *
+ * @(#)make.c	8.1 (Berkeley) 6/6/93
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)make.c	8.1 (Berkeley) 6/6/93";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
+#include <sys/cdefs.h>
+__RCSID("$FreeBSD$");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index e7e5daf9deb..ea2558256ff 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -34,15 +34,13 @@
  * 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.
+ *
+ * @(#)parse.c	8.3 (Berkeley) 3/19/94
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)parse.c	8.3 (Berkeley) 3/19/94";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
+#include <sys/cdefs.h>
+__RCSID("$FreeBSD$");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/str.c b/usr.bin/make/str.c
index 9607d5b2098..3f8c104d6bc 100644
--- a/usr.bin/make/str.c
+++ b/usr.bin/make/str.c
@@ -34,15 +34,13 @@
  * 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.
+ *
+ * @(#)str.c	5.8 (Berkeley) 6/1/90
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)str.c	5.8 (Berkeley) 6/1/90";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
+#include <sys/cdefs.h>
+__RCSID("$FreeBSD$");
 #endif /* not lint */
 
 #include "make.h"
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index 81b427a939c..61f8f8e06f6 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -34,15 +34,13 @@
  * 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.
+ *
+ * @(#)suff.c	8.4 (Berkeley) 3/21/94
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)suff.c	8.4 (Berkeley) 3/21/94";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
+#include <sys/cdefs.h>
+__RCSID("$FreeBSD$");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/targ.c b/usr.bin/make/targ.c
index 6394ae2ab0a..26eb17e70cf 100644
--- a/usr.bin/make/targ.c
+++ b/usr.bin/make/targ.c
@@ -34,15 +34,13 @@
  * 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.
+ *
+ * @(#)targ.c	8.2 (Berkeley) 3/19/94
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)targ.c	8.2 (Berkeley) 3/19/94";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
+#include <sys/cdefs.h>
+__RCSID("$FreeBSD$");
 #endif /* not lint */
 
 /*-
diff --git a/usr.bin/make/util.c b/usr.bin/make/util.c
index 7dc73996d83..57ab0c0d2c9 100644
--- a/usr.bin/make/util.c
+++ b/usr.bin/make/util.c
@@ -2,14 +2,15 @@
  * Missing stuff from OS's
  */
 
+#ifndef lint
+#include <sys/cdefs.h>
+__RCSID("$FreeBSD$");
+#endif
+
 #include <stdio.h>
 #include <errno.h>
 #include "make.h"
 
-#ifndef lint
-__RCSID("$FreeBSD$");
-#endif
-
 #if !__STDC__
 # ifndef const
 #  define const
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index 31dfd02a813..d9de5b7de5a 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -34,15 +34,13 @@
  * 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.
+ *
+ * @(#)var.c	8.3 (Berkeley) 3/19/94
  */
 
 #ifndef lint
-#if 0
-static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
+#include <sys/cdefs.h>
+__RCSID("$FreeBSD$");
 #endif /* not lint */
 
 /*-