diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 04868f4..867af85 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -1681,20 +1681,23 @@
 LOCAL_CPPFLAGS := $(L_CPPFLAGS)
 LOCAL_CFLAGS := $(L_CFLAGS)
 LOCAL_C_INCLUDES := $(INCLUDES)
+HIDL_INTERFACE_VERSION = 1.0
 LOCAL_SRC_FILES := \
-    hidl/hidl.cpp \
-    hidl/hidl_manager.cpp \
-    hidl/iface_config_utils.cpp \
-    hidl/p2p_iface.cpp \
-    hidl/p2p_network.cpp \
-    hidl/sta_iface.cpp \
-    hidl/sta_network.cpp \
-    hidl/supplicant.cpp
+    hidl/$(HIDL_INTERFACE_VERSION)/hidl.cpp \
+    hidl/$(HIDL_INTERFACE_VERSION)/hidl_manager.cpp \
+    hidl/$(HIDL_INTERFACE_VERSION)/iface_config_utils.cpp \
+    hidl/$(HIDL_INTERFACE_VERSION)/p2p_iface.cpp \
+    hidl/$(HIDL_INTERFACE_VERSION)/p2p_network.cpp \
+    hidl/$(HIDL_INTERFACE_VERSION)/sta_iface.cpp \
+    hidl/$(HIDL_INTERFACE_VERSION)/sta_network.cpp \
+    hidl/$(HIDL_INTERFACE_VERSION)/supplicant.cpp
 LOCAL_SHARED_LIBRARIES := \
-    android.hardware.wifi.supplicant@1.0 \
+    android.hardware.wifi.supplicant@$(HIDL_INTERFACE_VERSION) \
     libhidlbase \
     libhidltransport \
     libhwbinder \
     libutils
+LOCAL_EXPORT_C_INCLUDE_DIRS := \
+    $(LOCAL_PATH)/hidl/$(HIDL_INTERFACE_VERSION)
 include $(BUILD_STATIC_LIBRARY)
 endif # WPA_SUPPLICANT_USE_HIDL == y
