diff --git a/gyp/platform-android.gypi b/gyp/platform-android.gypi
index b66c297c6..89f624657 100644
--- a/gyp/platform-android.gypi
+++ b/gyp/platform-android.gypi
@@ -20,6 +20,8 @@
         '../platform/default/png_reader.cpp',
         '../platform/default/jpeg_reader.cpp',
         '../platform/default/timer.cpp',
+        '../platform/default/default_file_source.cpp',
+        '../platform/default/online_file_source.cpp',
       ],
 
       'variables': {
diff --git a/gyp/platform-ios.gypi b/gyp/platform-ios.gypi
index 8707a4272..4383efd94 100644
--- a/gyp/platform-ios.gypi
+++ b/gyp/platform-ios.gypi
@@ -13,6 +13,8 @@
         '../platform/default/async_task.cpp',
         '../platform/default/run_loop.cpp',
         '../platform/default/timer.cpp',
+        '../platform/default/default_file_source.cpp',
+        '../platform/default/online_file_source.cpp',
         '../platform/darwin/log_nslog.mm',
         '../platform/darwin/string_nsstring.mm',
         '../platform/darwin/application_root.mm',
diff --git a/gyp/platform-linux.gypi b/gyp/platform-linux.gypi
index eb54bdf9e..a3ed71b04 100644
--- a/gyp/platform-linux.gypi
+++ b/gyp/platform-linux.gypi
@@ -21,6 +21,8 @@
         '../platform/default/png_reader.cpp',
         '../platform/default/jpeg_reader.cpp',
         '../platform/default/timer.cpp',
+        '../platform/default/default_file_source.cpp',
+        '../platform/default/online_file_source.cpp',
       ],
 
       'variables': {
diff --git a/gyp/platform-osx.gypi b/gyp/platform-osx.gypi
index 6ad948c27..9af1cbd77 100644
--- a/gyp/platform-osx.gypi
+++ b/gyp/platform-osx.gypi
@@ -13,6 +13,8 @@
         '../platform/default/async_task.cpp',
         '../platform/default/run_loop.cpp',
         '../platform/default/timer.cpp',
+        '../platform/default/default_file_source.cpp',
+        '../platform/default/online_file_source.cpp',
         '../platform/darwin/log_nslog.mm',
         '../platform/darwin/string_nsstring.mm',
         '../platform/darwin/application_root.mm',
diff --git a/src/mbgl/storage/default_file_source.cpp b/platform/default/default_file_source.cpp
similarity index 94%
rename from src/mbgl/storage/default_file_source.cpp
rename to platform/default/default_file_source.cpp
index b2ab5abd6..47af6c314 100644
--- a/src/mbgl/storage/default_file_source.cpp
+++ b/platform/default/default_file_source.cpp
@@ -1,5 +1,6 @@
 #include <mbgl/storage/default_file_source.hpp>
-#include <mbgl/storage/online_file_source.hpp>
+
+#include "online_file_source.hpp"
 
 namespace mbgl {
 
diff --git a/src/mbgl/storage/online_file_source.cpp b/platform/default/online_file_source.cpp
similarity index 99%
rename from src/mbgl/storage/online_file_source.cpp
rename to platform/default/online_file_source.cpp
index 1f3ccbcbd..22c3684e7 100644
--- a/src/mbgl/storage/online_file_source.cpp
+++ b/platform/default/online_file_source.cpp
@@ -1,4 +1,4 @@
-#include <mbgl/storage/online_file_source.hpp>
+#include "online_file_source.hpp"
 #include <mbgl/storage/asset_context_base.hpp>
 #include <mbgl/storage/http_context_base.hpp>
 #include <mbgl/storage/network_status.hpp>
diff --git a/src/mbgl/storage/online_file_source.hpp b/platform/default/online_file_source.hpp
similarity index 100%
rename from src/mbgl/storage/online_file_source.hpp
rename to platform/default/online_file_source.hpp