[core] Move render-related sources out of style directory/namespace

Moves the following to the renderer directory and out of the style namespace:

* CascadeParameters
* PropertyEvaluationParameters
* UpdateParameters
* PropertyEvaluator
* DataDrivenPropertyEvaluator
* CrossFadedPropertyEvaluator
* PaintPropertyBinder
* PaintProperyStatistics
* PossiblyEvaluatedPropertyValue
* TransitioningLight
* EvaluatedLight

60 files changed, 137 insertions, 188 deletions

diff --git a/src/mbgl/annotation/annotation_tile.cpp b/src/mbgl/annotation/annotation_tile.cpp
index fd182b70bc..796ca04ba6 100644
--- a/src/mbgl/annotation/annotation_tile.cpp
+++ b/src/mbgl/annotation/annotation_tile.cpp
@@ -2,7 +2,7 @@
 #include <mbgl/annotation/annotation_manager.hpp>
 #include <mbgl/util/constants.hpp>
 #include <mbgl/storage/file_source.hpp>
-#include <mbgl/style/update_parameters.hpp>
+#include <mbgl/renderer/update_parameters.hpp>
 #include <mbgl/style/style.hpp>
 
 #include <utility>
@@ -10,7 +10,7 @@
 namespace mbgl {
 
 AnnotationTile::AnnotationTile(const OverscaledTileID& overscaledTileID,
-                               const style::UpdateParameters& parameters)
+                               const UpdateParameters& parameters)
     : GeometryTile(overscaledTileID, AnnotationManager::SourceID, parameters,
                    *parameters.style.glyphAtlas,
                    parameters.annotationManager.spriteAtlas),
diff --git a/src/mbgl/annotation/annotation_tile.hpp b/src/mbgl/annotation/annotation_tile.hpp
index 2c100ed50a..6ca9079f9e 100644
--- a/src/mbgl/annotation/annotation_tile.hpp
+++ b/src/mbgl/annotation/annotation_tile.hpp
@@ -7,15 +7,12 @@
 namespace mbgl {
 
 class AnnotationManager;
-
-namespace style {
 class UpdateParameters;
-} // namespace style
 
 class AnnotationTile : public GeometryTile {
 public:
     AnnotationTile(const OverscaledTileID&,
-                   const style::UpdateParameters&);
+                   const UpdateParameters&);
     ~AnnotationTile() override;
 
     void setNecessity(Necessity) final;
diff --git a/src/mbgl/annotation/render_annotation_source.hpp b/src/mbgl/annotation/render_annotation_source.hpp
index 394acc5108..ae0a43c5c7 100644
--- a/src/mbgl/annotation/render_annotation_source.hpp
+++ b/src/mbgl/annotation/render_annotation_source.hpp
@@ -14,7 +14,7 @@ public:
 
     // Called when the camera has changed. May load new tiles, unload obsolete tiles, or
     // trigger re-placement of existing complete tiles.
-    void updateTiles(const style::UpdateParameters&) final;
+    void updateTiles(const UpdateParameters&) final;
 
     // Removes all tiles (by putting them into the cache).
     void removeTiles() final;
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp
index 46ccc7216e..9964c5c9f3 100644
--- a/src/mbgl/map/map.cpp
+++ b/src/mbgl/map/map.cpp
@@ -12,7 +12,7 @@
 #include <mbgl/style/light.hpp>
 #include <mbgl/style/observer.hpp>
 #include <mbgl/style/transition_options.hpp>
-#include <mbgl/style/update_parameters.hpp>
+#include <mbgl/renderer/update_parameters.hpp>
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/renderer/render_source.hpp>
 #include <mbgl/storage/file_source.hpp>
@@ -253,7 +253,7 @@ void Map::Impl::render(View& view) {
         style->relayout();
     }
 
-    style::UpdateParameters parameters(pixelRatio,
+    UpdateParameters parameters(pixelRatio,
                                        debugOptions,
                                        transform.getState(),
                                        scheduler,
diff --git a/src/mbgl/programs/fill_extrusion_program.cpp b/src/mbgl/programs/fill_extrusion_program.cpp
index 67426c8d9d..63d1cbeb59 100644
--- a/src/mbgl/programs/fill_extrusion_program.cpp
+++ b/src/mbgl/programs/fill_extrusion_program.cpp
@@ -1,6 +1,6 @@
 #include <mbgl/programs/fill_extrusion_program.hpp>
 #include <mbgl/sprite/sprite_atlas.hpp>
-#include <mbgl/style/cross_faded_property_evaluator.hpp>
+#include <mbgl/renderer/cross_faded_property_evaluator.hpp>
 #include <mbgl/tile/tile_id.hpp>
 #include <mbgl/map/transform_state.hpp>
 #include <mbgl/util/mat3.hpp>
diff --git a/src/mbgl/programs/fill_extrusion_program.hpp b/src/mbgl/programs/fill_extrusion_program.hpp
index b84e50298c..48fca44ee8 100644
--- a/src/mbgl/programs/fill_extrusion_program.hpp
+++ b/src/mbgl/programs/fill_extrusion_program.hpp
@@ -10,7 +10,7 @@
 #include <mbgl/util/size.hpp>
 #include <mbgl/style/layers/fill_extrusion_layer_properties.hpp>
 #include <mbgl/style/style.hpp>
-#include <mbgl/style/light_impl.hpp>
+#include <mbgl/renderer/render_light.hpp>
 
 #include <string>
 
@@ -19,10 +19,7 @@ namespace mbgl {
 class SpriteAtlasElement;
 class UnwrappedTileID;
 class TransformState;
-
-namespace style {
 template <class> class Faded;
-} // namespace style
 
 namespace uniforms {
 MBGL_DEFINE_UNIFORM_VECTOR(float, 3, u_lightpos);
@@ -45,7 +42,7 @@ struct FillExtrusionUniforms : gl::Uniforms<
 {
     static Values values(mat4,
                          const TransformState&,
-                         const style::EvaluatedLight&);
+                         const EvaluatedLight&);
 };
 
 struct FillExtrusionPatternUniforms : gl::Uniforms<
@@ -71,11 +68,11 @@ struct FillExtrusionPatternUniforms : gl::Uniforms<
     static Values values(mat4,
                          const SpriteAtlasElement&,
                          const SpriteAtlasElement&,
-                         const style::Faded<std::string>&,
+                         const Faded<std::string>&,
                          const UnwrappedTileID&,
                          const TransformState&,
                          const float,
-                         const style::EvaluatedLight&);
+                         const EvaluatedLight&);
 };
 
 class FillExtrusionProgram : public Program<
diff --git a/src/mbgl/programs/fill_program.cpp b/src/mbgl/programs/fill_program.cpp
index eebcffd2cb..4310f01164 100644
--- a/src/mbgl/programs/fill_program.cpp
+++ b/src/mbgl/programs/fill_program.cpp
@@ -1,6 +1,6 @@
 #include <mbgl/programs/fill_program.hpp>
 #include <mbgl/sprite/sprite_atlas.hpp>
-#include <mbgl/style/cross_faded_property_evaluator.hpp>
+#include <mbgl/renderer/cross_faded_property_evaluator.hpp>
 #include <mbgl/tile/tile_id.hpp>
 #include <mbgl/map/transform_state.hpp>
 
diff --git a/src/mbgl/programs/fill_program.hpp b/src/mbgl/programs/fill_program.hpp
index bbf5c39fb9..63751e740a 100644
--- a/src/mbgl/programs/fill_program.hpp
+++ b/src/mbgl/programs/fill_program.hpp
@@ -19,10 +19,7 @@ namespace mbgl {
 class SpriteAtlasElement;
 class UnwrappedTileID;
 class TransformState;
-
-namespace style {
 template <class> class Faded;
-} // namespace style
 
 struct FillLayoutAttributes : gl::Attributes<
     attributes::a_pos>
@@ -54,7 +51,7 @@ struct FillPatternUniforms : gl::Uniforms<
                          Size framebufferSize,
                          const SpriteAtlasElement&,
                          const SpriteAtlasElement&,
-                         const style::Faded<std::string>&,
+                         const Faded<std::string>&,
                          const UnwrappedTileID&,
                          const TransformState&);
 };
diff --git a/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp
index 4895f6fca7..1cac99bfc2 100644
--- a/src/mbgl/programs/symbol_program.hpp
+++ b/src/mbgl/programs/symbol_program.hpp
@@ -105,7 +105,7 @@ public:
                                                     const style::DataDrivenPropertyValue<float>& sizeProperty,
                                                     const float defaultValue);
 
