diff --git a/configure.ac b/configure.ac
index 1f1e8146..6166884f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,42 +185,7 @@ LIBEVENT_OPENSSL
 LIBEVENT_MBEDTLS
 
 dnl Checks for header files.
-AC_CHECK_HEADERS([ \
-  arpa/inet.h \
-  fcntl.h \
-  ifaddrs.h \
-  mach/mach_time.h \
-  mach/mach.h \
-  netdb.h \
-  netinet/in.h \
-  netinet/in6.h \
-  netinet/tcp.h \
-  sys/un.h \
-  poll.h \
-  port.h \
-  stdarg.h \
-  stddef.h \
-  sys/devpoll.h \
-  sys/epoll.h \
-  sys/event.h \
-  sys/eventfd.h \
-  sys/ioctl.h \
-  sys/mman.h \
-  sys/param.h \
-  sys/queue.h \
-  sys/resource.h \
-  sys/select.h \
-  sys/sendfile.h \
-  sys/socket.h \
-  sys/stat.h \
-  sys/time.h \
-  sys/timerfd.h \
-  sys/uio.h \
-  sys/wait.h \
-  sys/random.h \
-  errno.h \
-  afunix.h
-])
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h ifaddrs.h mach/mach_time.h mach/mach.h netdb.h netinet/in.h netinet/in6.h netinet/tcp.h sys/un.h poll.h port.h stdarg.h stddef.h sys/devpoll.h sys/epoll.h sys/event.h sys/eventfd.h sys/ioctl.h sys/mman.h sys/param.h sys/queue.h sys/resource.h sys/select.h sys/sendfile.h sys/socket.h sys/stat.h sys/time.h sys/timerfd.h sys/uio.h sys/wait.h sys/random.h errno.h afunix.h])
 
 case "${host_os}" in
     linux*) ;;
@@ -325,42 +290,7 @@ AC_C_INLINE
 AC_HEADER_TIME
 
 dnl Checks for library functions.
-AC_CHECK_FUNCS([ \
-  accept4 \
-  arc4random \
-  arc4random_buf \
-  arc4random_addrandom \
-  eventfd \
-  epoll_create1 \
-  fcntl \
-  getegid \
-  geteuid \
-  getifaddrs \
-  gettimeofday \
-  issetugid \
-  mach_absolute_time \
-  mmap \
-  nanosleep \
-  pipe \
-  pipe2 \
-  putenv \
-  sendfile \
-  setenv \
-  setrlimit \
-  sigaction \
-  signal \
-  strsignal \
-  strlcpy \
-  strsep \
-  strtok_r \
-  strtoll \
-  sysctl \
-  timerfd_create \
-  umask \
-  unsetenv \
-  usleep \
-  getrandom
-])
+AC_CHECK_FUNCS([accept4 arc4random arc4random_buf arc4random_addrandom eventfd epoll_create1 fcntl getegid geteuid getifaddrs gettimeofday issetugid mach_absolute_time mmap nanosleep pipe pipe2 putenv sendfile setenv setrlimit sigaction signal strsignal strlcpy strsep strtok_r strtoll sysctl timerfd_create umask unsetenv usleep getrandom ])
 
 AS_IF([test x$bwin32 = xtrue],
   AC_CHECK_FUNCS(_gmtime64_s, , [AC_CHECK_FUNCS(_gmtime64)])