diff --git a/lib/roken/base64-test.c b/lib/roken/base64-test.c
index 8d70fac77..e9a2835e8 100644
--- a/lib/roken/base64-test.c
+++ b/lib/roken/base64-test.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 #include <base64.h>
diff --git a/lib/roken/base64.c b/lib/roken/base64.c
index e5ec7b7a2..5e720eb6d 100644
--- a/lib/roken/base64.c
+++ b/lib/roken/base64.c
@@ -31,10 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
+
 #include <stdlib.h>
 #include <string.h>
 #include "base64.h"
diff --git a/lib/roken/bswap.c b/lib/roken/bswap.c
index a87345be3..67d240c23 100644
--- a/lib/roken/bswap.c
+++ b/lib/roken/bswap.c
@@ -31,13 +31,9 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 #include "roken.h"
 
-RCSID("$Id$");
-
 #ifndef HAVE_BSWAP32
 
 unsigned int ROKEN_LIB_FUNCTION
diff --git a/lib/roken/chown.c b/lib/roken/chown.c
index 68aa089b9..c01e2aa94 100644
--- a/lib/roken/chown.c
+++ b/lib/roken/chown.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/cloexec.c b/lib/roken/cloexec.c
index 7a6423330..c015b1d8f 100644
--- a/lib/roken/cloexec.c
+++ b/lib/roken/cloexec.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/lib/roken/closefrom.c b/lib/roken/closefrom.c
index 9198c05e2..7aa0ef737 100644
--- a/lib/roken/closefrom.c
+++ b/lib/roken/closefrom.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/lib/roken/concat.c b/lib/roken/concat.c
index 62087628e..631a0786b 100644
--- a/lib/roken/concat.c
+++ b/lib/roken/concat.c
@@ -31,10 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
+
 #include "roken.h"
 
 int ROKEN_LIB_FUNCTION
diff --git a/lib/roken/copyhostent.c b/lib/roken/copyhostent.c
index 58f5a112f..69c1ba40f 100644
--- a/lib/roken/copyhostent.c
+++ b/lib/roken/copyhostent.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/daemon.c b/lib/roken/daemon.c
index 6a06a686a..2fc98371b 100644
--- a/lib/roken/daemon.c
+++ b/lib/roken/daemon.c
@@ -31,11 +31,7 @@
 static char sccsid[] = "@(#)daemon.c	8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-RCSID("$Id$");
 
 #ifndef HAVE_DAEMON
 
diff --git a/lib/roken/dumpdata.c b/lib/roken/dumpdata.c
index 88a86815e..c5513c323 100644
--- a/lib/roken/dumpdata.c
+++ b/lib/roken/dumpdata.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <unistd.h>
 
diff --git a/lib/roken/ecalloc.c b/lib/roken/ecalloc.c
index 6c579e99f..c8e650403 100644
--- a/lib/roken/ecalloc.c
+++ b/lib/roken/ecalloc.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <stdlib.h>
 #include <err.h>
diff --git a/lib/roken/emalloc.c b/lib/roken/emalloc.c
index d033e16a0..c937e6d70 100644
--- a/lib/roken/emalloc.c
+++ b/lib/roken/emalloc.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <stdlib.h>
 #include <err.h>
diff --git a/lib/roken/environment.c b/lib/roken/environment.c
index 35f3c8b1b..49a6f4a54 100644
--- a/lib/roken/environment.c
+++ b/lib/roken/environment.c
@@ -32,10 +32,7 @@
  */
 
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <stdio.h>
 #include <string.h>
diff --git a/lib/roken/eread.c b/lib/roken/eread.c
index f6802c432..18de0b85e 100644
--- a/lib/roken/eread.c
+++ b/lib/roken/eread.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <unistd.h>
 #include <err.h>
diff --git a/lib/roken/erealloc.c b/lib/roken/erealloc.c
index 239d6a0ea..f77c8ec73 100644
--- a/lib/roken/erealloc.c
+++ b/lib/roken/erealloc.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <stdlib.h>
 #include <err.h>
diff --git a/lib/roken/err.c b/lib/roken/err.c
index 5cb37cd30..a5c3dddb5 100644
--- a/lib/roken/err.c
+++ b/lib/roken/err.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "err.h"
 
diff --git a/lib/roken/errx.c b/lib/roken/errx.c
index 4d60054a6..60fc7e7c0 100644
--- a/lib/roken/errx.c
+++ b/lib/roken/errx.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "err.h"
 
