diff --git a/Android.bp b/Android.bp
index 6e49e0a604..67198de059 100644
--- a/Android.bp
+++ b/Android.bp
@@ -85,7 +85,7 @@ cc_library_headers {
 cc_library_headers {
     name: "smmu_proxy_uapi_header",
     vendor_available: true,
-    export_include_dirs: ["smmu-proxy/uapi/"],
+    export_include_dirs: ["smmu-proxy/include/uapi/"],
 }
 
 cc_library_headers {
diff --git a/BUILD.bazel b/BUILD.bazel
index 469dfa45b0..e6bdb1220e 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -68,7 +68,7 @@ ddk_headers(
     hdrs = glob([
         "smmu-proxy/*.h",
         "smmu-proxy/linux/*.h",
-        "smmu-proxy/uapi/linux/*.h"
+        "smmu-proxy/include/uapi/linux/*.h"
     ]),
     includes = [".", "smmu-proxy"],
 )
diff --git a/smmu-proxy/uapi/linux/qti-smmu-proxy.h b/smmu-proxy/include/uapi/linux/qti-smmu-proxy.h
similarity index 100%
rename from smmu-proxy/uapi/linux/qti-smmu-proxy.h
rename to smmu-proxy/include/uapi/linux/qti-smmu-proxy.h
diff --git a/smmu-proxy/linux/qti-smmu-proxy.h b/smmu-proxy/linux/qti-smmu-proxy.h
index 446bbf0b04..1c1ac15d0d 100644
--- a/smmu-proxy/linux/qti-smmu-proxy.h
+++ b/smmu-proxy/linux/qti-smmu-proxy.h
@@ -9,7 +9,7 @@
 #include <linux/scatterlist.h>
 #include <linux/align.h>
 
-#include <smmu-proxy/uapi/linux/qti-smmu-proxy.h>
+#include <smmu-proxy/include/uapi/linux/qti-smmu-proxy.h>
 
 #define SMMU_PROXY_MEM_ALIGNMENT (1 << 21)