From 04bab1af7621e79d947e9cf4c594a7cdc41e96f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= <mail@kkaefer.com>
Date: Wed, 23 Jul 2014 13:18:03 +0200
Subject: [PATCH] more include what you use

---
 include/mbgl/map/map.hpp              |  1 +
 include/mbgl/map/raster_tile_data.hpp |  8 +++++++-
 include/mbgl/map/source.hpp           | 18 ++++++++++--------
 include/mbgl/map/sprite.hpp           | 10 +++++-----
 include/mbgl/map/tile.hpp             |  8 +++++---
 include/mbgl/map/tile_data.hpp        | 17 ++++++++++-------
 include/mbgl/map/tile_parser.hpp      | 25 ++++++++++++++-----------
 include/mbgl/map/transform.hpp        | 15 +++++++++------
 include/mbgl/map/transform_state.hpp  |  8 +++++---
 include/mbgl/map/vector_tile.hpp      | 16 +++++++---------
 include/mbgl/map/vector_tile_data.hpp | 17 ++++++++++-------
 src/map/map.cpp                       |  2 ++
 src/map/tile_data.cpp                 |  1 +
 src/map/transform.cpp                 |  2 ++
 src/map/vector_tile_data.cpp          |  2 ++
 src/renderer/painter.cpp              |  1 +
 src/renderer/painter_fill.cpp         |  1 +
 src/renderer/painter_framebuffers.cpp |  1 +
 src/renderer/painter_text.cpp         |  1 +
 19 files changed, 94 insertions(+), 60 deletions(-)

diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index 6fef90573..81d55b217 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -3,6 +3,7 @@
 
 #include <mbgl/map/transform.hpp>
 #include <mbgl/renderer/painter.hpp>
+
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/time.hpp>
 #include <mbgl/util/uv.hpp>
diff --git a/include/mbgl/map/raster_tile_data.hpp b/include/mbgl/map/raster_tile_data.hpp
index 23f097972..bf8691454 100644
--- a/include/mbgl/map/raster_tile_data.hpp
+++ b/include/mbgl/map/raster_tile_data.hpp
@@ -1,13 +1,19 @@
 #ifndef MBGL_MAP_RASTER_TILE_DATA
 #define MBGL_MAP_RASTER_TILE_DATA
 
+#include <mbgl/map/tile.hpp>
 #include <mbgl/map/tile_data.hpp>
-
 #include <mbgl/renderer/raster_bucket.hpp>
 
