diff --git a/configure.ac b/configure.ac
index 3161620..e148077 100644
--- a/configure.ac
+++ b/configure.ac
@@ -161,22 +161,9 @@ dnl
 AC_HEADER_STDC
 AC_HEADER_TIME
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([sys/ioctl.h sys/mman.h sys/resource.h \
-		  sys/select.h sys/socket.h sys/time.h sys/uio.h \
-		  sys/un.h arpa/inet.h netinet/in.h \
-		  assert.h errno.h fcntl.h grp.h io.h libintl.h \
-		  netdb.h pwd.h regex.h signal.h stdarg.h \
-		  sysexits.h syslog.h time.h wchar.h wctype.h \
+AC_CHECK_HEADERS([sys/ioctl.h alloca.h memory.h malloc.h sysexits.h \
 		  values.h])
 
-dnl OpenBSD machines don't like having malloc included (even if it's present)
-dnl as they expect you to use stdlib.h
-case "$target" in
-    *-openbsd*) ;;
-    *)         AC_CHECK_HEADER(malloc.h);;
-esac
-
-
 dnl Checks for types
 AC_TYPE_SIZE_T
 AC_TYPE_PID_T
diff --git a/src/common.h b/src/common.h
index 7f5ce9b..47a1ed1 100644
--- a/src/common.h
+++ b/src/common.h
@@ -41,115 +41,58 @@
 #include	<stdlib.h>
 #include	<string.h>
 #include	<unistd.h>
-
-#ifdef HAVE_SYS_TYPES_H
+/* standard POSIX headers - they need to be there as well. */
+#  include	<errno.h>
+#  include	<fcntl.h>
+#  include	<netdb.h>
+#  include      <signal.h>
+#  include      <stdarg.h>
+#  include	<strings.h>
+#  include      <syslog.h>
+#  include	<wchar.h>
+#  include	<wctype.h>
+#  include      <sys/mman.h>
+#  include	<sys/select.h>
+#  include	<sys/socket.h>
+#  include	<sys/stat.h>
 #  include      <sys/types.h>
-#endif
+#  include	<sys/wait.h>
+#  include	<sys/uio.h>
+#  include	<sys/un.h>
+#  include	<sys/time.h>
+#  include	<time.h>
+#  include	<inttypes.h>
+#  include      <sys/resource.h>
+#  include	<netinet/in.h>
+#  include      <assert.h>
+#  include	<arpa/inet.h>
+#  include	<grp.h>
+#  include	<pwd.h>
+#  include      <regex.h>
+
+/* rest - some oddball headers */
 #ifdef HAVE_VALUES_H
 #  include      <values.h>
 #endif
-#ifdef HAVE_INTTYPES_H
-#  include	<inttypes.h>
-#endif
 
 #ifdef HAVE_SYS_IOCTL_H
 #  include	<sys/ioctl.h>
 #endif
-#ifdef HAVE_SYS_SELECT_H
-#  include	<sys/select.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#  include	<sys/socket.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-#  include	<sys/stat.h>
-#endif
 
-#ifdef TIME_WITH_SYS_TIME
-#  include <sys/time.h>
-#  include <time.h>
-#else
-#  ifdef HAVE_SYS_TIME_H
-#    include <sys/time.h>
-#  else
-#    include <time.h>
-#  endif
-#endif
-
-#ifdef HAVE_SYS_RESOURCE_H
-#  include      <sys/resource.h>
-#endif
-#ifdef HAVE_SYS_UIO_H
-#  include	<sys/uio.h>
-#endif
-#ifdef HAVE_SYS_UN_H
-#  include	<sys/un.h>
-#endif
-#ifdef HAVE_SYS_WAIT_H
-#  include	<sys/wait.h>
-#endif
-
-#ifdef HAVE_NETINET_IN_H
-#  include	<netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#  include	<arpa/inet.h>
-#endif
 #ifdef HAVE_ALLOCA_H
 #  include	<alloca.h>
 #endif
-#ifdef HAVE_ASSERT_H
-#  include      <assert.h>
-#endif
-#ifdef HAVE_ERRNO_H
-#  include	<errno.h>
-#endif
-#ifdef HAVE_FCNTL_H
-#  include	<fcntl.h>
-#endif
-#ifdef HAVE_GRP_H
-#  include    	<grp.h>
-#endif
+
 #ifdef HAVE_MEMORY_H
 #  include	<memory.h>
 #endif
-#ifdef HAVE_NETDB_H
-#  include	<netdb.h>
-#endif
-#ifdef HAVE_PWD_H
-#  include     	<pwd.h>
-#endif
-#ifdef HAVE_REGEX_H
-#  include      <regex.h>
-#endif
-#ifdef HAVE_SIGNAL_H
-#  include      <signal.h>
-#endif
-#ifdef HAVE_STDARG_H
-#  include      <stdarg.h>
-#endif
 
 #ifdef HAVE_MALLOC_H
 #  include	<malloc.h>
 #endif
 
-#ifdef HAVE_STRINGS_H
-#  include	<strings.h>
-#endif
 #ifdef HAVE_SYSEXITS_H
-#  include     	<sysexits.h>
-#endif
-#ifdef HAVE_SYSLOG_H
-#  include      <syslog.h>
-#endif
-#ifdef HAVE_WCHAR_H
-#  include	<wchar.h>
-#endif
-#ifdef HAVE_WCTYPE_H
-#  include	<wctype.h>
-#endif
-#ifdef HAVE_SYS_MMAN_H
-#  include      <sys/mman.h>
+#  include	<sysexits.h>
 #endif
 
 /*
diff --git a/src/log.h b/src/log.h
index b523ab0..68c89c3 100644
--- a/src/log.h
+++ b/src/log.h
@@ -77,16 +77,7 @@
  *		don't advocate this, but it could be useful at times.)
  */
 
-#ifdef HAVE_SYSLOG_H
-#  include <syslog.h>
-#else
-#  define LOG_CRIT    2
-#  define LOG_ERR     3
-#  define LOG_WARNING 4
-#  define LOG_NOTICE  5
-#  define LOG_INFO    6
-#  define LOG_DEBUG   7
-#endif
+#include <syslog.h>
 
 #define LOG_CONN      8         /* extra to log connections without the INFO stuff */