diff --git a/lib/krb5/crc.c b/lib/krb5/crc.c
index a900cabbb..eab946541 100644
--- a/lib/krb5/crc.c
+++ b/lib/krb5/crc.c
@@ -33,8 +33,6 @@
 
 #include "krb5_locl.h"
 
-RCSID("$Id$");
-
 static u_long table[256];
 
 #define CRC_GEN 0xEDB88320L
diff --git a/lib/krb5/doxygen.c b/lib/krb5/doxygen.c
index 370eca58a..de9971c0c 100644
--- a/lib/krb5/doxygen.c
+++ b/lib/krb5/doxygen.c
@@ -32,7 +32,6 @@
  */
 
 #include "krb5_locl.h"
-RCSID("$Id$");
 
 /**
  *
diff --git a/lib/krb5/krb5_locl.h b/lib/krb5/krb5_locl.h
index 0e279507c..7c3c79de8 100644
--- a/lib/krb5/krb5_locl.h
+++ b/lib/krb5/krb5_locl.h
@@ -36,9 +36,7 @@
 #ifndef __KRB5_LOCL_H__
 #define __KRB5_LOCL_H__
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <errno.h>
 #include <ctype.h>
diff --git a/lib/krb5/krbhst.c b/lib/krb5/krbhst.c
index 7348ac3f0..273e7403f 100644
--- a/lib/krb5/krbhst.c
+++ b/lib/krb5/krbhst.c
@@ -35,8 +35,6 @@
 #include <resolve.h>
 #include "locate_plugin.h"
 
-RCSID("$Id$");
-
 static int
 string_to_proto(const char *string)
 {
diff --git a/lib/krb5/scache.c b/lib/krb5/scache.c
index 4df3f623e..3bc21c4bb 100644
--- a/lib/krb5/scache.c
+++ b/lib/krb5/scache.c
@@ -35,8 +35,6 @@
 
 #include <sqlite3.h>
 
-RCSID("$Id$");
-
 typedef struct krb5_scache {
     char *name;
     char *file;