diff --git a/include/mbgl/style/expression/interpolate.hpp b/include/mbgl/style/expression/interpolate.hpp
index 2dcb5a32a..439122f91 100644
--- a/include/mbgl/style/expression/interpolate.hpp
+++ b/include/mbgl/style/expression/interpolate.hpp
@@ -73,7 +73,7 @@ public:
 
     void eachChild(const std::function<void(const Expression&)>& visit) const override {
         visit(*input);
-        for (const std::pair<const double, const std::unique_ptr<Expression>&>& stop : stops) {
+        for (const auto& stop : stops) {
             visit(*stop.second);
         }
     }
diff --git a/include/mbgl/style/function/convert.hpp b/include/mbgl/style/function/convert.hpp
index ed35b4bf1..9f7b7ed1f 100644
--- a/include/mbgl/style/function/convert.hpp
+++ b/include/mbgl/style/function/convert.hpp
@@ -174,7 +174,7 @@ struct Convert {
     template <typename T>
     static std::map<double, std::unique_ptr<Expression>> convertStops(const std::map<float, T>& stops) {
         std::map<double, std::unique_ptr<Expression>> convertedStops;
-        for(const std::pair<float, T>& stop : stops) {
+        for(const auto& stop : stops) {
             convertedStops.emplace(
                 stop.first,
                 makeLiteral(stop.second)