+#include <memory>
 
 namespace mbgl {
 
+class Map;
+class Painter;
+class SourceInfo;
+class StyleLayer;
+
 class RasterTileData : public TileData {
     friend class TileParser;
 
diff --git a/include/mbgl/map/source.hpp b/include/mbgl/map/source.hpp
index 95a141ff5..c3f2d4fe8 100644
--- a/include/mbgl/map/source.hpp
+++ b/include/mbgl/map/source.hpp
@@ -3,23 +3,25 @@
 
 #include <mbgl/map/tile.hpp>
 #include <mbgl/map/tile_data.hpp>
+#include <mbgl/style/style_source.hpp>
+
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/time.hpp>
-#include <mbgl/style/style_source.hpp>
-#include <mbgl/style/types.hpp>
+#include <mbgl/util/mat4.hpp>
 
-#include <list>
+#include <cstdint>
 #include <forward_list>
-#include <memory>
-#include <vector>
-#include <string>
+#include <iosfwd>
 #include <map>
-#include <set>
+#include <memory>
 
 namespace mbgl {
 
+class Map;
+class Painter;
+class StyleLayer;
 class TransformState;
-class Texturepool;
+struct box;
 
 class Source : public std::enable_shared_from_this<Source>, private util::noncopyable {
 public:
diff --git a/include/mbgl/map/sprite.hpp b/include/mbgl/map/sprite.hpp
index c4f27a3ee..3f8d5611a 100644
--- a/include/mbgl/map/sprite.hpp
+++ b/include/mbgl/map/sprite.hpp
@@ -1,13 +1,13 @@
 #ifndef MBGL_STYLE_SPRITE
 #define MBGL_STYLE_SPRITE
 
-#include <mbgl/util/raster.hpp>
-#include <mbgl/util/vec.hpp>
+#include <mbgl/util/image.hpp>
 
-#include <string>
-#include <mutex>
-#include <memory>
+#include <cstdint>
 #include <atomic>
+#include <iosfwd>
+#include <memory>
+#include <string>
 #include <unordered_map>
 
 namespace mbgl {
diff --git a/include/mbgl/map/tile.hpp b/include/mbgl/map/tile.hpp
index 7e868afad..9cf5ff534 100644
--- a/include/mbgl/map/tile.hpp
+++ b/include/mbgl/map/tile.hpp
@@ -1,15 +1,17 @@
 #ifndef MBGL_MAP_TILE
 #define MBGL_MAP_TILE
 
-#include <mbgl/util/vec.hpp>
 #include <mbgl/util/mat4.hpp>
 #include <mbgl/util/noncopyable.hpp>
 
 #include <cstdint>
-#include <forward_list>
-#include <string>
 #include <bitset>
+#include <cmath>
+#include <cstdint>
+#include <forward_list>
+#include <iosfwd>
 #include <memory>
+#include <string>
 
 namespace mbgl {
 
diff --git a/include/mbgl/map/tile_data.hpp b/include/mbgl/map/tile_data.hpp
index 416a29d2a..c349ea2ba 100644
--- a/include/mbgl/map/tile_data.hpp
+++ b/include/mbgl/map/tile_data.hpp
@@ -2,22 +2,25 @@
 #define MBGL_MAP_TILE_DATA
 
 #include <mbgl/map/tile.hpp>
-#include <mbgl/util/noncopyable.hpp>
-#include <mbgl/platform/platform.hpp>
-#include <mbgl/geometry/vao.hpp>
 #include <mbgl/renderer/debug_bucket.hpp>
+#include <mbgl/geometry/debug_font_buffer.hpp>
+
+#include <mbgl/util/noncopyable.hpp>
 
-#include <cstdint>
-#include <string>
-#include <memory>
 #include <atomic>
+#include <exception>
+#include <iosfwd>
+#include <memory>
+#include <string>
 
 namespace mbgl {
 
 class Map;
 class Painter;
-class StyleLayer;
 class SourceInfo;
+class StyleLayer;
+
+namespace platform { class Request; }
 
 class TileData : public std::enable_shared_from_this<TileData>,
              private util::noncopyable {
diff --git a/include/mbgl/map/tile_parser.hpp b/include/mbgl/map/tile_parser.hpp
index 14e00946b..1550350ed 100644
--- a/include/mbgl/map/tile_parser.hpp
+++ b/include/mbgl/map/tile_parser.hpp
@@ -2,27 +2,30 @@
 #define MBGL_MAP_TILE_PARSER
 
 #include <mbgl/map/vector_tile.hpp>
-#include <mbgl/text/placement.hpp>
-#include <mbgl/text/glyph_store.hpp>
-#include <mbgl/text/glyph.hpp>
-#include <mbgl/util/utf.hpp>
 #include <mbgl/style/filter_expression.hpp>
+#include <mbgl/text/glyph.hpp>
+#include <mbgl/text/placement.hpp>
+
+#include <cstdint>
+#include <iosfwd>
+#include <memory>
+#include <string>
 
 namespace mbgl {
 
-class Style;
+class Bucket;
+class FontStack;
 class GlyphAtlas;
 class GlyphStore;
 class SpriteAtlas;
-class VectorTileData;
-class StyleLayer;
-class StyleLayerGroup;
+class Style;
 class StyleBucket;
 class StyleBucketFill;
-class StyleBucketLine;
 class StyleBucketIcon;
-
-class Bucket;
+class StyleBucketLine;
+class StyleBucketText;
+class StyleLayerGroup;
+class VectorTileData;
 
 class TileParser {
 public:
diff --git a/include/mbgl/map/transform.hpp b/include/mbgl/map/transform.hpp
index 61bef7656..359c325f1 100644
--- a/include/mbgl/map/transform.hpp
+++ b/include/mbgl/map/transform.hpp
@@ -1,20 +1,23 @@
 #ifndef MBGL_MAP_TRANSFORM
 #define MBGL_MAP_TRANSFORM
 
-#include <mbgl/util/transition.hpp>
+#include <mbgl/util/time.hpp>
+#include <mbgl/map/transform_state.hpp>
+
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/util/uv.hpp>
 
-#include "view.hpp"
-#include "transform_state.hpp"
-
+#include <cstdint>
+#include <cmath>
 #include <forward_list>
+#include <memory>
 
 namespace mbgl {
 
-struct box;
+class View;
+namespace util { class transition; }
 
-    class Transform : private util::noncopyable {
+class Transform : private util::noncopyable {
 public:
     Transform(View &view);
 
diff --git a/include/mbgl/map/transform_state.hpp b/include/mbgl/map/transform_state.hpp
index 85dd2eb87..5b3b7d375 100644
--- a/include/mbgl/map/transform_state.hpp
+++ b/include/mbgl/map/transform_state.hpp
@@ -1,15 +1,17 @@
 #ifndef MBGL_MAP_TRANSFORM_STATE
 #define MBGL_MAP_TRANSFORM_STATE
 
-#include <mbgl/util/mat4.hpp>
 #include <mbgl/map/tile.hpp>
 
+#include <mbgl/util/mat4.hpp>
+#include <mbgl/util/vec.hpp>
+
 #include <cstdint>
+#include <array>
+#include <limits>
 
 namespace mbgl {
 
-class Transform;
-
 class TransformState {
     friend class Transform;
 
diff --git a/include/mbgl/map/vector_tile.hpp b/include/mbgl/map/vector_tile.hpp
index 77e379865..96123c154 100644
--- a/include/mbgl/map/vector_tile.hpp
+++ b/include/mbgl/map/vector_tile.hpp
@@ -1,24 +1,22 @@
 #ifndef MBGL_MAP_VECTOR_TILE
 #define MBGL_MAP_VECTOR_TILE
 
-#include <mbgl/util/pbf.hpp>
-#include <mbgl/util/vec.hpp>
+#include <mbgl/style/filter_expression.hpp>
 #include <mbgl/style/value.hpp>
 #include <mbgl/text/glyph.hpp>
-#include <mbgl/style/filter_expression.hpp>
-#include <vector>
+#include <mbgl/util/pbf.hpp>
+
+#include <cstdint>
+#include <iosfwd>
 #include <map>
+#include <string>
 #include <unordered_map>
-#include <set>
-#include <limits>
+#include <vector>
 
 namespace mbgl {
 
-class BucketDescription;
 class VectorTileLayer;
 
-struct pbf;
-
 enum class FeatureType {
     Unknown = 0,
     Point = 1,
diff --git a/include/mbgl/map/vector_tile_data.hpp b/include/mbgl/map/vector_tile_data.hpp
index dc67b9251..d31d11499 100644
--- a/include/mbgl/map/vector_tile_data.hpp
+++ b/include/mbgl/map/vector_tile_data.hpp
@@ -1,23 +1,26 @@
 #ifndef MBGL_MAP_VECTOR_TILE_DATA
 #define MBGL_MAP_VECTOR_TILE_DATA
 
+#include <mbgl/map/tile.hpp>
 #include <mbgl/map/tile_data.hpp>
-
-
-#include <mbgl/renderer/bucket.hpp>
-
-#include <mbgl/geometry/vertex_buffer.hpp>
 #include <mbgl/geometry/elements_buffer.hpp>
 #include <mbgl/geometry/fill_buffer.hpp>
-#include <mbgl/geometry/line_buffer.hpp>
 #include <mbgl/geometry/icon_buffer.hpp>
+#include <mbgl/geometry/line_buffer.hpp>
 #include <mbgl/geometry/text_buffer.hpp>
-#include <mbgl/map/tile_parser.hpp>
 
+#include <iosfwd>
+#include <memory>
 #include <unordered_map>
 
 namespace mbgl {
 
+class Bucket;
+class Map;
+class Painter;
+class SourceInfo;
+class StyleLayer;
+class TileParser;
 
 class VectorTileData : public TileData {
     friend class TileParser;
diff --git a/src/map/map.cpp b/src/map/map.cpp
index d30296aad..9252a57cc 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -1,5 +1,6 @@
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/source.hpp>
+#include <mbgl/map/view.hpp>
 #include <mbgl/platform/platform.hpp>
 #include <mbgl/map/sprite.hpp>
 #include <mbgl/util/transition.hpp>
@@ -15,6 +16,7 @@
 #include <mbgl/geometry/glyph_atlas.hpp>
 #include <mbgl/style/style_layer_group.hpp>
 #include <mbgl/style/style_bucket.hpp>
+#include <mbgl/util/texturepool.hpp>
 #include <mbgl/geometry/sprite_atlas.hpp>
 
 #include <algorithm>
diff --git a/src/map/tile_data.cpp b/src/map/tile_data.cpp
index 556a2e607..57ad6944b 100644
--- a/src/map/tile_data.cpp
+++ b/src/map/tile_data.cpp
@@ -1,5 +1,6 @@
 #include <mbgl/map/tile_data.hpp>
 #include <mbgl/map/map.hpp>
+#include <mbgl/style/style_source.hpp>
 
 #include <mbgl/util/token.hpp>
 #include <mbgl/util/string.hpp>
diff --git a/src/map/transform.cpp b/src/map/transform.cpp
index ccf92f974..251af30f9 100644
--- a/src/map/transform.cpp
+++ b/src/map/transform.cpp
@@ -1,9 +1,11 @@
 #include <mbgl/map/transform.hpp>
+#include <mbgl/map/view.hpp>
 #include <mbgl/util/constants.hpp>
 #include <mbgl/util/mat4.hpp>
 #include <mbgl/util/std.hpp>
 #include <mbgl/util/math.hpp>
 #include <mbgl/util/time.hpp>
+#include <mbgl/util/transition.hpp>
 #include <mbgl/platform/platform.hpp>
 #include <cstdio>
 
diff --git a/src/map/vector_tile_data.cpp b/src/map/vector_tile_data.cpp
index f1f065d58..fd3cd6ec8 100644
--- a/src/map/vector_tile_data.cpp
+++ b/src/map/vector_tile_data.cpp
@@ -1,8 +1,10 @@
 #include <mbgl/map/vector_tile_data.hpp>
+#include <mbgl/map/tile_parser.hpp>
 #include <mbgl/util/std.hpp>
 #include <mbgl/map/map.hpp>
 #include <mbgl/style/style_layer.hpp>
 #include <mbgl/style/style_bucket.hpp>
+#include <mbgl/geometry/glyph_atlas.hpp>
 
 using namespace mbgl;
 
diff --git a/src/renderer/painter.cpp b/src/renderer/painter.cpp
index c87bcb19a..e6977171a 100644
--- a/src/renderer/painter.cpp
+++ b/src/renderer/painter.cpp
@@ -1,5 +1,6 @@
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/map/map.hpp>
+#include <mbgl/style/style.hpp>
 #include <mbgl/style/style_layer.hpp>
 #include <mbgl/util/std.hpp>
 #include <mbgl/util/string.hpp>
diff --git a/src/renderer/painter_fill.cpp b/src/renderer/painter_fill.cpp
index f78f006df..7664555b7 100644
--- a/src/renderer/painter_fill.cpp
+++ b/src/renderer/painter_fill.cpp
@@ -1,5 +1,6 @@
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/renderer/fill_bucket.hpp>
+#include <mbgl/style/style.hpp>
 #include <mbgl/style/style_layer.hpp>
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/sprite.hpp>
diff --git a/src/renderer/painter_framebuffers.cpp b/src/renderer/painter_framebuffers.cpp
index 83ad18987..f221b884c 100644
--- a/src/renderer/painter_framebuffers.cpp
+++ b/src/renderer/painter_framebuffers.cpp
@@ -1,6 +1,7 @@
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/renderer/fill_bucket.hpp>
 #include <mbgl/map/map.hpp>
+#include <mbgl/map/view.hpp>
 #include <mbgl/util/clip_ids.hpp>
 
 using namespace mbgl;
diff --git a/src/renderer/painter_text.cpp b/src/renderer/painter_text.cpp
index 54fa1a737..d5ad3db51 100644
--- a/src/renderer/painter_text.cpp
+++ b/src/renderer/painter_text.cpp
@@ -1,6 +1,7 @@
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/renderer/text_bucket.hpp>
 #include <mbgl/style/style_layer.hpp>
+#include <mbgl/geometry/glyph_atlas.hpp>
 #include <mbgl/map/map.hpp>
 #include <mbgl/util/math.hpp>
 #include <cmath>