diff --git a/common/configure.ac b/common/configure.ac
index b895da6..fc2f8bf 100644
--- a/common/configure.ac
+++ b/common/configure.ac
@@ -84,6 +84,8 @@
 	[AC_DEFINE([VNC_SOCKLEN_T], [socklen_t], [Use correct size])],
 	[AC_DEFINE([VNC_SOCKLEN_T], [int])])
 
+AC_CHECK_HEADERS([sys/select.h])
+
 AC_OUTPUT([Makefile
 	   rdr/Makefile
 	   network/Makefile
diff --git a/common/rdr/FdInStream.cxx b/common/rdr/FdInStream.cxx
index 2b11973..e2281b4 100644
--- a/common/rdr/FdInStream.cxx
+++ b/common/rdr/FdInStream.cxx
@@ -16,6 +16,10 @@
  * USA.
  */
 
+#ifdef HAVE_COMMON_CONFIG_H
+#include <common-config.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #ifdef _WIN32
@@ -43,16 +47,11 @@
 #define vncmax(a,b)            (((a) > (b)) ? (a) : (b))
 #endif
 
-// XXX should use autoconf HAVE_SYS_SELECT_H
-#ifdef _AIX
+/* Old systems have select() in sys/time.h */
+#ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
 
-// XXX Lynx/OS 2.3: protos for gettimeofday(), select(), bzero()
-#ifdef Lynx
-#include <sys/proto.h>
-#endif
-
 #include <rdr/FdInStream.h>
 #include <rdr/Exception.h>
 
diff --git a/common/rdr/FdOutStream.cxx b/common/rdr/FdOutStream.cxx
index 07ac04c..c771166 100644
--- a/common/rdr/FdOutStream.cxx
+++ b/common/rdr/FdOutStream.cxx
@@ -16,6 +16,10 @@
  * USA.
  */
 
+#ifdef HAVE_COMMON_CONFIG_H
+#include <common-config.h>
+#endif
+
 #include <stdio.h>
 #include <string.h>
 #ifdef _WIN32
@@ -33,9 +37,9 @@
 #include <sys/time.h>
 #endif
 
-// XXX Lynx/OS 2.3: protos for select(), bzero()
-#ifdef Lynx
-#include <sys/proto.h>
+/* Old systems have select() in sys/time.h */
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
 #endif
 
 #include <rdr/FdOutStream.h>