diff --git a/src/ble/Makefile.inc b/src/ble/Makefile.inc
index e3ccf9e34..71c293d4f 100644
--- a/src/ble/Makefile.inc
+++ b/src/ble/Makefile.inc
@@ -6,7 +6,6 @@ SRC_BLE_FILES = \
     att_dispatch.c \
     att_server.c \
     gatt_client.c \
-    hids_client.c \
     le_device_db_memory.c \
     le_device_db_tlv.c \
     sm.c \
diff --git a/src/ble/gatt-service/Makefile.inc b/src/ble/gatt-service/Makefile.inc
index 3e7c888f9..20e02dc8c 100644
--- a/src/ble/gatt-service/Makefile.inc
+++ b/src/ble/gatt-service/Makefile.inc
@@ -9,6 +9,7 @@ SRC_BLE_GATT_SERVICE_FILES = \
     device_information_service_client.c \
     device_information_service_server.c \
     heart_rate_service_server.c \
+    hids_client.c \
     hids_device.c \
     mesh_provisioning_service_server.c \
     mesh_proxy_service_server.c \
diff --git a/src/ble/hids_client.c b/src/ble/gatt-service/hids_client.c
similarity index 100%
rename from src/ble/hids_client.c
rename to src/ble/gatt-service/hids_client.c
diff --git a/src/ble/hids_client.h b/src/ble/gatt-service/hids_client.h
similarity index 100%
rename from src/ble/hids_client.h
rename to src/ble/gatt-service/hids_client.h
diff --git a/src/btstack.h b/src/btstack.h
index 8846bd11a..5767468ec 100644
--- a/src/btstack.h
+++ b/src/btstack.h
@@ -89,6 +89,7 @@
 #include "ble/gatt-service/device_information_service_client.h"
 #include "ble/gatt-service/device_information_service_server.h"
 #include "ble/gatt-service/heart_rate_service_server.h"
+#include "ble/gatt-service/hids_client.h"
 #include "ble/gatt-service/hids_device.h"
 #include "ble/gatt-service/scan_parameters_service_client.h"
 #ifdef ENABLE_MESH
@@ -96,7 +97,6 @@
 #include "ble/gatt-service/mesh_proxy_service_server.h"
 #endif
 #include "ble/gatt_client.h"
-#include "ble/hids_client.h"
 #include "ble/le_device_db.h"
 #include "ble/sm.h"
 #endif