diff --git a/lib/roken/dirent.c b/lib/roken/dirent.c
index a0301e207..bf28d5224 100644
--- a/lib/roken/dirent.c
+++ b/lib/roken/dirent.c
@@ -29,9 +29,7 @@
  * 
  **********************************************************************/
 
-#ifdef HAVE_CONFIG_H
 #include<config.h>
-#endif
 
 #include <stdlib.h>
 #include <io.h>
diff --git a/lib/roken/dlfcn_w32.c b/lib/roken/dlfcn_w32.c
index 08005f70c..5898f1682 100644
--- a/lib/roken/dlfcn_w32.c
+++ b/lib/roken/dlfcn_w32.c
@@ -29,6 +29,7 @@
  * 
  **********************************************************************/
 
+#include <config.h>
 #include <windows.h>
 #include <dlfcn.h>
 #include <strsafe.h>
diff --git a/lib/roken/getifaddrs_w32.c b/lib/roken/getifaddrs_w32.c
index ff0250baa..7b3f8143a 100644
--- a/lib/roken/getifaddrs_w32.c
+++ b/lib/roken/getifaddrs_w32.c
@@ -29,9 +29,7 @@
  * 
  **********************************************************************/
 
-#ifdef HAVE_CONFIG_H
 #include<config.h>
-#endif
 
 #include <roken.h>
 
diff --git a/lib/roken/simple_exec_w32.c b/lib/roken/simple_exec_w32.c
index 83ef6f9b5..1fca398c1 100644
--- a/lib/roken/simple_exec_w32.c
+++ b/lib/roken/simple_exec_w32.c
@@ -29,10 +29,7 @@
  * 
  **********************************************************************/
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-RCSID("$Id$");
-#endif
 
 #include <roken.h>
 #include <strsafe.h>
diff --git a/lib/roken/sleep.c b/lib/roken/sleep.c
index c19439c53..eac28c166 100644
--- a/lib/roken/sleep.c
+++ b/lib/roken/sleep.c
@@ -29,9 +29,7 @@
  * 
  **********************************************************************/
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <roken.h>
 
diff --git a/lib/roken/sockstartup_w32.c b/lib/roken/sockstartup_w32.c
index 675d5aad7..2dcfdf4a3 100644
--- a/lib/roken/sockstartup_w32.c
+++ b/lib/roken/sockstartup_w32.c
@@ -29,9 +29,7 @@
  * 
  **********************************************************************/
 
-#ifdef HAVE_CONFIG_H
 #include<config.h>
-#endif
 
 #include <roken.h>
 
diff --git a/lib/roken/syslogc.c b/lib/roken/syslogc.c
index b5b3901ca..dcdaa185f 100644
--- a/lib/roken/syslogc.c
+++ b/lib/roken/syslogc.c
@@ -33,9 +33,7 @@
  * Based on code by Alexander Yaworsky
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <roken.h>