diff --git a/configure.ac b/configure.ac
index bce567b13..9f1182311 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,7 +147,6 @@ AC_CHECK_HEADERS([unistd.h string.h memory.h grp.h limits.h malloc.h \
 	sys/mkdev.h wchar.h wctype.h])
 
 AC_HEADER_TIME
-AC_HEADER_SYS_WAIT
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 
diff --git a/vfs/samba/configure.ac b/vfs/samba/configure.ac
index a6ea600a2..df7b7cdbc 100644
--- a/vfs/samba/configure.ac
+++ b/vfs/samba/configure.ac
@@ -41,11 +41,10 @@ AC_INLINE
 AC_HEADER_STDC
 AC_HEADER_DIRENT
 AC_HEADER_TIME
-AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(arpa/inet.h sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h)
 AC_CHECK_HEADERS(unistd.h utime.h grp.h sys/id.h limits.h memory.h net/if.h)
 AC_CHECK_HEADERS(compat.h rpc/rpc.h rpcsvc/nis.h rpcsvc/yp_prot.h rpcsvc/ypclnt.h)
-AC_CHECK_HEADERS(sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/mode.h)
+AC_CHECK_HEADERS(sys/param.h ctype.h sys/resource.h sys/ioctl.h sys/mode.h)
 AC_CHECK_HEADERS(sys/mman.h sys/filio.h sys/priv.h string.h strings.h sys/socket.h)
 AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h)
 AC_CHECK_HEADERS(sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h sys/sockio.h)