diff --git a/platform/ATCmdParser.cpp b/platform/ATCmdParser.cpp
index e60615141c..b6ace58865 100644
--- a/platform/ATCmdParser.cpp
+++ b/platform/ATCmdParser.cpp
@@ -39,6 +39,8 @@
 #define CR  13
 #endif
 
+namespace mbed {
+
 // getc/putc handling with timeouts
 int ATCmdParser::putc(char c)
 {
@@ -434,4 +436,5 @@ bool ATCmdParser::process_oob()
     }
 }
 
+}
 
diff --git a/platform/ATCmdParser.h b/platform/ATCmdParser.h
index c5b0e57162..eb46fc475c 100644
--- a/platform/ATCmdParser.h
+++ b/platform/ATCmdParser.h
@@ -20,9 +20,10 @@
 #ifndef MBED_ATCMDPARSER_H
 #define MBED_ATCMDPARSER_H
 
-#include "mbed.h"
 #include <cstdarg>
 #include "Callback.h"
+#include "NonCopyable.h"
+#include "FileHandle.h"
 
 namespace mbed {
 
diff --git a/platform/FileSystemHandle.cpp b/platform/FileSystemHandle.cpp
index 1823f8a43b..e0702bdb39 100644
--- a/platform/FileSystemHandle.cpp
+++ b/platform/FileSystemHandle.cpp
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "mbed.h"
 #include "FileSystemHandle.h"
 #include <errno.h>
 
+namespace mbed {
 int FileSystemHandle::open(DirHandle **dir, const char *path)
 {
     return -ENOSYS;
@@ -47,3 +47,4 @@ int FileSystemHandle::statvfs(const char *path, struct statvfs *buf)
 {
     return -ENOSYS;
 }
+}
diff --git a/platform/mbed_wait_api_rtos.cpp b/platform/mbed_wait_api_rtos.cpp
index 2e34d0f257..c44cdb0acd 100644
--- a/platform/mbed_wait_api_rtos.cpp
+++ b/platform/mbed_wait_api_rtos.cpp
@@ -20,7 +20,7 @@
 
 #include "platform/mbed_wait_api.h"
 #include "hal/us_ticker_api.h"
-#include "rtos/rtos.h"
+#include "rtos/ThisThread.h"
 #include "platform/mbed_critical.h"
 #include "platform/mbed_power_mgmt.h"