diff --git a/platform/source/SysTimer.cpp b/platform/source/SysTimer.cpp
index 8c387d5a67..7dac341a10 100644
--- a/platform/source/SysTimer.cpp
+++ b/platform/source/SysTimer.cpp
@@ -22,7 +22,7 @@
 #include "mbed_assert.h"
 #include "platform/mbed_power_mgmt.h"
 #include "platform/CriticalSectionLock.h"
-#include "platform/source/SysTimer.h"
+#include "source/SysTimer.h"
 extern "C" {
 #if MBED_CONF_RTOS_PRESENT
 #include "rtx_lib.h"
diff --git a/platform/source/mbed_error.c b/platform/source/mbed_error.c
index e596b4986c..c98ea68b04 100644
--- a/platform/source/mbed_error.c
+++ b/platform/source/mbed_error.c
@@ -22,11 +22,11 @@
 #include "platform/mbed_atomic.h"
 #include "platform/mbed_critical.h"
 #include "platform/mbed_error.h"
-#include "platform/source/mbed_error_hist.h"
 #include "platform/mbed_interface.h"
 #include "platform/mbed_power_mgmt.h"
 #include "platform/mbed_stats.h"
 #include "platform/internal/mbed_fault_handler.h"
+#include "source/mbed_error_hist.h"
 #include "drivers/MbedCRC.h"
 #include "mbed_rtx.h"
 #ifdef MBED_CONF_RTOS_PRESENT
diff --git a/platform/source/mbed_error_hist.c b/platform/source/mbed_error_hist.c
index 4a686885f7..8c3cf28817 100644
--- a/platform/source/mbed_error_hist.c
+++ b/platform/source/mbed_error_hist.c
@@ -21,7 +21,7 @@
 #include "platform/mbed_critical.h"
 
 #if MBED_CONF_PLATFORM_ERROR_HIST_ENABLED
-#include "platform/source/mbed_error_hist.h"
+#include "source/mbed_error_hist.h"
 
 static mbed_error_ctx mbed_error_ctx_log[MBED_CONF_PLATFORM_ERROR_HIST_SIZE] = {0};
 static int error_log_count = -1;
diff --git a/platform/source/mbed_os_timer.cpp b/platform/source/mbed_os_timer.cpp
index 17126eea9b..ff87cbd204 100644
--- a/platform/source/mbed_os_timer.cpp
+++ b/platform/source/mbed_os_timer.cpp
@@ -16,9 +16,9 @@
  */
 
 #include "platform/mbed_power_mgmt.h"
-#include "platform/source/mbed_os_timer.h"
 #include "platform/CriticalSectionLock.h"
-#include "platform/source/SysTimer.h"
+#include "source/SysTimer.h"
+#include "source/mbed_os_timer.h"
 #include "us_ticker_api.h"
 #include "lp_ticker_api.h"
 #include "mbed_critical.h"
diff --git a/platform/source/mbed_os_timer.h b/platform/source/mbed_os_timer.h
index 7d17f9eabd..d206742d1e 100644
--- a/platform/source/mbed_os_timer.h
+++ b/platform/source/mbed_os_timer.h
@@ -18,7 +18,7 @@
 #define MBED_MBED_SLEEP_TIMER_H
 
 #include <chrono>
-#include "platform/source/SysTimer.h"
+#include "source/SysTimer.h"
 
 #if MBED_CONF_RTOS_PRESENT
 extern "C" {
diff --git a/platform/source/mbed_thread.cpp b/platform/source/mbed_thread.cpp
index 08d2cb26bf..20cf1562a4 100644
--- a/platform/source/mbed_thread.cpp
+++ b/platform/source/mbed_thread.cpp
@@ -17,7 +17,7 @@
 
 #include "platform/mbed_thread.h"
 #include "platform/mbed_critical.h"
-#include "platform/source/mbed_os_timer.h"
+#include "source/mbed_os_timer.h"
 
 /* If the RTOS is present, we call the RTOS API to do the work */
 /* If the RTOS is not present, the RTOS API calls us to do the work */