diff --git a/configure.in b/configure.in
index 648cd4655..17f532ea4 100644
--- a/configure.in
+++ b/configure.in
@@ -50,16 +50,20 @@ AC_DECL_YYTEXT
 dnl Checks for header files.
 AC_HEADER_STDC
 
-AC_CHECK_HEADERS(arpa/inet.h arpa/telnet.h bsdsetjmp.h crypt.h db.h)
-AC_CHECK_HEADERS(dbm.h dirent.h fcntl.h grp.h limits.h ndbm.h)
-AC_CHECK_HEADERS(net/if.h netdb.h netinet/in.h netinet/in_systm.h)
-AC_CHECK_HEADERS(netinet/in6.h netinet/in6_machtypes.h netinet/ip.h)
-AC_CHECK_HEADERS(paths.h pwd.h rpcsvc/dbm.h shadow.h signal.h)
-AC_CHECK_HEADERS(sys/bitypes.h sys/filio.h sys/file.h sys/ioctl.h)
-AC_CHECK_HEADERS(sys/param.h sys/proc.h sys/resource.h sys/select.h)
-AC_CHECK_HEADERS(sys/socket.h sys/sockio.h sys/stat.h sys/sysctl.h)
+AC_CHECK_HEADERS(arpa/inet.h arpa/telnet.h bsdsetjmp.h)
+AC_CHECK_HEADERS(crypt.h curses.h db.h dbm.h dirent.h fcntl.h)
+AC_CHECK_HEADERS(grp.h limits.h ndbm.h net/if.h netdb.h)
+AC_CHECK_HEADERS(netinet/in.h netinet/in_systm.h netinet/in6.h)
+AC_CHECK_HEADERS(netinet/in6_machtypes.h netinet/ip.h paths.h)
+AC_CHECK_HEADERS(pty.h pwd.h rpcsvc/dbm.h sac.h shadow.h)
+AC_CHECK_HEADERS(signal.h stropts.h sys/bitypes.h sys/filio.h)
+AC_CHECK_HEADERS(sys/file.h sys/ioctl.h sys/param.h sys/proc.h)
+AC_CHECK_HEADERS(sys/pty.h sys/ptyio.h sys/ptyvar.h sys/resource.h)
+AC_CHECK_HEADERS(sys/select.h sys/socket.h sys/sockio.h sys/stat.h)
+AC_CHECK_HEADERS(sys/stream.h sys/stropts.h sys/sysctl.h)
 AC_CHECK_HEADERS(sys/time.h sys/tty.h sys/types.h sys/wait.h)
-AC_CHECK_HEADERS(syslog.h termios.h unistd.h utmp.h utmpx.h)
+AC_CHECK_HEADERS(sys/uio.h syslog.h termio.h termios.h tmpdir.h)
+AC_CHECK_HEADERS(unistd.h util.h utmp.h utmpx.h sys/utsname.h)
 
 dnl Checks for libraries.
 
@@ -95,12 +99,11 @@ if test "$ac_cv_func_snprintf_working" = yes; then
 	AC_DEFINE_UNQUOTED($foo)
 fi
 
-AC_CHECK_FUNCS(asnprintf asprintf vasprintf vasnprintf vsnprintf)
-AC_CHECK_FUNCS(getmsg)
-
-AC_CHECK_FUNCS(gethostname mktime timegm select strstr)
-AC_CHECK_FUNCS(random rand setitimer setsid setsockopt)
-AC_CHECK_FUNCS(setpcred setlogin)
+AC_CHECK_FUNCS(_getpty asnprintf asprintf gethostname getmsg)
+AC_CHECK_FUNCS(grantpt logwtmp mktime ptsname rand random revoke)
+AC_CHECK_FUNCS(select setitimer setlogin setpcred setpgid setsid)
+AC_CHECK_FUNCS(setsid setsockopt strstr timegm ttyname unlockpt)
+AC_CHECK_FUNCS(vasnprintf vasprintf vhangup vsnprintf)
 
 AC_TYPE_SIGNAL
 if test "$ac_cv_type_signal" = "void" ; then
@@ -115,10 +118,11 @@ AC_FIND_IF_NOT_BROKEN(hstrerror, resolv,
 17)
 
 AC_BROKEN(chown daemon err errx fchown getcwd getdtablesize)
-AC_BROKEN(getusershell inet_aton initgroups lstat memmove mkstemp)
-AC_BROKEN(putenv rcmd setegid setenv seteuid strcasecmp strdup)
-AC_BROKEN(strerror strftime strlwr strnlen strtok_r strupr unsetenv)
-AC_BROKEN(vsyslog verr verrx vwarn vwarnx warn warnx)
+AC_BROKEN(getusershell inet_aton initgroups lstat memmove)
+AC_BROKEN(mkstemp putenv rcmd setegid setenv seteuid)
+AC_BROKEN(strcasecmp strdup strerror strftime strlwr)
+AC_BROKEN(strnlen strtok_r strupr unsetenv vsyslog verr)
+AC_BROKEN(verrx vwarn vwarnx warn warnx)
 
 dnl AC_KRB_FUNC_GETCWD_BROKEN