diff --git a/android/Android.mk b/android/Android.mk
index 720e988..91b9562 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -497,7 +497,7 @@ LOCAL_SRC_FILES := \
 
 LOCAL_C_INCLUDES := \
 	$(LOCAL_PATH)/bluez \
-	$(LOCAL_PATH)/bluez/android/compat_includes \
+	$(LOCAL_PATH)/bluez/android/compat \
 
 LOCAL_CFLAGS := $(BLUEZ_COMMON_CFLAGS)
 
diff --git a/android/Makefile.am b/android/Makefile.am
index 9c0c96d..4f13c4d 100644
--- a/android/Makefile.am
+++ b/android/Makefile.am
@@ -218,9 +218,9 @@ android_test_ipc_LDADD = src/libshared-glib.la @GLIB_LIBS@
 endif
 
 EXTRA_DIST += android/Android.mk android/README \
-				android/compat_includes/readline/history.h \
-				android/compat_includes/readline/readline.h \
-				android/compat_includes/wordexp.h \
+				android/compat/readline/history.h \
+				android/compat/readline/readline.h \
+				android/compat/wordexp.h \
 				android/bluetoothd-wrapper.c \
 				android/log.c \
 				android/bluetoothd.te \
diff --git a/android/compat_includes/readline/history.h b/android/compat/readline/history.h
similarity index 100%
rename from android/compat_includes/readline/history.h
rename to android/compat/readline/history.h
diff --git a/android/compat_includes/readline/readline.h b/android/compat/readline/readline.h
similarity index 100%
rename from android/compat_includes/readline/readline.h
rename to android/compat/readline/readline.h
diff --git a/android/compat_includes/wordexp.h b/android/compat/wordexp.h
similarity index 100%
rename from android/compat_includes/wordexp.h
rename to android/compat/wordexp.h