even more refactoring

14 files changed, 19 insertions, 2 deletions

diff --git a/src/map/map.cpp b/src/map/map.cpp
index db94ca97db..44c62eeb2d 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -9,6 +9,9 @@
 #include <llmr/util/string.hpp>
 #include <llmr/util/constants.hpp>
 #include <llmr/util/uv.hpp>
+#include <llmr/style/style_layer.hpp>
+#include <llmr/style/style_bucket.hpp>
+#include <llmr/geometry/sprite_atlas.hpp>
 
 #include <algorithm>
 #include <memory>
diff --git a/src/map/source.cpp b/src/map/source.cpp
index b03d83ca45..6f7bb811fd 100644
--- a/src/map/source.cpp
+++ b/src/map/source.cpp
@@ -9,6 +9,7 @@
 #include <llmr/util/vec.hpp>
 #include <llmr/util/std.hpp>
 #include <llmr/geometry/glyph_atlas.hpp>
+#include <llmr/style/style_layer.hpp>
 
 
 #include <llmr/map/vector_tile_data.hpp>
diff --git a/src/map/tile_parser.cpp b/src/map/tile_parser.cpp
index e834e6fa95..847c57d088 100644
--- a/src/map/tile_parser.cpp
+++ b/src/map/tile_parser.cpp
@@ -2,6 +2,7 @@
 
 #include <llmr/map/vector_tile_data.hpp>
 #include <llmr/style/style.hpp>
+#include <llmr/style/style_layer.hpp>
 #include <llmr/renderer/fill_bucket.hpp>
 #include <llmr/renderer/line_bucket.hpp>
 #include <llmr/renderer/icon_bucket.hpp>
diff --git a/src/map/vector_tile_data.cpp b/src/map/vector_tile_data.cpp
index de99bb5d39..051ebb7eac 100644
--- a/src/map/vector_tile_data.cpp
+++ b/src/map/vector_tile_data.cpp
@@ -1,6 +1,8 @@
 #include <llmr/map/vector_tile_data.hpp>
 #include <llmr/util/std.hpp>
 #include <llmr/map/map.hpp>
+#include <llmr/style/style_layer.hpp>
+#include <llmr/style/style_bucket.hpp>
 
 using namespace llmr;
 
diff --git a/src/renderer/icon_bucket.cpp b/src/renderer/icon_bucket.cpp
index 1a1c104507..9cc1407e6d 100644
--- a/src/renderer/icon_bucket.cpp
+++ b/src/renderer/icon_bucket.cpp
@@ -2,6 +2,7 @@
 #include <llmr/geometry/icon_buffer.hpp>
 #include <llmr/geometry/elements_buffer.hpp>
 #include <llmr/geometry/geometry.hpp>
+#include <llmr/geometry/sprite_atlas.hpp>
 
 #include <llmr/renderer/painter.hpp>
 #include <llmr/style/style.hpp>
diff --git a/src/renderer/painter.cpp b/src/renderer/painter.cpp
index 0739eea323..665c7baece 100644
--- a/src/renderer/painter.cpp
+++ b/src/renderer/painter.cpp
@@ -1,5 +1,6 @@
 #include <llmr/renderer/painter.hpp>
 #include <llmr/map/map.hpp>
+#include <llmr/style/style_layer.hpp>
 #include <llmr/util/std.hpp>
 #include <llmr/util/string.hpp>
 #include <llmr/util/time.hpp>
diff --git a/src/renderer/painter_fill.cpp b/src/renderer/painter_fill.cpp
index fa79cb8de0..e651d3f36a 100644
--- a/src/renderer/painter_fill.cpp
+++ b/src/renderer/painter_fill.cpp
@@ -1,5 +1,6 @@
 #include <llmr/renderer/painter.hpp>
 #include <llmr/renderer/fill_bucket.hpp>
+#include <llmr/style/style_layer.hpp>
 #include <llmr/map/map.hpp>
 #include <llmr/style/sprite.hpp>
 #include <llmr/geometry/sprite_atlas.hpp>
