[core] Organize files that were in map folder better

Fixes #996

42 files changed, 56 insertions, 53 deletions

diff --git a/src/mbgl/annotation/annotation_tile.hpp b/src/mbgl/annotation/annotation_tile.hpp
index 742a4114a8..b2d98c6a3b 100644
--- a/src/mbgl/annotation/annotation_tile.hpp
+++ b/src/mbgl/annotation/annotation_tile.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_ANNOTATION_TILE
 #define MBGL_ANNOTATION_TILE
 
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/map/tile_id.hpp>
 
 #include <map>
diff --git a/src/mbgl/map/tile.cpp b/src/mbgl/map/tile.cpp
deleted file mode 100644
index 408cdfaec5..0000000000
--- a/src/mbgl/map/tile.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <mbgl/map/tile.hpp>
-
-using namespace mbgl;
diff --git a/src/mbgl/renderer/circle_bucket.hpp b/src/mbgl/renderer/circle_bucket.hpp
index f85c9267d3..d098a7a686 100644
--- a/src/mbgl/renderer/circle_bucket.hpp
+++ b/src/mbgl/renderer/circle_bucket.hpp
@@ -3,7 +3,7 @@
 
 #include <mbgl/renderer/bucket.hpp>
 
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 
 #include <mbgl/geometry/elements_buffer.hpp>
 #include <mbgl/geometry/circle_buffer.hpp>
diff --git a/src/mbgl/renderer/debug_bucket.hpp b/src/mbgl/renderer/debug_bucket.hpp
index 5c7511ce87..9338f65157 100644
--- a/src/mbgl/renderer/debug_bucket.hpp
+++ b/src/mbgl/renderer/debug_bucket.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_RENDERER_DEBUGBUCKET
 #define MBGL_RENDERER_DEBUGBUCKET
 
-#include <mbgl/map/tile_data.hpp>
+#include <mbgl/tile/tile_data.hpp>
 #include <mbgl/map/mode.hpp>
 #include <mbgl/geometry/debug_font_buffer.hpp>
 #include <mbgl/geometry/vao.hpp>
diff --git a/src/mbgl/renderer/fill_bucket.hpp b/src/mbgl/renderer/fill_bucket.hpp
index 674c41f7d1..9b2022af50 100644
--- a/src/mbgl/renderer/fill_bucket.hpp
+++ b/src/mbgl/renderer/fill_bucket.hpp
@@ -2,7 +2,7 @@
 #define MBGL_RENDERER_FILLBUCKET
 
 #include <mbgl/renderer/bucket.hpp>
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/geometry/elements_buffer.hpp>
 #include <mbgl/geometry/fill_buffer.hpp>
 
diff --git a/src/mbgl/renderer/line_bucket.hpp b/src/mbgl/renderer/line_bucket.hpp
index 7d662aac02..0c4c1f5d91 100644
--- a/src/mbgl/renderer/line_bucket.hpp
+++ b/src/mbgl/renderer/line_bucket.hpp
@@ -2,7 +2,7 @@
 #define MBGL_RENDERER_LINEBUCKET
 
 #include <mbgl/renderer/bucket.hpp>
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/geometry/vao.hpp>
 #include <mbgl/geometry/elements_buffer.hpp>
 #include <mbgl/geometry/line_buffer.hpp>
diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp
index fe0118952a..1ade5c0396 100644
--- a/src/mbgl/renderer/painter.cpp
+++ b/src/mbgl/renderer/painter.cpp
@@ -1,7 +1,7 @@
 #include <mbgl/renderer/painter.hpp>
 
-#include <mbgl/map/source.hpp>
-#include <mbgl/map/tile.hpp>
+#include <mbgl/source/source.hpp>
+#include <mbgl/tile/tile.hpp>
 #include <mbgl/map/map_context.hpp>
 #include <mbgl/map/map_data.hpp>
 
