diff --git a/lib/roken/hstrerror.c b/lib/roken/hstrerror.c
index ef3412dcc..168d55a67 100644
--- a/lib/roken/hstrerror.c
+++ b/lib/roken/hstrerror.c
@@ -38,15 +38,11 @@ RCSID("$Id$");
 
 #ifndef HAVE_HSTRERROR
 
-#include "roken.h"
-
-#include <stdio.h>
-
-#ifdef HAVE_NETDB_H
 #if (defined(SunOS) && (SunOS >= 50))
 #define hstrerror broken_proto
 #endif
-#include <netdb.h>
+#include "roken.h"
+#if (defined(SunOS) && (SunOS >= 50))
 #undef hstrerror
 #endif
 
diff --git a/lib/roken/roken_gethostby.c b/lib/roken/roken_gethostby.c
index 43255af02..f95e34ec3 100644
--- a/lib/roken/roken_gethostby.c
+++ b/lib/roken/roken_gethostby.c
@@ -37,12 +37,6 @@ RCSID("$Id$");
 #endif
 
 #include <roken.h>
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
 
 #undef roken_gethostbyname
 #undef roken_gethostbyaddr