diff --git a/src/gap.h b/src/gap.h
index 37b60512e..36731daeb 100644
--- a/src/gap.h
+++ b/src/gap.h
@@ -325,6 +325,20 @@ typedef struct {
     bool can_send_now_requested;
 } le_audio_cig_t;
 
+typedef enum {
+    GAP_PRIVACY_CLIENT_STATE_IDLE,
+    GAP_PRIVACY_CLIENT_STATE_PENDING,
+    GAP_PRIVACY_CLIENT_STATE_READY
+} gap_privacy_client_state_t;
+
+struct gap_privacy_client {
+    btstack_linked_item_t * next;
+    void (*callback)(struct gap_privacy_client * client, bd_addr_t random_addr);
+    gap_privacy_client_state_t state;
+};
+
+typedef struct gap_privacy_client gap_privacy_client_t;
+
 /* API_START */
 
 // Classic + LE
@@ -1466,19 +1480,6 @@ void gap_set_peer_privacy_mode(le_privacy_mode_t privacy_mode );
  */
 uint8_t gap_load_resolving_list_from_le_device_db(void);
 
-typedef enum {
-    GAP_PRIVACY_CLIENT_STATE_IDLE,
-    GAP_PRIVACY_CLIENT_STATE_PENDING,
-    GAP_PRIVACY_CLIENT_STATE_READY
-} gap_privacy_client_state_t;
-
-struct gap_privacy_client {
-    btstack_linked_item_t * next;
-    void (*callback)(struct gap_privacy_client * client, bd_addr_t random_addr);
-    gap_privacy_client_state_t state;
-};
-typedef struct gap_privacy_client gap_privacy_client_t;
-
 /**
  * @brief Register callback that gets executed during random address update
  * @note gap_privacy_client_ready needs to be called after callback is received