diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/CordioHCIDriver.cpp b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/CordioHCIDriver.cpp
index fb91c68450..c676f4d021 100644
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/CordioHCIDriver.cpp
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/CordioHCIDriver.cpp
@@ -18,7 +18,6 @@
 #include <string.h>
 
 #include "ble/BLE.h"
-#include "ble/internal/BLEInstanceBase.h"
 #include "ble/Gap.h"
 #include "CordioHCIDriver.h"
 #include "hci_api.h"
@@ -98,7 +97,7 @@ buf_pool_desc_t CordioHCIDriver::get_default_buffer_pool_description()
 
 void CordioHCIDriver::set_random_static_address(const ble::address_t& address)
 {
-    ble_error_t err = BLEInstanceBase::deviceInstance().getGap().setRandomStaticAddress(address);
+    ble_error_t err = BLE::Instance().gap().setRandomStaticAddress(address);
     MBED_ASSERT(err == BLE_ERROR_NONE);
 }
 
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/BLEInstanceBaseImpl.h b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/BLEInstanceBaseImpl.h
index feabf71ad6..475f5e4d36 100644
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/BLEInstanceBaseImpl.h
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/BLEInstanceBaseImpl.h
@@ -21,7 +21,7 @@
 
 #include "ble/BLE.h"
 #include "ble/common/ble/blecommon.h"
-#include "ble/internal/BLEInstanceBase.h"
+#include "source/BLEInstanceBase.h"
 
 #include "CordioHCIDriver.h"
 #include "ble/GattServer.h"
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/BLEInstanceBaseImpl.cpp b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/BLEInstanceBaseImpl.cpp
index 56c703388c..d1a022a995 100644
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/BLEInstanceBaseImpl.cpp
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/BLEInstanceBaseImpl.cpp
@@ -41,7 +41,7 @@
 #include "ble/internal/PalSecurityManager.h"
 #include "ble/internal/PalGap.h"
 #include "ble/internal/PalSigningMonitor.h"
-#include "ble/internal/BLEInstanceBase.h"
+#include "source/BLEInstanceBase.h"
 #include "CordioHCIDriver.h"
 #include "source/generic/GattServerImpl.h"
 
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalAttClientImpl.cpp b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalAttClientImpl.cpp
index 8287fcf330..d7a73454e1 100644
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalAttClientImpl.cpp
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalAttClientImpl.cpp
@@ -21,7 +21,7 @@
 #include "ble/internal/PalSimpleAttServerMessage.h"
 #include "ble/internal/PalGap.h"
 #include "ble/internal/PalGattClient.h"
