diff --git a/lib/hcrypto/aes.c b/lib/hcrypto/aes.c
index bc9c9ca07..b3049c165 100644
--- a/lib/hcrypto/aes.c
+++ b/lib/hcrypto/aes.c
@@ -31,11 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
 
-RCSID("$Id$");
-#endif
 
 #ifdef KRB5
 #include <krb5-types.h>
diff --git a/lib/hcrypto/bn.c b/lib/hcrypto/bn.c
index 179595ae5..545d9529d 100644
--- a/lib/hcrypto/bn.c
+++ b/lib/hcrypto/bn.c
@@ -31,11 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
-RCSID("$Id$");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/hcrypto/des.c b/lib/hcrypto/des.c
index 5e258dfbc..7dc4823b5 100644
--- a/lib/hcrypto/des.c
+++ b/lib/hcrypto/des.c
@@ -82,10 +82,7 @@
  * thanks to his work. Thank you Richard.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #define HC_DEPRECATED
 
diff --git a/lib/hcrypto/destest.c b/lib/hcrypto/destest.c
index b3d823942..405404bd1 100644
--- a/lib/hcrypto/destest.c
+++ b/lib/hcrypto/destest.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-RCSID("$Id$");
-#endif
 
 #ifdef KRB5
 #include <krb5-types.h>
diff --git a/lib/hcrypto/dh-imath.c b/lib/hcrypto/dh-imath.c
index 4725281d1..822d5a328 100644
--- a/lib/hcrypto/dh-imath.c
+++ b/lib/hcrypto/dh-imath.c
@@ -43,8 +43,6 @@
 
 #include "imath/imath.h"
 
