From e70fb27d551ff2ae009912e8acfbaa2dcc87567b Mon Sep 17 00:00:00 2001
From: Vincent Coubard <vincent.coubard@arm.com>
Date: Mon, 25 Feb 2019 19:13:20 +0000
Subject: [PATCH] BLE - cleanup includes.

---
 features/FEATURE_BLE/ble/BLE.h                | 6 +++---
 features/FEATURE_BLE/ble/BLEInstanceBase.h    | 8 ++++----
 features/FEATURE_BLE/ble/GattCharacteristic.h | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/features/FEATURE_BLE/ble/BLE.h b/features/FEATURE_BLE/ble/BLE.h
index 0df3656ae0..c2d26248fe 100644
--- a/features/FEATURE_BLE/ble/BLE.h
+++ b/features/FEATURE_BLE/ble/BLE.h
@@ -19,9 +19,9 @@
 
 #include "blecommon.h"
 #include "ble/Gap.h"
-#include "GattServer.h"
-#include "GattClient.h"
-#include "SecurityManager.h"
+#include "ble/GattServer.h"
+#include "ble/GattClient.h"
+#include "ble/SecurityManager.h"
 
 #include "ble/FunctionPointerWithContext.h"
 
diff --git a/features/FEATURE_BLE/ble/BLEInstanceBase.h b/features/FEATURE_BLE/ble/BLEInstanceBase.h
index 1ed6745520..95f6cd10ef 100644
--- a/features/FEATURE_BLE/ble/BLEInstanceBase.h
+++ b/features/FEATURE_BLE/ble/BLEInstanceBase.h
@@ -21,13 +21,13 @@
 #ifndef MBED_BLE_DEVICE_INSTANCE_BASE__
 #define MBED_BLE_DEVICE_INSTANCE_BASE__
 
+#include "ble/BLE.h"
 #include "ble/Gap.h"
 #include "ble/SecurityManager.h"
-#include "ble/BLE.h"
+#include "ble/GattServer.h"
+#include "ble/GattClient.h"
+
 
-/* Forward declarations. */
-class GattServer;
-class GattClient;
 
 /**
  * @addtogroup ble
diff --git a/features/FEATURE_BLE/ble/GattCharacteristic.h b/features/FEATURE_BLE/ble/GattCharacteristic.h
index 93400171e9..a3acbb81b1 100644
--- a/features/FEATURE_BLE/ble/GattCharacteristic.h
+++ b/features/FEATURE_BLE/ble/GattCharacteristic.h
@@ -18,7 +18,7 @@
 #define __GATT_CHARACTERISTIC_H__
 
 #include "ble/Gap.h"
-#include "SecurityManager.h"
+#include "ble/SecurityManager.h"
 #include "GattAttribute.h"
 #include "GattCallbackParamTypes.h"
 #include "FunctionPointerWithContext.h"