diff --git a/lib/krb5/acache.c b/lib/krb5/acache.c
index a39e3c6da..421be27cf 100644
--- a/lib/krb5/acache.c
+++ b/lib/krb5/acache.c
@@ -37,12 +37,8 @@
 #include <dlfcn.h>
 #endif
 
-RCSID("$Id$");
-
-/* XXX should we fetch these for each open ? */
 static HEIMDAL_MUTEX acc_mutex = HEIMDAL_MUTEX_INITIALIZER;
 static cc_initialize_func init_func;
-
 #ifdef HAVE_DLOPEN
 static void *cc_handle;
 #endif
diff --git a/lib/krb5/acl.c b/lib/krb5/acl.c
index 285ff89f1..788719dfd 100644
--- a/lib/krb5/acl.c
+++ b/lib/krb5/acl.c
@@ -34,8 +34,6 @@
 #include "krb5_locl.h"
 #include <fnmatch.h>
 
-RCSID("$Id$");
-
 struct acl_field {
     enum { acl_string, acl_fnmatch, acl_retval } type;
     union {
diff --git a/lib/krb5/add_et_list.c b/lib/krb5/add_et_list.c
index f08c0fe71..ccffd93b2 100644
--- a/lib/krb5/add_et_list.c
+++ b/lib/krb5/add_et_list.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 /**
  * Add a specified list of error messages to the et list in context.
  * Call func (probably a comerr-generated function) with a pointer to
diff --git a/lib/krb5/addr_families.c b/lib/krb5/addr_families.c
index 8923340c6..f88fb2276 100644
--- a/lib/krb5/addr_families.c
+++ b/lib/krb5/addr_families.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 struct addr_operations {
     int af;
     krb5_address_type atype;
diff --git a/lib/krb5/aes-test.c b/lib/krb5/aes-test.c
index 053653662..e135e338f 100644
--- a/lib/krb5/aes-test.c
+++ b/lib/krb5/aes-test.c
@@ -38,8 +38,6 @@
 #include <openssl/evp.h>
 #endif
 
-RCSID("$Id$");
-
 static int verbose = 0;
 
 static void
diff --git a/lib/krb5/aname_to_localname.c b/lib/krb5/aname_to_localname.c
index 992b3700c..2986aab92 100644
--- a/lib/krb5/aname_to_localname.c
+++ b/lib/krb5/aname_to_localname.c
@@ -33,8 +33,6 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id$");
-
 krb5_error_code KRB5_LIB_FUNCTION
 krb5_aname_to_localname (krb5_context context,
 			 krb5_const_principal aname,
diff --git a/lib/krb5/appdefault.c b/lib/krb5/appdefault.c
index d49fc4997..383e82dad 100644
--- a/lib/krb5/appdefault.c
+++ b/lib/krb5/appdefault.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 void KRB5_LIB_FUNCTION
 krb5_appdefault_boolean(krb5_context context, const char *appname,
 			krb5_const_realm realm, const char *option,
diff --git a/lib/krb5/asn1_glue.c b/lib/krb5/asn1_glue.c
index 9603dce12..59c0fbd64 100644
--- a/lib/krb5/asn1_glue.c
+++ b/lib/krb5/asn1_glue.c
@@ -37,8 +37,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 krb5_error_code KRB5_LIB_FUNCTION
 _krb5_principal2principalname (PrincipalName *p,
 			       const krb5_principal from)
diff --git a/lib/krb5/auth_context.c b/lib/krb5/auth_context.c
index 66eccbbc0..bfc183d16 100644
--- a/lib/krb5/auth_context.c
+++ b/lib/krb5/auth_context.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 krb5_error_code KRB5_LIB_FUNCTION
 krb5_auth_con_init(krb5_context context,
 		   krb5_auth_context *auth_context)
diff --git a/lib/krb5/build_ap_req.c b/lib/krb5/build_ap_req.c
index 92c03cb78..1550239fa 100644
--- a/lib/krb5/build_ap_req.c
+++ b/lib/krb5/build_ap_req.c
@@ -33,8 +33,6 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id$");
-
 krb5_error_code KRB5_LIB_FUNCTION
 krb5_build_ap_req (krb5_context context,
 		   krb5_enctype enctype,
diff --git a/lib/krb5/build_auth.c b/lib/krb5/build_auth.c
index ce0a905e9..bf77fd4e7 100644
--- a/lib/krb5/build_auth.c
+++ b/lib/krb5/build_auth.c
@@ -33,8 +33,6 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id$");
-
 static krb5_error_code
 make_etypelist(krb5_context context,
 	       krb5_authdata **auth_data)
diff --git a/lib/krb5/cache.c b/lib/krb5/cache.c
index 2283b0092..12097470d 100644
--- a/lib/krb5/cache.c
+++ b/lib/krb5/cache.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 /**
  * @page krb5_ccache_intro The credential cache functions
  * @section section_krb5_ccache Kerberos credential caches
diff --git a/lib/krb5/changepw.c b/lib/krb5/changepw.c
index 585ea845d..207b86b48 100644
--- a/lib/krb5/changepw.c
+++ b/lib/krb5/changepw.c
@@ -35,8 +35,6 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id$");
-
 #undef __attribute__
 #define __attribute__(X)
 
diff --git a/lib/krb5/codec.c b/lib/krb5/codec.c
index c38dea3eb..ebda3e51f 100644
--- a/lib/krb5/codec.c
+++ b/lib/krb5/codec.c
@@ -35,8 +35,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 #ifndef HEIMDAL_SMALLER
 
 krb5_error_code KRB5_LIB_FUNCTION
diff --git a/lib/krb5/config_file.c b/lib/krb5/config_file.c
index 2dba873ef..ee226c78a 100644
--- a/lib/krb5/config_file.c
+++ b/lib/krb5/config_file.c
@@ -32,7 +32,6 @@
  */
 
 #include "krb5_locl.h"
-RCSID("$Id$");
 
 /* Gaah! I want a portable funopen */
 struct fileptr {
diff --git a/lib/krb5/constants.c b/lib/krb5/constants.c
index e67e54dfa..a3b3d09f4 100644
--- a/lib/krb5/constants.c
+++ b/lib/krb5/constants.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 KRB5_LIB_VARIABLE const char *krb5_config_file =
 #ifdef __APPLE__
 "~/Library/Preferences/edu.mit.Kerberos:"
diff --git a/lib/krb5/convert_creds.c b/lib/krb5/convert_creds.c
index 72ee5f0eb..35454bf98 100644
--- a/lib/krb5/convert_creds.c
+++ b/lib/krb5/convert_creds.c
@@ -32,8 +32,6 @@
  */
 
 #include "krb5_locl.h"
-RCSID("$Id$");
-
 #include "krb5-v4compat.h"
 
 #ifndef HEIMDAL_SMALLER
diff --git a/lib/krb5/copy_host_realm.c b/lib/krb5/copy_host_realm.c
index 37e27110b..7f19ddd3d 100644
--- a/lib/krb5/copy_host_realm.c
+++ b/lib/krb5/copy_host_realm.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 /**
  * Copy the list of realms from `from' to `to'.
  *
diff --git a/lib/krb5/creds.c b/lib/krb5/creds.c
index 51eeb3ae3..26c0dfbec 100644
--- a/lib/krb5/creds.c
+++ b/lib/krb5/creds.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 /**
  * Free content of krb5_creds.
  *
diff --git a/lib/krb5/crypto.c b/lib/krb5/crypto.c
index 7fc26afbb..c6fbf7127 100644
--- a/lib/krb5/crypto.c
+++ b/lib/krb5/crypto.c
@@ -31,13 +31,11 @@
  * SUCH DAMAGE.
  */
 
-#include "krb5_locl.h"
-RCSID("$Id$");
-#include <pkinit_asn1.h>
-
-#undef KRB5_DEPRECATED
 #define KRB5_DEPRECATED
 
+#include "krb5_locl.h"
+#include <pkinit_asn1.h>
+
 #define WEAK_ENCTYPES 1
 
 #ifndef HEIMDAL_SMALLER
diff --git a/lib/krb5/data.c b/lib/krb5/data.c
index 888d394ad..993d6058b 100644
--- a/lib/krb5/data.c
+++ b/lib/krb5/data.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 /**
  * Reset the (potentially uninitalized) krb5_data structure.
  *
diff --git a/lib/krb5/derived-key-test.c b/lib/krb5/derived-key-test.c
index 3c354ebed..fe85ff257 100644
--- a/lib/krb5/derived-key-test.c
+++ b/lib/krb5/derived-key-test.c
@@ -33,8 +33,6 @@
 #include "krb5_locl.h"
 #include <err.h>
 
-RCSID("$Id$");
-
 enum { MAXSIZE = 24 };
 
 static struct testcase {
diff --git a/lib/krb5/digest.c b/lib/krb5/digest.c
index 0ae99a800..653fed089 100644
--- a/lib/krb5/digest.c
+++ b/lib/krb5/digest.c
@@ -32,7 +32,6 @@
  */
 
 #include "krb5_locl.h"
-RCSID("$Id$");
 #include "digest_asn1.h"
 
 #ifndef HEIMDAL_SMALLER
diff --git a/lib/krb5/eai_to_heim_errno.c b/lib/krb5/eai_to_heim_errno.c
index 594f998e2..499150f46 100644
--- a/lib/krb5/eai_to_heim_errno.c
+++ b/lib/krb5/eai_to_heim_errno.c
@@ -33,8 +33,6 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id$");
-
 /**
  * Convert the getaddrinfo() error code to a Kerberos et error code.
  *
diff --git a/lib/krb5/error_string.c b/lib/krb5/error_string.c
index 86e0171b8..c73a26815 100644
--- a/lib/krb5/error_string.c
+++ b/lib/krb5/error_string.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 #undef __attribute__(x)
 #define __attribute__(x)
 
diff --git a/lib/krb5/expand_hostname.c b/lib/krb5/expand_hostname.c
index f66be7743..67988d0d7 100644
--- a/lib/krb5/expand_hostname.c
+++ b/lib/krb5/expand_hostname.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 static krb5_error_code
 copy_hostname(krb5_context context,
 	      const char *orig_hostname,
diff --git a/lib/krb5/fcache.c b/lib/krb5/fcache.c
index be243eef3..f8e74f1dd 100644
--- a/lib/krb5/fcache.c
+++ b/lib/krb5/fcache.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 typedef struct krb5_fcache{
     char *filename;
     int version;
diff --git a/lib/krb5/free.c b/lib/krb5/free.c
index da1eb1de1..7f4374374 100644
--- a/lib/krb5/free.c
+++ b/lib/krb5/free.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 krb5_error_code KRB5_LIB_FUNCTION
 krb5_free_kdc_rep(krb5_context context, krb5_kdc_rep *rep)
 {
diff --git a/lib/krb5/free_host_realm.c b/lib/krb5/free_host_realm.c
index 581b61a15..12fa7135c 100644
--- a/lib/krb5/free_host_realm.c
+++ b/lib/krb5/free_host_realm.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 /*
  * Free all memory allocated by `realmlist'
  */
diff --git a/lib/krb5/generate_seq_number.c b/lib/krb5/generate_seq_number.c
index 99745b830..2764f1a91 100644
--- a/lib/krb5/generate_seq_number.c
+++ b/lib/krb5/generate_seq_number.c
@@ -33,8 +33,6 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id$");
-
 krb5_error_code KRB5_LIB_FUNCTION
 krb5_generate_seq_number(krb5_context context,
 			 const krb5_keyblock *key,
diff --git a/lib/krb5/generate_subkey.c b/lib/krb5/generate_subkey.c
index 4ab4b9bf6..efb6cce28 100644
--- a/lib/krb5/generate_subkey.c
+++ b/lib/krb5/generate_subkey.c
@@ -33,8 +33,6 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id$");
-
 krb5_error_code KRB5_LIB_FUNCTION
 krb5_generate_subkey(krb5_context context,
 		     const krb5_keyblock *key,
diff --git a/lib/krb5/get_addrs.c b/lib/krb5/get_addrs.c
index 2bef0ae95..8f366fa14 100644
--- a/lib/krb5/get_addrs.c
+++ b/lib/krb5/get_addrs.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 #ifdef __osf__
 /* hate */
 struct rtentry;
diff --git a/lib/krb5/get_cred.c b/lib/krb5/get_cred.c
index f15ed2abd..e609bcadc 100644
--- a/lib/krb5/get_cred.c
+++ b/lib/krb5/get_cred.c
@@ -33,8 +33,6 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id$");
-
 /*
  * Take the `body' and encode it into `padata' using the credentials
  * in `creds'.
diff --git a/lib/krb5/get_default_principal.c b/lib/krb5/get_default_principal.c
index c804ab9e5..82d064293 100644
--- a/lib/krb5/get_default_principal.c
+++ b/lib/krb5/get_default_principal.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 /*
  * Try to find out what's a reasonable default principal.
  */
diff --git a/lib/krb5/get_default_realm.c b/lib/krb5/get_default_realm.c
index a2518bbab..f09df264c 100644
--- a/lib/krb5/get_default_realm.c
+++ b/lib/krb5/get_default_realm.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 /*
  * Return a NULL-terminated list of default realms in `realms'.
  * Free this memory with krb5_free_host_realm.
diff --git a/lib/krb5/get_for_creds.c b/lib/krb5/get_for_creds.c
index a7072a013..19e48173d 100644
--- a/lib/krb5/get_for_creds.c
+++ b/lib/krb5/get_for_creds.c
@@ -33,8 +33,6 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id$");
-
 static krb5_error_code
 add_addrs(krb5_context context,
 	  krb5_addresses *addr,
diff --git a/lib/krb5/get_host_realm.c b/lib/krb5/get_host_realm.c
index 18aa95f95..7d7fef6e1 100644
--- a/lib/krb5/get_host_realm.c
+++ b/lib/krb5/get_host_realm.c
@@ -34,8 +34,6 @@
 #include "krb5_locl.h"
 #include <resolve.h>
 
-RCSID("$Id$");
-
 /* To automagically find the correct realm of a host (without
  * [domain_realm] in krb5.conf) add a text record for your domain with
  * the name of your realm, like this:
diff --git a/lib/krb5/get_in_tkt.c b/lib/krb5/get_in_tkt.c
index 361809177..84b1ffb71 100644
--- a/lib/krb5/get_in_tkt.c
+++ b/lib/krb5/get_in_tkt.c
@@ -35,8 +35,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 #ifndef HEIMDAL_SMALLER
 
 static krb5_error_code
diff --git a/lib/krb5/get_port.c b/lib/krb5/get_port.c
index c9869eb45..5d0361b81 100644
--- a/lib/krb5/get_port.c
+++ b/lib/krb5/get_port.c
@@ -33,8 +33,6 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id$");
-
 int KRB5_LIB_FUNCTION
 krb5_getportbyname (krb5_context context,
 		    const char *service,
diff --git a/lib/krb5/init_creds_pw.c b/lib/krb5/init_creds_pw.c
index af7ba7068..9c2213703 100644
--- a/lib/krb5/init_creds_pw.c
+++ b/lib/krb5/init_creds_pw.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 typedef struct krb5_get_init_creds_ctx {
     KDCOptions flags;
     krb5_creds cred;
diff --git a/lib/krb5/kcm.c b/lib/krb5/kcm.c
index 170e2efbc..f03434197 100644
--- a/lib/krb5/kcm.c
+++ b/lib/krb5/kcm.c
@@ -43,8 +43,6 @@
 
 #include "kcm.h"
 
-RCSID("$Id$");
-
 typedef struct krb5_kcmcache {
     char *name;
     struct sockaddr_un path;
diff --git a/lib/krb5/keyblock.c b/lib/krb5/keyblock.c
index fefd08f80..57ed7875f 100644
--- a/lib/krb5/keyblock.c
+++ b/lib/krb5/keyblock.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 /**
  * Zero out a keyblock
  *
diff --git a/lib/krb5/keytab.c b/lib/krb5/keytab.c
index 20534218f..fcc74e847 100644
--- a/lib/krb5/keytab.c
+++ b/lib/krb5/keytab.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 /**
  * @page krb5_keytab_intro The keytab handing functions
  * @section section_krb5_keytab Kerberos Keytabs
diff --git a/lib/krb5/keytab_any.c b/lib/krb5/keytab_any.c
index 031567782..02de8c802 100644
--- a/lib/krb5/keytab_any.c
+++ b/lib/krb5/keytab_any.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 struct any_data {
     krb5_keytab kt;
     char *name;
diff --git a/lib/krb5/keytab_file.c b/lib/krb5/keytab_file.c
index 7d45497e9..819366443 100644
--- a/lib/krb5/keytab_file.c
+++ b/lib/krb5/keytab_file.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 #define KRB5_KT_VNO_1 1
 #define KRB5_KT_VNO_2 2
 #define KRB5_KT_VNO   KRB5_KT_VNO_2
diff --git a/lib/krb5/keytab_keyfile.c b/lib/krb5/keytab_keyfile.c
index c0a2baa9f..54666c7d4 100644
--- a/lib/krb5/keytab_keyfile.c
+++ b/lib/krb5/keytab_keyfile.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 #ifndef HEIMDAL_SMALLER
 
 /* afs keyfile operations --------------------------------------- */
diff --git a/lib/krb5/keytab_memory.c b/lib/krb5/keytab_memory.c
index ec5da9a26..73ffa1c67 100644
--- a/lib/krb5/keytab_memory.c
+++ b/lib/krb5/keytab_memory.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 /* memory operations -------------------------------------------- */
 
 struct mkt_data {
diff --git a/lib/krb5/krbhst-test.c b/lib/krb5/krbhst-test.c
index 9c41b665e..873734fce 100644
--- a/lib/krb5/krbhst-test.c
+++ b/lib/krb5/krbhst-test.c
@@ -36,8 +36,6 @@
 #include <err.h>
 #include <getarg.h>
 
-RCSID("$Id$");
-
 static int version_flag = 0;
 static int help_flag	= 0;
 
diff --git a/lib/krb5/kuserok.c b/lib/krb5/kuserok.c
index 03ca1872f..83dde37ca 100644
--- a/lib/krb5/kuserok.c
+++ b/lib/krb5/kuserok.c
@@ -34,8 +34,6 @@
 #include "krb5_locl.h"
 #include <dirent.h>
 
-RCSID("$Id$");
-
 /* see if principal is mentioned in the filename access file, return
    TRUE (in result) if so, FALSE otherwise */
 
diff --git a/lib/krb5/log.c b/lib/krb5/log.c
index 587cf7ed9..31d267320 100644
--- a/lib/krb5/log.c
+++ b/lib/krb5/log.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 struct facility {
     int min;
     int max;
diff --git a/lib/krb5/mcache.c b/lib/krb5/mcache.c
index 752608069..78ef68db3 100644
--- a/lib/krb5/mcache.c
+++ b/lib/krb5/mcache.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 typedef struct krb5_mcache {
     char *name;
     unsigned int refcnt;
diff --git a/lib/krb5/misc.c b/lib/krb5/misc.c
index 4cee5e22e..e47383880 100644
--- a/lib/krb5/misc.c
+++ b/lib/krb5/misc.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 krb5_error_code KRB5_LIB_FUNCTION
 _krb5_s4u2self_to_checksumdata(krb5_context context,
 			       const PA_S4U2Self *self,
diff --git a/lib/krb5/mit_glue.c b/lib/krb5/mit_glue.c
index 99f953f28..dab5c6046 100644
--- a/lib/krb5/mit_glue.c
+++ b/lib/krb5/mit_glue.c
@@ -34,7 +34,6 @@
 #define KRB5_DEPRECATED
 
 #include "krb5_locl.h"
-RCSID("$Id$");
 
 #ifndef HEIMDAL_SMALLER
 
diff --git a/lib/krb5/mk_error.c b/lib/krb5/mk_error.c
index 989aa23d7..f623fc495 100644
--- a/lib/krb5/mk_error.c
+++ b/lib/krb5/mk_error.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 krb5_error_code KRB5_LIB_FUNCTION
 krb5_mk_error(krb5_context context,
 	      krb5_error_code error_code,
diff --git a/lib/krb5/mk_priv.c b/lib/krb5/mk_priv.c
index 86a6b669b..40f09ae33 100644
--- a/lib/krb5/mk_priv.c
+++ b/lib/krb5/mk_priv.c
@@ -33,9 +33,6 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id$");
-
-
 krb5_error_code KRB5_LIB_FUNCTION
 krb5_mk_priv(krb5_context context,
 	     krb5_auth_context auth_context,
diff --git a/lib/krb5/mk_rep.c b/lib/krb5/mk_rep.c
index bba276183..8eef0ea65 100644
--- a/lib/krb5/mk_rep.c
+++ b/lib/krb5/mk_rep.c
@@ -33,8 +33,6 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id$");
-
 krb5_error_code KRB5_LIB_FUNCTION
 krb5_mk_rep(krb5_context context,
 	    krb5_auth_context auth_context,
diff --git a/lib/krb5/mk_req.c b/lib/krb5/mk_req.c
index 157063773..c87fa6129 100644
--- a/lib/krb5/mk_req.c
+++ b/lib/krb5/mk_req.c
@@ -33,8 +33,6 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id$");
-
 krb5_error_code KRB5_LIB_FUNCTION
 krb5_mk_req_exact(krb5_context context,
 		  krb5_auth_context *auth_context,
diff --git a/lib/krb5/mk_req_ext.c b/lib/krb5/mk_req_ext.c
index aba804716..d130272aa 100644
--- a/lib/krb5/mk_req_ext.c
+++ b/lib/krb5/mk_req_ext.c
@@ -33,8 +33,6 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id$");
-
 krb5_error_code
 _krb5_mk_req_internal(krb5_context context,
 		      krb5_auth_context *auth_context,
diff --git a/lib/krb5/mk_safe.c b/lib/krb5/mk_safe.c
index 24e3dbe25..5b7580d8a 100644
--- a/lib/krb5/mk_safe.c
+++ b/lib/krb5/mk_safe.c
@@ -33,8 +33,6 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id$");
-
 krb5_error_code KRB5_LIB_FUNCTION
 krb5_mk_safe(krb5_context context,
 	     krb5_auth_context auth_context,
diff --git a/lib/krb5/n-fold-test.c b/lib/krb5/n-fold-test.c
index 264a7cb13..452964522 100644
--- a/lib/krb5/n-fold-test.c
+++ b/lib/krb5/n-fold-test.c
@@ -32,8 +32,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 enum { MAXSIZE = 24 };
 
 static struct testcase {
diff --git a/lib/krb5/n-fold.c b/lib/krb5/n-fold.c
index 39b70a872..0623f6aae 100644
--- a/lib/krb5/n-fold.c
+++ b/lib/krb5/n-fold.c
@@ -32,8 +32,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 static krb5_error_code
 rr13(unsigned char *buf, size_t len)
 {
diff --git a/lib/krb5/name-45-test.c b/lib/krb5/name-45-test.c
index 3377f4571..747dbccda 100644
--- a/lib/krb5/name-45-test.c
+++ b/lib/krb5/name-45-test.c
@@ -35,8 +35,6 @@
 #include "krb5_locl.h"
 #include <err.h>
 
-RCSID("$Id$");
-
 enum { MAX_COMPONENTS = 3 };
 
 static struct testcase {
diff --git a/lib/krb5/net_read.c b/lib/krb5/net_read.c
index 05208997b..eeb97a483 100644
--- a/lib/krb5/net_read.c
+++ b/lib/krb5/net_read.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 krb5_ssize_t KRB5_LIB_FUNCTION
 krb5_net_read (krb5_context context,
 	       void *p_fd,
diff --git a/lib/krb5/net_write.c b/lib/krb5/net_write.c
index 30aaa5b5b..d39a9b17f 100644
--- a/lib/krb5/net_write.c
+++ b/lib/krb5/net_write.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 krb5_ssize_t KRB5_LIB_FUNCTION
 krb5_net_write (krb5_context context,
 		void *p_fd,
diff --git a/lib/krb5/pac.c b/lib/krb5/pac.c
index bfa3d2136..b66e79960 100644
--- a/lib/krb5/pac.c
+++ b/lib/krb5/pac.c
@@ -34,8 +34,6 @@
 #include "krb5_locl.h"
 #include <wind.h>
 
-RCSID("$Id$");
-
 struct PAC_INFO_BUFFER {
     uint32_t type;
     uint32_t buffersize;
diff --git a/lib/krb5/padata.c b/lib/krb5/padata.c
index 022260e70..aa08248ed 100644
--- a/lib/krb5/padata.c
+++ b/lib/krb5/padata.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 PA_DATA *
 krb5_find_padata(PA_DATA *val, unsigned len, int type, int *idx)
 {
diff --git a/lib/krb5/parse-name-test.c b/lib/krb5/parse-name-test.c
index a1feb02c8..a03d9764b 100644
--- a/lib/krb5/parse-name-test.c
+++ b/lib/krb5/parse-name-test.c
@@ -33,8 +33,6 @@
 #include "krb5_locl.h"
 #include <err.h>
 
-RCSID("$Id$");
-
 enum { MAX_COMPONENTS = 3 };
 
 static struct testcase {
diff --git a/lib/krb5/plugin.c b/lib/krb5/plugin.c
index a71dd8b6f..f30c0847a 100644
--- a/lib/krb5/plugin.c
+++ b/lib/krb5/plugin.c
@@ -32,7 +32,7 @@
  */
 
 #include "krb5_locl.h"
-RCSID("$Id$");
+
 #ifdef HAVE_DLFCN_H
 #include <dlfcn.h>
 #endif
diff --git a/lib/krb5/principal.c b/lib/krb5/principal.c
index d5aa39f96..0d3990f02 100644
--- a/lib/krb5/principal.c
+++ b/lib/krb5/principal.c
@@ -57,8 +57,6 @@ host/admin@H5L.ORG
 #include <fnmatch.h>
 #include "resolve.h"
 
-RCSID("$Id$");
-
 #define princ_num_comp(P) ((P)->name.name_string.len)
 #define princ_type(P) ((P)->name.name_type)
 #define princ_comp(P) ((P)->name.name_string.val)
diff --git a/lib/krb5/prompter_posix.c b/lib/krb5/prompter_posix.c
index 7d6393542..05deaff52 100644
--- a/lib/krb5/prompter_posix.c
+++ b/lib/krb5/prompter_posix.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 int KRB5_LIB_FUNCTION
 krb5_prompter_posix (krb5_context context,
 		     void *data,
diff --git a/lib/krb5/rd_cred.c b/lib/krb5/rd_cred.c
index 30e82d8de..f41edfa2b 100644
--- a/lib/krb5/rd_cred.c
+++ b/lib/krb5/rd_cred.c
@@ -33,8 +33,6 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id$");
-
 static krb5_error_code
 compare_addrs(krb5_context context,
 	      krb5_address *a,
diff --git a/lib/krb5/rd_error.c b/lib/krb5/rd_error.c
index 75ae8b1e8..1561188fa 100644
--- a/lib/krb5/rd_error.c
+++ b/lib/krb5/rd_error.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 krb5_error_code KRB5_LIB_FUNCTION
 krb5_rd_error(krb5_context context,
 	      const krb5_data *msg,
diff --git a/lib/krb5/rd_priv.c b/lib/krb5/rd_priv.c
index 6778ccad8..fb6cfcee4 100644
--- a/lib/krb5/rd_priv.c
+++ b/lib/krb5/rd_priv.c
@@ -33,8 +33,6 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id$");
-
 krb5_error_code KRB5_LIB_FUNCTION
 krb5_rd_priv(krb5_context context,
 	     krb5_auth_context auth_context,
diff --git a/lib/krb5/rd_rep.c b/lib/krb5/rd_rep.c
index 14541c2c1..2d5792cd4 100644
--- a/lib/krb5/rd_rep.c
+++ b/lib/krb5/rd_rep.c
@@ -33,8 +33,6 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id$");
-
 krb5_error_code KRB5_LIB_FUNCTION
 krb5_rd_rep(krb5_context context,
 	    krb5_auth_context auth_context,
diff --git a/lib/krb5/rd_req.c b/lib/krb5/rd_req.c
index 824646897..784427fe4 100644
--- a/lib/krb5/rd_req.c
+++ b/lib/krb5/rd_req.c
@@ -33,8 +33,6 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id$");
-
 static krb5_error_code
 decrypt_tkt_enc_part (krb5_context context,
 		      krb5_keyblock *key,
diff --git a/lib/krb5/rd_safe.c b/lib/krb5/rd_safe.c
index 03df0cb85..16466e0c3 100644
--- a/lib/krb5/rd_safe.c
+++ b/lib/krb5/rd_safe.c
@@ -33,8 +33,6 @@
 
 #include <krb5_locl.h>
 
-RCSID("$Id$");
-
 static krb5_error_code
 verify_checksum(krb5_context context,
 		krb5_auth_context auth_context,
diff --git a/lib/krb5/read_message.c b/lib/krb5/read_message.c
index df6511b9e..be850b81c 100644
--- a/lib/krb5/read_message.c
+++ b/lib/krb5/read_message.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 krb5_error_code KRB5_LIB_FUNCTION
 krb5_read_message (krb5_context context,
 		   krb5_pointer p_fd,
diff --git a/lib/krb5/recvauth.c b/lib/krb5/recvauth.c
index cdcb5c064..80829a599 100644
--- a/lib/krb5/recvauth.c
+++ b/lib/krb5/recvauth.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 /*
  * See `sendauth.c' for the format.
  */
diff --git a/lib/krb5/replay.c b/lib/krb5/replay.c
index 25a6da026..37556cfbc 100644
--- a/lib/krb5/replay.c
+++ b/lib/krb5/replay.c
@@ -34,8 +34,6 @@
 #include "krb5_locl.h"
 #include <vis.h>
 
-RCSID("$Id$");
-
 struct krb5_rcache_data {
     char *name;
 };
diff --git a/lib/krb5/send_to_kdc.c b/lib/krb5/send_to_kdc.c
index 4b3be684c..50b42f2f1 100644
--- a/lib/krb5/send_to_kdc.c
+++ b/lib/krb5/send_to_kdc.c
@@ -34,8 +34,6 @@
 #include "krb5_locl.h"
 #include "send_to_kdc_plugin.h"
 
-RCSID("$Id$");
-
 struct send_to_kdc {
     krb5_send_to_kdc_func func;
     void *data;
diff --git a/lib/krb5/sendauth.c b/lib/krb5/sendauth.c
index ccd805388..dca759437 100644
--- a/lib/krb5/sendauth.c
+++ b/lib/krb5/sendauth.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 /*
  * The format seems to be:
  * client -> server
diff --git a/lib/krb5/set_default_realm.c b/lib/krb5/set_default_realm.c
index 6907b11d1..91201eeb5 100644
--- a/lib/krb5/set_default_realm.c
+++ b/lib/krb5/set_default_realm.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 /*
  * Convert the simple string `s' into a NULL-terminated and freshly allocated
  * list in `list'.  Return an error code.
diff --git a/lib/krb5/sock_principal.c b/lib/krb5/sock_principal.c
index ed534106b..d65035684 100644
--- a/lib/krb5/sock_principal.c
+++ b/lib/krb5/sock_principal.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-			
 krb5_error_code KRB5_LIB_FUNCTION
 krb5_sock_to_principal (krb5_context context,
 			int sock,
diff --git a/lib/krb5/store-test.c b/lib/krb5/store-test.c
index fba8e746e..595540da6 100644
--- a/lib/krb5/store-test.c
+++ b/lib/krb5/store-test.c
@@ -32,8 +32,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 static void
 print_data(unsigned char *data, size_t len)
 {
diff --git a/lib/krb5/store.c b/lib/krb5/store.c
index 8037c2591..2ba83ef0d 100644
--- a/lib/krb5/store.c
+++ b/lib/krb5/store.c
@@ -34,8 +34,6 @@
 #include "krb5_locl.h"
 #include "store-int.h"
 
-RCSID("$Id$");
-
 #define BYTEORDER_IS(SP, V) (((SP)->flags & KRB5_STORAGE_BYTEORDER_MASK) == (V))
 #define BYTEORDER_IS_LE(SP) BYTEORDER_IS((SP), KRB5_STORAGE_BYTEORDER_LE)
 #define BYTEORDER_IS_BE(SP) BYTEORDER_IS((SP), KRB5_STORAGE_BYTEORDER_BE)
diff --git a/lib/krb5/store_emem.c b/lib/krb5/store_emem.c
index 7c52947aa..4be89b656 100644
--- a/lib/krb5/store_emem.c
+++ b/lib/krb5/store_emem.c
@@ -34,8 +34,6 @@
 #include "krb5_locl.h"
 #include "store-int.h"
 
-RCSID("$Id$");
-
 typedef struct emem_storage{
     unsigned char *base;
     size_t size;
diff --git a/lib/krb5/store_fd.c b/lib/krb5/store_fd.c
index 40f3e8db8..38d67ae4d 100644
--- a/lib/krb5/store_fd.c
+++ b/lib/krb5/store_fd.c
@@ -34,8 +34,6 @@
 #include "krb5_locl.h"
 #include "store-int.h"
 
-RCSID("$Id$");
-
 typedef struct fd_storage {
     int fd;
 } fd_storage;
diff --git a/lib/krb5/store_mem.c b/lib/krb5/store_mem.c
index d908e4617..db1abc1e9 100644
--- a/lib/krb5/store_mem.c
+++ b/lib/krb5/store_mem.c
@@ -34,8 +34,6 @@
 #include "krb5_locl.h"
 #include "store-int.h"
 
-RCSID("$Id$");
-
 typedef struct mem_storage{
     unsigned char *base;
     size_t size;
diff --git a/lib/krb5/string-to-key-test.c b/lib/krb5/string-to-key-test.c
index 7edbb37af..325524f1b 100644
--- a/lib/krb5/string-to-key-test.c
+++ b/lib/krb5/string-to-key-test.c
@@ -33,8 +33,6 @@
 #include "krb5_locl.h"
 #include <err.h>
 
-RCSID("$Id$");
-
 enum { MAXSIZE = 24 };
 
 static struct testcase {
diff --git a/lib/krb5/test_acl.c b/lib/krb5/test_acl.c
index 2b0005e7d..f2b38209c 100644
--- a/lib/krb5/test_acl.c
+++ b/lib/krb5/test_acl.c
@@ -33,8 +33,6 @@
 #include "krb5_locl.h"
 #include <err.h>
 
-RCSID("$Id$");
-
 #define RETVAL(c, r, e, s) \
 	do { if (r != e) krb5_errx(c, 1, "%s", s); } while (0)
 #define STRINGMATCH(c, s, _s1, _s2) \
diff --git a/lib/krb5/test_addr.c b/lib/krb5/test_addr.c
index bf47548ed..622fa78f7 100644
--- a/lib/krb5/test_addr.c
+++ b/lib/krb5/test_addr.c
@@ -33,8 +33,6 @@
 #include "krb5_locl.h"
 #include <err.h>
 
-RCSID("$Id$");
-
 static void
 print_addr(krb5_context context, const char *addr)
 {
diff --git a/lib/krb5/test_alname.c b/lib/krb5/test_alname.c
index 019f105c1..21e4bff8d 100644
--- a/lib/krb5/test_alname.c
+++ b/lib/krb5/test_alname.c
@@ -34,8 +34,6 @@
 #include <getarg.h>
 #include <err.h>
 
-RCSID("$Id$");
-
 static void
 test_alname(krb5_context context, krb5_const_realm realm,
 	    const char *user, const char *inst,
diff --git a/lib/krb5/test_ap-req.c b/lib/krb5/test_ap-req.c
index cc9449ae1..d32ae4849 100644
--- a/lib/krb5/test_ap-req.c
+++ b/lib/krb5/test_ap-req.c
@@ -30,10 +30,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/lib/krb5/test_cc.c b/lib/krb5/test_cc.c
index 277dbc6e1..40ff941a5 100644
--- a/lib/krb5/test_cc.c
+++ b/lib/krb5/test_cc.c
@@ -34,8 +34,6 @@
 #include <getarg.h>
 #include <err.h>
 
-RCSID("$Id$");
-
 static int debug_flag	= 0;
 static int version_flag = 0;
 static int help_flag	= 0;
diff --git a/lib/krb5/test_config.c b/lib/krb5/test_config.c
index 95e806352..61d1a0870 100644
--- a/lib/krb5/test_config.c
+++ b/lib/krb5/test_config.c
@@ -34,8 +34,6 @@
 #include "krb5_locl.h"
 #include <err.h>
 
-RCSID("$Id$");
-
 static int
 check_config_file(krb5_context context, char *filelist, char **res, int def)
 {
diff --git a/lib/krb5/test_crypto.c b/lib/krb5/test_crypto.c
index 211ecd197..972af0c5f 100644
--- a/lib/krb5/test_crypto.c
+++ b/lib/krb5/test_crypto.c
@@ -34,8 +34,6 @@
 #include <err.h>
 #include <getarg.h>
 
-RCSID("$Id$");
-
 static void
 time_encryption(krb5_context context, size_t size,
 		krb5_enctype etype, int iterations)
diff --git a/lib/krb5/test_crypto_wrapping.c b/lib/krb5/test_crypto_wrapping.c
index 8471bb968..294af6f2e 100644
--- a/lib/krb5/test_crypto_wrapping.c
+++ b/lib/krb5/test_crypto_wrapping.c
@@ -34,8 +34,6 @@
 #include <err.h>
 #include <getarg.h>
 
-RCSID("$Id$");
-
 static void
 test_wrapping(krb5_context context,
 	      size_t min_size,
diff --git a/lib/krb5/test_forward.c b/lib/krb5/test_forward.c
index 10c86361f..3782e5074 100644
--- a/lib/krb5/test_forward.c
+++ b/lib/krb5/test_forward.c
@@ -34,8 +34,6 @@
 #include <err.h>
 #include <getarg.h>
 
-RCSID("$Id$");
-
 static int version_flag = 0;
 static int help_flag	= 0;
 
diff --git a/lib/krb5/test_get_addrs.c b/lib/krb5/test_get_addrs.c
index 967df6764..33ca929e6 100644
--- a/lib/krb5/test_get_addrs.c
+++ b/lib/krb5/test_get_addrs.c
@@ -34,8 +34,6 @@
 #include <err.h>
 #include <getarg.h>
 
-RCSID("$Id$");
-
 /* print all addresses that we find */
 
 static void
diff --git a/lib/krb5/test_gic.c b/lib/krb5/test_gic.c
index adb607ff8..1c8787d6a 100644
--- a/lib/krb5/test_gic.c
+++ b/lib/krb5/test_gic.c
@@ -34,8 +34,6 @@
 #include <err.h>
 #include <getarg.h>
 
-RCSID("$Id$");
-
 static char *password_str;
 
 static krb5_error_code
diff --git a/lib/krb5/test_hostname.c b/lib/krb5/test_hostname.c
index d4cad8fa4..fbdb5c9c3 100644
--- a/lib/krb5/test_hostname.c
+++ b/lib/krb5/test_hostname.c
@@ -34,8 +34,6 @@
 #include <err.h>
 #include <getarg.h>
 
-RCSID("$Id$");
-
 static int debug_flag	= 0;
 static int version_flag = 0;
 static int help_flag	= 0;
diff --git a/lib/krb5/test_keytab.c b/lib/krb5/test_keytab.c
index a3caf971d..33f2f1595 100644
--- a/lib/krb5/test_keytab.c
+++ b/lib/krb5/test_keytab.c
@@ -34,8 +34,6 @@
 #include <err.h>
 #include <getarg.h>
 
-RCSID("$Id$");
-
 /*
  * Test that removal entry from of empty keytab doesn't corrupts
  * memory.
diff --git a/lib/krb5/test_kuserok.c b/lib/krb5/test_kuserok.c
index 84d048e39..5beb1b757 100644
--- a/lib/krb5/test_kuserok.c
+++ b/lib/krb5/test_kuserok.c
@@ -34,8 +34,6 @@
 #include <getarg.h>
 #include <err.h>
 
-RCSID("$Id$");
-
 static int version_flag = 0;
 static int help_flag	= 0;
 
diff --git a/lib/krb5/test_mem.c b/lib/krb5/test_mem.c
index f55c29911..3333d0dc6 100644
--- a/lib/krb5/test_mem.c
+++ b/lib/krb5/test_mem.c
@@ -33,8 +33,6 @@
 #include "krb5_locl.h"
 #include <err.h>
 
-RCSID("$Id$");
-
 /*
  * Test run functions, to be used with valgrind to detect memoryleaks.
  */
diff --git a/lib/krb5/test_pac.c b/lib/krb5/test_pac.c
index 507ad64ca..7289050b9 100644
--- a/lib/krb5/test_pac.c
+++ b/lib/krb5/test_pac.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 /*
  * This PAC and keys are copied (with permission) from Samba torture
  * regression test suite, they where created by Andrew Bartlet.
diff --git a/lib/krb5/test_pkinit_dh2key.c b/lib/krb5/test_pkinit_dh2key.c
index 594942351..e18fd174a 100644
--- a/lib/krb5/test_pkinit_dh2key.c
+++ b/lib/krb5/test_pkinit_dh2key.c
@@ -34,8 +34,6 @@
 #include <err.h>
 #include <getarg.h>
 
-RCSID("$Id$");
-
 static void
 test_dh2key(int i,
 	    krb5_context context,
diff --git a/lib/krb5/test_pknistkdf.c b/lib/krb5/test_pknistkdf.c
index 133300383..6a831cf0f 100644
--- a/lib/krb5/test_pknistkdf.c
+++ b/lib/krb5/test_pknistkdf.c
@@ -36,8 +36,6 @@
 #include <getarg.h>
 #include <hex.h>
 
-RCSID("$Id$");
-
 static int verbose_flag = 0;
 
 struct testcase {
diff --git a/lib/krb5/test_plugin.c b/lib/krb5/test_plugin.c
index 9698e5df7..3c36e5673 100644
--- a/lib/krb5/test_plugin.c
+++ b/lib/krb5/test_plugin.c
@@ -32,7 +32,6 @@
  */
 
 #include <krb5_locl.h>
-RCSID("$Id$");
 #include "locate_plugin.h"
 
 static krb5_error_code
diff --git a/lib/krb5/test_prf.c b/lib/krb5/test_prf.c
index 8b7e9d387..26ba2a6ef 100644
--- a/lib/krb5/test_prf.c
+++ b/lib/krb5/test_prf.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 #include <hex.h>
 #include <err.h>
 
diff --git a/lib/krb5/test_princ.c b/lib/krb5/test_princ.c
index c575ab8f4..e75b2ec2c 100644
--- a/lib/krb5/test_princ.c
+++ b/lib/krb5/test_princ.c
@@ -33,8 +33,6 @@
 #include "krb5_locl.h"
 #include <err.h>
 
-RCSID("$Id$");
-
 /*
  * Check that a closed cc still keeps it data and that it's no longer
  * there when it's destroyed.
diff --git a/lib/krb5/test_renew.c b/lib/krb5/test_renew.c
index a93590f61..40d373917 100644
--- a/lib/krb5/test_renew.c
+++ b/lib/krb5/test_renew.c
@@ -35,9 +35,6 @@
 #include <err.h>
 #include <getarg.h>
 
-RCSID("$Id$");
-
-
 static int version_flag = 0;
 static int help_flag	= 0;
 
diff --git a/lib/krb5/test_store.c b/lib/krb5/test_store.c
index 2a6ef85e6..831762b2a 100644
--- a/lib/krb5/test_store.c
+++ b/lib/krb5/test_store.c
@@ -33,8 +33,6 @@
 #include "krb5_locl.h"
 #include <getarg.h>
 
-RCSID("$Id$");
-
 static void
 test_int8(krb5_context context, krb5_storage *sp)
 {
diff --git a/lib/krb5/test_time.c b/lib/krb5/test_time.c
index c36e4d1f5..5f6625c90 100644
--- a/lib/krb5/test_time.c
+++ b/lib/krb5/test_time.c
@@ -34,8 +34,6 @@
 #include "krb5_locl.h"
 #include <err.h>
 
-RCSID("$Id$");
-
 static void
 check_set_time(krb5_context context)
 {
diff --git a/lib/krb5/ticket.c b/lib/krb5/ticket.c
index d75168721..6bbb99a59 100644
--- a/lib/krb5/ticket.c
+++ b/lib/krb5/ticket.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 krb5_error_code KRB5_LIB_FUNCTION
 krb5_free_ticket(krb5_context context,
 		 krb5_ticket *ticket)
diff --git a/lib/krb5/time.c b/lib/krb5/time.c
index cd786fedd..ed235783a 100644
--- a/lib/krb5/time.c
+++ b/lib/krb5/time.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 /**
  * Set the absolute time that the caller knows the kdc has so the
  * kerberos library can calculate the relative diffrence beteen the
diff --git a/lib/krb5/transited.c b/lib/krb5/transited.c
index 7e11d5579..196ef447e 100644
--- a/lib/krb5/transited.c
+++ b/lib/krb5/transited.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 /* this is an attempt at one of the most horrible `compression'
    schemes that has ever been invented; it's so amazingly brain-dead
    that words can not describe it, and all this just to save a few
diff --git a/lib/krb5/v4_glue.c b/lib/krb5/v4_glue.c
index cfcc8ca47..168268cea 100644
--- a/lib/krb5/v4_glue.c
+++ b/lib/krb5/v4_glue.c
@@ -32,7 +32,6 @@
  */
 
 #include "krb5_locl.h"
-RCSID("$Id$");
 
 #include "krb5-v4compat.h"
 
diff --git a/lib/krb5/verify_init.c b/lib/krb5/verify_init.c
index 3e6735062..363bb4677 100644
--- a/lib/krb5/verify_init.c
+++ b/lib/krb5/verify_init.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 void KRB5_LIB_FUNCTION
 krb5_verify_init_creds_opt_init(krb5_verify_init_creds_opt *options)
 {
diff --git a/lib/krb5/verify_krb5_conf.c b/lib/krb5/verify_krb5_conf.c
index 9a5bb01d2..00fca750f 100644
--- a/lib/krb5/verify_krb5_conf.c
+++ b/lib/krb5/verify_krb5_conf.c
@@ -35,7 +35,6 @@
 #include <getarg.h>
 #include <parse_bytes.h>
 #include <err.h>
-RCSID("$Id$");
 
 /* verify krb5.conf */
 
diff --git a/lib/krb5/verify_user.c b/lib/krb5/verify_user.c
index f105ed643..8cc109f0a 100644
--- a/lib/krb5/verify_user.c
+++ b/lib/krb5/verify_user.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 static krb5_error_code
 verify_common (krb5_context context,
 	       krb5_principal principal,
diff --git a/lib/krb5/version.c b/lib/krb5/version.c
index d43b83e26..a0e750604 100644
--- a/lib/krb5/version.c
+++ b/lib/krb5/version.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 /* this is just to get a version stamp in the library file */
 
 #define heimdal_version __heimdal_version
diff --git a/lib/krb5/warn.c b/lib/krb5/warn.c
index 29906b75f..58fb73189 100644
--- a/lib/krb5/warn.c
+++ b/lib/krb5/warn.c
@@ -34,8 +34,6 @@
 #include "krb5_locl.h"
 #include <err.h>
 
-RCSID("$Id$");
-
 static krb5_error_code _warnerr(krb5_context context, int do_errtext,
 	 krb5_error_code code, int level, const char *fmt, va_list ap)
 	__attribute__((__format__(__printf__, 5, 0)));
diff --git a/lib/krb5/write_message.c b/lib/krb5/write_message.c
index bd2d7bd4a..a824e08fd 100644
--- a/lib/krb5/write_message.c
+++ b/lib/krb5/write_message.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 krb5_error_code KRB5_LIB_FUNCTION
 krb5_write_message (krb5_context context,
 		    krb5_pointer p_fd,