--- a/src/gallium/include/pipe/p_config.h
+++ b/src/gallium/include/pipe/p_config.h
@@ -130,7 +130,7 @@
  * Endian detection.
  */
 
-#ifdef __GLIBC__
+#ifdef __linux__
 #include <endian.h>
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
--- a/vtest/util.c
+++ b/vtest/util.c
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#include <sys/select.h>
 
 int vtest_wait_for_fd_read(int fd)
 {
--- a/vtest/vtest_server.c
+++ b/vtest/vtest_server.c
@@ -31,6 +31,7 @@
 #include <netinet/in.h>
 #include <sys/un.h>
 #include <fcntl.h>
+#include <string.h>
 
 #include "util.h"
 #include "vtest.h"