diff --git a/Minecraft.Client/Platform/Common/UI/UIControl_MinecraftHorse.cpp b/Minecraft.Client/Platform/Common/UI/UIControl_MinecraftHorse.cpp
index e4604f0b7..16ef1f182 100644
--- a/Minecraft.Client/Platform/Common/UI/UIControl_MinecraftHorse.cpp
+++ b/Minecraft.Client/Platform/Common/UI/UIControl_MinecraftHorse.cpp
@@ -1,5 +1,5 @@
 #include "../../stdafx.h"
-#include "../../Minecraft.h"
+#include "../../Minecraft.Client/Minecraft.h"
 
 #include "../../Minecraft.Client/UI/ScreenSizeCalculator.h"
 #include "../../Minecraft.Client/Rendering/EntityRenderers/EntityRenderDispatcher.h"
diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_BeaconMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_BeaconMenu.cpp
index ba67a0a54..2f60599e6 100644
--- a/Minecraft.Client/Platform/Common/UI/UIScene_BeaconMenu.cpp
+++ b/Minecraft.Client/Platform/Common/UI/UIScene_BeaconMenu.cpp
@@ -2,7 +2,7 @@
 #include "UI.h"
 #include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
 #include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
-#include "../../Minecraft.h"
+#include "../../../../Minecraft.Client/Minecraft.h"
 #include "UIScene_BeaconMenu.h"
 
 UIScene_BeaconMenu::UIScene_BeaconMenu(int iPad, void* _initData,
diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.cpp
index 20d776152..db4032095 100644
--- a/Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.cpp
+++ b/Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.cpp
@@ -297,15 +297,15 @@ void UIScene_InGameSaveManagementMenu::tick() {
 #ifdef __PS3
                 size_t srcmax, dstmax;
 #else
-                std::uint32_t srcmax, dstmax;
-                std::uint32_t srclen, dstlen;
+                uint32_t srcmax, dstmax;
+                uint32_t srclen, dstlen;
 #endif
                 srcmax = MAX_SAVEFILENAME_LENGTH;
                 dstmax = MAX_SAVEFILENAME_LENGTH;
 
 #if defined(__PS3__)
                 L10nResult lres = UTF8stoUTF16s(
-                    (std::uint8_t*)m_saveDetails[m_iRequestingThumbnailId]
+                    (uint8_t*)m_saveDetails[m_iRequestingThumbnailId]
                         .UTF8SaveFilename,
                     &srcmax, u16Message, &dstmax);
 #else
@@ -314,7 +314,7 @@ void UIScene_InGameSaveManagementMenu::tick() {
 
                 sceCesUtf8StrToUtf16Str(
                     &context,
-                    (std::uint8_t*)m_saveDetails[m_iRequestingThumbnailId]
+                    (uint8_t*)m_saveDetails[m_iRequestingThumbnailId]
                         .UTF8SaveFilename,
                     srcmax, &srclen, u16Message, dstmax, &dstlen);
 #endif
diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.cpp
index 267435344..aeed09eed 100644
--- a/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.cpp
+++ b/Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.cpp
@@ -203,6 +203,14 @@ void UIScene_QuadrantSignin::checkAllPrivilegesCallback(LPVOID lpParam,
 }
 #endif
 
+namespace {
+int AvatarReturnedThunk(void* lpParam, std::uint8_t* thumbnailData,
+                        unsigned int thumbnailBytes) {
+    return UIScene_QuadrantSignin::AvatarReturned(lpParam, thumbnailData,
+                                                  thumbnailBytes);
+}
+}  // namespace
+
 void UIScene_QuadrantSignin::updateState() {
     for (unsigned int i = 0; i < XUSER_MAX_COUNT; ++i) {
         if (ProfileManager.IsSignedIn(i) && InputManager.IsPadConnected(i)) {
@@ -244,14 +252,6 @@ void UIScene_QuadrantSignin::updateState() {
     }
 }
 
-namespace {
-int AvatarReturnedThunk(void* lpParam, std::uint8_t* thumbnailData,
-                        unsigned int thumbnailBytes) {
-    return UIScene_QuadrantSignin::AvatarReturned(lpParam, thumbnailData,
-                                                  thumbnailBytes);
-}
-}  // namespace
-
 void UIScene_QuadrantSignin::setControllerState(int iPad,
                                                 EControllerStatus state) {
     if (m_controllerStatus[iPad] != state) {
diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.cpp
index 92ae8fc36..33236a3d4 100644
--- a/Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.cpp
+++ b/Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.cpp
@@ -1,5 +1,6 @@
 #include "../../Minecraft.World/Platform/stdafx.h"
 #include "UI.h"
+#include "../../Minecraft.World/Util/HtmlString.h"
 #include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
 #include "../../Minecraft.World/Headers/net.minecraft.world.item.trading.h"
 #include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
diff --git a/Minecraft.Client/meson.build b/Minecraft.Client/meson.build
index 7b485b3d3..fa0bd92f8 100644
--- a/Minecraft.Client/meson.build
+++ b/Minecraft.Client/meson.build
@@ -32,6 +32,7 @@ exclude_platform_common_sources = [
   # we use system zlib instead, since this one is old as hell and isn't configured for linux correctly
   ' ! -path "*/zlib/*"',
   ' ! -name "SonyLeaderboardManager.cpp"',
+  ' ! -name "UIScene_InGameSaveManagementMenu.cpp"'
 ]
 
 # all sources in in ./Platform/Common