diff --git a/android/Android.mk b/android/Android.mk
index f9bf070..51037a7 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -22,7 +22,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := \
 	main.c \
 	adapter.c \
-	hid.c \
+	hidhost.c \
 	socket.c \
 	ipc.c ipc.h \
 	a2dp.c \
diff --git a/android/Makefile.am b/android/Makefile.am
index 6790f24..073edc8 100644
--- a/android/Makefile.am
+++ b/android/Makefile.am
@@ -17,7 +17,7 @@ android_bluetoothd_SOURCES = android/main.c \
 				src/shared/util.h src/shared/util.c \
 				src/shared/mgmt.h src/shared/mgmt.c \
 				android/adapter.h android/adapter.c \
-				android/hid.h android/hid.c \
+				android/hidhost.h android/hidhost.c \
 				android/ipc.h android/ipc.c \
 				android/a2dp.h android/a2dp.c \
 				android/socket.h android/socket.c \
diff --git a/android/hid.c b/android/hidhost.c
similarity index 99%
rename from android/hid.c
rename to android/hidhost.c
index 1089301..c7b4114 100644
--- a/android/hid.c
+++ b/android/hidhost.c
@@ -46,7 +46,7 @@
 #include "log.h"
 #include "hal-msg.h"
 #include "ipc.h"
-#include "hid.h"
+#include "hidhost.h"
 #include "adapter.h"
 #include "utils.h"
 
diff --git a/android/hid.h b/android/hidhost.h
similarity index 100%
rename from android/hid.h
rename to android/hidhost.h
diff --git a/android/main.c b/android/main.c
index 71fc60b..057c2f7 100644
--- a/android/main.c
+++ b/android/main.c
@@ -50,7 +50,7 @@
 
 #include "adapter.h"
 #include "socket.h"
-#include "hid.h"
+#include "hidhost.h"
 #include "hal-msg.h"
 #include "ipc.h"
 #include "a2dp.h"