diff --git a/lib/roken/esetenv.c b/lib/roken/esetenv.c
index 3a4ad9678..bbafdbea1 100644
--- a/lib/roken/esetenv.c
+++ b/lib/roken/esetenv.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/estrdup.c b/lib/roken/estrdup.c
index fb353d0d8..ab7f26550 100644
--- a/lib/roken/estrdup.c
+++ b/lib/roken/estrdup.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <stdlib.h>
 #include <err.h>
diff --git a/lib/roken/ewrite.c b/lib/roken/ewrite.c
index 2792996a6..ac00f3b94 100644
--- a/lib/roken/ewrite.c
+++ b/lib/roken/ewrite.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <unistd.h>
 #include <err.h>
diff --git a/lib/roken/fchown.c b/lib/roken/fchown.c
index 81de92386..453bb3eb0 100644
--- a/lib/roken/fchown.c
+++ b/lib/roken/fchown.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/flock.c b/lib/roken/flock.c
index fc078fa6a..d7f32583e 100644
--- a/lib/roken/flock.c
+++ b/lib/roken/flock.c
@@ -31,12 +31,9 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #ifndef HAVE_FLOCK
-RCSID("$Id$");
 
 #include "roken.h"
 
diff --git a/lib/roken/freeaddrinfo.c b/lib/roken/freeaddrinfo.c
index 1721d20aa..434e49e88 100644
--- a/lib/roken/freeaddrinfo.c
+++ b/lib/roken/freeaddrinfo.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/freehostent.c b/lib/roken/freehostent.c
index 38c27d338..335504300 100644
--- a/lib/roken/freehostent.c
+++ b/lib/roken/freehostent.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/gai_strerror.c b/lib/roken/gai_strerror.c
index 084900a58..10beac05e 100644
--- a/lib/roken/gai_strerror.c
+++ b/lib/roken/gai_strerror.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/get_default_username.c b/lib/roken/get_default_username.c
index 614d58185..96fa1b06d 100644
--- a/lib/roken/get_default_username.c
+++ b/lib/roken/get_default_username.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif /* HAVE_CONFIG_H */
 
 #include "roken.h"
 
diff --git a/lib/roken/get_window_size.c b/lib/roken/get_window_size.c
index 9b200c115..60fb1764f 100644
--- a/lib/roken/get_window_size.c
+++ b/lib/roken/get_window_size.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
diff --git a/lib/roken/getaddrinfo-test.c b/lib/roken/getaddrinfo-test.c
index 4f9db38a2..b177d4762 100644
--- a/lib/roken/getaddrinfo-test.c
+++ b/lib/roken/getaddrinfo-test.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 #include "getarg.h"
diff --git a/lib/roken/getaddrinfo.c b/lib/roken/getaddrinfo.c
index a8fc029c3..8c6129976 100644
--- a/lib/roken/getaddrinfo.c
+++ b/lib/roken/getaddrinfo.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/getaddrinfo_hostspec.c b/lib/roken/getaddrinfo_hostspec.c
index 93f105b55..44694eeb8 100644
--- a/lib/roken/getaddrinfo_hostspec.c
+++ b/lib/roken/getaddrinfo_hostspec.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/getarg.c b/lib/roken/getarg.c
index 3884fa83d..714f26532 100644
--- a/lib/roken/getarg.c
+++ b/lib/roken/getarg.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/roken/getcap.c b/lib/roken/getcap.c
index 83f63966d..ff288d76e 100644
--- a/lib/roken/getcap.c
+++ b/lib/roken/getcap.c
@@ -32,11 +32,9 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
+
 #include "roken.h"
-RCSID("$Id$");
 
 #include <sys/types.h>
 #include <ctype.h>
diff --git a/lib/roken/getcwd.c b/lib/roken/getcwd.c
index 3ff61b688..c83b56e2d 100644
--- a/lib/roken/getcwd.c
+++ b/lib/roken/getcwd.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/lib/roken/getdtablesize.c b/lib/roken/getdtablesize.c
index a3ccd7787..a515af345 100644
--- a/lib/roken/getdtablesize.c
+++ b/lib/roken/getdtablesize.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/getegid.c b/lib/roken/getegid.c
index ed06fe869..dfd82db1a 100644
--- a/lib/roken/getegid.c
+++ b/lib/roken/getegid.c
@@ -31,15 +31,12 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
+
 #include "roken.h"
 
 #ifndef HAVE_GETEGID
 
