diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 02987d1..0c52f0c 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -1650,15 +1650,17 @@
 LOCAL_AIDL_INCLUDES := \
     $(LOCAL_PATH)/binder \
     frameworks/native/aidl/binder
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-    $(LOCAL_PATH)/binder
 LOCAL_CPPFLAGS := $(L_CPPFLAGS)
+LOCAL_C_INCLUDES = \
+    $(LOCAL_PATH)/binder/include
 LOCAL_SRC_FILES := \
     binder/binder_constants.cpp \
     binder/fi/w1/wpa_supplicant/ISupplicant.aidl \
     binder/fi/w1/wpa_supplicant/ISupplicantCallbacks.aidl \
     binder/fi/w1/wpa_supplicant/IIface.aidl
 LOCAL_SHARED_LIBRARIES := libbinder
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+    $(LOCAL_PATH)/binder/include
 include $(BUILD_STATIC_LIBRARY)
 
 ### Binder service library ###
diff --git a/wpa_supplicant/binder/binder_constants.cpp b/wpa_supplicant/binder/binder_constants.cpp
index 0d452b1..848c70e 100644
--- a/wpa_supplicant/binder/binder_constants.cpp
+++ b/wpa_supplicant/binder/binder_constants.cpp
@@ -7,7 +7,7 @@
  * See README for more details.
  */
 
-#include "binder_constants.h"
+#include "wpa_supplicant_binder/binder_constants.h"
 
 namespace wpa_supplicant_binder {
 namespace binder_constants {
diff --git a/wpa_supplicant/binder/binder_manager.cpp b/wpa_supplicant/binder/binder_manager.cpp
index 6551b50..7b54b66 100644
--- a/wpa_supplicant/binder/binder_manager.cpp
+++ b/wpa_supplicant/binder/binder_manager.cpp
@@ -9,8 +9,8 @@
 
 #include <binder/IServiceManager.h>
 
-#include "binder_constants.h"
 #include "binder_manager.h"
+#include "wpa_supplicant_binder/binder_constants.h"
 
 extern "C" {
 #include "utils/common.h"
diff --git a/wpa_supplicant/binder/binder_constants.h b/wpa_supplicant/binder/include/wpa_supplicant_binder/binder_constants.h
similarity index 100%
rename from wpa_supplicant/binder/binder_constants.h
rename to wpa_supplicant/binder/include/wpa_supplicant_binder/binder_constants.h