diff --git a/lib/roken/getdtablesize.c b/lib/roken/getdtablesize.c
index 9921cb264..fdeee76a4 100644
--- a/lib/roken/getdtablesize.c
+++ b/lib/roken/getdtablesize.c
@@ -2,6 +2,8 @@
 #include <config.h>
 #endif
 
+#include "roken.h"
+
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/param.h>
diff --git a/lib/roken/hstrerror.c b/lib/roken/hstrerror.c
index 42e5975c1..9b5f49637 100644
--- a/lib/roken/hstrerror.c
+++ b/lib/roken/hstrerror.c
@@ -2,6 +2,8 @@
 #include <config.h>
 #endif
 
+#include "roken.h"
+
 #ifndef HAVE_HSTRERROR
 
 #include <stdio.h>
diff --git a/lib/roken/inet_aton.c b/lib/roken/inet_aton.c
index b4b8bd56f..2d237d0a0 100644
--- a/lib/roken/inet_aton.c
+++ b/lib/roken/inet_aton.c
@@ -2,7 +2,10 @@
 #include <config.h>
 #endif
 
+#include "roken.h"
+
 #include <sys/types.h>
+#include <stdio.h>
 #include <netinet/in.h>
 #include <netdb.h>
 
diff --git a/lib/roken/roken.h b/lib/roken/roken.h
index 4cfdead9d..c9286cb5e 100644
--- a/lib/roken/roken.h
+++ b/lib/roken/roken.h
@@ -42,7 +42,9 @@ char *hstrerror(int herr);
 
 #ifndef HAVE_INET_ATON
 /* Minimal implementation of inet_aton. Doesn't handle hex numbers. */
+#ifndef __GNUC__
 int inet_aton(char *cp, struct in_addr *adr);
 #endif
+#endif
 
 #endif /*  __ROKEN_H__ */
diff --git a/lib/roken/roken.h.in b/lib/roken/roken.h.in
index 4cfdead9d..c9286cb5e 100644
--- a/lib/roken/roken.h.in
+++ b/lib/roken/roken.h.in
@@ -42,7 +42,9 @@ char *hstrerror(int herr);
 
 #ifndef HAVE_INET_ATON
 /* Minimal implementation of inet_aton. Doesn't handle hex numbers. */
+#ifndef __GNUC__
 int inet_aton(char *cp, struct in_addr *adr);
 #endif
+#endif
 
 #endif /*  __ROKEN_H__ */
diff --git a/lib/roken/setenv.c b/lib/roken/setenv.c
index 23ac9d224..4b3449fc2 100644
--- a/lib/roken/setenv.c
+++ b/lib/roken/setenv.c
@@ -4,7 +4,10 @@
 
 RCSID("$Id$");
 
+#include "roken.h"
+
 #include <stdlib.h>
+#include <string.h>
 
 /*
  * This is the easy way out, use putenv to implement setenv. We might
diff --git a/lib/roken/snprintf.c b/lib/roken/snprintf.c
index 99344facf..3bd6281f2 100644
--- a/lib/roken/snprintf.c
+++ b/lib/roken/snprintf.c
@@ -2,11 +2,13 @@
 #include <config.h>
 #endif
 
+RCSID("$Id$");
+
+#include "roken.h"
+
 #include <stdio.h>
 #include <stdarg.h>
 
-RCSID("$Id$");
-
 int snprintf(char *s, int n, const char *fmt, ...)
 {
   int ret;