Clear up BLE header interdependencies

Author: LDong-Arm

connectivity/FEATURE_BLE/include/ble/BLE.h

@@ -28,16 +28,15 @@
 #include "ble/types/BLETypes.h"
 #include "ble/types/blecommon.h"
 
+#include "ble/Gap.h"
+#include "ble/GattClient.h"
+#include "ble/GattServer.h"
+#include "ble/SecurityManager.h"
 
 /* Forward declaration for the implementation class */
 
 namespace ble {
 class BLEInstanceBase;
-class Gap;
-class GattClient;
-class GattServer;
-class SecurityManager;
-}
 
 /**
  * @addtogroup ble
@@ -477,6 +476,9 @@ class BLE {
     bool event_signaled;
 };
 
+}
+
+using ble::BLE;
 /**
  * @namespace ble Entry namespace for all %BLE API definitions.
  */

connectivity/FEATURE_BLE/include/ble/GattServer.h

@@ -31,8 +31,6 @@
 #include "ble/Gap.h"
 #include "SecurityManager.h"
 
-#include "ble/BLE.h"
-
 namespace ble {
 
 /**

connectivity/FEATURE_BLE/include/ble/SecurityManager.h

@@ -25,9 +25,7 @@
 
 #include "ble/types/BLETypes.h"
 #include "ble/types/blecommon.h"
-#include "ble/Gap.h"
 
-#include "ble/internal/GapTypes.h"
 #include "ble/types/BLETypes.h"
 #include "ble/internal/SecurityDb.h"
 #include "ble/internal/PalConnectionMonitor.h"

connectivity/FEATURE_BLE/include/ble/types/DiscoveredCharacteristic.h

@@ -21,6 +21,7 @@
 
 #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"
 

connectivity/FEATURE_BLE/include/ble/types/DiscoveredCharacteristicDescriptor.h

@@ -22,9 +22,12 @@
 #include "ble/types/UUID.h"
 #include "ble/Gap.h"
 #include "ble/types/GattAttribute.h"
-#include "ble/GattClient.h"
 #include "ble/types/CharacteristicDescriptorDiscovery.h"
 
+namespace ble {
+class GattClient;
+}
+
 /**
  * @addtogroup ble
  * @{

connectivity/FEATURE_BLE/include/ble/types/GattCallbackParamTypes.h

@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include "CallChainOfFunctionPointersWithContext.h"
 
 #ifndef MBED_BLE_GATT_CALLBACK_PARAM_TYPES_H__
 #define MBED_BLE_GATT_CALLBACK_PARAM_TYPES_H__

connectivity/FEATURE_BLE/include/ble/types/GattCharacteristic.h

@@ -21,7 +21,6 @@
 
 #include "FunctionPointerWithContext.h"
 
-#include "ble/Gap.h"
 #include "ble/types/GattAttribute.h"
 #include "ble/types/GattCallbackParamTypes.h"
 

connectivity/FEATURE_BLE/include/ble/types/ServiceDiscovery.h

@@ -21,7 +21,6 @@
 
 #include "ble/types/blecommon.h"
 #include "ble/types/UUID.h"
-#include "ble/Gap.h"
 #include "ble/types/GattAttribute.h"
 
 class DiscoveredService;

connectivity/FEATURE_BLE/libraries/ble-api-implementation/include/ble/internal/GattServerImpl.h

@@ -33,7 +33,6 @@
 #include "att_api.h"
 #include "SecurityManager.h"
 
-#include "ble/BLE.h"
 #include "ble/types/GattCallbackParamTypes.h"
 #include "ble/internal/PalSigningMonitor.h"
 

connectivity/FEATURE_BLE/libraries/ble-api-implementation/include/ble/internal/SecurityManagerImpl.h

@@ -34,10 +34,11 @@
 #include "ble/internal/PalSigningMonitor.h"
 #include "ble/internal/PalSecurityManager.h"
 #include "ble/SecurityManager.h"
-#include "ble/internal/BLEInstanceBase.h"
 
 namespace ble {
 
+class BLEInstanceBase;
+
 class SecurityManager :
     public ble::interface::SecurityManager,
     public ble::PalSecurityManagerEventHandler,