diff --git a/lib/plat/unix/private.h b/lib/plat/unix/private.h
index bfee954f4f..80b557273f 100644
--- a/lib/plat/unix/private.h
+++ b/lib/plat/unix/private.h
@@ -106,8 +106,13 @@
 
 #endif
 
-#if defined (__sun) || defined(__HAIKU__) || defined(__QNX__)
+#if defined (__sun) || defined(__HAIKU__) || defined(__QNX__) || defined(__ANDROID__)
 #include <syslog.h>
+
+#if defined(__ANDROID__)
+#include <sys/resource.h>
+#endif
+
 #else
 #include <sys/syslog.h>
 #endif
@@ -148,11 +153,6 @@ delete_from_fd(const struct lws_context *context, int fd);
 #endif
 #endif
 
-#if defined (__ANDROID__)
- #include <syslog.h>
- #include <sys/resource.h>
-#endif
-
 #define compatible_close(x) close(x)
 #define lws_plat_socket_offset() (0)
 
diff --git a/test-apps/test-server.c b/test-apps/test-server.c
index 0039389199..430ef5078f 100644
--- a/test-apps/test-server.c
+++ b/test-apps/test-server.c
@@ -483,7 +483,7 @@ int main(int argc, char **argv)
 
 	printf("Using resource path \"%s\"\n", resource_path);
 #ifdef EXTERNAL_POLL
-#if !defined(WIN32) && !defined(_WIN32)
+#if !defined(WIN32) && !defined(_WIN32) && !defined(__ANDROID__)
 	max_poll_elements = getdtablesize();
 #else
 	max_poll_elements = sysconf(_SC_OPEN_MAX);