2 files changed, 9 insertions, 7 deletions

diff --git a/include/libbb.h b/include/libbb.h
index 1d91a0a72..65430d254 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -51,7 +51,9 @@
 
 #include "pwd_.h"
 #include "grp_.h"
+#if ENABLE_FEATURE_SHADOWPASSWDS
 #include "shadow_.h"
+#endif
 
 /* Try to pull in PATH_MAX */
 #include <limits.h>
diff --git a/include/xatonum.h b/include/xatonum.h
index 585d84623..8b1663789 100644
--- a/include/xatonum.h
+++ b/include/xatonum.h
@@ -115,7 +115,7 @@ extern inline
 unsigned long bb_strtoul(const char *arg, char **endp, int base)
 { return bb_strtoull(arg, endp, base); }
 extern inline
-unsigned long bb_strtol(const char *arg, char **endp, int base)
+long bb_strtol(const char *arg, char **endp, int base)
 { return bb_strtoll(arg, endp, base); }
 #else
 unsigned long bb_strtoul(const char *arg, char **endp, int base);
@@ -124,21 +124,21 @@ long bb_strtol(const char *arg, char **endp, int base);
 
 #if UINT_MAX == ULLONG_MAX
 extern inline
-unsigned long bb_strtou(const char *arg, char **endp, int base)
+unsigned bb_strtou(const char *arg, char **endp, int base)
 { return bb_strtoull(arg, endp, base); }
 extern inline
-unsigned long bb_strtoi(const char *arg, char **endp, int base)
+int bb_strtoi(const char *arg, char **endp, int base)
 { return bb_strtoll(arg, endp, base); }
 #elif UINT_MAX == ULONG_MAX
 extern inline
-unsigned long bb_strtou(const char *arg, char **endp, int base)
+unsigned bb_strtou(const char *arg, char **endp, int base)
 { return bb_strtoul(arg, endp, base); }
 extern inline
-unsigned long bb_strtoi(const char *arg, char **endp, int base)
+int bb_strtoi(const char *arg, char **endp, int base)
 { return bb_strtol(arg, endp, base); }
 #else
-unsigned long bb_strtou(const char *arg, char **endp, int base);
-long bb_strtoi(const char *arg, char **endp, int base);
+unsigned bb_strtou(const char *arg, char **endp, int base);
+int bb_strtoi(const char *arg, char **endp, int base);
 #endif
 
 int BUG_bb_strtou32_unimplemented(void);