diff --git a/minecraft/Minecraft.Client/Common/App_structs.h b/minecraft/Minecraft.Client/Common/App_structs.h
index 63038ec03..ca22e12f1 100644
--- a/minecraft/Minecraft.Client/Common/App_structs.h
+++ b/minecraft/Minecraft.Client/Common/App_structs.h
@@ -4,6 +4,9 @@
 
 #include "4J.Storage/4J_Storage.h"
 #include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h"
+#include "Minecraft.Client/Common/App_Defines.h"
+#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h"
 
 typedef struct {
     wchar_t* wchFilename;
diff --git a/minecraft/Minecraft.Client/Common/Consoles_App.cpp b/minecraft/Minecraft.Client/Common/Consoles_App.cpp
index 5dedd6d95..d25c5918a 100644
--- a/minecraft/Minecraft.Client/Common/Consoles_App.cpp
+++ b/minecraft/Minecraft.Client/Common/Consoles_App.cpp
@@ -1,6 +1,3 @@
-
-#include "Minecraft.Client/Header Files/stdafx.h"
-
 #include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h"
 #include "Minecraft.Client/net/minecraft/client/Options.h"
 #include "Minecraft.World/net/minecraft/world/phys/AABB.h"
@@ -51,6 +48,11 @@
 #include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h"
 #include "Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+
+#include "4J_Input.h"
+#include "Minecraft.Client/net/minecraft/client/gui/Gui.h"
+#include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h"
+
 #if defined(__linux__)
 #include <unistd.h>
 #include <climits>
diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCManager.cpp b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCManager.cpp
index 54e3f84c3..3f5edad36 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCManager.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCManager.cpp	
@@ -1,10 +1,13 @@
 #include "Minecraft.Client/Header Files/stdafx.h"
+
+#include <cassert>
 #include <algorithm>
 #include "DLCManager.h"
 #include "DLCPack.h"
 #include "DLCFile.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
 #include "Minecraft.World/Header Files/PortableFileIO.h"
+#include "Minecraft.Client/Common/Source Files/UI/UIController.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePackRepository.h"
 #include <cstring>
@@ -250,7 +253,7 @@ DLCPack* DLCManager::getPack(unsigned int index,
             app.DebugPrintf(
                 "DLCManager: Trying to access a DLC pack beyond the range of "
                 "valid packs\n");
-            __debugbreak();
+            assert(0);
         }
         pack = m_packs[index];
     }
diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.cpp
index 64e716ec9..6a7b71fa3 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.cpp	
@@ -12,6 +12,7 @@
 #include "Minecraft.Client/Common/Source Files/Localisation/StringTable.h"
 #include "LevelGenerationOptions.h"
 #include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h"
 
 JustGrSource::JustGrSource() {
     m_displayName = L"Default_DisplayName";
diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/GameNetworkManager.cpp b/minecraft/Minecraft.Client/Common/Source Files/Network/GameNetworkManager.cpp
index 90eba2ea7..c35d4af25 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/Network/GameNetworkManager.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/Network/GameNetworkManager.cpp	
@@ -35,6 +35,7 @@
 
 #include "Minecraft.Client/Common/Source Files/UI/UI.h"
 #include "Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.h"
+#include "4J_Input.h"
 
 // Global instance
 CGameNetworkManager g_NetworkManager;
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp
index 077436a2a..7c2e40bf3 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp	
@@ -8,6 +8,7 @@
 #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "4J_Input.h"
 
 IUIScene_AbstractContainerMenu::IUIScene_AbstractContainerMenu() {
     m_menu = nullptr;
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CraftingMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CraftingMenu.h
index f755b2057..e9b630502 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CraftingMenu.h	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CraftingMenu.h	
@@ -1,6 +1,8 @@
 #pragma once
 #include "Minecraft.World/net/minecraft/world/item/crafting/Recipy.h"
 #include "Minecraft.World/net/minecraft/world/item/Item.h"
+#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h"
+#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
 
 class LocalPlayer;
 
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.cpp
index a9a92b4fc..63e87a3ca 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_PauseMenu.cpp	
@@ -14,6 +14,9 @@
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h"
 #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h"
+#include "Minecraft.World/Header Files/compression.h"
+#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h"
 
 int IUIScene_PauseMenu::ExitGameDialogReturned(
     void* pParam, int iPad, C4JStorage::EMessageResult result) {
@@ -256,60 +259,59 @@ void IUIScene_PauseMenu::_ExitWorld(void* lpParameter) {
     if (pMinecraft->isClientSide() || g_NetworkManager.IsInSession()) {
         if (lpParameter != nullptr) {
             // 4J-PB - check if we have lost connection to Live
-            if (ProfileManager.GetLiveConnectionStatus() !=
-                XONLINE_S_LOGON_CONNECTION_ESTABLISHED) {
-                exitReasonStringId = IDS_CONNECTION_LOST_LIVE;
-            } else {
-                switch (app.GetDisconnectReason()) {
-                    case DisconnectPacket::eDisconnect_Kicked:
-                        exitReasonStringId = IDS_DISCONNECTED_KICKED;
-                        break;
-                    case DisconnectPacket::eDisconnect_NoUGC_AllLocal:
-                        exitReasonStringId =
-                            IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_ALL_LOCAL;
-                        exitReasonTitleId = IDS_CONNECTION_FAILED;
-                        break;
-                    case DisconnectPacket::eDisconnect_NoUGC_Single_Local:
-                        exitReasonStringId =
-                            IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_SINGLE_LOCAL;
-                        exitReasonTitleId = IDS_CONNECTION_FAILED;
-                        break;
-                    case DisconnectPacket::eDisconnect_NoFlying:
-                        exitReasonStringId = IDS_DISCONNECTED_FLYING;
-                        break;
-                    case DisconnectPacket::eDisconnect_Quitting:
-                        exitReasonStringId = IDS_DISCONNECTED_SERVER_QUIT;
-                        break;
-                    case DisconnectPacket::eDisconnect_NoFriendsInGame:
-                        exitReasonStringId =
-                            IDS_DISCONNECTED_NO_FRIENDS_IN_GAME;
-                        exitReasonTitleId = IDS_CANTJOIN_TITLE;
-                        break;
-                    case DisconnectPacket::eDisconnect_Banned:
-                        exitReasonStringId = IDS_DISCONNECTED_BANNED;
-                        exitReasonTitleId = IDS_CANTJOIN_TITLE;
-                        break;
-                    case DisconnectPacket::eDisconnect_NotFriendsWithHost:
-                        exitReasonStringId = IDS_NOTALLOWED_FRIENDSOFFRIENDS;
-                        exitReasonTitleId = IDS_CANTJOIN_TITLE;
-                        break;
-                    case DisconnectPacket::eDisconnect_OutdatedServer:
-                        exitReasonStringId = IDS_DISCONNECTED_SERVER_OLD;
-                        exitReasonTitleId = IDS_CANTJOIN_TITLE;
-                        break;
-                    case DisconnectPacket::eDisconnect_OutdatedClient:
-                        exitReasonStringId = IDS_DISCONNECTED_CLIENT_OLD;
-                        exitReasonTitleId = IDS_CANTJOIN_TITLE;
-                        break;
-                    case DisconnectPacket::eDisconnect_ServerFull:
-                        exitReasonStringId = IDS_DISCONNECTED_SERVER_FULL;
-                        exitReasonTitleId = IDS_CANTJOIN_TITLE;
-                        break;
+            // if (ProfileManager.GetLiveConnectionStatus() !=
+            //     XONLINE_S_LOGON_CONNECTION_ESTABLISHED) {
+            //     exitReasonStringId = IDS_CONNECTION_LOST_LIVE;
+            // } else {
+            switch (app.GetDisconnectReason()) {
+                case DisconnectPacket::eDisconnect_Kicked:
+                    exitReasonStringId = IDS_DISCONNECTED_KICKED;
+                    break;
+                case DisconnectPacket::eDisconnect_NoUGC_AllLocal:
+                    exitReasonStringId =
+                        IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_ALL_LOCAL;
+                    exitReasonTitleId = IDS_CONNECTION_FAILED;
+                    break;
+                case DisconnectPacket::eDisconnect_NoUGC_Single_Local:
+                    exitReasonStringId =
+                        IDS_NO_USER_CREATED_CONTENT_PRIVILEGE_SINGLE_LOCAL;
+                    exitReasonTitleId = IDS_CONNECTION_FAILED;
+                    break;
+                case DisconnectPacket::eDisconnect_NoFlying:
+                    exitReasonStringId = IDS_DISCONNECTED_FLYING;
+                    break;
+                case DisconnectPacket::eDisconnect_Quitting:
+                    exitReasonStringId = IDS_DISCONNECTED_SERVER_QUIT;
+                    break;
+                case DisconnectPacket::eDisconnect_NoFriendsInGame:
+                    exitReasonStringId = IDS_DISCONNECTED_NO_FRIENDS_IN_GAME;
+                    exitReasonTitleId = IDS_CANTJOIN_TITLE;
+                    break;
+                case DisconnectPacket::eDisconnect_Banned:
+                    exitReasonStringId = IDS_DISCONNECTED_BANNED;
+                    exitReasonTitleId = IDS_CANTJOIN_TITLE;
+                    break;
+                case DisconnectPacket::eDisconnect_NotFriendsWithHost:
+                    exitReasonStringId = IDS_NOTALLOWED_FRIENDSOFFRIENDS;
+                    exitReasonTitleId = IDS_CANTJOIN_TITLE;
+                    break;
+                case DisconnectPacket::eDisconnect_OutdatedServer:
+                    exitReasonStringId = IDS_DISCONNECTED_SERVER_OLD;
+                    exitReasonTitleId = IDS_CANTJOIN_TITLE;
+                    break;
+                case DisconnectPacket::eDisconnect_OutdatedClient:
+                    exitReasonStringId = IDS_DISCONNECTED_CLIENT_OLD;
+                    exitReasonTitleId = IDS_CANTJOIN_TITLE;
+                    break;
+                case DisconnectPacket::eDisconnect_ServerFull:
+                    exitReasonStringId = IDS_DISCONNECTED_SERVER_FULL;
+                    exitReasonTitleId = IDS_CANTJOIN_TITLE;
+                    break;
 
-                    default:
-                        exitReasonStringId = IDS_CONNECTION_LOST_SERVER;
-                }
+                default:
+                    exitReasonStringId = IDS_CONNECTION_LOST_SERVER;
             }
+            // }
             // pMinecraft->progressRenderer->progressStartNoAbort(
             // exitReasonStringId );
 
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_TradingMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_TradingMenu.h
index caf89edd6..85a59b4f1 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_TradingMenu.h	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_TradingMenu.h	
@@ -2,6 +2,7 @@
 #include "Minecraft.World/net/minecraft/world/inventory/MerchantMenu.h"
 #include "Minecraft.World/net/minecraft/util/HtmlString.h"
 #include "Minecraft.World/net/minecraft/world/item/Rarity.h"
+#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h"
 
 class MerchantRecipe;
 
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.cpp
index da0f18c03..b3d644f8a 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Components/UIScene_HUD.cpp	
@@ -10,6 +10,7 @@
 #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
 #include "Minecraft.World/net/minecraft/world/effect/net.minecraft.world.effect.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "Minecraft.Client/net/minecraft/client/gui/Gui.h"
 
 UIScene_HUD::UIScene_HUD(int iPad, void* initData, UILayer* parentLayer)
     : UIScene(iPad, parentLayer) {
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp
index db4542d23..473067674 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_CreateWorldMenu.cpp	
@@ -11,6 +11,7 @@
 #include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h"
 #include "Minecraft.World/net/minecraft/world/level/LevelType.h"
 #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h"
 
 #if defined(_WINDOWS64)
 
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp
index 2130b4d05..24e3fdab1 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp	
@@ -2,6 +2,7 @@
 #include "Minecraft.Client/Common/Source Files/UI/UI.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
 #include "UIScene_LaunchMoreOptionsMenu.h"
+#include "4J_Input.h"
 
 #define GAME_CREATE_ONLINE_TIMER_ID 0
 #define GAME_CREATE_ONLINE_TIMER_TIME 100
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp
index 00e309ee3..d85e64a2e 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp	
@@ -8,6 +8,7 @@
 #include "Minecraft.World/net/minecraft/world/level/LevelSettings.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
 #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h"
 
 #define GAME_CREATE_ONLINE_TIMER_ID 0
 #define GAME_CREATE_ONLINE_TIMER_TIME 100
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp
index e77ab9191..b6b8edfa5 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_LoadOrJoinMenu.cpp	
@@ -1535,7 +1535,7 @@ int UIScene_LoadOrJoinMenu::TexturePackDialogReturned(
     // Exit with or without saving
     if (result == C4JStorage::EMessage_ResultAccept) {
         // we need to enable background downloading for the DLC
-        XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW);
+        // XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW);
     }
     pClass->m_bIgnoreInput = false;
     return 0;
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp
index be6cf0286..976f16011 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp	
@@ -5,8 +5,11 @@
 #include "Minecraft.Client/net/minecraft/client/User.h"
 #include "Minecraft.Client/net/minecraft/server/MinecraftServer.h"
 #include "Minecraft.Client/Common/Source Files/UI/UI.h"
+#include "Minecraft.Client/net/minecraft/client/gui/Font.h"
+#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h"
 #include "UIScene_MainMenu.h"
 
+
 Random* UIScene_MainMenu::random = new Random();
 
 int UIScene_MainMenu::eNavigateWhenReady = -1;
@@ -654,7 +657,7 @@ int UIScene_MainMenu::Achievements_SignInReturned(void* pParam, bool bContinue,
         ProfileManager.SetCurrentGameActivity(iPad, CONTEXT_PRESENCE_MENUS,
                                               false);
 
-        XShowAchievementsUI(ProfileManager.GetPrimaryPad());
+        // XShowAchievementsUI(ProfileManager.GetPrimaryPad());
     } else {
         pClass->m_bIgnorePress = false;
         // unlock the profile
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp
index 3ba779ab0..dc362814a 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_ControlsMenu.cpp	
@@ -3,6 +3,8 @@
 #include "UIScene_ControlsMenu.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "Minecraft.Client/Common/Source Files/BuildVer/BuildVer.h"
+#include "4J_Input.h"
 
 UIScene_ControlsMenu::UIScene_ControlsMenu(int iPad, void* initData,
                                            UILayer* parentLayer)
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp
index 41ba51638..f6f165810 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SettingsControlMenu.cpp	
@@ -1,6 +1,7 @@
 #include "Minecraft.Client/Header Files/stdafx.h"
 #include "Minecraft.Client/Common/Source Files/UI/UI.h"
 #include "UIScene_SettingsControlMenu.h"
+#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 
 UIScene_SettingsControlMenu::UIScene_SettingsControlMenu(int iPad,
                                                          void* initData,
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp
index 4872c62df..b03b529f9 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp	
@@ -2,6 +2,9 @@
 #include "Minecraft.Client/Common/Source Files/UI/UI.h"
 #include "UIScene_SkinSelectMenu.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.h"
+#include "Minecraft.Client/Common/Minecraft_Macros.h"
 
 #define SKIN_SELECT_PACK_DEFAULT 0
 #define SKIN_SELECT_PACK_FAVORITES 1
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp
index 6eb8b21eb..b2b1404cb 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp	
@@ -5,6 +5,7 @@
 #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h"
 #include "Minecraft.World/net/minecraft/world/item/net.minecraft.world.item.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
+#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h"
 
 UIScene_AbstractContainerMenu::UIScene_AbstractContainerMenu(
     int iPad, UILayer* parentLayer)
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h
index bd243cd96..e79270c5f 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AnvilMenu.h	
@@ -3,6 +3,8 @@
 #include "UIScene_AbstractContainerMenu.h"
 #include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_AnvilMenu.h"
 #include "Minecraft.World/net/minecraft/world/inventory/MerchantMenu.h"
+#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h"
+#include "4J_Input.h"
 
 class InventoryMenu;
 
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp
index bd1a73a8d..9f0a41c21 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_BeaconMenu.cpp	
@@ -4,6 +4,7 @@
 #include "Minecraft.World/net/minecraft/world/inventory/net.minecraft.world.inventory.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "UIScene_BeaconMenu.h"
+#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h"
 
 UIScene_BeaconMenu::UIScene_BeaconMenu(int iPad, void* _initData,
                                        UILayer* parentLayer)
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp
index 01fb2b550..4abcb6633 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_EndPoem.cpp	
@@ -5,6 +5,7 @@
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "Minecraft.Client/net/minecraft/client/gui/Font.h"
 
 UIScene_EndPoem::UIScene_EndPoem(int iPad, void* initData, UILayer* parentLayer)
     : UIScene(iPad, parentLayer) {
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp
index 0f4cfeef6..3836d4551 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.cpp	
@@ -5,6 +5,7 @@
 #include "Minecraft.World/net/minecraft/network/packet/net.minecraft.network.packet.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
+#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 
 UIScene_InGameInfoMenu::UIScene_InGameInfoMenu(int iPad, void* initData,
                                                UILayer* parentLayer)
@@ -81,11 +82,11 @@ void UIScene_InGameInfoMenu::updateTooltips() {
     int keyX = IDS_TOOLTIPS_INVITE_FRIENDS;
     int ikeyY = -1;
 
-    XPARTY_USER_LIST partyList;
-    if ((XPartyGetUserList(&partyList) != XPARTY_E_NOT_IN_PARTY) &&
-        (partyList.dwUserCount > 1)) {
-        keyX = IDS_TOOLTIPS_INVITE_PARTY;
-    }
+    // XPARTY_USER_LIST partyList;
+    // if ((XPartyGetUserList(&partyList) != XPARTY_E_NOT_IN_PARTY) &&
+    //     (partyList.dwUserCount > 1)) {
+    //     keyX = IDS_TOOLTIPS_INVITE_PARTY;
+    // }
 
     if (g_NetworkManager.IsLocalGame()) keyX = -1;
 
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h
index 0869b25c3..737df782b 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGameInfoMenu.h	
@@ -3,6 +3,7 @@
 #include <cstdint>
 
 #include "Minecraft.Client/Common/Source Files/UI/UIScene.h"
+#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h"
 
 class UIScene_InGameInfoMenu : public UIScene {
 private:
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h
index 6050306f0..349159f74 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_InGamePlayerOptionsMenu.h	
@@ -3,6 +3,7 @@
 #include <cstdint>
 
 #include "Minecraft.Client/Common/Source Files/UI/UIScene.h"
+#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h"
 
 class UIScene_InGamePlayerOptionsMenu : public UIScene {
 private:
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp
index ee26318da..c8d10a1b4 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_PauseMenu.cpp	
@@ -7,6 +7,8 @@
 #include "Minecraft.Client/net/minecraft/client/skins/TexturePack.h"
 #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
+#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h"
 
 UIScene_PauseMenu::UIScene_PauseMenu(int iPad, void* initData,
                                      UILayer* parentLayer)
@@ -290,7 +292,7 @@ void UIScene_PauseMenu::handlePress(F64 controlId, F64 childId) {
                                        IDS_PRO_GUESTPROFILE_TEXT, uiIDA, 1,
                                        ProfileManager.GetPrimaryPad());
             } else {
-                XShowAchievementsUI(m_iPad);
+                // XShowAchievementsUI(m_iPad);
             }
             break;
 
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp
index 311a1766b..d37f65597 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_SignEntryMenu.cpp	
@@ -8,6 +8,7 @@
 #include "Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.h"
 #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
+#include "4J_Input.h"
 
 UIScene_SignEntryMenu::UIScene_SignEntryMenu(int iPad, void* _initData,
                                              UILayer* parentLayer)
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h
index 903852f79..62685c1a0 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/UIScene_TeleportMenu.h	
@@ -3,6 +3,7 @@
 #include <cstdint>
 
 #include "Minecraft.Client/Common/Source Files/UI/UIScene.h"
+#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h"
 
 class UIScene_TeleportMenu : public UIScene {
 private:
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.cpp
index 528114de9..bf03f2c72 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/UIScene_QuadrantSignin.cpp	
@@ -2,6 +2,7 @@
 #include "Minecraft.Client/Common/Source Files/UI/UI.h"
 #include "UIScene_QuadrantSignin.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "4J_Input.h"
 
 UIScene_QuadrantSignin::UIScene_QuadrantSignin(int iPad, void* _initData,
                                                UILayer* parentLayer)
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIController.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/UIController.cpp
index 0df961ad2..a78839a62 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIController.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/UIController.cpp	
@@ -13,6 +13,7 @@
 #include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLocalPlayer.h"
 #include "Minecraft.Client/net/minecraft/client/title/TitleScreen.h"
 #include "UIFontData.h"
+#include "4J_Input.h"
 
 // 4J Stu - Enable this to override the Iggy Allocator
 // #define ENABLE_IGGY_ALLOCATOR
diff --git a/minecraft/Minecraft.Client/Header Files/extraX64client.h b/minecraft/Minecraft.Client/Header Files/extraX64client.h
deleted file mode 100644
index 4217b6e21..000000000
--- a/minecraft/Minecraft.Client/Header Files/extraX64client.h	
+++ /dev/null
@@ -1,44 +0,0 @@
-#pragma once
-
-typedef enum _XBACKGROUND_DOWNLOAD_MODE {
-    XBACKGROUND_DOWNLOAD_MODE_ALWAYS_ALLOW = 1,
-    XBACKGROUND_DOWNLOAD_MODE_AUTO = 2
-} XBACKGROUND_DOWNLOAD_MODE,
-    *PXBACKGROUND_DOWNLOAD_MODE;
-
-uint32_t XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE Mode);
-
-#define XONLINE_S_LOGON_CONNECTION_ESTABLISHED 0
-#define XPARTY_E_NOT_IN_PARTY 0
-#define XPARTY_MAX_USERS 4
-typedef struct _XPARTY_USER_INFO {
-    PlayerUID Xuid;
-    char GamerTag[XUSER_NAME_SIZE];
-    uint32_t dwUserIndex;
-    //   XONLINE_NAT_TYPE NatType;
-    uint32_t dwTitleId;
-    uint32_t dwFlags;
-    //    XSESSION_INFO SessionInfo;
-    //    XPARTY_CUSTOM_DATA CustomData;
-} XPARTY_USER_INFO;
-
-typedef struct _XPARTY_USER_LIST {
-    uint32_t dwUserCount;
-    XPARTY_USER_INFO Users[XPARTY_MAX_USERS];
-} XPARTY_USER_LIST;
-
-uint32_t XShowPartyUI(uint32_t dwUserIndex);
-uint32_t XShowFriendsUI(uint32_t dwUserIndex);
-int32_t XPartyGetUserList(XPARTY_USER_LIST* pUserList);
-
-uint32_t XContentGetThumbnail(uint32_t dwUserIndex,
-                              const XCONTENT_DATA* pContentData,
-                              uint8_t* pbThumbnail, uint32_t* pcbThumbnail,
-                              PXOVERLAPPED* pOverlapped);
-
-void XShowAchievementsUI(int i);
-
-uint32_t XUserAreUsersFriends(uint32_t dwUserIndex, PPlayerUID pXuids,
-                              uint32_t dwXuidCount, bool* pfResult,
-                              void* pOverlapped);
-
diff --git a/minecraft/Minecraft.Client/Header Files/stdafx.h b/minecraft/Minecraft.Client/Header Files/stdafx.h
index e7873799f..80f25d66f 100644
--- a/minecraft/Minecraft.Client/Header Files/stdafx.h	
+++ b/minecraft/Minecraft.Client/Header Files/stdafx.h	
@@ -5,100 +5,6 @@
 
 #pragma once
 
-// #include <xtl.h>
-// #include <xboxmath.h>
-
-#define __STR2__(x) #x
-#define __STR1__(x) __STR2__(x)
-#define __LOC__ __FILE__ "(" __STR1__(__LINE__) ") : 4J Warning Msg: "
-
-// use  - #pragma message(__LOC__"Need to do something here")
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
-#ifdef __linux__
-#include "Minecraft.Client/Linux/Stubs/LinuxStubs.h"
-#endif
-
-#ifdef _WINDOWS64
-#define WIN32_LEAN_AND_MEAN  // Exclude rarely-used stuff from Windows headers
-#include <windows.h>
-#include <malloc.h>
-#include <tchar.h>
-#include <d3d11.h>
-#include <DirectXMath.h>
-using namespace DirectX;
-
-#define HRESULT_SUCCEEDED(hr) (((int32_t)(hr)) >= 0)
-#endif
-
-#include "Minecraft.World/x64headers/extraX64.h"
-
-#include <memory>
-
-#include <list>
-#include <map>
-#include <set>
-#include <deque>
-#include <algorithm>
-#include <string>
-#include <sstream>
-#include <iostream>
-#include <exception>
-
-#include <assert.h>
-
-#include "Minecraft.World/ConsoleHelpers/Definitions.h"
-#include "java/Class.h"
-#include "Minecraft.World/ConsoleHelpers/ArrayWithLength.h"
-#include "Minecraft.World/net/minecraft/SharedConstants.h"
-#include "java/Random.h"
-#include "Minecraft.World/Header Files/compression.h"
-#include "Minecraft.World/ConsoleHelpers/PerformanceTimer.h"
-
-#ifdef _WINDOWS64
-#include "../Platform/Windows64/4JLibs/inc/4J_Input.h"
-#include "../Platform/Windows64/4JLibs/inc/4J_Profile.h"
-#include "../Platform/Windows64/4JLibs/inc/4J_Render.h"
-#include "../Platform/Windows64/4JLibs/inc/4J_Storage.h"
-#else
-#include "4J_Input.h"
-#include "4J_Profile.h"
-#include "4J.Render/4J_Render.h"
-#include "4J_Storage.h"
-#endif
-
-#include "Minecraft.Client/net/minecraft/client/renderer/Textures.h"
-#include "Minecraft.Client/net/minecraft/client/gui/Font.h"
-#include "Minecraft.Client/net/minecraft/client/ClientConstants.h"
-#include "Minecraft.Client/net/minecraft/client/gui/Gui.h"
-#include "Minecraft.Client/net/minecraft/client/gui/Screen.h"
-#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h"
-#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
-#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h"
-#include "Minecraft.Client/Header Files/stubs.h"
-#include "Minecraft.Client/Header Files/BufferedImage.h"
-
-#include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h"
-
-#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIEnums.h"
-#include "Minecraft.Client/Common/Source Files/UI/All Platforms/UIStructs.h"
-#include "Minecraft.Client/Common/App_Defines.h"
-#include "Minecraft.Client/Common/App_enums.h"
-#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialEnum.h"
-#include "Minecraft.Client/Common/App_structs.h"
-
-#include "Minecraft.Client/Common/Consoles_App.h"
-#include "Minecraft.Client/Common/Minecraft_Macros.h"
-#include "Minecraft.Client/Common/Source Files/BuildVer/BuildVer.h"
-
-// This is generated at build time via scripts/pack_loc.py
-#include "strings.h"
-
 #ifdef _WINDOWS64
 #include "Minecraft.Client/Windows64/Windows64_App.h"
 #include "Minecraft.Client/Windows64/XML/ATGXmlParser.h"
@@ -107,34 +13,9 @@ using namespace DirectX;
 #include "Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.h"
 #include "Minecraft.Client/Windows64/Windows64_UIController.h"
 #else
+#include "Minecraft.Client/Linux/Stubs/LinuxStubs.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Iggy/include/iggy.h"
 #include "Minecraft.Client/Common/Source Files/Audio/SoundEngine.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
 #endif
-
-#include "Minecraft.Client/Common/Source Files/ConsoleGameMode.h"
-#include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h"
-#include "Minecraft.Client/Common/Source Files/Console_Awards_enum.h"
-#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h"
-#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h"
-#include "Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.h"
-#include "Minecraft.Client/Common/Source Files/Trial/TrialMode.h"
-#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h"
-#include "Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.h"
-#include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h"
-#include "Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.h"
-#include "Minecraft.Client/Common/Source Files/DLC/DLCManager.h"
-#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h"
-
-#include "extraX64client.h"
-
-#ifdef _FINAL_BUILD
-#define printf BREAKTHECOMPILE
-#define wprintf BREAKTHECOMPILE
-#undef OutputDebugString
-#define OutputDebugString BREAKTHECOMPILE
-#define OutputDebugStringA BREAKTHECOMPILE
-#define OutputDebugStringW BREAKTHECOMPILE
-#endif
-
diff --git a/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp b/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp
index 74ec9cfad..720c809bd 100644
--- a/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp
+++ b/minecraft/Minecraft.Client/Linux/Linux_Minecraft.cpp
@@ -65,6 +65,8 @@ static void sigsegv_handler(int sig) {
 #include "Minecraft.Client/net/minecraft/client/renderer/Textures.h"
 #include "Minecraft.World/Header Files/compression.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h"
+#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "4J_Input.h"
 // #include "../Orbis/Leaderboards/OrbisLeaderboardManager.h"
 
 // #include "../Orbis/Network/Orbis_NPToolkit.h"
diff --git a/minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp b/minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp
index d8241ddbd..f28b7cf27 100644
--- a/minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp	
+++ b/minecraft/Minecraft.Client/Source Files/Extrax64Stubs.cpp	
@@ -7,7 +7,6 @@
 #include "4J.Common/4J_Compat.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "Minecraft.World/x64headers/extraX64.h"
-#include "extraX64client.h"
 
 class INVITE_INFO;
 #if defined(_WINDOWS64)
@@ -34,17 +33,13 @@ void ATG::XMLParser::RegisterSAXCallbackInterface(ISAXCallback* pISAXCallback) {
 
 uint32_t XShowPartyUI(uint32_t dwUserIndex) { return 0; }
 uint32_t XShowFriendsUI(uint32_t dwUserIndex) { return 0; }
-int32_t XPartyGetUserList(XPARTY_USER_LIST* pUserList) { return S_OK; }
+int32_t XPartyGetUserList(void* pUserList) { return S_OK; }
 uint32_t XContentGetThumbnail(uint32_t dwUserIndex,
                               const XCONTENT_DATA* pContentData,
                               uint8_t* pbThumbnail, uint32_t* pcbThumbnail,
                               PXOVERLAPPED* pOverlapped) {
     return 0;
 }
-void XShowAchievementsUI(int i) {}
-uint32_t XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE Mode) {
-    return 0;
-}
 
 void PIXAddNamedCounter(int a, const char* b, ...) {}
 // #define PS3_USE_PIX_EVENTS
diff --git a/minecraft/Minecraft.Client/Windows64/Windows64_App.cpp b/minecraft/Minecraft.Client/Windows64/Windows64_App.cpp
index ef4521742..e035d4745 100644
--- a/minecraft/Minecraft.Client/Windows64/Windows64_App.cpp
+++ b/minecraft/Minecraft.Client/Windows64/Windows64_App.cpp
@@ -1,4 +1,4 @@
-#include "Minecraft.Client/Header Files/stdafx.h"
+
 #include "Minecraft.Client/Common/Consoles_App.h"
 #include "Minecraft.Client/net/minecraft/client/User.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp
index f1d1b7e79..0cfd1e49b 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/Minecraft.cpp
@@ -73,6 +73,17 @@
 #include "Minecraft.Client/Common/Source Files/UI/All Platforms/IUIScene_CreativeMenu.h"
 #include "Minecraft.Client/Common/Source Files/UI/UIFontData.h"
 #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
+#include "Minecraft.Client/net/minecraft/client/gui/Font.h"
+#include "Minecraft.Client/Header Files/stubs.h"
+#include "Minecraft.Client/net/minecraft/client/gui/Gui.h"
+#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h"
+#include "Minecraft.Client/net/minecraft/client/MemoryTracker.h"
+#include "Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.h"
+#include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h"
+#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h"
+#include "Minecraft.Client/Common/Source Files/ConsoleGameMode.h"
+#include "4J_Input.h"
 
 // #define DISABLE_SPU_CODE
 // 4J Turning this on will change the graph at the bottom of the debug overlay
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp
index 5ffed8576..5b7d68f6e 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/Gui.cpp
@@ -30,6 +30,10 @@
 #include "Minecraft.World/net/minecraft/world/level/biome/Biome.h"
 #include "Minecraft.World/net/minecraft/world/entity/monster/SharedMonsterAttributes.h"
 #include "Minecraft.World/net/minecraft/world/entity/ai/attributes/AttributeInstance.h"
+#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "Minecraft.Client/net/minecraft/client/gui/ScreenSizeCalculator.h"
+#include "Minecraft.Client/net/minecraft/client/ClientConstants.h"
+#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
 
 ResourceLocation Gui::PUMPKIN_BLUR_LOCATION =
     ResourceLocation(TN__BLUR__MISC_PUMPKINBLUR);
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp
index f45b89859..e77373c1b 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/ClientConnection.cpp
@@ -50,6 +50,12 @@
 #include "Minecraft.Client/net/minecraft/client/gui/MerchantScreen.h"
 #include "Minecraft.Client/Common/Source Files/UI/UI.h"
 #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
+#include "Minecraft.Client/net/minecraft/client/gui/Gui.h"
+#include "Minecraft.Client/Common/Source Files/ConsoleGameMode.h"
+#include "Minecraft.Client/Common/Source Files/Tutorial/TutorialMode.h"
+#include "Minecraft.Client/Common/Source Files/Tutorial/FullTutorialMode.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h"
+#include "4J_Input.h"
 
 ClientConnection::ClientConnection(Minecraft* minecraft, const std::wstring& ip,
                                    int port) {
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp
index 2f03a6ae9..8f3703707 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.cpp
@@ -103,6 +103,7 @@
 #include "Minecraft.Client/net/minecraft/client/renderer/culling/FrustumData.h"
 #include "Minecraft.Client/net/minecraft/client/resources/ResourceLocation.h"
 #include "Minecraft.Client/Header Files/stubs.h"
+#include "4J_Input.h"
 
 class Icon;
 class ItemInstance;
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SignRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SignRenderer.cpp
index d70225bf9..4ff93404f 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SignRenderer.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/tileentity/SignRenderer.cpp
@@ -1,12 +1,18 @@
 #include "Minecraft.Client/Header Files/stdafx.h"
 #include "SignRenderer.h"
+
 #include "Minecraft.Client/net/minecraft/client/model/SignModel.h"
 #include "Minecraft.Client/net/minecraft/client/model/geom/ModelPart.h"
+#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
+#include "Minecraft.Client/net/minecraft/client/gui/Font.h"
+#include "Minecraft.Client/net/minecraft/client/gui/Gui.h"
+
 #include "Minecraft.World/net/minecraft/world/level/tile/entity/net.minecraft.world.level.tile.entity.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/net.minecraft.world.level.tile.h"
 #include "Minecraft.World/net/minecraft/world/entity/Entity.h"
 #include "Minecraft.World/net/minecraft/world/level/Level.h"
 
+
 ResourceLocation SignRenderer::SIGN_LOCATION = ResourceLocation(TN_ITEM_SIGN);
 
 SignRenderer::SignRenderer() { signModel = new SignModel(); }
diff --git a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp
index 4cbe29d2f..45d0aa7bc 100644
--- a/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/server/MinecraftServer.cpp
@@ -49,6 +49,7 @@
 #include "Minecraft.Client/net/minecraft/server/commands/ServerCommandDispatcher.h"
 #include "Minecraft.World/net/minecraft/world/level/biome/BiomeSource.h"
 #include "Minecraft.Client/net/minecraft/server/level/PlayerChunkMap.h"
+#include "4J_Input.h"
 
 #define DEBUG_SERVER_DONT_SPAWN_MOBS 0
 
diff --git a/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp b/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp
index 2b89587d9..41397f192 100644
--- a/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/server/PlayerList.cpp
@@ -26,6 +26,9 @@
 #include "Minecraft.World/net/minecraft/world/level/saveddata/net.minecraft.world.level.saveddata.h"
 #include "java/JavaMath.h"
 #include "Minecraft.World/net/minecraft/world/entity/EntityIO.h"
+#include "Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerGameMode.h"
+#include "Minecraft.Client/Common/Source Files/Tutorial/Tutorial.h"
+
 // 4J - this class is fairly substantially altered as there didn't seem any
 // point in porting code for banning, whitelisting, ops etc.
 
diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp
index baf87abdd..2dd5a0692 100644
--- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp
@@ -40,7 +40,10 @@
 #include "Minecraft.Client/net/minecraft/client/skins/DLCTexturePack.h"
 #include "Minecraft.World/net/minecraft/util/ProgressListener.h"
 #include "Minecraft.Client/Common/ShutdownManager.h"
+#include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "PlayerChunkMap.h"
+#include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h"
+#include "4J_Input.h"
 
 std::vector<WeighedTreasure*> ServerLevel::RANDOM_BONUS_ITEMS;
 
diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.h b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.h
index 0430c0f07..f20f19a97 100644
--- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.h
+++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.h
@@ -1,4 +1,6 @@
 #pragma once
+
+#include <set>
 #include <mutex>
 #include "Minecraft.World/net/minecraft/world/level/net.minecraft.world.level.h"
 #include "java/JavaIntHash.h"