cleanup includes

3 files changed, 8 insertions, 4 deletions

diff --git a/src/search-cache.cpp b/src/search-cache.cpp
index 511d72b4..dd73601f 100644
--- a/src/search-cache.cpp
+++ b/src/search-cache.cpp
@@ -1,5 +1,6 @@
 #include "search-cache.hpp"
 #include "search-constants.hpp"
+#include "point.hpp"
 #include "world.hpp"
 #include <bitset>
 
diff --git a/src/search-cache.hpp b/src/search-cache.hpp
index ee6f7537..c8fc8bbe 100644
--- a/src/search-cache.hpp
+++ b/src/search-cache.hpp
@@ -1,11 +1,15 @@
 #pragma once
 #include "compat/defs.hpp"
-#include "point.hpp"
 #include <array>
 #include <Corrade/Containers/Array.h>
 #include <Magnum/Math/Vector2.h>
 
-namespace floormat { class world; class chunk; }
+namespace floormat {
+class world;
+class chunk;
+struct point;
+struct chunk_coords_;
+} // namespace floormat
 
 namespace floormat::Search {
 
diff --git a/src/wall-atlas.hpp b/src/wall-atlas.hpp
index c1f60a03..2bc03dc0 100644
--- a/src/wall-atlas.hpp
+++ b/src/wall-atlas.hpp
@@ -4,7 +4,6 @@
 #include "src/pass-mode.hpp"
 #include "wall-defs.hpp"
 #include <array>
-#include <bitset> // todo replace with array
 #include <Corrade/Containers/Array.h>
 #include <Corrade/Containers/String.h>
 #include <Magnum/Math/Vector2.h>
@@ -97,7 +96,7 @@ struct wall_atlas_def final
     Array<Wall::Frame> frames;
     Array<Wall::Direction> direction_array;
     std::array<Wall::DirArrayIndex, Wall::Direction_COUNT> direction_map;
-    std::bitset<Wall::Direction_COUNT> direction_mask{0};
+    std::array<bool, Wall::Direction_COUNT> direction_mask{};
 
     static wall_atlas_def deserialize(StringView filename);
     void serialize(StringView filename) const;