diff --git a/wpa_supplicant/hidl/hidl.cpp b/wpa_supplicant/hidl/1.0/hidl.cpp
similarity index 100%
rename from wpa_supplicant/hidl/hidl.cpp
rename to wpa_supplicant/hidl/1.0/hidl.cpp
diff --git a/wpa_supplicant/hidl/hidl.h b/wpa_supplicant/hidl/1.0/hidl.h
similarity index 100%
rename from wpa_supplicant/hidl/hidl.h
rename to wpa_supplicant/hidl/1.0/hidl.h
diff --git a/wpa_supplicant/hidl/hidl_constants.h b/wpa_supplicant/hidl/1.0/hidl_constants.h
similarity index 100%
rename from wpa_supplicant/hidl/hidl_constants.h
rename to wpa_supplicant/hidl/1.0/hidl_constants.h
diff --git a/wpa_supplicant/hidl/hidl_i.h b/wpa_supplicant/hidl/1.0/hidl_i.h
similarity index 100%
rename from wpa_supplicant/hidl/hidl_i.h
rename to wpa_supplicant/hidl/1.0/hidl_i.h
diff --git a/wpa_supplicant/hidl/hidl_manager.cpp b/wpa_supplicant/hidl/1.0/hidl_manager.cpp
similarity index 100%
rename from wpa_supplicant/hidl/hidl_manager.cpp
rename to wpa_supplicant/hidl/1.0/hidl_manager.cpp
diff --git a/wpa_supplicant/hidl/hidl_manager.h b/wpa_supplicant/hidl/1.0/hidl_manager.h
similarity index 100%
rename from wpa_supplicant/hidl/hidl_manager.h
rename to wpa_supplicant/hidl/1.0/hidl_manager.h
diff --git a/wpa_supplicant/hidl/hidl_return_util.h b/wpa_supplicant/hidl/1.0/hidl_return_util.h
similarity index 100%
rename from wpa_supplicant/hidl/hidl_return_util.h
rename to wpa_supplicant/hidl/1.0/hidl_return_util.h
diff --git a/wpa_supplicant/hidl/iface_config_utils.cpp b/wpa_supplicant/hidl/1.0/iface_config_utils.cpp
similarity index 100%
rename from wpa_supplicant/hidl/iface_config_utils.cpp
rename to wpa_supplicant/hidl/1.0/iface_config_utils.cpp
diff --git a/wpa_supplicant/hidl/iface_config_utils.h b/wpa_supplicant/hidl/1.0/iface_config_utils.h
similarity index 100%
rename from wpa_supplicant/hidl/iface_config_utils.h
rename to wpa_supplicant/hidl/1.0/iface_config_utils.h
diff --git a/wpa_supplicant/hidl/misc_utils.h b/wpa_supplicant/hidl/1.0/misc_utils.h
similarity index 100%
rename from wpa_supplicant/hidl/misc_utils.h
rename to wpa_supplicant/hidl/1.0/misc_utils.h
diff --git a/wpa_supplicant/hidl/p2p_iface.cpp b/wpa_supplicant/hidl/1.0/p2p_iface.cpp
similarity index 100%
rename from wpa_supplicant/hidl/p2p_iface.cpp
rename to wpa_supplicant/hidl/1.0/p2p_iface.cpp
diff --git a/wpa_supplicant/hidl/p2p_iface.h b/wpa_supplicant/hidl/1.0/p2p_iface.h
similarity index 100%
rename from wpa_supplicant/hidl/p2p_iface.h
rename to wpa_supplicant/hidl/1.0/p2p_iface.h
diff --git a/wpa_supplicant/hidl/p2p_network.cpp b/wpa_supplicant/hidl/1.0/p2p_network.cpp
similarity index 100%
rename from wpa_supplicant/hidl/p2p_network.cpp
rename to wpa_supplicant/hidl/1.0/p2p_network.cpp
diff --git a/wpa_supplicant/hidl/p2p_network.h b/wpa_supplicant/hidl/1.0/p2p_network.h
similarity index 100%
rename from wpa_supplicant/hidl/p2p_network.h
rename to wpa_supplicant/hidl/1.0/p2p_network.h
diff --git a/wpa_supplicant/hidl/sta_iface.cpp b/wpa_supplicant/hidl/1.0/sta_iface.cpp
similarity index 100%
rename from wpa_supplicant/hidl/sta_iface.cpp
rename to wpa_supplicant/hidl/1.0/sta_iface.cpp
diff --git a/wpa_supplicant/hidl/sta_iface.h b/wpa_supplicant/hidl/1.0/sta_iface.h
similarity index 100%
rename from wpa_supplicant/hidl/sta_iface.h
rename to wpa_supplicant/hidl/1.0/sta_iface.h
diff --git a/wpa_supplicant/hidl/sta_network.cpp b/wpa_supplicant/hidl/1.0/sta_network.cpp
similarity index 100%
rename from wpa_supplicant/hidl/sta_network.cpp
rename to wpa_supplicant/hidl/1.0/sta_network.cpp
diff --git a/wpa_supplicant/hidl/sta_network.h b/wpa_supplicant/hidl/1.0/sta_network.h
similarity index 100%
rename from wpa_supplicant/hidl/sta_network.h
rename to wpa_supplicant/hidl/1.0/sta_network.h
diff --git a/wpa_supplicant/hidl/supplicant.cpp b/wpa_supplicant/hidl/1.0/supplicant.cpp
similarity index 100%
rename from wpa_supplicant/hidl/supplicant.cpp
rename to wpa_supplicant/hidl/1.0/supplicant.cpp
diff --git a/wpa_supplicant/hidl/supplicant.h b/wpa_supplicant/hidl/1.0/supplicant.h
similarity index 100%
rename from wpa_supplicant/hidl/supplicant.h
rename to wpa_supplicant/hidl/1.0/supplicant.h
diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c
index c720c32..9464c4b 100644
--- a/wpa_supplicant/notify.c
+++ b/wpa_supplicant/notify.c
@@ -23,7 +23,7 @@
 #include "p2p_supplicant.h"
 #include "sme.h"
 #include "notify.h"
-#include "hidl/hidl.h"
+#include "hidl.h"
 
 int wpas_notify_supplicant_initialized(struct wpa_global *global)
 {