diff --git a/features/filesystem/File.h b/features/filesystem/File.h
index 7bf1fe42aa..5043ba1b5f 100644
--- a/features/filesystem/File.h
+++ b/features/filesystem/File.h
@@ -18,7 +18,7 @@
 #define FILE_H
 
 #include "filesystem/FileSystem.h"
-#include "drivers/FileHandle.h"
+#include "platform/FileHandle.h"
 
 namespace mbed {
 /** \addtogroup filesystem */
diff --git a/features/filesystem/FileSystem.h b/features/filesystem/FileSystem.h
index cfc84225d1..d5824b60b1 100644
--- a/features/filesystem/FileSystem.h
+++ b/features/filesystem/FileSystem.h
@@ -19,7 +19,7 @@
 
 #include "platform/platform.h"
 
-#include "drivers/FileBase.h"
+#include "platform/FileBase.h"
 #include "BlockDevice.h"
 
 namespace mbed {
diff --git a/mbed.h b/mbed.h
index 4ec380812a..9b1b01e8d6 100644
--- a/mbed.h
+++ b/mbed.h
@@ -94,7 +94,7 @@
 #include "drivers/LowPowerTimeout.h"
 #include "drivers/LowPowerTicker.h"
 #include "drivers/LowPowerTimer.h"
-#include "drivers/LocalFileSystem.h"
+#include "platform/LocalFileSystem.h"
 #include "drivers/InterruptIn.h"
 #include "platform/mbed_wait_api.h"
 #include "hal/sleep_api.h"
diff --git a/drivers/DirHandle.h b/platform/DirHandle.h
similarity index 100%
rename from drivers/DirHandle.h
rename to platform/DirHandle.h
diff --git a/drivers/FileBase.cpp b/platform/FileBase.cpp
similarity index 96%
rename from drivers/FileBase.cpp
rename to platform/FileBase.cpp
index 47e49e3f5c..4458f584b4 100644
--- a/drivers/FileBase.cpp
+++ b/platform/FileBase.cpp
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "drivers/FileBase.h"
-#include "drivers/FileLike.h"
-#include "drivers/FileHandle.h"
+#include "platform/FileBase.h"
+#include "platform/FileLike.h"
+#include "platform/FileHandle.h"
 
 namespace mbed {
 
diff --git a/drivers/FileBase.h b/platform/FileBase.h
similarity index 100%
rename from drivers/FileBase.h
rename to platform/FileBase.h
diff --git a/drivers/FileHandle.h b/platform/FileHandle.h
similarity index 100%
rename from drivers/FileHandle.h
rename to platform/FileHandle.h
diff --git a/drivers/FileLike.h b/platform/FileLike.h
similarity index 95%
rename from drivers/FileLike.h
rename to platform/FileLike.h
index e9c8d8839f..a249b68c90 100644
--- a/drivers/FileLike.h
+++ b/platform/FileLike.h
@@ -17,8 +17,8 @@
 #define MBED_FILELIKE_H
 
 #include "platform/mbed_toolchain.h"
-#include "drivers/FileBase.h"
-#include "drivers/FileHandle.h"
+#include "platform/FileBase.h"
+#include "platform/FileHandle.h"
 
 namespace mbed {
 /** \addtogroup drivers */
diff --git a/drivers/FilePath.cpp b/platform/FilePath.cpp
similarity index 98%
rename from drivers/FilePath.cpp
rename to platform/FilePath.cpp
index cdd64f5d9c..e8733a33b4 100644
--- a/drivers/FilePath.cpp
+++ b/platform/FilePath.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "drivers/FilePath.h"
+#include "platform/FilePath.h"
 
 namespace mbed {
 
diff --git a/drivers/FilePath.h b/platform/FilePath.h
similarity index 94%
rename from drivers/FilePath.h
rename to platform/FilePath.h
index 7e1d1a5879..9daa1597c6 100644
--- a/drivers/FilePath.h
+++ b/platform/FilePath.h
@@ -18,8 +18,8 @@
 
 #include "platform/platform.h"
 
-#include "drivers/FileSystemLike.h"
-#include "drivers/FileLike.h"
+#include "platform/FileSystemLike.h"
+#include "platform/FileLike.h"
 
 namespace mbed {
 /** \addtogroup drivers */
diff --git a/drivers/FileSystemLike.cpp b/platform/FileSystemLike.cpp
similarity index 98%
rename from drivers/FileSystemLike.cpp
rename to platform/FileSystemLike.cpp
index 167936af32..e7c6aafbb0 100644
--- a/drivers/FileSystemLike.cpp
+++ b/platform/FileSystemLike.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "drivers/FileSystemLike.h"
+#include "platform/FileSystemLike.h"
 
 namespace mbed {
 
diff --git a/drivers/FileSystemLike.h b/platform/FileSystemLike.h
similarity index 97%
rename from drivers/FileSystemLike.h
rename to platform/FileSystemLike.h
index 47ece539d9..b9949c2a87 100644
--- a/drivers/FileSystemLike.h
+++ b/platform/FileSystemLike.h
@@ -18,9 +18,9 @@
 
 #include "platform/platform.h"
 
-#include "drivers/FileBase.h"
-#include "drivers/FileHandle.h"
-#include "drivers/DirHandle.h"
+#include "platform/FileBase.h"
+#include "platform/FileHandle.h"
+#include "platform/DirHandle.h"
 
 namespace mbed {
 /** \addtogroup drivers */
diff --git a/drivers/LocalFileSystem.cpp b/platform/LocalFileSystem.cpp
similarity index 99%
rename from drivers/LocalFileSystem.cpp
rename to platform/LocalFileSystem.cpp
index 037dcfac99..3b06c3c00b 100644
--- a/drivers/LocalFileSystem.cpp
+++ b/platform/LocalFileSystem.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "drivers/LocalFileSystem.h"
+#include "platform/LocalFileSystem.h"
 
 #if DEVICE_LOCALFILESYSTEM
 
diff --git a/drivers/LocalFileSystem.h b/platform/LocalFileSystem.h
similarity index 98%
rename from drivers/LocalFileSystem.h
rename to platform/LocalFileSystem.h
index 904008ffb5..526c2d1f22 100644
--- a/drivers/LocalFileSystem.h
+++ b/platform/LocalFileSystem.h
@@ -20,7 +20,7 @@
 
 #if DEVICE_LOCALFILESYSTEM
 
-#include "drivers/FileSystemLike.h"
+#include "platform/FileSystemLike.h"
 #include "platform/PlatformMutex.h"
 
 namespace mbed {
diff --git a/drivers/Stream.cpp b/platform/Stream.cpp
similarity index 99%
rename from drivers/Stream.cpp
rename to platform/Stream.cpp
index 9837c81297..76568712e7 100644
--- a/drivers/Stream.cpp
+++ b/platform/Stream.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "drivers/Stream.h"
+#include "platform/Stream.h"
 
 namespace mbed {
 
diff --git a/drivers/Stream.h b/platform/Stream.h
similarity index 97%
rename from drivers/Stream.h
rename to platform/Stream.h
index 44bd55f7ca..cbb25a9c61 100644
--- a/drivers/Stream.h
+++ b/platform/Stream.h
@@ -17,8 +17,8 @@
 #define MBED_STREAM_H
 
 #include "platform/platform.h"
-#include "drivers/FileLike.h"
-#include "drivers/FileHandle.h"
+#include "platform/FileLike.h"
+#include "platform/FileHandle.h"
 #include <cstdarg>
 
 namespace mbed {
diff --git a/platform/mbed_retarget.cpp b/platform/mbed_retarget.cpp
index ae769e1d45..3297fe1882 100644
--- a/platform/mbed_retarget.cpp
+++ b/platform/mbed_retarget.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #include "platform/platform.h"
-#include "drivers/FilePath.h"
+#include "platform/FilePath.h"
 #include "hal/serial_api.h"
 #include "platform/mbed_toolchain.h"
 #include "platform/mbed_semihost_api.h"