-    virtual SymbolSizeAttributes::Bindings attributeBindings(const style::PossiblyEvaluatedPropertyValue<float> currentValue) const = 0;
+    virtual SymbolSizeAttributes::Bindings attributeBindings(const PossiblyEvaluatedPropertyValue<float> currentValue) const = 0;
     virtual void populateVertexVector(const GeometryTileFeature& feature) = 0;
     virtual UniformValues uniformValues(float currentZoom) const = 0;
     virtual void upload(gl::Context&) = 0;
@@ -155,7 +155,7 @@ public:
         );
     }
     
-    SymbolSizeAttributes::Bindings attributeBindings(const style::PossiblyEvaluatedPropertyValue<float>) const override {
+    SymbolSizeAttributes::Bindings attributeBindings(const PossiblyEvaluatedPropertyValue<float>) const override {
         return SymbolSizeAttributes::Bindings { SymbolSizeAttributes::Attribute::ConstantBinding {{{0, 0, 0}}} };
     }
     void upload(gl::Context&) override {}
@@ -209,7 +209,7 @@ public:
           defaultValue(defaultValue_) {
     }
 
-    SymbolSizeAttributes::Bindings attributeBindings(const style::PossiblyEvaluatedPropertyValue<float> currentValue) const override {
+    SymbolSizeAttributes::Bindings attributeBindings(const PossiblyEvaluatedPropertyValue<float> currentValue) const override {
         if (currentValue.isConstant()) {
             return SymbolSizeAttributes::Bindings { SymbolSizeAttributes::Attribute::ConstantBinding {{{0, 0, 0}}} };
         }
@@ -266,7 +266,7 @@ public:
             return getCoveringStops(stops, tileZoom, tileZoom + 1); }))
     {}
 
