diff --git a/features/FEATURE_BLE/ble/gap/AdvertisingDataBuilder.h b/features/FEATURE_BLE/ble/gap/AdvertisingDataBuilder.h
index 05af4b2a82..a08590dfce 100644
--- a/features/FEATURE_BLE/ble/gap/AdvertisingDataBuilder.h
+++ b/features/FEATURE_BLE/ble/gap/AdvertisingDataBuilder.h
@@ -29,6 +29,8 @@
 #include "UUID.h"
 #include "ble/gap/Types.h"
 
+namespace ble {
+
 /**
  * @addtogroup ble
  * @{
@@ -36,8 +38,6 @@
  * @{
  */
 
-namespace ble {
-
 /*!
  * List of standard Advertising Data types.
  *
@@ -933,12 +933,11 @@ private:
     uint8_t _payload_length;
 };
 
-} // namespace ble
-
 /**
  * @}
  * @}
  */
 
+} // namespace ble
 
 #endif /* ifndef MBED_GAP_ADVERTISING_DATA_H__ */
diff --git a/features/FEATURE_BLE/ble/gap/AdvertisingParameters.h b/features/FEATURE_BLE/ble/gap/AdvertisingParameters.h
index 001ca51320..9056c7a781 100644
--- a/features/FEATURE_BLE/ble/gap/AdvertisingParameters.h
+++ b/features/FEATURE_BLE/ble/gap/AdvertisingParameters.h
@@ -24,6 +24,8 @@
 #include "blecommon.h"
 #include "SafeEnum.h"
 
+namespace ble {
+
 /**
  * @addtogroup ble
  * @{
@@ -31,8 +33,6 @@
  * @{
  */
 
-namespace ble {
-
 /**
  * Parameters defining the advertising process.
  *
@@ -531,11 +531,11 @@ private:
     bool _includeHeaderTxPower:1;
 };
 
-} // namespace ble
-
 /**
  * @}
  * @}
  */
 
+} // namespace ble
+
 #endif /* ifndef MBED_ADVERTISING_PARAMETERS_H__ */
diff --git a/features/FEATURE_BLE/ble/gap/ConnectionParameters.h b/features/FEATURE_BLE/ble/gap/ConnectionParameters.h
index faa469bcd3..c0038c5f44 100644
--- a/features/FEATURE_BLE/ble/gap/ConnectionParameters.h
+++ b/features/FEATURE_BLE/ble/gap/ConnectionParameters.h
@@ -20,6 +20,8 @@
 #include "ble/BLETypes.h"
 #include "mbed_assert.h"
 
+namespace ble {
+
 /**
  * @addtogroup ble
  * @{
@@ -27,8 +29,6 @@
  * @{
  */
 
-namespace ble {
-
 /**
  * Parameters defining the connection initiation process.
  *
@@ -453,11 +453,11 @@ private:
     bool _enabledPhy[MAX_PARAM_PHYS];
 };
 
-} // namespace ble
-
 /**
  * @}
  * @}
  */
 
+} // namespace ble
+
 #endif /* ifndef MBED_EXTENDED_CONNECT_PARAMETERS_H__ */
diff --git a/features/FEATURE_BLE/ble/gap/Events.h b/features/FEATURE_BLE/ble/gap/Events.h
index da9cebf70d..369e45ae61 100644
--- a/features/FEATURE_BLE/ble/gap/Events.h
+++ b/features/FEATURE_BLE/ble/gap/Events.h
@@ -23,6 +23,13 @@
 
 namespace ble {
 
+/**
+ * @addtogroup ble
+ * @{
+ * @addtogroup gap
+ * @{
+ */
+
 /**
  * Event generated when an advertising packet is seen during passive scanning
  * or a scan response is received during active scanning.
@@ -805,6 +812,11 @@ private:
 
 };
 
+/**
+ * @}
+ * @}
+ */
+
 } // namespace ble
 
 #endif //BLE_GAP_EVENTS_H
diff --git a/features/FEATURE_BLE/ble/gap/Gap.h b/features/FEATURE_BLE/ble/gap/Gap.h
index 552d1208d2..baa9422498 100644
--- a/features/FEATURE_BLE/ble/gap/Gap.h
+++ b/features/FEATURE_BLE/ble/gap/Gap.h
@@ -28,6 +28,13 @@
 
 namespace ble {
 
+/**
+ * @addtogroup ble
+ * @{
+ * @addtogroup gap
+ * @{
+ */
+
 /**
  * Define device discovery, connection and link management procedures.
  *
@@ -1310,6 +1317,11 @@ protected:
 #endif
 };
 
+/**
+ * @}
+ * @}
+ */
+
 } // namespace ble
 
 #endif //BLE_GAP_GAP_H
diff --git a/features/FEATURE_BLE/ble/gap/ScanParameters.h b/features/FEATURE_BLE/ble/gap/ScanParameters.h
index b6f9f3eac1..e20db6aa85 100644
--- a/features/FEATURE_BLE/ble/gap/ScanParameters.h
+++ b/features/FEATURE_BLE/ble/gap/ScanParameters.h
@@ -21,6 +21,8 @@
 #include "ble/blecommon.h"
 #include "BLETypes.h"
 
+namespace ble {
+
 /**
  * @addtogroup ble
  * @{
@@ -28,8 +30,6 @@
  * @{
  */
 
-namespace ble {
-
 /**
  * Parameters defining the scan process.
  *
@@ -263,11 +263,11 @@ private:
     phy_configuration_t phy_coded_configuration;
 };
 
-} // namespace ble
-
 /**
  * @}
  * @}
  */
 
+} // namespace ble
+
 #endif /* ifndef MBED_GAP_SCAN_PARAMETERS_H__ */
diff --git a/features/FEATURE_BLE/ble/gap/Types.h b/features/FEATURE_BLE/ble/gap/Types.h
index c267d2dab3..b3ec2d10e8 100644
--- a/features/FEATURE_BLE/ble/gap/Types.h
+++ b/features/FEATURE_BLE/ble/gap/Types.h
@@ -23,6 +23,13 @@
 
 namespace ble {
 
+/**
+ * @addtogroup ble
+ * @{
+ * @addtogroup gap
+ * @{
+ */
+
 /* BLE units, using microseconds as the common denominator */
 typedef Duration<uint32_t,      625, Range<0x20, 0xFFFFFF> > adv_interval_t;
 typedef Duration<uint16_t,    10000, Range<0x00,   0xFFFF>, Value<uint16_t, 0x0000> > adv_duration_t;
@@ -719,6 +726,10 @@ struct disconnection_reason_t : SafeEnum<disconnection_reason_t, uint8_t> {
     }
 };
 
+/**
+ * @}
+ * @}
+ */
 
 } // namespace ble