diff --git a/connectivity/FEATURE_BLE/include/ble/BLE.h b/connectivity/FEATURE_BLE/include/ble/BLE.h
index 6bb7eddbcd..03dfe282b9 100644
--- a/connectivity/FEATURE_BLE/include/ble/BLE.h
+++ b/connectivity/FEATURE_BLE/include/ble/BLE.h
@@ -24,9 +24,9 @@
 #include "platform/mbed_assert.h"
 #include "platform/mbed_toolchain.h"
 
-#include "ble/types/BLERoles.h"
-#include "ble/types/BLETypes.h"
-#include "ble/types/blecommon.h"
+#include "ble/common/ble/BLERoles.h"
+#include "ble/common/ble/BLETypes.h"
+#include "ble/common/ble/blecommon.h"
 
 #include "ble/Gap.h"
 #include "ble/GattClient.h"
diff --git a/connectivity/FEATURE_BLE/include/ble/Gap.h b/connectivity/FEATURE_BLE/include/ble/Gap.h
index 52530bcbe0..2ef43eb3ef 100644
--- a/connectivity/FEATURE_BLE/include/ble/Gap.h
+++ b/connectivity/FEATURE_BLE/include/ble/Gap.h
@@ -27,17 +27,17 @@
 #include "drivers/LowPowerTicker.h"
 #include "platform/mbed_error.h"
 
