diff --git a/gyp/http-android.gypi b/gyp/http-android.gypi
index 84a44adcb..0a49644e0 100644
--- a/gyp/http-android.gypi
+++ b/gyp/http-android.gypi
@@ -12,6 +12,7 @@
 
       'include_dirs': [
         '../include',
+        '../platform/android/include',
         '../src',
       ],
 
diff --git a/gyp/platform-android.gypi b/gyp/platform-android.gypi
index c9a7d3b6a..73fa264f1 100644
--- a/gyp/platform-android.gypi
+++ b/gyp/platform-android.gypi
@@ -47,6 +47,7 @@
 
       'include_dirs': [
         '../include',
+        '../platform/android/include',
         '../src',
       ],
 
diff --git a/include/mbgl/android/jni.hpp b/platform/android/include/mbgl/android/jni.hpp
similarity index 100%
rename from include/mbgl/android/jni.hpp
rename to platform/android/include/mbgl/android/jni.hpp
diff --git a/include/mbgl/android/native_map_view.hpp b/platform/android/include/mbgl/android/native_map_view.hpp
similarity index 100%
rename from include/mbgl/android/native_map_view.hpp
rename to platform/android/include/mbgl/android/native_map_view.hpp
diff --git a/platform/android/mapboxgl-app.gypi b/platform/android/mapboxgl-app.gypi
index ced569a4b..4686c79c2 100644
--- a/platform/android/mapboxgl-app.gypi
+++ b/platform/android/mapboxgl-app.gypi
@@ -16,6 +16,10 @@
         'mbgl.gyp:cache-<(cache_lib)',
       ],
 
+      'include_dirs': [
+        './include',
+      ],
+
       'sources': [
         './native_map_view.cpp',
         './jni.cpp',