diff --git a/android/mapboxgl-app.gyp b/android/mapboxgl-app.gyp
index 1140dd5cb..938546636 100644
--- a/android/mapboxgl-app.gyp
+++ b/android/mapboxgl-app.gyp
@@ -20,6 +20,7 @@
           '<@(openssl_static_libs)',
           '<@(curl_static_libs)',
           '<@(png_static_libs)',
+          '<@(jpeg_static_libs)',
           '<@(sqlite3_static_libs)',
           '<@(uv_static_libs)',
           '<@(nu_static_libs)',
@@ -34,6 +35,7 @@
           '-lstdc++',
           '-latomic',
           '<@(png_ldflags)',
+          '<@(jpeg_ldflags)',
           '<@(sqlite3_ldflags)',
           '<@(openssl_ldflags)',
           '<@(curl_ldflags)',
diff --git a/gyp/mbgl-android.gypi b/gyp/mbgl-android.gypi
index 8f35ddea9..10ea93338 100644
--- a/gyp/mbgl-android.gypi
+++ b/gyp/mbgl-android.gypi
@@ -8,6 +8,7 @@
       'variables': {
         'cflags_cc': [
           '<@(png_cflags)',
+          '<@(jpeg_cflags)',
           '<@(uv_cflags)',
           '<@(curl_cflags)',
           '<@(nu_cflags)',
@@ -21,6 +22,7 @@
         ],
         'ldflags': [
           '<@(png_ldflags)',
+          '<@(jpeg_ldflags)',
           '<@(uv_ldflags)',
           '<@(curl_ldflags)',
           '<@(nu_ldflags)',
@@ -35,6 +37,9 @@
         '../platform/default/string_stdlib.cpp',
         '../platform/default/http_request_baton_curl.cpp',
         '../platform/default/image.cpp',
+        '../platform/default/image_reader.cpp',
+        '../platform/default/png_reader.cpp',
+        '../platform/default/jpeg_reader.cpp',
       ],
       'include_dirs': [
         '../include',
diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi
index aee928685..28d8fc33a 100644
--- a/gyp/mbgl-linux.gypi
+++ b/gyp/mbgl-linux.gypi
@@ -8,7 +8,7 @@
       'variables': {
         'cflags_cc': [
           '<@(png_cflags)',
-	  '<@(jpeg_cflags)',
+	      '<@(jpeg_cflags)',
           '<@(uv_cflags)',
           '<@(curl_cflags)',
           '<@(nu_cflags)',