diff --git a/build/build.c b/build/build.c
index 477a01b20..f606d8893 100644
--- a/build/build.c
+++ b/build/build.c
@@ -5,6 +5,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <sys/resource.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <unistd.h>
diff --git a/build/pack.c b/build/pack.c
index eba43dee1..d43d17c6c 100644
--- a/build/pack.c
+++ b/build/pack.c
@@ -3,9 +3,10 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <sys/resource.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <sys/stat.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <string.h>
diff --git a/build/reqprov.c b/build/reqprov.c
index 806057df7..a05721ae4 100644
--- a/build/reqprov.c
+++ b/build/reqprov.c
@@ -6,6 +6,7 @@
 #include <signal.h>
 #include <fcntl.h>
 #include <ctype.h>
+#include <sys/resource.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
diff --git a/config.h.in b/config.h.in
index 5ac24a565..9b5833abe 100644
--- a/config.h.in
+++ b/config.h.in
@@ -71,4 +71,7 @@
 /* Define as 1 if chown() or chgrp() follows symlinks */
 #define CHOWN_FOLLOWS_SYMLINK 0
 
+/* Define as 1 if you have <sys/select.h> */
+#define HAVE_SYS_SELECT_H 0
+
 #endif
diff --git a/configure.in b/configure.in
index 2dac44646..70fb05170 100644
--- a/configure.in
+++ b/configure.in
@@ -218,7 +218,7 @@ dnl Checks for header files we can live without.
 AC_HEADER_STDC
 AC_HEADER_MAJOR
 AC_CHECK_HEADERS(netinet/in_systm.h limits.h)
-AC_CHECK_HEADERS(alloca.h dirent.h sys/socket.h)
+AC_CHECK_HEADERS(alloca.h dirent.h sys/socket.h sys/select.h)
 AC_CHECK_HEADERS(machine/types.h string.h)
 AC_CHECK_HEADERS(glob.h,,MISCOBJS="$MISCOBJS glob.o")
 AC_CHECK_HEADERS(fnmatch.h,,MISCOBJS="$MISCOBJS fnmatch.o")
diff --git a/lib/install.c b/lib/install.c
index b340e1ac4..f46385a32 100644
--- a/lib/install.c
+++ b/lib/install.c
@@ -9,6 +9,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
+#include <sys/resource.h>
 #include <sys/stat.h>		/* needed for mkdir(2) prototype! */
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/lib/uninstall.c b/lib/uninstall.c
index 28a0932da..f6ff2a0a4 100644
--- a/lib/uninstall.c
+++ b/lib/uninstall.c
@@ -8,6 +8,7 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/resource.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/lib/verify.c b/lib/verify.c
index 302f08ae4..e1fe03b77 100644
--- a/lib/verify.c
+++ b/lib/verify.c
@@ -8,6 +8,7 @@
 #include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/resource.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <unistd.h>
diff --git a/misc/miscfn.h b/misc/miscfn.h
index eda235e50..2597e06f6 100644
--- a/misc/miscfn.h
+++ b/misc/miscfn.h
@@ -54,4 +54,8 @@ extern void *myrealloc(void *, size_t);
 #include <limits.h>
 #endif
 
+#if HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
 #endif