diff --git a/features/filesystem/bd/HeapBlockDevice.cpp b/features/filesystem/bd/HeapBlockDevice.cpp
index 60e8d71b9a..afb2da42be 100644
--- a/features/filesystem/bd/HeapBlockDevice.cpp
+++ b/features/filesystem/bd/HeapBlockDevice.cpp
@@ -17,7 +17,9 @@
 #include "HeapBlockDevice.h"
 #include "platform/mbed_critical.h"
 #include "platform/mbed_assert.h"
+
 #include <stdlib.h>
+#include <string.h>
 
 namespace mbed {
 
diff --git a/features/filesystem/bd/MBRBlockDevice.cpp b/features/filesystem/bd/MBRBlockDevice.cpp
index 78fa5d6fe9..2c5f32e489 100644
--- a/features/filesystem/bd/MBRBlockDevice.cpp
+++ b/features/filesystem/bd/MBRBlockDevice.cpp
@@ -17,7 +17,10 @@
 #include "MBRBlockDevice.h"
 #include "platform/mbed_critical.h"
 #include "platform/mbed_assert.h"
+
 #include <algorithm>
+#include <stdlib.h>
+#include <string.h>
 
 namespace mbed {