diff --git a/features/FEATURE_BLE/ble/GattAttribute.h b/features/FEATURE_BLE/ble/GattAttribute.h
index 1011bc0d53..cbca2237fa 100644
--- a/features/FEATURE_BLE/ble/GattAttribute.h
+++ b/features/FEATURE_BLE/ble/GattAttribute.h
@@ -20,6 +20,15 @@
 #include "UUID.h"
 #include "BLETypes.h"
 
+/**
+ * @addtogroup ble
+ * @{
+ * @addtogroup gatt
+ * @{
+ * @addtogroup server
+ * @{
+ */
+
 /**
  * Instances of this class encapsulate the data that belongs to a Bluetooth Low
  * Energy attribute.
@@ -172,4 +181,10 @@ private:
     GattAttribute& operator=(const GattAttribute &);
 };
 
+/**
+ * @}
+ * @}
+ * @}
+ */
+
 #endif /* ifndef __GATT_ATTRIBUTE_H__ */
diff --git a/features/FEATURE_BLE/ble/GattCharacteristic.h b/features/FEATURE_BLE/ble/GattCharacteristic.h
index c21d99111b..e3254c80f1 100644
--- a/features/FEATURE_BLE/ble/GattCharacteristic.h
+++ b/features/FEATURE_BLE/ble/GattCharacteristic.h
@@ -23,6 +23,15 @@
 #include "GattCallbackParamTypes.h"
 #include "FunctionPointerWithContext.h"
 
+/**
+ * @addtogroup ble
+ * @{
+ * @addtogroup gatt
+ * @{
+ * @addtogroup server
+ * @{
+ */
+
 class GattCharacteristic {
 public:
     enum {
@@ -860,4 +869,10 @@ public:
     }
 };
 
+/**
+ * @}
+ * @}
+ * @}
+ */
+
 #endif /* ifndef __GATT_CHARACTERISTIC_H__ */
diff --git a/features/FEATURE_BLE/ble/GattServer.h b/features/FEATURE_BLE/ble/GattServer.h
index 9264b87a00..bc00b054b6 100644
--- a/features/FEATURE_BLE/ble/GattServer.h
+++ b/features/FEATURE_BLE/ble/GattServer.h
@@ -24,6 +24,15 @@
 #include "GattCallbackParamTypes.h"
 #include "CallChainOfFunctionPointersWithContext.h"
 
+/**
+ * @addtogroup ble
+ * @{
+ * @addtogroup gatt
+ * @{
+ * @addtogroup server
+ * @{
+ */
+
 class GattServer {
 public:
     /**
@@ -686,4 +695,10 @@ private:
     GattServer& operator=(const GattServer &);
 };
 
+/**
+ * @}
+ * @}
+ * @}
+ */
+
 #endif /* ifndef __GATT_SERVER_H__ */
diff --git a/features/FEATURE_BLE/ble/GattServerEvents.h b/features/FEATURE_BLE/ble/GattServerEvents.h
index 2971ab3135..5b4601a94b 100644
--- a/features/FEATURE_BLE/ble/GattServerEvents.h
+++ b/features/FEATURE_BLE/ble/GattServerEvents.h
@@ -17,6 +17,15 @@
 #ifndef MBED_BLE_GATT_SERVER_EVENTS_H__
 #define MBED_BLE_GATT_SERVER_EVENTS_H__
 
+/**
+ * @addtogroup ble
+ * @{
+ * @addtogroup gatt
+ * @{
+ * @addtogroup server
+ * @{
+ */
+
 /**
  * Abstract events generated by a GattServer vendor port.
  *
@@ -68,4 +77,10 @@ public:
     } gattEvent_t;
 };
 
+/**
+ * @}
+ * @}
+ * @}
+ */
+
 #endif /* ifndef MBED_BLE_GATT_SERVER_EVENTS_H__ */
diff --git a/features/FEATURE_BLE/ble/GattService.h b/features/FEATURE_BLE/ble/GattService.h
index bfc7c211dd..cedd39a6b8 100644
--- a/features/FEATURE_BLE/ble/GattService.h
+++ b/features/FEATURE_BLE/ble/GattService.h
@@ -20,6 +20,15 @@
 #include "UUID.h"
 #include "GattCharacteristic.h"
 
+/**
+ * @addtogroup ble
+ * @{
+ * @addtogroup gatt
+ * @{
+ * @addtogroup server
+ * @{
+ */
+
 class GattService {
 public:
     enum {
@@ -140,4 +149,11 @@ private:
     uint16_t             _handle;
 };
 
+/**
+ * @}
+ * @}
+ * @}
+ */
+
+
 #endif /* ifndef __GATT_SERVICE_H__ */