diff --git a/drivers/FileLike.h b/drivers/FileLike.h
index e4f323918e..f213272021 100644
--- a/drivers/FileLike.h
+++ b/drivers/FileLike.h
@@ -16,7 +16,7 @@
 #ifndef MBED_FILELIKE_H
 #define MBED_FILELIKE_H
 
-#include "platform/toolchain.h"
+#include "platform/mbed_toolchain.h"
 #include "drivers/FileBase.h"
 
 namespace mbed {
diff --git a/features/TESTS/filesystem/fat_filesystem/main.cpp b/features/TESTS/filesystem/fat_filesystem/main.cpp
index 717aa5990e..5ef12fb471 100644
--- a/features/TESTS/filesystem/fat_filesystem/main.cpp
+++ b/features/TESTS/filesystem/fat_filesystem/main.cpp
@@ -21,7 +21,7 @@
 #include "HeapBlockDevice.h"
 #include "FATFileSystem.h"
 #include <stdlib.h>
-#include "retarget.h"
+#include "mbed_retarget.h"
 
 using namespace utest::v1;
 
diff --git a/platform/mbed_retarget.cpp b/platform/mbed_retarget.cpp
index e0cdbac640..bff1d59a69 100644
--- a/platform/mbed_retarget.cpp
+++ b/platform/mbed_retarget.cpp
@@ -34,7 +34,7 @@
 #include <stdio.h>
 #endif
 #include <errno.h>
-#include "platform/retarget.h"
+#include "platform/mbed_retarget.h"
 
 
 #if defined(__ARMCC_VERSION)
diff --git a/platform/retarget.h b/platform/mbed_retarget.h
similarity index 100%
rename from platform/retarget.h
rename to platform/mbed_retarget.h
diff --git a/platform/platform.h b/platform/platform.h
index 6e2996ae32..a5802ff655 100644
--- a/platform/platform.h
+++ b/platform/platform.h
@@ -24,8 +24,8 @@
 #include <cstdio>
 #include <cstring>
 
-#include "platform/retarget.h"
-#include "platform/toolchain.h"
+#include "platform/mbed_retarget.h"
+#include "platform/mbed_toolchain.h"
 #include "device.h"
 #include "PinNames.h"
 #include "PeripheralNames.h"