-#include "ble/types/BLERoles.h"
-#include "ble/types/BLETypes.h"
-#include "ble/types/gap/AdvertisingDataBuilder.h"
-#include "ble/types/gap/AdvertisingDataParser.h"
-#include "ble/types/gap/AdvertisingDataSimpleBuilder.h"
-#include "ble/types/gap/AdvertisingDataTypes.h"
-#include "ble/types/gap/AdvertisingParameters.h"
-#include "ble/types/gap/ConnectionParameters.h"
-#include "ble/types/gap/Events.h"
-#include "ble/types/gap/ScanParameters.h"
-#include "ble/types/gap/Types.h"
+#include "ble/common/ble/BLERoles.h"
+#include "ble/common/ble/BLETypes.h"
+#include "ble/common/ble/gap/AdvertisingDataBuilder.h"
+#include "ble/common/ble/gap/AdvertisingDataParser.h"
+#include "ble/common/ble/gap/AdvertisingDataSimpleBuilder.h"
+#include "ble/common/ble/gap/AdvertisingDataTypes.h"
+#include "ble/common/ble/gap/AdvertisingParameters.h"
+#include "ble/common/ble/gap/ConnectionParameters.h"
+#include "ble/common/ble/gap/Events.h"
+#include "ble/common/ble/gap/ScanParameters.h"
+#include "ble/common/ble/gap/Types.h"
 
 namespace ble {
 class PalGenericAccessService;
diff --git a/connectivity/FEATURE_BLE/include/ble/GattClient.h b/connectivity/FEATURE_BLE/include/ble/GattClient.h
index 7f3fbeb1bf..37d7f1e88e 100644
--- a/connectivity/FEATURE_BLE/include/ble/GattClient.h
+++ b/connectivity/FEATURE_BLE/include/ble/GattClient.h
@@ -24,13 +24,13 @@
 #include "CallChainOfFunctionPointersWithContext.h"
 #include <algorithm>
 
-#include "ble/types/blecommon.h"
-#include "ble/types/GattAttribute.h"
-#include "ble/types/ServiceDiscovery.h"
-#include "ble/types/CharacteristicDescriptorDiscovery.h"
-#include "ble/types/GattCallbackParamTypes.h"
-#include "ble/types/DiscoveredService.h"
-#include "ble/types/DiscoveredCharacteristic.h"
+#include "ble/common/ble/blecommon.h"
+#include "ble/common/ble/GattAttribute.h"
+#include "ble/common/ble/ServiceDiscovery.h"
+#include "ble/common/ble/CharacteristicDescriptorDiscovery.h"
+#include "ble/common/ble/GattCallbackParamTypes.h"
+#include "ble/common/ble/DiscoveredService.h"
+#include "ble/common/ble/DiscoveredCharacteristic.h"
 
 namespace ble {
 
diff --git a/connectivity/FEATURE_BLE/include/ble/GattServer.h b/connectivity/FEATURE_BLE/include/ble/GattServer.h
index 1ed51aca01..e89d29412c 100644
--- a/connectivity/FEATURE_BLE/include/ble/GattServer.h
+++ b/connectivity/FEATURE_BLE/include/ble/GattServer.h
@@ -22,12 +22,12 @@
 
 #include "CallChainOfFunctionPointersWithContext.h"
 
-#include "ble/types/GattService.h"
-#include "ble/types/GattAttribute.h"
-#include "ble/types/GattServerEvents.h"
-#include "ble/types/GattCallbackParamTypes.h"
+#include "ble/common/ble/GattService.h"
+#include "ble/common/ble/GattAttribute.h"
+#include "ble/common/ble/GattServerEvents.h"
+#include "ble/common/ble/GattCallbackParamTypes.h"
 
-#include "ble/types/blecommon.h"
+#include "ble/common/ble/blecommon.h"
 #include "ble/Gap.h"
 #include "SecurityManager.h"
 
diff --git a/connectivity/FEATURE_BLE/include/ble/SecurityManager.h b/connectivity/FEATURE_BLE/include/ble/SecurityManager.h
index be42c5d982..b0e81e4d6e 100644
--- a/connectivity/FEATURE_BLE/include/ble/SecurityManager.h
+++ b/connectivity/FEATURE_BLE/include/ble/SecurityManager.h
@@ -23,10 +23,10 @@
 #include "CallChainOfFunctionPointersWithContext.h"
 #include "platform/Callback.h"
 
-#include "ble/types/BLETypes.h"
-#include "ble/types/blecommon.h"
+#include "ble/common/ble/BLETypes.h"
+#include "ble/common/ble/blecommon.h"
 
-#include "ble/types/BLETypes.h"
+#include "ble/common/ble/BLETypes.h"
 #include "ble/internal/SecurityDb.h"
 #include "ble/internal/PalConnectionMonitor.h"
 #include "ble/internal/PalSecurityManager.h"
diff --git a/connectivity/FEATURE_BLE/include/ble/types/BLERoles.h b/connectivity/FEATURE_BLE/include/ble/common/ble/BLERoles.h
similarity index 100%
rename from connectivity/FEATURE_BLE/include/ble/types/BLERoles.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/BLERoles.h
diff --git a/connectivity/FEATURE_BLE/include/ble/types/BLETypes.h b/connectivity/FEATURE_BLE/include/ble/common/ble/BLETypes.h
similarity index 99%
rename from connectivity/FEATURE_BLE/include/ble/types/BLETypes.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/BLETypes.h
index 2b2b8663d3..a5035d318d 100644
--- a/connectivity/FEATURE_BLE/include/ble/types/BLETypes.h
+++ b/connectivity/FEATURE_BLE/include/ble/common/ble/BLETypes.h
@@ -25,7 +25,7 @@
 #include "SafeEnum.h"
 #include "platform/Span.h"
 
-#include "ble/types/gap/Types.h"
+#include "ble/common/ble/gap/Types.h"
 
 /**
  * @addtogroup ble
diff --git a/connectivity/FEATURE_BLE/include/ble/types/Bounded.h b/connectivity/FEATURE_BLE/include/ble/common/ble/Bounded.h
similarity index 100%
rename from connectivity/FEATURE_BLE/include/ble/types/Bounded.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/Bounded.h
diff --git a/connectivity/FEATURE_BLE/include/ble/types/CharacteristicDescriptorDiscovery.h b/connectivity/FEATURE_BLE/include/ble/common/ble/CharacteristicDescriptorDiscovery.h
similarity index 100%
rename from connectivity/FEATURE_BLE/include/ble/types/CharacteristicDescriptorDiscovery.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/CharacteristicDescriptorDiscovery.h
diff --git a/connectivity/FEATURE_BLE/include/ble/types/DiscoveredCharacteristic.h b/connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredCharacteristic.h
similarity index 98%
rename from connectivity/FEATURE_BLE/include/ble/types/DiscoveredCharacteristic.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredCharacteristic.h
index 064bfa411d..7439ad3679 100644
--- a/connectivity/FEATURE_BLE/include/ble/types/DiscoveredCharacteristic.h
+++ b/connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredCharacteristic.h
@@ -19,11 +19,11 @@
 #ifndef MBED_DISCOVERED_CHARACTERISTIC_H__
 #define MBED_DISCOVERED_CHARACTERISTIC_H__
 
-#include "ble/types/UUID.h"
-#include "ble/types/GattAttribute.h"
-#include "ble/types/GattCallbackParamTypes.h"
-#include "ble/types/CharacteristicDescriptorDiscovery.h"
-#include "ble/types/DiscoveredCharacteristicDescriptor.h"
+#include "ble/common/ble/UUID.h"
+#include "ble/common/ble/GattAttribute.h"
+#include "ble/common/ble/GattCallbackParamTypes.h"
+#include "ble/common/ble/CharacteristicDescriptorDiscovery.h"
+#include "ble/common/ble/DiscoveredCharacteristicDescriptor.h"
 
 namespace ble {
 class GattClient;
diff --git a/connectivity/FEATURE_BLE/include/ble/types/DiscoveredCharacteristicDescriptor.h b/connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredCharacteristicDescriptor.h
similarity index 96%
rename from connectivity/FEATURE_BLE/include/ble/types/DiscoveredCharacteristicDescriptor.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredCharacteristicDescriptor.h
index 2cb586a819..5c7ac0786d 100644
--- a/connectivity/FEATURE_BLE/include/ble/types/DiscoveredCharacteristicDescriptor.h
+++ b/connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredCharacteristicDescriptor.h
@@ -19,10 +19,10 @@
 #ifndef MBED_DISCOVERED_CHARACTERISTIC_DESCRIPTOR_H__
 #define MBED_DISCOVERED_CHARACTERISTIC_DESCRIPTOR_H__
 
-#include "ble/types/UUID.h"
+#include "ble/common/ble/UUID.h"
 #include "ble/Gap.h"
-#include "ble/types/GattAttribute.h"
-#include "ble/types/CharacteristicDescriptorDiscovery.h"
+#include "ble/common/ble/GattAttribute.h"
+#include "ble/common/ble/CharacteristicDescriptorDiscovery.h"
 
 namespace ble {
 class GattClient;
diff --git a/connectivity/FEATURE_BLE/include/ble/types/DiscoveredService.h b/connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredService.h
similarity index 98%
rename from connectivity/FEATURE_BLE/include/ble/types/DiscoveredService.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredService.h
index d837a13f2b..baead1fb6c 100644
--- a/connectivity/FEATURE_BLE/include/ble/types/DiscoveredService.h
+++ b/connectivity/FEATURE_BLE/include/ble/common/ble/DiscoveredService.h
@@ -19,8 +19,8 @@
 #ifndef MBED_DISCOVERED_SERVICE_H__
 #define MBED_DISCOVERED_SERVICE_H__
 
-#include "ble/types/UUID.h"
-#include "ble/types/GattAttribute.h"
+#include "ble/common/ble/UUID.h"
+#include "ble/common/ble/GattAttribute.h"
 
 /**
  * @addtogroup ble
diff --git a/connectivity/FEATURE_BLE/include/ble/types/Duration.h b/connectivity/FEATURE_BLE/include/ble/common/ble/Duration.h
similarity index 100%
rename from connectivity/FEATURE_BLE/include/ble/types/Duration.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/Duration.h
diff --git a/connectivity/FEATURE_BLE/include/ble/internal/GapEvents.h b/connectivity/FEATURE_BLE/include/ble/common/ble/GapEvents.h
similarity index 99%
rename from connectivity/FEATURE_BLE/include/ble/internal/GapEvents.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/GapEvents.h
index 3453261bf1..0b9cca27a7 100644
--- a/connectivity/FEATURE_BLE/include/ble/internal/GapEvents.h
+++ b/connectivity/FEATURE_BLE/include/ble/common/ble/GapEvents.h
@@ -19,8 +19,8 @@
 #ifndef BLE_PAL_GAP_MESSAGE_H_
 #define BLE_PAL_GAP_MESSAGE_H_
 
-#include "ble/internal/GapTypes.h"
-#include "ble/types/BLETypes.h"
+#include "ble/common/ble/GapTypes.h"
+#include "ble/common/ble/BLETypes.h"
 
 namespace ble {
 
diff --git a/connectivity/FEATURE_BLE/include/ble/internal/GapTypes.h b/connectivity/FEATURE_BLE/include/ble/common/ble/GapTypes.h
similarity index 99%
rename from connectivity/FEATURE_BLE/include/ble/internal/GapTypes.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/GapTypes.h
index 5f7309adad..ae0d66514d 100644
--- a/connectivity/FEATURE_BLE/include/ble/internal/GapTypes.h
+++ b/connectivity/FEATURE_BLE/include/ble/common/ble/GapTypes.h
@@ -21,8 +21,8 @@
 
 #include <algorithm>
 
-#include "ble/types/BLETypes.h"
-#include "ble/types/SafeEnum.h"
+#include "ble/common/ble/BLETypes.h"
+#include "ble/common/ble/SafeEnum.h"
 
 namespace ble {
 
diff --git a/connectivity/FEATURE_BLE/include/ble/types/GattAttribute.h b/connectivity/FEATURE_BLE/include/ble/common/ble/GattAttribute.h
similarity index 99%
rename from connectivity/FEATURE_BLE/include/ble/types/GattAttribute.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/GattAttribute.h
index 5111d81867..6988981ac9 100644
--- a/connectivity/FEATURE_BLE/include/ble/types/GattAttribute.h
+++ b/connectivity/FEATURE_BLE/include/ble/common/ble/GattAttribute.h
@@ -19,8 +19,8 @@
 #ifndef MBED_GATT_ATTRIBUTE_H__
 #define MBED_GATT_ATTRIBUTE_H__
 
-#include "ble/types/UUID.h"
-#include "ble/types/BLETypes.h"
+#include "ble/common/ble/UUID.h"
+#include "ble/common/ble/BLETypes.h"
 
 /**
  * @addtogroup ble
diff --git a/connectivity/FEATURE_BLE/include/ble/types/GattCallbackParamTypes.h b/connectivity/FEATURE_BLE/include/ble/common/ble/GattCallbackParamTypes.h
similarity index 100%
rename from connectivity/FEATURE_BLE/include/ble/types/GattCallbackParamTypes.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/GattCallbackParamTypes.h
diff --git a/connectivity/FEATURE_BLE/include/ble/types/GattCharacteristic.h b/connectivity/FEATURE_BLE/include/ble/common/ble/GattCharacteristic.h
similarity index 99%
rename from connectivity/FEATURE_BLE/include/ble/types/GattCharacteristic.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/GattCharacteristic.h
index 5d87cf62d7..9ec36729f6 100644
--- a/connectivity/FEATURE_BLE/include/ble/types/GattCharacteristic.h
+++ b/connectivity/FEATURE_BLE/include/ble/common/ble/GattCharacteristic.h
@@ -21,8 +21,8 @@
 
 #include "FunctionPointerWithContext.h"
 
-#include "ble/types/GattAttribute.h"
-#include "ble/types/GattCallbackParamTypes.h"
+#include "ble/common/ble/GattAttribute.h"
+#include "ble/common/ble/GattCallbackParamTypes.h"
 
 /**
  * @addtogroup ble
diff --git a/connectivity/FEATURE_BLE/include/ble/types/GattServerEvents.h b/connectivity/FEATURE_BLE/include/ble/common/ble/GattServerEvents.h
similarity index 100%
rename from connectivity/FEATURE_BLE/include/ble/types/GattServerEvents.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/GattServerEvents.h
diff --git a/connectivity/FEATURE_BLE/include/ble/types/GattService.h b/connectivity/FEATURE_BLE/include/ble/common/ble/GattService.h
similarity index 98%
rename from connectivity/FEATURE_BLE/include/ble/types/GattService.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/GattService.h
index 3497c50a18..a5a72c2528 100644
--- a/connectivity/FEATURE_BLE/include/ble/types/GattService.h
+++ b/connectivity/FEATURE_BLE/include/ble/common/ble/GattService.h
@@ -19,8 +19,8 @@
 #ifndef MBED_GATT_SERVICE_H__
 #define MBED_GATT_SERVICE_H__
 
-#include "ble/types/UUID.h"
-#include "ble/types/GattCharacteristic.h"
+#include "ble/common/ble/UUID.h"
+#include "ble/common/ble/GattCharacteristic.h"
 
 /**
  * @addtogroup ble
diff --git a/connectivity/FEATURE_BLE/include/ble/types/SafeBool.h b/connectivity/FEATURE_BLE/include/ble/common/ble/SafeBool.h
similarity index 100%
rename from connectivity/FEATURE_BLE/include/ble/types/SafeBool.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/SafeBool.h
diff --git a/connectivity/FEATURE_BLE/include/ble/types/SafeEnum.h b/connectivity/FEATURE_BLE/include/ble/common/ble/SafeEnum.h
similarity index 100%
rename from connectivity/FEATURE_BLE/include/ble/types/SafeEnum.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/SafeEnum.h
diff --git a/connectivity/FEATURE_BLE/include/ble/types/ServiceDiscovery.h b/connectivity/FEATURE_BLE/include/ble/common/ble/ServiceDiscovery.h
similarity index 98%
rename from connectivity/FEATURE_BLE/include/ble/types/ServiceDiscovery.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/ServiceDiscovery.h
index 0acc7e7fe8..9e203e2af0 100644
--- a/connectivity/FEATURE_BLE/include/ble/types/ServiceDiscovery.h
+++ b/connectivity/FEATURE_BLE/include/ble/common/ble/ServiceDiscovery.h
@@ -19,9 +19,9 @@
 #ifndef MBED_BLE_SERVICE_DISOVERY_H__
 #define MBED_BLE_SERVICE_DISOVERY_H__
 
-#include "ble/types/blecommon.h"
-#include "ble/types/UUID.h"
-#include "ble/types/GattAttribute.h"
+#include "ble/common/ble/blecommon.h"
+#include "ble/common/ble/UUID.h"
+#include "ble/common/ble/GattAttribute.h"
 
 class DiscoveredService;
 class DiscoveredCharacteristic;
diff --git a/connectivity/FEATURE_BLE/include/ble/types/UUID.h b/connectivity/FEATURE_BLE/include/ble/common/ble/UUID.h
similarity index 99%
rename from connectivity/FEATURE_BLE/include/ble/types/UUID.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/UUID.h
index c8c38c5bb3..7d560a5e8e 100644
--- a/connectivity/FEATURE_BLE/include/ble/types/UUID.h
+++ b/connectivity/FEATURE_BLE/include/ble/common/ble/UUID.h
@@ -24,7 +24,7 @@
 #include <string.h>
 #include <algorithm>
 
-#include "ble/types/blecommon.h"
+#include "ble/common/ble/blecommon.h"
 
 /**
  * @file
diff --git a/connectivity/FEATURE_BLE/include/ble/types/blecommon.h b/connectivity/FEATURE_BLE/include/ble/common/ble/blecommon.h
similarity index 100%
rename from connectivity/FEATURE_BLE/include/ble/types/blecommon.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/blecommon.h
diff --git a/connectivity/FEATURE_BLE/include/ble/types/gap/AdvertisingDataBuilder.h b/connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataBuilder.h
similarity index 98%
rename from connectivity/FEATURE_BLE/include/ble/types/gap/AdvertisingDataBuilder.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataBuilder.h
index 8cb7e75d4b..4e2f91ba89 100644
--- a/connectivity/FEATURE_BLE/include/ble/types/gap/AdvertisingDataBuilder.h
+++ b/connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataBuilder.h
@@ -24,11 +24,11 @@
 #include <stdlib.h>
 #include "platform/NonCopyable.h"
 
-#include "ble/types/UUID.h"
-#include "ble/types/BLETypes.h"
-#include "ble/types/blecommon.h"
-#include "ble/types/gap/AdvertisingDataTypes.h"
-#include "ble/types/gap/Types.h"
+#include "ble/common/ble/UUID.h"
+#include "ble/common/ble/BLETypes.h"
+#include "ble/common/ble/blecommon.h"
+#include "ble/common/ble/gap/AdvertisingDataTypes.h"
+#include "ble/common/ble/gap/Types.h"
 
 namespace ble {
 
diff --git a/connectivity/FEATURE_BLE/include/ble/types/gap/AdvertisingDataParser.h b/connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataParser.h
similarity index 97%
rename from connectivity/FEATURE_BLE/include/ble/types/gap/AdvertisingDataParser.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataParser.h
index 320bd09f95..dc7a18286e 100644
--- a/connectivity/FEATURE_BLE/include/ble/types/gap/AdvertisingDataParser.h
+++ b/connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataParser.h
@@ -22,7 +22,7 @@
 #include <stdint.h>
 #include "platform/Span.h"
 
-#include "ble/types/gap/AdvertisingDataTypes.h"
+#include "ble/common/ble/gap/AdvertisingDataTypes.h"
 
 namespace ble {
 
@@ -73,7 +73,7 @@ public:
         if (position >= data.size()) {
             return false;
         }
-        
+
         /* early termination of packet, no more meaningful octets */
         if (current_length() == 0) {
             return false;
diff --git a/connectivity/FEATURE_BLE/include/ble/types/gap/AdvertisingDataSimpleBuilder.h b/connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataSimpleBuilder.h
similarity index 99%
rename from connectivity/FEATURE_BLE/include/ble/types/gap/AdvertisingDataSimpleBuilder.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataSimpleBuilder.h
index eb07e84c50..bc7c69d09b 100644
--- a/connectivity/FEATURE_BLE/include/ble/types/gap/AdvertisingDataSimpleBuilder.h
+++ b/connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataSimpleBuilder.h
@@ -21,8 +21,8 @@
 
 #include "platform/Span.h"
 
-#include "ble/types/UUID.h"
-#include "ble/types/gap/AdvertisingDataBuilder.h"
+#include "ble/common/ble/UUID.h"
+#include "ble/common/ble/gap/AdvertisingDataBuilder.h"
 
 namespace ble {
 
diff --git a/connectivity/FEATURE_BLE/include/ble/types/gap/AdvertisingDataTypes.h b/connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataTypes.h
similarity index 99%
rename from connectivity/FEATURE_BLE/include/ble/types/gap/AdvertisingDataTypes.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataTypes.h
index d9ac572a40..701c1285b6 100644
--- a/connectivity/FEATURE_BLE/include/ble/types/gap/AdvertisingDataTypes.h
+++ b/connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingDataTypes.h
@@ -19,7 +19,7 @@
 #ifndef BLE_GAP_ADVERTISINGDATATYPES_H
 #define BLE_GAP_ADVERTISINGDATATYPES_H
 
-#include "ble/types/SafeEnum.h"
+#include "ble/common/ble/SafeEnum.h"
 
 namespace ble {
 
diff --git a/connectivity/FEATURE_BLE/include/ble/types/gap/AdvertisingParameters.h b/connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingParameters.h
similarity index 99%
rename from connectivity/FEATURE_BLE/include/ble/types/gap/AdvertisingParameters.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingParameters.h
index 25c9ad91c4..2bda38a494 100644
--- a/connectivity/FEATURE_BLE/include/ble/types/gap/AdvertisingParameters.h
+++ b/connectivity/FEATURE_BLE/include/ble/common/ble/gap/AdvertisingParameters.h
@@ -21,9 +21,9 @@
 
 #include <algorithm>
 
-#include "ble/types/BLETypes.h"
-#include "ble/types/blecommon.h"
-#include "ble/types/SafeEnum.h"
+#include "ble/common/ble/BLETypes.h"
+#include "ble/common/ble/blecommon.h"
+#include "ble/common/ble/SafeEnum.h"
 
 namespace ble {
 
diff --git a/connectivity/FEATURE_BLE/include/ble/types/gap/ConnectionParameters.h b/connectivity/FEATURE_BLE/include/ble/common/ble/gap/ConnectionParameters.h
similarity index 99%
rename from connectivity/FEATURE_BLE/include/ble/types/gap/ConnectionParameters.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/gap/ConnectionParameters.h
index 22776f497b..dfdc33c72a 100644
--- a/connectivity/FEATURE_BLE/include/ble/types/gap/ConnectionParameters.h
+++ b/connectivity/FEATURE_BLE/include/ble/common/ble/gap/ConnectionParameters.h
@@ -21,7 +21,7 @@
 
 #include "mbed_assert.h"
 
-#include "ble/types/BLETypes.h"
+#include "ble/common/ble/BLETypes.h"
 
 namespace ble {
 
diff --git a/connectivity/FEATURE_BLE/include/ble/types/gap/Events.h b/connectivity/FEATURE_BLE/include/ble/common/ble/gap/Events.h
similarity index 99%
rename from connectivity/FEATURE_BLE/include/ble/types/gap/Events.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/gap/Events.h
index 56bb213c9a..454748eea9 100644
--- a/connectivity/FEATURE_BLE/include/ble/types/gap/Events.h
+++ b/connectivity/FEATURE_BLE/include/ble/common/ble/gap/Events.h
@@ -19,8 +19,8 @@
 #ifndef BLE_GAP_EVENTS_H
 #define BLE_GAP_EVENTS_H
 
-#include "ble/types/blecommon.h"
-#include "ble/types/BLETypes.h"
+#include "ble/common/ble/blecommon.h"
+#include "ble/common/ble/BLETypes.h"
 
 namespace ble {
 
diff --git a/connectivity/FEATURE_BLE/include/ble/gap/Gap.h b/connectivity/FEATURE_BLE/include/ble/common/ble/gap/Gap.h
similarity index 100%
rename from connectivity/FEATURE_BLE/include/ble/gap/Gap.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/gap/Gap.h
diff --git a/connectivity/FEATURE_BLE/include/ble/types/gap/ScanParameters.h b/connectivity/FEATURE_BLE/include/ble/common/ble/gap/ScanParameters.h
similarity index 99%
rename from connectivity/FEATURE_BLE/include/ble/types/gap/ScanParameters.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/gap/ScanParameters.h
index 544d6c084a..b4eead0a34 100644
--- a/connectivity/FEATURE_BLE/include/ble/types/gap/ScanParameters.h
+++ b/connectivity/FEATURE_BLE/include/ble/common/ble/gap/ScanParameters.h
@@ -21,8 +21,8 @@
 
 #include <stdint.h>
 
-#include "ble/types/blecommon.h"
-#include "ble/types/BLETypes.h"
+#include "ble/common/ble/blecommon.h"
+#include "ble/common/ble/BLETypes.h"
 
 namespace ble {
 
diff --git a/connectivity/FEATURE_BLE/include/ble/types/gap/Types.h b/connectivity/FEATURE_BLE/include/ble/common/ble/gap/Types.h
similarity index 99%
rename from connectivity/FEATURE_BLE/include/ble/types/gap/Types.h
rename to connectivity/FEATURE_BLE/include/ble/common/ble/gap/Types.h
index fe177f9a68..45f47eb819 100644
--- a/connectivity/FEATURE_BLE/include/ble/types/gap/Types.h
+++ b/connectivity/FEATURE_BLE/include/ble/common/ble/gap/Types.h
@@ -19,9 +19,9 @@
 #ifndef BLE_GAP_TYPES_H
 #define BLE_GAP_TYPES_H
 
-#include "ble/types/Duration.h"
-#include "ble/types/Bounded.h"
-#include "ble/types/SafeEnum.h"
+#include "ble/common/ble/Duration.h"
+#include "ble/common/ble/Bounded.h"
+#include "ble/common/ble/SafeEnum.h"
 
 namespace ble {
 
diff --git a/connectivity/FEATURE_BLE/include/ble/internal/AttServerMessage.h b/connectivity/FEATURE_BLE/include/ble/internal/AttServerMessage.h
index 8ee379e7e5..a60fe28b0d 100644
--- a/connectivity/FEATURE_BLE/include/ble/internal/AttServerMessage.h
+++ b/connectivity/FEATURE_BLE/include/ble/internal/AttServerMessage.h
@@ -19,8 +19,8 @@
 #ifndef BLE_PAL_ATT_SERVER_MESSAGE_H_
 #define BLE_PAL_ATT_SERVER_MESSAGE_H_
 
-#include "ble/types/BLETypes.h"
-#include "ble/types/UUID.h"
+#include "ble/common/ble/BLETypes.h"
+#include "ble/common/ble/UUID.h"
 
 namespace ble {
 
diff --git a/connectivity/FEATURE_BLE/include/ble/internal/PalAttClient.h b/connectivity/FEATURE_BLE/include/ble/internal/PalAttClient.h
index e3b8d72d3d..946bbb8049 100644
--- a/connectivity/FEATURE_BLE/include/ble/internal/PalAttClient.h
+++ b/connectivity/FEATURE_BLE/include/ble/internal/PalAttClient.h
@@ -21,9 +21,9 @@
 
 #include "platform/Callback.h"
 
-#include "ble/types/UUID.h"
-#include "ble/types/BLETypes.h"
-#include "ble/types/blecommon.h"
+#include "ble/common/ble/UUID.h"
+#include "ble/common/ble/BLETypes.h"
+#include "ble/common/ble/blecommon.h"
 #include "ble/internal/AttServerMessage.h"
 
 namespace ble {
diff --git a/connectivity/FEATURE_BLE/include/ble/internal/PalConnectionMonitor.h b/connectivity/FEATURE_BLE/include/ble/internal/PalConnectionMonitor.h
index 9c5d887089..37644a386d 100644
--- a/connectivity/FEATURE_BLE/include/ble/internal/PalConnectionMonitor.h
+++ b/connectivity/FEATURE_BLE/include/ble/internal/PalConnectionMonitor.h
@@ -20,7 +20,7 @@
 #define MBED_BLE_CONNECTION_EVENT_MONITOR
 
 #include "ble/Gap.h"
-#include "ble/types/BLETypes.h"
+#include "ble/common/ble/BLETypes.h"
 
 namespace ble {
 
diff --git a/connectivity/FEATURE_BLE/include/ble/internal/PalGap.h b/connectivity/FEATURE_BLE/include/ble/internal/PalGap.h
index 846267fd89..c602bb8bcb 100644
--- a/connectivity/FEATURE_BLE/include/ble/internal/PalGap.h
+++ b/connectivity/FEATURE_BLE/include/ble/internal/PalGap.h
@@ -21,9 +21,9 @@
 
 #include "platform/Callback.h"
 
-#include "ble/internal/GapTypes.h"
-#include "ble/internal/GapEvents.h"
-#include "ble/types/blecommon.h"
+#include "ble/common/ble/GapTypes.h"
+#include "ble/common/ble/GapEvents.h"
+#include "ble/common/ble/blecommon.h"
 
 #include "dm_api.h"
 
diff --git a/connectivity/FEATURE_BLE/include/ble/internal/PalGattClient.h b/connectivity/FEATURE_BLE/include/ble/internal/PalGattClient.h
index 79e9f3da8b..5f8ee934ad 100644
--- a/connectivity/FEATURE_BLE/include/ble/internal/PalGattClient.h
+++ b/connectivity/FEATURE_BLE/include/ble/internal/PalGattClient.h
@@ -21,9 +21,9 @@
 
 #include "platform/Callback.h"
 
-#include "ble/types/UUID.h"
-#include "ble/types/BLETypes.h"
-#include "ble/types/blecommon.h"
+#include "ble/common/ble/UUID.h"
+#include "ble/common/ble/BLETypes.h"
+#include "ble/common/ble/blecommon.h"
 #include "ble/internal/AttServerMessage.h"
 
 namespace ble {
diff --git a/connectivity/FEATURE_BLE/include/ble/internal/PalGenericAccessService.h b/connectivity/FEATURE_BLE/include/ble/internal/PalGenericAccessService.h
index 416b39ad23..edc44dea19 100644
--- a/connectivity/FEATURE_BLE/include/ble/internal/PalGenericAccessService.h
+++ b/connectivity/FEATURE_BLE/include/ble/internal/PalGenericAccessService.h
@@ -19,9 +19,9 @@
 #ifndef BLE_PAL_GENERIC_ACCESS_SERVICE_H_
 #define BLE_PAL_GENERIC_ACCESS_SERVICE_H_
 
-#include "ble/internal/GapTypes.h"
-#include "ble/types/BLETypes.h"
-#include "ble/types/blecommon.h"
+#include "ble/common/ble/GapTypes.h"
+#include "ble/common/ble/BLETypes.h"
+#include "ble/common/ble/blecommon.h"
 #include "ble/Gap.h"
 
 namespace ble {
diff --git a/connectivity/FEATURE_BLE/include/ble/internal/PalSecurityManager.h b/connectivity/FEATURE_BLE/include/ble/internal/PalSecurityManager.h
index 48ba87227d..26fac4bce9 100644
--- a/connectivity/FEATURE_BLE/include/ble/internal/PalSecurityManager.h
+++ b/connectivity/FEATURE_BLE/include/ble/internal/PalSecurityManager.h
@@ -22,8 +22,8 @@
 #include "platform/Callback.h"
 #include "platform/NonCopyable.h"
 
-#include "ble/types/BLETypes.h"
-#include "ble/internal/GapTypes.h"
+#include "ble/common/ble/BLETypes.h"
+#include "ble/common/ble/GapTypes.h"
 
 #include "wsf_types.h"
 #include "wsf_os.h"
diff --git a/connectivity/FEATURE_BLE/include/ble/internal/PalSigningMonitor.h b/connectivity/FEATURE_BLE/include/ble/internal/PalSigningMonitor.h
index b337994e4d..a851b06693 100644
--- a/connectivity/FEATURE_BLE/include/ble/internal/PalSigningMonitor.h
+++ b/connectivity/FEATURE_BLE/include/ble/internal/PalSigningMonitor.h
@@ -19,7 +19,7 @@
 #ifndef MBED_BLE_SIGNING_EVENT_MONITOR
 #define MBED_BLE_SIGNING_EVENT_MONITOR
 
-#include "ble/types/BLETypes.h"
+#include "ble/common/ble/BLETypes.h"
 
 namespace ble {
 
diff --git a/connectivity/FEATURE_BLE/include/ble/internal/SecurityDb.h b/connectivity/FEATURE_BLE/include/ble/internal/SecurityDb.h
index 93005a87fc..cd20c07cec 100644
--- a/connectivity/FEATURE_BLE/include/ble/internal/SecurityDb.h
+++ b/connectivity/FEATURE_BLE/include/ble/internal/SecurityDb.h
@@ -22,8 +22,8 @@
 #include <stdlib.h>
 #include "platform/Callback.h"
 
-#include "ble/internal/GapTypes.h"
-#include "ble/types/BLETypes.h"
+#include "ble/common/ble/GapTypes.h"
+#include "ble/common/ble/BLETypes.h"
 #include "ble/Gap.h"
 
 namespace ble {
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/CordioHCIDriver.h b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/CordioHCIDriver.h
index bc33baca3b..2641f87b1f 100644
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/CordioHCIDriver.h
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/CordioHCIDriver.h
@@ -22,7 +22,7 @@
 #include <BLETypes.h>
 #include "wsf_buf.h"
 #include "CordioHCITransportDriver.h"
-#include "ble/types/blecommon.h"
+#include "ble/common/ble/blecommon.h"
 #include "mbed.h"
 
 namespace ble {
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 b75a150b38..bd8dc70a9c 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
@@ -20,7 +20,7 @@
 #define IMPL_BLE_INSTANCE_BASE_H_
 
 #include "ble/BLE.h"
-#include "ble/types/blecommon.h"
+#include "ble/common/ble/blecommon.h"
 #include "ble/internal/BLEInstanceBase.h"
 
 #include "CordioHCIDriver.h"
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalSecurityManagerImpl.h b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalSecurityManagerImpl.h
index 9952a8eb49..8086df7fa7 100644
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalSecurityManagerImpl.h
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/PalSecurityManagerImpl.h
@@ -20,7 +20,7 @@
 #define IMPL_PAL_SECURITY_MANAGER_
 
 #include "ble/internal/PalSecurityManager.h"
-#include "ble/types/blecommon.h"
+#include "ble/common/ble/blecommon.h"
 #include "wsf_types.h"
 #include "wsf_os.h"
 #include "sec_api.h"
diff --git a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalSecurityManagerImpl.cpp b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalSecurityManagerImpl.cpp
index 1bd51a40ec..6ec395afb7 100644
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalSecurityManagerImpl.cpp
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalSecurityManagerImpl.cpp
@@ -20,7 +20,7 @@
 
 #include <string.h>
 
-#include "ble/types/blecommon.h"
+#include "ble/common/ble/blecommon.h"
 #include "ble/internal/PalSecurityManager.h"
 #include "ble/internal/PalAttClient.h"
 #include "dm_api.h"
diff --git a/connectivity/FEATURE_BLE/libraries/ble-api-implementation/include/ble/internal/GapImpl.h b/connectivity/FEATURE_BLE/libraries/ble-api-implementation/include/ble/internal/GapImpl.h
index b1c42aeae6..a89c8ba5ba 100644
--- a/connectivity/FEATURE_BLE/libraries/ble-api-implementation/include/ble/internal/GapImpl.h
+++ b/connectivity/FEATURE_BLE/libraries/ble-api-implementation/include/ble/internal/GapImpl.h
@@ -27,18 +27,18 @@
 #include "drivers/LowPowerTicker.h"
 #include "platform/mbed_error.h"
 
-#include "ble/types/BLERoles.h"
-#include "ble/types/BLETypes.h"
-#include "ble/types/gap/AdvertisingDataBuilder.h"
-#include "ble/types/gap/AdvertisingDataSimpleBuilder.h"
-#include "ble/types/gap/ConnectionParameters.h"
-#include "ble/types/gap/ScanParameters.h"
-#include "ble/types/gap/AdvertisingParameters.h"
-#include "ble/types/gap/Events.h"
+#include "ble/common/ble/BLERoles.h"
+#include "ble/common/ble/BLETypes.h"
+#include "ble/common/ble/gap/AdvertisingDataBuilder.h"
+#include "ble/common/ble/gap/AdvertisingDataSimpleBuilder.h"
+#include "ble/common/ble/gap/ConnectionParameters.h"
+#include "ble/common/ble/gap/ScanParameters.h"
+#include "ble/common/ble/gap/AdvertisingParameters.h"
+#include "ble/common/ble/gap/Events.h"
 
 #include "ble/internal/PalGap.h"
-#include "ble/internal/GapEvents.h"
-#include "ble/internal/GapTypes.h"
+#include "ble/common/ble/GapEvents.h"
+#include "ble/common/ble/GapTypes.h"
 #include "ble/internal/PalEventQueue.h"
 #include "ble/internal/PalConnectionMonitor.h"
 #include "PalEventQueue.h"
diff --git a/connectivity/FEATURE_BLE/libraries/ble-api-implementation/include/ble/internal/GattClientImpl.h b/connectivity/FEATURE_BLE/libraries/ble-api-implementation/include/ble/internal/GattClientImpl.h
index 44fee35b64..9a3c9cd8b1 100644
--- a/connectivity/FEATURE_BLE/libraries/ble-api-implementation/include/ble/internal/GattClientImpl.h
+++ b/connectivity/FEATURE_BLE/libraries/ble-api-implementation/include/ble/internal/GattClientImpl.h
@@ -22,11 +22,11 @@
 #include "CallChainOfFunctionPointersWithContext.h"
 #include <algorithm>
 
-#include "ble/types/blecommon.h"
-#include "ble/types/GattAttribute.h"
-#include "ble/types/ServiceDiscovery.h"
-#include "ble/types/CharacteristicDescriptorDiscovery.h"
-#include "ble/types/GattCallbackParamTypes.h"
+#include "ble/common/ble/blecommon.h"
+#include "ble/common/ble/GattAttribute.h"
+#include "ble/common/ble/ServiceDiscovery.h"
+#include "ble/common/ble/CharacteristicDescriptorDiscovery.h"
+#include "ble/common/ble/GattCallbackParamTypes.h"
 #include "ble/internal/PalGattClient.h"
 #include "ble/internal/PalSigningMonitor.h"
 #include "ble/GattClient.h"
diff --git a/connectivity/FEATURE_BLE/libraries/ble-api-implementation/include/ble/internal/GattServerImpl.h b/connectivity/FEATURE_BLE/libraries/ble-api-implementation/include/ble/internal/GattServerImpl.h
index 69d019a56c..f4dd6755df 100644
--- a/connectivity/FEATURE_BLE/libraries/ble-api-implementation/include/ble/internal/GattServerImpl.h
+++ b/connectivity/FEATURE_BLE/libraries/ble-api-implementation/include/ble/internal/GattServerImpl.h
@@ -21,19 +21,19 @@
 
 #include "CallChainOfFunctionPointersWithContext.h"
 
-#include "ble/types/GattService.h"
-#include "ble/types/GattAttribute.h"
-#include "ble/types/GattServerEvents.h"
-#include "ble/types/GattCallbackParamTypes.h"
+#include "ble/common/ble/GattService.h"
+#include "ble/common/ble/GattAttribute.h"
+#include "ble/common/ble/GattServerEvents.h"
+#include "ble/common/ble/GattCallbackParamTypes.h"
 
 #include <stddef.h>
-#include "ble/types/blecommon.h"
+#include "ble/common/ble/blecommon.h"
 #include "ble/Gap.h"
 #include "wsf_types.h"
 #include "att_api.h"
 #include "SecurityManager.h"
 
-#include "ble/types/GattCallbackParamTypes.h"
+#include "ble/common/ble/GattCallbackParamTypes.h"
 #include "ble/internal/PalSigningMonitor.h"
 
 namespace ble {
diff --git a/connectivity/FEATURE_BLE/libraries/ble-api-implementation/include/ble/internal/SecurityManagerImpl.h b/connectivity/FEATURE_BLE/libraries/ble-api-implementation/include/ble/internal/SecurityManagerImpl.h
index 33384276b4..a8f26e3c62 100644
--- a/connectivity/FEATURE_BLE/libraries/ble-api-implementation/include/ble/internal/SecurityManagerImpl.h
+++ b/connectivity/FEATURE_BLE/libraries/ble-api-implementation/include/ble/internal/SecurityManagerImpl.h
@@ -23,12 +23,12 @@
 #include "CallChainOfFunctionPointersWithContext.h"
 #include "platform/Callback.h"
 
-#include "ble/types/BLETypes.h"
-#include "ble/types/blecommon.h"
+#include "ble/common/ble/BLETypes.h"
+#include "ble/common/ble/blecommon.h"
 #include "ble/Gap.h"
 
-#include "ble/internal/GapTypes.h"
-#include "ble/types/BLETypes.h"
+#include "ble/common/ble/GapTypes.h"
+#include "ble/common/ble/BLETypes.h"
 #include "ble/internal/SecurityDb.h"
 #include "ble/internal/PalConnectionMonitor.h"
 #include "ble/internal/PalSigningMonitor.h"
diff --git a/connectivity/FEATURE_BLE/libraries/ble-api-implementation/source/GapImpl.cpp b/connectivity/FEATURE_BLE/libraries/ble-api-implementation/source/GapImpl.cpp
index 94495fb149..cc011ceb82 100644
--- a/connectivity/FEATURE_BLE/libraries/ble-api-implementation/source/GapImpl.cpp
+++ b/connectivity/FEATURE_BLE/libraries/ble-api-implementation/source/GapImpl.cpp
@@ -24,8 +24,8 @@
 #include "ble/Gap.h"
 #include "ble/SecurityManager.h"
 #include "ble/internal/PalGap.h"
-#include "ble/internal/GapEvents.h"
-#include "ble/internal/GapTypes.h"
+#include "ble/common/ble/GapEvents.h"
+#include "ble/common/ble/GapTypes.h"
 #include "ble/internal/PalGenericAccessService.h"
 #include "ble/internal/PalEventQueue.h"
 #include "ble/internal/PalGap.h"
diff --git a/connectivity/FEATURE_BLE/libraries/ble-api-implementation/source/GattClientImpl.cpp b/connectivity/FEATURE_BLE/libraries/ble-api-implementation/source/GattClientImpl.cpp
index 5961a67fd2..f4709144cf 100644
--- a/connectivity/FEATURE_BLE/libraries/ble-api-implementation/source/GattClientImpl.cpp
+++ b/connectivity/FEATURE_BLE/libraries/ble-api-implementation/source/GattClientImpl.cpp
@@ -24,10 +24,10 @@
 #include <stdlib.h>
 
 #include "ble/internal/AttServerMessage.h"
-#include "ble/types/DiscoveredService.h"
-#include "ble/types/DiscoveredCharacteristic.h"
+#include "ble/common/ble/DiscoveredService.h"
+#include "ble/common/ble/DiscoveredCharacteristic.h"
 #include "ble/GattClient.h"
-#include "ble/types/blecommon.h"
+#include "ble/common/ble/blecommon.h"
 #include "ble/internal/BLEInstanceBase.h"
 #include "ble/SecurityManager.h"
 #include <algorithm>
diff --git a/connectivity/FEATURE_BLE/source/DiscoveredCharacteristic.cpp b/connectivity/FEATURE_BLE/source/DiscoveredCharacteristic.cpp
index 5888885f2c..d7575ab3af 100644
--- a/connectivity/FEATURE_BLE/source/DiscoveredCharacteristic.cpp
+++ b/connectivity/FEATURE_BLE/source/DiscoveredCharacteristic.cpp
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-#include "ble/types/DiscoveredCharacteristic.h"
+#include "ble/common/ble/DiscoveredCharacteristic.h"
 #include "ble/GattClient.h"
 
 ble_error_t
@@ -154,7 +154,7 @@ ble_error_t DiscoveredCharacteristic::write(uint16_t length, const uint8_t *valu
 }
 
 ble_error_t DiscoveredCharacteristic::discoverDescriptors(
-    const CharacteristicDescriptorDiscovery::DiscoveryCallback_t& onCharacteristicDiscovered, 
+    const CharacteristicDescriptorDiscovery::DiscoveryCallback_t& onCharacteristicDiscovered,
     const CharacteristicDescriptorDiscovery::TerminationCallback_t& onTermination) const {
 
     if(!gattc) {
diff --git a/connectivity/drivers/ble/TARGET_STM32WB/HCIDriver.cpp b/connectivity/drivers/ble/TARGET_STM32WB/HCIDriver.cpp
index 578c09565e..a57caa348d 100644
--- a/connectivity/drivers/ble/TARGET_STM32WB/HCIDriver.cpp
+++ b/connectivity/drivers/ble/TARGET_STM32WB/HCIDriver.cpp
@@ -17,7 +17,7 @@
  */
 
 #include <stdio.h>
-#include "ble/types/blecommon.h"
+#include "ble/common/ble/blecommon.h"
 #include "BLEInstanceBase.h"
 #include "CordioHCIDriver.h"
 #include "CordioHCITransportDriver.h"