diff --git a/configure b/configure
index fdd619a955a..b371e5816fa 100755
--- a/configure
+++ b/configure
@@ -11642,6 +11642,8 @@ done
 
 
 
+
+
 
 
 
@@ -11702,6 +11704,8 @@ for ac_header in \
 	sys/sysctl.h \
 	sys/time.h \
 	sys/times.h \
+	sys/uio.h \
+	sys/un.h \
 	sys/user.h \
 	sys/v86.h \
 	sys/v86intr.h \
diff --git a/configure.ac b/configure.ac
index f7e7ec15e4b..699c82f298b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1017,6 +1017,8 @@ AC_CHECK_HEADERS(\
 	sys/sysctl.h \
 	sys/time.h \
 	sys/times.h \
+	sys/uio.h \
+	sys/un.h \
 	sys/user.h \
 	sys/v86.h \
 	sys/v86intr.h \
diff --git a/include/config.h.in b/include/config.h.in
index 5a8605b2b7a..0df52806a5c 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -548,6 +548,12 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
+/* Define to 1 if you have the <sys/uio.h> header file. */
+#undef HAVE_SYS_UIO_H
+
+/* Define to 1 if you have the <sys/un.h> header file. */
+#undef HAVE_SYS_UN_H
+
 /* Define to 1 if you have the <sys/user.h> header file. */
 #undef HAVE_SYS_USER_H
 
diff --git a/scheduler/client.c b/scheduler/client.c
index 246d91c1b12..ef6db594a77 100644
--- a/scheduler/client.c
+++ b/scheduler/client.c
@@ -35,12 +35,16 @@
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
+#ifdef HAVE_SYS_UN_H
 #include <sys/un.h>
+#endif
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif
 #include <sys/stat.h>
+#ifdef HAVE_SYS_UIO_H
 #include <sys/uio.h>
+#endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif