diff --git a/minecraft/Minecraft.Client/Common/App_structs.h b/minecraft/Minecraft.Client/Common/App_structs.h
index ca22e12f1..66d4b2067 100644
--- a/minecraft/Minecraft.Client/Common/App_structs.h
+++ b/minecraft/Minecraft.Client/Common/App_structs.h
@@ -3,7 +3,9 @@
 #include <cstdint>
 
 #include "4J.Storage/4J_Storage.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.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"
diff --git a/minecraft/Minecraft.Client/Common/Consoles_App.h b/minecraft/Minecraft.Client/Common/Consoles_App.h
index d189d194a..ba80d27da 100644
--- a/minecraft/Minecraft.Client/Common/Consoles_App.h
+++ b/minecraft/Minecraft.Client/Common/Consoles_App.h
@@ -23,7 +23,9 @@
 #include "Minecraft.Client/Common/Source Files/UI/All Platforms/ArchiveFile.h"
 #include "Minecraft.World/net/minecraft/world/entity/item/MinecartHopper.h"
 #include "Minecraft.Client/Common/App_structs.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 typedef struct _JoinFromInviteData {
     std::uint32_t dwUserIndex;       // dwUserIndex
diff --git a/minecraft/Minecraft.Client/Common/Source Files/Colours/ColourTable.cpp b/minecraft/Minecraft.Client/Common/Source Files/Colours/ColourTable.cpp
index ebb8a0f02..cc5300139 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/Colours/ColourTable.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/Colours/ColourTable.cpp	
@@ -5,7 +5,9 @@
 #include "ColourTable.h"
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
 #include "Minecraft.Client/Common/Source Files/Colours/ColourTable.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "java/InputOutputStream/ByteArrayInputStream.h"
 #include "java/InputOutputStream/DataInputStream.h"
 
diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCAudioFile.cpp b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCAudioFile.cpp
index 01f60a4ae..eeee3ddf5 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCAudioFile.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCAudioFile.cpp	
@@ -9,7 +9,9 @@
 #include "4J_Storage.h"
 #include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #if defined(_WINDOWS64)
 #include "Minecraft.Client/Windows64/XML/ATGXmlParser.h"
 #include "Minecraft.Client/Windows64/XML/xmlFilesCallback.h"
