diff --git a/lib/roken/getdtablesize.c b/lib/roken/getdtablesize.c
index 27b92e4f1..9921cb264 100644
--- a/lib/roken/getdtablesize.c
+++ b/lib/roken/getdtablesize.c
@@ -17,34 +17,36 @@
 
 int getdtablesize(void)
 {
-    int files = -1;
+  int files = -1;
 #if defined(HAVE_SYSCONF) && defined(_SC_OPEN_MAX)
-    files = sysconf(_SC_OPEN_MAX);
-
-#elif definded(HAVE_GETRLIMIT) && defined(RLIMIT_NOFILE)
-    struct rlimit res;
-    if(getrlimit(RLIMIT_NOFILE, &res) == 0)
-	files = res.rlim_cur;
-
-#elif defined(HAVE_SYSCTL) && defined(CTL_KERN) && defined(KERN_MAXFILES)
-    int mib[2];
-    size_t len;
+  files = sysconf(_SC_OPEN_MAX);
+#else /* !defined(HAVE_SYSCONF) */
+#if defined(HAVE_GETRLIMIT) && defined(RLIMIT_NOFILE)
+  struct rlimit res;
+  if (getrlimit(RLIMIT_NOFILE, &res) == 0)
+    files = res.rlim_cur;
+#else /* !definded(HAVE_GETRLIMIT) */
+#if defined(HAVE_SYSCTL) && defined(CTL_KERN) && defined(KERN_MAXFILES)
+  int mib[2];
+  size_t len;
     
-    mib[0] = CTL_KERN;
-    mib[1] = KERN_MAXFILES;
-    len = sizeof(files);
-    sysctl(&mib, 2, &files, sizeof(nfil), NULL, 0);
-#endif
+  mib[0] = CTL_KERN;
+  mib[1] = KERN_MAXFILES;
+  len = sizeof(files);
+  sysctl(&mib, 2, &files, sizeof(nfil), NULL, 0);
+#endif /* defined(HAVE_SYSCTL) */
+#endif /* !definded(HAVE_GETRLIMIT) */
+#endif /* !defined(HAVE_SYSCONF) */
 
 #ifdef OPEN_MAX
-    if(files < 0)
-	files = OPEN_MAX;
+  if (files < 0)
+    files = OPEN_MAX;
 #endif
 
 #ifdef NOFILE
-    if(files < 0)
-	files = NOFILE;
+  if (files < 0)
+    files = NOFILE;
 #endif    
     
-    return files;
+  return files;
 }
diff --git a/lib/roken/setenv.c b/lib/roken/setenv.c
index ee270e3a8..23ac9d224 100644
--- a/lib/roken/setenv.c
+++ b/lib/roken/setenv.c
@@ -4,6 +4,8 @@
 
 RCSID("$Id$");
 
+#include <stdlib.h>
+
 /*
  * This is the easy way out, use putenv to implement setenv. We might
  * leak some memory but that is ok since we are usally about to exec