-RCSID("$Id$");
-
 static void
 BN2mpz(mpz_t *s, const BIGNUM *bn)
 {
diff --git a/lib/hcrypto/dh.c b/lib/hcrypto/dh.c
index b0299395a..d42ac34fd 100644
--- a/lib/hcrypto/dh.c
+++ b/lib/hcrypto/dh.c
@@ -35,8 +35,6 @@
 #include <config.h>
 #endif
 
-RCSID("$Id$");
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <dh.h>
diff --git a/lib/hcrypto/dllmain.c b/lib/hcrypto/dllmain.c
index 27b4c2d44..b241c7380 100644
--- a/lib/hcrypto/dllmain.c
+++ b/lib/hcrypto/dllmain.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <Windows.h>
 
diff --git a/lib/hcrypto/dsa.c b/lib/hcrypto/dsa.c
index 6606a5e7c..a5bdbabad 100644
--- a/lib/hcrypto/dsa.c
+++ b/lib/hcrypto/dsa.c
@@ -31,11 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-RCSID("$Id$");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/hcrypto/engine.c b/lib/hcrypto/engine.c
index 61d5f9382..8066d59cf 100644
--- a/lib/hcrypto/engine.c
+++ b/lib/hcrypto/engine.c
@@ -31,11 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-RCSID("$Id$");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/hcrypto/evp-crypt.c b/lib/hcrypto/evp-crypt.c
index f0e7250fe..bfe45cdff 100644
--- a/lib/hcrypto/evp-crypt.c
+++ b/lib/hcrypto/evp-crypt.c
@@ -33,11 +33,7 @@
 
 /* Windows crypto provider plugin, sample */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-RCSID("$Id$");
 
 #define HC_DEPRECATED
 
diff --git a/lib/hcrypto/evp-hcrypto.c b/lib/hcrypto/evp-hcrypto.c
index 689738561..d176e2edf 100644
--- a/lib/hcrypto/evp-hcrypto.c
+++ b/lib/hcrypto/evp-hcrypto.c
@@ -31,11 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-RCSID("$Id$");
 
 #define HC_DEPRECATED
 
diff --git a/lib/hcrypto/md2.c b/lib/hcrypto/md2.c
index e82169c70..26254acee 100644
--- a/lib/hcrypto/md2.c
+++ b/lib/hcrypto/md2.c
@@ -31,12 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
 
-RCSID("$Id$");
-#endif
-
 #include "hash.h"
 #include "md2.h"
 
diff --git a/lib/hcrypto/md4.c b/lib/hcrypto/md4.c
index 56e2ac97c..435e662a4 100644
--- a/lib/hcrypto/md4.c
+++ b/lib/hcrypto/md4.c
@@ -31,12 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
 
-RCSID("$Id$");
-#endif
-
 #include "hash.h"
 #include "md4.h"
 
diff --git a/lib/hcrypto/md5.c b/lib/hcrypto/md5.c
index ffc7bb9ec..f99078737 100644
--- a/lib/hcrypto/md5.c
+++ b/lib/hcrypto/md5.c
@@ -31,12 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
 
-RCSID("$Id$");
-#endif
-
 #include "hash.h"
 #include "md5.h"
 
diff --git a/lib/hcrypto/md5crypt_test.c b/lib/hcrypto/md5crypt_test.c
index 03a72b762..a0c2df411 100644
--- a/lib/hcrypto/md5crypt_test.c
+++ b/lib/hcrypto/md5crypt_test.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/hcrypto/mdtest.c b/lib/hcrypto/mdtest.c
index d279f1e3f..d67c04a6b 100644
--- a/lib/hcrypto/mdtest.c
+++ b/lib/hcrypto/mdtest.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #define HC_DEPRECATED_CRYPTO
 
diff --git a/lib/hcrypto/passwd_dlg.c b/lib/hcrypto/passwd_dlg.c
index cd461e2f9..c16f28327 100644
--- a/lib/hcrypto/passwd_dlg.c
+++ b/lib/hcrypto/passwd_dlg.c
@@ -36,10 +36,7 @@
  * Date:	June 1996
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #ifdef WIN32	/* Visual C++ 4.0 (Windows95/NT) */
 #include <Windows.h>
diff --git a/lib/hcrypto/pkcs12.c b/lib/hcrypto/pkcs12.c
index 11afa0b68..92a40fa69 100644
--- a/lib/hcrypto/pkcs12.c
+++ b/lib/hcrypto/pkcs12.c
@@ -31,11 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-RCSID("$Id$");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/hcrypto/pkcs5.c b/lib/hcrypto/pkcs5.c
index 6537561e5..18045e236 100644
--- a/lib/hcrypto/pkcs5.c
+++ b/lib/hcrypto/pkcs5.c
@@ -31,11 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-RCSID("$Id$");
 
 #ifdef KRB5
 #include <krb5-types.h>
diff --git a/lib/hcrypto/rand-egd.c b/lib/hcrypto/rand-egd.c
index 168c15114..00d3286f2 100644
--- a/lib/hcrypto/rand-egd.c
+++ b/lib/hcrypto/rand-egd.c
@@ -31,11 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-RCSID("$Id$");
 
 #include <sys/types.h>
 #ifdef HAVE_SYS_UN_H
diff --git a/lib/hcrypto/rand-fortuna.c b/lib/hcrypto/rand-fortuna.c
index ebb4e6e18..c39c71390 100644
--- a/lib/hcrypto/rand-fortuna.c
+++ b/lib/hcrypto/rand-fortuna.c
@@ -29,11 +29,7 @@
  * $PostgreSQL: pgsql/contrib/pgcrypto/fortuna.c,v 1.8 2006/10/04 00:29:46 momjian Exp $
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-RCSID("$Id$");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/hcrypto/rand-timer.c b/lib/hcrypto/rand-timer.c
index 86ff22c30..994c3210e 100644
--- a/lib/hcrypto/rand-timer.c
+++ b/lib/hcrypto/rand-timer.c
@@ -31,11 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-RCSID("$Id$");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/hcrypto/rand-unix.c b/lib/hcrypto/rand-unix.c
index 07d81eb62..2bfa265fa 100644
--- a/lib/hcrypto/rand-unix.c
+++ b/lib/hcrypto/rand-unix.c
@@ -31,11 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-RCSID("$Id$");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/hcrypto/rand.c b/lib/hcrypto/rand.c
index a61c9cdfb..3cd65989c 100644
--- a/lib/hcrypto/rand.c
+++ b/lib/hcrypto/rand.c
@@ -31,11 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-RCSID("$Id$");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/hcrypto/rc2.c b/lib/hcrypto/rc2.c
index 917914968..dcfe42d02 100644
--- a/lib/hcrypto/rc2.c
+++ b/lib/hcrypto/rc2.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "rc2.h"
 #include <stdio.h>
diff --git a/lib/hcrypto/rc2test.c b/lib/hcrypto/rc2test.c
index afaa4e2d9..01701adf7 100644
--- a/lib/hcrypto/rc2test.c
+++ b/lib/hcrypto/rc2test.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <rc2.h>
 #include <stdio.h>
diff --git a/lib/hcrypto/rc4.c b/lib/hcrypto/rc4.c
index 9e696f78a..81cf093e4 100644
--- a/lib/hcrypto/rc4.c
+++ b/lib/hcrypto/rc4.c
@@ -33,12 +33,8 @@
 
 /* implemented from description in draft-kaukonen-cipher-arcfour-03.txt */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
 
-RCSID("$Id$");
-#endif
-
 #include <rc4.h>
 
 #define SWAP(k,x,y)				\
diff --git a/lib/hcrypto/rctest.c b/lib/hcrypto/rctest.c
index bcf6a1485..b952fcc9d 100644
--- a/lib/hcrypto/rctest.c
+++ b/lib/hcrypto/rctest.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/hcrypto/rijndael-alg-fst.c b/lib/hcrypto/rijndael-alg-fst.c
index 57f13177d..3dd255581 100644
--- a/lib/hcrypto/rijndael-alg-fst.c
+++ b/lib/hcrypto/rijndael-alg-fst.c
@@ -28,11 +28,8 @@
 
 /* "$NetBSD: rijndael-alg-fst.c,v 1.5 2001/11/13 01:40:10 lukem Exp $" */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
 
-RCSID("$Id$");
-#endif
 
 #ifdef KRB5
 #include <krb5-types.h>
diff --git a/lib/hcrypto/rnd_keys.c b/lib/hcrypto/rnd_keys.c
index 94370513e..9baf00212 100644
--- a/lib/hcrypto/rnd_keys.c
+++ b/lib/hcrypto/rnd_keys.c
@@ -31,11 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
 
-RCSID("$Id$");
-#endif
 
 #define HC_DEPRECATED
 
diff --git a/lib/hcrypto/rsa-gmp.c b/lib/hcrypto/rsa-gmp.c
index 4342d78c3..a5c40704c 100644
--- a/lib/hcrypto/rsa-gmp.c
+++ b/lib/hcrypto/rsa-gmp.c
@@ -31,12 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-RCSID("$Id$");
-
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/hcrypto/rsa-imath.c b/lib/hcrypto/rsa-imath.c
index 524027976..2641dc1bc 100644
--- a/lib/hcrypto/rsa-imath.c
+++ b/lib/hcrypto/rsa-imath.c
@@ -31,11 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-RCSID("$Id$");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/hcrypto/rsa.c b/lib/hcrypto/rsa.c
index f3095e7d3..9b9ecea67 100644
--- a/lib/hcrypto/rsa.c
+++ b/lib/hcrypto/rsa.c
@@ -31,11 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-RCSID("$Id$");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/hcrypto/sha.c b/lib/hcrypto/sha.c
index fd4867278..062f70509 100644
--- a/lib/hcrypto/sha.c
+++ b/lib/hcrypto/sha.c
@@ -31,12 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
 
-RCSID("$Id$");
-#endif
-
 #include "hash.h"
 #include "sha.h"
 
diff --git a/lib/hcrypto/sha256.c b/lib/hcrypto/sha256.c
index 922fb055a..baa87d15f 100644
--- a/lib/hcrypto/sha256.c
+++ b/lib/hcrypto/sha256.c
@@ -31,12 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
 
-RCSID("$Id$");
-#endif
-
 #include "hash.h"
 #include "sha.h"
 
diff --git a/lib/hcrypto/test_bn.c b/lib/hcrypto/test_bn.c
index 4a5fe22b7..b180f8e34 100644
--- a/lib/hcrypto/test_bn.c
+++ b/lib/hcrypto/test_bn.c
@@ -31,13 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#ifdef RCSID
-RCSID("$Id$");
-#endif
 
 #include <sys/types.h>
 #include <limits.h>
diff --git a/lib/hcrypto/test_cipher.c b/lib/hcrypto/test_cipher.c
index db63e4b26..a5bb45b6d 100644
--- a/lib/hcrypto/test_cipher.c
+++ b/lib/hcrypto/test_cipher.c
@@ -31,13 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#ifdef RCSID
-RCSID("$Id$");
-#endif
 
 #define HC_DEPRECATED_CRYPTO
 
diff --git a/lib/hcrypto/test_dh.c b/lib/hcrypto/test_dh.c
index 56d2df942..61505ae8d 100644
--- a/lib/hcrypto/test_dh.c
+++ b/lib/hcrypto/test_dh.c
@@ -37,13 +37,7 @@
  * fail since openssl-0.9.8f
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#ifdef RCSID
-RCSID("$Id: test_rsa.c 20466 2007-04-20 08:29:05Z lha $");
-#endif
 
 #include <stdio.h>
 #include <ctype.h>
diff --git a/lib/hcrypto/test_engine_dso.c b/lib/hcrypto/test_engine_dso.c
index 2b9c9a4a2..f0cb7d417 100644
--- a/lib/hcrypto/test_engine_dso.c
+++ b/lib/hcrypto/test_engine_dso.c
@@ -31,13 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#ifdef RCSID
-RCSID("$Id$");
-#endif
 
 #include <stdio.h>
 
diff --git a/lib/hcrypto/test_hmac.c b/lib/hcrypto/test_hmac.c
index 66625b8ed..263f4f7ab 100644
--- a/lib/hcrypto/test_hmac.c
+++ b/lib/hcrypto/test_hmac.c
@@ -31,13 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#ifdef RCSID
-RCSID("$Id$");
-#endif
 
 #include <sys/types.h>
 #include <limits.h>
diff --git a/lib/hcrypto/test_imath.c b/lib/hcrypto/test_imath.c
index ef5f420b6..41e740b91 100644
--- a/lib/hcrypto/test_imath.c
+++ b/lib/hcrypto/test_imath.c
@@ -32,7 +32,6 @@
  */
 
 #include <config.h>
-RCSID("$Id$");
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/hcrypto/test_pkcs12.c b/lib/hcrypto/test_pkcs12.c
index 347ef14b2..aa27af0e6 100644
--- a/lib/hcrypto/test_pkcs12.c
+++ b/lib/hcrypto/test_pkcs12.c
@@ -31,13 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#ifdef RCSID
-RCSID("$Id$");
-#endif
 
 #include <sys/types.h>
 #include <limits.h>
diff --git a/lib/hcrypto/test_pkcs5.c b/lib/hcrypto/test_pkcs5.c
index 563b4f911..46ca52ac7 100644
--- a/lib/hcrypto/test_pkcs5.c
+++ b/lib/hcrypto/test_pkcs5.c
@@ -31,13 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#ifdef RCSID
-RCSID("$Id$");
-#endif
 
 #include <sys/types.h>
 #include <limits.h>
diff --git a/lib/hcrypto/test_rand.c b/lib/hcrypto/test_rand.c
index 8f106df5e..5a73e6428 100644
--- a/lib/hcrypto/test_rand.c
+++ b/lib/hcrypto/test_rand.c
@@ -31,13 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#ifdef RCSID
-RCSID("$Id$");
-#endif
 
 #include <stdio.h>
 
diff --git a/lib/hcrypto/test_rsa.c b/lib/hcrypto/test_rsa.c
index 230f13318..16dc6038e 100644
--- a/lib/hcrypto/test_rsa.c
+++ b/lib/hcrypto/test_rsa.c
@@ -31,13 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-#ifdef RCSID
-RCSID("$Id$");
-#endif
 
 #include <stdio.h>
 
diff --git a/lib/hcrypto/ui.c b/lib/hcrypto/ui.c
index 91abf7637..ca8c8442b 100644
--- a/lib/hcrypto/ui.c
+++ b/lib/hcrypto/ui.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>