diff --git a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.cpp b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.cpp
index f97e4e98e..4b1c3fe1c 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/DLC/DLCSkinFile.cpp	
@@ -7,7 +7,9 @@
 #include "Minecraft.Client/Common/Source Files/DLC/DLCFile.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 DLCSkinFile::DLCSkinFile(const std::wstring& path)
     : DLCFile(DLCManager::e_DLCType_Skin, path) {
diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp
index da3abf696..169194d5e 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ApplySchematicRuleDefinition.cpp	
@@ -12,7 +12,9 @@
 #include "Minecraft.World/net/minecraft/world/level/Level.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h"
 #include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 
 ApplySchematicRuleDefinition::ApplySchematicRuleDefinition(
diff --git a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.cpp b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.cpp
index 8a959cac3..be0f8281c 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/ConsoleSchematicFile.cpp	
@@ -19,7 +19,9 @@
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h"
 #include "Minecraft.World/net/minecraft/world/phys/AABB.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "java/Class.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
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 5f3a2d9d5..dc8bfcdfe 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/GameRules/LevelGeneration/LevelGenerationOptions.cpp	
@@ -13,7 +13,9 @@
 #include "LevelGenerationOptions.h"
 #include "Minecraft.Client/Common/Source Files/GameRules/ConsoleGameRules.h"
 #include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 #include "4J_Storage.h"
 
diff --git a/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.cpp b/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.cpp
index 58526f4d4..85ff6f2e2 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/Leaderboards/LeaderboardManager.cpp	
@@ -1,7 +1,9 @@
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
 #include "LeaderboardManager.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 const std::wstring LeaderboardManager::filterNames[eNumFilterModes] = {
     L"Friends", L"MyScore", L"TopRank"};
diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/NetworkPlayerQNet.cpp b/minecraft/Minecraft.Client/Common/Source Files/Network/NetworkPlayerQNet.cpp
index 29e927d24..829b706e9 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/Network/NetworkPlayerQNet.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/Network/NetworkPlayerQNet.cpp	
@@ -2,7 +2,9 @@
 
 #include <limits.h>
 
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "java/System.h"
 
 NetworkPlayerQNet::NetworkPlayerQNet(IQNetPlayer* qnetPlayer) {
diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerInterface.h b/minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerInterface.h
index 449cb5d6c..17a4ff5d0 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerInterface.h	
+++ b/minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerInterface.h	
@@ -5,7 +5,9 @@
 #include <qnet.h>
 #endif
 #include "Minecraft.World/ConsoleHelpers/C4JThread.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "NetworkPlayerInterface.h"
 #include "SessionInfo.h"
 
diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerStub.h b/minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerStub.h
index 1a3ede278..7e11bb51c 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerStub.h	
+++ b/minecraft/Minecraft.Client/Common/Source Files/Network/PlatformNetworkManagerStub.h	
@@ -9,7 +9,9 @@
 #include "PlatformNetworkManagerInterface.h"
 #include "SessionInfo.h"
 #include "4J.Common/4J_Compat.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 class C4JThread;
 class CGameNetworkManager;
diff --git a/minecraft/Minecraft.Client/Common/Source Files/Network/Socket.cpp b/minecraft/Minecraft.Client/Common/Source Files/Network/Socket.cpp
index cb2bb2b3a..bba99afbf 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/Network/Socket.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/Network/Socket.cpp	
@@ -9,7 +9,9 @@
 #include "Minecraft.Client/net/minecraft/server/network/ServerConnection.h"
 #include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h"
 #include "Minecraft.Client/Common/Source Files/Network/NetworkPlayerInterface.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 class SocketAddress {};
 
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp
index 2cab43278..bb9e65388 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.cpp	
@@ -1,4 +1,6 @@
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "Minecraft.Client/Common/Source Files/UI/UI.h"
 #include "UIScene_LanguageSelector.h"
 
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.h b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.h
index fb3542a80..cd786c652 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.h	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/Help & Options/UIScene_LanguageSelector.h	
@@ -2,7 +2,9 @@
 
 #include "Minecraft.Client/Common/Source Files/UI/UIScene.h"
 #include "Minecraft.Client/Common/App_Defines.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 class UIScene_LanguageSelector : public UIScene {
 public:
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp
index 166f5ec2f..ec2458078 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/Scenes/In-Game Menu Screens/Containers/UIScene_CreativeMenu.cpp	
@@ -14,7 +14,9 @@
 #include "Minecraft.Client/Linux/Linux_UIController.h"
 #include "Minecraft.World/Header Files/SoundTypes.h"
 #include "Minecraft.World/net/minecraft/world/SimpleContainer.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 
 class UILayer;
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UILayer.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/UILayer.cpp
index 62bb270dd..be131055c 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/UILayer.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/UILayer.cpp	
@@ -76,7 +76,9 @@
 #include "Minecraft.Client/Common/Source Files/UI/UIGroup.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
 #include "Minecraft.Client/Linux/Linux_UIController.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 UILayer::UILayer(UIGroup* parent) {
     m_parentGroup = parent;
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIScene.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/UIScene.cpp
index 81a9e499b..e0ce48c0a 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIScene.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/UIScene.cpp	
@@ -21,7 +21,9 @@
 #include "Minecraft.World/Header Files/SoundTypes.h"
 #include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h"
 #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "java/System.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 
diff --git a/minecraft/Minecraft.Client/Common/Source Files/UI/UIString.cpp b/minecraft/Minecraft.Client/Common/Source Files/UI/UIString.cpp
index 575f33cde..97f141e4c 100644
--- a/minecraft/Minecraft.Client/Common/Source Files/UI/UIString.cpp	
+++ b/minecraft/Minecraft.Client/Common/Source Files/UI/UIString.cpp	
@@ -1,7 +1,9 @@
 #include "Minecraft.World/ConsoleHelpers/StringHelpers.h"
 #include "UIString.h"
 #include "Minecraft.Client/Linux/Linux_App.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 bool UIString::setCurrentLanguage() {
     int nextLanguage, nextLocale;
diff --git a/minecraft/Minecraft.Client/Linux/linux_game_stubs.cpp b/minecraft/Minecraft.Client/Linux/linux_game_stubs.cpp
index ce47dd0b0..c71b05f5e 100644
--- a/minecraft/Minecraft.Client/Linux/linux_game_stubs.cpp
+++ b/minecraft/Minecraft.Client/Linux/linux_game_stubs.cpp
@@ -7,6 +7,8 @@ void Display::update() {}
 
 int CMinecraftApp::GetTPConfigVal(wchar_t* pwchDataFile) { return 0; }
 
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 #endif
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp b/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp
index a931efa3d..524b1a72c 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/gui/CreateWorldScreen.cpp
@@ -21,7 +21,9 @@
 #include "Minecraft.World/net/minecraft/locale/Language.h"
 #include "Minecraft.World/net/minecraft/world/level/LevelSettings.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/gui/Screen.h"
 #include "Minecraft.Client/Header Files/stubs.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp
index 1cd143b0e..6d49ad8a4 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/multiplayer/MultiPlayerLevel.cpp
@@ -33,7 +33,9 @@
 #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
 #include "Minecraft.World/net/minecraft/world/level/storage/MockedLevelStorage.h"
 #include "Minecraft.World/net/minecraft/world/level/storage/SavedDataStorage.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "java/Random.h"
 #include "Minecraft.Client/net/minecraft/client/particle/ParticleEngine.h"
 
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.cpp
index 6e06a4113..f6f09fc59 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/Chunk.cpp
@@ -20,7 +20,9 @@
 #include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "Minecraft.Client/net/minecraft/client/renderer/Tesselator.h"
 #include "Minecraft.Client/net/minecraft/client/renderer/culling/Culler.h"
 
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp
index 363782d7b..cf138e074 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/GameRenderer.cpp
@@ -69,7 +69,9 @@
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
 #include "Minecraft.World/net/minecraft/world/phys/AABB.h"
 #include "Minecraft.World/net/minecraft/world/phys/HitResult.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "java/Class.h"
 #include "java/Random.h"
 #include "Minecraft.Client/net/minecraft/client/MemoryTracker.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.cpp
index 53b6e693e..41b64df8e 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/ItemInHandRenderer.cpp
@@ -33,7 +33,9 @@
 #include "Minecraft.World/net/minecraft/world/level/material/Material.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/FireTile.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "java/System.h"
 #include "Minecraft.Client/net/minecraft/client/MemoryTracker.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h
index a1eadd97c..52e9aa780 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h
+++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/LevelRenderer.h
@@ -7,7 +7,9 @@
 #include "Minecraft.World/ConsoleHelpers/C4JThread.h"
 #include "Minecraft.World/Header Files/ParticleTypes.h"
 #include "Minecraft.World/net/minecraft/world/phys/AABB.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 class ClipChunk;
 class HitResult;
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.cpp
index 5b0dd9b82..4a246714e 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/TileRenderer.cpp
@@ -63,7 +63,9 @@
 #include "Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/piston/PistonExtensionTile.h"
 #include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 bool TileRenderer::fancy = true;
 
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.cpp b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.cpp
index 221b804eb..3e25f03b8 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/ItemRenderer.cpp
@@ -20,7 +20,9 @@
 #include "Minecraft.World/net/minecraft/world/item/Item.h"
 #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "java/Random.h"
 #include "Minecraft.Client/net/minecraft/client/Minecraft.h"
 #include "Minecraft.Client/net/minecraft/client/gui/Font.h"
diff --git a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.h b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.h
index 4681b2799..7f81f7825 100644
--- a/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.h
+++ b/minecraft/Minecraft.Client/net/minecraft/client/renderer/entity/PlayerRenderer.h
@@ -4,7 +4,9 @@
 
 #include "MobRenderer.h"
 #include "Minecraft.World/net/minecraft/world/entity/player/Player.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "Minecraft.Client/net/minecraft/client/renderer/entity/LivingEntityRenderer.h"
 
 class HumanoidModel;
diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp
index 4fd9614a5..18e7d2b5c 100644
--- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerChunkCache.cpp
@@ -17,7 +17,9 @@
 #include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/storage/ChunkStorage.h"
 #include "Minecraft.World/net/minecraft/world/level/dimension/Dimension.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 ServerChunkCache::ServerChunkCache(ServerLevel* level, ChunkStorage* storage,
                                    ChunkSource* source) {
diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp
index d5dd127ad..120828209 100644
--- a/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/server/level/ServerLevel.cpp
@@ -46,7 +46,9 @@
 #include "Minecraft.Client/Common/Source Files/DLC/DLCPack.h"
 #include "Minecraft.Client/Common/Source Files/Console_Debug_enum.h"
 #include "4J_Input.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "Minecraft.Client/Common/Source Files/Network/GameNetworkManager.h"
 
 std::vector<WeighedTreasure*> ServerLevel::RANDOM_BONUS_ITEMS;
diff --git a/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.cpp b/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.cpp
index 9ddd8e532..dd73694d7 100644
--- a/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/server/level/TrackedEntity.cpp
@@ -53,7 +53,9 @@
 #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
 #include "Minecraft.World/net/minecraft/world/item/MapItem.h"
 #include "Minecraft.World/net/minecraft/world/level/saveddata/MapItemSavedData.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "java/Class.h"
 
 class AttributeInstance;
diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.cpp b/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.cpp
index b1b513e37..da57bc57e 100644
--- a/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/server/network/PendingConnection.cpp
@@ -18,7 +18,9 @@
 #include "Minecraft.World/net/minecraft/network/Connection.h"
 #include "Minecraft.World/net/minecraft/network/packet/LoginPacket.h"
 #include "Minecraft.World/net/minecraft/network/packet/PreLoginPacket.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "Minecraft.Client/Common/Source Files/BuildVer/BuildVer.h"
 #include "java/Random.h"
 
diff --git a/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.cpp b/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.cpp
index 89c861477..7ec7e7d8d 100644
--- a/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.cpp
+++ b/minecraft/Minecraft.Client/net/minecraft/server/network/PlayerConnection.cpp
@@ -93,7 +93,9 @@
 #include "Minecraft.World/net/minecraft/world/level/tile/entity/SignTileEntity.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h"
 #include "Minecraft.Client/Header Files/SkinBox.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "java/Class.h"
 #include "java/InputOutputStream/ByteArrayInputStream.h"
 #include "java/InputOutputStream/DataInputStream.h"
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp
index 72caf5007..3117182e8 100644
--- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp
+++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileOriginal.cpp
@@ -30,7 +30,9 @@
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "java/System.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "platform/PlatformServices.h"
 
 #define RESERVE_ALLOCATION MEM_RESERVE
diff --git a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp
index 8c59c9f4c..ec175361b 100644
--- a/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp
+++ b/minecraft/Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/ConsoleSaveFileSplit.cpp
@@ -35,7 +35,9 @@
 #include "java/System.h"
 #include "java/File.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "platform/PlatformServices.h"
 
 class ProgressListener;
diff --git a/minecraft/Minecraft.World/Source Files/compression.cpp b/minecraft/Minecraft.World/Source Files/compression.cpp
index 78d8be895..204b16eb0 100644
--- a/minecraft/Minecraft.World/Source Files/compression.cpp	
+++ b/minecraft/Minecraft.World/Source Files/compression.cpp	
@@ -7,7 +7,9 @@
 #include "Minecraft.World/ConsoleHelpers/ConsoleSaveFileIO/FileHeader.h"
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "compression.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #if defined(_WIN64) || defined(__linux__)
 // zconf.h defines "typedef unsigned char Byte" which conflicts with the
 // project's "class Byte" from BasicTypeContainers.h (via stdafx.h).
diff --git a/minecraft/Minecraft.World/meson.build b/minecraft/Minecraft.World/meson.build
index f8d2bae25..4cee77f0e 100644
--- a/minecraft/Minecraft.World/meson.build
+++ b/minecraft/Minecraft.World/meson.build
@@ -49,5 +49,4 @@ crypto_dep = dependency('libcrypto')  # for MD5 in Hasher.cpp on Linux
 world_dep = declare_dependency(
   link_with : lib_world,
   dependencies : [crypto_dep, zlib_dep],
-  include_directories : include_directories('x64headers'),
 )
diff --git a/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp b/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp
index 64e61b390..be62853ee 100644
--- a/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/network/Connection.cpp
@@ -17,7 +17,9 @@
 #include "Minecraft.World/net/minecraft/network/packet/KeepAlivePacket.h"
 #include "Minecraft.World/net/minecraft/network/packet/Packet.h"
 #include "Minecraft.World/net/minecraft/network/packet/PacketListener.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 class SocketAddress;
 
diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.cpp
index be62a5aa5..238c88a7b 100644
--- a/minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/network/packet/AddPlayerPacket.cpp
@@ -8,7 +8,9 @@
 #include "Minecraft.World/net/minecraft/world/entity/player/Inventory.h"
 #include "Minecraft.World/net/minecraft/world/entity/player/Player.h"
 #include "Minecraft.World/net/minecraft/world/item/ItemInstance.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 AddPlayerPacket::AddPlayerPacket() {
     id = -1;
diff --git a/minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.cpp b/minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.cpp
index f322b6727..1d2b6d529 100644
--- a/minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/network/packet/LoginPacket.cpp
@@ -6,7 +6,9 @@
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "Minecraft.World/net/minecraft/world/entity/player/Player.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/ChunkSource.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 LoginPacket::LoginPacket() {
     this->userName = L"";
diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp
index 8eccd44fc..4c9265e5e 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/entity/Entity.cpp
@@ -46,7 +46,9 @@
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
 #include "Minecraft.World/net/minecraft/world/phys/AABB.h"
 #include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 thread_local bool Entity::m_tlsUseSmallIds = false;
 
diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp
index fd3a7362e..a9d36bd08 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/entity/Mob.cpp
@@ -50,7 +50,9 @@
 #include "net/minecraft/world/level/Level.h"
 #include "net/minecraft/world/level/tile/Tile.h"
 #include "net/minecraft/world/phys/AABB.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 const float Mob::MAX_WEARING_ARMOR_CHANCE = 0.15f;
 const float Mob::MAX_PICKUP_LOOT_CHANCE = 0.55f;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.cpp b/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.cpp
index 51d706834..ad0c18d09 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/entity/player/Player.cpp
@@ -82,7 +82,9 @@
 #include "net/minecraft/world/scores/Scoreboard.h"
 #include "net/minecraft/world/scores/Team.h"
 #include "net/minecraft/world/scores/criteria/ObjectiveCriteria.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 class ModelPart;
 class Objective;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Explosion.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/Explosion.cpp
index 8716b0e3b..f2e163033 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/Explosion.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/Explosion.cpp
@@ -18,7 +18,9 @@
 #include "Minecraft.World/net/minecraft/world/level/Level.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
 #include "Minecraft.World/net/minecraft/world/phys/AABB.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 Explosion::Explosion(Level* level, std::shared_ptr<Entity> source, double x,
                      double y, double z, float r) {
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp
index 355866149..7f7b2ebd3 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/Level.cpp
@@ -64,7 +64,9 @@
 #include "net/minecraft/world/phys/HitResult.h"
 #include "net/minecraft/world/phys/Vec3.h"
 #include "net/minecraft/world/scores/Scoreboard.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "platform/PlatformServices.h"
 
 class CompoundTag;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.cpp
index 0270c5278..7218e9bf8 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/BiomeDecorator.cpp
@@ -18,7 +18,9 @@
 #include "Minecraft.World/net/minecraft/world/level/levelgen/feature/SandFeature.h"
 #include "Minecraft.World/net/minecraft/world/level/levelgen/feature/SpringFeature.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 BiomeDecorator::BiomeDecorator(Biome* biome) {
     _init();
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/biome/JungleBiome.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/biome/JungleBiome.cpp
index 0be15cecd..84682fd14 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/biome/JungleBiome.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/biome/JungleBiome.cpp
@@ -15,7 +15,9 @@
 #include "Minecraft.World/net/minecraft/world/level/tile/TallGrassPlantTile.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 JungleBiome::JungleBiome(int id) : Biome(id) {
     decorator->treeCount = 50;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.cpp
index a2143bd01..81c6e7af0 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.cpp
@@ -9,7 +9,9 @@
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
 #include "java/System.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 // Note: See header for an overview of this class
 
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.h
index 9ff68e52c..41eefa494 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/CompressedTileStorage.h
@@ -6,9 +6,6 @@
 class DataInputStream;
 class DataOutputStream;
 template <typename T> class XLockFreeStack;
-#if !defined(__linux__)
-#include "../../../../../x64headers/xmcore.h"
-#endif
 
 // This class is used for the compressed storage of tile data. Unlike the
 // SparseLightingStorage class, data is split into 512 blocks of 4x4x4 tiles.
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.cpp
index b3e078028..a6ae8f949 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.cpp
@@ -43,7 +43,9 @@
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h"
 #include "Minecraft.World/net/minecraft/world/phys/AABB.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 class DataInputStream;
 class DataOutputStream;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.cpp
index b507cbc92..c7efedeb0 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.cpp
@@ -7,7 +7,9 @@
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 // Note: See header for an overview of this class
 
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.h
index 185b0b253..8ad23f943 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseDataStorage.h
@@ -1,9 +1,6 @@
 #pragma once
 #include <stdint.h>
 #include <format>
-#if !defined(__linux__)
-#include "../../../../../x64headers/xmcore.h"
-#endif
 
 // 4J added - Storage for data (ie the extra per tile storage). Data is normally
 // stored as 4-bits per tile, in a DataLayer class of 16384 bytes ( 128 x 16 x
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.cpp
index 5a439777e..ab7e120be 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.cpp
@@ -7,7 +7,9 @@
 #include "Minecraft.Client/Linux/Stubs/winapi_stubs.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 // Note: See header for an overview of this class
 
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.h b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.h
index 6c1873bd7..b49610d2c 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.h
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/SparseLightStorage.h
@@ -1,9 +1,6 @@
 #pragma once
 #include <stdint.h>
 #include <format>
-#if !defined(__linux__)
-#include "../../../../../x64headers/xmcore.h"
-#endif
 
 // 4J added - Storage for block & sky light data. Lighting data is normally
 // stored as 4-bits per tile, in a DataLayer class of 16384 bytes ( 128 x 16 x
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp
index 702658d07..341908ef5 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/McRegionChunkStorage.cpp
@@ -28,7 +28,9 @@
 #include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.h"
 #include "Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFileCache.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "platform/PlatformServices.h"
 
 class DataInput;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.cpp
index 5695d09ea..b3d484a6e 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/OldChunkStorage.cpp
@@ -28,7 +28,9 @@
 #include "Minecraft.World/net/minecraft/world/level/chunk/LevelChunk.h"
 #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "platform/PlatformServices.h"
 
 thread_local OldChunkStorage::ThreadStorage* OldChunkStorage::m_tlsStorage =
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.cpp
index 4f2c0857a..2cc5a0588 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/chunk/storage/RegionFile.cpp
@@ -13,7 +13,9 @@
 #include "java/InputOutputStream/ByteArrayInputStream.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 std::vector<uint8_t> RegionFile::emptySector(SECTOR_BYTES);
 
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CustomLevelSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CustomLevelSource.cpp
index a1c8b44cf..528baadfb 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CustomLevelSource.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/CustomLevelSource.cpp
@@ -27,7 +27,9 @@
 #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 const double CustomLevelSource::SNOW_SCALE = 0.3;
 const double CustomLevelSource::SNOW_CUTOFF = 0.5;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/FlatLevelSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/FlatLevelSource.cpp
index 576f1a48c..fff659a1c 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/FlatLevelSource.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/FlatLevelSource.cpp
@@ -9,7 +9,9 @@
 #include "Minecraft.World/net/minecraft/world/level/levelgen/structure/VillageFeature.h"
 #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 // FlatLevelSource::villageFeature = new VillageFeature(1);
 
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellFlatLevelSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellFlatLevelSource.cpp
index b448d0425..0b3abcdb0 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellFlatLevelSource.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellFlatLevelSource.cpp
@@ -12,7 +12,9 @@
 #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 HellFlatLevelSource::HellFlatLevelSource(Level* level, int64_t seed) {
     int xzSize = level->getLevelData()->getXZSize();
@@ -103,13 +105,28 @@ LevelChunk* HellFlatLevelSource::create(int x, int z) { return getChunk(x, z); }
 LevelChunk* HellFlatLevelSource::getChunk(int xOffs, int zOffs) {
     random->setSeed(xOffs * 341873128712l + zOffs * 132897987541l);
 
+    // 4J - now allocating this with a physical alloc & bypassing general memory
+    // management so that it will get cleanly freed
     int chunksSize = Level::genDepth * 16 * 16;
-    std::vector<uint8_t> blocks(chunksSize, 0);
+    uint8_t* tileData = (uint8_t*)malloc(chunksSize);
+    memset(tileData, 0, chunksSize);
+    std::vector<uint8_t> blocks = std::vector<uint8_t>(tileData, tileData + chunksSize);
+    //    std::vector<uint8_t> blocks = std::vector<uint8_t>(16 * level->depth * 16);
 
     prepareHeights(xOffs, zOffs, blocks);
     buildSurfaces(xOffs, zOffs, blocks);
 
+    //    caveFeature->apply(this, level, xOffs, zOffs, blocks);
+    // townFeature.apply(this, level, xOffs, zOffs, blocks);
+    // addCaves(xOffs, zOffs, blocks);
+    // addTowns(xOffs, zOffs, blocks);
+
+    // 4J - this now creates compressed block data from the blocks array passed
+    // in, so needs to be after data is finalised. Also now need to free the
+    // passed in blocks as the LevelChunk doesn't use the passed in allocation
+    // anymore.
     LevelChunk* levelChunk = new LevelChunk(level, blocks, xOffs, zOffs);
+    free(tileData);
     return levelChunk;
 }
 
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.cpp
index 89a2b44c5..033e5d2bf 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/HellRandomLevelSource.cpp
@@ -22,7 +22,9 @@
 #include "Minecraft.World/net/minecraft/world/level/storage/LevelData.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 HellRandomLevelSource::HellRandomLevelSource(Level* level, int64_t seed) {
     int xzSize = level->getLevelData()->getXZSize();
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.cpp
index 32bf5a775..1579da996 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/RandomLevelSource.cpp
@@ -24,7 +24,9 @@
 #include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
 #include "Minecraft.World/net/minecraft/world/phys/Vec3.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 const double RandomLevelSource::SNOW_SCALE = 0.3;
 const double RandomLevelSource::SNOW_CUTOFF = 0.5;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp
index a56104e00..6ad34eb0a 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/TheEndLevelRandomLevelSource.cpp
@@ -10,7 +10,9 @@
 #include "Minecraft.World/net/minecraft/world/level/levelgen/synth/PerlinNoise.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/HeavyTile.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 TheEndLevelRandomLevelSource::TheEndLevelRandomLevelSource(Level* level,
                                                            int64_t seed) {
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp
index f916e66fc..1a46a243a 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/BasicTreeFeature.cpp
@@ -11,7 +11,9 @@
 #include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/TreeTile.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 uint8_t BasicTree::axisConversionArray[] = {2, 0, 0, 1, 2, 1};
 
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp
index 511fe36d0..3dee6ba83 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/GroundBushFeature.cpp
@@ -4,7 +4,9 @@
 #include "java/Random.h"
 #include "Minecraft.World/net/minecraft/world/level/Level.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 GroundBushFeature::GroundBushFeature(int trunkType, int leafType) {
     trunkTileType = trunkType;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp
index 25b79f67a..2874f32d0 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/MegaTreeFeature.cpp
@@ -9,7 +9,9 @@
 #include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/VineTile.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 MegaTreeFeature::MegaTreeFeature(bool doUpdate, int baseHeight, int trunkType,
                                  int leafType)
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/OreFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/OreFeature.cpp
index 70113069e..a9f3a4fbe 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/OreFeature.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/OreFeature.cpp
@@ -7,7 +7,9 @@
 #include "Minecraft.World/net/minecraft/util/Mth.h"
 #include "Minecraft.World/net/minecraft/world/level/Level.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 void OreFeature::_init(int tile, int count, int targetTile) {
     this->tile = tile;
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.cpp
index 3c1ad54de..e7b5d080d 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/levelgen/feature/TreeFeature.cpp
@@ -9,7 +9,9 @@
 #include "Minecraft.World/net/minecraft/world/level/levelgen/feature/Feature.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/VineTile.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 TreeFeature::TreeFeature(bool doUpdate)
     : Feature(doUpdate),
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.cpp
index 2ec852406..136e5eac2 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/storage/DirectoryLevelStorage.cpp
@@ -37,7 +37,9 @@
 #include "Minecraft.World/net/minecraft/world/level/dimension/TheEndDimension.h"
 #include "Minecraft.World/net/minecraft/world/level/storage/LevelStorage.h"
 #include "Minecraft.World/net/minecraft/world/level/storage/PlayerIO.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 #include "platform/PlatformServices.h"
 
 const std::wstring DirectoryLevelStorage::sc_szPlayerDir(L"players/");
diff --git a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.cpp b/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.cpp
index d3ee69a47..0cb06a171 100644
--- a/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.cpp
+++ b/minecraft/Minecraft.World/net/minecraft/world/level/tile/piston/PistonBaseTile.cpp
@@ -21,7 +21,9 @@
 #include "Minecraft.World/net/minecraft/world/level/tile/Tile.h"
 #include "Minecraft.World/net/minecraft/world/level/tile/entity/TileEntity.h"
 #include "Minecraft.World/net/minecraft/world/phys/AABB.h"
-#include "Minecraft.World/x64headers/extraX64.h"
+#include "Minecraft.Client/Header Files/NetTypes.h"
+#include "Minecraft.Client/Header Files/XboxStubs.h"
+#include "Minecraft.Client/Header Files/SkinBox.h"
 
 class Icon;
 
diff --git a/minecraft/Minecraft.World/x64headers/extraX64.h b/minecraft/Minecraft.World/x64headers/extraX64.h
deleted file mode 100644
index 8082b7b09..000000000
--- a/minecraft/Minecraft.World/x64headers/extraX64.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// Compatibility shim — includes the split headers for code that still
-// references the old monolithic header. Migrate direct includers to use
-// NetTypes.h or XboxStubs.h instead, then delete this file.
-#pragma once
-
-#include "Minecraft.Client/Header Files/NetTypes.h"
-#include "Minecraft.Client/Header Files/XboxStubs.h"
-#include "Minecraft.Client/Header Files/SkinBox.h"