diff --git a/src/mbgl/renderer/painter_clipping.cpp b/src/mbgl/renderer/painter_clipping.cpp
index 618c1093af..3dfe8101db 100644
--- a/src/mbgl/renderer/painter_clipping.cpp
+++ b/src/mbgl/renderer/painter_clipping.cpp
@@ -1,5 +1,5 @@
 #include <mbgl/renderer/painter.hpp>
-#include <mbgl/map/source.hpp>
+#include <mbgl/source/source.hpp>
 #include <mbgl/shader/plain_shader.hpp>
 #include <mbgl/util/clip_id.hpp>
 #include <mbgl/gl/debugging.hpp>
diff --git a/src/mbgl/renderer/painter_debug.cpp b/src/mbgl/renderer/painter_debug.cpp
index 739d23a66d..a4b5ca1788 100644
--- a/src/mbgl/renderer/painter_debug.cpp
+++ b/src/mbgl/renderer/painter_debug.cpp
@@ -1,7 +1,7 @@
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/renderer/debug_bucket.hpp>
-#include <mbgl/map/tile.hpp>
-#include <mbgl/map/tile_data.hpp>
+#include <mbgl/tile/tile.hpp>
+#include <mbgl/tile/tile_data.hpp>
 #include <mbgl/map/map_data.hpp>
 #include <mbgl/shader/plain_shader.hpp>
 #include <mbgl/util/string.hpp>
diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp
index e4fccc22e9..0854f697a3 100644
--- a/src/mbgl/renderer/symbol_bucket.cpp
+++ b/src/mbgl/renderer/symbol_bucket.cpp
@@ -1,6 +1,6 @@
 #include <mbgl/renderer/symbol_bucket.hpp>
 #include <mbgl/layer/symbol_layer.hpp>
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/sprite/sprite_image.hpp>
 #include <mbgl/sprite/sprite_store.hpp>
 #include <mbgl/sprite/sprite_atlas.hpp>
diff --git a/src/mbgl/renderer/symbol_bucket.hpp b/src/mbgl/renderer/symbol_bucket.hpp
index 5728cfa28c..cca34cd858 100644
--- a/src/mbgl/renderer/symbol_bucket.hpp
+++ b/src/mbgl/renderer/symbol_bucket.hpp
@@ -2,7 +2,7 @@
 #define MBGL_RENDERER_SYMBOLBUCKET
 
 #include <mbgl/renderer/bucket.hpp>
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/map/mode.hpp>
 #include <mbgl/geometry/vao.hpp>
 #include <mbgl/geometry/elements_buffer.hpp>
diff --git a/src/mbgl/map/source.cpp b/src/mbgl/source/source.cpp
index 96af8c3cba..c98b87c33f 100644
--- a/src/mbgl/map/source.cpp
+++ b/src/mbgl/source/source.cpp
@@ -1,8 +1,8 @@
-#include <mbgl/map/source.hpp>
+#include <mbgl/source/source.hpp>
 #include <mbgl/map/map_data.hpp>
 #include <mbgl/map/transform.hpp>
-#include <mbgl/map/tile.hpp>
-#include <mbgl/map/vector_tile.hpp>
+#include <mbgl/tile/tile.hpp>
+#include <mbgl/tile/vector_tile.hpp>
 #include <mbgl/annotation/annotation_tile.hpp>
 #include <mbgl/tile/geojson_tile.hpp>
 #include <mbgl/renderer/painter.hpp>
@@ -20,8 +20,8 @@
 #include <mbgl/util/string.hpp>
 #include <mbgl/util/tile_cover.hpp>
 
-#include <mbgl/map/vector_tile_data.hpp>
-#include <mbgl/map/raster_tile_data.hpp>
+#include <mbgl/tile/vector_tile_data.hpp>
+#include <mbgl/tile/raster_tile_data.hpp>
 #include <mbgl/style/style.hpp>
 #include <mbgl/style/style_parser.hpp>
 #include <mbgl/gl/debugging.hpp>
