diff --git a/src/transport/common/transport.c b/src/transport/common/transport.c
index e32b5a7be..433a6a1b1 100644
--- a/src/transport/common/transport.c
+++ b/src/transport/common/transport.c
@@ -16,7 +16,7 @@
 #include <stdbool.h>
 
 #include "zenoh-pico/link/link.h"
-#include "zenoh-pico/system/platform_common.h"
+#include "zenoh-pico/system/common/platform.h"
 #include "zenoh-pico/utils/result.h"
 
 void _z_common_transport_clear(_z_transport_common_t *ztc, bool detach_tasks) {
diff --git a/src/transport/unicast/lease.c b/src/transport/unicast/lease.c
index 3b0fab6b1..680099607 100644
--- a/src/transport/unicast/lease.c
+++ b/src/transport/unicast/lease.c
@@ -12,12 +12,11 @@
 //   ZettaScale Zenoh Team, <zenoh@zettascale.tech>
 //
 
-#include "zenoh-pico/transport/unicast/lease.h"
-
 #include "zenoh-pico/session/query.h"
-#include "zenoh-pico/system/platform_common.h"
+#include "zenoh-pico/system/common/platform.h"
 #include "zenoh-pico/transport/common/tx.h"
 #include "zenoh-pico/transport/transport.h"
+#include "zenoh-pico/transport/unicast/lease.h"
 #include "zenoh-pico/transport/unicast/transport.h"
 #include "zenoh-pico/utils/logging.h"
 
diff --git a/src/transport/unicast/transport.c b/src/transport/unicast/transport.c
index d3fe24ca3..8dc7a2e4d 100644
--- a/src/transport/unicast/transport.c
+++ b/src/transport/unicast/transport.c
@@ -11,8 +11,6 @@
 // Contributors:
 //   ZettaScale Zenoh Team, <zenoh@zettascale.tech>
 
-#include "zenoh-pico/transport/common/transport.h"
-
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -20,8 +18,9 @@
 #include <string.h>
 
 #include "zenoh-pico/link/link.h"
-#include "zenoh-pico/system/platform_common.h"
+#include "zenoh-pico/system/common/platform.h"
 #include "zenoh-pico/transport/common/rx.h"
+#include "zenoh-pico/transport/common/transport.h"
 #include "zenoh-pico/transport/common/tx.h"
 #include "zenoh-pico/transport/unicast/transport.h"
 #include "zenoh-pico/transport/utils.h"