diff --git a/configure.in b/configure.in
index 89030ece19f..b69a46403f5 100644
--- a/configure.in
+++ b/configure.in
@@ -3215,7 +3215,8 @@ dnl Checks for library functions.
 dnl ========================================================
 AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MEMCMP
-AC_CHECK_FUNCS(random strerror lchown fchmod snprintf statvfs memmove rint stat64 lstat64 truncate64 statvfs64 setbuf isatty)
+AC_CHECK_FUNCS(random strerror lchown fchmod snprintf memmove rint stat64 lstat64 truncate64 setbuf isatty)
+AC_CHECK_FUNCS(statvfs64 statvfs statfs64 statfs)
 AC_CHECK_FUNCS(flockfile getpagesize)
 AC_CHECK_FUNCS(localtime_r strtok_r)
 
@@ -8600,17 +8601,21 @@ HAVE_CPP_CHAR16_T
 HAVE_CPP_DYNAMIC_CAST_TO_VOID_PTR
 HAVE_CPP_PARTIAL_SPECIALIZATION
 HAVE_CPP_TROUBLE_COMPARING_TO_ZERO
-HAVE_STATVFS
-HAVE_STATVFS64
 NEED_CPP_UNUSED_IMPLEMENTATIONS
 NEW_H
 HAVE_GETPAGESIZE
 HAVE_ICONV
 HAVE_ICONV_WITH_CONST_INPUT
 HAVE_MBRTOWC
-HAVE_SYS_MOUNT_H
-HAVE_SYS_VFS_H
 HAVE_WCRTOMB
+HAVE_STATVFS64
+HAVE_STATVFS
+HAVE_STATFS64
+HAVE_STATFS
+HAVE_SYS_STATVFS_H
+HAVE_SYS_STATFS_H
+HAVE_SYS_VFS_H
+HAVE_SYS_MOUNT_H
 "
 
 AC_CONFIG_HEADER(
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
index b0bf398b545..1502c6983c8 100644
--- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp
@@ -36,6 +36,7 @@
 #endif
 #endif
 
+#include "xpcom-private.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsCRT.h"
 #include "nsCOMPtr.h"
diff --git a/xpcom/io/nsLocalFileUnix.h b/xpcom/io/nsLocalFileUnix.h
index b30d37b401a..b73f685e79f 100644
--- a/xpcom/io/nsLocalFileUnix.h
+++ b/xpcom/io/nsLocalFileUnix.h
@@ -38,6 +38,15 @@
     #include <sys/statfs.h>
 #endif
 
+#ifdef HAVE_SYS_VFS_H
+    #include <sys/vfs.h>
+#endif
+
+#ifdef HAVE_SYS_MOUNT_H
+    #include <sys/param.h>
+    #include <sys/mount.h>
+#endif
+
 #if defined(XP_MACOSX) && (defined(HAVE_STATVFS64) || !defined(HAVE_STATVFS))
 #error "Double-check which members of the 'STATFS' struct we're using!"
 #endif
diff --git a/xpcom/xpcom-config.h.in b/xpcom/xpcom-config.h.in
index 855ed25a1a1..14b9f11e515 100644
--- a/xpcom/xpcom-config.h.in
+++ b/xpcom/xpcom-config.h.in
@@ -32,9 +32,6 @@
  */
 #undef HAVE_CPP_TROUBLE_COMPARING_TO_ZERO
 
-/* Define if statvfs() is available */
-#undef HAVE_STATVFS
-
 /* Define if the c++ compiler requires implementations of 
  * unused virtual methods
  */
diff --git a/xpcom/xpcom-private.h.in b/xpcom/xpcom-private.h.in
index 55bf94e1f6b..66c024fd874 100644
--- a/xpcom/xpcom-private.h.in
+++ b/xpcom/xpcom-private.h.in
@@ -19,14 +19,32 @@
 /* Define if mbrtowc() is available */
 #undef HAVE_MBRTOWC
 
-/* Define if <sys/mount.h> is present */
-#undef HAVE_SYS_MOUNT_H
+/* Define if wcrtomb() is available */
+#undef HAVE_WCRTOMB
+
+/* Define if statvfs64() is available */
+#undef HAVE_STATVFS64
+
+/* Define if statvfs() is available */
+#undef HAVE_STATVFS
+
+/* Define if statfs64() is available */
+#undef HAVE_STATFS64
+
+/* Define if statfs() is available */
+#undef HAVE_STATFS
+
+/* Define if <sys/statvfs.h> is present */
+#undef HAVE_SYS_STATVFS_H
+
+/* Define if <sys/statfs.h> is present */
+#undef HAVE_SYS_STATFS_H
 
 /* Define if <sys/vfs.h> is present */
 #undef HAVE_SYS_VFS_H
 
-/* Define if wcrtomb() is available */
-#undef HAVE_WCRTOMB
+/* Define if <sys/mount.h> is present */
+#undef HAVE_SYS_MOUNT_H
 
 #endif /* _XPCOM_PRIVATE_H_ */