diff --git a/cc3200/mods/moduos.c b/cc3200/mods/moduos.c
index d5b29336af144a441a298453387def743389a5d3..1c9932b8e70f0b3f038410c0d00ce14d1500373f 100644
--- a/cc3200/mods/moduos.c
+++ b/cc3200/mods/moduos.c
@@ -37,7 +37,7 @@
 #include "moduos.h"
 #include "diskio.h"
 #include "sflash_diskio.h"
-#include "extmod/vfs_fat_file.h"
+#include "extmod/vfs_fat.h"
 #include "random.h"
 #include "mpexception.h"
 #include "version.h"
diff --git a/esp8266/moduos.c b/esp8266/moduos.c
index e9c4c3e8cc26cd2059806068669b59199e6bd9cd..5f5aab1662a0c21f39391efaf5317ba9e75e3221 100644
--- a/esp8266/moduos.c
+++ b/esp8266/moduos.c
@@ -34,12 +34,11 @@
 #include "py/runtime.h"
 #include "py/mperrno.h"
 #include "extmod/misc.h"
+#include "extmod/vfs_fat.h"
 #include "genhdr/mpversion.h"
 #include "esp_mphal.h"
 #include "user_interface.h"
 
-extern const mp_obj_type_t mp_fat_vfs_type;
-
 STATIC const qstr os_uname_info_fields[] = {
     MP_QSTR_sysname, MP_QSTR_nodename,
     MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
diff --git a/extmod/vfs_fat.c b/extmod/vfs_fat.c
index 36bdb5dbdee7ad278440e4def664338531ff12ba..36e5031a83764807c6364ee8e81c50837fc69b2d 100644
--- a/extmod/vfs_fat.c
+++ b/extmod/vfs_fat.c
@@ -37,7 +37,7 @@
 #include "py/runtime.h"
 #include "py/mperrno.h"
 #include "lib/oofatfs/ff.h"
-#include "extmod/vfs_fat_file.h"
+#include "extmod/vfs_fat.h"
 #include "extmod/fsusermount.h"
 #include "timeutils.h"
 
diff --git a/extmod/vfs_fat_file.h b/extmod/vfs_fat.h
similarity index 97%
rename from extmod/vfs_fat_file.h
rename to extmod/vfs_fat.h
index 9693aa04a2f00692610d2906374ada6432ea7ab8..441b35c045e43175774ea1d377b6403e687c41a4 100644
--- a/extmod/vfs_fat_file.h
+++ b/extmod/vfs_fat.h
@@ -27,6 +27,7 @@
 struct _fs_user_mount_t;
 
 extern const byte fresult_to_errno_table[20];
+extern const mp_obj_type_t mp_fat_vfs_type;
 
 struct _fs_user_mount_t *ff_get_vfs(const char **path);
 
diff --git a/extmod/vfs_fat_ffconf.c b/extmod/vfs_fat_ffconf.c
index ddcdd88444bf75aa9deae7c76e3b76ab91ab730b..89081380e1eca05822e051a28a6aa22425650997 100644
--- a/extmod/vfs_fat_ffconf.c
+++ b/extmod/vfs_fat_ffconf.c
@@ -36,7 +36,7 @@
 #include "lib/fatfs/ff.h"
 #endif
 #include "extmod/fsusermount.h"
-#include "extmod/vfs_fat_file.h"
+#include "extmod/vfs_fat.h"
 
 STATIC bool check_path(const TCHAR **path, const char *mount_point_str, mp_uint_t mount_point_len) {
     if (strncmp(*path, mount_point_str, mount_point_len) == 0) {
diff --git a/extmod/vfs_fat_file.c b/extmod/vfs_fat_file.c
index 6651d70d0521e75d521ccc153358ce9c894b9062..ea332709e4f752bcc1088c9f862a1e99cf52bcd3 100644
--- a/extmod/vfs_fat_file.c
+++ b/extmod/vfs_fat_file.c
@@ -42,7 +42,7 @@
 #include "lib/fatfs/ff.h"
 #endif
 #include "extmod/fsusermount.h"
-#include "extmod/vfs_fat_file.h"
+#include "extmod/vfs_fat.h"
 
 #if MICROPY_VFS_FAT
 #define mp_type_fileio fatfs_type_fileio
diff --git a/extmod/vfs_fat_misc.c b/extmod/vfs_fat_misc.c
index 5e89009cd306e750bd63f0c92a9689b8847c6dac..ea267a15fa7efcb4f19255b9a3cae2c2feca8494 100644
--- a/extmod/vfs_fat_misc.c
+++ b/extmod/vfs_fat_misc.c
@@ -37,7 +37,7 @@
 #else
 #include "lib/fatfs/ff.h"
 #endif
-#include "extmod/vfs_fat_file.h"
+#include "extmod/vfs_fat.h"
 #include "extmod/fsusermount.h"
 #include "py/lexer.h"
 
diff --git a/extmod/vfs_fat_reader.c b/extmod/vfs_fat_reader.c
index efd2de0c167c6b43abc7147a44111e6c04352140..b9abf3ad71bfead9ea2e198733ab875a93dbd761 100644
--- a/extmod/vfs_fat_reader.c
+++ b/extmod/vfs_fat_reader.c
@@ -38,7 +38,7 @@
 #include "lib/fatfs/ff.h"
 #endif
 #include "extmod/fsusermount.h"
-#include "extmod/vfs_fat_file.h"
+#include "extmod/vfs_fat.h"
 
 typedef struct _mp_reader_fatfs_t {
     FIL fp;
diff --git a/stmhal/builtin_open.c b/stmhal/builtin_open.c
index 697eec8eaaf80afdeb18957174ce8ca425c10957..56b98ea61c076fe17dd8640877b8120561ed6b2d 100644
--- a/stmhal/builtin_open.c
+++ b/stmhal/builtin_open.c
@@ -25,6 +25,6 @@
  */
 
 #include "py/runtime.h"
-#include "extmod/vfs_fat_file.h"
+#include "extmod/vfs_fat.h"
 
 MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, fatfs_builtin_open);
diff --git a/stmhal/moduos.c b/stmhal/moduos.c
index b3c6570a5bdac5f4ef0adacc554346cf4570608f..158e530ff408eb9765263eac6e6b4ac3f70ec6a8 100644
--- a/stmhal/moduos.c
+++ b/stmhal/moduos.c
@@ -37,7 +37,7 @@
 #include "timeutils.h"
 #include "rng.h"
 #include "uart.h"
-#include "extmod/vfs_fat_file.h"
+#include "extmod/vfs_fat.h"
 #include "sdcard.h"
 #include "extmod/fsusermount.h"
 #include "portmodules.h"
diff --git a/unix/modos.c b/unix/modos.c
index 72f5d872e4d2c59093aad6739d4003921b4c3ad1..c35b246dd0fb84ae6fc6317d9493de74370e25c4 100644
--- a/unix/modos.c
+++ b/unix/modos.c
@@ -39,6 +39,7 @@
 #include "py/objtuple.h"
 #include "py/mphal.h"
 #include "extmod/misc.h"
+#include "extmod/vfs_fat.h"
 
 // Can't include this, as FATFS structure definition is required,
 // and FatFs header defining it conflicts with POSIX.
@@ -46,7 +47,6 @@
 MP_DECLARE_CONST_FUN_OBJ_KW(fsuser_mount_obj);
 MP_DECLARE_CONST_FUN_OBJ_1(fsuser_umount_obj);
 MP_DECLARE_CONST_FUN_OBJ_KW(fsuser_mkfs_obj);
-extern const mp_obj_type_t mp_fat_vfs_type;
 
 #ifdef __ANDROID__
 #define USE_STATFS 1