From 9d4e6ba0e479e901fdc7fad475026cb9fdcc9fc4 Mon Sep 17 00:00:00 2001
From: HJfod <60038575+HJfod@users.noreply.github.com>
Date: Sun, 10 Nov 2024 11:51:49 +0200
Subject: [PATCH] header fixes (i think this might make compiling without PCH
 possible?)

---
 loader/include/Geode/Utils.hpp               | 2 +-
 loader/include/Geode/loader/Tulip.hpp        | 1 +
 loader/include/Geode/utils/VersionInfo.hpp   | 7 +++----
 loader/include/Geode/utils/cocos.hpp         | 2 ++
 loader/include/Geode/utils/string.hpp        | 1 +
 loader/src/loader/SettingV3.cpp              | 2 ++
 loader/src/ui/mods/popups/ConfirmInstall.cpp | 1 +
 loader/src/ui/nodes/SceneManager.cpp         | 1 +
 8 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/loader/include/Geode/Utils.hpp b/loader/include/Geode/Utils.hpp
index c587c8d0..24d2b820 100644
--- a/loader/include/Geode/Utils.hpp
+++ b/loader/include/Geode/Utils.hpp
@@ -10,5 +10,5 @@
 #include "utils/file.hpp"
 #include "utils/permission.hpp"
 #include "utils/general.hpp"
-#include "utils/timer.hpp"
+#include "utils/Timer.hpp"
 #include "utils/ObjcHook.hpp"
diff --git a/loader/include/Geode/loader/Tulip.hpp b/loader/include/Geode/loader/Tulip.hpp
index 5de00c34..0df1be92 100644
--- a/loader/include/Geode/loader/Tulip.hpp
+++ b/loader/include/Geode/loader/Tulip.hpp
@@ -2,6 +2,7 @@
 
 #include <Geode/platform/platform.hpp>
 #include <tulip/TulipHook.hpp>
+#include "../Prelude.hpp"
 
 namespace geode::hook {
     /**
diff --git a/loader/include/Geode/utils/VersionInfo.hpp b/loader/include/Geode/utils/VersionInfo.hpp
index ed51ada9..646ea423 100644
--- a/loader/include/Geode/utils/VersionInfo.hpp
+++ b/loader/include/Geode/utils/VersionInfo.hpp
@@ -5,6 +5,7 @@
 #include <matjson.hpp>
 #include <tuple>
 #include <Geode/Result.hpp>
+#include <fmt/format.h>
 
 namespace geode {
     enum class VersionCompare {
@@ -256,8 +257,7 @@ namespace geode {
 template <class V>
 requires std::is_same_v<V, geode::VersionInfo> || std::is_same_v<V, geode::ComparableVersionInfo>
 struct matjson::Serialize<V> {
-    static geode::Result<V, std::string> fromJson(Value const& value)
-    {
+    static geode::Result<V, std::string> fromJson(Value const& value) {
         GEODE_UNWRAP_INTO(auto str, value.asString());
         GEODE_UNWRAP_INTO(auto version, V::parse(str).mapErr([](auto&& err) {
             return fmt::format("Invalid version format: {}", err);
@@ -265,8 +265,7 @@ struct matjson::Serialize<V> {
         return geode::Ok(version);
     }
 
-    static Value toJson(V const& value)
-    {
+    static Value toJson(V const& value) {
         return Value(value.toString());
     }
 };
diff --git a/loader/include/Geode/utils/cocos.hpp b/loader/include/Geode/utils/cocos.hpp
index 43668bec..e12276c6 100644
--- a/loader/include/Geode/utils/cocos.hpp
+++ b/loader/include/Geode/utils/cocos.hpp
@@ -10,6 +10,8 @@
 #include "../loader/Event.hpp"
 #include <Geode/binding/CCMenuItemSpriteExtra.hpp>
 #include <Geode/binding/CCMenuItemToggler.hpp>
+#include "../ui/Layout.hpp"
+#include "../ui/SpacerNode.hpp"
 
 // support converting ccColor3B / ccColor4B to / from json
 
diff --git a/loader/include/Geode/utils/string.hpp b/loader/include/Geode/utils/string.hpp
index 5b87a113..e2632faa 100644
--- a/loader/include/Geode/utils/string.hpp
+++ b/loader/include/Geode/utils/string.hpp
@@ -4,6 +4,7 @@
 #include <string>
 #include <vector>
 #include <compare>
+#include "../DefaultInclude.hpp"
 
 namespace geode::utils::string {
     /**
diff --git a/loader/src/loader/SettingV3.cpp b/loader/src/loader/SettingV3.cpp
index e4cb701c..1bf9770f 100644
--- a/loader/src/loader/SettingV3.cpp
+++ b/loader/src/loader/SettingV3.cpp
@@ -1,3 +1,4 @@
+#include <Geode/loader/Mod.hpp>
 #include <Geode/loader/Setting.hpp>
 #include <Geode/loader/ModSettingsManager.hpp>
 #include <Geode/utils/ranges.hpp>
@@ -6,6 +7,7 @@
 #include <Geode/utils/JsonValidation.hpp>
 #include <regex>
 #include "SettingNodeV3.hpp"
+#include <matjson/std.hpp>
 
 using namespace geode::prelude;
 
diff --git a/loader/src/ui/mods/popups/ConfirmInstall.cpp b/loader/src/ui/mods/popups/ConfirmInstall.cpp
index 70f59a2b..02c30ce9 100644
--- a/loader/src/ui/mods/popups/ConfirmInstall.cpp
+++ b/loader/src/ui/mods/popups/ConfirmInstall.cpp
@@ -1,4 +1,5 @@
 #include "ConfirmInstall.hpp"
+#include <Geode/loader/Mod.hpp>
 #include <Geode/utils/ranges.hpp>
 #include <Geode/ui/Popup.hpp>
 #include <server/DownloadManager.hpp>
diff --git a/loader/src/ui/nodes/SceneManager.cpp b/loader/src/ui/nodes/SceneManager.cpp
index 77f1c69b..8a9982da 100644
--- a/loader/src/ui/nodes/SceneManager.cpp
+++ b/loader/src/ui/nodes/SceneManager.cpp
@@ -1,5 +1,6 @@
 #include <Geode/ui/SceneManager.hpp>
 #include <Geode/utils/cocos.hpp>
+#include <Geode/utils/ranges.hpp>
 
 using namespace geode::prelude;