diff --git a/lib/krb5/auth_context.c b/lib/krb5/auth_context.c
index 8e025612c..0a3e4c30f 100644
--- a/lib/krb5/auth_context.c
+++ b/lib/krb5/auth_context.c
@@ -1,5 +1,7 @@
 #include "krb5_locl.h"
 
+RCSID("$Id$");
+
 krb5_error_code
 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 d3e26f1bc..e7a698a00 100644
--- a/lib/krb5/build_ap_req.c
+++ b/lib/krb5/build_ap_req.c
@@ -1,5 +1,6 @@
 #include <krb5_locl.h>
-#include <krb5_error.h>
+
+RCSID("$Id$");
 
 krb5_error_code
 krb5_build_ap_req (krb5_context context,
diff --git a/lib/krb5/build_auth.c b/lib/krb5/build_auth.c
index 7a384849d..340fd43c8 100644
--- a/lib/krb5/build_auth.c
+++ b/lib/krb5/build_auth.c
@@ -1,5 +1,6 @@
 #include <krb5_locl.h>
-#include <krb5_error.h>
+
+RCSID("$Id$");
 
 krb5_error_code
 krb5_build_authenticator (krb5_context context,
diff --git a/lib/krb5/cache.c b/lib/krb5/cache.c
index 4ca6050f8..05ec8d38c 100644
--- a/lib/krb5/cache.c
+++ b/lib/krb5/cache.c
@@ -1,5 +1,7 @@
 #include "krb5_locl.h"
 
+RCSID("$Id$");
+
 /* XXX shouldn't be here */
 
 void
diff --git a/lib/krb5/cache.h b/lib/krb5/cache.h
index 05bdc30cb..6572c2767 100644
--- a/lib/krb5/cache.h
+++ b/lib/krb5/cache.h
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 #ifndef __CACHE_H__
 #define __CACHE_H__
 
diff --git a/lib/krb5/checksum.c b/lib/krb5/checksum.c
index c3ae5b1b8..d9d2e5bc0 100644
--- a/lib/krb5/checksum.c
+++ b/lib/krb5/checksum.c
@@ -1,7 +1,8 @@
 #include <krb5_locl.h>
-#include <krb5_error.h>
 #include "md4.h"
 
+RCSID("$Id$");
+
 krb5_error_code
 krb5_create_checksum (krb5_context context,
 		      krb5_cksumtype type,
@@ -36,9 +37,9 @@ krb5_verify_checksum (krb5_context context,
   u_char csum[16];
 
   if (cksum->cksumtype != CKSUMTYPE_RSA_MD4)
-    return KRB_AP_ERR_INAPP_CKSUM;
+    return KRB5KRB_AP_ERR_INAPP_CKSUM;
   if (cksum->checksum.length != 16)
-    return KRB_AP_ERR_MODIFIED;
+    return KRB5KRB_AP_ERR_MODIFIED;
 
   md4_init (&m);
   md4_update (&m, ptr, len);
@@ -46,5 +47,5 @@ krb5_verify_checksum (krb5_context context,
   if (memcmp (cksum->checksum.data, csum, 16) == 0)
     return 0;
   else
-    return KRB_AP_ERR_MODIFIED;
+    return KRB5KRB_AP_ERR_MODIFIED;
 }
diff --git a/lib/krb5/config_file.h b/lib/krb5/config_file.h
index 11eba6244..88e7425a5 100644
--- a/lib/krb5/config_file.h
+++ b/lib/krb5/config_file.h
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 #ifndef __CONF_H__
 #define __CONF_H__
 
diff --git a/lib/krb5/config_file.y b/lib/krb5/config_file.y
index ab6a058b4..305305347 100644
--- a/lib/krb5/config_file.y
+++ b/lib/krb5/config_file.y
@@ -8,6 +8,8 @@
 #include "krb5_locl.h"
 #include "config_file.h"
 
+RCSID("$Id$");
+
 static char section[128];
 static FILE *F;
 
diff --git a/lib/krb5/constants.c b/lib/krb5/constants.c
index 94e5664c1..babb2e068 100644
--- a/lib/krb5/constants.c
+++ b/lib/krb5/constants.c
@@ -1,4 +1,6 @@
+#include "krb5_locl.h"
 
+RCSID("$Id$");
 
 const char krb5_config_file[] = "/etc/krb5.conf";
 const char krb5_defkeyname[] = "/etc/v5srvtab";
diff --git a/lib/krb5/context.c b/lib/krb5/context.c
index d62950fbe..fdc6c704b 100644
--- a/lib/krb5/context.c
+++ b/lib/krb5/context.c
@@ -1,5 +1,7 @@
 #include "krb5_locl.h"
 
+RCSID("$Id$");
+
 /* XXX */
 
 #ifdef sun
diff --git a/lib/krb5/crc.c b/lib/krb5/crc.c
index e7d3e0836..9305406d9 100644
--- a/lib/krb5/crc.c
+++ b/lib/krb5/crc.c
@@ -1,3 +1,7 @@
+#include "krb5_locl.h"
+
+RCSID("$Id$");
+
 #include <stdio.h>
 #include "crc.h"
 
diff --git a/lib/krb5/crc.h b/lib/krb5/crc.h
index 52c78511b..050b91d4a 100644
--- a/lib/krb5/crc.h
+++ b/lib/krb5/crc.h
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 #include <sys/types.h>
 
 #define CRC_GEN 0xEDB88320L
diff --git a/lib/krb5/data.c b/lib/krb5/data.c
index 37c1e3bab..8b1a67f52 100644
--- a/lib/krb5/data.c
+++ b/lib/krb5/data.c
@@ -1,5 +1,7 @@
 #include "krb5_locl.h"
 
+RCSID("$Id$");
+
 /* XXX */
 
 #ifdef sun
diff --git a/lib/krb5/encrypt.c b/lib/krb5/encrypt.c
index 663eccd84..ea6fea92d 100644
--- a/lib/krb5/encrypt.c
+++ b/lib/krb5/encrypt.c
@@ -1,7 +1,8 @@
 #include <krb5_locl.h>
-#include <krb5_error.h>
 #include "crc.h"
 
+RCSID("$Id$");
+
 krb5_error_code
 krb5_encrypt (krb5_context context,
 	      void *ptr,
diff --git a/lib/krb5/get_addrs.c b/lib/krb5/get_addrs.c
index 48fc93810..68672696b 100644
--- a/lib/krb5/get_addrs.c
+++ b/lib/krb5/get_addrs.c
@@ -1,5 +1,6 @@
 #include "krb5_locl.h"
 
+RCSID("$Id$");
 
 /*
  * Try to get all addresses, but return the one corresponding to
diff --git a/lib/krb5/get_cred.c b/lib/krb5/get_cred.c
index 03bb95b0a..87ba8328f 100644
--- a/lib/krb5/get_cred.c
+++ b/lib/krb5/get_cred.c
@@ -1,5 +1,4 @@
 #include <krb5_locl.h>
-#include <krb5_error.h>
 #include <md4.h>
 
 RCSID("$Id$");
diff --git a/lib/krb5/get_host_realm.c b/lib/krb5/get_host_realm.c
index a1f61dc60..83765393e 100644
--- a/lib/krb5/get_host_realm.c
+++ b/lib/krb5/get_host_realm.c
@@ -1,5 +1,7 @@
 #include "krb5_locl.h"
 
+RCSID("$Id$");
+
 krb5_error_code
 krb5_get_host_realm(krb5_context context,
 		    const char *host,
diff --git a/lib/krb5/get_in_tkt.c b/lib/krb5/get_in_tkt.c
index 5010996ac..47c09b137 100644
--- a/lib/krb5/get_in_tkt.c
+++ b/lib/krb5/get_in_tkt.c
@@ -1,7 +1,8 @@
 #include "krb5_locl.h"
-#include <krb5_error.h>
 
-krb5_error_code
+RCSID("$Id$");
+
+static krb5_error_code
 krb5_get_salt (krb5_principal princ,
 	       krb5_data *salt)
 {
diff --git a/lib/krb5/get_in_tkt_pw.c b/lib/krb5/get_in_tkt_pw.c
index 908583543..8b687f9e1 100644
--- a/lib/krb5/get_in_tkt_pw.c
+++ b/lib/krb5/get_in_tkt_pw.c
@@ -1,5 +1,7 @@
 #include "krb5_locl.h"
 
+RCSID("$Id$");
+
 static krb5_error_code
 key_proc (krb5_context context,
 	  krb5_keytype type,
diff --git a/lib/krb5/get_port.c b/lib/krb5/get_port.c
index 767201672..e4f17731b 100644
--- a/lib/krb5/get_port.c
+++ b/lib/krb5/get_port.c
@@ -1,5 +1,7 @@
 #include <krb5_locl.h>
 
+RCSID("$Id$");
+
 int
 krb5_getportbyname (const char *service,
 		    const char *proto,
diff --git a/lib/krb5/keytab.h b/lib/krb5/keytab.h
index b6c5bc126..e0354fcb0 100644
--- a/lib/krb5/keytab.h
+++ b/lib/krb5/keytab.h
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 #ifndef __KEYTAB_H__
 #define __KEYTAB_H__
 
diff --git a/lib/krb5/krb5.h b/lib/krb5/krb5.h
index 972d7da12..73d242733 100644
--- a/lib/krb5/krb5.h
+++ b/lib/krb5/krb5.h
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 #ifndef __KRB5_H__
 #define __KRB5_H__
 
diff --git a/lib/krb5/krb5_locl.h b/lib/krb5/krb5_locl.h
index ad087a073..6b14d078d 100644
--- a/lib/krb5/krb5_locl.h
+++ b/lib/krb5/krb5_locl.h
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 #ifndef __KRB5_LOCL_H__
 #define __KRB5_LOCL_H__
 
diff --git a/lib/krb5/krbhst.c b/lib/krb5/krbhst.c
index 78994a9a1..d0d6949db 100644
--- a/lib/krb5/krbhst.c
+++ b/lib/krb5/krbhst.c
@@ -1,5 +1,7 @@
 #include "krb5_locl.h"
 
+RCSID("$Id$");
+
 krb5_error_code
 krb5_get_krbhst (krb5_context context,
 		 const krb5_data *realm,
diff --git a/lib/krb5/misc.c b/lib/krb5/misc.c
index 37e8e153a..6f2519da0 100644
--- a/lib/krb5/misc.c
+++ b/lib/krb5/misc.c
@@ -1,5 +1,6 @@
 #include "krb5_locl.h"
 
+RCSID("$Id$");
 
 krb5_error_code
 krb5_get_lrealm(char **realm)
diff --git a/lib/krb5/mk_rep.c b/lib/krb5/mk_rep.c
index c82bf972d..0a84d0f34 100644
--- a/lib/krb5/mk_rep.c
+++ b/lib/krb5/mk_rep.c
@@ -1,5 +1,6 @@
 #include <krb5_locl.h>
-#include <krb5_error.h>
+
+RCSID("$Id$");
 
 krb5_error_code
 krb5_mk_rep(krb5_context context,
diff --git a/lib/krb5/mk_req.c b/lib/krb5/mk_req.c
index 19fb9a712..c801c35ac 100644
--- a/lib/krb5/mk_req.c
+++ b/lib/krb5/mk_req.c
@@ -1,5 +1,6 @@
 #include <krb5_locl.h>
-#include <krb5_error.h>
+
+RCSID("$Id$");
 
 krb5_error_code
 krb5_mk_req(krb5_context context,
diff --git a/lib/krb5/mk_safe.c b/lib/krb5/mk_safe.c
index 056d93f9e..078661ebb 100644
--- a/lib/krb5/mk_safe.c
+++ b/lib/krb5/mk_safe.c
@@ -1,7 +1,8 @@
 #include <krb5_locl.h>
-#include <krb5_error.h>
 #include "md4.h"
 
+RCSID("$Id$");
+
 krb5_error_code
 krb5_mk_safe(krb5_context context,
 	     krb5_auth_context auth_context,
diff --git a/lib/krb5/principal_p.c b/lib/krb5/principal_p.c
index 91362aefe..83f62070e 100644
--- a/lib/krb5/principal_p.c
+++ b/lib/krb5/principal_p.c
@@ -1,5 +1,7 @@
 #include "krb5_locl.h"
 
+RCSID("$Id$");
+
 krb5_error_code
 krb5_principal_alloc(krb5_principal *p)
 {
diff --git a/lib/krb5/rd_rep.c b/lib/krb5/rd_rep.c
index 079926045..872b541e0 100644
--- a/lib/krb5/rd_rep.c
+++ b/lib/krb5/rd_rep.c
@@ -1,5 +1,6 @@
 #include <krb5_locl.h>
-#include <krb5_error.h>
+
+RCSID("$Id$");
 
 krb5_error_code
 krb5_rd_rep(krb5_context context,
@@ -17,9 +18,9 @@ krb5_rd_rep(krb5_context context,
   if (len < 0)
     return ASN1_PARSE_ERROR;
   if (ap_rep.pvno != 5)
-    return KRB_AP_ERR_BADVERSION;
+    return KRB5KRB_AP_ERR_BADVERSION;
   if (ap_rep.msg_type != krb_ap_rep)
-    return KRB_AP_ERR_MSG_TYPE;
+    return KRB5KRB_AP_ERR_MSG_TYPE;
 
   des_set_key (auth_context->key.contents.data, schedule);
   len = ap_rep.enc_part.cipher.length;
@@ -44,13 +45,13 @@ krb5_rd_rep(krb5_context context,
     return ASN1_PARSE_ERROR;
   if ((*repl)->ctime != auth_context->authenticator->ctime ||
       (*repl)->cusec != auth_context->authenticator->cusec) {
-    printf("KRB_AP_ERR_MUT_FAIL\n");
+    printf("KRB5KRB_AP_ERR_MUT_FAIL\n");
     printf ("(%u, %u) != (%u, %u)\n",
 	    (*repl)->ctime, (*repl)->cusec,
 	    auth_context->authenticator->ctime,
 	    auth_context->authenticator->cusec);
 #if 0				/* Something wrong with the coding??? */
-    return KRB_AP_ERR_MUT_FAIL;
+    return KRB5KRB_AP_ERR_MUT_FAIL;
 #endif
   }
   
diff --git a/lib/krb5/rd_req.c b/lib/krb5/rd_req.c
index 18bd34fb2..ec1908723 100644
--- a/lib/krb5/rd_req.c
+++ b/lib/krb5/rd_req.c
@@ -1,5 +1,6 @@
 #include <krb5_locl.h>
-#include <krb5_error.h>
+
+RCSID("$Id$");
 
 static krb5_error_code
 decrypt_tkt_enc_part (krb5_context context,
@@ -86,11 +87,11 @@ krb5_rd_req(krb5_context context,
   if (len < 0)
     return ASN1_PARSE_ERROR;
   if (ap_req.pvno != 5)
-    return KRB_AP_ERR_BADVERSION;
+    return KRB5KRB_AP_ERR_BADVERSION;
   if (ap_req.msg_type != krb_ap_req)
-    return KRB_AP_ERR_MSG_TYPE;
+    return KRB5KRB_AP_ERR_MSG_TYPE;
   if (ap_req.ticket.tkt_vno != 5)
-    return KRB_AP_ERR_BADVERSION;
+    return KRB5KRB_AP_ERR_BADVERSION;
   if (ap_req.ap_options.use_session_key)
     abort ();
   else {
@@ -139,7 +140,7 @@ krb5_rd_req(krb5_context context,
       return ret;
 
     if (strcmp (authenticator.crealm, decr_part.crealm) != 0)
-      return KRB_AP_ERR_BADMATCH;
+      return KRB5KRB_AP_ERR_BADMATCH;
     {
       krb5_principal p1, p2;
 
@@ -148,7 +149,7 @@ krb5_rd_req(krb5_context context,
       principalname2krb5_principal(&p2, decr_part.cname,
 				   decr_part.crealm);
       if (!krb5_principal_compare (context, p1, p2))
-	return KRB_AP_ERR_BADMATCH;
+	return KRB5KRB_AP_ERR_BADMATCH;
     }
     (*auth_context)->authenticator->cusec = authenticator.cusec;
     (*auth_context)->authenticator->ctime = authenticator.ctime;
diff --git a/lib/krb5/rd_safe.c b/lib/krb5/rd_safe.c
index 2f8ed9e8a..63c7e2cd5 100644
--- a/lib/krb5/rd_safe.c
+++ b/lib/krb5/rd_safe.c
@@ -1,5 +1,6 @@
 #include <krb5_locl.h>
-#include <krb5_error.h>
+
+RCSID("$Id$");
 
 krb5_error_code
 krb5_rd_safe(krb5_context context,
@@ -16,11 +17,11 @@ krb5_rd_safe(krb5_context context,
   if (len < 0)
     return ASN1_PARSE_ERROR;
   if (safe.pvno != 5)
-    return KRB_AP_ERR_BADVERSION;
+    return KRB5KRB_AP_ERR_BADVERSION;
   if (safe.msg_type != krb_safe)
-    return KRB_AP_ERR_MSG_TYPE;
+    return KRB5KRB_AP_ERR_MSG_TYPE;
   if (safe.cksum.cksumtype != CKSUMTYPE_RSA_MD4)
-    return KRB_AP_ERR_INAPP_CKSUM;
+    return KRB5KRB_AP_ERR_INAPP_CKSUM;
   /* XXX */
   r = krb5_verify_checksum (context,
 			    safe.safe_body.user_data.data,
diff --git a/lib/krb5/send_to_kdc.c b/lib/krb5/send_to_kdc.c
index 1b7c0b813..e7f8b7155 100644
--- a/lib/krb5/send_to_kdc.c
+++ b/lib/krb5/send_to_kdc.c
@@ -1,5 +1,6 @@
 #include "krb5_locl.h"
-#include "krb5_error.h"
+
+RCSID("$Id$");
 
 static int
 send_and_recv (int fd,
diff --git a/lib/krb5/store.c b/lib/krb5/store.c
index 6c81f7e2c..051255952 100644
--- a/lib/krb5/store.c
+++ b/lib/krb5/store.c
@@ -67,7 +67,7 @@ mem_seek(krb5_storage *sp, off_t offset, int whence)
 		 SEEK_SET);
 	break;
     case SEEK_END:
-	sp->seek(sp, (char *)(MEM(sp)->len) + offset, SEEK_SET);
+	sp->seek(sp, MEM(sp)->len + offset, SEEK_SET);
     default:
 	errno = EINVAL;
 	return -1;
diff --git a/lib/krb5/str2key.c b/lib/krb5/str2key.c
index b8a38b122..b65f1126e 100644
--- a/lib/krb5/str2key.c
+++ b/lib/krb5/str2key.c
@@ -1,5 +1,7 @@
 #include <krb5_locl.h>
 
+RCSID("$Id$");
+
 /*
  * Reverse 8 bytes
  */