diff --git a/lib/librpcsvc/rnusers.c b/lib/librpcsvc/rnusers.c
index 3a4629fce741..538a2c9cc5f5 100644
--- a/lib/librpcsvc/rnusers.c
+++ b/lib/librpcsvc/rnusers.c
@@ -27,6 +27,10 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #if !defined(lint) && defined(SCCSIDS)
 static char sccsid[] = "@(#)rnusers.c	1.2 91/03/11 TIRPC 1.0; from 1.7 89/03/24 SMI";
 #endif
diff --git a/lib/librpcsvc/rstat.c b/lib/librpcsvc/rstat.c
index 6851c75892e7..e857f0204831 100644
--- a/lib/librpcsvc/rstat.c
+++ b/lib/librpcsvc/rstat.c
@@ -27,6 +27,10 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #if !defined(lint) && defined(SCCSIDS)
 static char sccsid[] = "@(#)rstat.c	1.2 91/03/11 TIRPC 1.0; from 1.6 89/03/24 SMI";
 #endif
diff --git a/lib/librpcsvc/rwall.c b/lib/librpcsvc/rwall.c
index 97de86e29add..c530523c49c5 100644
--- a/lib/librpcsvc/rwall.c
+++ b/lib/librpcsvc/rwall.c
@@ -27,6 +27,10 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #if !defined(lint) && defined(SCCSIDS)
 static char sccsid[] = "@(#)rwall.c	1.2 91/03/11 TIRPC 1.0; from  1.3 89/03/24 SMI";
 #endif
diff --git a/lib/librpcsvc/secretkey.c b/lib/librpcsvc/secretkey.c
index 374372b787d4..136bdb9c2c0b 100644
--- a/lib/librpcsvc/secretkey.c
+++ b/lib/librpcsvc/secretkey.c
@@ -27,6 +27,10 @@
  * 2550 Garcia Avenue
  * Mountain View, California  94043
  */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #if !defined(lint) && defined(SCCSIDS)
 static char sccsid[] = "@(#)secretkey.c 1.8 91/03/11 Copyr 1986 Sun Micro";
 #endif
diff --git a/lib/librpcsvc/xcrypt.c b/lib/librpcsvc/xcrypt.c
index f2b54a54e57c..9d9d9f2662e9 100644
--- a/lib/librpcsvc/xcrypt.c
+++ b/lib/librpcsvc/xcrypt.c
@@ -32,17 +32,14 @@
  * Copyright (C) 1986, Sun Microsystems, Inc. 
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/cdefs.h>
 #include <rpc/des_crypt.h>
 
-#ifndef lint
-/*from: static char sccsid[] = "@(#)xcrypt.c	2.2 88/08/10 4.0 RPCSRC"; */
-static const char rcsid[] = "$FreeBSD$";
-#endif
-
 static char hex[];	/* forward */
 static char hexval __P(( char ));
 static void bin2hex __P(( int, unsigned char *, char * ));
diff --git a/lib/librpcsvc/yp_passwd.c b/lib/librpcsvc/yp_passwd.c
index 254e14ef6223..b43669c05be3 100644
--- a/lib/librpcsvc/yp_passwd.c
+++ b/lib/librpcsvc/yp_passwd.c
@@ -30,6 +30,9 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <stdlib.h>
 #include <rpc/rpc.h>
 #include <rpcsvc/yp_prot.h>
@@ -37,11 +40,6 @@
 #include <rpcsvc/yppasswd.h>
 #include <netinet/in.h>
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
-
 /*
  * XXX <rpcsvc/yppasswd.h> does a typedef that makes 'yppasswd'
  * a type of struct yppasswd. This leads to a namespace collision:
diff --git a/lib/librpcsvc/yp_update.c b/lib/librpcsvc/yp_update.c
index baf4ba01184d..5585e7518229 100644
--- a/lib/librpcsvc/yp_update.c
+++ b/lib/librpcsvc/yp_update.c
@@ -36,6 +36,9 @@
  * Columbia University, New York City
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <stdlib.h>
 #include <rpc/rpc.h>
 #include <rpcsvc/yp_prot.h>
@@ -43,11 +46,6 @@
 #include <rpcsvc/ypupdate_prot.h>
 #include <rpc/key_prot.h>
 
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 #ifndef WINDOW
 #define WINDOW (60*60)
 #endif