diff --git a/fs/fat/fs_fat32.h b/fs/fat/fs_fat32.h
index 70e958ee13a..d2cf8890f31 100644
--- a/fs/fat/fs_fat32.h
+++ b/fs/fat/fs_fat32.h
@@ -1084,7 +1084,7 @@ EXTERN int    fat_ffcacheinvalidate(struct fat_mountpt_s *fs,
 EXTERN int    fat_updatefsinfo(struct fat_mountpt_s *fs);
 EXTERN int    fat_computefreeclusters(struct fat_mountpt_s *fs);
 EXTERN int    fat_nfreeclusters(struct fat_mountpt_s *fs,
-                                off_t *pfreeclusters);
+                                fsblkcnt_t *pfreeclusters);
 EXTERN int    fat_currentsector(struct fat_mountpt_s *fs,
                                 struct fat_file_s *ff, off_t position);
 
diff --git a/fs/fat/fs_fat32util.c b/fs/fat/fs_fat32util.c
index d24d8fec08b..63b15e30e8a 100644
--- a/fs/fat/fs_fat32util.c
+++ b/fs/fat/fs_fat32util.c
@@ -2135,7 +2135,7 @@ int fat_computefreeclusters(struct fat_mountpt_s *fs)
  *
  ****************************************************************************/
 
-int fat_nfreeclusters(struct fat_mountpt_s *fs, off_t *pfreeclusters)
+int fat_nfreeclusters(struct fat_mountpt_s *fs, fsblkcnt_t *pfreeclusters)
 {
   /* If number of the first free cluster is valid, then just return that
    * value.
diff --git a/include/sys/statfs.h b/include/sys/statfs.h
index 82c304f2679..0817e310c02 100644
--- a/include/sys/statfs.h
+++ b/include/sys/statfs.h
@@ -100,14 +100,14 @@
 
 struct statfs
 {
-  uint32_t f_type;     /* Type of filesystem (see definitions above) */
-  size_t   f_namelen;  /* Maximum length of filenames */
-  size_t   f_bsize;    /* Optimal block size for transfers */
-  off_t    f_blocks;   /* Total data blocks in the file system of this size */
-  off_t    f_bfree;    /* Free blocks in the file system */
-  off_t    f_bavail;   /* Free blocks avail to non-superuser */
-  off_t    f_files;    /* Total file nodes in the file system */
-  off_t    f_ffree;    /* Free file nodes in the file system */
+  uint32_t   f_type;     /* Type of filesystem (see definitions above) */
+  size_t     f_namelen;  /* Maximum length of filenames */
+  size_t     f_bsize;    /* Optimal block size for transfers */
+  fsblkcnt_t f_blocks;   /* Total data blocks in the file system of this size */
+  fsblkcnt_t f_bfree;    /* Free blocks in the file system */
+  fsblkcnt_t f_bavail;   /* Free blocks avail to non-superuser */
+  fsfilcnt_t f_files;    /* Total file nodes in the file system */
+  fsfilcnt_t f_ffree;    /* Free file nodes in the file system */
 };
 
 /****************************************************************************