-    SymbolSizeAttributes::Bindings attributeBindings(const style::PossiblyEvaluatedPropertyValue<float> currentValue) const override {
+    SymbolSizeAttributes::Bindings attributeBindings(const PossiblyEvaluatedPropertyValue<float> currentValue) const override {
         if (currentValue.isConstant()) {
             return SymbolSizeAttributes::Bindings { SymbolSizeAttributes::Attribute::ConstantBinding {{{0, 0, 0}}} };
         }
@@ -361,7 +361,7 @@ public:
               UniformValues&& uniformValues,
               const gl::VertexBuffer<LayoutVertex>& layoutVertexBuffer,
               const SymbolSizeBinder& symbolSizeBinder,
-              const style::PossiblyEvaluatedPropertyValue<float>& currentSizeValue,
+              const PossiblyEvaluatedPropertyValue<float>& currentSizeValue,
               const gl::IndexBuffer<DrawMode>& indexBuffer,
               const gl::SegmentVector<Attributes>& segments,
               const PaintPropertyBinders& paintPropertyBinders,
diff --git a/src/mbgl/style/cascade_parameters.hpp b/src/mbgl/renderer/cascade_parameters.hpp
index e0333741dd..4096cc5a6b 100644
--- a/src/mbgl/style/cascade_parameters.hpp
+++ b/src/mbgl/renderer/cascade_parameters.hpp
@@ -7,14 +7,12 @@
 #include <vector>
 
 namespace mbgl {
-namespace style {
 
 class CascadeParameters {
 public:
-    std::vector<ClassID> classes;
+    std::vector<style::ClassID> classes;
     TimePoint now;
-    TransitionOptions transition;
+    style::TransitionOptions transition;
 };
 
-} // namespace style
 } // namespace mbgl
diff --git a/src/mbgl/style/cross_faded_property_evaluator.cpp b/src/mbgl/renderer/cross_faded_property_evaluator.cpp
index 796ca00bbf..ee3c86614f 100644
--- a/src/mbgl/style/cross_faded_property_evaluator.cpp
+++ b/src/mbgl/renderer/cross_faded_property_evaluator.cpp
@@ -1,13 +1,12 @@
-#include <mbgl/style/cross_faded_property_evaluator.hpp>
+#include <mbgl/renderer/cross_faded_property_evaluator.hpp>
 #include <mbgl/util/chrono.hpp>
 
 #include <cmath>
 
 namespace mbgl {
-namespace style {
 
 template <typename T>
-Faded<T> CrossFadedPropertyEvaluator<T>::operator()(const Undefined&) const {
+Faded<T> CrossFadedPropertyEvaluator<T>::operator()(const style::Undefined&) const {
     return calculate(defaultValue, defaultValue, defaultValue);
 }
 
@@ -17,7 +16,7 @@ Faded<T> CrossFadedPropertyEvaluator<T>::operator()(const T& constant) const {
 }
 
 template <typename T>
-Faded<T> CrossFadedPropertyEvaluator<T>::operator()(const CameraFunction<T>& function) const {
+Faded<T> CrossFadedPropertyEvaluator<T>::operator()(const style::CameraFunction<T>& function) const {
     return calculate(function.evaluate(parameters.z - 1.0f),
                      function.evaluate(parameters.z),
                      function.evaluate(parameters.z + 1.0f));
@@ -38,5 +37,4 @@ Faded<T> CrossFadedPropertyEvaluator<T>::calculate(const T& min, const T& mid, c
 template class CrossFadedPropertyEvaluator<std::string>;
 template class CrossFadedPropertyEvaluator<std::vector<float>>;
 
-} // namespace style
 } // namespace mbgl
diff --git a/src/mbgl/style/cross_faded_property_evaluator.hpp b/src/mbgl/renderer/cross_faded_property_evaluator.hpp
index c5642f5cfb..40ecba5d93 100644
--- a/src/mbgl/style/cross_faded_property_evaluator.hpp
+++ b/src/mbgl/renderer/cross_faded_property_evaluator.hpp
@@ -1,11 +1,10 @@
 #pragma once
 
 #include <mbgl/style/property_value.hpp>
-#include <mbgl/style/property_evaluation_parameters.hpp>
+#include <mbgl/renderer/property_evaluation_parameters.hpp>
 #include <mbgl/util/interpolate.hpp>
 
 namespace mbgl {
-namespace style {
 
 template <typename T>
 class Faded {
@@ -26,9 +25,9 @@ public:
         : parameters(parameters_),
           defaultValue(std::move(defaultValue_)) {}
 
-    Faded<T> operator()(const Undefined&) const;
+    Faded<T> operator()(const style::Undefined&) const;
     Faded<T> operator()(const T& constant) const;
-    Faded<T> operator()(const CameraFunction<T>&) const;
+    Faded<T> operator()(const style::CameraFunction<T>&) const;
 
 private:
     Faded<T> calculate(const T& min, const T& mid, const T& max) const;
@@ -37,11 +36,9 @@ private:
     T defaultValue;
 };
 
-} // namespace style
-
 namespace util {
 template <typename T>
-struct Interpolator<style::Faded<T>>
+struct Interpolator<Faded<T>>
     : Uninterpolated {};
 } // namespace util
 
diff --git a/src/mbgl/style/data_driven_property_evaluator.hpp b/src/mbgl/renderer/data_driven_property_evaluator.hpp
index 7a0ff9a094..6406b3478b 100644
--- a/src/mbgl/style/data_driven_property_evaluator.hpp
+++ b/src/mbgl/renderer/data_driven_property_evaluator.hpp
@@ -1,11 +1,10 @@
 #pragma once
 
 #include <mbgl/style/property_value.hpp>
-#include <mbgl/style/property_evaluation_parameters.hpp>
-#include <mbgl/style/possibly_evaluated_property_value.hpp>
+#include <mbgl/renderer/property_evaluation_parameters.hpp>
+#include <mbgl/renderer/possibly_evaluated_property_value.hpp>
 
 namespace mbgl {
-namespace style {
 
 template <typename T>
 class DataDrivenPropertyEvaluator {
@@ -16,7 +15,7 @@ public:
         : parameters(parameters_),
           defaultValue(std::move(defaultValue_)) {}
 
-    ResultType operator()(const Undefined&) const {
+    ResultType operator()(const style::Undefined&) const {
         return ResultType(defaultValue);
     }
 
@@ -24,7 +23,7 @@ public:
         return ResultType(constant);
     }
 
-    ResultType operator()(const CameraFunction<T>& function) const {
+    ResultType operator()(const style::CameraFunction<T>& function) const {
         return ResultType(function.evaluate(parameters.z));
     }
 
@@ -38,5 +37,4 @@ private:
     T defaultValue;
 };
 
-} // namespace style
 } // namespace mbgl
diff --git a/src/mbgl/style/paint_property_binder.hpp b/src/mbgl/renderer/paint_property_binder.hpp
index 3915ee588b..3e53bcc884 100644
--- a/src/mbgl/style/paint_property_binder.hpp
+++ b/src/mbgl/renderer/paint_property_binder.hpp
@@ -4,10 +4,9 @@
 #include <mbgl/gl/attribute.hpp>
 #include <mbgl/gl/uniform.hpp>
 #include <mbgl/util/type_list.hpp>
-#include <mbgl/style/paint_property_statistics.hpp>
+#include <mbgl/renderer/paint_property_statistics.hpp>
 
 namespace mbgl {
-namespace style {
 
 /*
    ZoomInterpolatedAttribute<Attr> is a 'compound' attribute, representing two values of the
@@ -133,7 +132,7 @@ public:
     using Attribute = ZoomInterpolatedAttributeType<A>;
     using AttributeBinding = typename Attribute::Binding;
 
-    SourceFunctionPaintPropertyBinder(SourceFunction<T> function_, T defaultValue_)
+    SourceFunctionPaintPropertyBinder(style::SourceFunction<T> function_, T defaultValue_)
         : function(std::move(function_)),
           defaultValue(std::move(defaultValue_)) {
     }
@@ -167,7 +166,7 @@ public:
     }
 
 private:
-    SourceFunction<T> function;
+    style::SourceFunction<T> function;
     T defaultValue;
     gl::VertexVector<BaseVertex> vertexVector;
     optional<gl::VertexBuffer<BaseVertex>> vertexBuffer;
@@ -184,7 +183,7 @@ public:
     using AttributeBinding = typename Attribute::Binding;
     using Vertex = gl::detail::Vertex<Attribute>;
 
-    CompositeFunctionPaintPropertyBinder(CompositeFunction<T> function_, float zoom, T defaultValue_)
+    CompositeFunctionPaintPropertyBinder(style::CompositeFunction<T> function_, float zoom, T defaultValue_)
         : function(std::move(function_)),
           defaultValue(std::move(defaultValue_)),
           coveringRanges(function.coveringRanges(zoom)) {
@@ -222,8 +221,8 @@ public:
     }
 
 private:
-    using InnerStops = typename CompositeFunction<T>::InnerStops;
-    CompositeFunction<T> function;
+    using InnerStops = typename style::CompositeFunction<T>::InnerStops;
+    style::CompositeFunction<T> function;
     T defaultValue;
     std::tuple<Range<float>, Range<InnerStops>> coveringRanges;
     gl::VertexVector<Vertex> vertexVector;
@@ -237,10 +236,10 @@ PaintPropertyBinder<T, A>::create(const PossiblyEvaluatedPropertyValue<T>& value
         [&] (const T& constant) -> std::unique_ptr<PaintPropertyBinder<T, A>> {
             return std::make_unique<ConstantPaintPropertyBinder<T, A>>(constant);
         },
-        [&] (const SourceFunction<T>& function) {
+        [&] (const style::SourceFunction<T>& function) {
             return std::make_unique<SourceFunctionPaintPropertyBinder<T, A>>(function, defaultValue);
         },
-        [&] (const CompositeFunction<T>& function) {
+        [&] (const style::CompositeFunction<T>& function) {
             return std::make_unique<CompositeFunctionPaintPropertyBinder<T, A>>(function, zoom, defaultValue);
         }
     );
@@ -328,5 +327,4 @@ private:
     Binders binders;
 };
 
-} // namespace style
 } // namespace mbgl
diff --git a/src/mbgl/style/paint_property_statistics.hpp b/src/mbgl/renderer/paint_property_statistics.hpp
index 01d634dd6f..59a8545911 100644
--- a/src/mbgl/style/paint_property_statistics.hpp
+++ b/src/mbgl/renderer/paint_property_statistics.hpp
@@ -3,7 +3,6 @@
 #include <mbgl/util/optional.hpp>
 
 namespace mbgl {
-namespace style {
 
 template <class T>
 class PaintPropertyStatistics {
@@ -27,5 +26,4 @@ private:
     optional<float> _max;
 };
 
-} // namespace style
 } // namespace mbgl
diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp
index c7c8173d0d..ff72749718 100644
--- a/src/mbgl/renderer/painter.hpp
+++ b/src/mbgl/renderer/painter.hpp
@@ -158,7 +158,7 @@ private:
     GlyphAtlas* glyphAtlas = nullptr;
     LineAtlas* lineAtlas = nullptr;
 
-    style::EvaluatedLight evaluatedLight;
+    EvaluatedLight evaluatedLight;
 
     FrameHistory frameHistory;
 
diff --git a/src/mbgl/style/possibly_evaluated_property_value.hpp b/src/mbgl/renderer/possibly_evaluated_property_value.hpp
index 9cb5f6e81b..a0bcec2bf1 100644
--- a/src/mbgl/style/possibly_evaluated_property_value.hpp
+++ b/src/mbgl/renderer/possibly_evaluated_property_value.hpp
@@ -7,15 +7,13 @@
 
 namespace mbgl {
 
-namespace style {
-
 template <class T>
 class PossiblyEvaluatedPropertyValue {
 private:
     using Value = variant<
         T,
-        SourceFunction<T>,
-        CompositeFunction<T>>;
+        style::SourceFunction<T>,
+        style::CompositeFunction<T>>;
 
     Value value;
 
@@ -46,25 +44,23 @@ public:
     T evaluate(const Feature& feature, float zoom, T defaultValue) const {
         return this->match(
                 [&] (const T& constant) { return constant; },
-                [&] (const SourceFunction<T>& function) {
+                [&] (const style::SourceFunction<T>& function) {
                     return function.evaluate(feature, defaultValue);
                 },
-                [&] (const CompositeFunction<T>& function) {
+                [&] (const style::CompositeFunction<T>& function) {
                     return function.evaluate(zoom, feature, defaultValue);
                 }
         );
     }
 };
 
-} // namespace style
-
 namespace util {
 
 template <typename T>
-struct Interpolator<style::PossiblyEvaluatedPropertyValue<T>> {
-    style::PossiblyEvaluatedPropertyValue<T> operator()(const style::PossiblyEvaluatedPropertyValue<T>& a,
-                                                        const style::PossiblyEvaluatedPropertyValue<T>& b,
-                                                        const double t) const {
+struct Interpolator<PossiblyEvaluatedPropertyValue<T>> {
+    PossiblyEvaluatedPropertyValue<T> operator()(const PossiblyEvaluatedPropertyValue<T>& a,
+                                                 const PossiblyEvaluatedPropertyValue<T>& b,
+                                                 const double t) const {
         if (a.isConstant() && b.isConstant()) {
             return { interpolate(*a.constant(), *b.constant(), t) };
         } else {
diff --git a/src/mbgl/style/property_evaluation_parameters.hpp b/src/mbgl/renderer/property_evaluation_parameters.hpp
index 2591fc07a1..b18fe57aca 100644
--- a/src/mbgl/style/property_evaluation_parameters.hpp
+++ b/src/mbgl/renderer/property_evaluation_parameters.hpp
@@ -4,7 +4,6 @@
 #include <mbgl/util/chrono.hpp>
 
 namespace mbgl {
-namespace style {
 
 class PropertyEvaluationParameters {
 public:
@@ -26,5 +25,4 @@ public:
     Duration defaultFadeDuration;
 };
 
-} // namespace style
 } // namespace mbgl
diff --git a/src/mbgl/style/property_evaluator.hpp b/src/mbgl/renderer/property_evaluator.hpp
index 3f629ada4f..3ac0573920 100644
--- a/src/mbgl/style/property_evaluator.hpp
+++ b/src/mbgl/renderer/property_evaluator.hpp
@@ -1,10 +1,9 @@
 #pragma once
 
 #include <mbgl/style/property_value.hpp>
-#include <mbgl/style/property_evaluation_parameters.hpp>
+#include <mbgl/renderer/property_evaluation_parameters.hpp>
 
 namespace mbgl {
-namespace style {
 
 template <typename T>
 class PropertyEvaluator {
@@ -15,14 +14,13 @@ public:
         : parameters(parameters_),
           defaultValue(std::move(defaultValue_)) {}
 
-    T operator()(const Undefined&) const { return defaultValue; }
+    T operator()(const style::Undefined&) const { return defaultValue; }
     T operator()(const T& constant) const { return constant; }
-    T operator()(const CameraFunction<T>& fn) const { return fn.evaluate(parameters.z); }
+    T operator()(const style::CameraFunction<T>& fn) const { return fn.evaluate(parameters.z); }
 
 private:
     const PropertyEvaluationParameters& parameters;
     T defaultValue;
 };
 
-} // namespace style
 } // namespace mbgl
diff --git a/src/mbgl/renderer/render_background_layer.cpp b/src/mbgl/renderer/render_background_layer.cpp
index 5b98210975..a6b4a5e36e 100644
--- a/src/mbgl/renderer/render_background_layer.cpp
+++ b/src/mbgl/renderer/render_background_layer.cpp
@@ -19,11 +19,11 @@ std::unique_ptr<Bucket> RenderBackgroundLayer::createBucket(const BucketParamete
     return nullptr;
 }
 
-void RenderBackgroundLayer::cascade(const style::CascadeParameters &parameters) {
+void RenderBackgroundLayer::cascade(const CascadeParameters &parameters) {
     unevaluated = impl->cascading.cascade(parameters, std::move(unevaluated));
 }
 
-bool RenderBackgroundLayer::evaluate(const style::PropertyEvaluationParameters &parameters) {
+bool RenderBackgroundLayer::evaluate(const PropertyEvaluationParameters &parameters) {
     evaluated = unevaluated.evaluate(parameters);
 
     passes = evaluated.get<style::BackgroundOpacity>() > 0 ? RenderPass::Translucent
diff --git a/src/mbgl/renderer/render_background_layer.hpp b/src/mbgl/renderer/render_background_layer.hpp
index bd74f7b390..137980389c 100644
--- a/src/mbgl/renderer/render_background_layer.hpp
+++ b/src/mbgl/renderer/render_background_layer.hpp
@@ -14,8 +14,8 @@ public:
 
     std::unique_ptr<RenderLayer> clone() const override;
 
-    void cascade(const style::CascadeParameters&) override;
-    bool evaluate(const style::PropertyEvaluationParameters&) override;
+    void cascade(const CascadeParameters&) override;
+    bool evaluate(const PropertyEvaluationParameters&) override;
 
     std::unique_ptr<Bucket> createBucket(const BucketParameters&, const std::vector<const RenderLayer*>&) const override;
 
diff --git a/src/mbgl/renderer/render_circle_layer.cpp b/src/mbgl/renderer/render_circle_layer.cpp
index aa127e9859..56832d53cb 100644
--- a/src/mbgl/renderer/render_circle_layer.cpp
+++ b/src/mbgl/renderer/render_circle_layer.cpp
@@ -20,11 +20,11 @@ std::unique_ptr<Bucket> RenderCircleLayer::createBucket(const BucketParameters&
     return std::make_unique<CircleBucket>(parameters, layers);
 }
 
-void RenderCircleLayer::cascade(const style::CascadeParameters& parameters) {
+void RenderCircleLayer::cascade(const CascadeParameters& parameters) {
     unevaluated = impl->cascading.cascade(parameters, std::move(unevaluated));
 }
 
-bool RenderCircleLayer::evaluate(const style::PropertyEvaluationParameters& parameters) {
+bool RenderCircleLayer::evaluate(const PropertyEvaluationParameters& parameters) {
     evaluated = unevaluated.evaluate(parameters);
 
     passes = ((evaluated.get<style::CircleRadius>().constantOr(1) > 0 ||
diff --git a/src/mbgl/renderer/render_circle_layer.hpp b/src/mbgl/renderer/render_circle_layer.hpp
index 5117b12246..8a2f73ec83 100644
--- a/src/mbgl/renderer/render_circle_layer.hpp
+++ b/src/mbgl/renderer/render_circle_layer.hpp
@@ -14,8 +14,8 @@ public:
 
     std::unique_ptr<RenderLayer> clone() const override;
 
-    void cascade(const style::CascadeParameters&) override;
-    bool evaluate(const style::PropertyEvaluationParameters&) override;
+    void cascade(const CascadeParameters&) override;
+    bool evaluate(const PropertyEvaluationParameters&) override;
 
     bool queryIntersectsFeature(
             const GeometryCoordinates&,
diff --git a/src/mbgl/renderer/render_custom_layer.cpp b/src/mbgl/renderer/render_custom_layer.cpp
index f9dda47d7a..d500d11f4a 100644
--- a/src/mbgl/renderer/render_custom_layer.cpp
+++ b/src/mbgl/renderer/render_custom_layer.cpp
@@ -13,7 +13,7 @@ std::unique_ptr<RenderLayer> RenderCustomLayer::clone() const {
     return std::make_unique<RenderCustomLayer>(*this);
 }
 
-bool RenderCustomLayer::evaluate(const style::PropertyEvaluationParameters&) {
+bool RenderCustomLayer::evaluate(const PropertyEvaluationParameters&) {
     passes = RenderPass::Translucent;
     return false;
 }
diff --git a/src/mbgl/renderer/render_custom_layer.hpp b/src/mbgl/renderer/render_custom_layer.hpp
index 3c6c06ff7c..cb728fecb3 100644
--- a/src/mbgl/renderer/render_custom_layer.hpp
+++ b/src/mbgl/renderer/render_custom_layer.hpp
@@ -13,8 +13,8 @@ public:
 
     std::unique_ptr<RenderLayer> clone() const override;
 
-    void cascade(const style::CascadeParameters&) final {}
-    bool evaluate(const style::PropertyEvaluationParameters&) final;
+    void cascade(const CascadeParameters&) final {}
+    bool evaluate(const PropertyEvaluationParameters&) final;
 
     std::unique_ptr<Bucket> createBucket(const BucketParameters&, const std::vector<const RenderLayer*>&) const final;
 
diff --git a/src/mbgl/renderer/render_fill_extrusion_layer.cpp b/src/mbgl/renderer/render_fill_extrusion_layer.cpp
index 8df0d36900..70ee74b56e 100644
--- a/src/mbgl/renderer/render_fill_extrusion_layer.cpp
+++ b/src/mbgl/renderer/render_fill_extrusion_layer.cpp
@@ -20,11 +20,11 @@ std::unique_ptr<Bucket> RenderFillExtrusionLayer::createBucket(const BucketParam
     return std::make_unique<FillExtrusionBucket>(parameters, layers);
 }
 
-void RenderFillExtrusionLayer::cascade(const style::CascadeParameters& parameters) {
+void RenderFillExtrusionLayer::cascade(const CascadeParameters& parameters) {
     unevaluated = impl->cascading.cascade(parameters, std::move(unevaluated));
 }
 
-bool RenderFillExtrusionLayer::evaluate(const style::PropertyEvaluationParameters& parameters) {
+bool RenderFillExtrusionLayer::evaluate(const PropertyEvaluationParameters& parameters) {
     evaluated = unevaluated.evaluate(parameters);
 
     passes = (evaluated.get<style::FillExtrusionOpacity>() > 0) ? RenderPass::Translucent
diff --git a/src/mbgl/renderer/render_fill_extrusion_layer.hpp b/src/mbgl/renderer/render_fill_extrusion_layer.hpp
index 87b6ad6071..b4fd1411f5 100644
--- a/src/mbgl/renderer/render_fill_extrusion_layer.hpp
+++ b/src/mbgl/renderer/render_fill_extrusion_layer.hpp
@@ -14,8 +14,8 @@ public:
 
     std::unique_ptr<RenderLayer> clone() const override;
 
-    void cascade(const style::CascadeParameters&) override;
-    bool evaluate(const style::PropertyEvaluationParameters&) override;
+    void cascade(const CascadeParameters&) override;
+    bool evaluate(const PropertyEvaluationParameters&) override;
 
     bool queryIntersectsFeature(
         const GeometryCoordinates&,
diff --git a/src/mbgl/renderer/render_fill_layer.cpp b/src/mbgl/renderer/render_fill_layer.cpp
index 126189fc50..53c1ff3032 100644
--- a/src/mbgl/renderer/render_fill_layer.cpp
+++ b/src/mbgl/renderer/render_fill_layer.cpp
@@ -20,11 +20,11 @@ std::unique_ptr<Bucket> RenderFillLayer::createBucket(const BucketParameters& pa
     return std::make_unique<FillBucket>(parameters, layers);
 }
 
-void RenderFillLayer::cascade(const style::CascadeParameters& parameters) {
+void RenderFillLayer::cascade(const CascadeParameters& parameters) {
     unevaluated = impl->cascading.cascade(parameters, std::move(unevaluated));
 }
 
-bool RenderFillLayer::evaluate(const style::PropertyEvaluationParameters& parameters) {
+bool RenderFillLayer::evaluate(const PropertyEvaluationParameters& parameters) {
     evaluated = unevaluated.evaluate(parameters);
 
     if (unevaluated.get<style::FillOutlineColor>().isUndefined()) {
diff --git a/src/mbgl/renderer/render_fill_layer.hpp b/src/mbgl/renderer/render_fill_layer.hpp
index 25b969d4c3..3a8de3622a 100644
--- a/src/mbgl/renderer/render_fill_layer.hpp
+++ b/src/mbgl/renderer/render_fill_layer.hpp
@@ -14,8 +14,8 @@ public:
 
     std::unique_ptr<RenderLayer> clone() const override;
 
-    void cascade(const style::CascadeParameters&) override;
-    bool evaluate(const style::PropertyEvaluationParameters&) override;
+    void cascade(const CascadeParameters&) override;
+    bool evaluate(const PropertyEvaluationParameters&) override;
 
     bool queryIntersectsFeature(
             const GeometryCoordinates&,
diff --git a/src/mbgl/renderer/render_layer.hpp b/src/mbgl/renderer/render_layer.hpp
index af5345d5e3..003059005e 100644
--- a/src/mbgl/renderer/render_layer.hpp
+++ b/src/mbgl/renderer/render_layer.hpp
@@ -12,11 +12,8 @@ namespace mbgl {
 
 class Bucket;
 class BucketParameters;
-
-namespace style {
 class CascadeParameters;
 class PropertyEvaluationParameters;
-} // namespace style
 
 class RenderLayer {
 
@@ -33,11 +30,11 @@ public:
     virtual std::unique_ptr<RenderLayer> clone() const = 0;
 
     // Partially evaluate paint properties based on a set of classes.
-    virtual void cascade(const style::CascadeParameters&) = 0;
+    virtual void cascade(const CascadeParameters&) = 0;
 
     // Fully evaluate cascaded paint properties based on a zoom level.
     // Returns true if any paint properties have active transitions.
-    virtual bool evaluate(const style::PropertyEvaluationParameters&) = 0;
+    virtual bool evaluate(const PropertyEvaluationParameters&) = 0;
 
     // Check whether this layer is of the given subtype.
     template <class T>
diff --git a/src/mbgl/style/light_impl.hpp b/src/mbgl/renderer/render_light.hpp
index d1825090fc..8f59299552 100644
--- a/src/mbgl/style/light_impl.hpp
+++ b/src/mbgl/renderer/render_light.hpp
@@ -1,14 +1,13 @@
 #pragma once
 
 #include <mbgl/style/light.hpp>
-#include <mbgl/style/transitioning_property.hpp>
-#include <mbgl/style/cascade_parameters.hpp>
-#include <mbgl/style/property_evaluator.hpp>
-#include <mbgl/style/property_evaluation_parameters.hpp>
+#include <mbgl/renderer/transitioning_property.hpp>
+#include <mbgl/renderer/cascade_parameters.hpp>
+#include <mbgl/renderer/property_evaluator.hpp>
+#include <mbgl/renderer/property_evaluation_parameters.hpp>
 #include <mbgl/util/ignore.hpp>
 
 namespace mbgl {
-namespace style {
 
 template <class TypeList>
 class Transitioning;
@@ -67,8 +66,7 @@ public:
         } {}
 };
 
-using TransitioningLight = Transitioning<LightProperties>;
-using EvaluatedLight     = Evaluated<LightProperties>;
+using TransitioningLight = Transitioning<style::LightProperties>;
+using EvaluatedLight     = Evaluated<style::LightProperties>;
 
-} // namespace style
 } // namespace mbgl
diff --git a/src/mbgl/renderer/render_line_layer.cpp b/src/mbgl/renderer/render_line_layer.cpp
index 551d40bef5..e5060af79e 100644
--- a/src/mbgl/renderer/render_line_layer.cpp
+++ b/src/mbgl/renderer/render_line_layer.cpp
@@ -20,11 +20,11 @@ std::unique_ptr<Bucket> RenderLineLayer::createBucket(const BucketParameters& pa
     return std::make_unique<LineBucket>(parameters, layers, impl->layout);
 }
 
-void RenderLineLayer::cascade(const style::CascadeParameters& parameters) {
+void RenderLineLayer::cascade(const CascadeParameters& parameters) {
     unevaluated = impl->cascading.cascade(parameters, std::move(unevaluated));
 }
 
-bool RenderLineLayer::evaluate(const style::PropertyEvaluationParameters& parameters) {
+bool RenderLineLayer::evaluate(const PropertyEvaluationParameters& parameters) {
     // for scaling dasharrays
     auto dashArrayParams = parameters;
     dashArrayParams.z = std::floor(dashArrayParams.z);
diff --git a/src/mbgl/renderer/render_line_layer.hpp b/src/mbgl/renderer/render_line_layer.hpp
index 0bde6f9a86..15052deb38 100644
--- a/src/mbgl/renderer/render_line_layer.hpp
+++ b/src/mbgl/renderer/render_line_layer.hpp
@@ -14,8 +14,8 @@ public:
 
     std::unique_ptr<RenderLayer> clone() const override;
 
-    void cascade(const style::CascadeParameters&) override;
-    bool evaluate(const style::PropertyEvaluationParameters&) override;
+    void cascade(const CascadeParameters&) override;
+    bool evaluate(const PropertyEvaluationParameters&) override;
 
     bool queryIntersectsFeature(
             const GeometryCoordinates&,
diff --git a/src/mbgl/renderer/render_raster_layer.cpp b/src/mbgl/renderer/render_raster_layer.cpp
index f877a02398..0cfccc81b3 100644
--- a/src/mbgl/renderer/render_raster_layer.cpp
+++ b/src/mbgl/renderer/render_raster_layer.cpp
@@ -18,11 +18,11 @@ std::unique_ptr<Bucket> RenderRasterLayer::createBucket(const BucketParameters&,
     return nullptr;
 }
 
-void RenderRasterLayer::cascade(const style::CascadeParameters& parameters) {
+void RenderRasterLayer::cascade(const CascadeParameters& parameters) {
     unevaluated = impl->cascading.cascade(parameters, std::move(unevaluated));
 }
 
-bool RenderRasterLayer::evaluate(const style::PropertyEvaluationParameters& parameters) {
+bool RenderRasterLayer::evaluate(const PropertyEvaluationParameters& parameters) {
     evaluated = unevaluated.evaluate(parameters);
 
     passes = evaluated.get<style::RasterOpacity>() > 0 ? RenderPass::Translucent : RenderPass::None;
diff --git a/src/mbgl/renderer/render_raster_layer.hpp b/src/mbgl/renderer/render_raster_layer.hpp
index 1fd0fe7c47..c6e38fa147 100644
--- a/src/mbgl/renderer/render_raster_layer.hpp
+++ b/src/mbgl/renderer/render_raster_layer.hpp
@@ -14,8 +14,8 @@ public:
 
     std::unique_ptr<RenderLayer> clone() const override;
 
-    void cascade(const style::CascadeParameters&) override;
-    bool evaluate(const style::PropertyEvaluationParameters&) override;
+    void cascade(const CascadeParameters&) override;
+    bool evaluate(const PropertyEvaluationParameters&) override;
 
     std::unique_ptr<Bucket> createBucket(const BucketParameters&, const std::vector<const RenderLayer*>&) const override;
 
diff --git a/src/mbgl/renderer/render_source.hpp b/src/mbgl/renderer/render_source.hpp
index 5d93ae49d6..bec1d24d0f 100644
--- a/src/mbgl/renderer/render_source.hpp
+++ b/src/mbgl/renderer/render_source.hpp
@@ -21,15 +21,12 @@ class RenderedQueryOptions;
 class SourceQueryOptions;
 class Tile;
 class RenderSourceObserver;
+class UpdateParameters;
 
 namespace algorithm {
 class ClipIDGenerator;
 } // namespace algorithm
 
-namespace style {
-class UpdateParameters;
-} // namespace style
-
 class RenderSource : protected TileObserver {
 public:
     RenderSource(const style::Source::Impl&);
@@ -39,7 +36,7 @@ public:
 
     // Called when the camera has changed. May load new tiles, unload obsolete tiles, or
     // trigger re-placement of existing complete tiles.
-    virtual void updateTiles(const style::UpdateParameters&) = 0;
+    virtual void updateTiles(const UpdateParameters&) = 0;
 
     // Removes all tiles (by putting them into the cache).
     virtual void removeTiles() = 0;
diff --git a/src/mbgl/renderer/render_symbol_layer.cpp b/src/mbgl/renderer/render_symbol_layer.cpp
index d46dc614f0..0c3601aedf 100644
--- a/src/mbgl/renderer/render_symbol_layer.cpp
+++ b/src/mbgl/renderer/render_symbol_layer.cpp
@@ -2,8 +2,8 @@
 #include <mbgl/layout/symbol_layout.hpp>
 #include <mbgl/renderer/bucket.hpp>
 #include <mbgl/renderer/bucket_parameters.hpp>
+#include <mbgl/renderer/property_evaluation_parameters.hpp>
 #include <mbgl/style/layers/symbol_layer_impl.hpp>
-#include <mbgl/style/property_evaluation_parameters.hpp>
 #include <mbgl/tile/geometry_tile_data.hpp>
 
 namespace mbgl {
@@ -34,11 +34,11 @@ std::unique_ptr<SymbolLayout> RenderSymbolLayer::createLayout(const BucketParame
                                           glyphDependencies);
 }
 
-void RenderSymbolLayer::cascade(const style::CascadeParameters& parameters) {
+void RenderSymbolLayer::cascade(const CascadeParameters& parameters) {
     unevaluated = impl->cascading.cascade(parameters, std::move(unevaluated));
 }
 
-bool RenderSymbolLayer::evaluate(const style::PropertyEvaluationParameters& parameters) {
+bool RenderSymbolLayer::evaluate(const PropertyEvaluationParameters& parameters) {
     evaluated = unevaluated.evaluate(parameters);
 
     auto hasIconOpacity = evaluated.get<style::IconColor>().constantOr(Color::black()).a > 0 ||
diff --git a/src/mbgl/renderer/render_symbol_layer.hpp b/src/mbgl/renderer/render_symbol_layer.hpp
index b19b236e90..b9c2cc3247 100644
--- a/src/mbgl/renderer/render_symbol_layer.hpp
+++ b/src/mbgl/renderer/render_symbol_layer.hpp
@@ -66,8 +66,8 @@ public:
 
     std::unique_ptr<RenderLayer> clone() const override;
 
-    void cascade(const style::CascadeParameters&) override;
-    bool evaluate(const style::PropertyEvaluationParameters&) override;
+    void cascade(const CascadeParameters&) override;
+    bool evaluate(const PropertyEvaluationParameters&) override;
 
     style::IconPaintProperties::Evaluated iconPaintProperties() const;
     style::TextPaintProperties::Evaluated textPaintProperties() const;
diff --git a/src/mbgl/renderer/sources/render_geojson_source.hpp b/src/mbgl/renderer/sources/render_geojson_source.hpp
index 3476b63afd..502df0f1c5 100644
--- a/src/mbgl/renderer/sources/render_geojson_source.hpp
+++ b/src/mbgl/renderer/sources/render_geojson_source.hpp
@@ -18,7 +18,7 @@ public:
 
     // Called when the camera has changed. May load new tiles, unload obsolete tiles, or
     // trigger re-placement of existing complete tiles.
-    void updateTiles(const style::UpdateParameters&) final;
+    void updateTiles(const UpdateParameters&) final;
 
     // Removes all tiles (by putting them into the cache).
     void removeTiles() final;
diff --git a/src/mbgl/renderer/sources/render_raster_source.hpp b/src/mbgl/renderer/sources/render_raster_source.hpp
index 6b95be363f..ebb7b62150 100644
--- a/src/mbgl/renderer/sources/render_raster_source.hpp
+++ b/src/mbgl/renderer/sources/render_raster_source.hpp
@@ -14,7 +14,7 @@ public:
 
     // Called when the camera has changed. May load new tiles, unload obsolete tiles, or
     // trigger re-placement of existing complete tiles.
-    void updateTiles(const style::UpdateParameters&) final;
+    void updateTiles(const UpdateParameters&) final;
 
     // Removes all tiles (by putting them into the cache).
     void removeTiles() final;
diff --git a/src/mbgl/renderer/sources/render_vector_source.hpp b/src/mbgl/renderer/sources/render_vector_source.hpp
index 0f40c14cf5..c435db6f0b 100644
--- a/src/mbgl/renderer/sources/render_vector_source.hpp
+++ b/src/mbgl/renderer/sources/render_vector_source.hpp
@@ -14,7 +14,7 @@ public:
 
     // Called when the camera has changed. May load new tiles, unload obsolete tiles, or
     // trigger re-placement of existing complete tiles.
-    void updateTiles(const style::UpdateParameters&) final;
+    void updateTiles(const UpdateParameters&) final;
 
     // Removes all tiles (by putting them into the cache).
     void removeTiles() final;
diff --git a/src/mbgl/renderer/tile_pyramid.cpp b/src/mbgl/renderer/tile_pyramid.cpp
index 130b9dc5b6..97f9f31937 100644
--- a/src/mbgl/renderer/tile_pyramid.cpp
+++ b/src/mbgl/renderer/tile_pyramid.cpp
@@ -2,7 +2,7 @@
 #include <mbgl/renderer/render_tile.hpp>
 #include <mbgl/renderer/painter.hpp>
 #include <mbgl/renderer/render_source.hpp>
-#include <mbgl/style/update_parameters.hpp>
+#include <mbgl/renderer/update_parameters.hpp>
 #include <mbgl/map/transform.hpp>
 #include <mbgl/map/query.hpp>
 #include <mbgl/text/placement_config.hpp>
diff --git a/src/mbgl/renderer/tile_pyramid.hpp b/src/mbgl/renderer/tile_pyramid.hpp
index a38a21dd88..b8ffbfb2b0 100644
--- a/src/mbgl/renderer/tile_pyramid.hpp
+++ b/src/mbgl/renderer/tile_pyramid.hpp
@@ -22,10 +22,7 @@ class TransformState;
 class RenderTile;
 class RenderedQueryOptions;
 class SourceQueryOptions;
-
-namespace style {
 class UpdateParameters;
-} // namespace style
 
 class TilePyramid {
 public:
@@ -36,7 +33,7 @@ public:
 
     // Called when the camera has changed. May load new tiles, unload obsolete tiles, or
     // trigger re-placement of existing complete tiles.
-    void updateTiles(const style::UpdateParameters&,
+    void updateTiles(const UpdateParameters&,
                      SourceType type,
                      uint16_t tileSize,
                      Range<uint8_t> zoomRange,
diff --git a/src/mbgl/style/transitioning_property.hpp b/src/mbgl/renderer/transitioning_property.hpp
index 5456322b33..c211ccf116 100644
--- a/src/mbgl/style/transitioning_property.hpp
+++ b/src/mbgl/renderer/transitioning_property.hpp
@@ -8,7 +8,6 @@
 #include <utility>
 
 namespace mbgl {
-namespace style {
 
 template <class Value>
 class TransitioningProperty {
@@ -17,7 +16,7 @@ public:
 
     TransitioningProperty(Value value_,
                           TransitioningProperty<Value> prior_,
-                          TransitionOptions transition,
+                          style::TransitionOptions transition,
                           TimePoint now)
         : begin(now + transition.delay.value_or(Duration::zero())),
           end(begin + transition.duration.value_or(Duration::zero())),
@@ -73,5 +72,4 @@ private:
     Value value;
 };
 
-} // namespace style
 } // namespace mbgl
diff --git a/src/mbgl/style/update_parameters.hpp b/src/mbgl/renderer/update_parameters.hpp
index 900f4b5183..a00e01b973 100644
--- a/src/mbgl/style/update_parameters.hpp
+++ b/src/mbgl/renderer/update_parameters.hpp
@@ -10,8 +10,8 @@ class FileSource;
 class AnnotationManager;
 
 namespace style {
-
 class Style;
+} // namespace style
 
 class UpdateParameters {
 public:
@@ -22,7 +22,7 @@ public:
                           FileSource& fileSource_,
                           const MapMode mode_,
                           AnnotationManager& annotationManager_,
-                          Style& style_)
+                          style::Style& style_)
         : pixelRatio(pixelRatio_),
           debugOptions(debugOptions_),
           transformState(transformState_),
@@ -41,8 +41,7 @@ public:
     AnnotationManager& annotationManager;
 
     // TODO: remove
-    Style& style;
+    style::Style& style;
 };
 
-} // namespace style
 } // namespace mbgl
diff --git a/src/mbgl/style/layout_property.hpp b/src/mbgl/style/layout_property.hpp
index e2137deb9f..3b9d6114c0 100644
--- a/src/mbgl/style/layout_property.hpp
+++ b/src/mbgl/style/layout_property.hpp
@@ -2,15 +2,16 @@
 
 #include <mbgl/style/property_value.hpp>
 #include <mbgl/style/data_driven_property_value.hpp>
-#include <mbgl/style/property_evaluator.hpp>
-#include <mbgl/style/data_driven_property_evaluator.hpp>
+#include <mbgl/renderer/property_evaluator.hpp>
+#include <mbgl/renderer/data_driven_property_evaluator.hpp>
 #include <mbgl/util/indexed_tuple.hpp>
 
 namespace mbgl {
-namespace style {
 
 class PropertyEvaluationParameters;
 
+namespace style {
+
 template <class T>
 class LayoutProperty {
 public:
diff --git a/src/mbgl/style/paint_property.hpp b/src/mbgl/style/paint_property.hpp
index dd8d6c0b50..f1752e69d9 100644
--- a/src/mbgl/style/paint_property.hpp
+++ b/src/mbgl/style/paint_property.hpp
@@ -1,16 +1,16 @@
 #pragma once
 
-#include <mbgl/style/transitioning_property.hpp>
 #include <mbgl/style/class_dictionary.hpp>
 #include <mbgl/style/property_value.hpp>
 #include <mbgl/style/data_driven_property_value.hpp>
-#include <mbgl/style/property_evaluator.hpp>
-#include <mbgl/style/cross_faded_property_evaluator.hpp>
-#include <mbgl/style/data_driven_property_evaluator.hpp>
-#include <mbgl/style/property_evaluation_parameters.hpp>
 #include <mbgl/style/transition_options.hpp>
-#include <mbgl/style/cascade_parameters.hpp>
-#include <mbgl/style/paint_property_binder.hpp>
+#include <mbgl/renderer/property_evaluator.hpp>
+#include <mbgl/renderer/cross_faded_property_evaluator.hpp>
+#include <mbgl/renderer/data_driven_property_evaluator.hpp>
+#include <mbgl/renderer/property_evaluation_parameters.hpp>
+#include <mbgl/renderer/cascade_parameters.hpp>
+#include <mbgl/renderer/transitioning_property.hpp>
+#include <mbgl/renderer/paint_property_binder.hpp>
 #include <mbgl/util/constants.hpp>
 #include <mbgl/util/interpolate.hpp>
 #include <mbgl/util/indexed_tuple.hpp>
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index 5fc9c40eba..23536e0e3e 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -16,13 +16,13 @@
 #include <mbgl/style/parser.hpp>
 #include <mbgl/style/transition_options.hpp>
 #include <mbgl/style/class_dictionary.hpp>
-#include <mbgl/style/update_parameters.hpp>
-#include <mbgl/style/cascade_parameters.hpp>
-#include <mbgl/style/property_evaluation_parameters.hpp>
 #include <mbgl/sprite/sprite_atlas.hpp>
 #include <mbgl/text/glyph_atlas.hpp>
 #include <mbgl/geometry/line_atlas.hpp>
 #include <mbgl/renderer/render_source.hpp>
+#include <mbgl/renderer/update_parameters.hpp>
+#include <mbgl/renderer/cascade_parameters.hpp>
+#include <mbgl/renderer/property_evaluation_parameters.hpp>
 #include <mbgl/renderer/render_item.hpp>
 #include <mbgl/renderer/render_tile.hpp>
 #include <mbgl/renderer/render_background_layer.hpp>
diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp
index 6c80a2ef59..fe588c3ce5 100644
--- a/src/mbgl/style/style.hpp
+++ b/src/mbgl/style/style.hpp
@@ -7,7 +7,7 @@
 #include <mbgl/style/layer_observer.hpp>
 #include <mbgl/style/update_batch.hpp>
 #include <mbgl/renderer/render_layer.hpp>
-#include <mbgl/style/light_impl.hpp>
+#include <mbgl/renderer/render_light.hpp>
 #include <mbgl/text/glyph_atlas_observer.hpp>
 #include <mbgl/sprite/sprite_atlas_observer.hpp>
 #include <mbgl/map/mode.hpp>
@@ -36,11 +36,11 @@ class RenderedQueryOptions;
 class Scheduler;
 class RenderLayer;
 class RenderSource;
+class UpdateParameters;
 
 namespace style {
 
 class Layer;
-class UpdateParameters;
 class QueryParameters;
 
 class Style : public GlyphAtlasObserver,
diff --git a/src/mbgl/tile/geojson_tile.cpp b/src/mbgl/tile/geojson_tile.cpp
index 4e0623c18b..21c29f3eb7 100644
--- a/src/mbgl/tile/geojson_tile.cpp
+++ b/src/mbgl/tile/geojson_tile.cpp
@@ -2,7 +2,7 @@
 #include <mbgl/tile/geometry_tile_data.hpp>
 #include <mbgl/map/query.hpp>
 #include <mbgl/style/style.hpp>
-#include <mbgl/style/update_parameters.hpp>
+#include <mbgl/renderer/update_parameters.hpp>
 
 #include <mapbox/geojsonvt.hpp>
 #include <supercluster.hpp>
@@ -84,7 +84,7 @@ public:
 
 GeoJSONTile::GeoJSONTile(const OverscaledTileID& overscaledTileID,
                          std::string sourceID_,
-                         const style::UpdateParameters& parameters,
+                         const UpdateParameters& parameters,
                          mapbox::geometry::feature_collection<int16_t> features)
     : GeometryTile(overscaledTileID, sourceID_, parameters,
                    *parameters.style.glyphAtlas,
diff --git a/src/mbgl/tile/geojson_tile.hpp b/src/mbgl/tile/geojson_tile.hpp
index 0bafe14bdc..8bb0cb01b9 100644
--- a/src/mbgl/tile/geojson_tile.hpp
+++ b/src/mbgl/tile/geojson_tile.hpp
@@ -5,15 +5,13 @@
 
 namespace mbgl {
 
-namespace style {
 class UpdateParameters;
-} // namespace style
 
 class GeoJSONTile : public GeometryTile {
 public:
     GeoJSONTile(const OverscaledTileID&,
                 std::string sourceID,
-                const style::UpdateParameters&,
+                const UpdateParameters&,
                 mapbox::geometry::feature_collection<int16_t>);
 
     void updateData(mapbox::geometry::feature_collection<int16_t>);
diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp
index 6ac4a2e3aa..e995347f70 100644
--- a/src/mbgl/tile/geometry_tile.cpp
+++ b/src/mbgl/tile/geometry_tile.cpp
@@ -2,10 +2,10 @@
 #include <mbgl/tile/geometry_tile_worker.hpp>
 #include <mbgl/tile/geometry_tile_data.hpp>
 #include <mbgl/tile/tile_observer.hpp>
-#include <mbgl/style/update_parameters.hpp>
 #include <mbgl/style/layer_impl.hpp>
 #include <mbgl/style/layers/background_layer.hpp>
 #include <mbgl/style/layers/custom_layer.hpp>
+#include <mbgl/renderer/update_parameters.hpp>
 #include <mbgl/renderer/render_background_layer.hpp>
 #include <mbgl/renderer/render_custom_layer.hpp>
 #include <mbgl/renderer/render_symbol_layer.hpp>
@@ -28,7 +28,7 @@ using namespace style;
 
 GeometryTile::GeometryTile(const OverscaledTileID& id_,
                            std::string sourceID_,
-                           const style::UpdateParameters& parameters,
+                           const UpdateParameters& parameters,
                            GlyphAtlas& glyphAtlas_,
                            SpriteAtlas& spriteAtlas_)
     : Tile(id_),
diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp
index 227e774e9d..c54e48a5bc 100644
--- a/src/mbgl/tile/geometry_tile.hpp
+++ b/src/mbgl/tile/geometry_tile.hpp
@@ -20,17 +20,17 @@ class FeatureIndex;
 class CollisionTile;
 class RenderLayer;
 class SourceQueryOptions;
+class UpdateParameters;
 
 namespace style {
 class Style;
-class UpdateParameters;
 } // namespace style
 
 class GeometryTile : public Tile, public GlyphRequestor, IconRequestor {
 public:
     GeometryTile(const OverscaledTileID&,
                  std::string sourceID,
-                 const style::UpdateParameters&,
+                 const UpdateParameters&,
                  GlyphAtlas&,
                  SpriteAtlas&);
 
diff --git a/src/mbgl/tile/geometry_tile_worker.cpp b/src/mbgl/tile/geometry_tile_worker.cpp
index 550e06bae2..a2d1f15906 100644
--- a/src/mbgl/tile/geometry_tile_worker.cpp
+++ b/src/mbgl/tile/geometry_tile_worker.cpp
@@ -249,13 +249,13 @@ static std::vector<std::unique_ptr<RenderLayer>> toRenderLayers(const std::vecto
     for (auto& layer : layers) {
         renderLayers.push_back(layer->baseImpl->createRenderLayer());
 
-        renderLayers.back()->cascade(style::CascadeParameters {
+        renderLayers.back()->cascade(CascadeParameters {
             { ClassID::Default },
             Clock::time_point::max(),
             TransitionOptions()
         });
 
-        renderLayers.back()->evaluate(style::PropertyEvaluationParameters {
+        renderLayers.back()->evaluate(PropertyEvaluationParameters {
             zoom,
             Clock::time_point::max(),
             ZoomHistory(),
diff --git a/src/mbgl/tile/raster_tile.cpp b/src/mbgl/tile/raster_tile.cpp
index 65907eb92a..d670a142fe 100644
--- a/src/mbgl/tile/raster_tile.cpp
+++ b/src/mbgl/tile/raster_tile.cpp
@@ -3,17 +3,17 @@
 #include <mbgl/tile/tile_observer.hpp>
 #include <mbgl/tile/tile_loader_impl.hpp>
 #include <mbgl/style/source.hpp>
-#include <mbgl/style/update_parameters.hpp>
 #include <mbgl/storage/resource.hpp>
 #include <mbgl/storage/response.hpp>
 #include <mbgl/storage/file_source.hpp>
+#include <mbgl/renderer/update_parameters.hpp>
 #include <mbgl/renderer/raster_bucket.hpp>
 #include <mbgl/util/run_loop.hpp>
 
 namespace mbgl {
 
 RasterTile::RasterTile(const OverscaledTileID& id_,
-                       const style::UpdateParameters& parameters,
+                       const UpdateParameters& parameters,
                        const Tileset& tileset)
     : Tile(id_),
       loader(*this, id_, parameters, tileset),
diff --git a/src/mbgl/tile/raster_tile.hpp b/src/mbgl/tile/raster_tile.hpp
index 47f67a0842..c2ece70ab0 100644
--- a/src/mbgl/tile/raster_tile.hpp
+++ b/src/mbgl/tile/raster_tile.hpp
@@ -8,16 +8,16 @@
 namespace mbgl {
 
 class Tileset;
+class UpdateParameters;
 
 namespace style {
 class Layer;
-class UpdateParameters;
 } // namespace style
 
 class RasterTile : public Tile {
 public:
     RasterTile(const OverscaledTileID&,
-                   const style::UpdateParameters&,
+                   const UpdateParameters&,
                    const Tileset&);
     ~RasterTile() final;
 
diff --git a/src/mbgl/tile/tile_loader.hpp b/src/mbgl/tile/tile_loader.hpp
index 0d64f647d7..125f82f0f5 100644
--- a/src/mbgl/tile/tile_loader.hpp
+++ b/src/mbgl/tile/tile_loader.hpp
@@ -10,17 +10,14 @@ class FileSource;
 class AsyncRequest;
 class Response;
 class Tileset;
-
-namespace style {
 class UpdateParameters;
-} // namespace style
 
 template <typename T>
 class TileLoader : private util::noncopyable {
 public:
     TileLoader(T&,
                const OverscaledTileID&,
-               const style::UpdateParameters&,
+               const UpdateParameters&,
                const Tileset&);
     ~TileLoader();
 
diff --git a/src/mbgl/tile/tile_loader_impl.hpp b/src/mbgl/tile/tile_loader_impl.hpp
index 9a5b35a7af..7d7839f808 100644
--- a/src/mbgl/tile/tile_loader_impl.hpp
+++ b/src/mbgl/tile/tile_loader_impl.hpp
@@ -2,7 +2,7 @@
 
 #include <mbgl/tile/tile_loader.hpp>
 #include <mbgl/storage/file_source.hpp>
-#include <mbgl/style/update_parameters.hpp>
+#include <mbgl/renderer/update_parameters.hpp>
 #include <mbgl/util/tileset.hpp>
 
 #include <cassert>
@@ -12,7 +12,7 @@ namespace mbgl {
 template <typename T>
 TileLoader<T>::TileLoader(T& tile_,
                           const OverscaledTileID& id,
-                          const style::UpdateParameters& parameters,
+                          const UpdateParameters& parameters,
                           const Tileset& tileset)
     : tile(tile_),
       necessity(Necessity::Optional),
diff --git a/src/mbgl/tile/vector_tile.cpp b/src/mbgl/tile/vector_tile.cpp
index 277a176670..d43ab74007 100644
--- a/src/mbgl/tile/vector_tile.cpp
+++ b/src/mbgl/tile/vector_tile.cpp
@@ -2,7 +2,7 @@
 #include <mbgl/tile/tile_loader_impl.hpp>
 #include <mbgl/tile/geometry_tile_data.hpp>
 #include <mbgl/style/style.hpp>
-#include <mbgl/style/update_parameters.hpp>
+#include <mbgl/renderer/update_parameters.hpp>
 
 #include <protozero/pbf_reader.hpp>
 
@@ -83,7 +83,7 @@ private:
 
 VectorTile::VectorTile(const OverscaledTileID& id_,
                        std::string sourceID_,
-                       const style::UpdateParameters& parameters,
+                       const UpdateParameters& parameters,
                        const Tileset& tileset)
     : GeometryTile(id_, sourceID_, parameters,
                    *parameters.style.glyphAtlas,
diff --git a/src/mbgl/tile/vector_tile.hpp b/src/mbgl/tile/vector_tile.hpp
index 2568a277e6..175b71c213 100644
--- a/src/mbgl/tile/vector_tile.hpp
+++ b/src/mbgl/tile/vector_tile.hpp
@@ -6,16 +6,13 @@
 namespace mbgl {
 
 class Tileset;
-
-namespace style {
 class UpdateParameters;
-} // namespace style
 
 class VectorTile : public GeometryTile {
 public:
     VectorTile(const OverscaledTileID&,
                std::string sourceID,
-               const style::UpdateParameters&,
+               const UpdateParameters&,
                const Tileset&);
 
     void setNecessity(Necessity) final;