make include path backwards compatible

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"

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;

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 {
 

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"
 

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"

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

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;

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;

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

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 {
 

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 {
 

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

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

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

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;

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

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {

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 {
 

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"
 

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 {

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 {

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"

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 {
 

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 {

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 {

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"

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"

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"

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"

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"

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 {

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"

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"

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>

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

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"