diff --git a/media/libeffects/factory/Android.bp b/media/libeffects/factory/Android.bp
index 6318e39..16680bd 100644
--- a/media/libeffects/factory/Android.bp
+++ b/media/libeffects/factory/Android.bp
@@ -1,3 +1,11 @@
+cc_library_headers {
+    name: "libeffects_headers",
+    vendor_available: true,
+    export_include_dirs: ["include"],
+    header_libs: ["libhardware_headers"],
+    export_header_lib_headers: ["libhardware_headers"],
+}
+
 // Effect factory library
 cc_library_shared {
     name: "libeffects",
@@ -12,9 +20,8 @@
 
     include_dirs: ["system/media/audio_effects/include"],
 
-    local_include_dirs:["include"],
+    local_include_dirs:["include/media"],
 
-    export_include_dirs: ["include"],
-    header_libs: ["libhardware_headers"],
-    export_header_lib_headers: ["libhardware_headers"],
+    header_libs: ["libeffects_headers"],
+    export_header_lib_headers: ["libeffects_headers"],
 }
diff --git a/media/libeffects/factory/include/EffectsFactoryApi.h b/media/libeffects/factory/include/media/EffectsFactoryApi.h
similarity index 100%
rename from media/libeffects/factory/include/EffectsFactoryApi.h
rename to media/libeffects/factory/include/media/EffectsFactoryApi.h