fix non-pch build

9 files changed, 23 insertions, 13 deletions

diff --git a/compat/exception.hpp b/compat/exception.hpp
index dd07e483..86a8db21 100644
--- a/compat/exception.hpp
+++ b/compat/exception.hpp
@@ -3,6 +3,7 @@
 #include <type_traits>
 #include <iterator>
 #include <exception>
+#include <Corrade/Utility/Move.h>
 
 namespace floormat {
 
@@ -22,7 +23,7 @@ private:
 template<typename Fmt, typename... Ts>
 exception::exception(const Fmt& fmt, Ts&&... args) noexcept
 {
-    fmt::format_to(std::back_inserter(buf), fmt, Utility::forward<Ts>(args)...);
+    fmt::format_to(std::back_inserter(buf), fmt, Corrade::Utility::forward<Ts>(args)...);
     buf.push_back('\0');
 }
 
diff --git a/compat/format.hpp b/compat/format.hpp
index 45f8a9cb..4fa05f26 100644
--- a/compat/format.hpp
+++ b/compat/format.hpp
@@ -1,9 +1,9 @@
 #pragma once
 #include <fmt/core.h>
 #include <fmt/compile.h>
+#include <Corrade/Utility/Move.h>
 #include <Corrade/Containers/StringView.h>
 #include <Corrade/Containers/String.h>
-#include <Corrade/Utility/Move.h>
 
 namespace fmt {
 
@@ -51,7 +51,7 @@ template<size_t N, typename Fmt, typename... Xs>
 size_t snformat(char(&buf)[N], Fmt&& fmt, Xs&&... args)
 {
     constexpr size_t n = N > 0 ? N - 1 : 0;
-    auto result = fmt::format_to_n(buf, n, Utility::forward<Fmt>(fmt), std::forward<Xs>(args)...);
+    auto result = fmt::format_to_n(buf, n, Corrade::Utility::forward<Fmt>(fmt), Corrade::Utility::forward<Xs>(args)...);
     const auto len = std::min(n, result.size);
     if constexpr(N > 0)
         buf[len] = '\0';
diff --git a/editor/inspect.hpp b/editor/inspect.hpp
index de572666..5bfb7c1f 100644
--- a/editor/inspect.hpp
+++ b/editor/inspect.hpp
@@ -1,5 +1,6 @@
 #pragma once
 #include <utility>
+namespace floormat { struct entity; }
 namespace floormat::entities {
 
 struct erased_accessor;
diff --git a/editor/vobj-editor.hpp b/editor/vobj-editor.hpp
index e026a498..46b5dce1 100644
--- a/editor/vobj-editor.hpp
+++ b/editor/vobj-editor.hpp
@@ -1,7 +1,9 @@
 #pragma once
 #include "src/entity-type.hpp"
+#include "src/object-id.hpp"
 #include <memory>
 #include <map>
+#include <Corrade/Containers/StringView.h>
 
 namespace Corrade::Containers {
 template<typename T> class BasicStringView;
diff --git a/entity/metadata.hpp b/entity/metadata.hpp
index 8ad006ac..1902091f 100644
--- a/entity/metadata.hpp
+++ b/entity/metadata.hpp
@@ -9,11 +9,11 @@
 #include <concepts>
 #include <utility>
 #include <limits>
-#include <utility>
 #include <tuple>
 #include <array>
 #include <compat/function2.hpp>
 #include <Corrade/Containers/StringView.h>
+#include <Corrade/Utility/Move.h>
 
 namespace floormat::entities {
 
@@ -32,7 +32,7 @@ constexpr CORRADE_ALWAYS_INLINE void visit_tuple(F&& fun, Tuple&& tuple)
 
     fun(std::get<N>(tuple));
     if constexpr(N+1 < Size())
-        visit_tuple<F, Tuple, N+1>(std::forward<F>(fun), std::forward<Tuple>(tuple));
+        visit_tuple<F, Tuple, N+1>(Corrade::Utility::forward<F>(fun), Corrade::Utility::forward<Tuple>(tuple));
 }
 
 template<typename F, typename Tuple, size_t N>
@@ -45,7 +45,7 @@ constexpr CORRADE_ALWAYS_INLINE bool find_in_tuple(F&& fun, Tuple&& tuple)
     if (fun(std::get<N>(tuple)))
         return true;
     if constexpr(N+1 < Size())
-        return find_in_tuple<F, Tuple, N+1>(std::forward<F>(fun), std::forward<Tuple>(tuple));
+        return find_in_tuple<F, Tuple, N+1>(Corrade::Utility::forward<F>(fun), Corrade::Utility::forward<Tuple>(tuple));
     return false;
 }
 
@@ -119,7 +119,7 @@ public:
     static constexpr decltype(auto) read(const R& reader, const Obj& x) { return detail::read_field<Obj, Type, R>::read(x, reader); }
     static constexpr void write(const W& writer, Obj& x, Type v);
     constexpr decltype(auto) read(const Obj& x) const { return read(reader, x); }
-    constexpr void write(Obj& x, Type value) const { write(writer, x, std::move(value)); }
+    constexpr void write(Obj& x, Type value) const { write(writer, x, Corrade::Utility::move(value)); }
     static constexpr bool can_write = !std::is_same_v<std::nullptr_t, decltype(entity_field<Obj, Type, R, W, Ts...>::writer)>;
 
     static constexpr field_status is_enabled(const Predicate & p, const Obj& x);
@@ -142,7 +142,7 @@ public:
 template<typename Obj, typename Type, FieldReader<Obj, Type> R, FieldWriter<Obj, Type> W, typename... Ts>
 constexpr void entity_field<Obj, Type, R, W, Ts...>::write(const W& writer, Obj& x, Type v)
 {
-    static_assert(can_write); detail::write_field<Obj, Type, W>::write(x, writer, std::move(v));
+    static_assert(can_write); detail::write_field<Obj, Type, W>::write(x, writer, Corrade::Utility::move(v));
 }
 
 template<typename Obj, typename Type, FieldReader<Obj, Type> R, FieldWriter<Obj, Type> W, typename... Ts>
@@ -164,8 +164,8 @@ constexpr erased_accessor entity_field<Obj, Type, R, W, Ts...>::erased() const
     constexpr auto writer_fn = [](void* obj, const writer_t* writer, void* value) {
         auto& obj_ = *reinterpret_cast<Obj*>(obj);
         const auto& writer_ = *reinterpret_cast<const W*>(writer);
-        Type value_ = std::move(*reinterpret_cast<Type*>(value));
-        write(writer_, obj_, std::move(value_));
+        Type value_ = Corrade::Utility::move(*reinterpret_cast<Type*>(value));
+        write(writer_, obj_, Corrade::Utility::move(value_));
     };
     constexpr auto predicate_fn = [](const void* obj, const predicate_t* predicate) {
         const auto& obj_ = *reinterpret_cast<const Obj*>(obj);
@@ -217,7 +217,7 @@ struct Entity final {
         struct field final : entity_field<Obj, Type, R, W, Ts...>
         {
             constexpr field(StringView field_name, R r, W w, Ts&&... ts) noexcept :
-                entity_field<Obj, Type, R, W, Ts...>{field_name, r, w, Utility::forward<Ts>(ts)...}
+                entity_field<Obj, Type, R, W, Ts...>{field_name, r, w, Corrade::Utility::forward<Ts>(ts)...}
             {}
         };
 
@@ -231,7 +231,7 @@ constexpr void visit_tuple(F&& fun, Tuple&& tuple)
 {
     using Size = std::tuple_size<std::decay_t<Tuple>>;
     if constexpr(Size() > 0)
-        detail::visit_tuple<F, Tuple, 0>(Utility::forward<F>(fun), Utility::forward<Tuple>(tuple));
+        detail::visit_tuple<F, Tuple, 0>(Corrade::Utility::forward<F>(fun), Corrade::Utility::forward<Tuple>(tuple));
 }
 
 template<typename F, typename Tuple>
@@ -239,7 +239,7 @@ constexpr bool find_in_tuple(F&& fun, Tuple&& tuple)
 {
     using Size = std::tuple_size<std::decay_t<Tuple>>;
     if constexpr(Size() > 0)
-        return detail::find_in_tuple<F, Tuple, 0>(Utility::forward<F>(fun), Utility::forward<Tuple>(tuple));
+        return detail::find_in_tuple<F, Tuple, 0>(Corrade::Utility::forward<F>(fun), Corrade::Utility::forward<Tuple>(tuple));
     else
         return false;
 }
diff --git a/loader/vobj.cpp b/loader/vobj.cpp
index 75351cd4..fa9c3d73 100644
--- a/loader/vobj.cpp
+++ b/loader/vobj.cpp
@@ -6,6 +6,9 @@
 #include "src/anim.hpp"
 #include "compat/exception.hpp"
 #include <Corrade/Containers/ArrayViewStl.h>
+#include <Corrade/Containers/StridedArrayView.h>
+#include <Corrade/Utility/Path.h>
+#include <Magnum/Trade/ImageData.h>
 
 namespace floormat::loader_detail {
 struct vobj {
diff --git a/src/chunk-render.cpp b/src/chunk-render.cpp
index 6dff9a40..281d7207 100644
--- a/src/chunk-render.cpp
+++ b/src/chunk-render.cpp
@@ -1,6 +1,7 @@
 #include "chunk.hpp"
 #include "tile-atlas.hpp"
 #include "shaders/shader.hpp"
+#include "compat/defs.hpp"
 #include <algorithm>
 #include <Corrade/Containers/ArrayViewStl.h>
 #include <Magnum/GL/Buffer.h>
diff --git a/src/chunk-scenery.cpp b/src/chunk-scenery.cpp
index d12a754b..6a3987aa 100644
--- a/src/chunk-scenery.cpp
+++ b/src/chunk-scenery.cpp
@@ -3,6 +3,7 @@
 #include "entity.hpp"
 #include "anim-atlas.hpp"
 #include "tile-atlas.hpp"
+#include <bit>
 #include <Corrade/Containers/ArrayViewStl.h>
 #include <Magnum/GL/Buffer.h>
 
diff --git a/src/tile-bbox.hpp b/src/tile-bbox.hpp
index 3275e22a..ba61f0bf 100644
--- a/src/tile-bbox.hpp
+++ b/src/tile-bbox.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #include "src/tile-defs.hpp"
 #include "src/local-coords.hpp"
+#include <Corrade/Containers/Pair.h>
 #include <Magnum/Magnum.h>
 #include <Magnum/Math/Vector2.h>