diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6318e778c5..32dfcdbad5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1344,7 +1344,8 @@ source_group("dusk" FILES ${DUSK_FILES})
 
 add_library(game SHARED ${DOLZEL_FILES} ${Z2AUDIOLIB_FILES} ${SSYSTEM_FILES} ${JSYSTEM_FILES} ${REL_FILES} ${DUSK_FILES})
 target_compile_definitions(game PRIVATE TARGET_PC VERSION=0)
-target_include_directories(game PRIVATE include)
+# TODO: version handling for res includes
+target_include_directories(game PRIVATE include assets/GZ2E01 src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common_Embedded/Math/Include)
 target_link_libraries(game PRIVATE aurora::core aurora::gx aurora::si aurora::vi aurora::pad)
 
 add_executable(dusk src/dusk/main.cpp)
diff --git a/include/JSystem/J2DGraph/J2DPrint.h b/include/JSystem/J2DGraph/J2DPrint.h
index 48bdb59bc9..02e704d0d2 100644
--- a/include/JSystem/J2DGraph/J2DPrint.h
+++ b/include/JSystem/J2DGraph/J2DPrint.h
@@ -2,7 +2,7 @@
 #define J2DPRINT_H
 
 #include "JSystem/J2DGraph/J2DTextBox.h"
-#include "__va_arg.h"
+#include <cstdarg>
 
 class JUTFont;
 class J2DPrint;
diff --git a/include/JSystem/JGadget/define.h b/include/JSystem/JGadget/define.h
index c64d61c33e..fdf224cd33 100644
--- a/include/JSystem/JGadget/define.h
+++ b/include/JSystem/JGadget/define.h
@@ -1,7 +1,7 @@
 #ifndef DEFINE_H
 #define DEFINE_H
 
-#include "types.h"
+#include "dolphin/types.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h
index cb65d1091c..7c69cfd6eb 100644
--- a/include/JSystem/JUtility/JUTConsole.h
+++ b/include/JSystem/JUtility/JUTConsole.h
@@ -4,7 +4,7 @@
 #include "JSystem/JGadget/linklist.h"
 #include "JSystem/JKernel/JKRDisposer.h"
 #include "JSystem/JUtility/JUTFont.h"
-#include "__va_arg.h"
+#include <cstdarg>
 
 /**
 * @ingroup jsystem-jutility
@@ -142,7 +142,7 @@ public:
     typedef JGadget::TLinkList<JUTConsole, -offsetof(JUTConsole, mListNode)> ConsoleList;
 #else
     // clangd does not support offsetof in template arguments.
-    typedef JGadget::TLinkList<JUTConsole, -sizeof(JKRDisposer)> ConsoleList;
+    typedef JGadget::TLinkList<JUTConsole, -static_cast<int>(sizeof(JKRDisposer))> ConsoleList;
 #endif
 
 private:
diff --git a/include/JSystem/JUtility/JUTDirectPrint.h b/include/JSystem/JUtility/JUTDirectPrint.h
index 8d85ba5982..14ed2c28b8 100644
--- a/include/JSystem/JUtility/JUTDirectPrint.h
+++ b/include/JSystem/JUtility/JUTDirectPrint.h
@@ -2,7 +2,7 @@
 #define JUTDIRECTPRINT_H
 
 #include "JSystem/JUtility/TColor.h"
-#include "__va_arg.h"
+#include <cstdarg>
 
 /**
 * @ingroup jsystem-jutility
diff --git a/include/JSystem/JUtility/JUTException.h b/include/JSystem/JUtility/JUTException.h
index 923349a089..2914493f86 100644
--- a/include/JSystem/JUtility/JUTException.h
+++ b/include/JSystem/JUtility/JUTException.h
@@ -3,7 +3,7 @@
 
 #include "JSystem/JKernel/JKRThread.h"
 #include "JSystem/JUtility/JUTGamePad.h"
-#include "__va_arg.h"
+#include <cstdarg>
 #include <dolphin/gx.h>
 #include <dolphin/os.h>
 #include "global.h"
diff --git a/include/dolphin/gd/GDLight.h b/include/dolphin/gd/GDLight.h
index a725830fe4..bc53ec4954 100644
--- a/include/dolphin/gd/GDLight.h
+++ b/include/dolphin/gd/GDLight.h
@@ -59,7 +59,11 @@ void GDSetChanCtrl(GXChannelID chan, u8 enable, GXColorSrc amb_src,
 inline static u16 __GDLightID2Index(GXLightID id) {
 	u16 idx;
 
+#ifdef __MWERKS__
 	idx = 0x1F - __cntlzw(id);
+#else
+	idx = 0x1F - __builtin_clz(id);
+#endif
 	if (idx > 7) {
 		idx = 0;
 	}
diff --git a/include/dolphin/types.h b/include/dolphin/types.h
index 411bb8ec27..02f151b131 100644
--- a/include/dolphin/types.h
+++ b/include/dolphin/types.h
@@ -56,6 +56,12 @@ typedef unsigned int uint;
 #endif
 #endif
 
+#if defined(__MWERKS__)
+#define __REGISTER register
+#else
+#define __REGISTER
+#endif
+
 #ifndef DECL_WEAK
 #if defined(__MWERKS__)
 #define DECL_WEAK __declspec(weak)
diff --git a/include/m_Do/m_Do_printf.h b/include/m_Do/m_Do_printf.h
index 13ca5b0e01..032efe518b 100644
--- a/include/m_Do/m_Do_printf.h
+++ b/include/m_Do/m_Do_printf.h
@@ -1,7 +1,8 @@
 #ifndef M_DO_M_DO_PRINTF_H
 #define M_DO_M_DO_PRINTF_H
 
-#include <dolphin/os.h>
+#include <cstdarg>
+#include "dolphin/types.h"
 
 void my_PutString(const char*);
 void mDoPrintf_vprintf_Interrupt(char const*, va_list);
diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h
index ea14c07a35..9e9a27ea0f 100644
--- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h
+++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/printf.h
@@ -2,7 +2,7 @@
 #define _MSL_COMMON_PRINTF_H
 
 #include "ansi_files.h"
-#include "__va_arg.h"
+#include <cstdarg>
 
 #ifdef __cplusplus
 extern "C" {