diff --git a/android/avrcp-lib.c b/android/avrcp-lib.c
index 6957422..5f7ca6b 100644
--- a/android/avrcp-lib.c
+++ b/android/avrcp-lib.c
@@ -82,6 +82,14 @@ struct avrcp_browsing_header {
 } __attribute__ ((packed));
 #define AVRCP_BROWSING_HEADER_LENGTH 3
 
+struct avrcp_control_handler {
+	uint8_t id;
+	uint8_t code;
+	uint8_t rsp;
+	ssize_t (*func) (struct avrcp *session, uint8_t transaction,
+			uint16_t params_len, uint8_t *params, void *user_data);
+};
+
 struct avrcp {
 	struct avctp *conn;
 	struct avrcp_player *player;
diff --git a/android/avrcp-lib.h b/android/avrcp-lib.h
index 8b2424c..4d1bbcc 100644
--- a/android/avrcp-lib.h
+++ b/android/avrcp-lib.h
@@ -126,14 +126,6 @@
 
 struct avrcp;
 
-struct avrcp_control_handler {
-	uint8_t id;
-	uint8_t code;
-	uint8_t rsp;
-	ssize_t (*func) (struct avrcp *session, uint8_t transaction,
-			uint16_t params_len, uint8_t *params, void *user_data);
-};
-
 struct avrcp_control_ind {
 	int (*get_capabilities) (struct avrcp *session, uint8_t transaction,
 							void *user_data);