diff --git a/include/libbb.h b/include/libbb.h
index 22d2a5b20..5e957fbf8 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -51,6 +51,12 @@
 #include <termios.h>
 #include <time.h>
 #include <sys/param.h>
+#include <pwd.h>
+#include <grp.h>
+#if defined(ANDROID) || defined(__ANDROID__)
+# define endpwent() ((void)0)
+# define endgrent() ((void)0)
+#endif
 #ifdef HAVE_MNTENT_H
 # include <mntent.h>
 #endif
@@ -80,8 +86,6 @@
 #ifdef DMALLOC
 # include <dmalloc.h>
 #endif
-#include <pwd.h>
-#include <grp.h>
 #if ENABLE_FEATURE_SHADOWPASSWDS
 # if !ENABLE_USE_BB_SHADOW
 /* If using busybox's shadow implementation, do not include the shadow.h
diff --git a/include/platform.h b/include/platform.h
index 7451fb757..d79cc97e5 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -334,11 +334,6 @@ typedef unsigned smalluint;
 # define MAXSYMLINKS SYMLOOP_MAX
 #endif
 
-#if defined(ANDROID) || defined(__ANDROID__)
-# define endpwent() ((void)0)
-# define endgrent() ((void)0)
-#endif
-
 
 /* ---- Who misses what? ------------------------------------ */