From c196ded104950c86831b2a8c5f62800e23e6d49d Mon Sep 17 00:00:00 2001
From: PJB3005 <pieterjan.briers+git@gmail.com>
Date: Sun, 29 Mar 2026 04:34:45 +0200
Subject: [PATCH 1/2] Don't include weak_bss_1109_to_1009.h on PC

Not relevant to us.
---
 include/d/dolzel_base.pch | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/d/dolzel_base.pch b/include/d/dolzel_base.pch
index ac45474890..e603a50e14 100644
--- a/include/d/dolzel_base.pch
+++ b/include/d/dolzel_base.pch
@@ -2,7 +2,9 @@
 #define DOLZEL_BASE_PCH
 
 // Fixes weak .bss
+#if !TARGET_PC
 #include "weak_bss_1109_to_1009.h" // IWYU pragma: export
+#endif
 
 #include <cmath> // IWYU pragma: export
 #include <cstring> // IWYU pragma: export

From 3ad643f3977fe637d812c888c3acde71f0882ab9 Mon Sep 17 00:00:00 2001
From: PJB3005 <pieterjan.briers+git@gmail.com>
Date: Sun, 29 Mar 2026 04:35:44 +0200
Subject: [PATCH 2/2] Don't include logging infrastructure in m_Do_graphic.h

This ends up wasting a ton of compile time because it pulls in all of Aurora's log infrastructure and fmt and all the noise into a thousand game files
---
 include/m_Do/m_Do_graphic.h       | 5 +----
 src/d/actor/d_a_obj_brg.cpp       | 2 ++
 src/d/d_resorce.cpp               | 2 ++
 src/d/d_stage.cpp                 | 1 +
 src/dusk/imgui/ImGuiMapLoader.cpp | 1 +
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h
index c30c28a517..b4f947546d 100644
--- a/include/m_Do/m_Do_graphic.h
+++ b/include/m_Do/m_Do_graphic.h
@@ -4,7 +4,6 @@
 #include "JSystem/JFramework/JFWDisplay.h"
 #include "m_Do/m_Do_mtx.h"
 #include "global.h"
-#include "dusk/logging.h"
 #if TARGET_PC
 #include <aurora/aurora.h>
 #endif
@@ -100,9 +99,7 @@ public:
     }
 
     static int startFadeOut(int param_0) { return JFWDisplay::getManager()->startFadeOut(param_0); }
-    static int startFadeIn(int param_0) { 
-        DuskLog.debug("mDoGph_gInf_c::startFadeIn START");
-        return JFWDisplay::getManager()->startFadeIn(param_0); }
+    static int startFadeIn(int param_0) { return JFWDisplay::getManager()->startFadeIn(param_0); }
     static void setFadeColor(JUtility::TColor& color) { mFader->setColor(color); }
     static void setClearColor(JUtility::TColor color) { JFWDisplay::getManager()->setClearColor(color); }
     static void setBackColor(GXColor& color) { mBackColor = color; }
diff --git a/src/d/actor/d_a_obj_brg.cpp b/src/d/actor/d_a_obj_brg.cpp
index b2acca8f98..cb666f3205 100644
--- a/src/d/actor/d_a_obj_brg.cpp
+++ b/src/d/actor/d_a_obj_brg.cpp
@@ -16,6 +16,8 @@
 #include "f_op/f_op_camera_mng.h"
 #include <cstring>
 
+#include "dusk/logging.h"
+
 static void ride_call_back(dBgW* i_bgw, fopAc_ac_c* i_bgActor, fopAc_ac_c* i_rideActor) {
     obj_brg_class* a_this = (obj_brg_class*)i_bgActor;
 
diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp
index 1dce982025..ab21e140c0 100644
--- a/src/d/d_resorce.cpp
+++ b/src/d/d_resorce.cpp
@@ -20,6 +20,8 @@
 #include <cstdio>
 #include <cstring>
 
+#include "dusk/logging.h"
+
 #ifndef __MWERKS__
 #include "dusk/extras.h"
 #endif
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp
index 53f610267f..df706ecb5f 100644
--- a/src/d/d_stage.cpp
+++ b/src/d/d_stage.cpp
@@ -22,6 +22,7 @@
 #include <cstdio>
 #include <cstring>
 
+#include "dusk/logging.h"
 #include "dusk/string.hpp"
 #if TARGET_PC
 #include <format>
diff --git a/src/dusk/imgui/ImGuiMapLoader.cpp b/src/dusk/imgui/ImGuiMapLoader.cpp
index 89ab6aa120..8d11c0673b 100644
--- a/src/dusk/imgui/ImGuiMapLoader.cpp
+++ b/src/dusk/imgui/ImGuiMapLoader.cpp
@@ -5,6 +5,7 @@
 #include "ImGuiConsole.hpp"
 #include "ImGuiMenuTools.hpp"
 #include "dusk/map_loader_definitions.h"
+#include "fmt/format.h"
 
 namespace dusk {
     void ImGuiMenuTools::ShowMapLoader() {