diff --git a/lib/roken/getusershell.c b/lib/roken/getusershell.c
index 02dae9445..8aa863e55 100644
--- a/lib/roken/getusershell.c
+++ b/lib/roken/getusershell.c
@@ -43,7 +43,9 @@ RCSID("$Id$");
 
 #include <stdio.h>
 #include <stdlib.h>
+#ifdef HAVE_PATHS_H
 #include <paths.h>
+#endif
 #include <sys/stat.h>
 #include <sys/param.h>
 
@@ -55,6 +57,14 @@ RCSID("$Id$");
 #define _PATH_SHELLS "/etc/shells"
 #endif
 
+#ifndef _PATH_BSHELL
+#define _PATH_BSHELL "/bin/sh"
+#endif
+
+#ifndef _PATH_CSHELL
+#define _PATH_CSHELL "/bin/csh"
+#endif
+
 /*
  * Local shells should NOT be added here.  They should be added in
  * /etc/shells.
diff --git a/lib/roken/strdup.c b/lib/roken/strdup.c
index 8b976c2c6..c9377ef4a 100644
--- a/lib/roken/strdup.c
+++ b/lib/roken/strdup.c
@@ -1,4 +1,8 @@
-#include "bsd_locl.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
 
 RCSID("$Id$");