diff --git a/include/Filesystem.h b/include/Filesystem.h
index d03d952..9b5ec30 100644
--- a/include/Filesystem.h
+++ b/include/Filesystem.h
@@ -6,9 +6,10 @@
 #ifndef FILESYSTEM_H
 #define FILESYSTEM_H
 
-#include "MainFilesystem.h"
+#include "FileSystem.h"
+#include "mbed.h"
 
-void mountFilesystem(mbed::BlockDevice &bd, LittleFileSystem2 &fs);
-void unmountFilesystem(mbed::BlockDevice &bd, LittleFileSystem2 &fs);
+void mountFilesystem(mbed::BlockDevice &bd, mbed::FileSystem &fs);
+void unmountFilesystem(mbed::BlockDevice &bd, mbed::FileSystem &fs);
 
 #endif
diff --git a/include/FlashErase.h b/include/FlashErase.h
index cab4d7c..a0fc9cc 100644
--- a/include/FlashErase.h
+++ b/include/FlashErase.h
@@ -9,6 +9,6 @@
 #include "Filesystem.h"
 #include "MainBD.h"
 
-void doErase(mbed::BlockDevice &bd, LittleFileSystem2 &fs);
+void doErase(mbed::BlockDevice &bd, mbed::FileSystem &fs);
 
 #endif
diff --git a/include/MyUSBMSD.h b/include/MyUSBMSD.h
index 397421c..84d6d34 100644
--- a/include/MyUSBMSD.h
+++ b/include/MyUSBMSD.h
@@ -20,5 +20,5 @@
 	virtual const uint8_t *string_iproduct_desc();
 };
 
-void doUSBMSD(mbed::BlockDevice &bd, LittleFileSystem2 &fs);
+void doUSBMSD(mbed::BlockDevice &bd, mbed::FileSystem &fs);
 #endif
diff --git a/src/Filesystem.cpp b/src/Filesystem.cpp
index 029423b..a580a81 100644
--- a/src/Filesystem.cpp
+++ b/src/Filesystem.cpp
@@ -15,7 +15,7 @@
 
 // function to attempt to mount the filesystem and
 // reformat and mount it again should it fail
-void mountFilesystem(mbed::BlockDevice &bd, LittleFileSystem2 &fs) {
+void mountFilesystem(mbed::BlockDevice &bd, mbed::FileSystem &fs) {
 	int err;
 	// Try to mount the filesystem
 	printf("Mounting the filesystem... ");
@@ -43,7 +43,7 @@
 }
 
 // function to unmount the filesystem
-void unmountFilesystem(mbed::BlockDevice &bd, LittleFileSystem2 &fs) {
+void unmountFilesystem(mbed::BlockDevice &bd, mbed::FileSystem &fs) {
 	// Try to unmount the filesystem
 	printf("Unmounting the filesystem... ");
 	fflush(stdout);
diff --git a/src/FlashErase.cpp b/src/FlashErase.cpp
index f772fd9..0141f3d 100644
--- a/src/FlashErase.cpp
+++ b/src/FlashErase.cpp
@@ -9,7 +9,7 @@
 #include <functional>
 
 // function to erase the flash
-void doErase(mbed::BlockDevice &bd, LittleFileSystem2 &fs) {
+void doErase(mbed::BlockDevice &bd, mbed::FileSystem &fs) {
 	// Try to unmount the filesystem
 	unmountFilesystem(bd, fs);
 	printf("Initializing the block device... ");
diff --git a/src/MyUSBMSD.cpp b/src/MyUSBMSD.cpp
index 0b23a56..6ad0aec 100644
--- a/src/MyUSBMSD.cpp
+++ b/src/MyUSBMSD.cpp
@@ -26,7 +26,7 @@
 	return string_iproduct_descriptor;
 }
 
-void doUSBMSD(mbed::BlockDevice &bd, LittleFileSystem2 &fs) {
+void doUSBMSD(mbed::BlockDevice &bd, mbed::FileSystem &fs) {
 	// Try to unmount the filesystem
 	unmountFilesystem(bd, fs);
 	printf("Switching to the usb mass storage mode...\n");