diff --git a/src/mbgl/map/tile_parser.cpp b/src/mbgl/map/tile_parser.cpp
index 81706297e..bc6de4056 100644
--- a/src/mbgl/map/tile_parser.cpp
+++ b/src/mbgl/map/tile_parser.cpp
@@ -3,6 +3,7 @@
 #include <mbgl/platform/log.hpp>
 #include <mbgl/style/style.hpp>
 #include <mbgl/style/style_layer.hpp>
+#include <mbgl/style/style_source.hpp>
 #include <mbgl/renderer/fill_bucket.hpp>
 #include <mbgl/renderer/line_bucket.hpp>
 #include <mbgl/renderer/symbol_bucket.hpp>
diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp
index 04303b64b..e36fc4bb8 100644
--- a/src/mbgl/style/style.hpp
+++ b/src/mbgl/style/style.hpp
@@ -2,38 +2,31 @@
 #define MBGL_STYLE_STYLE
 
 #include <mbgl/style/property_transition.hpp>
-#include <mbgl/style/style_source.hpp>
 #include <mbgl/style/zoom_history.hpp>
 
 #include <mbgl/util/uv.hpp>
 #include <mbgl/util/ptr.hpp>
+#include <mbgl/util/noncopyable.hpp>
 
 #include <cstdint>
-#include <map>
 #include <string>
-#include <unordered_map>
 #include <vector>
-#include <set>
 #include <chrono>
 
 namespace mbgl {
 
-class Sprite;
 class StyleLayer;
 
 class Style : public util::noncopyable {
 public:
-    struct exception : std::runtime_error { exception(const char *msg) : std::runtime_error(msg) {} };
-
     Style();
     ~Style();
 
     void loadJSON(const uint8_t *const data);
 
-    size_t layerCount() const;
     void updateProperties(float z, std::chrono::steady_clock::time_point now);
 
-    void setDefaultTransitionDuration(std::chrono::steady_clock::duration duration = std::chrono::steady_clock::duration::zero());
+    void setDefaultTransitionDuration(std::chrono::steady_clock::duration);
     void cascadeClasses(const std::vector<std::string>&);
 
     bool hasTransitions() const;
@@ -41,7 +34,6 @@ public:
     const std::string &getSpriteURL() const;
 
     std::vector<util::ptr<StyleLayer>> layers;
-    std::vector<std::string> appliedClasses;
     std::string glyph_url;
     std::string base;