Index: head/lib/libkvm/Makefile
===================================================================
--- head/lib/libkvm/Makefile
+++ head/lib/libkvm/Makefile
@@ -6,7 +6,7 @@
 
 SHLIBDIR?= /lib
 SHLIB_MAJOR=	7
-CFLAGS+=-DLIBC_SCCS -I${.CURDIR}
+CFLAGS+=-DNO__SCCSID -I${.CURDIR}
 
 WARNS?=	6
 
Index: head/lib/libkvm/kvm.c
===================================================================
--- head/lib/libkvm/kvm.c
+++ head/lib/libkvm/kvm.c
@@ -35,12 +35,7 @@
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm.c	8.2 (Berkeley) 2/13/94";
-#endif
-#endif /* LIBC_SCCS and not lint */
+__SCCSID("@(#)kvm.c	8.2 (Berkeley) 2/13/94");
 
 #include <sys/param.h>
 #include <sys/fnv_hash.h>
Index: head/lib/libkvm/kvm_amd64.c
===================================================================
--- head/lib/libkvm/kvm_amd64.c
+++ head/lib/libkvm/kvm_amd64.c
@@ -35,12 +35,7 @@
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* LIBC_SCCS and not lint */
+__SCCSID("@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93");
 
 /*
  * AMD64 machine dependent routines for kvm.  Hopefully, the forthcoming
Index: head/lib/libkvm/kvm_getloadavg.c
===================================================================
--- head/lib/libkvm/kvm_getloadavg.c
+++ head/lib/libkvm/kvm_getloadavg.c
@@ -31,12 +31,7 @@
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm_getloadavg.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* LIBC_SCCS and not lint */
+__SCCSID("@(#)kvm_getloadavg.c	8.1 (Berkeley) 6/4/93");
 
 #include <sys/param.h>
 #include <sys/time.h>
Index: head/lib/libkvm/kvm_i386.c
===================================================================
--- head/lib/libkvm/kvm_i386.c
+++ head/lib/libkvm/kvm_i386.c
@@ -35,12 +35,7 @@
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* LIBC_SCCS and not lint */
+__SCCSID("@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93");
 
 /*
  * i386 machine dependent routines for kvm.  Hopefully, the forthcoming
Index: head/lib/libkvm/kvm_proc.c
===================================================================
--- head/lib/libkvm/kvm_proc.c
+++ head/lib/libkvm/kvm_proc.c
@@ -33,14 +33,9 @@
  * SUCH DAMAGE.
  */
 
-#if 0
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)kvm_proc.c	8.3 (Berkeley) 9/23/93";
-#endif /* LIBC_SCCS and not lint */
-#endif
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
+__SCCSID("@(#)kvm_proc.c	8.3 (Berkeley) 9/23/93");
 
 /*
  * Proc traversal interface for kvm.  ps and w are (probably) the exclusive
Index: head/lib/libkvm/kvm_sparc64.c
===================================================================
--- head/lib/libkvm/kvm_sparc64.c
+++ head/lib/libkvm/kvm_sparc64.c
@@ -37,12 +37,7 @@
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
-
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char sccsid[] = "@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93";
-#endif
-#endif /* LIBC_SCCS and not lint */
+__SCCSID("@(#)kvm_hp300.c	8.1 (Berkeley) 6/4/93");
 
 /*
  * sparc64 machine dependent routines for kvm.