From 5bd9fb7badf06a3da32d8b15ea57a3f5f00b8a7a Mon Sep 17 00:00:00 2001
From: Sean Miller <seanmiller999@gmail.com>
Date: Mon, 6 Apr 2026 16:54:52 +0100
Subject: [PATCH] Fix definition of global variables in header file

---
 include/d/d_sys.h |  8 ++++----
 src/d/d_sys.cpp   | 10 ++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/include/d/d_sys.h b/include/d/d_sys.h
index f8fbc979..45550b4c 100644
--- a/include/d/d_sys.h
+++ b/include/d/d_sys.h
@@ -48,10 +48,10 @@ public:
 
 namespace dSystem {
 
-void *s_OrgMEM1ArenaLo;
-void *s_NewMEM1ArenaLo;
-void *s_OrgMEM1ArenaHi;
-void *s_NewMEM1ArenaHi;
+extern void *s_OrgMEM1ArenaLo;
+extern void *s_NewMEM1ArenaLo;
+extern void *s_OrgMEM1ArenaHi;
+extern void *s_NewMEM1ArenaHi;
 
 void fixHeaps();
 
diff --git a/src/d/d_sys.cpp b/src/d/d_sys.cpp
index c0315dd9..a988ce03 100644
--- a/src/d/d_sys.cpp
+++ b/src/d/d_sys.cpp
@@ -43,12 +43,22 @@
 #include "rvl/GX.h"
 #include "rvl/OS.h"
 
+namespace dSystem {
+
+void *s_OrgMEM1ArenaLo;
+void *s_NewMEM1ArenaLo;
+void *s_OrgMEM1ArenaHi;
+void *s_NewMEM1ArenaHi;
+
+}
+
 System SysConfig;
 
 System *dSys_c::ms_configuration_p;
 EGG::Heap *dSys_c::ms_RootHeapMem1;
 EGG::Heap *dSys_c::ms_RootHeapMem2;
 
+// TODO Replace with proper import + names
 extern u32 lbl_80574FA0;
 extern u32 lbl_80574FA4;