diff --git a/cpp/Android.bp b/cpp/Android.bp
index 9d9041c..28ed223 100644
--- a/cpp/Android.bp
+++ b/cpp/Android.bp
@@ -58,8 +58,14 @@
 
     // We need to export not just rs/cpp but also rs.  This is because
     // RenderScript.h includes rsCppStructs.h, which includes rs/rsDefines.h.
-    header_libs: ["rs-headers"],
-    export_header_lib_headers: ["rs-headers"],
+    header_libs: [
+        "jni_headers",
+        "rs-headers"
+    ],
+    export_header_lib_headers: [
+        "jni_headers",
+        "rs-headers"
+    ],
     export_include_dirs: ["."],
 
     shared_libs: [
diff --git a/support/jni/Android.bp b/support/jni/Android.bp
index 4f4fef8..331ea01 100644
--- a/support/jni/Android.bp
+++ b/support/jni/Android.bp
@@ -23,6 +23,8 @@
         "-DRS_COMPATIBILITY_LIB",
     ],
 
+    header_libs: ["jni_headers"],
+
     shared_libs: [
         "libandroid",
         "libdl",
@@ -43,6 +45,9 @@
 
     srcs: ["android_renderscript_RenderScript.cpp"],
 
+    header_libs: ["jni_headers"],
+    export_header_lib_headers: ["jni_headers"],
+
     shared_libs: [
         "libdl",
         "libjnigraphics",