diff --git a/src/renderer/painter_icon.cpp b/src/renderer/painter_icon.cpp
index f720a24000..59ae67746e 100644
--- a/src/renderer/painter_icon.cpp
+++ b/src/renderer/painter_icon.cpp
@@ -2,6 +2,8 @@
 #include <llmr/renderer/icon_bucket.hpp>
 #include <llmr/map/map.hpp>
 #include <llmr/style/sprite.hpp>
+#include <llmr/style/style_layer.hpp>
+#include <llmr/geometry/sprite_atlas.hpp>
 #include <llmr/util/math.hpp>
 
 using namespace llmr;
diff --git a/src/renderer/painter_line.cpp b/src/renderer/painter_line.cpp
index 6ec7a1e7e6..990c80b89c 100644
--- a/src/renderer/painter_line.cpp
+++ b/src/renderer/painter_line.cpp
@@ -1,5 +1,6 @@
 #include <llmr/renderer/painter.hpp>
 #include <llmr/renderer/line_bucket.hpp>
+#include <llmr/style/style_layer.hpp>
 #include <llmr/map/map.hpp>
 
 using namespace llmr;
diff --git a/src/renderer/painter_raster.cpp b/src/renderer/painter_raster.cpp
index 4cfe7c0c68..8f330898da 100644
--- a/src/renderer/painter_raster.cpp
+++ b/src/renderer/painter_raster.cpp
@@ -1,5 +1,6 @@
 #include <llmr/renderer/painter.hpp>
 #include <llmr/renderer/raster_bucket.hpp>
+#include <llmr/style/style_layer.hpp>
 #include <llmr/map/map.hpp>
 
 using namespace llmr;
diff --git a/src/renderer/painter_text.cpp b/src/renderer/painter_text.cpp
index 47fea57c93..89c9d41077 100644
--- a/src/renderer/painter_text.cpp
+++ b/src/renderer/painter_text.cpp
@@ -1,5 +1,6 @@
 #include <llmr/renderer/painter.hpp>
 #include <llmr/renderer/text_bucket.hpp>
+#include <llmr/style/style_layer.hpp>
 #include <llmr/map/map.hpp>
 #include <cmath>
 
diff --git a/src/map/filter_expression.cpp b/src/style/filter_expression.cpp
index 9e293b0026..a0454d8af4 100644
--- a/src/map/filter_expression.cpp
+++ b/src/style/filter_expression.cpp
@@ -1,4 +1,4 @@
-#include <llmr/map/filter_expression.hpp>
+#include <llmr/style/filter_expression.hpp>
 #include <llmr/map/vector_tile.hpp>
 
 namespace llmr {
diff --git a/src/style/style.cpp b/src/style/style.cpp
index d6d7a72918..f6de8c013b 100644
--- a/src/style/style.cpp
+++ b/src/style/style.cpp
@@ -1,5 +1,7 @@
 #include <llmr/style/style.hpp>
+#include <llmr/style/style_layer.hpp>
 #include <llmr/style/style_parser.hpp>
+#include <llmr/style/style_bucket.hpp>
 #include <llmr/util/constants.hpp>
 #include <csscolorparser/csscolorparser.hpp>
 
@@ -194,7 +196,6 @@ void Style::cascade(float z) {
     }
 }
 
-
 bool Style::needsTransition() const {
     uv::readlock lock(mtx);
 
diff --git a/src/style/style_parser.cpp b/src/style/style_parser.cpp
index 7bb05ecc66..1bbb4fd522 100644
--- a/src/style/style_parser.cpp
+++ b/src/style/style_parser.cpp
@@ -1,4 +1,5 @@
 #include <llmr/style/style_parser.hpp>
+#include <llmr/style/style_layer.hpp>
 #include <llmr/util/constants.hpp>
 #include <llmr/util/std.hpp>
 #include <csscolorparser/csscolorparser.hpp>