diff --git a/acconfig.h b/acconfig.h
index 2844bdca2..05296f9ba 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -34,6 +34,10 @@
 
 /* ******************* Shouldn't need to edit below this line ************** */
 
+#include <sys/types.h> /* For u_intXX_t */
+#include <sys/socket.h> /* For SHUT_XXXX */
+#include <paths.h> /* For _PATH_XXX */
+
 #ifndef SHUT_RDWR
 enum
 {
@@ -46,9 +50,6 @@ enum
 };
 #endif
 
-#include <sys/types.h> /* For u_intXX_t */
-#include <paths.h> /* For _PATH_XXX */
-
 #if !defined(u_int32_t) && defined(uint32_t)
 #define u_int32_t uint32_t
 #endif
@@ -57,6 +58,10 @@ enum
 #define u_int16_t uint16_t
 #endif
 
+#if !defined(quad_t) && defined(int64_t)
+#define quad_t int64_t
+#endif
+
 #ifndef _PATH_LASTLOG
 # ifdef LASTLOG_LOCATION
 #  define _PATH_LASTLOG LASTLOG_LOCATION
@@ -88,3 +93,8 @@ enum
 #  define _PATH_MAILDIR MAILDIR
 # endif
 #endif
+
+#ifndef MAX
+# define MAX(a,b) (((a)>(b))?(a):(b))
+# define MIN(a,b) (((a)<(b))?(a):(b))
+#endif
diff --git a/configure.in b/configure.in
index 9fe1a92ff..05a354d1a 100644
--- a/configure.in
+++ b/configure.in
@@ -55,7 +55,7 @@ AC_CHECK_LIB(dl, dlopen, , )
 AC_CHECK_LIB(pam, pam_authenticate, , )
 
 dnl Checks for header files.
-AC_CHECK_HEADERS(pty.h endian.h paths.h lastlog.h shadow.h netgroup.h maillock.h)
+AC_CHECK_HEADERS(pty.h endian.h paths.h lastlog.h shadow.h netgroup.h maillock.h sys/select.h)
 
 dnl Checks for library functions.
 AC_CHECK_FUNCS(openpty strlcpy mkdtemp arc4random setproctitle setlogin)
diff --git a/includes.h b/includes.h
index e2a0ea3b6..75349cf3e 100644
--- a/includes.h
+++ b/includes.h
@@ -19,9 +19,10 @@ This file includes most of the needed system headers.
 #define RCSID(msg) \
 static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 
+#include "config.h"
+
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/select.h>
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
@@ -52,8 +53,6 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #include <time.h>
 #include <dirent.h>
 
-#include "config.h"
-
 #ifdef HAVE_NETGROUP_H
 # include <netgroup.h>
 #endif 
@@ -63,16 +62,18 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #ifdef HAVE_ENDIAN_H
 # include <endian.h>
 #endif
+#ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#endif
+#ifdef HAVE_LIBPAM
+# include <security/pam_appl.h>
+#endif /* HAVE_PAM */
 
 #include "version.h"
 #include "helper.h"
 #include "mktemp.h"
 #include "strlcpy.h"
 
-#ifdef HAVE_LIBPAM
-#include <security/pam_appl.h>
-#endif /* HAVE_PAM */
-
 /* Define this to be the path of the xauth program. */
 #ifndef XAUTH_PATH
 #define XAUTH_PATH "/usr/X11R6/bin/xauth"