[core] Rationalize naming for style-related code

20 files changed, 127 insertions, 76 deletions

diff --git a/src/mbgl/renderer/bucket.hpp b/src/mbgl/renderer/bucket.hpp
index 89b0ceefb2..c7ebe480ed 100644
--- a/src/mbgl/renderer/bucket.hpp
+++ b/src/mbgl/renderer/bucket.hpp
@@ -13,7 +13,6 @@
 namespace mbgl {
 
 class Painter;
-class Layer;
 class UnwrappedTileID;
 class CollisionTile;
 
@@ -21,6 +20,10 @@ namespace gl {
 class ObjectStore;
 }
 
+namespace style {
+class Layer;
+}
+
 class Bucket : private util::noncopyable {
 public:
     Bucket() : uploaded(false) {}
@@ -31,7 +34,7 @@ public:
 
     // Every time this bucket is getting rendered, this function is called. This happens either
     // once or twice (for Opaque and Transparent render passes).
-    virtual void render(Painter&, const Layer&, const UnwrappedTileID&, const mat4&) = 0;
+    virtual void render(Painter&, const style::Layer&, const UnwrappedTileID&, const mat4&) = 0;
 
     virtual ~Bucket() = default;
 
diff --git a/src/mbgl/renderer/circle_bucket.cpp b/src/mbgl/renderer/circle_bucket.cpp
index 969e05131b..4ae63fed46 100644
--- a/src/mbgl/renderer/circle_bucket.cpp
+++ b/src/mbgl/renderer/circle_bucket.cpp
@@ -2,10 +2,12 @@
 #include <mbgl/renderer/painter.hpp>
 
 #include <mbgl/shader/circle_shader.hpp>
-#include <mbgl/layer/circle_layer.hpp>
+#include <mbgl/style/layers/circle_layer.hpp>
 #include <mbgl/util/constants.hpp>
 
-using namespace mbgl;
+namespace mbgl {
+
+using namespace style;
 
 CircleBucket::CircleBucket(MapMode mode_) : mode(mode_) {
 }
@@ -97,3 +99,5 @@ void CircleBucket::drawCircles(CircleShader& shader, gl::ObjectStore& store) {
         elementsIndex += group->elements_length * elementsBuffer_.itemSize;
     }
 }
+
+}
diff --git a/src/mbgl/renderer/circle_bucket.hpp b/src/mbgl/renderer/circle_bucket.hpp
index 9c95fce045..fa34aa088a 100644
--- a/src/mbgl/renderer/circle_bucket.hpp
+++ b/src/mbgl/renderer/circle_bucket.hpp
@@ -19,7 +19,7 @@ public:
     ~CircleBucket() override;
 
     void upload(gl::ObjectStore&) override;
-    void render(Painter&, const Layer&, const UnwrappedTileID&, const mat4&) override;
+    void render(Painter&, const style::Layer&, const UnwrappedTileID&, const mat4&) override;
 
     bool hasData() const override;
     bool needsClipping() const override;
diff --git a/src/mbgl/renderer/fill_bucket.cpp b/src/mbgl/renderer/fill_bucket.cpp
index 4a9709f4e8..02f346decb 100644
--- a/src/mbgl/renderer/fill_bucket.cpp
+++ b/src/mbgl/renderer/fill_bucket.cpp
@@ -1,5 +1,5 @@
 #include <mbgl/renderer/fill_bucket.hpp>
-#include <mbgl/layer/fill_layer.hpp>
+#include <mbgl/style/layers/fill_layer.hpp>
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/shader/plain_shader.hpp>
 #include <mbgl/shader/pattern_shader.hpp>
@@ -12,22 +12,24 @@
 
 #include <cassert>
 
-struct GeometryTooLongException : std::exception {};
-
-using namespace mbgl;
-
 namespace mapbox {
 namespace util {
-template <> struct nth<0, GeometryCoordinate> {
-    inline static int64_t get(const GeometryCoordinate& t) { return t.x; };
+template <> struct nth<0, mbgl::GeometryCoordinate> {
+    inline static int64_t get(const mbgl::GeometryCoordinate& t) { return t.x; };
 };
 
-template <> struct nth<1, GeometryCoordinate> {
-    inline static int64_t get(const GeometryCoordinate& t) { return t.y; };
+template <> struct nth<1, mbgl::GeometryCoordinate> {
+    inline static int64_t get(const mbgl::GeometryCoordinate& t) { return t.y; };
 };
 }
 }
 
+namespace mbgl {
+
+using namespace style;
+
+struct GeometryTooLongException : std::exception {};
+
 FillBucket::FillBucket() {
 }
 
@@ -165,3 +167,5 @@ void FillBucket::drawVertices(OutlinePatternShader& shader, gl::ObjectStore& sto
         elements_index += group->elements_length * lineElementsBuffer.itemSize;
     }
 }
+
+}
diff --git a/src/mbgl/renderer/fill_bucket.hpp b/src/mbgl/renderer/fill_bucket.hpp
index 21e3239f29..35d70d169c 100644
--- a/src/mbgl/renderer/fill_bucket.hpp
+++ b/src/mbgl/renderer/fill_bucket.hpp
@@ -21,7 +21,7 @@ public:
     ~FillBucket() override;
 
     void upload(gl::ObjectStore&) override;
-    void render(Painter&, const Layer&, const UnwrappedTileID&, const mat4&) override;
+    void render(Painter&, const style::Layer&, const UnwrappedTileID&, const mat4&) override;
     bool hasData() const override;
     bool needsClipping() const override;
 
diff --git a/src/mbgl/renderer/line_bucket.cpp b/src/mbgl/renderer/line_bucket.cpp
index 8124a5daed..d207cdb8c5 100644
--- a/src/mbgl/renderer/line_bucket.cpp
+++ b/src/mbgl/renderer/line_bucket.cpp
@@ -1,5 +1,5 @@
 #include <mbgl/renderer/line_bucket.hpp>
-#include <mbgl/layer/line_layer.hpp>
+#include <mbgl/style/layers/line_layer.hpp>
 #include <mbgl/geometry/elements_buffer.hpp>
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/shader/line_shader.hpp>
@@ -11,7 +11,9 @@
 
 #include <cassert>
 
-using namespace mbgl;
+namespace mbgl {
+
+using namespace style;
 
 LineBucket::LineBucket(uint32_t overscaling_) : overscaling(overscaling_) {
 }
@@ -505,3 +507,5 @@ void LineBucket::drawLinePatterns(LinepatternShader& shader, gl::ObjectStore& st
         elements_index += group->elements_length * triangleElementsBuffer.itemSize;
     }
 }
+
+}
diff --git a/src/mbgl/renderer/line_bucket.hpp b/src/mbgl/renderer/line_bucket.hpp
index 1093ec2a48..d746f29c7e 100644
--- a/src/mbgl/renderer/line_bucket.hpp
+++ b/src/mbgl/renderer/line_bucket.hpp
@@ -5,13 +5,12 @@
 #include <mbgl/geometry/vao.hpp>
 #include <mbgl/geometry/elements_buffer.hpp>
 #include <mbgl/geometry/line_buffer.hpp>
-#include <mbgl/layer/line_layer_impl.hpp>
+#include <mbgl/style/layers/line_layer_properties.hpp>
 
 #include <vector>
 
 namespace mbgl {
 
-class Style;
 class LineVertexBuffer;
 class TriangleElementsBuffer;
 class LineShader;
@@ -26,7 +25,7 @@ public:
     ~LineBucket() override;
 
     void upload(gl::ObjectStore&) override;
-    void render(Painter&, const Layer&, const UnwrappedTileID&, const mat4&) override;
+    void render(Painter&, const style::Layer&, const UnwrappedTileID&, const mat4&) override;
     bool hasData() const override;
     bool needsClipping() const override;
 
@@ -50,7 +49,7 @@ private:
             std::vector<TriangleElement>& triangleStore);
 
 public:
-    LineLayoutProperties layout;
+    style::LineLayoutProperties layout;
 
 private:
     LineVertexBuffer vertexBuffer;
diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp
index ccc6e23408..1864bf7ef1 100644
--- a/src/mbgl/renderer/painter.cpp
+++ b/src/mbgl/renderer/painter.cpp
@@ -1,18 +1,17 @@
 #include <mbgl/renderer/painter.hpp>
 
-#include <mbgl/source/source.hpp>
+#include <mbgl/style/source.hpp>
 #include <mbgl/tile/tile.hpp>
 
 #include <mbgl/platform/log.hpp>
 #include <mbgl/gl/debugging.hpp>
 
 #include <mbgl/style/style.hpp>
-#include <mbgl/layer/layer_impl.hpp>
-#include <mbgl/style/style_render_parameters.hpp>
+#include <mbgl/style/layer_impl.hpp>
 
-#include <mbgl/layer/background_layer.hpp>
-#include <mbgl/layer/custom_layer.hpp>
-#include <mbgl/layer/custom_layer_impl.hpp>
+#include <mbgl/style/layers/background_layer.hpp>
+#include <mbgl/style/layers/custom_layer.hpp>
+#include <mbgl/style/layers/custom_layer_impl.hpp>
 
 #include <mbgl/sprite/sprite_atlas.hpp>
 #include <mbgl/geometry/line_atlas.hpp>
@@ -46,7 +45,9 @@
 #include <algorithm>
 #include <iostream>
 
-using namespace mbgl;
+namespace mbgl {
+
+using namespace style;
 
 Painter::Painter(const TransformState& state_, gl::ObjectStore& store_)
     : state(state_),
@@ -308,3 +309,5 @@ void Painter::setDepthSublayer(int n) {
     float farDepth = nearDepth + depthRangeSize;
     config.depthRange = { nearDepth, farDepth };
 }
+
+}
diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp
index ad26457555..f040fee67f 100644
--- a/src/mbgl/renderer/painter.hpp
+++ b/src/mbgl/renderer/painter.hpp
@@ -13,7 +13,7 @@
 #include <mbgl/gl/gl_config.hpp>
 
 #include <mbgl/style/render_item.hpp>
-#include <mbgl/style/types.hpp>
+#include <mbgl/style/style.hpp>
 
 #include <mbgl/gl/gl.hpp>
 
@@ -28,27 +28,19 @@
 
 namespace mbgl {
 
-class Style;
 class Tile;
 class SpriteAtlas;
 class GlyphAtlas;
 class LineAtlas;
-class Source;
 struct FrameData;
 class TileData;
 
 class DebugBucket;
 class FillBucket;
-class FillLayer;
 class LineBucket;
-class LineLayer;
 class CircleBucket;
-class CircleLayer;
 class SymbolBucket;
-class SymbolLayer;
 class RasterBucket;
-class RasterLayer;
-class BackgroundLayer;
 
 class SDFShader;
 class PlainShader;
@@ -72,6 +64,17 @@ namespace util {
 class ObjectStore;
 }
 
+namespace style {
+class Style;
+class Source;
+class FillLayer;
+class LineLayer;
+class CircleLayer;
+class SymbolLayer;
+class RasterLayer;
+class BackgroundLayer;
+}
+
 struct FrameData {
     std::array<uint16_t, 2> framebufferSize;
     TimePoint timePoint;
@@ -86,8 +89,8 @@ public:
     Painter(const TransformState&, gl::ObjectStore&);
     ~Painter();
 
-    void render(const Style& style,
-                const FrameData& frame,
+    void render(const style::Style&,
+                const FrameData&,
                 SpriteAtlas& annotationSpriteAtlas);
 
     // Renders debug information for a tile.
@@ -99,12 +102,12 @@ public:
     void renderClipMasks();
 
     void renderDebugText(TileData&, const mat4&);
-    void renderFill(FillBucket&, const FillLayer&, const UnwrappedTileID&, const mat4&);
-    void renderLine(LineBucket&, const LineLayer&, const UnwrappedTileID&, const mat4&);
-    void renderCircle(CircleBucket&, const CircleLayer&, const UnwrappedTileID&, const mat4&);
-    void renderSymbol(SymbolBucket&, const SymbolLayer&, const UnwrappedTileID&, const mat4&);
-    void renderRaster(RasterBucket&, const RasterLayer&, const UnwrappedTileID&, const mat4&);
-    void renderBackground(const BackgroundLayer&);
+    void renderFill(FillBucket&, const style::FillLayer&, const UnwrappedTileID&, const mat4&);
+    void renderLine(LineBucket&, const style::LineLayer&, const UnwrappedTileID&, const mat4&);
+    void renderCircle(CircleBucket&, const style::CircleLayer&, const UnwrappedTileID&, const mat4&);
+    void renderSymbol(SymbolBucket&, const style::SymbolLayer&, const UnwrappedTileID&, const mat4&);
+    void renderRaster(RasterBucket&, const style::RasterLayer&, const UnwrappedTileID&, const mat4&);
+    void renderBackground(const style::BackgroundLayer&);
 
     float saturationFactor(float saturation);
     float contrastFactor(float contrast);
@@ -118,9 +121,9 @@ private:
     mat4 translatedMatrix(const mat4& matrix,
                           const std::array<float, 2>& translation,
                           const UnwrappedTileID& id,
-                          TranslateAnchorType anchor);
+                          style::TranslateAnchorType anchor);
 
-    std::vector<RenderItem> determineRenderOrder(const Style& style);
+    std::vector<RenderItem> determineRenderOrder(const style::Style&);
 
     template <class Iterator>
     void renderPass(RenderPass,
@@ -138,7 +141,7 @@ private:
                    void (SymbolBucket::*drawSDF)(SDFShader&, gl::ObjectStore&),
 
                    // Layout
-                   RotationAlignmentType rotationAlignment,
+                   style::RotationAlignmentType rotationAlignment,
                    float layoutSize,
 
                    // Paint
@@ -148,7 +151,7 @@ private:
                    float haloWidth,
                    float haloBlur,
                    std::array<float, 2> translate,
-                   TranslateAnchorType translateAnchor,
+                   style::TranslateAnchorType translateAnchor,
                    float paintSize);
 
     void setDepthSublayer(int n);
diff --git a/src/mbgl/renderer/painter_background.cpp b/src/mbgl/renderer/painter_background.cpp
index bc01d3c32f..07e5821ce8 100644
--- a/src/mbgl/renderer/painter_background.cpp
+++ b/src/mbgl/renderer/painter_background.cpp
@@ -1,14 +1,16 @@
 #include <mbgl/renderer/painter.hpp>
 
-#include <mbgl/layer/background_layer.hpp>
-#include <mbgl/layer/background_layer_impl.hpp>
+#include <mbgl/style/layers/background_layer.hpp>
+#include <mbgl/style/layers/background_layer_impl.hpp>
 #include <mbgl/shader/pattern_shader.hpp>
 #include <mbgl/shader/plain_shader.hpp>
 #include <mbgl/sprite/sprite_atlas.hpp>
 #include <mbgl/util/mat4.hpp>
 #include <mbgl/util/tile_cover.hpp>
 
-using namespace mbgl;
+namespace mbgl {
+
+using namespace style;
 
 void Painter::renderBackground(const BackgroundLayer& layer) {
     // Note that for bottommost layers without a pattern, the background color is drawn with
@@ -107,3 +109,5 @@ void Painter::renderBackground(const BackgroundLayer& layer) {
         MBGL_CHECK_ERROR(glDrawArrays(GL_TRIANGLE_STRIP, 0, (GLsizei)tileStencilBuffer.index()));
     }
 }
+
+}
diff --git a/src/mbgl/renderer/painter_circle.cpp b/src/mbgl/renderer/painter_circle.cpp
index c371f4debe..9f2cd17f7f 100644
--- a/src/mbgl/renderer/painter_circle.cpp
+++ b/src/mbgl/renderer/painter_circle.cpp
@@ -1,12 +1,14 @@
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/renderer/circle_bucket.hpp>
 
-#include <mbgl/layer/circle_layer.hpp>
-#include <mbgl/layer/circle_layer_impl.hpp>
+#include <mbgl/style/layers/circle_layer.hpp>
+#include <mbgl/style/layers/circle_layer_impl.hpp>
 
 #include <mbgl/shader/circle_shader.hpp>
 
-using namespace mbgl;
+namespace mbgl {
+
+using namespace style;
 
 void Painter::renderCircle(CircleBucket& bucket,
                            const CircleLayer& layer,
@@ -43,3 +45,5 @@ void Painter::renderCircle(CircleBucket& bucket,
 
     bucket.drawCircles(*circleShader, store);
 }
+
+}
diff --git a/src/mbgl/renderer/painter_clipping.cpp b/src/mbgl/renderer/painter_clipping.cpp
index f0fd498267..e6ce1a040e 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/source/source.hpp>
+#include <mbgl/style/source.hpp>
 #include <mbgl/shader/plain_shader.hpp>
 #include <mbgl/util/clip_id.hpp>
 #include <mbgl/util/string.hpp>
diff --git a/src/mbgl/renderer/painter_fill.cpp b/src/mbgl/renderer/painter_fill.cpp
index b499d20da3..b89686c815 100644
--- a/src/mbgl/renderer/painter_fill.cpp
+++ b/src/mbgl/renderer/painter_fill.cpp
@@ -1,14 +1,16 @@
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/renderer/fill_bucket.hpp>
-#include <mbgl/layer/fill_layer.hpp>
-#include <mbgl/layer/fill_layer_impl.hpp>
+#include <mbgl/style/layers/fill_layer.hpp>
+#include <mbgl/style/layers/fill_layer_impl.hpp>
 #include <mbgl/sprite/sprite_atlas.hpp>
 #include <mbgl/shader/outline_shader.hpp>
 #include <mbgl/shader/outlinepattern_shader.hpp>
 #include <mbgl/shader/pattern_shader.hpp>
 #include <mbgl/shader/plain_shader.hpp>
 
-using namespace mbgl;
+namespace mbgl {
+
+using namespace style;
 
 void Painter::renderFill(FillBucket& bucket,
                          const FillLayer& layer,
@@ -195,3 +197,5 @@ void Painter::renderFill(FillBucket& bucket,
         bucket.drawVertices(*outlineShader, store);
     }
 }
+
+}
diff --git a/src/mbgl/renderer/painter_line.cpp b/src/mbgl/renderer/painter_line.cpp
index 3cf1ad4147..26041a8165 100644
--- a/src/mbgl/renderer/painter_line.cpp
+++ b/src/mbgl/renderer/painter_line.cpp
@@ -1,7 +1,7 @@
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/renderer/line_bucket.hpp>
-#include <mbgl/layer/line_layer.hpp>
-#include <mbgl/layer/line_layer_impl.hpp>
+#include <mbgl/style/layers/line_layer.hpp>
+#include <mbgl/style/layers/line_layer_impl.hpp>
 #include <mbgl/shader/line_shader.hpp>
 #include <mbgl/shader/linesdf_shader.hpp>
 #include <mbgl/shader/linepattern_shader.hpp>
@@ -9,7 +9,9 @@
 #include <mbgl/geometry/line_atlas.hpp>
 #include <mbgl/util/mat2.hpp>
 
-using namespace mbgl;
+namespace mbgl {
+
+using namespace style;
 
 void Painter::renderLine(LineBucket& bucket,
                          const LineLayer& layer,
@@ -161,3 +163,5 @@ void Painter::renderLine(LineBucket& bucket,
         bucket.drawLines(*lineShader, store);
     }
 }
+
+}
diff --git a/src/mbgl/renderer/painter_raster.cpp b/src/mbgl/renderer/painter_raster.cpp
index 511ac96387..cce71e8ce2 100644
--- a/src/mbgl/renderer/painter_raster.cpp
+++ b/src/mbgl/renderer/painter_raster.cpp
@@ -1,11 +1,13 @@
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/gl/gl.hpp>
 #include <mbgl/renderer/raster_bucket.hpp>
-#include <mbgl/layer/raster_layer.hpp>
-#include <mbgl/layer/raster_layer_impl.hpp>
+#include <mbgl/style/layers/raster_layer.hpp>
+#include <mbgl/style/layers/raster_layer_impl.hpp>
 #include <mbgl/shader/raster_shader.hpp>
 
-using namespace mbgl;
+namespace mbgl {
+
+using namespace style;
 
 void Painter::renderRaster(RasterBucket& bucket,
                            const RasterLayer& layer,
@@ -66,3 +68,5 @@ std::array<float, 3> Painter::spinWeights(float spin) {
     }};
     return spin_weights;
 }
+
+}
diff --git a/src/mbgl/renderer/painter_symbol.cpp b/src/mbgl/renderer/painter_symbol.cpp
index 9774568074..3c453242ae 100644
--- a/src/mbgl/renderer/painter_symbol.cpp
+++ b/src/mbgl/renderer/painter_symbol.cpp
@@ -1,6 +1,7 @@
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/renderer/symbol_bucket.hpp>
-#include <mbgl/layer/symbol_layer.hpp>
+#include <mbgl/style/layers/symbol_layer.hpp>
+#include <mbgl/style/layers/symbol_layer_impl.hpp>
 #include <mbgl/geometry/glyph_atlas.hpp>
 #include <mbgl/sprite/sprite_atlas.hpp>
 #include <mbgl/shader/sdf_shader.hpp>
@@ -10,7 +11,9 @@
 
 #include <cmath>
 
-using namespace mbgl;
+namespace mbgl {
+
+using namespace style;
 
 void Painter::renderSDF(SymbolBucket &bucket,
                         const UnwrappedTileID &tileID,
@@ -257,3 +260,5 @@ void Painter::renderSymbol(SymbolBucket& bucket,
 
     config.activeTexture = GL_TEXTURE0;
 }
+
+}
diff --git a/src/mbgl/renderer/raster_bucket.cpp b/src/mbgl/renderer/raster_bucket.cpp
index b16d7f8161..39f8dacd92 100644
--- a/src/mbgl/renderer/raster_bucket.cpp
+++ b/src/mbgl/renderer/raster_bucket.cpp
@@ -1,9 +1,11 @@
 #include <mbgl/renderer/raster_bucket.hpp>
-#include <mbgl/layer/raster_layer.hpp>
+#include <mbgl/style/layers/raster_layer.hpp>
 #include <mbgl/shader/raster_shader.hpp>
 #include <mbgl/renderer/painter.hpp>
 
-using namespace mbgl;
+namespace mbgl {
+
+using namespace style;
 
 RasterBucket::RasterBucket(gl::TexturePool& texturePool)
 : raster(texturePool) {
@@ -40,3 +42,5 @@ bool RasterBucket::hasData() const {
 bool RasterBucket::needsClipping() const {
     return false;
 }
+
+}
diff --git a/src/mbgl/renderer/raster_bucket.hpp b/src/mbgl/renderer/raster_bucket.hpp
index 9125ef2047..93331755fb 100644
--- a/src/mbgl/renderer/raster_bucket.hpp
+++ b/src/mbgl/renderer/raster_bucket.hpp
@@ -14,7 +14,7 @@ public:
     RasterBucket(gl::TexturePool&);
 
     void upload(gl::ObjectStore&) override;
-    void render(Painter&, const Layer&, const UnwrappedTileID&, const mat4&) override;
+    void render(Painter&, const style::Layer&, const UnwrappedTileID&, const mat4&) override;
     bool hasData() const override;
     bool needsClipping() const override;
 
diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp
index 67c8468ecd..f4e55432c1 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/style/filter_evaluator.hpp>
-#include <mbgl/layer/symbol_layer.hpp>
+#include <mbgl/style/layers/symbol_layer.hpp>
 #include <mbgl/tile/geometry_tile.hpp>
 #include <mbgl/sprite/sprite_image.hpp>
 #include <mbgl/sprite/sprite_store.hpp>
@@ -31,6 +31,8 @@
 
 namespace mbgl {
 
+using namespace style;
+
 SymbolInstance::SymbolInstance(Anchor& anchor, const GeometryCoordinates& line,
         const Shaping& shapedText, const PositionedIcon& shapedIcon,
         const SymbolLayoutProperties& layout, const bool addToBuffers, const uint32_t index_,
diff --git a/src/mbgl/renderer/symbol_bucket.hpp b/src/mbgl/renderer/symbol_bucket.hpp
index b19a86b275..314d44bdee 100644
--- a/src/mbgl/renderer/symbol_bucket.hpp
+++ b/src/mbgl/renderer/symbol_bucket.hpp
@@ -13,7 +13,7 @@
 #include <mbgl/text/shaping.hpp>
 #include <mbgl/text/quads.hpp>
 #include <mbgl/style/filter.hpp>
-#include <mbgl/layer/symbol_layer_impl.hpp>
+#include <mbgl/style/layers/symbol_layer_properties.hpp>
 
 #include <memory>
 #include <map>
@@ -46,7 +46,7 @@ class SymbolInstance {
     public:
         explicit SymbolInstance(Anchor& anchor, const GeometryCoordinates& line,
                 const Shaping& shapedText, const PositionedIcon& shapedIcon,
-                const SymbolLayoutProperties& layout, const bool inside, const uint32_t index,
+                const style::SymbolLayoutProperties&, const bool inside, const uint32_t index,
                 const float textBoxScale, const float textPadding, const float textAlongLine,
                 const float iconBoxScale, const float iconPadding, const float iconAlongLine,
                 const GlyphPositions& face, const IndexedSubfeature& indexedfeature);
@@ -70,7 +70,7 @@ public:
     ~SymbolBucket() override;
 
     void upload(gl::ObjectStore&) override;
-    void render(Painter&, const Layer&, const UnwrappedTileID&, const mat4&) override;
+    void render(Painter&, const style::Layer&, const UnwrappedTileID&, const mat4&) override;
     bool hasData() const override;
     bool hasTextData() const;
     bool hasIconData() const;
@@ -87,7 +87,7 @@ public:
     void drawIcons(IconShader&, gl::ObjectStore&);
     void drawCollisionBoxes(CollisionBoxShader&, gl::ObjectStore&);
 
-    void parseFeatures(const GeometryTileLayer&, const Filter&);
+    void parseFeatures(const GeometryTileLayer&, const style::Filter&);
     bool needsDependencies(GlyphStore&, SpriteStore&);
     void placeFeatures(CollisionTile&) override;
 
@@ -109,7 +109,7 @@ private:
             const bool keepUpright, const bool alongLine, const float placementAngle);
 
 public:
-    SymbolLayoutProperties layout;
+    style::SymbolLayoutProperties layout;
 
     float iconMaxSize = 1.0f;
     float textMaxSize = 16.0f;