remove some unused includes

android/cpp/jni.cpp

@@ -1,5 +1,6 @@
 #include <cstdint>
 #include <cinttypes>
+#include <cassert>
 
 #include <string>
 #include <locale>

android/cpp/native_map_view.cpp

@@ -1,5 +1,6 @@
 #include <cstdlib>
 #include <ctime>
+#include <cassert>
 #include <memory>
 #include <list>
 #include <tuple>

include/mbgl/map/map.hpp

@@ -5,23 +5,17 @@
 #include <mbgl/map/update.hpp>
 #include <mbgl/map/mode.hpp>
 #include <mbgl/util/geo.hpp>
-#include <mbgl/util/projection.hpp>
 #include <mbgl/util/noncopyable.hpp>
-#include <mbgl/util/ptr.hpp>
 #include <mbgl/util/vec.hpp>
 
 #include <cstdint>
-#include <atomic>
-#include <thread>
-#include <iosfwd>
-#include <set>
+#include <string>
+#include <functional>
 #include <vector>
-#include <queue>
+#include <thread>
 #include <mutex>
 #include <condition_variable>
-#include <functional>
-
-namespace uv { class async; }
+#include <memory>
 
 namespace mbgl {
 
@@ -30,10 +24,8 @@ class View;
 class Environment;
 class EnvironmentScope;
 class MapData;
-class Worker;
-class StillImage;
-class TileID;
 class MapContext;
+class StillImage;
 
 class Map : private util::noncopyable {
     friend class View;

platform/default/glfw_view.cpp

@@ -2,6 +2,8 @@
 #include <mbgl/platform/gl.hpp>
 #include <mbgl/platform/log.hpp>
 
+#include <cassert>
+
 pthread_once_t loadGLExtensions = PTHREAD_ONCE_INIT;
 
 GLFWView::GLFWView(bool fullscreen_) : fullscreen(fullscreen_) {

src/mbgl/map/map.cpp

@@ -1,33 +1,26 @@
 #include <mbgl/map/map.hpp>
-#include <mbgl/map/update.hpp>
 #include <mbgl/map/environment.hpp>
 #include <mbgl/map/map_context.hpp>
 #include <mbgl/map/view.hpp>
 #include <mbgl/map/map_data.hpp>
 #include <mbgl/map/still_image.hpp>
-#include <mbgl/platform/platform.hpp>
-#include <mbgl/map/source.hpp>
-#include <mbgl/renderer/painter.hpp>
-#include <mbgl/map/annotation.hpp>
 #include <mbgl/map/sprite.hpp>
-#include <mbgl/util/math.hpp>
-#include <mbgl/util/clip_id.hpp>
-#include <mbgl/util/string.hpp>
-#include <mbgl/util/constants.hpp>
-#include <mbgl/util/uv_detail.hpp>
-#include <mbgl/util/std.hpp>
+#include <mbgl/map/source.hpp>
+
 #include <mbgl/style/style.hpp>
+
+#include <mbgl/renderer/painter.hpp>
+
 #include <mbgl/text/glyph_store.hpp>
+
 #include <mbgl/geometry/glyph_atlas.hpp>
-#include <mbgl/style/style_layer.hpp>
-#include <mbgl/style/style_bucket.hpp>
-#include <mbgl/util/texture_pool.hpp>
 #include <mbgl/geometry/sprite_atlas.hpp>
 #include <mbgl/geometry/line_atlas.hpp>
-#include <mbgl/storage/file_source.hpp>
-#include <mbgl/platform/log.hpp>
-#include <mbgl/util/string.hpp>
-#include <mbgl/util/uv.hpp>
+
+#include <mbgl/util/std.hpp>
+#include <mbgl/util/projection.hpp>
+#include <mbgl/util/texture_pool.hpp>
+#include <mbgl/util/uv_detail.hpp>
 #include <mbgl/util/mapbox.hpp>
 #include <mbgl/util/exception.hpp>
 #include <mbgl/util/worker.hpp>
@@ -38,8 +31,6 @@
 #define _USE_MATH_DEFINES
 #include <cmath>
 
-#include <uv.h>
-
 namespace mbgl {
 
 Map::Map(View& view_, FileSource& fileSource_)

src/mbgl/map/map_context.hpp

@@ -1,12 +1,11 @@
 #ifndef MBGL_MAP_MAP_CONTEXT
 #define MBGL_MAP_MAP_CONTEXT
 
-#include <mbgl/map/tile.hpp>
+#include <mbgl/map/tile_id.hpp>
 #include <mbgl/map/update.hpp>
 #include <mbgl/util/ptr.hpp>
 #include <mbgl/util/signal.hpp>
 
-#include <set>
 #include <vector>
 #include <queue>
 #include <future>

src/mbgl/map/view.cpp

@@ -2,6 +2,8 @@
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/still_image.hpp>
 
+#include <cassert>
+
 namespace mbgl {
 
 void View::initialize(Map *map_) {

src/mbgl/renderer/debug_bucket.cpp

@@ -1,10 +1,15 @@
 #include <mbgl/renderer/debug_bucket.hpp>
 #include <mbgl/renderer/painter.hpp>
+#include <mbgl/shader/plain_shader.hpp>
 
 #include <mbgl/platform/gl.hpp>
 
 #include <cassert>
 
+#ifndef BUFFER_OFFSET
+#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
+#endif
+
 using namespace mbgl;
 
 DebugBucket::DebugBucket(DebugFontBuffer& fontBuffer_)

src/mbgl/renderer/debug_bucket.hpp

@@ -7,10 +7,6 @@
 
 #include <vector>
 
-#ifndef BUFFER_OFFSET
-#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
-#endif
-
 namespace mbgl {
 
 class PlainShader;

src/mbgl/renderer/fill_bucket.cpp

@@ -4,18 +4,23 @@
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/style/style.hpp>
 #include <mbgl/style/style_layout.hpp>
+#include <mbgl/shader/plain_shader.hpp>
+#include <mbgl/shader/pattern_shader.hpp>
+#include <mbgl/shader/outline_shader.hpp>
 #include <mbgl/util/std.hpp>
 #include <mbgl/platform/gl.hpp>
 #include <mbgl/platform/log.hpp>
 
 #include <cassert>
 
+#ifndef BUFFER_OFFSET
+#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
+#endif
+
 struct geometry_too_long_exception : std::exception {};
 
 using namespace mbgl;
 
-
-
 void *FillBucket::alloc(void *, unsigned int size) {
     return ::malloc(size);
 }

src/mbgl/renderer/fill_bucket.hpp

@@ -11,10 +11,6 @@
 #include <vector>
 #include <memory>
 
-#ifndef BUFFER_OFFSET
-#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
-#endif
-
 namespace mbgl {
 
 class FillVertexBuffer;

src/mbgl/renderer/line_bucket.cpp

@@ -4,6 +4,9 @@
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/style/style.hpp>
 #include <mbgl/style/style_layout.hpp>
+#include <mbgl/shader/line_shader.hpp>
+#include <mbgl/shader/linesdf_shader.hpp>
+#include <mbgl/shader/linepattern_shader.hpp>
 #include <mbgl/util/math.hpp>
 #include <mbgl/util/std.hpp>
 #include <mbgl/platform/gl.hpp>

src/mbgl/renderer/painter.cpp

@@ -1,16 +1,32 @@
 #include <mbgl/renderer/painter.hpp>
+
+#include <mbgl/map/source.hpp>
+#include <mbgl/map/tile.hpp>
+
 #include <mbgl/platform/log.hpp>
+
 #include <mbgl/style/style.hpp>
 #include <mbgl/style/style_layer.hpp>
 #include <mbgl/style/style_bucket.hpp>
+
+#include <mbgl/geometry/sprite_atlas.hpp>
+
+#include <mbgl/shader/pattern_shader.hpp>
+#include <mbgl/shader/plain_shader.hpp>
+#include <mbgl/shader/outline_shader.hpp>
+#include <mbgl/shader/line_shader.hpp>
+#include <mbgl/shader/linesdf_shader.hpp>
+#include <mbgl/shader/linepattern_shader.hpp>
+#include <mbgl/shader/icon_shader.hpp>
+#include <mbgl/shader/raster_shader.hpp>
+#include <mbgl/shader/sdf_shader.hpp>
+#include <mbgl/shader/dot_shader.hpp>
+#include <mbgl/shader/gaussian_shader.hpp>
+
+
 #include <mbgl/util/std.hpp>
-#include <mbgl/util/string.hpp>
-#include <mbgl/util/clip_id.hpp>
 #include <mbgl/util/constants.hpp>
 #include <mbgl/util/mat3.hpp>
-#include <mbgl/geometry/sprite_atlas.hpp>
-#include <mbgl/map/source.hpp>
-#include <mbgl/map/tile.hpp>
 
 #if defined(DEBUG)
 #include <mbgl/util/stopwatch.hpp>

src/mbgl/renderer/painter.hpp

@@ -1,58 +1,60 @@
 #ifndef MBGL_RENDERER_PAINTER
 #define MBGL_RENDERER_PAINTER
 
-#include <mbgl/map/tile_data.hpp>
+#include <mbgl/map/transform_state.hpp>
+
+#include <mbgl/renderer/frame_history.hpp>
+
 #include <mbgl/geometry/vao.hpp>
 #include <mbgl/geometry/static_vertex_buffer.hpp>
-#include <mbgl/util/mat4.hpp>
-#include <mbgl/util/noncopyable.hpp>
-#include <mbgl/renderer/frame_history.hpp>
+
 #include <mbgl/style/types.hpp>
 
-#include <mbgl/shader/plain_shader.hpp>
-#include <mbgl/shader/outline_shader.hpp>
-#include <mbgl/shader/pattern_shader.hpp>
-#include <mbgl/shader/line_shader.hpp>
-#include <mbgl/shader/linesdf_shader.hpp>
-#include <mbgl/shader/linepattern_shader.hpp>
-#include <mbgl/shader/icon_shader.hpp>
-#include <mbgl/shader/raster_shader.hpp>
-#include <mbgl/shader/sdf_shader.hpp>
-#include <mbgl/shader/dot_shader.hpp>
-#include <mbgl/shader/gaussian_shader.hpp>
+#include <mbgl/platform/gl.hpp>
 
-#include <mbgl/map/transform_state.hpp>
-#include <mbgl/util/ptr.hpp>
+#include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/chrono.hpp>
 
-#include <map>
-#include <unordered_map>
+#include <array>
+#include <vector>
 #include <set>
 
 namespace mbgl {
 
 enum class RenderPass : bool { Opaque, Translucent };
 
-class Transform;
 class Style;
+class StyleLayer;
 class Tile;
-class Sprite;
 class SpriteAtlas;
 class GlyphAtlas;
 class LineAtlas;
 class Source;
 
+
+class DebugBucket;
 class FillBucket;
 class LineBucket;
 class SymbolBucket;
 class RasterBucket;
-class PrerenderedTexture;
 
-struct FillProperties;
 struct RasterProperties;
 
-class LayerDescription;
-class RasterTileData;
+class SDFShader;
+class PlainShader;
+class OutlineShader;
+class LineShader;
+class LinejoinShader;
+class LineSDFShader;
+class LinepatternShader;
+class PatternShader;
+class IconShader;
+class RasterShader;
+class SDFGlyphShader;
+class SDFIconShader;
+class DotShader;
+class GaussianShader;
+
 struct ClipID;
 
 class Painter : private util::noncopyable {

src/mbgl/renderer/painter_clipping.cpp

@@ -1,7 +1,12 @@
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/map/source.hpp>
+#include <mbgl/shader/plain_shader.hpp>
 #include <mbgl/util/clip_id.hpp>
 
+#ifndef BUFFER_OFFSET
+#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
+#endif
+
 using namespace mbgl;
 
 void Painter::drawClippingMasks(const std::set<Source*>& sources) {

src/mbgl/renderer/painter_debug.cpp

@@ -1,8 +1,14 @@
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/renderer/debug_bucket.hpp>
 #include <mbgl/map/tile.hpp>
+#include <mbgl/map/tile_data.hpp>
+#include <mbgl/shader/plain_shader.hpp>
 #include <mbgl/util/string.hpp>
 
+#ifndef BUFFER_OFFSET
+#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
+#endif
+
 using namespace mbgl;
 
 void Painter::renderTileDebug(const Tile& tile) {

src/mbgl/renderer/painter_fill.cpp

@@ -4,7 +4,11 @@
 #include <mbgl/style/style_layer.hpp>
 #include <mbgl/style/style_layout.hpp>
 #include <mbgl/map/sprite.hpp>
+#include <mbgl/map/tile_id.hpp>
 #include <mbgl/geometry/sprite_atlas.hpp>
+#include <mbgl/shader/outline_shader.hpp>
+#include <mbgl/shader/pattern_shader.hpp>
+#include <mbgl/shader/plain_shader.hpp>
 #include <mbgl/util/std.hpp>
 #include <mbgl/util/mat3.hpp>
 

src/mbgl/renderer/painter_line.cpp

@@ -4,6 +4,10 @@
 #include <mbgl/style/style_layer.hpp>
 #include <mbgl/style/style_layout.hpp>
 #include <mbgl/map/sprite.hpp>
+#include <mbgl/map/tile_id.hpp>
+#include <mbgl/shader/line_shader.hpp>
+#include <mbgl/shader/linesdf_shader.hpp>
+#include <mbgl/shader/linepattern_shader.hpp>
 #include <mbgl/geometry/sprite_atlas.hpp>
 #include <mbgl/geometry/line_atlas.hpp>
 

src/mbgl/renderer/painter_raster.cpp

@@ -2,6 +2,7 @@
 #include <mbgl/platform/gl.hpp>
 #include <mbgl/renderer/raster_bucket.hpp>
 #include <mbgl/style/style_layer.hpp>
+#include <mbgl/shader/raster_shader.hpp>
 #include <mbgl/util/std.hpp>
 
 using namespace mbgl;

src/mbgl/renderer/painter_symbol.cpp

@@ -4,6 +4,8 @@
 #include <mbgl/style/style_layout.hpp>
 #include <mbgl/geometry/glyph_atlas.hpp>
 #include <mbgl/geometry/sprite_atlas.hpp>
+#include <mbgl/shader/sdf_shader.hpp>
+#include <mbgl/shader/icon_shader.hpp>
 #include <mbgl/util/math.hpp>
 
 #include <cmath>

src/mbgl/renderer/raster_bucket.cpp

@@ -1,6 +1,11 @@
 #include <mbgl/renderer/raster_bucket.hpp>
+#include <mbgl/shader/raster_shader.hpp>
 #include <mbgl/renderer/painter.hpp>
 
+#ifndef BUFFER_OFFSET
+#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
+#endif
+
 using namespace mbgl;
 
 RasterBucket::RasterBucket(TexturePool& texturePool, const StyleLayoutRaster& layout_)

src/mbgl/renderer/raster_bucket.hpp

@@ -5,8 +5,6 @@
 #include <mbgl/util/raster.hpp>
 #include <mbgl/style/style_bucket.hpp>
 
-
-
 namespace mbgl {
 
 class StyleLayoutRaster;

src/mbgl/renderer/symbol_bucket.cpp

@@ -12,6 +12,8 @@
 #include <mbgl/text/placement.hpp>
 #include <mbgl/platform/log.hpp>
 #include <mbgl/text/collision.hpp>
+#include <mbgl/shader/sdf_shader.hpp>
+#include <mbgl/shader/icon_shader.hpp>
 #include <mbgl/map/sprite.hpp>
 
 #include <mbgl/util/utf.hpp>
@@ -20,6 +22,10 @@
 #include <mbgl/util/merge_lines.hpp>
 #include <mbgl/util/std.hpp>
 
+#ifndef BUFFER_OFFSET
+#define BUFFER_OFFSET(i) ((char *)nullptr + (i))
+#endif
+
 namespace mbgl {
 
 SymbolBucket::SymbolBucket(Collision &collision_)