-#include "ble/internal/BLEInstanceBase.h"
+#include "source/BLEInstanceBase.h"
 
 #include "att_api.h"
 #include "att_defs.h"
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalEventQueueImpl.cpp b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalEventQueueImpl.cpp
index a483ff03ba..7d6b9e82bb 100644
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalEventQueueImpl.cpp
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalEventQueueImpl.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "ble/internal/PalEventQueue.h"
-#include "ble/internal/BLEInstanceBase.h"
+#include "source/BLEInstanceBase.h"
 
 namespace ble {
 
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalSigningMonitorImpl.cpp b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalSigningMonitorImpl.cpp
index e8a5cb3372..454188a2c1 100644
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalSigningMonitorImpl.cpp
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalSigningMonitorImpl.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "ble/internal/PalSigningMonitor.h"
-#include "ble/internal/BLEInstanceBase.h"
+#include "source/BLEInstanceBase.h"
 
 namespace ble {
 
diff --git a/connectivity/FEATURE_BLE/source/BLE.cpp b/connectivity/FEATURE_BLE/source/BLE.cpp
index b0fa05d63b..7f6e3525a3 100644
--- a/connectivity/FEATURE_BLE/source/BLE.cpp
+++ b/connectivity/FEATURE_BLE/source/BLE.cpp
@@ -18,7 +18,7 @@
 
 #include <stdio.h>
 #include "platform/mbed_critical.h"
-#include "ble/internal/BLEInstanceBase.h"
+#include "BLEInstanceBase.h"
 
 #if defined(TARGET_OTA_ENABLED)
 #include "services/DFUService.h"
@@ -28,7 +28,7 @@
 #include <mbed_toolchain.h>
 
 #include "ble/BLE.h"
-#include "ble/internal/BLEInstanceBase.h"
+#include "BLEInstanceBase.h"
 
 static const char *error_strings[] = {
     "BLE_ERROR_NONE: No error",
diff --git a/connectivity/FEATURE_BLE/include/ble/internal/BLEInstanceBase.h b/connectivity/FEATURE_BLE/source/BLEInstanceBase.h
similarity index 100%
rename from connectivity/FEATURE_BLE/include/ble/internal/BLEInstanceBase.h
rename to connectivity/FEATURE_BLE/source/BLEInstanceBase.h
diff --git a/connectivity/FEATURE_BLE/source/generic/GapImpl.cpp b/connectivity/FEATURE_BLE/source/generic/GapImpl.cpp
index b73deb2c9d..48127a0093 100644
--- a/connectivity/FEATURE_BLE/source/generic/GapImpl.cpp
+++ b/connectivity/FEATURE_BLE/source/generic/GapImpl.cpp
@@ -21,7 +21,7 @@
 
 #include "GapImpl.h"
 #include "ble/Gap.h"
-#include "ble/internal/BLEInstanceBase.h"
+#include "source/BLEInstanceBase.h"
 #include "ble/Gap.h"
 #include "ble/SecurityManager.h"
 #include "ble/internal/PalGap.h"
diff --git a/connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp b/connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp
index 9848cac80f..77cb9458e4 100644
--- a/connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp
+++ b/connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp
@@ -28,7 +28,7 @@
 #include "ble/common/ble/DiscoveredService.h"
 #include "ble/common/ble/DiscoveredCharacteristic.h"
 #include "ble/common/ble/blecommon.h"
-#include "ble/internal/BLEInstanceBase.h"
+#include "source/BLEInstanceBase.h"
 #include "ble/SecurityManager.h"
 #include <algorithm>
 
diff --git a/connectivity/FEATURE_BLE/source/generic/GattServerImpl.cpp b/connectivity/FEATURE_BLE/source/generic/GattServerImpl.cpp
index cc2b34273f..b6a0d95f8d 100644
--- a/connectivity/FEATURE_BLE/source/generic/GattServerImpl.cpp
+++ b/connectivity/FEATURE_BLE/source/generic/GattServerImpl.cpp
@@ -19,7 +19,7 @@
 #include "BLERoles.h"
 #include <algorithm>
 #include "GattServerImpl.h"
-#include "ble/internal/BLEInstanceBase.h"
+#include "source/BLEInstanceBase.h"
 #include "wsf_types.h"
 #include "att_api.h"
 
diff --git a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/BlueNrgMsHCIDriver.cpp b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/BlueNrgMsHCIDriver.cpp
index 8676c15fba..8890ebcbfa 100644
--- a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/BlueNrgMsHCIDriver.cpp
+++ b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/BlueNrgMsHCIDriver.cpp
@@ -27,7 +27,6 @@
 #include "platform/mbed_wait_api.h"
 
 // FEATURE_BLE/targets/TARGET_CORDIO
-#include "BLEInstanceBase.h"
 #include "CordioHCIDriver.h"
 #include "CordioHCITransportDriver.h"
 #include "hci_api.h"
diff --git a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/HCIDriver.cpp b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/HCIDriver.cpp
index 4494bcd113..f7042ca21f 100644
--- a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/HCIDriver.cpp
+++ b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/HCIDriver.cpp
@@ -16,7 +16,6 @@
  */
 
 #include <stdio.h>
-#include "BLEInstanceBase.h"
 #include "CordioHCIDriver.h"
 #include "hci_api.h"
 #include "hci_cmd.h"
diff --git a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/TARGET_PSOC6/cy_bt_cordio_cfg.cpp b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/TARGET_PSOC6/cy_bt_cordio_cfg.cpp
index 4133531f87..e6789c09a0 100644
--- a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/TARGET_PSOC6/cy_bt_cordio_cfg.cpp
+++ b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/TARGET_PSOC6/cy_bt_cordio_cfg.cpp
@@ -24,7 +24,6 @@
 *******************************************************************************/
 
 #include <stdio.h>
-#include "BLEInstanceBase.h"
 #include "CordioHCIDriver.h"
 #include "hci_api.h"
 #include "hci_cmd.h"
diff --git a/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/HCIDriver.cpp b/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/HCIDriver.cpp
index a57caa348d..b00a3bd345 100644
--- a/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/HCIDriver.cpp
+++ b/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/HCIDriver.cpp
@@ -18,7 +18,6 @@
 
 #include <stdio.h>
 #include "ble/common/ble/blecommon.h"
-#include "BLEInstanceBase.h"
 #include "CordioHCIDriver.h"
 #include "CordioHCITransportDriver.h"
 #include "mbed.h"