refactor: move misplaced headers to their proper modules

2026-05-18 07:32:53 +00:00 · 2026-04-04 14:12:58 +11:00 · 2026-04-04 14:12:58 +11:00 · 54a1f90212
parent d814a78453
commit 54a1f90212
95 changed files with 119 additions and 119 deletions
--- a/targets/app/common/App_structs.h
+++ b/targets/app/common/App_structs.h
@ -7,9 +7,9 @@
 #include "app/common/App_enums.h"
 #include "app/common/Tutorial/TutorialEnum.h"
 #include "app/common/UI/All Platforms/UIEnums.h"
-#include "app/common/NetTypes.h"
-#include "app/common/SkinBox.h"
-#include "app/common/XboxStubs.h"
+#include "platform/NetTypes.h"
+#include "minecraft/client/SkinBox.h"
+#include "platform/XboxStubs.h"

 typedef struct {
    wchar_t* wchFilename;
--- a/targets/app/common/DLC/DLCAudioFile.cpp
+++ b/targets/app/common/DLC/DLCAudioFile.cpp
@ -10,7 +10,7 @@
 #include "DLCManager.h"
 #include "app/common/DLC/DLCFile.h"
 #include "app/linux/LinuxGame.h"
-#include "app/common/XboxStubs.h"
+#include "platform/XboxStubs.h"
 #if defined(_WINDOWS64)
 #include "app/windows/XML/ATGXmlParser.h"
 #include "app/windows/XML/xmlFilesCallback.h"
--- a/targets/app/common/DLC/DLCSkinFile.cpp
+++ b/targets/app/common/DLC/DLCSkinFile.cpp
@ -7,8 +7,8 @@
 #include "DLCManager.h"
 #include "app/common/DLC/DLCFile.h"
 #include "app/linux/LinuxGame.h"
-#include "app/common/SkinBox.h"
-#include "app/common/XboxStubs.h"
+#include "minecraft/client/SkinBox.h"
+#include "platform/XboxStubs.h"

 DLCSkinFile::DLCSkinFile(const std::wstring& path)
    : DLCFile(DLCManager::e_DLCType_Skin, path) {
--- a/targets/app/common/DLC/DLCSkinFile.h
+++ b/targets/app/common/DLC/DLCSkinFile.h
@ -6,7 +6,7 @@

 #include "DLCFile.h"
 #include "app/common/DLC/DLCManager.h"
-#include "app/common/SkinBox.h"
+#include "minecraft/client/SkinBox.h"
 #include "minecraft/client/model/HumanoidModel.h"

 class DLCSkinFile : public DLCFile {
--- a/targets/app/common/Game.cpp
+++ b/targets/app/common/Game.cpp
@ -21,9 +21,9 @@
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/NetTypes.h"
-#include "app/common/SkinBox.h"
-#include "app/common/XboxStubs.h"
+#include "platform/NetTypes.h"
+#include "minecraft/client/SkinBox.h"
+#include "platform/XboxStubs.h"
 #include "platform/PlatformServices.h"
 #include "java/Class.h"
 #include "java/File.h"
--- a/targets/app/common/Game.h
+++ b/targets/app/common/Game.h
@ -19,9 +19,9 @@
 #include "app/common/Tutorial/TutorialEnum.h"
 #include "app/common/UI/All Platforms/ArchiveFile.h"
 #include "app/common/UI/All Platforms/UIStructs.h"
-#include "app/common/NetTypes.h"
-#include "app/common/SkinBox.h"
-#include "app/common/XboxStubs.h"
+#include "platform/NetTypes.h"
+#include "minecraft/client/SkinBox.h"
+#include "platform/XboxStubs.h"
 #include "minecraft/network/packet/DisconnectPacket.h"
 #include "minecraft/world/entity/item/MinecartHopper.h"

--- a/targets/app/common/Network/GameNetworkManager.cpp
+++ b/targets/app/common/Network/GameNetworkManager.cpp
@ -26,7 +26,7 @@
 #include "app/linux/Linux_UIController.h"
 #include "app/linux/Stubs/winapi_stubs.h"
 #include "Socket.h"
-#include "app/common/XboxStubs.h"
+#include "platform/XboxStubs.h"
 #include "util/StringHelpers.h"
 #include "platform/PlatformServices.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h"
--- a/targets/app/common/Network/GameNetworkManager.h
+++ b/targets/app/common/Network/GameNetworkManager.h
@ -9,7 +9,7 @@
 #endif
 #include "platform/PlatformTypes.h"
 #include "platform/IPlatformNetwork.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "NetworkPlayerInterface.h"
 #include "PlatformNetworkManagerStub.h"
 #include "SessionInfo.h"
--- a/targets/app/common/Network/NetworkPlayerQNet.cpp
+++ b/targets/app/common/Network/NetworkPlayerQNet.cpp
@ -2,7 +2,7 @@

 #include <limits.h>

-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "java/System.h"

 NetworkPlayerQNet::NetworkPlayerQNet(IQNetPlayer* qnetPlayer) {
--- a/targets/app/common/Network/PlatformNetworkManagerInterface.h
+++ b/targets/app/common/Network/PlatformNetworkManagerInterface.h
@ -5,9 +5,9 @@
 #if !defined(__linux__)
 #include <qnet.h>
 #endif
-#include "app/common/NetTypes.h"
-#include "app/common/SkinBox.h"
-#include "app/common/XboxStubs.h"
+#include "platform/NetTypes.h"
+#include "minecraft/client/SkinBox.h"
+#include "platform/XboxStubs.h"
 #include "NetworkPlayerInterface.h"
 #include "SessionInfo.h"
 #include "platform/C4JThread.h"
--- a/targets/app/common/Network/PlatformNetworkManagerStub.cpp
+++ b/targets/app/common/Network/PlatformNetworkManagerStub.cpp
@ -9,7 +9,7 @@
 #include "app/common/Network/NetworkPlayerInterface.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "NetworkPlayerQNet.h"
 #include "Socket.h"
 #include "platform/C4JThread.h"
--- a/targets/app/common/Network/PlatformNetworkManagerStub.h
+++ b/targets/app/common/Network/PlatformNetworkManagerStub.h
@ -5,9 +5,9 @@
 #include <vector>

 #include "platform/PlatformTypes.h"
-#include "app/common/NetTypes.h"
-#include "app/common/SkinBox.h"
-#include "app/common/XboxStubs.h"
+#include "platform/NetTypes.h"
+#include "minecraft/client/SkinBox.h"
+#include "platform/XboxStubs.h"
 #include "NetworkPlayerInterface.h"
 #include "platform/IPlatformNetwork.h"
 #include "SessionInfo.h"
--- a/targets/app/common/Network/SessionInfo.h
+++ b/targets/app/common/Network/SessionInfo.h
@ -1,6 +1,6 @@
 #pragma once

-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"

 // A struct that we store in the QoS data when we are hosting the session. Max
 // size 1020 bytes.
--- a/targets/app/common/Network/Socket.cpp
+++ b/targets/app/common/Network/Socket.cpp
@ -10,7 +10,7 @@
 #include "platform/ShutdownManager.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "app/common/Network/NetworkPlayerInterface.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "minecraft/server/network/ServerConnection.h"

 class SocketAddress {};
--- a/targets/app/common/UI/Scenes/Frontend
+++ b/targets/app/common/UI/Scenes/Frontend
@ -25,7 +25,7 @@
 #include "app/common/UI/UILayer.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "util/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/Options.h"
--- a/targets/app/common/UI/Scenes/Frontend
+++ b/targets/app/common/UI/Scenes/Frontend
@ -24,7 +24,7 @@
 #include "app/common/UI/UILayer.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/Options.h"
 #include "minecraft/client/skins/DLCTexturePack.h"
--- a/targets/app/common/UI/Scenes/Frontend
+++ b/targets/app/common/UI/Scenes/Frontend
@ -21,7 +21,7 @@
 #include "app/common/UI/UIScene.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "java/File.h"
 #include "java/InputOutputStream/FileInputStream.h"
 #include "minecraft/client/Minecraft.h"
--- a/targets/app/common/UI/Scenes/Frontend
+++ b/targets/app/common/UI/Scenes/Frontend
@ -21,7 +21,7 @@
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "util/StringHelpers.h"

 #include "java/InputOutputStream/BufferedReader.h"
--- a/Options/UIScene_LanguageSelector.h
+++ b/Options/UIScene_LanguageSelector.h
@ -8,9 +8,9 @@
 #include "app/common/UI/Controls/UIControl_ButtonList.h"
 #include "app/common/UI/UIScene.h"
 #include "app/linux/Iggy/include/rrCore.h"
-#include "app/common/NetTypes.h"
-#include "app/common/SkinBox.h"
-#include "app/common/XboxStubs.h"
+#include "platform/NetTypes.h"
+#include "minecraft/client/SkinBox.h"
+#include "platform/XboxStubs.h"

 class UILayer;

--- a/Options/UIScene_SkinSelectMenu.cpp
+++ b/Options/UIScene_SkinSelectMenu.cpp
@ -20,7 +20,7 @@
 #include "app/common/UI/UIScene.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
-#include "app/common/SkinBox.h"
+#include "minecraft/client/SkinBox.h"
 #include "util/StringHelpers.h"

 #include "minecraft/client/Minecraft.h"
--- a/targets/app/common/UI/Scenes/Help
+++ b/targets/app/common/UI/Scenes/Help
@ -15,7 +15,7 @@
 #include "app/linux/Stubs/iggy_stubs.h"
 #endif
 #include "app/linux/Iggy/include/rrCore.h"
-#include "app/common/SkinBox.h"
+#include "minecraft/client/SkinBox.h"
 #include "minecraft/world/entity/player/SkinTypes.h"
 #include "minecraft/client/renderer/Textures.h"

--- a/Screens/Containers/UIScene_CreativeMenu.cpp
+++ b/Screens/Containers/UIScene_CreativeMenu.cpp
@ -19,7 +19,7 @@
 #include "app/linux/Iggy/include/rrCore.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
-#include "app/common/XboxStubs.h"
+#include "platform/XboxStubs.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/player/LocalPlayer.h"
 #include "minecraft/sounds/SoundTypes.h"
--- a/targets/app/common/UI/Scenes/In-Game
+++ b/targets/app/common/UI/Scenes/In-Game
@ -9,7 +9,7 @@
 #include "app/common/UI/Controls/UIControl_PlayerList.h"
 #include "app/common/UI/UIScene.h"
 #include "app/linux/Iggy/include/rrCore.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"

 class INetworkPlayer;
 class UILayer;
--- a/targets/app/common/UI/UIBitmapFont.cpp
+++ b/targets/app/common/UI/UIBitmapFont.cpp
@ -5,7 +5,7 @@
 #include "app/linux/Stubs/iggy_stubs.h"
 #endif
 #include "app/linux/Iggy/include/rrCore.h"
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"
 #include "UIFontData.h"

 /////////////////////////////
--- a/targets/app/common/UI/UIController.cpp
+++ b/targets/app/common/UI/UIController.cpp
@ -35,9 +35,9 @@
 #endif
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"
 #include "UIFontData.h"
-#include "app/common/XboxStubs.h"
+#include "platform/XboxStubs.h"
 #include "platform/C4JThread.h"
 #include "util/Timer.h"

--- a/targets/app/common/UI/UIString.cpp
+++ b/targets/app/common/UI/UIString.cpp
@ -1,7 +1,7 @@
 #include "UIString.h"

 #include "app/linux/LinuxGame.h"
-#include "app/common/XboxStubs.h"
+#include "platform/XboxStubs.h"
 #include "util/StringHelpers.h"

 bool UIString::setCurrentLanguage() {
--- a/targets/app/common/XboxStubs.cpp
+++ b/targets/app/common/XboxStubs.cpp
@ -6,8 +6,8 @@

 #include "platform/PlatformTypes.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/NetTypes.h"
-#include "app/common/XboxStubs.h"
+#include "platform/NetTypes.h"
+#include "platform/XboxStubs.h"

 class INVITE_INFO;

--- a/targets/app/common/stubs.cpp
+++ b/targets/app/common/stubs.cpp
@ -1,5 +1,5 @@

-#include "app/common/stubs.h"
+#include "platform/stubs.h"

 #include "app/linux/LinuxGame.h"
 #if defined(__linux__)
--- a/targets/app/linux/LinuxGL.cpp
+++ b/targets/app/linux/LinuxGL.cpp
@ -1,7 +1,7 @@
 #ifdef __linux__

 #include "platform/sdl2/Render.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"

 #include "java/ByteBuffer.h"
 #include "java/FloatBuffer.h"
--- a/targets/app/linux/linux_game_stubs.cpp
+++ b/targets/app/linux/linux_game_stubs.cpp
@ -1,7 +1,7 @@
 #ifdef __linux__

 #include "app/common/Game.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"

 void Display::update() {}

--- a/targets/minecraft/client/BufferedImage.cpp
+++ b/targets/minecraft/client/BufferedImage.cpp
@ -1,4 +1,4 @@
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"

 #include <string.h>

--- a/targets/minecraft/client/BufferedImage.h
+++ b/targets/minecraft/client/BufferedImage.h
--- a/targets/minecraft/client/Camera.cpp
+++ b/targets/minecraft/client/Camera.cpp
@ -8,7 +8,7 @@
 #include <numbers>

 #include "MemoryTracker.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "java/FloatBuffer.h"
 #include "minecraft/world/entity/LivingEntity.h"
 #include "minecraft/world/entity/player/Player.h"
--- a/targets/minecraft/client/Lighting.cpp
+++ b/targets/minecraft/client/Lighting.cpp
@ -3,7 +3,7 @@
 #include <GL/gl.h>

 #include "platform/sdl2/Render.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "java/FloatBuffer.h"
 #include "minecraft/world/phys/Vec3.h"

--- a/targets/minecraft/client/Minecraft.cpp
+++ b/targets/minecraft/client/Minecraft.cpp
@ -25,7 +25,7 @@
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/XboxStubs.h"
+#include "platform/XboxStubs.h"
 #include "Options.h"
 #include "Pos.h"
 #include "ProgressRenderer.h"
@ -110,7 +110,7 @@
 #include "app/common/Tutorial/FullTutorialMode.h"
 #include "app/common/UI/All Platforms/IUIScene_CreativeMenu.h"
 #include "app/common/UI/UIFontData.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "util/StringHelpers.h"
 #include "java/File.h"
 #include "java/System.h"
--- a/targets/minecraft/client/Options.cpp
+++ b/targets/minecraft/client/Options.cpp
@ -3,7 +3,7 @@
 #include "KeyMapping.h"
 #include "app/common/Audio/SoundEngine.h"
 #include "app/linux/LinuxGame.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "util/StringHelpers.h"
 #include "java/File.h"
 #include "java/InputOutputStream/BufferedReader.h"
--- a/targets/minecraft/client/SkinBox.h
+++ b/targets/minecraft/client/SkinBox.h
--- a/targets/minecraft/client/gui/ChatScreen.cpp
+++ b/targets/minecraft/client/gui/ChatScreen.cpp
@ -2,7 +2,7 @@

 #include <memory>

-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "util/StringHelpers.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/client/Minecraft.h"
--- a/targets/minecraft/client/gui/CreateWorldScreen.cpp
+++ b/targets/minecraft/client/gui/CreateWorldScreen.cpp
@ -16,8 +16,8 @@
 #include "app/common/UI/All Platforms/UIStructs.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
-#include "app/common/NetTypes.h"
-#include "app/common/stubs.h"
+#include "platform/NetTypes.h"
+#include "platform/stubs.h"
 #include "util/StringHelpers.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/client/Minecraft.h"
--- a/targets/minecraft/client/gui/EditBox.cpp
+++ b/targets/minecraft/client/gui/EditBox.cpp
@ -1,6 +1,6 @@
 #include "EditBox.h"

-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/client/gui/Screen.h"

--- a/targets/minecraft/client/gui/Font.cpp
+++ b/targets/minecraft/client/gui/Font.cpp
@ -6,7 +6,7 @@
 #include <vector>

 #include "platform/sdl2/Render.h"
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"
 #include "util/StringHelpers.h"
 #include "java/Random.h"
 #include "minecraft/SharedConstants.h"
--- a/targets/minecraft/client/gui/Gui.cpp
+++ b/targets/minecraft/client/gui/Gui.cpp
@ -11,7 +11,7 @@
 #include "app/common/App_structs.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
-#include "app/common/XboxStubs.h"
+#include "platform/XboxStubs.h"
 #include "util/StringHelpers.h"
 #include "java/JavaMath.h"
 #include "java/Random.h"
@ -55,7 +55,7 @@
 #include "minecraft/world/level/storage/LevelData.h"
 #include "minecraft/world/level/tile/PortalTile.h"
 #include "minecraft/world/level/tile/Tile.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"

 #include "strings.h"

--- a/targets/minecraft/client/gui/GuiComponent.cpp
+++ b/targets/minecraft/client/gui/GuiComponent.cpp
@ -4,7 +4,7 @@
 #include <math.h>

 #include "platform/sdl2/Render.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Font.h"
 #include "minecraft/client/gui/Gui.h"
--- a/targets/minecraft/client/gui/InBedChatScreen.cpp
+++ b/targets/minecraft/client/gui/InBedChatScreen.cpp
@ -5,7 +5,7 @@
 #include <vector>

 #include "Button.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "util/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/ChatScreen.h"
--- a/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp
+++ b/targets/minecraft/client/gui/JoinMultiplayerScreen.cpp
@ -4,7 +4,7 @@

 #include "Button.h"
 #include "EditBox.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "util/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/Options.h"
--- a/targets/minecraft/client/gui/Minimap.cpp
+++ b/targets/minecraft/client/gui/Minimap.cpp
@ -11,7 +11,7 @@
 #include "Font.h"
 #include "app/common/App_enums.h"
 #include "app/common/Colours/ColourTable.h"
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/client/renderer/Textures.h"
--- a/targets/minecraft/client/gui/NameEntryScreen.cpp
+++ b/targets/minecraft/client/gui/NameEntryScreen.cpp
@ -3,7 +3,7 @@
 #include <vector>

 #include "Button.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "util/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Screen.h"
--- a/targets/minecraft/client/gui/RenameWorldScreen.cpp
+++ b/targets/minecraft/client/gui/RenameWorldScreen.cpp
@ -4,7 +4,7 @@

 #include "Button.h"
 #include "EditBox.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "util/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Screen.h"
--- a/targets/minecraft/client/gui/Screen.cpp
+++ b/targets/minecraft/client/gui/Screen.cpp
@ -8,7 +8,7 @@
 #include "app/common/Audio/SoundEngine.h"
 #include "app/common/Network/GameNetworkManager.h"
 #include "app/linux/LinuxGame.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Screen.h"
 #include "minecraft/client/gui/particle/GuiParticles.h"
--- a/targets/minecraft/client/gui/achievement/AchievementScreen.cpp
+++ b/targets/minecraft/client/gui/achievement/AchievementScreen.cpp
@ -6,7 +6,7 @@
 #include <vector>

 #include "platform/sdl2/Render.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "minecraft/client/KeyMapping.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/Options.h"
--- a/targets/minecraft/client/gui/achievement/StatsScreen.cpp
+++ b/targets/minecraft/client/gui/achievement/StatsScreen.cpp
@ -1,7 +1,7 @@
 #include "StatsScreen.h"

 #include "app/common/Audio/SoundEngine.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "util/StringHelpers.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Button.h"
--- a/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp
+++ b/targets/minecraft/client/gui/inventory/AbstractContainerScreen.cpp
@ -5,7 +5,7 @@
 #include <vector>

 #include "app/linux/LinuxGame.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "minecraft/client/KeyMapping.h"
 #include "minecraft/client/Lighting.h"
 #include "minecraft/client/Minecraft.h"
--- a/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp
+++ b/targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp
@ -11,7 +11,7 @@
 #include "AbstractContainerScreen.h"
 #include "app/common/UI/All Platforms/IUIScene_CreativeMenu.h"
 #include "app/linux/LinuxGame.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/Lighting.h"
 #include "minecraft/client/gui/Screen.h"
--- a/targets/minecraft/client/gui/inventory/TextEditScreen.cpp
+++ b/targets/minecraft/client/gui/inventory/TextEditScreen.cpp
@ -3,7 +3,7 @@
 #include <vector>

 #include "platform/sdl2/Render.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "minecraft/SharedConstants.h"
 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Button.h"
--- a/targets/minecraft/client/gui/particle/GuiParticle.cpp
+++ b/targets/minecraft/client/gui/particle/GuiParticle.cpp
@ -1,6 +1,6 @@
 #include "GuiParticle.h"

-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "java/Random.h"

 Random* GuiParticle::random = new Random();
--- a/targets/minecraft/client/model/HumanoidModel.h
+++ b/targets/minecraft/client/model/HumanoidModel.h
@ -1,5 +1,5 @@
 #pragma once
-#include "app/common/SkinBox.h"
+#include "minecraft/client/SkinBox.h"
 #include "minecraft/client/model/geom/Model.h"

 class ModelPart;
--- a/targets/minecraft/client/model/geom/Model.h
+++ b/targets/minecraft/client/model/geom/Model.h
@ -5,7 +5,7 @@
 #include <unordered_map>
 #include <vector>

-#include "app/common/SkinBox.h"
+#include "minecraft/client/SkinBox.h"
 #include "java/Random.h"

 class Mob;
--- a/targets/minecraft/client/model/geom/ModelPart.h
+++ b/targets/minecraft/client/model/geom/ModelPart.h
@ -2,7 +2,7 @@
 #include <string>
 #include <vector>

-#include "app/common/SkinBox.h"
+#include "minecraft/client/SkinBox.h"
 #include "Model.h"
 #include "minecraft/client/model/Polygon.h"
 #include "minecraft/client/model/Vertex.h"
--- a/targets/minecraft/client/renderer/Chunk.cpp
+++ b/targets/minecraft/client/renderer/Chunk.cpp
@ -12,7 +12,7 @@
 #include "platform/sdl2/Render.h"
 #include "LevelRenderer.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/FrameProfiler.h"
+#include "util/FrameProfiler.h"
 #include "TileRenderer.h"
 #include "minecraft/client/renderer/Tesselator.h"
 #include "minecraft/client/renderer/culling/Culler.h"
--- a/targets/minecraft/client/renderer/GameRenderer.cpp
+++ b/targets/minecraft/client/renderer/GameRenderer.cpp
@ -18,9 +18,9 @@
 #include "app/common/Colours/ColourTable.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/BufferedImage.h"
-#include "app/common/FrameProfiler.h"
-#include "app/common/stubs.h"
+#include "minecraft/client/BufferedImage.h"
+#include "util/FrameProfiler.h"
+#include "platform/stubs.h"
 #include "Tesselator.h"
 #include "minecraft/world/level/storage/ConsoleSaveFileIO/compression.h"

--- a/targets/minecraft/client/renderer/LevelRenderer.cpp
+++ b/targets/minecraft/client/renderer/LevelRenderer.cpp
@ -23,9 +23,9 @@
 #include "app/common/Colours/ColourTable.h"
 #include "app/common/Console_Debug_enum.h"
 #include "app/linux/LinuxGame.h"
-#include "app/common/FrameProfiler.h"
-#include "app/common/MobSkinMemTextureProcessor.h"
-#include "app/common/stubs.h"
+#include "util/FrameProfiler.h"
+#include "minecraft/client/renderer/MobSkinMemTextureProcessor.h"
+#include "platform/stubs.h"
 #include "Tesselator.h"
 #include "util/StringHelpers.h"
 #include "java/Class.h"
--- a/targets/minecraft/client/renderer/LevelRenderer.h
+++ b/targets/minecraft/client/renderer/LevelRenderer.h
@ -1,7 +1,7 @@
 #pragma once
-#include "app/common/NetTypes.h"
-#include "app/common/SkinBox.h"
-#include "app/common/XboxStubs.h"
+#include "platform/NetTypes.h"
+#include "minecraft/client/SkinBox.h"
+#include "platform/XboxStubs.h"
 #include "OffsettedRenderList.h"
 #include "platform/C4JThread.h"
 #include "util/Definitions.h"
--- a/targets/minecraft/client/renderer/MemTexture.cpp
+++ b/targets/minecraft/client/renderer/MemTexture.cpp
@ -1,9 +1,9 @@
-#include "app/common/MemTexture.h"
+#include "minecraft/client/renderer/MemTexture.h"

 #include <cstdint>
 #include <string>

-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"

 class MemTextureProcessor;

--- a/targets/minecraft/client/renderer/MemTexture.h
+++ b/targets/minecraft/client/renderer/MemTexture.h
--- a/targets/minecraft/client/renderer/MemTextureProcessor.h
+++ b/targets/minecraft/client/renderer/MemTextureProcessor.h
--- a/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp
+++ b/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.cpp
@ -1,7 +1,7 @@
-#include "app/common/MobSkinMemTextureProcessor.h"
+#include "minecraft/client/renderer/MobSkinMemTextureProcessor.h"

-#include "app/common/BufferedImage.h"
-#include "app/common/stubs.h"
+#include "minecraft/client/BufferedImage.h"
+#include "platform/stubs.h"

 BufferedImage* MobSkinMemTextureProcessor::process(BufferedImage* in) {
    if (in == nullptr) return nullptr;
--- a/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.h
+++ b/targets/minecraft/client/renderer/MobSkinMemTextureProcessor.h
@ -1,5 +1,5 @@
 #pragma once
-#include "app/common/MemTextureProcessor.h"
+#include "minecraft/client/renderer/MemTextureProcessor.h"

 class MobSkinMemTextureProcessor : public MemTextureProcessor {
 private:
--- a/targets/minecraft/client/renderer/MobSkinTextureProcessor.cpp
+++ b/targets/minecraft/client/renderer/MobSkinTextureProcessor.cpp
@ -1,7 +1,7 @@
 #include "MobSkinTextureProcessor.h"

-#include "app/common/BufferedImage.h"
-#include "app/common/stubs.h"
+#include "minecraft/client/BufferedImage.h"
+#include "platform/stubs.h"

 BufferedImage* MobSkinTextureProcessor::process(BufferedImage* in) {
    if (in == nullptr) return nullptr;
--- a/targets/minecraft/client/renderer/Tesselator.cpp
+++ b/targets/minecraft/client/renderer/Tesselator.cpp
@ -6,7 +6,7 @@

 #include "platform/sdl2/Render.h"
 #include "app/linux/LinuxGame.h"
-#include "app/common/stubs.h"
+#include "platform/stubs.h"
 #include "minecraft/client/MemoryTracker.h"

 bool Tesselator::TRIANGLE_MODE = false;
--- a/targets/minecraft/client/renderer/Textures.cpp
+++ b/targets/minecraft/client/renderer/Textures.cpp
@ -10,10 +10,10 @@
 #include "platform/sdl2/Render.h"
 #include "HttpTexture.h"
 #include "app/linux/LinuxGame.h"
-#include "app/common/BufferedImage.h"
-#include "app/common/MemTexture.h"
-#include "app/common/MemTextureProcessor.h"
-#include "app/common/MobSkinMemTextureProcessor.h"
+#include "minecraft/client/BufferedImage.h"
+#include "minecraft/client/renderer/MemTexture.h"
+#include "minecraft/client/renderer/MemTextureProcessor.h"
+#include "minecraft/client/renderer/MobSkinMemTextureProcessor.h"
 #include "util/StringHelpers.h"

 #include "java/Buffer.h"
--- a/targets/minecraft/client/renderer/TileRenderer.cpp
+++ b/targets/minecraft/client/renderer/TileRenderer.cpp
@ -14,7 +14,7 @@
 #include "GameRenderer.h"
 #include "app/common/App_enums.h"
 #include "app/common/Colours/ColourTable.h"
-#include "app/common/FrameProfiler.h"
+#include "util/FrameProfiler.h"
 #include "Tesselator.h"
 #include "minecraft/Direction.h"
 #include "minecraft/Facing.h"
--- a/targets/minecraft/client/renderer/entity/PlayerRenderer.h
+++ b/targets/minecraft/client/renderer/entity/PlayerRenderer.h
@ -2,9 +2,9 @@
 #include <memory>
 #include <string>

-#include "app/common/NetTypes.h"
-#include "app/common/SkinBox.h"
-#include "app/common/XboxStubs.h"
+#include "platform/NetTypes.h"
+#include "minecraft/client/SkinBox.h"
+#include "platform/XboxStubs.h"
 #include "MobRenderer.h"
 #include "minecraft/client/renderer/entity/LivingEntityRenderer.h"
 #include "minecraft/world/entity/player/Player.h"
--- a/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp
+++ b/targets/minecraft/client/renderer/texture/PreStitchedTextureMap.cpp
@ -5,7 +5,7 @@

 #include "app/linux/LinuxGame.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"
 #include "SimpleIcon.h"
 #include "StitchedTexture.h"
 #include "Texture.h"
--- a/targets/minecraft/client/renderer/texture/Texture.cpp
+++ b/targets/minecraft/client/renderer/texture/Texture.cpp
@ -7,7 +7,7 @@

 #include "platform/sdl2/Render.h"
 #include "app/linux/LinuxGame.h"
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"
 #include "TextureManager.h"
 #include "java/Buffer.h"
 #include "java/ByteBuffer.h"
--- a/targets/minecraft/client/renderer/texture/TextureManager.cpp
+++ b/targets/minecraft/client/renderer/texture/TextureManager.cpp
@ -6,7 +6,7 @@
 #include <vector>

 #include "app/linux/LinuxGame.h"
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"
 #include "Stitcher.h"
 #include "Texture.h"
 #include "java/File.h"
--- a/targets/minecraft/client/renderer/texture/TextureMap.cpp
+++ b/targets/minecraft/client/renderer/texture/TextureMap.cpp
@ -7,7 +7,7 @@

 #include "app/linux/LinuxGame.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"
 #include "StitchSlot.h"
 #include "StitchedTexture.h"
 #include "Stitcher.h"
--- a/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp
+++ b/targets/minecraft/client/renderer/tileentity/SignRenderer.cpp
@ -8,7 +8,7 @@
 #include "app/common/App_enums.h"
 #include "app/common/Colours/ColourTable.h"
 #include "app/linux/LinuxGame.h"
-#include "app/common/XboxStubs.h"
+#include "platform/XboxStubs.h"

 #include "minecraft/client/Minecraft.h"
 #include "minecraft/client/gui/Font.h"
--- a/targets/minecraft/client/skins/AbstractTexturePack.cpp
+++ b/targets/minecraft/client/skins/AbstractTexturePack.cpp
@ -9,7 +9,7 @@
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"
 #include "util/StringHelpers.h"
 #include "java/File.h"
 #include "java/InputOutputStream/BufferedReader.h"
--- a/targets/minecraft/client/skins/DLCTexturePack.cpp
+++ b/targets/minecraft/client/skins/DLCTexturePack.cpp
@ -26,7 +26,7 @@
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Linux_UIController.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"
 #include "platform/PlatformServices.h"
 #include "java/File.h"
 #include "minecraft/client/Minecraft.h"
--- a/targets/minecraft/client/title/TitleScreen.cpp
+++ b/targets/minecraft/client/title/TitleScreen.cpp
@ -8,7 +8,7 @@
 #include "platform/sdl2/Render.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/BufferedImage.h"
+#include "minecraft/client/BufferedImage.h"
 #include "util/StringHelpers.h"
 #include "java/InputOutputStream/BufferedReader.h"
 #include "java/InputOutputStream/ByteArrayInputStream.h"
--- a/targets/minecraft/network/packet/TextureAndGeometryPacket.h
+++ b/targets/minecraft/network/packet/TextureAndGeometryPacket.h
@ -5,7 +5,7 @@
 #include <string>
 #include <vector>

-#include "app/common/SkinBox.h"
+#include "minecraft/client/SkinBox.h"
 #include "Packet.h"
 #include "minecraft/client/model/geom/Model.h"
 #include "minecraft/network/packet/Packet.h"
--- a/targets/minecraft/server/PlayerList.cpp
+++ b/targets/minecraft/server/PlayerList.cpp
@ -20,7 +20,7 @@
 #include "app/common/Tutorial/TutorialEnum.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "MinecraftServer.h"
 #include "Settings.h"
 #include "minecraft/world/entity/player/SkinTypes.h"
--- a/targets/minecraft/server/network/PendingConnection.cpp
+++ b/targets/minecraft/server/network/PendingConnection.cpp
@ -13,7 +13,7 @@
 #include "platform/IPlatformNetwork.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "PlayerConnection.h"
 #include "ServerConnection.h"
 #include "java/Random.h"
--- a/targets/minecraft/server/network/PlayerConnection.cpp
+++ b/targets/minecraft/server/network/PlayerConnection.cpp
@ -16,7 +16,7 @@
 #include "app/common/Network/NetworkPlayerInterface.h"
 #include "app/common/Network/Socket.h"
 #include "app/linux/LinuxGame.h"
-#include "app/common/SkinBox.h"
+#include "minecraft/client/SkinBox.h"
 #include "ServerConnection.h"
 #include "java/Class.h"
 #include "java/InputOutputStream/ByteArrayInputStream.h"
--- a/targets/minecraft/world/level/Level.cpp
+++ b/targets/minecraft/world/level/Level.cpp
@ -21,7 +21,7 @@
 #include "app/common/Network/GameNetworkManager.h"
 #include "app/linux/LinuxGame.h"
 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/FrameProfiler.h"
+#include "util/FrameProfiler.h"
 #include "java/Random.h"
 #include "minecraft/Direction.h"
 #include "minecraft/Facing.h"
--- a/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp
+++ b/targets/minecraft/world/level/chunk/CompressedTileStorage.cpp
@ -9,7 +9,7 @@
 #include <vector>

 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "util/Definitions.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"
--- a/targets/minecraft/world/level/chunk/SparseDataStorage.cpp
+++ b/targets/minecraft/world/level/chunk/SparseDataStorage.cpp
@ -7,7 +7,7 @@
 #include <vector>

 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"

--- a/targets/minecraft/world/level/chunk/SparseLightStorage.cpp
+++ b/targets/minecraft/world/level/chunk/SparseLightStorage.cpp
@ -7,7 +7,7 @@
 #include <vector>

 #include "app/linux/Stubs/winapi_stubs.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"
 #include "java/InputOutputStream/DataInputStream.h"
 #include "java/InputOutputStream/DataOutputStream.h"

--- a/targets/platform/IPlatformNetwork.h
+++ b/targets/platform/IPlatformNetwork.h
@ -6,7 +6,7 @@
 #include <vector>

 #include "PlatformTypes.h"
-#include "app/common/NetTypes.h"
+#include "platform/NetTypes.h"

 #ifndef VER_NETWORK
 #define VER_NETWORK 560
--- a/targets/app/common/NetTypes.h
+++ b/targets/app/common/NetTypes.h
--- a/targets/app/common/XboxStubs.h
+++ b/targets/app/common/XboxStubs.h
--- a/targets/app/common/stubs.h
+++ b/targets/app/common/stubs.h
--- a/targets/app/common/FrameProfiler.cpp
+++ b/targets/app/common/FrameProfiler.cpp
--- a/targets/app/common/FrameProfiler.h
+++ b/targets/app/common/FrameProfiler.h
--- a/targets/util/meson.build
+++ b/targets/util/meson.build
@ -4,7 +4,7 @@ simdutf_dep = dependency('simdutf',
 )

 lib_util = static_library('util',
-  files('StringHelpers.cpp'),
+  files('StringHelpers.cpp', 'FrameProfiler.cpp'),
  dependencies: [simdutf_dep],
  include_directories : include_directories('.', '..'),
  cpp_args : global_cpp_args + global_cpp_defs,