diff --git a/ChangeLog b/ChangeLog
index 398502e214..02ea29b836 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
 	* sysdeps/unix/sysv/linux/fstatvfs64.c: Rename to __fstatvfs64 and
 	make old name weak alias.
 	* sysdeps/generic/fstatvfs64.c: Likewise.
+	* include/sys/statvfs.h: New file.
 
 	* sysdeps/generic/bits/confname.h: Define _PC_REC_INCR_XFER_SIZE,
 	_PC_REC_MAX_XFER_SIZE, _PC_REC_MIN_XFER_SIZE, and
diff --git a/include/sys/statvfs.h b/include/sys/statvfs.h
new file mode 100644
index 0000000000..40acf9db16
--- /dev/null
+++ b/include/sys/statvfs.h
@@ -0,0 +1,7 @@
+#ifndef _SYS_STATVFS_H
+#include <io/sys/statvfs.h>
+
+/* Now define the internal interfaces.  */
+extern int __statvfs64 (__const char *__file, struct statvfs64 *__buf);
+extern int __fstatvfs64 (int __fildes, struct statvfs64 *__buf);
+#endif
diff --git a/sysdeps/posix/fpathconf.c b/sysdeps/posix/fpathconf.c
index c92afb9439..93f0b99590 100644
--- a/sysdeps/posix/fpathconf.c
+++ b/sysdeps/posix/fpathconf.c
@@ -21,6 +21,7 @@
 #include <unistd.h>
 #include <limits.h>
 #include <sys/statfs.h>
+#include <sys/statvfs.h>
 
 
 /* Get file-specific information about descriptor FD.  */
diff --git a/sysdeps/posix/pathconf.c b/sysdeps/posix/pathconf.c
index f6d0253f69..edb3961c67 100644
--- a/sysdeps/posix/pathconf.c
+++ b/sysdeps/posix/pathconf.c
@@ -22,6 +22,8 @@
 #include <limits.h>
 #include <fcntl.h>
 #include <sys/statfs.h>
+#include <sys/statvfs.h>
+
 
 /* Get file-specific information about PATH.  */
 long int
@@ -163,7 +165,6 @@ __pathconf (const char *path, int name)
       return 32;
 #endif
 
-
     case _PC_REC_INCR_XFER_SIZE:
       /* XXX It is not entirely clear what the limit is supposed to do.
 	 What is incremented?  */