diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt
index c9998e05..29d66005 100644
--- a/config/SOUE01/symbols.txt
+++ b/config/SOUE01/symbols.txt
@@ -2829,16 +2829,16 @@ dSys_c__beginFrame = .text:0x80064360; // type:function size:0x68
 EGG__ConfigurationData__onBeginFrame = .text:0x800643D0; // type:function size:0x4
 dSys_c__endFrame = .text:0x800643E0; // type:function size:0x48
 EGG__ConfigurationData__onEndFrame = .text:0x80064430; // type:function size:0x4
-dSys_c__setBlack = .text:0x80064440; // type:function size:0x80
+setBlack__6dSys_cFb = .text:0x80064440; // type:function size:0x80
 setFrameRate__6dSys_cFUc = .text:0x800644C0; // type:function size:0x10
 getFrameRate__6dSys_cFv = .text:0x800644D0; // type:function size:0x10
 setClearColor__6dSys_cFQ34nw4r2ut5Color = .text:0x800644E0; // type:function size:0x60
 dSys_c__getClearColor = .text:0x80064540; // type:function size:0x14
-dSys_c__create = .text:0x80064560; // type:function size:0x3BC
+create__6dSys_cFv = .text:0x80064560; // type:function size:0x3BC
 setPosParam__Q23EGG14CoreControllerFff = .text:0x80064920; // type:function size:0x8
 EGG__TSystem__initialize = .text:0x80064930; // type:function size:0x1F4
-dSys_c__execute = .text:0x80064B30; // type:function size:0x268
-dSystem__fixHeaps = .text:0x80064DA0; // type:function size:0xB8
+execute__6dSys_cFv = .text:0x80064B30; // type:function size:0x268
+fixHeaps__7dSystemFv = .text:0x80064DA0; // type:function size:0xB8
 dSystem__init = .text:0x80064E60; // type:function size:0x34
 EGG__ConfigurationData__initRenderMode = .text:0x80064EA0; // type:function size:0x4
 getVideo = .text:0x80064EB0; // type:function size:0x8
diff --git a/include/d/d_main.h b/include/d/d_main.h
index 12d3a150..2eca2708 100644
--- a/include/d/d_main.h
+++ b/include/d/d_main.h
@@ -5,10 +5,11 @@
 
 namespace dMain {
 
+OSTime g_InitialTime;
+
 void Create();
 void Execute();
 void *main01(void *arg);
-OSTime g_InitialTime;
 
 }; // namespace dMain
 
diff --git a/src/d/d_main.cpp b/src/d/d_main.cpp
index aac41dd6..feb4ea6a 100644
--- a/src/d/d_main.cpp
+++ b/src/d/d_main.cpp
@@ -6,10 +6,6 @@
 
 #include "rvl/OS.h"
 
-OSThread MAIN_THREAD;
-
-#define STACK_SIZE 0xF000
-
 void dMain::Create() {
     dSys_c::create();
     dSys_c::setBlack(false);
@@ -27,7 +23,11 @@ void *dMain::main01(void *arg) {
     return nullptr;
 }
 
+#define STACK_SIZE 0xF000
+
 void main(int argc, char **argv) {
+    static OSThread MAIN_THREAD;
+
     u8 pStackBase[STACK_SIZE] __attribute__((aligned(32)));
 
     fn_80006C20();