6 files changed, 6 insertions, 3 deletions
diff --git a/bench/dijkstra.cpp b/bench/dijkstra.cpp
index 0c47942f..fa998d56 100644
--- a/bench/dijkstra.cpp
+++ b/bench/dijkstra.cpp
@@ -1,5 +1,5 @@
-#include "src/search-astar.hpp"
 #include "src/search-result.hpp"
+#include "src/search-astar.hpp"
 #include "src/point.hpp"
 #include "src/world.hpp"
 #include "loader/loader.hpp"
diff --git a/editor/tests/path-test.cpp b/editor/tests/path-test.cpp
index 8589829b..bdaeaae0 100644
--- a/editor/tests/path-test.cpp
+++ b/editor/tests/path-test.cpp
@@ -4,10 +4,10 @@
 #include "compat/vector-wrapper.hpp"
 #include "floormat/main.hpp"
 #include "src/search-astar.hpp"
+#include "src/search-result.hpp"
 #include "src/critter.hpp"
 #include "shaders/shader.hpp"
 #include "../imgui-raii.hpp"
-#include "src/camera-offset.hpp"
 #include <Magnum/Math/Functions.h>
 #include <Magnum/Math/Color.h>
 
diff --git a/src/search-astar.cpp b/src/search-astar.cpp
index eb2812a2..7f3a9da6 100644
--- a/src/search-astar.cpp
+++ b/src/search-astar.cpp
@@ -2,6 +2,7 @@
 #include "search-bbox.hpp"
 #include "search-constants.hpp"
 #include "search-cache.hpp"
+#include "search-result.hpp"
 #include "compat/format.hpp"
 #include "compat/vector-wrapper.hpp"
 #include "compat/heap.hpp"
diff --git a/src/search-astar.hpp b/src/search-astar.hpp
index a56b7f53..dbd89892 100644
--- a/src/search-astar.hpp
+++ b/src/search-astar.hpp
@@ -8,6 +8,8 @@ namespace floormat::Search { struct cache; }
 
 namespace floormat {
 
+struct point;
+
 class astar
 {
 public:
diff --git a/src/search.hpp b/src/search.hpp
index b70dc049..c4ffc1eb 100644
--- a/src/search.hpp
+++ b/src/search.hpp
@@ -2,7 +2,6 @@
 #include "tile-constants.hpp"
 #include "global-coords.hpp"
 #include "object-id.hpp"
-#include "search-result.hpp"
 #include "search-pred.hpp"
 #include <array>
 
diff --git a/test/dijkstra.cpp b/test/dijkstra.cpp
index f5b9ad1f..f8764292 100644
--- a/test/dijkstra.cpp
+++ b/test/dijkstra.cpp
@@ -1,5 +1,6 @@
 #include "app.hpp"
 #include "src/search-astar.hpp"
+#include "src/search-result.hpp"
 #include "src/point.hpp"
 #include "src/world.hpp"
 #include "loader/loader.hpp"