diff --git a/configure.ac b/configure.ac
index 9f1182311..77076f4b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -140,8 +140,8 @@ if test x"$enable_extcharset" = x"yes"; then
 fi
 
 AC_PROG_INSTALL
-AC_CHECK_HEADERS([unistd.h string.h memory.h grp.h limits.h malloc.h \
-	termios.h utime.h fcntl.h pwd.h sys/statfs.h sys/vfs.h sys/time.h \
+AC_CHECK_HEADERS([unistd.h string.h memory.h limits.h malloc.h \
+	termios.h utime.h fcntl.h sys/statfs.h sys/vfs.h sys/time.h \
 	sys/timeb.h sys/select.h sys/ioctl.h stropts.h arpa/inet.h \
 	security/pam_misc.h sys/socket.h sys/sysmacros.h sys/types.h \
 	sys/mkdev.h wchar.h wctype.h])
diff --git a/vfs/samba/configure.ac b/vfs/samba/configure.ac
index df7b7cdbc..d58eac708 100644
--- a/vfs/samba/configure.ac
+++ b/vfs/samba/configure.ac
@@ -42,7 +42,7 @@ AC_HEADER_STDC
 AC_HEADER_DIRENT
 AC_HEADER_TIME
 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(unistd.h utime.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/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)