From 7cb658cc15a18634dd8733954134ad8289da1731 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sun, 16 Apr 2023 12:26:07 +0200
Subject: mess around with <memory> inclusion

---
 editor/editor.hpp          | 1 -
 loader/impl.cpp            | 1 -
 main/clickable.hpp         | 1 -
 serialize/tile-atlas.hpp   | 3 +--
 serialize/world-reader.cpp | 2 +-
 src/character.cpp          | 1 +
 src/scenery.hpp            | 1 -
 test/loader.cpp            | 1 -
 8 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/editor/editor.hpp b/editor/editor.hpp
index 62027d8d..64d92611 100644
--- a/editor/editor.hpp
+++ b/editor/editor.hpp
@@ -8,7 +8,6 @@
 #include "scenery-editor.hpp"
 
 #include <map>
-#include <memory>
 #include <Corrade/Containers/Optional.h>
 #include <Corrade/Containers/StringView.h>
 
diff --git a/loader/impl.cpp b/loader/impl.cpp
index ba055464..7e29616b 100644
--- a/loader/impl.cpp
+++ b/loader/impl.cpp
@@ -2,7 +2,6 @@
 #include "compat/assert.hpp"
 #include "loader/scenery.hpp"
 #include <cstring>
-#include <memory>
 #include <Corrade/Containers/Pair.h>
 #include <Magnum/Trade/ImageData.h>
 
diff --git a/main/clickable.hpp b/main/clickable.hpp
index 2fc28587..da50a1d1 100644
--- a/main/clickable.hpp
+++ b/main/clickable.hpp
@@ -1,6 +1,5 @@
 #pragma once
 #include "src/global-coords.hpp"
-#include <memory>
 #include <Corrade/Containers/BitArrayView.h>
 #include <Magnum/Math/Vector2.h>
 #include <Magnum/Math/Range.h>
diff --git a/serialize/tile-atlas.hpp b/serialize/tile-atlas.hpp
index 02e5b966..0c65c55e 100644
--- a/serialize/tile-atlas.hpp
+++ b/serialize/tile-atlas.hpp
@@ -1,9 +1,8 @@
 #pragma once
+#include "src/tile-atlas.hpp"
 #include <memory>
 #include <nlohmann/json_fwd.hpp>
 
-namespace floormat { struct tile_atlas; }
-
 namespace nlohmann {
 
 template<>
diff --git a/serialize/world-reader.cpp b/serialize/world-reader.cpp
index 09566afa..f72065ef 100644
--- a/serialize/world-reader.cpp
+++ b/serialize/world-reader.cpp
@@ -9,8 +9,8 @@
 #include "src/tile-atlas.hpp"
 #include "src/anim-atlas.hpp"
 #include "src/chunk-scenery.hpp"
-
 #include <cstring>
+#include <memory>
 
 namespace {
 
diff --git a/src/character.cpp b/src/character.cpp
index ff6d5a83..d75070e8 100644
--- a/src/character.cpp
+++ b/src/character.cpp
@@ -7,6 +7,7 @@
 #include "src/RTree-search.hpp"
 #include "compat/exception.hpp"
 #include <cmath>
+#include <memory>
 #include <utility>
 #include <algorithm>
 
diff --git a/src/scenery.hpp b/src/scenery.hpp
index a3ba7934..7a03fc87 100644
--- a/src/scenery.hpp
+++ b/src/scenery.hpp
@@ -3,7 +3,6 @@
 #include "tile-defs.hpp"
 #include "rotation.hpp"
 #include "entity.hpp"
-#include <memory>
 #include <type_traits>
 #include <Magnum/Math/Vector2.h>
 #include <Magnum/Magnum.h>
diff --git a/test/loader.cpp b/test/loader.cpp
index fbffc407..69804c89 100644
--- a/test/loader.cpp
+++ b/test/loader.cpp
@@ -1,6 +1,5 @@
 #include "app.hpp"
 #include "compat/assert.hpp"
-#include "compat/prelude.hpp"
 #include "loader/loader.hpp"
 #include "src/tile-atlas.hpp"
 
-- 
cgit v1.2.3