diff --git a/ChangeLog b/ChangeLog
index 16d693193..dd9741b6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Feb 10 10:28:55 EET 2008 (edwin)
+------------------------------------
+  * configure, configure.in: don't use EXIT_SUCCESS if <stdlib.h> is not
+			     included;
+			     include <sys/select.h> only if needed for fd_set
+			     (bb #452)
+			     
 Fri Feb  8 20:16:45 CET 2008 (tk)
 ---------------------------------
   * libclamac/readdb.c: add support for signature whitelisting with
diff --git a/configure b/configure
index ff9e90167..54525c448 100755
--- a/configure
+++ b/configure
@@ -18233,8 +18233,12 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/time.h>
+#ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <errno.h>
 int main(void) {
         FILE *fp = fopen("conftestval", "w");
@@ -18247,7 +18251,7 @@ int main(void) {
 		perror("fopen failed");
 		return errno;
 	}
-        return EXIT_SUCCESS;
+        return 0;
 }
 
 _ACEOF
diff --git a/configure.in b/configure.in
index 40b50bb5b..a46d4bf87 100644
--- a/configure.in
+++ b/configure.in
@@ -1349,8 +1349,12 @@ AC_TRY_RUN([
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/time.h>
+#ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
 #include <errno.h>
 int main(void) {
         FILE *fp = fopen("conftestval", "w");
@@ -1363,7 +1367,7 @@ int main(void) {
 		perror("fopen failed");
 		return errno;
 	}
-        return EXIT_SUCCESS;
+        return 0;
 }
 ],
 DEFAULT_FD_SETSIZE=`cat conftestval`,