diff --git a/android/gatt.c b/android/gatt.c
index 5a1d215..75ec554 100644
--- a/android/gatt.c
+++ b/android/gatt.c
@@ -216,8 +216,6 @@ static const uint8_t TEST_UUID[] = {
 	0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03, 0x04
 };
 
-static void bt_le_discovery_stop_cb(void);
-
 static bool is_bluetooth_uuid(const uint8_t *uuid)
 {
 	int i;
@@ -1585,6 +1583,15 @@ static int connect_next_dev(void)
 	return connect_le(dev);
 }
 
+static void bt_le_discovery_stop_cb(void)
+{
+	DBG("");
+
+	/* Check now if there is any device ready to connect */
+	if (connect_next_dev() < 0)
+		bt_le_discovery_start();
+}
+
 static void le_device_found_handler(const bdaddr_t *addr, uint8_t addr_type,
 						int rssi, uint16_t eir_len,
 						const void *eir,
@@ -1760,15 +1767,6 @@ reply:
 									status);
 }
 
-static void bt_le_discovery_stop_cb(void)
-{
-	DBG("");
-
-	/* Check now if there is any device ready to connect */
-	if (connect_next_dev() < 0)
-		bt_le_discovery_start();
-}
-
 static void trigger_disconnection(struct app_connection *connection)
 {
 	/* Notify client */