diff --git a/src/ad_parser.h b/src/ad_parser.h
index 8584183ba..f4165b50a 100644
--- a/src/ad_parser.h
+++ b/src/ad_parser.h
@@ -36,8 +36,9 @@
  */
 
 /**
- * @title AD Data (Advertisements and EIR) Parser 
+ * @title AD Data Parser 
  *
+ * AD Data (Advertisements and EIR) Parser
  */
 
 #ifndef AD_PARSER_H
diff --git a/src/ble/gatt-service/hids_device.h b/src/ble/gatt-service/hids_device.h
index 41377ee8d..b66759ee3 100644
--- a/src/ble/gatt-service/hids_device.h
+++ b/src/ble/gatt-service/hids_device.h
@@ -51,6 +51,8 @@
 extern "C" {
 #endif
 
+/* API_START */
+
 /**
  * @text Implementation of the GATT HIDS Device
  * To use with your application, add '#import <hids.gatt>' to your .gatt file
@@ -99,6 +101,8 @@ void hids_device_send_boot_mouse_input_report(hci_con_handle_t con_handle, const
  */
 void hids_device_send_boot_keyboard_input_report(hci_con_handle_t con_handle, const uint8_t * report, uint16_t report_len);
 
+/* API_END */
+
 #if defined __cplusplus
 }
 #endif
diff --git a/src/btstack_chipset.h b/src/btstack_chipset.h
index 189f564b7..e06cd4fc5 100644
--- a/src/btstack_chipset.h
+++ b/src/btstack_chipset.h
@@ -60,6 +60,7 @@ typedef enum {
   BTSTACK_CHIPSET_NO_INIT_SCRIPT,
 } btstack_chipset_result_t;
 
+/* API_START */
 
 typedef struct {
     /**
@@ -96,6 +97,8 @@ typedef struct {
 
 } btstack_chipset_t;
 
+/* API_END */
+
 #if defined __cplusplus
 }
 #endif
diff --git a/src/btstack_control.h b/src/btstack_control.h
index 102036626..0f1572592 100644
--- a/src/btstack_control.h
+++ b/src/btstack_control.h
@@ -36,9 +36,9 @@
  */
 
 /**
- * @title BTstack Bluetooth Hardware Control
+ * @title Bluetooth Power Control
  *
- * The API allows HCI to manage Bluetooth chipsets via direct hardware controls.
+ * The Bluetooth Hardware Control API allows HCI to manage Bluetooth chipsets via direct hardware controls.
  *
  */
 
@@ -57,6 +57,8 @@ typedef enum {
     POWER_WILL_WAKE_UP
 } POWER_NOTIFICATION_t;
 
+/* API_START */
+
 typedef struct {
 	void (*init) (const void *config);
     int  (*on)   (void);  // <-- turn BT module on and configure
@@ -66,6 +68,8 @@ typedef struct {
     void (*register_for_power_notifications)(void (*cb)(POWER_NOTIFICATION_t event));
 } btstack_control_t;
 
+/* API_END */
+
 #if defined __cplusplus
 }
 #endif
diff --git a/src/btstack_event.h b/src/btstack_event.h
index d5ca4bf20..914d6c222 100644
--- a/src/btstack_event.h
+++ b/src/btstack_event.h
@@ -36,7 +36,7 @@
  */
 
 /**
- * @title HCI Event Getter
+ * HCI Event Getter
  *  
  * Note: Don't edit this file. It is generated by tool/btstack_event_generator.py
  *