-RCSID("$Id$");
-
 int ROKEN_LIB_FUNCTION
 getegid(void)
 {
diff --git a/lib/roken/geteuid.c b/lib/roken/geteuid.c
index 8acc3c0c5..3246d0256 100644
--- a/lib/roken/geteuid.c
+++ b/lib/roken/geteuid.c
@@ -31,15 +31,12 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
+
 #include "roken.h"
 
 #ifndef HAVE_GETEUID
 
-RCSID("$Id$");
-
 int ROKEN_LIB_FUNCTION
 geteuid(void)
 {
diff --git a/lib/roken/getgid.c b/lib/roken/getgid.c
index dee0c4e50..6a8e66db6 100644
--- a/lib/roken/getgid.c
+++ b/lib/roken/getgid.c
@@ -31,15 +31,11 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 #include "roken.h"
 
 #ifndef HAVE_GETGID
 
-RCSID("$Id$");
-
 int ROKEN_LIB_FUNCTION
 getgid(void)
 {
diff --git a/lib/roken/gethostname.c b/lib/roken/gethostname.c
index 48e796f18..7051667f7 100644
--- a/lib/roken/gethostname.c
+++ b/lib/roken/gethostname.c
@@ -31,9 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 #include "roken.h"
 
 #ifndef HAVE_GETHOSTNAME
diff --git a/lib/roken/getifaddrs.c b/lib/roken/getifaddrs.c
index 13c5e6c57..c9d2446aa 100644
--- a/lib/roken/getifaddrs.c
+++ b/lib/roken/getifaddrs.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 #include "roken.h"
 
 #ifdef __osf__
diff --git a/lib/roken/getipnodebyaddr.c b/lib/roken/getipnodebyaddr.c
index e3c2b50e3..ddaec03a8 100644
--- a/lib/roken/getipnodebyaddr.c
+++ b/lib/roken/getipnodebyaddr.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/getipnodebyname.c b/lib/roken/getipnodebyname.c
index ec578937b..16fdbdd24 100644
--- a/lib/roken/getipnodebyname.c
+++ b/lib/roken/getipnodebyname.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/getnameinfo.c b/lib/roken/getnameinfo.c
index 865cc09dc..0621cfeee 100644
--- a/lib/roken/getnameinfo.c
+++ b/lib/roken/getnameinfo.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/getnameinfo_verified.c b/lib/roken/getnameinfo_verified.c
index e4a459813..bcac6c561 100644
--- a/lib/roken/getnameinfo_verified.c
+++ b/lib/roken/getnameinfo_verified.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/getprogname.c b/lib/roken/getprogname.c
index b01a3d7e4..933b6dec7 100644
--- a/lib/roken/getprogname.c
+++ b/lib/roken/getprogname.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/gettimeofday.c b/lib/roken/gettimeofday.c
index 0c3183bd8..dcce56329 100644
--- a/lib/roken/gettimeofday.c
+++ b/lib/roken/gettimeofday.c
@@ -31,14 +31,10 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 #include "roken.h"
 #ifndef HAVE_GETTIMEOFDAY
 
-RCSID("$Id$");
-
 /*
  * Simple gettimeofday that only returns seconds.
  */
diff --git a/lib/roken/getuid.c b/lib/roken/getuid.c
index a87445f5d..86bca77e1 100644
--- a/lib/roken/getuid.c
+++ b/lib/roken/getuid.c
@@ -31,15 +31,11 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 #include "roken.h"
 
 #ifndef HAVE_GETUID
 
-RCSID("$Id$");
-
 int ROKEN_LIB_FUNCTION
 getuid(void)
 {
diff --git a/lib/roken/getusershell.c b/lib/roken/getusershell.c
index 00d5eb0e8..a1e6333e7 100644
--- a/lib/roken/getusershell.c
+++ b/lib/roken/getusershell.c
@@ -27,11 +27,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
-
-RCSID("$Id$");
 
 #ifndef HAVE_GETUSERSHELL
 
diff --git a/lib/roken/glob.c b/lib/roken/glob.c
index 516834549..4cdb9037f 100644
--- a/lib/roken/glob.c
+++ b/lib/roken/glob.c
@@ -55,9 +55,7 @@
  *	Number of matches in the current invocation of glob.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
diff --git a/lib/roken/h_errno.c b/lib/roken/h_errno.c
index 0cee02d47..7e49f8008 100644
--- a/lib/roken/h_errno.c
+++ b/lib/roken/h_errno.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #ifndef HAVE_H_ERRNO
 int h_errno = -17; /* Some magic number */
diff --git a/lib/roken/hex-test.c b/lib/roken/hex-test.c
index 534d96d8a..9a3d10f28 100644
--- a/lib/roken/hex-test.c
+++ b/lib/roken/hex-test.c
@@ -31,12 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
 
-RCSID("$Id$");
-#endif
-
 #include "roken.h"
 #include <hex.h>
 
diff --git a/lib/roken/hex.c b/lib/roken/hex.c
index 68c18a4eb..95488af5c 100644
--- a/lib/roken/hex.c
+++ b/lib/roken/hex.c
@@ -31,10 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
+
 #include <config.h>
-RCSID("$Id$");
-#endif
 #include "roken.h"
 #include <ctype.h>
 #include "hex.h"
diff --git a/lib/roken/hostent_find_fqdn.c b/lib/roken/hostent_find_fqdn.c
index 9376c1da3..b5f2b42f6 100644
--- a/lib/roken/hostent_find_fqdn.c
+++ b/lib/roken/hostent_find_fqdn.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/hstrerror.c b/lib/roken/hstrerror.c
index 1746acee4..79eab2dd5 100644
--- a/lib/roken/hstrerror.c
+++ b/lib/roken/hstrerror.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #ifndef HAVE_HSTRERROR
 
diff --git a/lib/roken/inet_aton.c b/lib/roken/inet_aton.c
index c42697c63..c9b21e00f 100644
--- a/lib/roken/inet_aton.c
+++ b/lib/roken/inet_aton.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/inet_ntop.c b/lib/roken/inet_ntop.c
index 5e4e4f9dc..daf3e926d 100644
--- a/lib/roken/inet_ntop.c
+++ b/lib/roken/inet_ntop.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/inet_pton.c b/lib/roken/inet_pton.c
index f2a9af3aa..ad60824f4 100644
--- a/lib/roken/inet_pton.c
+++ b/lib/roken/inet_pton.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/innetgr.c b/lib/roken/innetgr.c
index 13996954a..2f6d9a1dc 100644
--- a/lib/roken/innetgr.c
+++ b/lib/roken/innetgr.c
@@ -30,15 +30,11 @@
  * 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>
-#endif
 #include "roken.h"
 
 #ifndef HAVE_INNETGR
 
-RCSID("$Id$");
-
 int ROKEN_LIB_FUNCTION
 innetgr(const char *netgroup, const char *machine,
 	const char *user, const char *domain)
diff --git a/lib/roken/iruserok.c b/lib/roken/iruserok.c
index 1ff0abfe6..3f0b5a0a5 100644
--- a/lib/roken/iruserok.c
+++ b/lib/roken/iruserok.c
@@ -27,10 +27,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <stdio.h>
 #include <ctype.h>
diff --git a/lib/roken/issuid.c b/lib/roken/issuid.c
index 257481cff..2999e8249 100644
--- a/lib/roken/issuid.c
+++ b/lib/roken/issuid.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/k_getpwnam.c b/lib/roken/k_getpwnam.c
index bc8bac508..0c50118dd 100644
--- a/lib/roken/k_getpwnam.c
+++ b/lib/roken/k_getpwnam.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif /* HAVE_CONFIG_H */
 
 #include "roken.h"
 #ifdef HAVE_SHADOW_H
diff --git a/lib/roken/k_getpwuid.c b/lib/roken/k_getpwuid.c
index b7fba2e7d..29b7228e2 100644
--- a/lib/roken/k_getpwuid.c
+++ b/lib/roken/k_getpwuid.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif /* HAVE_CONFIG_H */
 
 #include "roken.h"
 #ifdef HAVE_SHADOW_H
diff --git a/lib/roken/localtime_r.c b/lib/roken/localtime_r.c
index f60294c49..3335180b1 100644
--- a/lib/roken/localtime_r.c
+++ b/lib/roken/localtime_r.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <stdio.h>
 #include <time.h>
diff --git a/lib/roken/lstat.c b/lib/roken/lstat.c
index b7bbdf30a..a850efd75 100644
--- a/lib/roken/lstat.c
+++ b/lib/roken/lstat.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/memmove.c b/lib/roken/memmove.c
index 5199e258f..c5cdf6fd6 100644
--- a/lib/roken/memmove.c
+++ b/lib/roken/memmove.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 /*
  * memmove for systems that doesn't have it
diff --git a/lib/roken/mini_inetd.c b/lib/roken/mini_inetd.c
index f8aa739ea..f00a39837 100644
--- a/lib/roken/mini_inetd.c
+++ b/lib/roken/mini_inetd.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <err.h>
 #include "roken.h"
diff --git a/lib/roken/mkstemp.c b/lib/roken/mkstemp.c
index 97545264e..abdc8c8ff 100644
--- a/lib/roken/mkstemp.c
+++ b/lib/roken/mkstemp.c
@@ -31,9 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <string.h>
 #ifdef HAVE_UNISTD_H
diff --git a/lib/roken/ndbm_wrap.c b/lib/roken/ndbm_wrap.c
index 779f614e3..8db3662a1 100644
--- a/lib/roken/ndbm_wrap.c
+++ b/lib/roken/ndbm_wrap.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "ndbm_wrap.h"
 #if defined(HAVE_DB4_DB_H)
diff --git a/lib/roken/net_read.c b/lib/roken/net_read.c
index ae025ffc7..9d055d006 100644
--- a/lib/roken/net_read.c
+++ b/lib/roken/net_read.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/lib/roken/net_write.c b/lib/roken/net_write.c
index 11f5b8d7b..515f21097 100644
--- a/lib/roken/net_write.c
+++ b/lib/roken/net_write.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/lib/roken/parse_bytes-test.c b/lib/roken/parse_bytes-test.c
index 14993c6bb..3c42cb182 100644
--- a/lib/roken/parse_bytes-test.c
+++ b/lib/roken/parse_bytes-test.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 #include "parse_bytes.h"
diff --git a/lib/roken/parse_bytes.c b/lib/roken/parse_bytes.c
index 5f677564f..4a7df94e7 100644
--- a/lib/roken/parse_bytes.c
+++ b/lib/roken/parse_bytes.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <parse_units.h>
 #include "parse_bytes.h"
diff --git a/lib/roken/parse_reply-test.c b/lib/roken/parse_reply-test.c
index 94739a29f..5e40b8185 100644
--- a/lib/roken/parse_reply-test.c
+++ b/lib/roken/parse_reply-test.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <sys/types.h>
 #ifdef HAVE_SYS_MMAN_H
diff --git a/lib/roken/parse_time-test.c b/lib/roken/parse_time-test.c
index 8e8e87812..d6ba4cbb9 100644
--- a/lib/roken/parse_time-test.c
+++ b/lib/roken/parse_time-test.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 #include "parse_time.h"
diff --git a/lib/roken/parse_time.c b/lib/roken/parse_time.c
index 6065eeb42..b581970bd 100644
--- a/lib/roken/parse_time.c
+++ b/lib/roken/parse_time.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <parse_units.h>
 #include "parse_time.h"
diff --git a/lib/roken/parse_units.c b/lib/roken/parse_units.c
index 4dbd7b489..a848298c5 100644
--- a/lib/roken/parse_units.c
+++ b/lib/roken/parse_units.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <stdio.h>
 #include <ctype.h>
diff --git a/lib/roken/putenv.c b/lib/roken/putenv.c
index eec2377f6..a1a119e33 100644
--- a/lib/roken/putenv.c
+++ b/lib/roken/putenv.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <stdlib.h>
 
diff --git a/lib/roken/rcmd.c b/lib/roken/rcmd.c
index a4489dfb7..c1ff33919 100644
--- a/lib/roken/rcmd.c
+++ b/lib/roken/rcmd.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 #include <stdio.h>
diff --git a/lib/roken/readv.c b/lib/roken/readv.c
index 42ee5a5b5..4523b4a48 100644
--- a/lib/roken/readv.c
+++ b/lib/roken/readv.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/realloc.c b/lib/roken/realloc.c
index 656e51501..9fdde6f73 100644
--- a/lib/roken/realloc.c
+++ b/lib/roken/realloc.c
@@ -31,10 +31,9 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
 #undef realloc
-#endif
+
 #include <stdlib.h>
 #include "roken.h"
 
diff --git a/lib/roken/recvmsg.c b/lib/roken/recvmsg.c
index f2e00145d..184e9c6a7 100644
--- a/lib/roken/recvmsg.c
+++ b/lib/roken/recvmsg.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/resolve-test.c b/lib/roken/resolve-test.c
index a9d202fd1..97324d635 100644
--- a/lib/roken/resolve-test.c
+++ b/lib/roken/resolve-test.c
@@ -31,9 +31,9 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
+
 #include <config.h>
-#endif
+
 #include "roken.h"
 #include "getarg.h"
 #ifdef HAVE_ARPA_NAMESER_H
diff --git a/lib/roken/resolve.c b/lib/roken/resolve.c
index f358a5b26..e08ba59f6 100644
--- a/lib/roken/resolve.c
+++ b/lib/roken/resolve.c
@@ -31,9 +31,9 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
+
 #include <config.h>
-#endif
+
 #include "roken.h"
 #ifdef HAVE_ARPA_NAMESER_H
 #include <arpa/nameser.h>
diff --git a/lib/roken/roken.awk b/lib/roken/roken.awk
index 184f455a2..9c9e526cc 100644
--- a/lib/roken/roken.awk
+++ b/lib/roken/roken.awk
@@ -1,9 +1,7 @@
 # $Id$
 
 BEGIN {
-	print "#ifdef HAVE_CONFIG_H"
 	print "#include <config.h>"
-	print "#endif"
 	print "#include <stdio.h>"
 	print ""
 	print "int main(int argc, char **argv)"
diff --git a/lib/roken/roken_gethostby.c b/lib/roken/roken_gethostby.c
index 12760456a..d87a49a04 100644
--- a/lib/roken/roken_gethostby.c
+++ b/lib/roken/roken_gethostby.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/rtbl.c b/lib/roken/rtbl.c
index cfb765709..7d11a487c 100644
--- a/lib/roken/rtbl.c
+++ b/lib/roken/rtbl.c
@@ -31,10 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID ("$Id$");
-#endif
+
 #include "roken.h"
 #include "rtbl.h"
 
diff --git a/lib/roken/sendmsg.c b/lib/roken/sendmsg.c
index e3783b0da..2c087bd1b 100644
--- a/lib/roken/sendmsg.c
+++ b/lib/roken/sendmsg.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/setegid.c b/lib/roken/setegid.c
index 9e82d9c37..b4b3b036a 100644
--- a/lib/roken/setegid.c
+++ b/lib/roken/setegid.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/lib/roken/setenv.c b/lib/roken/setenv.c
index 4b747e45b..b6d0c0a6a 100644
--- a/lib/roken/setenv.c
+++ b/lib/roken/setenv.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/seteuid.c b/lib/roken/seteuid.c
index 0c57bc4d0..cff8f24d8 100644
--- a/lib/roken/seteuid.c
+++ b/lib/roken/seteuid.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/lib/roken/setprogname.c b/lib/roken/setprogname.c
index 9beb07afe..225e6ae09 100644
--- a/lib/roken/setprogname.c
+++ b/lib/roken/setprogname.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/signal.c b/lib/roken/signal.c
index 9141ca2bb..19a484543 100644
--- a/lib/roken/signal.c
+++ b/lib/roken/signal.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <signal.h>
 #include "roken.h"
diff --git a/lib/roken/snprintf-test.c b/lib/roken/snprintf-test.c
index 627c587d0..dd7d5fb8d 100644
--- a/lib/roken/snprintf-test.c
+++ b/lib/roken/snprintf-test.c
@@ -30,9 +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>
-#endif
 #include "snprintf-test.h"
 #include "roken.h"
 #include <limits.h>
diff --git a/lib/roken/snprintf.c b/lib/roken/snprintf.c
index 5bca51dca..375f417bb 100644
--- a/lib/roken/snprintf.c
+++ b/lib/roken/snprintf.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 #if defined(TEST_SNPRINTF)
 #include "snprintf-test.h"
 #endif /* TEST_SNPRINTF */
diff --git a/lib/roken/socket.c b/lib/roken/socket.c
index a373eb7ed..e7cdce63e 100644
--- a/lib/roken/socket.c
+++ b/lib/roken/socket.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 #include <err.h>
diff --git a/lib/roken/socket_wrapper.c b/lib/roken/socket_wrapper.c
index 62a95a78d..5caae7f70 100644
--- a/lib/roken/socket_wrapper.c
+++ b/lib/roken/socket_wrapper.c
@@ -59,9 +59,7 @@
 
 #else /* _SAMBA_BUILD_ */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 #undef SOCKET_WRAPPER_REPLACE
 
 #include <sys/types.h>
diff --git a/lib/roken/strcasecmp.c b/lib/roken/strcasecmp.c
index aaa0e05ec..200175d67 100644
--- a/lib/roken/strcasecmp.c
+++ b/lib/roken/strcasecmp.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <string.h>
 #include <ctype.h>
diff --git a/lib/roken/strcollect.c b/lib/roken/strcollect.c
index a33d52134..f444d05e2 100644
--- a/lib/roken/strcollect.c
+++ b/lib/roken/strcollect.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/lib/roken/strdup.c b/lib/roken/strdup.c
index 06a48eccf..e06ac5222 100644
--- a/lib/roken/strdup.c
+++ b/lib/roken/strdup.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/lib/roken/strerror.c b/lib/roken/strerror.c
index ba5038dee..015d5c57c 100644
--- a/lib/roken/strerror.c
+++ b/lib/roken/strerror.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/roken/strftime.c b/lib/roken/strftime.c
index dc669dc81..4660e202d 100644
--- a/lib/roken/strftime.c
+++ b/lib/roken/strftime.c
@@ -30,9 +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>
-#endif
 #ifdef TEST_STRPFTIME
 #include "strpftime-test.h"
 #endif
diff --git a/lib/roken/strlcat.c b/lib/roken/strlcat.c
index 1e3f76cd3..2d3744a5f 100644
--- a/lib/roken/strlcat.c
+++ b/lib/roken/strlcat.c
@@ -31,13 +31,9 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 #include "roken.h"
 
-RCSID("$Id$");
-
 #ifndef HAVE_STRLCAT
 
 size_t ROKEN_LIB_FUNCTION
diff --git a/lib/roken/strlcpy.c b/lib/roken/strlcpy.c
index 5f84062b8..b151d2184 100644
--- a/lib/roken/strlcpy.c
+++ b/lib/roken/strlcpy.c
@@ -31,13 +31,9 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 #include "roken.h"
 
-RCSID("$Id$");
-
 #ifndef HAVE_STRLCPY
 
 size_t ROKEN_LIB_FUNCTION
diff --git a/lib/roken/strlwr.c b/lib/roken/strlwr.c
index ea787d818..1a6634b73 100644
--- a/lib/roken/strlwr.c
+++ b/lib/roken/strlwr.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 #include <string.h>
 #include <ctype.h>
 
diff --git a/lib/roken/strncasecmp.c b/lib/roken/strncasecmp.c
index 16e72cd16..0af38e173 100644
--- a/lib/roken/strncasecmp.c
+++ b/lib/roken/strncasecmp.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <string.h>
 #include <ctype.h>
diff --git a/lib/roken/strndup.c b/lib/roken/strndup.c
index e64c2602f..af89664d8 100644
--- a/lib/roken/strndup.c
+++ b/lib/roken/strndup.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/lib/roken/strnlen.c b/lib/roken/strnlen.c
index a57ed2c16..dfbcc2bf5 100644
--- a/lib/roken/strnlen.c
+++ b/lib/roken/strnlen.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/strpftime-test.c b/lib/roken/strpftime-test.c
index 60cd31ff8..5f5cca5b9 100644
--- a/lib/roken/strpftime-test.c
+++ b/lib/roken/strpftime-test.c
@@ -30,9 +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>
-#endif
 #ifdef TEST_STRPFTIME
 #include "strpftime-test.h"
 #endif
diff --git a/lib/roken/strpool.c b/lib/roken/strpool.c
index aa8099694..dc5689214 100644
--- a/lib/roken/strpool.c
+++ b/lib/roken/strpool.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/lib/roken/strptime.c b/lib/roken/strptime.c
index c45286622..91eb62918 100644
--- a/lib/roken/strptime.c
+++ b/lib/roken/strptime.c
@@ -30,17 +30,13 @@
  * 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>
-#endif
 #ifdef TEST_STRPFTIME
 #include "strpftime-test.h"
 #endif
 #include <ctype.h>
 #include "roken.h"
 
-RCSID("$Id$");
-
 static const char *abb_weekdays[] = {
     "Sun",
     "Mon",
diff --git a/lib/roken/strsep.c b/lib/roken/strsep.c
index 7a93fb17a..5cbf8557a 100644
--- a/lib/roken/strsep.c
+++ b/lib/roken/strsep.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <string.h>
 
diff --git a/lib/roken/strsep_copy.c b/lib/roken/strsep_copy.c
index 61b7d39c5..908e37ca4 100644
--- a/lib/roken/strsep_copy.c
+++ b/lib/roken/strsep_copy.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <string.h>
 
diff --git a/lib/roken/strtok_r.c b/lib/roken/strtok_r.c
index 0b3d78d91..a8ffde58e 100644
--- a/lib/roken/strtok_r.c
+++ b/lib/roken/strtok_r.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <string.h>
 
diff --git a/lib/roken/strupr.c b/lib/roken/strupr.c
index d67dd20dd..db2d987f9 100644
--- a/lib/roken/strupr.c
+++ b/lib/roken/strupr.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 #include <string.h>
 #include <ctype.h>
 
diff --git a/lib/roken/swab.c b/lib/roken/swab.c
index dd6183e9d..19a443eca 100644
--- a/lib/roken/swab.c
+++ b/lib/roken/swab.c
@@ -31,15 +31,11 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 #include "roken.h"
 
 #ifndef HAVE_SWAB
 
-RCSID("$Id$");
-
 void ROKEN_LIB_FUNCTION
 swab (char *from, char *to, int nbytes)
 {
diff --git a/lib/roken/test-mem.c b/lib/roken/test-mem.c
index 620d081c2..d270d8f80 100644
--- a/lib/roken/test-mem.c
+++ b/lib/roken/test-mem.c
@@ -31,9 +31,8 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
+
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif
diff --git a/lib/roken/test-readenv.c b/lib/roken/test-readenv.c
index 3d13e4aca..24a666184 100644
--- a/lib/roken/test-readenv.c
+++ b/lib/roken/test-readenv.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 #include "test-mem.h"
diff --git a/lib/roken/timegm.c b/lib/roken/timegm.c
index e5f01b890..e6c8992ad 100644
--- a/lib/roken/timegm.c
+++ b/lib/roken/timegm.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/timeval.c b/lib/roken/timeval.c
index 8da36592b..082bfc8b9 100644
--- a/lib/roken/timeval.c
+++ b/lib/roken/timeval.c
@@ -35,10 +35,7 @@
  * Timeval stuff
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/tm2time.c b/lib/roken/tm2time.c
index 6a1c13cfd..d61ea0b01 100644
--- a/lib/roken/tm2time.c
+++ b/lib/roken/tm2time.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
diff --git a/lib/roken/unsetenv.c b/lib/roken/unsetenv.c
index 01dd78936..5e4545726 100644
--- a/lib/roken/unsetenv.c
+++ b/lib/roken/unsetenv.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/roken/unvis.c b/lib/roken/unvis.c
index c1e898908..d284f50b3 100644
--- a/lib/roken/unvis.c
+++ b/lib/roken/unvis.c
@@ -30,10 +30,7 @@
  */
 
 #if 1
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 #include "roken.h"
 #ifndef _DIAGASSERT
 #define _DIAGASSERT(X)
diff --git a/lib/roken/verify.c b/lib/roken/verify.c
index 2f638296f..396b3c581 100644
--- a/lib/roken/verify.c
+++ b/lib/roken/verify.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <stdio.h>
 #ifdef HAVE_UNISTD_H
diff --git a/lib/roken/verr.c b/lib/roken/verr.c
index 7dd4c5d07..3a8653284 100644
--- a/lib/roken/verr.c
+++ b/lib/roken/verr.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 #include <err.h>
diff --git a/lib/roken/verrx.c b/lib/roken/verrx.c
index 642a20019..b6fe92fb9 100644
--- a/lib/roken/verrx.c
+++ b/lib/roken/verrx.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 #include <err.h>
diff --git a/lib/roken/vis.c b/lib/roken/vis.c
index 43705e4d5..c8d19a445 100644
--- a/lib/roken/vis.c
+++ b/lib/roken/vis.c
@@ -56,10 +56,7 @@
  */
 
 #if 1
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 #include "roken.h"
 #ifndef _DIAGASSERT
 #define _DIAGASSERT(X)
diff --git a/lib/roken/vsyslog.c b/lib/roken/vsyslog.c
index 7b4584356..dbcec2ace 100644
--- a/lib/roken/vsyslog.c
+++ b/lib/roken/vsyslog.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #ifndef HAVE_VSYSLOG
 
diff --git a/lib/roken/vwarn.c b/lib/roken/vwarn.c
index 2321510e2..1b4c00ef1 100644
--- a/lib/roken/vwarn.c
+++ b/lib/roken/vwarn.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 #include <err.h>
diff --git a/lib/roken/vwarnx.c b/lib/roken/vwarnx.c
index e1fabf323..bf28f6572 100644
--- a/lib/roken/vwarnx.c
+++ b/lib/roken/vwarnx.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 #include <err.h>
diff --git a/lib/roken/warn.c b/lib/roken/warn.c
index 92d44cd3c..09b9cf82e 100644
--- a/lib/roken/warn.c
+++ b/lib/roken/warn.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "err.h"
 
diff --git a/lib/roken/warnerr.c b/lib/roken/warnerr.c
index 2e8350499..6a4cbd364 100644
--- a/lib/roken/warnerr.c
+++ b/lib/roken/warnerr.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 #include "err.h"
diff --git a/lib/roken/warnx.c b/lib/roken/warnx.c
index d22ac13ac..1ffc64785 100644
--- a/lib/roken/warnx.c
+++ b/lib/roken/warnx.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "err.h"
 
diff --git a/lib/roken/write_pid.c b/lib/roken/write_pid.c
index 0ed4eb79d..e4af6f607 100644
--- a/lib/roken/write_pid.c
+++ b/lib/roken/write_pid.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/lib/roken/writev.c b/lib/roken/writev.c
index 64e1d2c52..db44b2ef3 100644
--- a/lib/roken/writev.c
+++ b/lib/roken/writev.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include "roken.h"
 
diff --git a/lib/roken/xfree.c b/lib/roken/xfree.c
index 5f6d86ee5..13366ce13 100644
--- a/lib/roken/xfree.c
+++ b/lib/roken/xfree.c
@@ -31,10 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <unistd.h>