diff --git a/Android.bp b/Android.bp
index f2d87a3..038baa5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -64,8 +64,10 @@
 cc_library_shared {
     name: "libnativehelper_compat_libc++",
     clang: true,
-    local_include_dirs: ["include/nativehelper"],
-    export_include_dirs: ["include/nativehelper"],
+    export_include_dirs: [
+        "include",
+        "include/nativehelper", // TODO(b/63762847): remove
+    ],
     cflags: ["-Werror"],
     srcs: [
         "JNIHelp.cpp",
diff --git a/AsynchronousCloseMonitor.cpp b/AsynchronousCloseMonitor.cpp
index 1815580..95de317 100644
--- a/AsynchronousCloseMonitor.cpp
+++ b/AsynchronousCloseMonitor.cpp
@@ -16,7 +16,7 @@
 
 #define LOG_TAG "AsynchronousCloseMonitor"
 
-#include "AsynchronousCloseMonitor.h"
+#include <nativehelper/AsynchronousCloseMonitor.h>
 #include "cutils/log.h"
 
 #include <errno.h>
diff --git a/JNIHelp.cpp b/JNIHelp.cpp
index 54012b8..5aefd42 100644
--- a/JNIHelp.cpp
+++ b/JNIHelp.cpp
@@ -23,8 +23,8 @@
 
 #define LOG_TAG "JNIHelp"
 
-#include "JniConstants.h"
-#include "JNIHelp.h"
+#include <nativehelper/JniConstants.h>
+#include <nativehelper/JNIHelp.h>
 #include "ALog-priv.h"
 
 #include <stdio.h>
diff --git a/JniConstants.cpp b/JniConstants.cpp
index bf8a955..f42de2f 100644
--- a/JniConstants.cpp
+++ b/JniConstants.cpp
@@ -17,8 +17,8 @@
 #define LOG_TAG "JniConstants"
 
 #include "ALog-priv.h"
-#include "JniConstants.h"
-#include "ScopedLocalRef.h"
+#include <nativehelper/JniConstants.h>
+#include <nativehelper/ScopedLocalRef.h>
 
 #include <stdlib.h>
 
diff --git a/JniInvocation.cpp b/JniInvocation.cpp
index b869914..031dcb3 100644
--- a/JniInvocation.cpp
+++ b/JniInvocation.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "JniInvocation.h"
+#include <nativehelper/JniInvocation.h>
 
 #include <dlfcn.h>
 #include <stdlib.h>
diff --git a/include_deprecated/JniInvocation.h b/include_deprecated/JniInvocation.h
deleted file mode 120000
index 7801592..0000000
--- a/include_deprecated/JniInvocation.h
+++ /dev/null
@@ -1 +0,0 @@
-../include/nativehelper/JniInvocation.h
\ No newline at end of file
diff --git a/include_deprecated/ScopedLocalFrame.h b/include_deprecated/ScopedLocalFrame.h
deleted file mode 120000
index 17919a0..0000000
--- a/include_deprecated/ScopedLocalFrame.h
+++ /dev/null
@@ -1 +0,0 @@
-../include/nativehelper/ScopedLocalFrame.h
\ No newline at end of file
diff --git a/tests/JniInvocation_test.cpp b/tests/JniInvocation_test.cpp
index 7a73c70..1467cb3 100644
--- a/tests/JniInvocation_test.cpp
+++ b/tests/JniInvocation_test.cpp
@@ -16,7 +16,7 @@
 
 #define LOG_TAG "NativeBridge_test"
 
-#include <JniInvocation.h>
+#include <nativehelper/JniInvocation.h>
 #include <gtest/gtest.h>
 
 
diff --git a/toStringArray.cpp b/toStringArray.cpp
index f2b0add..3ccc053 100644
--- a/toStringArray.cpp
+++ b/toStringArray.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "JniConstants.h"
-#include "toStringArray.h"
+#include <nativehelper/JniConstants.h>
+#include <nativehelper/toStringArray.h>
 
 jobjectArray newStringArray(JNIEnv* env, size_t count) {
     return env->NewObjectArray(count, JniConstants::stringClass, NULL);