From 1802970cdc6785d9c0bf36f49ec31d6939a99149 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sun, 25 Feb 2024 05:42:11 +0100
Subject: clean up more headers

---
 main/ctor.cpp        | 1 +
 main/main-impl.cpp   | 1 +
 src/search-astar.hpp | 5 ++++-
 src/search-bbox.hpp  | 1 -
 src/search.hpp       | 2 --
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/main/ctor.cpp b/main/ctor.cpp
index 09976016..1787b3ef 100644
--- a/main/ctor.cpp
+++ b/main/ctor.cpp
@@ -1,6 +1,7 @@
 #include "main-impl.hpp"
 #include "compat/fpu.hpp"
 #include "src/search-astar.hpp"
+#include "src/search.hpp"
 #include <Corrade/Containers/GrowableArray.h>
 
 namespace floormat {
diff --git a/main/main-impl.cpp b/main/main-impl.cpp
index 74ee87ce..fde0861d 100644
--- a/main/main-impl.cpp
+++ b/main/main-impl.cpp
@@ -1,5 +1,6 @@
 #include "main-impl.hpp"
 #include "src/search-astar.hpp"
+#include "src/search.hpp"
 #include <Corrade/Utility/Move.h>
 #include <Magnum/Platform/Sdl2Application.h>
 
diff --git a/src/search-astar.hpp b/src/search-astar.hpp
index dbd89892..c31b348f 100644
--- a/src/search-astar.hpp
+++ b/src/search-astar.hpp
@@ -1,14 +1,17 @@
 #pragma once
 #include "compat/safe-ptr.hpp"
-#include "search.hpp"
 #include "search-constants.hpp"
+#include "search-pred.hpp"
+#include "object-id.hpp"
 #include <Corrade/Containers/Array.h>
 
 namespace floormat::Search { struct cache; }
 
 namespace floormat {
 
+class world;
 struct point;
+struct path_search_result;
 
 class astar
 {
diff --git a/src/search-bbox.hpp b/src/search-bbox.hpp
index 0d211daf..28c7d2c2 100644
--- a/src/search-bbox.hpp
+++ b/src/search-bbox.hpp
@@ -1,6 +1,5 @@
 #pragma once
 #include "search.hpp"
-#include <concepts>
 #include <Magnum/Math/Vector2.h>
 #include <Magnum/DimensionTraits.h>
 
diff --git a/src/search.hpp b/src/search.hpp
index c4ffc1eb..1fdaf3e2 100644
--- a/src/search.hpp
+++ b/src/search.hpp
@@ -15,11 +15,9 @@ namespace floormat {
 class world;
 struct object;
 class chunk;
-struct path_search_result;
 
 class path_search final
 {
-    friend struct path_search_result;
     template<typename T> using bbox = Search::bbox<T>;
     using pred = Search::pred;
 
-- 
cgit v1.2.3