diff --git a/build/autoconf/mozcommonheader.m4 b/build/autoconf/mozcommonheader.m4
index 2765217bdf76..c25987441a74 100644
--- a/build/autoconf/mozcommonheader.m4
+++ b/build/autoconf/mozcommonheader.m4
@@ -3,7 +3,6 @@ dnl License, v. 2.0. If a copy of the MPL was not distributed with this
 dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 AC_DEFUN(MOZ_CHECK_COMMON_HEADERS,
-	MOZ_CHECK_HEADERS(sys/byteorder.h compat.h getopt.h sys/bitypes.h \
-        memory.h unistd.h gnu/libc-version.h nl_types.h malloc.h \
-        X11/XKBlib.h io.h cpuid.h)
+	MOZ_CHECK_HEADERS(sys/byteorder.h getopt.h unistd.h nl_types.h \
+        malloc.h cpuid.h)
 )
diff --git a/js/src/old-configure.in b/js/src/old-configure.in
index 126c57ed7a86..173ff8a5078d 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -1249,8 +1249,6 @@ if test "x$enable_dtrace" = "xyes"; then
 fi
 AC_SUBST(HAVE_DTRACE)
 
-MOZ_CHECK_HEADERS(sys/cdefs.h)
-
 MOZ_LINUX_PERF_EVENT
 
 dnl Checks for libraries.
diff --git a/old-configure.in b/old-configure.in
index 1f57a23f8bed..99377b4ca1f2 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -1582,7 +1582,7 @@ dnl These are all the places some variant of statfs can be hiding.
 MOZ_CHECK_HEADERS(sys/statvfs.h sys/statfs.h sys/vfs.h sys/mount.h)
 
 dnl Quota support
-MOZ_CHECK_HEADERS(sys/quota.h sys/sysmacros.h)
+MOZ_CHECK_HEADERS(sys/quota.h)
 MOZ_CHECK_HEADERS([linux/quota.h],,,[#include <sys/socket.h>])
 
 dnl SCTP support - needs various network include headers