diff --git a/src/mbgl/map/source.hpp b/src/mbgl/source/source.hpp
index d3f4abbca8..3c265e8e7b 100644
--- a/src/mbgl/map/source.hpp
+++ b/src/mbgl/source/source.hpp
@@ -1,12 +1,14 @@
 #ifndef MBGL_MAP_SOURCE
 #define MBGL_MAP_SOURCE
 
-#include <mbgl/map/tile_cache.hpp>
-#include <mbgl/map/source_info.hpp>
+#include <mbgl/tile/tile_data.hpp>
+#include <mbgl/tile/tile_cache.hpp>
+#include <mbgl/source/source_info.hpp>
 
 #include <mbgl/util/mat4.hpp>
 #include <mbgl/util/rapidjson.hpp>
 
+#include <forward_list>
 #include <vector>
 #include <map>
 
diff --git a/src/mbgl/map/source_info.hpp b/src/mbgl/source/source_info.hpp
index 2fb5c2466d..2fb5c2466d 100644
--- a/src/mbgl/map/source_info.hpp
+++ b/src/mbgl/source/source_info.hpp
diff --git a/src/mbgl/style/filter_expression.cpp b/src/mbgl/style/filter_expression.cpp
index e8231b82e0..660c978f0d 100644
--- a/src/mbgl/style/filter_expression.cpp
+++ b/src/mbgl/style/filter_expression.cpp
@@ -1,5 +1,5 @@
 #include <mbgl/style/filter_expression.hpp>
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/platform/log.hpp>
 
 namespace mbgl {
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index 1ffd75bf69..b66575c36c 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -1,7 +1,7 @@
 #include <mbgl/style/style.hpp>
 #include <mbgl/map/map_data.hpp>
-#include <mbgl/map/source.hpp>
-#include <mbgl/map/tile.hpp>
+#include <mbgl/source/source.hpp>
+#include <mbgl/tile/tile.hpp>
 #include <mbgl/map/transform_state.hpp>
 #include <mbgl/layer/symbol_layer.hpp>
 #include <mbgl/layer/custom_layer.hpp>
diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp
index 7bd98a7552..c74181ed00 100644
--- a/src/mbgl/style/style.hpp
+++ b/src/mbgl/style/style.hpp
@@ -3,7 +3,7 @@
 
 #include <mbgl/style/zoom_history.hpp>
 
-#include <mbgl/map/source.hpp>
+#include <mbgl/source/source.hpp>
 #include <mbgl/text/glyph_store.hpp>
 #include <mbgl/sprite/sprite_store.hpp>
 
diff --git a/src/mbgl/style/style_bucket_parameters.cpp b/src/mbgl/style/style_bucket_parameters.cpp
index e8303e3d8f..7bde1fd80e 100644
--- a/src/mbgl/style/style_bucket_parameters.cpp
+++ b/src/mbgl/style/style_bucket_parameters.cpp
@@ -1,5 +1,5 @@
 #include <mbgl/style/style_bucket_parameters.hpp>
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 
 namespace mbgl {
 
diff --git a/src/mbgl/style/style_bucket_parameters.hpp b/src/mbgl/style/style_bucket_parameters.hpp
index 3329cac032..134850066d 100644
--- a/src/mbgl/style/style_bucket_parameters.hpp
+++ b/src/mbgl/style/style_bucket_parameters.hpp
@@ -3,7 +3,7 @@
 
 #include <mbgl/map/mode.hpp>
 #include <mbgl/style/filter_expression.hpp>
-#include <mbgl/map/tile_data.hpp>
+#include <mbgl/tile/tile_data.hpp>
 
 #include <functional>
 
diff --git a/src/mbgl/style/style_parser.hpp b/src/mbgl/style/style_parser.hpp
index 6b7c3fefbb..280cda530b 100644
--- a/src/mbgl/style/style_parser.hpp
+++ b/src/mbgl/style/style_parser.hpp
@@ -2,7 +2,7 @@
 #define MBGL_STYLE_STYLE_PARSER
 
 #include <mbgl/style/style_layer.hpp>
-#include <mbgl/map/source.hpp>
+#include <mbgl/source/source.hpp>
 #include <mbgl/util/rapidjson.hpp>
 
 #include <vector>
diff --git a/src/mbgl/tile/geojson_tile.hpp b/src/mbgl/tile/geojson_tile.hpp
index fd27fa5917..6f3cbc10d1 100644
--- a/src/mbgl/tile/geojson_tile.hpp
+++ b/src/mbgl/tile/geojson_tile.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_ANNOTATION_GEOJSON_VT_TILE
 #define MBGL_ANNOTATION_GEOJSON_VT_TILE
 
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/map/tile_id.hpp>
 
 #include <unordered_map>
diff --git a/src/mbgl/map/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp
index 82affc689f..fa41481d4d 100644
--- a/src/mbgl/map/geometry_tile.cpp
+++ b/src/mbgl/tile/geometry_tile.cpp
@@ -1,4 +1,4 @@
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/style/filter_expression.hpp>
 #include <mbgl/style/filter_expression_private.hpp>
 
diff --git a/src/mbgl/map/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp
index 5cb2f96fdc..5cb2f96fdc 100644
--- a/src/mbgl/map/geometry_tile.hpp
+++ b/src/mbgl/tile/geometry_tile.hpp
diff --git a/src/mbgl/map/raster_tile_data.cpp b/src/mbgl/tile/raster_tile_data.cpp
index 8df4e05b62..797ee2a2b8 100644
--- a/src/mbgl/map/raster_tile_data.cpp
+++ b/src/mbgl/tile/raster_tile_data.cpp
@@ -1,5 +1,5 @@
-#include <mbgl/map/raster_tile_data.hpp>
-#include <mbgl/map/source.hpp>
+#include <mbgl/tile/raster_tile_data.hpp>
+#include <mbgl/source/source.hpp>
 #include <mbgl/storage/resource.hpp>
 #include <mbgl/storage/response.hpp>
 #include <mbgl/storage/file_source.hpp>
diff --git a/src/mbgl/map/raster_tile_data.hpp b/src/mbgl/tile/raster_tile_data.hpp
index e68fbc94c5..466d5fbf5e 100644
--- a/src/mbgl/map/raster_tile_data.hpp
+++ b/src/mbgl/tile/raster_tile_data.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_MAP_RASTER_TILE_DATA
 #define MBGL_MAP_RASTER_TILE_DATA
 
-#include <mbgl/map/tile_data.hpp>
+#include <mbgl/tile/tile_data.hpp>
 #include <mbgl/renderer/raster_bucket.hpp>
 
 namespace mbgl {
diff --git a/src/mbgl/tile/tile.cpp b/src/mbgl/tile/tile.cpp
new file mode 100644
index 0000000000..a1d36421a4
--- /dev/null
+++ b/src/mbgl/tile/tile.cpp
@@ -0,0 +1,3 @@
+#include <mbgl/tile/tile.hpp>
+
+using namespace mbgl;
diff --git a/src/mbgl/map/tile.hpp b/src/mbgl/tile/tile.hpp
index 8b9030f1bd..8b9030f1bd 100644
--- a/src/mbgl/map/tile.hpp
+++ b/src/mbgl/tile/tile.hpp
diff --git a/src/mbgl/map/tile_cache.cpp b/src/mbgl/tile/tile_cache.cpp
index 2d1a0da96c..423b355827 100644
--- a/src/mbgl/map/tile_cache.cpp
+++ b/src/mbgl/tile/tile_cache.cpp
@@ -1,4 +1,5 @@
-#include <mbgl/map/tile_cache.hpp>
+#include <mbgl/tile/tile_cache.hpp>
+#include <mbgl/tile/tile_data.hpp>
 
 #include <cassert>
 
diff --git a/src/mbgl/map/tile_cache.hpp b/src/mbgl/tile/tile_cache.hpp
index e39db0ffae..199f611e79 100644
--- a/src/mbgl/map/tile_cache.hpp
+++ b/src/mbgl/tile/tile_cache.hpp
@@ -1,13 +1,13 @@
 #ifndef MBGL_MAP_TILE_CACHE
 #define MBGL_MAP_TILE_CACHE
 
-#include <mbgl/map/tile_data.hpp>
-
 #include <list>
 #include <unordered_map>
 
 namespace mbgl {
 
+class TileData;
+
 class TileCache {
 public:
     TileCache(size_t size_ = 0) : size(size_) {}
@@ -18,6 +18,7 @@ public:
     std::shared_ptr<TileData> get(uint64_t key);
     bool has(uint64_t key);
     void clear();
+
 private:
     std::unordered_map<uint64_t, std::shared_ptr<TileData>> tiles;
     std::list<uint64_t> orderedKeys;
diff --git a/src/mbgl/map/tile_data.cpp b/src/mbgl/tile/tile_data.cpp
index edfe4d7ada..46ce64771c 100644
--- a/src/mbgl/map/tile_data.cpp
+++ b/src/mbgl/tile/tile_data.cpp
@@ -1,4 +1,4 @@
-#include <mbgl/map/tile_data.hpp>
+#include <mbgl/tile/tile_data.hpp>
 #include <mbgl/renderer/debug_bucket.hpp>
 #include <mbgl/util/string.hpp>
 
diff --git a/src/mbgl/map/tile_data.hpp b/src/mbgl/tile/tile_data.hpp
index 90196f8a42..90196f8a42 100644
--- a/src/mbgl/map/tile_data.hpp
+++ b/src/mbgl/tile/tile_data.hpp
diff --git a/src/mbgl/map/tile_worker.cpp b/src/mbgl/tile/tile_worker.cpp
index edbd392057..917b61fde9 100644
--- a/src/mbgl/map/tile_worker.cpp
+++ b/src/mbgl/tile/tile_worker.cpp
@@ -1,6 +1,6 @@
 #include <mbgl/text/collision_tile.hpp>
-#include <mbgl/map/tile_worker.hpp>
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/tile_worker.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/style/style_layer.hpp>
 #include <mbgl/style/style_bucket_parameters.hpp>
 #include <mbgl/layer/background_layer.hpp>
diff --git a/src/mbgl/map/tile_worker.hpp b/src/mbgl/tile/tile_worker.hpp
index bcd8e59bf9..08048c134b 100644
--- a/src/mbgl/map/tile_worker.hpp
+++ b/src/mbgl/tile/tile_worker.hpp
@@ -4,7 +4,7 @@
 #include <mapbox/variant.hpp>
 
 #include <mbgl/map/mode.hpp>
-#include <mbgl/map/tile_data.hpp>
+#include <mbgl/tile/tile_data.hpp>
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/ptr.hpp>
 #include <mbgl/text/placement_config.hpp>
diff --git a/src/mbgl/map/vector_tile.cpp b/src/mbgl/tile/vector_tile.cpp
index 6de3b76b4f..da070abe2e 100644
--- a/src/mbgl/map/vector_tile.cpp
+++ b/src/mbgl/tile/vector_tile.cpp
@@ -1,5 +1,5 @@
-#include <mbgl/map/vector_tile.hpp>
-#include <mbgl/map/source.hpp>
+#include <mbgl/tile/vector_tile.hpp>
+#include <mbgl/source/source.hpp>
 #include <mbgl/storage/resource.hpp>
 #include <mbgl/storage/response.hpp>
 #include <mbgl/storage/file_source.hpp>
diff --git a/src/mbgl/map/vector_tile.hpp b/src/mbgl/tile/vector_tile.hpp
index 8550b1c55a..15cd70a9d4 100644
--- a/src/mbgl/map/vector_tile.hpp
+++ b/src/mbgl/tile/vector_tile.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_MAP_VECTOR_TILE
 #define MBGL_MAP_VECTOR_TILE
 
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/map/tile_id.hpp>
 #include <mbgl/util/pbf.hpp>
 
diff --git a/src/mbgl/map/vector_tile_data.cpp b/src/mbgl/tile/vector_tile_data.cpp
index 27172a3e63..d2eecab975 100644
--- a/src/mbgl/map/vector_tile_data.cpp
+++ b/src/mbgl/tile/vector_tile_data.cpp
@@ -1,5 +1,5 @@
-#include <mbgl/map/vector_tile_data.hpp>
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/vector_tile_data.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/style/style_layer.hpp>
 #include <mbgl/util/worker.hpp>
 #include <mbgl/util/work_request.hpp>
diff --git a/src/mbgl/map/vector_tile_data.hpp b/src/mbgl/tile/vector_tile_data.hpp
index b61b2a25a0..d0b599c4cf 100644
--- a/src/mbgl/map/vector_tile_data.hpp
+++ b/src/mbgl/tile/vector_tile_data.hpp
@@ -1,8 +1,8 @@
 #ifndef MBGL_MAP_VECTOR_TILE_DATA
 #define MBGL_MAP_VECTOR_TILE_DATA
 
-#include <mbgl/map/tile_data.hpp>
-#include <mbgl/map/tile_worker.hpp>
+#include <mbgl/tile/tile_data.hpp>
+#include <mbgl/tile/tile_worker.hpp>
 #include <mbgl/text/placement_config.hpp>
 
 #include <atomic>
diff --git a/src/mbgl/util/clip_id.cpp b/src/mbgl/util/clip_id.cpp
index 8274be338d..47a5877bb6 100644
--- a/src/mbgl/util/clip_id.cpp
+++ b/src/mbgl/util/clip_id.cpp
@@ -3,7 +3,7 @@
 #include <mbgl/platform/log.hpp>
 #include <mbgl/util/math.hpp>
 #include <mbgl/util/std.hpp>
-#include <mbgl/map/tile.hpp>
+#include <mbgl/tile/tile.hpp>
 
 #include <list>
 #include <vector>
diff --git a/src/mbgl/util/get_geometries.hpp b/src/mbgl/util/get_geometries.hpp
index 32dd389507..013a7e5b9f 100644
--- a/src/mbgl/util/get_geometries.hpp
+++ b/src/mbgl/util/get_geometries.hpp
@@ -1,7 +1,7 @@
 #ifndef MBGL_UTIL_GET_GEOMETRIES
 #define MBGL_UTIL_GET_GEOMETRIES
 
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 
 namespace mbgl {
 
diff --git a/src/mbgl/util/tile_cover.cpp b/src/mbgl/util/tile_cover.cpp
index a9c265089b..e77ea469a7 100644
--- a/src/mbgl/util/tile_cover.cpp
+++ b/src/mbgl/util/tile_cover.cpp
@@ -2,7 +2,6 @@
 #include <mbgl/util/vec.hpp>
 #include <mbgl/util/tile_coordinate.hpp>
 #include <mbgl/util/constants.hpp>
-#include <mbgl/map/source_info.hpp>
 #include <mbgl/map/transform_state.hpp>
 
 namespace mbgl {
diff --git a/src/mbgl/util/worker.cpp b/src/mbgl/util/worker.cpp
index fe8ee81779..bc6e4be3db 100644
--- a/src/mbgl/util/worker.cpp
+++ b/src/mbgl/util/worker.cpp
@@ -3,7 +3,7 @@
 #include <mbgl/util/work_request.hpp>
 #include <mbgl/platform/platform.hpp>
 #include <mbgl/renderer/raster_bucket.hpp>
-#include <mbgl/map/geometry_tile.hpp>
+#include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/style/style_layer.hpp>
 
 #include <cassert>
diff --git a/src/mbgl/util/worker.hpp b/src/mbgl/util/worker.hpp
index d72438bc75..96a7b27885 100644
--- a/src/mbgl/util/worker.hpp
+++ b/src/mbgl/util/worker.hpp
@@ -3,7 +3,7 @@
 
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/thread.hpp>
-#include <mbgl/map/tile_worker.hpp>
+#include <mbgl/tile/tile_worker.hpp>
 
 #include <functional>
 #include <memory>