diff --git a/graphics/mapper/2.0/Android.bp b/graphics/mapper/2.0/Android.bp
index 3718503..19b1388 100644
--- a/graphics/mapper/2.0/Android.bp
+++ b/graphics/mapper/2.0/Android.bp
@@ -1,15 +1,4 @@
-genrule {
-    name: "android.hardware.graphics.mapper@2.0_genc++_headers",
-    cmd: "cp $in $genDir/android/hardware/graphics/mapper/2.0",
-    srcs: ["IMapper.h", "types.h"],
-    out: [
-        "android/hardware/graphics/mapper/2.0/IMapper.h",
-        "android/hardware/graphics/mapper/2.0/types.h",
-    ],
-}
-
 cc_library_static {
     name: "android.hardware.graphics.mapper@2.0",
-    generated_headers: ["android.hardware.graphics.mapper@2.0_genc++_headers"],
-    export_generated_headers: ["android.hardware.graphics.mapper@2.0_genc++_headers"],
+    export_include_dirs: ["include"],
 }
diff --git a/graphics/mapper/2.0/IMapper.h b/graphics/mapper/2.0/include/android/hardware/graphics/mapper/2.0/IMapper.h
similarity index 100%
rename from graphics/mapper/2.0/IMapper.h
rename to graphics/mapper/2.0/include/android/hardware/graphics/mapper/2.0/IMapper.h
diff --git a/graphics/mapper/2.0/types.h b/graphics/mapper/2.0/include/android/hardware/graphics/mapper/2.0/types.h
similarity index 100%
rename from graphics/mapper/2.0/types.h
rename to graphics/mapper/2.0/include/android/hardware/graphics/mapper/2.0/types.h