diff --git a/connectivity/FEATURE_BLE/include/ble/driver/CordioHCIDriver.h b/connectivity/FEATURE_BLE/include/ble/driver/CordioHCIDriver.h
index 0b2ba50f79..3fd186e872 100644
--- a/connectivity/FEATURE_BLE/include/ble/driver/CordioHCIDriver.h
+++ b/connectivity/FEATURE_BLE/include/ble/driver/CordioHCIDriver.h
@@ -19,10 +19,10 @@
 
 #include <cstddef>
 #include <cstdint>
-#include <BLETypes.h>
+#include "platform/Callback.h"
+#include "ble/common/BLETypes.h"
 #include "ble/driver/CordioHCITransportDriver.h"
 #include "ble/common/blecommon.h"
-#include "mbed.h"
 
 // FIXME: make this invisible!
 #include "wsf_buf.h"
diff --git a/connectivity/FEATURE_BLE/include/ble/driver/H4TransportDriver.h b/connectivity/FEATURE_BLE/include/ble/driver/H4TransportDriver.h
index 4e89cf6104..2142667be5 100644
--- a/connectivity/FEATURE_BLE/include/ble/driver/H4TransportDriver.h
+++ b/connectivity/FEATURE_BLE/include/ble/driver/H4TransportDriver.h
@@ -20,7 +20,7 @@
 #if (DEVICE_SERIAL && DEVICE_SERIAL_FC) || defined(DOXYGEN_ONLY)
 
 #include <cstdint>
-#include "mbed.h"
+#include "drivers/UnbufferedSerial.h"
 #include "ble/driver/CordioHCITransportDriver.h"
 
 namespace ble {
@@ -69,7 +69,7 @@ private:
 
     // Use UnbufferedSerial as we don't require locking primitives.
     // We access the peripheral in interrupt context.
-    UnbufferedSerial uart;
+    mbed::UnbufferedSerial uart;
     PinName cts;
     PinName rts;
 };
diff --git a/connectivity/FEATURE_BLE/source/cordio/driver/H4TransportDriver.cpp b/connectivity/FEATURE_BLE/source/cordio/driver/H4TransportDriver.cpp
index a0bb8173af..a988a49cb3 100644
--- a/connectivity/FEATURE_BLE/source/cordio/driver/H4TransportDriver.cpp
+++ b/connectivity/FEATURE_BLE/source/cordio/driver/H4TransportDriver.cpp
@@ -27,19 +27,19 @@ void H4TransportDriver::initialize()
 {
     uart.format(
         /* bits */ 8,
-        /* parity */ SerialBase::None,
+        /* parity */ mbed::SerialBase::None,
         /* stop bit */ 1
     );
 
     uart.set_flow_control(
-        /* flow */ SerialBase::RTSCTS,
+        /* flow */ mbed::SerialBase::RTSCTS,
         /* rts */ rts,
         /* cts */ cts
     );
 
     uart.attach(
-        callback(this, &H4TransportDriver::on_controller_irq),
-        SerialBase::RxIrq
+        mbed::callback(this, &H4TransportDriver::on_controller_irq),
+        mbed::SerialBase::RxIrq
     );
 }
 
diff --git a/connectivity/FEATURE_BLE/source/cordio/source/BLEInstanceBaseImpl.cpp b/connectivity/FEATURE_BLE/source/cordio/source/BLEInstanceBaseImpl.cpp
index 0e16c674e8..c38ca24310 100644
--- a/connectivity/FEATURE_BLE/source/cordio/source/BLEInstanceBaseImpl.cpp
+++ b/connectivity/FEATURE_BLE/source/cordio/source/BLEInstanceBaseImpl.cpp
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-#include "mbed.h"
 #include "platform/CriticalSectionLock.h"
 #include "hal/us_ticker_api.h"
 #include "platform/mbed_assert.h"
@@ -309,7 +308,7 @@ const ble::SecurityManager &BLEInstanceBase::getSecurityManager() const
 
 void BLEInstanceBase::waitForEvent()
 {
-    static Timeout nextTimeout;
+    static mbed::Timeout nextTimeout;
     timestamp_t nextTimestamp;
     bool_t pTimerRunning;
 
@@ -633,8 +632,8 @@ void BLEInstanceBase::callDispatcher()
 
     wsfOsDispatcher();
 
-    static LowPowerTimeout nextTimeout;
-    CriticalSectionLock critical_section;
+    static mbed::LowPowerTimeout nextTimeout;
+    mbed::CriticalSectionLock critical_section;
 
     if (wsfOsReadyToSleep()) {
         // setup an mbed timer for the next Cordio timeout
diff --git a/connectivity/FEATURE_BLE/source/cordio/stack_adaptation/pal_mbed_os_adaptation.cpp b/connectivity/FEATURE_BLE/source/cordio/stack_adaptation/pal_mbed_os_adaptation.cpp
index 5af45aa957..3ef6aa6913 100644
--- a/connectivity/FEATURE_BLE/source/cordio/stack_adaptation/pal_mbed_os_adaptation.cpp
+++ b/connectivity/FEATURE_BLE/source/cordio/stack_adaptation/pal_mbed_os_adaptation.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include "mbed.h"
 #include "cordio_stack/platform/include/pal_types.h"
 #include "cordio_stack/platform/include/pal_uart.h"
 #include "hal/ticker_api.h"
-#include "mbed_critical.h"
+#include "platform/mbed_critical.h"
 #include "pal_codec.h"
+#include "platform/mbed_error.h"
 
 #ifdef __cplusplus
 extern "C" {